Refactor some notifiable stuff to try and unify it a little bit

Zorbatron · Zorbatron · commit a5d6054c8ef1 · 2025-04-11T23:09:22.000-04:00
diff --git a/src/main/java/gregtech/api/capability/DualHandler.java b/src/main/java/gregtech/api/capability/DualHandler.java
@@ -12,12 +12,15 @@
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
+import com.google.common.collect.ImmutableList;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
-public class DualHandler implements IItemHandlerModifiable, IMultipleTankHandler, INotifiableHandler {
+public class DualHandler implements IItemHandlerModifiable, IMultipleTankHandler, INotifiableHandler,
+                         IMultipleNotifiableHandler {
 
     @NotNull
     private static final ItemStackHashStrategy strategy = ItemStackHashStrategy.comparingAll();
@@ -203,6 +206,25 @@ public void removeNotifiableMetaTileEntity(MetaTileEntity metaTileEntity) {
         return fluidDelegate;
     }
 
+    @Override
+    public @NotNull Collection<INotifiableHandler> getBackingNotifiers() {
+        ImmutableList.Builder<INotifiableHandler> handlerList = ImmutableList.builder();
+
+        if (itemDelegate instanceof IMultipleNotifiableHandler multipleNotifiableHandler) {
+            handlerList.addAll(multipleNotifiableHandler.getBackingNotifiers());
+        } else if (itemDelegate instanceof INotifiableHandler notifiableHandler) {
+            handlerList.add(notifiableHandler);
+        }
+
+        for (var tank : fluidDelegate) {
+            if (tank instanceof INotifiableHandler notifiableHandler) {
+                handlerList.add(notifiableHandler);
+            }
+        }
+
+        return handlerList.build();
+    }
+
     public static class DualEntry implements ITankEntry, INotifiableHandler {
 
         @NotNull
diff --git a/src/main/java/gregtech/api/capability/IMultipleNotifiableHandler.java b/src/main/java/gregtech/api/capability/IMultipleNotifiableHandler.java
@@ -0,0 +1,11 @@
+package gregtech.api.capability;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+public interface IMultipleNotifiableHandler {
+
+    @NotNull
+    Collection<INotifiableHandler> getBackingNotifiers();
+}
diff --git a/src/main/java/gregtech/api/capability/impl/ItemHandlerList.java b/src/main/java/gregtech/api/capability/impl/ItemHandlerList.java
@@ -1,9 +1,13 @@
 package gregtech.api.capability.impl;
 
+import gregtech.api.capability.IMultipleNotifiableHandler;
+import gregtech.api.capability.INotifiableHandler;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
+import com.google.common.collect.ImmutableList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
@@ -15,7 +19,7 @@
 /**
  * Efficiently delegates calls into multiple item handlers
  */
-public class ItemHandlerList implements IItemHandlerModifiable {
+public class ItemHandlerList implements IItemHandlerModifiable, IMultipleNotifiableHandler {
 
     private final Int2ObjectMap<IItemHandler> handlerBySlotIndex = new Int2ObjectOpenHashMap<>();
     private final Object2IntMap<IItemHandler> baseIndexOffset = new Object2IntArrayMap<>();
@@ -93,6 +97,19 @@ public Collection<IItemHandler> getBackingHandlers() {
         return Collections.unmodifiableCollection(baseIndexOffset.keySet());
     }
 
+    @Override
+    public @NotNull Collection<INotifiableHandler> getBackingNotifiers() {
+        ImmutableList.Builder<INotifiableHandler> notifiableHandlers = ImmutableList.builder();
+
+        for (var handler : getBackingHandlers()) {
+            if (handler instanceof INotifiableHandler notifiableHandler) {
+                notifiableHandlers.add(notifiableHandler);
+            }
+        }
+
+        return notifiableHandlers.build();
+    }
+
     private boolean invalidSlot(int slot) {
         return slot < 0 && slot >= this.getSlots();
     }
diff --git a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java
@@ -4,6 +4,7 @@
 import gregtech.api.capability.DualHandler;
 import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.capability.IMultiblockController;
+import gregtech.api.capability.IMultipleNotifiableHandler;
 import gregtech.api.capability.IMultipleRecipeMaps;
 import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
@@ -146,9 +147,9 @@ protected boolean canWorkWithInputs() {
                         Iterator<IItemHandlerModifiable> invalidatedIter = invalidatedInputList.iterator();
                         while (invalidatedIter.hasNext()) {
                             IItemHandler invalidatedHandler = invalidatedIter.next();
-                            if (invalidatedHandler instanceof ItemHandlerList) {
-                                for (IItemHandler ih : ((ItemHandlerList) invalidatedHandler).getBackingHandlers()) {
-                                    if (ih == bus) {
+                            if (invalidatedHandler instanceof IMultipleNotifiableHandler multipleNotifiableHandler) {
+                                for (var notifiableHandler : multipleNotifiableHandler.getBackingNotifiers()) {
+                                    if (notifiableHandler == bus) {
                                         canWork = true;
                                         invalidatedIter.remove();
                                         break;
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java
@@ -16,7 +16,6 @@
 import gregtech.api.metatileentity.multiblock.AbilityInstances;
 import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
-import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.widget.GhostCircuitSlotWidget;
@@ -359,20 +358,6 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
                 .bindPlayerInventory();
     }
 
-    @Override
-    public void addToMultiBlock(MultiblockControllerBase controllerBase) {
-        super.addToMultiBlock(controllerBase);
-        if (hasGhostCircuitInventory())
-            this.circuitInventory.addNotifiableMetaTileEntity(controllerBase);
-    }
-
-    @Override
-    public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
-        super.removeFromMultiBlock(controllerBase);
-        if (hasGhostCircuitInventory())
-            this.circuitInventory.removeNotifiableMetaTileEntity(controllerBase);
-    }
-
     @Override
     public void addInformation(ItemStack stack, @Nullable World player, @NotNull List<String> tooltip,
                                boolean advanced) {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityItemBus.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityItemBus.java
@@ -11,7 +11,6 @@
 import gregtech.api.metatileentity.multiblock.AbilityInstances;
 import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
-import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.widget.GhostCircuitSlotWidget;
@@ -33,7 +32,6 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import codechicken.lib.raytracer.CuboidRayTraceResult;
@@ -100,31 +98,6 @@ public IItemHandlerModifiable getImportItems() {
         return this.actualImportItems == null ? super.getImportItems() : this.actualImportItems;
     }
 
-    @Override
-    public void addToMultiBlock(MultiblockControllerBase controllerBase) {
-        super.addToMultiBlock(controllerBase);
-        if (hasGhostCircuitInventory() && this.actualImportItems instanceof ItemHandlerList) {
-            for (IItemHandler handler : ((ItemHandlerList) this.actualImportItems).getBackingHandlers()) {
-                if (handler instanceof INotifiableHandler notifiable) {
-                    notifiable.addNotifiableMetaTileEntity(controllerBase);
-                    notifiable.addToNotifiedList(this, handler, isExportHatch);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
-        super.removeFromMultiBlock(controllerBase);
-        if (hasGhostCircuitInventory() && this.actualImportItems instanceof ItemHandlerList) {
-            for (IItemHandler handler : ((ItemHandlerList) this.actualImportItems).getBackingHandlers()) {
-                if (handler instanceof INotifiableHandler notifiable) {
-                    notifiable.removeNotifiableMetaTileEntity(controllerBase);
-                }
-            }
-        }
-    }
-
     @Override
     public void update() {
         super.update();
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockNotifiablePart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockNotifiablePart.java
@@ -1,9 +1,13 @@
 package gregtech.common.metatileentities.multi.multiblockpart;
 
+import gregtech.api.capability.IMultipleNotifiableHandler;
 import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.capability.INotifiableHandler;
 import gregtech.api.capability.impl.FluidTankList;
 import gregtech.api.capability.impl.ItemHandlerList;
+import gregtech.api.metatileentity.multiblock.AbilityInstances;
+import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
+import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 
 import net.minecraft.util.ResourceLocation;
@@ -49,28 +53,50 @@ private FluidTankList getFluidHandlers() {
     }
 
     private List<INotifiableHandler> getPartHandlers() {
-        List<INotifiableHandler> handlerList = new ArrayList<>();
+        List<INotifiableHandler> notifiableHandlers = new ArrayList<>();
 
-        for (var notif : getItemHandlers()) {
-            if (notif.size() > 0) {
-                handlerList.add(notif);
+        if (this instanceof IMultiblockAbilityPart<?>abilityPart) {
+            List<MultiblockAbility<?>> abilities = abilityPart.getAbilities();
+            for (var ability : abilities) {
+                AbilityInstances instances = new AbilityInstances(ability);
+                abilityPart.registerAbilities(instances);
+                for (var handler : instances) {
+                    if (handler instanceof IMultipleNotifiableHandler multipleNotifiableHandler) {
+                        notifiableHandlers.addAll(multipleNotifiableHandler.getBackingNotifiers());
+                    } else if (handler instanceof IMultipleTankHandler multipleTankHandler) {
+                        for (var tank : multipleTankHandler.getFluidTanks()) {
+                            if (tank instanceof INotifiableHandler notifiableTank) {
+                                notifiableHandlers.add(notifiableTank);
+                            }
+                        }
+                    } else if (handler instanceof INotifiableHandler notifiableHandler) {
+                        notifiableHandlers.add(notifiableHandler);
+                    }
+                }
+            }
+        } else {
+            for (var notif : getItemHandlers()) {
+                if (notif.size() > 0) {
+                    notifiableHandlers.add(notif);
+                }
             }
-        }
 
-        if (this.fluidInventory.getTankProperties().length > 0) {
-            FluidTankList fluidTankList = getFluidHandlers();
-            if (fluidTankList != null) {
-                for (IFluidTank fluidTank : fluidTankList) {
-                    if (fluidTank instanceof IMultipleTankHandler.ITankEntry entry) {
-                        fluidTank = entry.getDelegate();
-                    }
-                    if (fluidTank instanceof INotifiableHandler) {
-                        handlerList.add((INotifiableHandler) fluidTank);
+            if (this.fluidInventory.getTankProperties().length > 0) {
+                FluidTankList fluidTankList = getFluidHandlers();
+                if (fluidTankList != null) {
+                    for (IFluidTank fluidTank : fluidTankList) {
+                        if (fluidTank instanceof IMultipleTankHandler.ITankEntry entry) {
+                            fluidTank = entry.getDelegate();
+                        }
+                        if (fluidTank instanceof INotifiableHandler) {
+                            notifiableHandlers.add((INotifiableHandler) fluidTank);
+                        }
                     }
                 }
             }
         }
-        return handlerList;
+
+        return notifiableHandlers;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBus.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBus.java
@@ -5,7 +5,6 @@
 import gregtech.api.capability.GregtechTileCapabilities;
 import gregtech.api.capability.IDataStickIntractable;
 import gregtech.api.capability.IGhostSlotConfigurable;
-import gregtech.api.capability.INotifiableHandler;
 import gregtech.api.capability.impl.GhostCircuitItemStackHandler;
 import gregtech.api.capability.impl.ItemHandlerList;
 import gregtech.api.capability.impl.NotifiableItemStackHandler;
@@ -18,7 +17,6 @@
 import gregtech.api.metatileentity.multiblock.AbilityInstances;
 import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
-import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.util.GTUtility;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.gui.widget.appeng.AEItemConfigWidget;
@@ -38,7 +36,6 @@
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.api.config.Actionable;
@@ -161,27 +158,6 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEnti
         return new MetaTileEntityMEInputBus(metaTileEntityId);
     }
 
-    @Override
-    public void addToMultiBlock(MultiblockControllerBase controllerBase) {
-        super.addToMultiBlock(controllerBase);
-        for (IItemHandler handler : this.actualImportItems.getBackingHandlers()) {
-            if (handler instanceof INotifiableHandler notifiable) {
-                notifiable.addNotifiableMetaTileEntity(controllerBase);
-                notifiable.addToNotifiedList(this, handler, false);
-            }
-        }
-    }
-
-    @Override
-    public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
-        super.removeFromMultiBlock(controllerBase);
-        for (IItemHandler handler : this.actualImportItems.getBackingHandlers()) {
-            if (handler instanceof INotifiableHandler notifiable) {
-                notifiable.removeNotifiableMetaTileEntity(controllerBase);
-            }
-        }
-    }
-
     @Override
     protected final ModularUI createUI(EntityPlayer player) {
         ModularUI.Builder builder = createUITemplate(player);
