Simplified handler logic by only allowing one metatile to be notified

Author: PrototypeTrousers

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

@@ -2,9 +2,6 @@
 
 import gregtech.api.metatileentity.MetaTileEntity;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-
 /**
  * For Item and Fluid handlers capable of notifying entities when
  * their contents change
@@ -18,28 +15,17 @@ public interface INotifiableHandler {
      * @param isExport boolean specifying if a handler is an output handler
      */
 
-    default void notifyMetaTileEntitiesOfChange(boolean isExport) {
-        Iterator<MetaTileEntity> iterator = getNotifiableMetaTileEntities().iterator();
-        while (iterator.hasNext()) {
-            MetaTileEntity metaTileEntity = iterator.next();
-            if (metaTileEntity != null && metaTileEntity.isValid()) {
-                if (isExport) metaTileEntity.setOutputsDirty(true);
-                else metaTileEntity.setInputsDirty(true);
-            } else {
-                iterator.remove();
-            }
+    default void notifyMetaTileEntityOfChange(MetaTileEntity metaTileEntity, boolean isExport) {
+        if (metaTileEntity != null && metaTileEntity.isValid()) {
+            if (isExport) metaTileEntity.setOutputsDirty(true);
+            else metaTileEntity.setInputsDirty(true);
         }
     }
 
-    /**
-     * @return a List containing the notifiable MetaTileEntities
-     */
-    LinkedList<MetaTileEntity> getNotifiableMetaTileEntities();
-
     /**
      * @param metaTileEntity MetaTileEntity to be notified
      */
-    default void addNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
-        getNotifiableMetaTileEntities().add(metaTileEntity);
+    default void setNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
+
     }
 }

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

@@ -3,27 +3,25 @@
 import gregtech.api.capability.INotifiableHandler;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-import java.util.LinkedList;
-
 public class NotifiableFilteredFluidHandler extends FilteredFluidHandler implements INotifiableHandler {
 
-    LinkedList<MetaTileEntity> entitiesToNotify = new LinkedList<>();
+    MetaTileEntity notifiableEntity;
     private final boolean isExport;
 
     public NotifiableFilteredFluidHandler(int capacity, MetaTileEntity entityToNotify, boolean isExport) {
         super(capacity);
-        this.entitiesToNotify.add(entityToNotify);
+        this.notifiableEntity = entityToNotify;
         this.isExport = isExport;
     }
 
     @Override
     protected void onContentsChanged() {
         super.onContentsChanged();
-        notifyMetaTileEntitiesOfChange(isExport);
+        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
     }
 
     @Override
-    public LinkedList<MetaTileEntity> getNotifiableMetaTileEntities() {
-        return this.entitiesToNotify;
+    public void setNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
+        this.notifiableEntity = metaTileEntity;
     }
 }

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

@@ -4,27 +4,25 @@
 import gregtech.api.metatileentity.MetaTileEntity;
 import net.minecraftforge.fluids.FluidTank;
 
-import java.util.LinkedList;
-
 public class NotifiableFluidTank extends FluidTank implements INotifiableHandler {
 
-    LinkedList<MetaTileEntity> entitiesToNotify = new LinkedList<>();
+    MetaTileEntity notifiableEntity;
     private final boolean isExport;
 
     public NotifiableFluidTank(int capacity, MetaTileEntity entityToNotify, boolean isExport) {
         super(capacity);
-        this.entitiesToNotify.add(entityToNotify);
+        this.notifiableEntity = entityToNotify;
         this.isExport = isExport;
     }
 
     @Override
     protected void onContentsChanged() {
         super.onContentsChanged();
-        notifyMetaTileEntitiesOfChange(isExport);
+        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
     }
 
     @Override
-    public LinkedList<MetaTileEntity> getNotifiableMetaTileEntities() {
-        return this.entitiesToNotify;
+    public void setNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
+        this.notifiableEntity = metaTileEntity;
     }
 }

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

