mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Silence!

Browse source 
- Removed leftovers from debugging
This commit is contained in:
simibubi 2020-10-30 02:17:58 +01:00
parent 5abfc15e9e
commit 1942d1dd63
2 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java
View file

@ -10,7 +10,6 @@ import javax.annotation.Nullable;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
import com.simibubi.create.foundation.tileEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.tileEntity.behaviour.BehaviourType;
import com.simibubi.create.foundation.utility.Debug;
import it.unimi.dsi.fastutil.PriorityQueue; import it.unimi.dsi.fastutil.PriorityQueue;
import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue; import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue;
@ -60,7 +59,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
} }
if (counterpartActed) { if (counterpartActed) {
Debug.debugChat("<!> Counterpart acted");
counterpartActed = false; counterpartActed = false;
softReset(root); softReset(root);
return false; return false;
@ -141,7 +139,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
isValid = checkValid(world, rootPos); isValid = checkValid(world, rootPos);
reset(); reset();
} else if (!validationSet.contains(currentPos)) { } else if (!validationSet.contains(currentPos)) {
Debug.debugChat("<!> Drained unreachable fluid - rebuilding");
reset(); reset();
} }
return true; return true;
@ -230,7 +227,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
public void rebuildContext(BlockPos root) { public void rebuildContext(BlockPos root) {
reset(); reset();
Debug.debugChat("Rebuilding!");
rootPos = root; rootPos = root;
affectedArea = new MutableBoundingBox(rootPos, rootPos); affectedArea = new MutableBoundingBox(rootPos, rootPos);
if (isValid) if (isValid)
@ -238,7 +234,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
} }
public void revalidate(BlockPos root) { public void revalidate(BlockPos root) {
Debug.debugChat("Revalidating!");
validationFrontier.clear(); validationFrontier.clear();
validationVisited.clear(); validationVisited.clear();
newValidationSet.clear(); newValidationSet.clear();
@ -251,7 +246,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
queue.enqueue(new BlockPosEntry(e, d)); queue.enqueue(new BlockPosEntry(e, d));
validationSet.add(e); validationSet.add(e);
}, false); }, false);
Debug.debugChat("<...> Building - queue size " + queue.size());
World world = getWorld(); World world = getWorld();
int maxBlocks = maxBlocks(); int maxBlocks = maxBlocks();
@ -272,29 +266,24 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
queue.clear(); queue.clear();
queue.enqueue(new BlockPosEntry(firstValid, 0)); queue.enqueue(new BlockPosEntry(firstValid, 0));
tileEntity.sendData(); tileEntity.sendData();
Debug.debugChat("<!> Build complete - infinite");
return; return;
} }
if (!frontier.isEmpty()) if (!frontier.isEmpty())
return; return;
Debug.debugChat("<!> Build complete - queue size " + queue.size());
tileEntity.sendData(); tileEntity.sendData();
visited.clear(); visited.clear();
} }
private void continueValidation() { private void continueValidation() {
search(fluid, validationFrontier, validationVisited, (e, d) -> newValidationSet.add(e), false); search(fluid, validationFrontier, validationVisited, (e, d) -> newValidationSet.add(e), false);
Debug.debugChat("<...> Validating - set size " + newValidationSet.size());
int maxBlocks = maxBlocks(); int maxBlocks = maxBlocks();
if (validationVisited.size() > maxBlocks) { if (validationVisited.size() > maxBlocks) {
if (!infinite) { if (!infinite) {
Debug.debugChat("<!> Validation complete - now infinite");
reset(); reset();
} }
Debug.debugChat("Validation complete - still infinite");
validationFrontier.clear(); validationFrontier.clear();
setLongValidationTimer(); setLongValidationTimer();
return; return;
@ -303,12 +292,10 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
if (!validationFrontier.isEmpty()) if (!validationFrontier.isEmpty())
return; return;
if (infinite) { if (infinite) {
Debug.debugChat("<!> Validation complete - no longer infinite");
reset(); reset();
return; return;
} }
Debug.debugChat("Validation complete - set size " + newValidationSet.size());
validationSet = newValidationSet; validationSet = newValidationSet;
newValidationSet = new HashSet<>(); newValidationSet = new HashSet<>();
validationVisited.clear(); validationVisited.clear();
@ -316,7 +303,6 @@ public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
@Override @Override
public void reset() { public void reset() {
Debug.debugChat("<!> RESET");
super.reset(); super.reset();
fluid = null; fluid = null;

6
src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
View file

@ -8,7 +8,6 @@ import java.util.Set;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
import com.simibubi.create.foundation.tileEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.tileEntity.behaviour.BehaviourType;
import com.simibubi.create.foundation.utility.Debug;
import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Iterate;
import it.unimi.dsi.fastutil.PriorityQueue; import it.unimi.dsi.fastutil.PriorityQueue;
@ -63,11 +62,9 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
if (infinityCheckVisited.size() > maxBlocks) { if (infinityCheckVisited.size() > maxBlocks) {
if (!infinite) { if (!infinite) {
Debug.debugChat("<!> Filler Validation complete - now infinite");
reset(); reset();
infinite = true; infinite = true;
} }
Debug.debugChat("Filler Validation complete - still infinite");
infinityCheckFrontier.clear(); infinityCheckFrontier.clear();
setLongValidationTimer(); setLongValidationTimer();
return; return;
@ -76,7 +73,6 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
if (!infinityCheckFrontier.isEmpty()) if (!infinityCheckFrontier.isEmpty())
return; return;
if (infinite) { if (infinite) {
Debug.debugChat("<!> Filler Validation complete - no longer infinite");
reset(); reset();
return; return;
} }
@ -94,7 +90,6 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
} }
if (counterpartActed) { if (counterpartActed) {
Debug.debugChat("<!> Counterpart acted");
counterpartActed = false; counterpartActed = false;
softReset(root); softReset(root);
return false; return false;
@ -143,7 +138,6 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
visited.add(currentPos); visited.add(currentPos);
if (visited.size() >= maxBlocks) { if (visited.size() >= maxBlocks) {
Debug.debugChat("<F> Search exceeded - now infinite");
infinite = true; infinite = true;
visited.clear(); visited.clear();
queue.clear(); queue.clear();