Fix fluid level maintainer deadlock and remove console spam

Author: FakeDomi

src/main/java/com/glodblock/github/common/tile/TileFluidLevelMaintainer.java

@@ -46,6 +46,8 @@ public class TileFluidLevelMaintainer extends AENetworkTile implements ICrafting
     public static final int MAX_FLUID = 5;
     private int tick = 0;
 
+    public boolean forceNextTick = false;
+
     private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, MAX_FLUID) {
         @Override
         public int getSlotLimit(int slot) {
@@ -128,7 +130,7 @@ public void doWork() {
                     if (remain == null || remain.getStackSize() < fluid.amount) {
                         FluidStack copy = fluid.copy();
                         copy.amount = (int) request[i];
-                        System.out.print(this.craftingTracker.handleCrafting(i, request[i], ItemFluidDrop.newAeStack(copy), DummyInvAdaptor.INSTANCE, getWorld(), getProxy().getGrid(), getProxy().getCrafting(), this.source) + "\n");
+                        this.craftingTracker.handleCrafting(i, request[i], ItemFluidDrop.newAeStack(copy), DummyInvAdaptor.INSTANCE, getWorld(), getProxy().getGrid(), getProxy().getCrafting(), this.source);
                     }
                 }
             }
@@ -257,7 +259,11 @@ public void onChangeInventory(IItemHandler iItemHandler, int i, InvOperation inv
     public void update() {
         if (!getWorld().isRemote) {
             tick ++;
-            if (tick > 1200) {
+            if (forceNextTick) {
+                forceNextTick = false;
+                doWork();
+            }
+            else if (tick > 1200) {
                 tick = 0;
                 doWork();
             }

src/main/java/com/glodblock/github/util/MultiCraftingTracker.java

@@ -7,6 +7,7 @@
 import appeng.api.storage.data.IAEItemStack;
 import appeng.helpers.NonNullArrayIterator;
 import appeng.util.InventoryAdaptor;
+import com.glodblock.github.common.tile.TileFluidLevelMaintainer;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -63,34 +64,39 @@ public boolean handleCrafting(int x, long itemToCraft, IAEItemStack ais, Invento
 
             if (remaining.isEmpty()) {
                 ais.setCachedItemStack(inputStack);
-                Future<ICraftingJob> craftingJob = this.getJob(x);
+                Future<ICraftingJob> jobCalculation = this.getJob(x);
 
                 if (this.getLink(x) != null) {
                     return false;
                 }
 
-                if (craftingJob == null && this.getLink(x) == null) {
+                if (jobCalculation == null && this.getLink(x) == null) {
                     IAEItemStack aisC = ais.copy();
                     aisC.setStackSize(itemToCraft);
                     this.setJob(x, cg.beginCraftingJob(w, g, mySrc, aisC, null));
-                    craftingJob = this.getJob(x);
+                    jobCalculation = this.getJob(x);
                 }
 
-                if (craftingJob == null) {
+                if (jobCalculation == null) {
                     return false;
                 }
 
                 try {
-                    ICraftingJob job = craftingJob.get();
-
-                    if (job != null) {
-                        ICraftingLink link = cg.submitJob(job, this.owner, null, false, mySrc);
-                        this.setJob(x, null);
-                        if (link != null) {
-                            this.setLink(x, link);
-                            return true;
+                    if (jobCalculation.isDone()) {
+                        ICraftingJob job = jobCalculation.get();
+
+                        if (job != null) {
+                            ICraftingLink link = cg.submitJob(job, this.owner, null, false, mySrc);
+                            this.setJob(x, null);
+                            if (link != null) {
+                                this.setLink(x, link);
+                                return true;
+                            }
                         }
                     }
+                    else {
+                        ((TileFluidLevelMaintainer)this.owner).forceNextTick = true;
+                    }
                 } catch (InterruptedException | ExecutionException ignored) {
                 }
             } else {