@@ -5,27 +5,25 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
-import java.util.LinkedList;
-
 public class NotifiableItemStackHandler extends ItemStackHandler implements IItemHandlerModifiable, INotifiableHandler {
 
-    LinkedList<MetaTileEntity> entitiesToNotify = new LinkedList<>();
+    MetaTileEntity notifiableEntity;
     private final boolean isExport;
 
     public NotifiableItemStackHandler(int slots, MetaTileEntity entityToNotify, boolean isExport) {
         super(slots);
-        this.entitiesToNotify.add(entityToNotify);
+        this.notifiableEntity = entityToNotify;
         this.isExport = isExport;
     }
 
     @Override
     public void onContentsChanged(int slot) {
         super.onContentsChanged(slot);
-        notifyMetaTileEntitiesOfChange(isExport);
+        notifyMetaTileEntityOfChange(notifiableEntity, isExport);
     }
 
     @Override
-    public LinkedList<MetaTileEntity> getNotifiableMetaTileEntities() {
-        return this.entitiesToNotify;
+    public void setNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
+        this.notifiableEntity = metaTileEntity;
     }
 }

src/main/java/gregtech/api/metatileentity/multiblock/IMultiblockPart.java

@@ -10,7 +10,7 @@ public interface IMultiblockPart {
 
     void removeFromMultiBlock(MultiblockControllerBase controllerBase);
 
-    default void addEntityToDirtyableHandlers(MetaTileEntity metaTileEntity) {
+    default void setupNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
 
     }
 }

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java

@@ -172,7 +172,7 @@ protected void checkStructurePattern() {
             }
             if (checkStructureComponents(parts, abilities)) {
                 parts.forEach(part -> part.addToMultiBlock(this));
-                parts.forEach(part -> part.addEntityToDirtyableHandlers(this));
+                parts.forEach(part -> part.setupNotifiableMetaTileEntity(this));
                 this.multiblockParts.addAll(parts);
                 this.multiblockAbilities.putAll(abilities);
                 this.structureFormed = true;

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

@@ -109,15 +109,15 @@ protected void initializeInventory() {
     }
 
     @Override
-    public void addEntityToDirtyableHandlers(MetaTileEntity metaTileEntity) {
+    public void setupNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
         NotifiableFluidTank handler = null;
         if (isExportHatch && getExportFluids().getFluidTanks().get(0) instanceof NotifiableFluidTank)
             handler = (NotifiableFluidTank) getExportFluids().getFluidTanks().get(0);
         else if (!isExportHatch && getImportFluids().getFluidTanks().get(0) instanceof NotifiableFluidTank)
             handler = (NotifiableFluidTank) getImportFluids().getFluidTanks().get(0);
         if (handler != null) {
-            handler.addNotifiableMetaTileEntity(metaTileEntity);
-            handler.notifyMetaTileEntitiesOfChange(isExportHatch);
+            handler.setNotifiableMetaTileEntity(metaTileEntity);
+            handler.notifyMetaTileEntityOfChange(this, isExportHatch);
         }
     }
 

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

@@ -88,15 +88,15 @@ public void registerAbilities(List<IItemHandlerModifiable> abilityList) {
     }
 
     @Override
-    public void addEntityToDirtyableHandlers(MetaTileEntity metaTileEntity) {
+    public void setupNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
         NotifiableItemStackHandler handler = null;
         if (isExportHatch && getExportItems() instanceof NotifiableItemStackHandler)
             handler = (NotifiableItemStackHandler) getExportItems();
         else if (!isExportHatch && getImportItems() instanceof NotifiableItemStackHandler)
             handler = (NotifiableItemStackHandler) getImportItems();
         if (handler != null) {
-            handler.addNotifiableMetaTileEntity(metaTileEntity);
-            handler.notifyMetaTileEntitiesOfChange(isExportHatch);
+            handler.setNotifiableMetaTileEntity(metaTileEntity);
+            handler.notifyMetaTileEntityOfChange(this, isExportHatch);
         }
     }