pass handlers around instead of a boolean

Author: PrototypeTrousers

src/main/java/gregtech/api/capability/INotifiableHandler.java

@@ -15,10 +15,10 @@ public interface INotifiableHandler {
      * @param isExport boolean specifying if a handler is an output handler
      */
 
-    default void notifyMetaTileEntityOfChange(MetaTileEntity metaTileEntity, boolean isExport) {
+    default <T> void addToNotifiedList(MetaTileEntity metaTileEntity, T handler, boolean isExport) {
         if (metaTileEntity != null && metaTileEntity.isValid()) {
-            if (isExport) metaTileEntity.setOutputsDirty(true);
-            else metaTileEntity.setInputsDirty(true);
+            if (isExport) metaTileEntity.addNotifiedOutput(handler);
+            else metaTileEntity.addNotifiedInput(handler);
         }
     }
 

src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java

@@ -130,19 +130,30 @@ protected boolean shouldSearchForRecipes() {
         return canWorkWithInputs() && canFitNewOutputs();
     }
 
+    protected boolean hasNotifiedInputs() {
+        return (metaTileEntity.getNotifiedItemInputList().size() > 0 ||
+                metaTileEntity.getNotifiedFluidInputList().size() > 0);
+    }
+
+    protected boolean hasNotifiedOutputs() {
+        return (metaTileEntity.getNotifiedItemOutputList().size() > 0 ||
+                metaTileEntity.getNotifiedFluidOutputList().size() > 0);
+    }
+
     protected boolean canFitNewOutputs() {
         // if the output is full check if the output changed so we can process recipes results again.
-        if (this.isOutputsFull && !metaTileEntity.isOutputsDirty()) return false;
+        if (this.isOutputsFull && !hasNotifiedOutputs()) return false;
         else {
             this.isOutputsFull = false;
-            metaTileEntity.setOutputsDirty(false);
+            metaTileEntity.removeNotifiedOutput(getOutputInventory());
+            metaTileEntity.removeNotifiedOutput(getOutputTank());
         }
         return true;
     }
 
     protected boolean canWorkWithInputs() {
         // if the inputs were bad last time, check if they've changed before trying to find a new recipe.
-        if (this.invalidInputsForRecipes && !metaTileEntity.isInputsDirty()) return false;
+        if (this.invalidInputsForRecipes && !hasNotifiedInputs()) return false;
         else {
             this.invalidInputsForRecipes = false;
         }
@@ -198,7 +209,8 @@ protected void trySearchNewRecipe() {
         if (currentRecipe != null && setupAndConsumeRecipeInputs(currentRecipe))
             setupRecipe(currentRecipe);
         // Inputs have been inspected.
-        metaTileEntity.setInputsDirty(false);
+        metaTileEntity.removeNotifiedInput(importInventory);
+        metaTileEntity.removeNotifiedInput(importFluids);
     }
 
     public void forceRecipeRecheck() {
@@ -221,12 +233,12 @@ protected Recipe findRecipe(long maxVoltage, IItemHandlerModifiable inputs, IMul
     }
 
     /**
-     * @deprecated Use {@link MetaTileEntity#isInputsDirty() } instead
+     * @deprecated Use {@link #hasNotifiedInputs() } instead
      * Left here for binary compatibility purposes
      */
     @Deprecated
     protected boolean checkRecipeInputsDirty(IItemHandler inputs, IMultipleTankHandler fluidInputs) {
-        return this.getMetaTileEntity().isInputsDirty();
+        return this.hasNotifiedInputs();
     }
 
     protected static boolean areItemStacksEqual(ItemStack stackA, ItemStack stackB) {
@@ -369,7 +381,7 @@ protected void setActive(boolean active) {
         this.isActive = active;
         metaTileEntity.markDirty();
         World world = metaTileEntity.getWorld();
-        if (world != null && world.isRemote) {
+        if (world != null && !world.isRemote) {
             writeCustomData(1, buf -> buf.writeBoolean(active));
         }
     }

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

@@ -60,6 +60,18 @@ protected boolean setupAndConsumeRecipeInputs(Recipe recipe) {
         } else return false;
     }
 
+    @Override
+    protected boolean hasNotifiedInputs() {
+        return (metaTileEntity.getNotifiedItemInputList().size() > 0 ||
+                metaTileEntity.getNotifiedFluidInputList().size() > 0);
+    }
+
+    @Override
+    protected boolean hasNotifiedOutputs() {
+        return (metaTileEntity.getNotifiedItemOutputList().size() > 0 ||
+                metaTileEntity.getNotifiedFluidOutputList().size() > 0);
+    }
+
     @Override
     protected long getEnergyStored() {
         return getEnergyContainer().getEnergyStored();

src/main/java/gregtech/api/capability/impl/NotifiableFilteredFluidHandler.java

@@ -17,7 +17,7 @@ public NotifiableFilteredFluidHandler(int capacity, MetaTileEntity entityToNotif
     @Override
     protected void onContentsChanged() {
         super.onContentsChanged();
-        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
+        addToNotifiedList(notifiableEntity, this, isExport);
     }
 
     @Override

src/main/java/gregtech/api/capability/impl/NotifiableFluidTank.java

@@ -18,7 +18,7 @@ public NotifiableFluidTank(int capacity, MetaTileEntity entityToNotify, boolean
     @Override
     protected void onContentsChanged() {
         super.onContentsChanged();
-        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
+        addToNotifiedList(notifiableEntity, this, isExport);
     }
 
     @Override

src/main/java/gregtech/api/capability/impl/NotifiableItemStackHandler.java

@@ -19,7 +19,7 @@ public NotifiableItemStackHandler(int slots, MetaTileEntity entityToNotify, bool
     @Override
     public void onContentsChanged(int slot) {
         super.onContentsChanged(slot);
-        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
+        addToNotifiedList(notifiableEntity, this, isExport);
     }
 
     @Override

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -12,9 +12,7 @@
 import gregtech.api.GregTechAPI;
 import gregtech.api.capability.GregtechTileCapabilities;
 import gregtech.api.capability.IEnergyContainer;
-import gregtech.api.capability.impl.FluidHandlerProxy;
-import gregtech.api.capability.impl.FluidTankList;
-import gregtech.api.capability.impl.ItemHandlerProxy;
+import gregtech.api.capability.impl.*;
 import gregtech.api.cover.CoverBehavior;
 import gregtech.api.cover.CoverDefinition;
 import gregtech.api.cover.ICoverable;
@@ -42,6 +40,7 @@
 import net.minecraftforge.common.util.Constants.NBT;
 import net.minecraftforge.fluids.FluidActionResult;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
@@ -52,8 +51,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 
 import static gregtech.api.util.InventoryUtils.simulateItemStackMerge;
@@ -90,8 +88,10 @@ public abstract class MetaTileEntity implements ICoverable {
     protected boolean isFragile = false;
 
     private final CoverBehavior[] coverBehaviors = new CoverBehavior[6];
-    protected boolean outputDirty;
-    protected boolean inputDirty;
+    protected List<IItemHandlerModifiable> notifiedItemOutputList = new ArrayList<>();
+    protected List<IItemHandlerModifiable> notifiedItemInputList = new ArrayList<>();
+    protected List<IFluidHandler> notifiedFluidInputList = new ArrayList<>();
+    protected List<IFluidHandler> notifiedFluidOutputList = new ArrayList<>();
 
     public MetaTileEntity(ResourceLocation metaTileEntityId) {
         this.metaTileEntityId = metaTileEntityId;
@@ -259,20 +259,42 @@ public final String getMetaFullName() {
         return getMetaName() + ".name";
     }
 
-    public void setInputsDirty(boolean dirty) {
-        this.inputDirty = dirty;
+    public <T> void addNotifiedInput (T input) {
+        if (input instanceof IItemHandlerModifiable) {
+            if (!notifiedItemInputList.contains(input)) {
+                this.notifiedItemInputList.add((IItemHandlerModifiable) input);
+            }
+        } else if (input instanceof FluidTank) {
+            if (!notifiedFluidInputList.contains(input)) {
+                this.notifiedFluidInputList.add((FluidTank) input);
+            }
+        }
     }
 
-    public boolean isInputsDirty() {
-        return this.inputDirty;
+    public <T> void addNotifiedOutput (T output) {
+        if (output instanceof IItemHandlerModifiable) {
+            if (!notifiedItemOutputList.contains(output)) {
+                this.notifiedItemOutputList.add((IItemHandlerModifiable) output);
+            }
+        } else if (output instanceof NotifiableFluidTank) {
+            if (!notifiedFluidOutputList.contains(output)) {
+                this.notifiedFluidOutputList.add((NotifiableFluidTank) output);
+            }
+        }
     }
 
-    public void setOutputsDirty(boolean dirty) {
-        this.outputDirty = dirty;
+    public <T> void removeNotifiedInput (T input) {
+        if (input instanceof IItemHandlerModifiable)
+            this.notifiedItemInputList.remove(input);
+        else if (input instanceof FluidTank)
+            this.notifiedFluidInputList.remove(input);
     }
 
-    public boolean isOutputsDirty() {
-        return this.outputDirty;
+    public <T> void removeNotifiedOutput (T input) {
+        if (input instanceof IItemHandlerModifiable)
+            this.notifiedItemOutputList.remove(input);
+        else if (input instanceof FluidTank)
+            this.notifiedFluidOutputList.remove(input);
     }
 
     /**
@@ -1231,6 +1253,22 @@ public FluidTankList getExportFluids() {
         return exportFluids;
     }
 
+    public List<IItemHandlerModifiable> getNotifiedItemOutputList() {
+        return notifiedItemOutputList;
+    }
+
+    public List<IItemHandlerModifiable> getNotifiedItemInputList() {
+        return notifiedItemInputList;
+    }
+
+    public List<IFluidHandler> getNotifiedFluidInputList() {
+        return notifiedFluidInputList;
+    }
+
+    public List<IFluidHandler> getNotifiedFluidOutputList() {
+        return notifiedFluidOutputList;
+    }
+
     public boolean isFragile() {
         return isFragile;
     }

src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityFluidHatch.java

@@ -117,7 +117,7 @@ else if (!isExportHatch && getImportFluids().getFluidTanks().get(0) instanceof N
             handler = (NotifiableFluidTank) getImportFluids().getFluidTanks().get(0);
         if (handler != null) {
             handler.setNotifiableMetaTileEntity(metaTileEntity);
-            handler.notifyMetaTileEntityOfChange(this, isExportHatch);
+            handler.addToNotifiedList(this, handler, isExportHatch);
         }
     }
 

src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java

@@ -96,7 +96,7 @@ else if (!isExportHatch && getImportItems() instanceof NotifiableItemStackHandle
             handler = (NotifiableItemStackHandler) getImportItems();
         if (handler != null) {
             handler.setNotifiableMetaTileEntity(metaTileEntity);
-            handler.notifyMetaTileEntityOfChange(this, isExportHatch);
+            handler.addToNotifiedList(this, handler, isExportHatch);
         }
     }
 

src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityMultiFurnace.java

@@ -103,7 +103,7 @@ protected void trySearchNewRecipe() {
             //for MultiSmelter, we can reuse previous recipe if inputs didn't change
             //otherwise, we need to recompute it for new ingredients
             //but technically, it means we can cache multi smelter recipe, but changing inputs have more priority
-            if (metaTileEntity.isInputsDirty() ||
+            if (hasNotifiedInputs() ||
                 previousRecipe == null ||
                 !previousRecipe.matches(false,importInventory,importFluids)) {
                 //Inputs changed, try searching new recipe for given inputs
@@ -119,7 +119,8 @@ protected void trySearchNewRecipe() {
             if (currentRecipe != null && setupAndConsumeRecipeInputs(currentRecipe))
                 setupRecipe(currentRecipe);
             // Inputs have been inspected.
-            metaTileEntity.setInputsDirty(false);
+            metaTileEntity.getNotifiedItemInputList().clear();
+            metaTileEntity.getNotifiedFluidOutputList().clear();
         }
 
         @Override