fix a few things

Zorbatron · Zorbatron · commit d86f5e1deaf2 · 2025-12-15T13:48:42.000-05:00
diff --git a/src/main/java/gregtech/api/capability/impl/ItemHandlerList.java b/src/main/java/gregtech/api/capability/impl/ItemHandlerList.java
@@ -20,6 +20,10 @@ public class ItemHandlerList implements IItemHandlerModifiable {
     private final Int2ObjectMap<IItemHandler> handlerBySlotIndex = new Int2ObjectOpenHashMap<>();
     private final Object2IntMap<IItemHandler> baseIndexOffset = new Object2IntArrayMap<>();
 
+    public ItemHandlerList(@NotNull IItemHandler @NotNull... handlers) {
+        this(Arrays.asList(handlers));
+    }
+
     public ItemHandlerList(@NotNull List<? extends @NotNull IItemHandler> itemHandlerList) {
         int currentSlotIndex = 0;
         for (IItemHandler itemHandler : itemHandlerList) {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockNotifiablePart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockNotifiablePart.java
@@ -8,6 +8,8 @@
 
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.IFluidTank;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,13 +28,14 @@ public MetaTileEntityMultiblockNotifiablePart(ResourceLocation metaTileEntityId,
 
     private @NotNull List<INotifiableHandler> getItemHandlers() {
         List<INotifiableHandler> notifiables = new ArrayList<>();
-        var mteHandler = isExportHatch ? getExportItems() : getImportItems();
+        IItemHandlerModifiable mteHandler = isExportHatch ? getExportItems() : getImportItems();
         if (mteHandler instanceof INotifiableHandler notifiable) {
             notifiables.add(notifiable);
         } else if (mteHandler instanceof ItemHandlerList list) {
-            for (var handler : list.getBackingHandlers()) {
-                if (handler instanceof INotifiableHandler notifiable)
+            for (IItemHandler handler : list.getBackingHandlers()) {
+                if (handler instanceof INotifiableHandler notifiable) {
                     notifiables.add(notifiable);
+                }
             }
         }
         if (getItemInventory() instanceof INotifiableHandler notifiable) {
@@ -54,7 +57,7 @@ public MetaTileEntityMultiblockNotifiablePart(ResourceLocation metaTileEntityId,
     private List<INotifiableHandler> getPartHandlers() {
         List<INotifiableHandler> handlerList = new ArrayList<>();
 
-        for (var notif : getItemHandlers()) {
+        for (INotifiableHandler notif : getItemHandlers()) {
             if (notif.size() > 0) {
                 handlerList.add(notif);
             }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostableChannelPart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostableChannelPart.java
@@ -17,7 +17,6 @@
 public abstract class MetaTileEntityAEHostableChannelPart<T extends IAEStack<T>> extends MetaTileEntityAEHostablePart {
 
     private final Class<? extends IStorageChannel<T>> storageChannel;
-    protected int refreshRate;
 
     public MetaTileEntityAEHostableChannelPart(ResourceLocation metaTileEntityId, int tier, boolean isExportHatch,
                                                Class<? extends IStorageChannel<T>> storageChannel) {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java
@@ -37,7 +37,7 @@ public abstract class MetaTileEntityAEHostablePart extends MetaTileEntityMultibl
     public static final String REFRESH_RATE_TAG = "RefreshRate";
 
     private AENetworkProxy aeProxy;
-    protected int refreshRate = ConfigHolder.compat.ae2.updateIntervals;
+    private int refreshRate = ConfigHolder.compat.ae2.updateIntervals;
     protected boolean isOnline;
     protected boolean allowsExtraConnections = false;
     protected boolean meStatusChanged = false;
@@ -120,7 +120,8 @@ public int getRefreshRate() {
     }
 
     protected void setRefreshRate(int newRefreshRate) {
-        if (this.refreshRate == newRefreshRate) return;
+        if (newRefreshRate == this.refreshRate) return;
+        if (newRefreshRate < 1) throw new IllegalArgumentException("Refresh rate of AE part cannot be below 1!");
 
         this.refreshRate = newRefreshRate;
         if (!getWorld().isRemote) {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBase.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBase.java
@@ -25,6 +25,7 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.Constants;
+import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.api.config.Actionable;
 import appeng.api.storage.IMEMonitor;
@@ -68,10 +69,14 @@ public MetaTileEntityMEInputBase(ResourceLocation metaTileEntityId, int tier, bo
 
     @Override
     protected void initializeInventory() {
-        super.initializeInventory();
         this.aeHandler = initializeAEHandler();
         this.circuitInventory = new GhostCircuitItemStackHandler(this);
-        this.importItems = circuitInventory;
+        super.initializeInventory();
+    }
+
+    @Override
+    protected IItemHandlerModifiable createImportItemHandler() {
+        return circuitInventory;
     }
 
     protected abstract @NotNull IExportOnlyAEStackList<AEStackType> initializeAEHandler();
@@ -81,7 +86,7 @@ protected void initializeInventory() {
     @Override
     public void update() {
         super.update();
-        if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % refreshRate == 0)) {
+        if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % getRefreshRate() == 0)) {
             operateOnME();
         }
     }
@@ -401,7 +406,7 @@ protected NBTTagCompound writeConfigToTag() {
         }
 
         tag.setByte("GhostCircuit", (byte) this.circuitInventory.getCircuitValue());
-        tag.setInteger(REFRESH_RATE_TAG, this.refreshRate);
+        tag.setInteger(REFRESH_RATE_TAG, getRefreshRate());
         return tag;
     }
 
@@ -438,7 +443,7 @@ protected void readConfigFromTag(NBTTagCompound tag) {
         }
 
         if (tag.hasKey(REFRESH_RATE_TAG)) {
-            this.refreshRate = tag.getInteger(REFRESH_RATE_TAG);
+            setRefreshRate(tag.getInteger(REFRESH_RATE_TAG));
         }
     }
 
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
@@ -1,14 +1,12 @@
 package gregtech.common.metatileentities.multi.multiblockpart.appeng;
 
-import gregtech.api.capability.INotifiableHandler;
 import gregtech.api.capability.impl.ItemHandlerList;
 import gregtech.api.capability.impl.NotifiableItemStackHandler;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 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.sync.appeng.AEItemSyncHandler;
 import gregtech.api.mui.sync.appeng.AESyncHandler;
@@ -27,7 +25,6 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import appeng.api.storage.channels.IItemStorageChannel;
@@ -48,7 +45,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
 
-import java.util.Arrays;
 import java.util.List;
 
 public class MetaTileEntityMEInputBus extends MetaTileEntityMEInputBase<IAEItemStack>
@@ -69,11 +65,14 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEnti
 
     @Override
     protected void initializeInventory() {
-        super.initializeInventory();
         this.extraSlotInventory = new NotifiableItemStackHandler(this, 1, this, false);
         this.extraSlotInventory.addNotifiableMetaTileEntity(this);
-        this.importItems = new ItemHandlerList(
-                Arrays.asList(getAEHandler(), this.circuitInventory, this.extraSlotInventory));
+        super.initializeInventory();
+    }
+
+    @Override
+    protected IItemHandlerModifiable createImportItemHandler() {
+        return new ItemHandlerList(getAEHandler(), circuitInventory, extraSlotInventory);
     }
 
     @Override
@@ -94,27 +93,6 @@ public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer)
         }
     }
 
-    @Override
-    public void addToMultiBlock(MultiblockControllerBase controllerBase) {
-        super.addToMultiBlock(controllerBase);
-        for (IItemHandler handler : ((ItemHandlerList) this.importItems).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 : ((ItemHandlerList) this.importItems).getBackingHandlers()) {
-            if (handler instanceof INotifiableHandler notifiable) {
-                notifiable.removeNotifiableMetaTileEntity(controllerBase);
-            }
-        }
-    }
-
     @Override
     protected @NotNull AESyncHandler<IAEItemStack> createAESyncHandler() {
         return new AEItemSyncHandler(getAEHandler(), this::markDirty, circuitInventory::setCircuitValue);
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputHatch.java
@@ -59,9 +59,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEnti
     }
 
     @Override
-    protected void initializeInventory() {
-        super.initializeInventory();
-        this.importFluids = new FluidTankList(false, getAEHandler().getInventory());
+    protected FluidTankList createImportFluidHandler() {
+        return new FluidTankList(false, getAEHandler().getInventory());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEOutputBase.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEOutputBase.java
@@ -68,7 +68,7 @@ protected void initializeInventory() {
     @Override
     public void update() {
         super.update();
-        if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % refreshRate == 0)) {
+        if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % getRefreshRate() == 0)) {
             if (this.internalBuffer.isEmpty()) return;
 
             IMEMonitor<AEStackType> monitor = getMonitor();
@@ -250,7 +250,7 @@ public void detectAndSendChanges(boolean init) {
                 AEStackType newStack = internalBuffer.get(index);
                 AEStackType cachedStack = cache.get(index);
 
-                if (init || !newStack.equals(cachedStack)) {
+                if (init || !newStack.equals(cachedStack) || newStack.getStackSize() != cachedStack.getStackSize()) {
                     AEStackType copy = newStack.copy();
                     changedIndexes.add(index);
                     cache.set(index, copy);

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import net.minecraft.world.World;`
`26`	`26`	`import net.minecraftforge.common.capabilities.Capability;`
`27`	`27`	`import net.minecraftforge.common.util.Constants;`
	`28`	`+import net.minecraftforge.items.IItemHandlerModifiable;`
`28`	`29`
`29`	`30`	`import appeng.api.config.Actionable;`
`30`	`31`	`import appeng.api.storage.IMEMonitor;`
`@@ -68,10 +69,14 @@ public MetaTileEntityMEInputBase(ResourceLocation metaTileEntityId, int tier, bo`
`68`	`69`
`69`	`70`	`@Override`
`70`	`71`	`protected void initializeInventory() {`
`71`		`- super.initializeInventory();`
`72`	`72`	`this.aeHandler = initializeAEHandler();`
`73`	`73`	`this.circuitInventory = new GhostCircuitItemStackHandler(this);`
`74`		`- this.importItems = circuitInventory;`
	`74`	`+ super.initializeInventory();`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ @Override`
	`78`	`+ protected IItemHandlerModifiable createImportItemHandler() {`
	`79`	`+ return circuitInventory;`
`75`	`80`	`}`
`76`	`81`
`77`	`82`	`protected abstract @NotNull IExportOnlyAEStackList<AEStackType> initializeAEHandler();`
`@@ -81,7 +86,7 @@ protected void initializeInventory() {`
`81`	`86`	`@Override`
`82`	`87`	`public void update() {`
`83`	`88`	`super.update();`
`84`		`- if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % refreshRate == 0)) {`
	`89`	`+ if (!getWorld().isRemote && workingEnabled && isOnline && (getOffsetTimer() % getRefreshRate() == 0)) {`
`85`	`90`	`operateOnME();`
`86`	`91`	`}`
`87`	`92`	`}`
`@@ -401,7 +406,7 @@ protected NBTTagCompound writeConfigToTag() {`
`401`	`406`	`}`
`402`	`407`
`403`	`408`	`tag.setByte("GhostCircuit", (byte) this.circuitInventory.getCircuitValue());`
`404`		`- tag.setInteger(REFRESH_RATE_TAG, this.refreshRate);`
	`409`	`+ tag.setInteger(REFRESH_RATE_TAG, getRefreshRate());`
`405`	`410`	`return tag;`
`406`	`411`	`}`
`407`	`412`
`@@ -438,7 +443,7 @@ protected void readConfigFromTag(NBTTagCompound tag) {`
`438`	`443`	`}`
`439`	`444`
`440`	`445`	`if (tag.hasKey(REFRESH_RATE_TAG)) {`
`441`		`- this.refreshRate = tag.getInteger(REFRESH_RATE_TAG);`
	`446`	`+ setRefreshRate(tag.getInteger(REFRESH_RATE_TAG));`
`442`	`447`	`}`
`443`	`448`	`}`
`444`	`449`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,8 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEnti`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- protected void initializeInventory() {`
`63`		`- super.initializeInventory();`
`64`		`- this.importFluids = new FluidTankList(false, getAEHandler().getInventory());`
	`62`	`+ protected FluidTankList createImportFluidHandler() {`
	`63`	`+ return new FluidTankList(false, getAEHandler().getInventory());`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`@Override`