Fix stocking hatches duping like crazy (Agh I want to redo how ARL sees and takes items from hatches so badly!1!1!)

Author: Zorbatron

src/main/java/gregtech/api/mui/widget/appeng/AEConfigSlot.java

@@ -4,8 +4,6 @@
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.sync.appeng.AESyncHandler;
 
-import net.minecraft.client.resources.I18n;
-
 import appeng.api.storage.data.IAEStack;
 import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.api.drawable.IDrawable;

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEInputBase.java

@@ -5,7 +5,6 @@
 import gregtech.api.capability.IControllable;
 import gregtech.api.capability.IGhostSlotConfigurable;
 import gregtech.api.capability.impl.GhostCircuitItemStackHandler;
-import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.mui.sync.appeng.AEFluidSyncHandler;

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEStockingBus.java

@@ -411,37 +411,38 @@ public ExportOnlyAEStockingItemSlot(MetaTileEntityMEStockingBus holder) {
 
         @Override
         public @NotNull ItemStack extractItem(int slot, int amount, boolean simulate) {
-            if (slot == 0 && this.stock != null) {
-                if (this.config != null) {
-                    // Extract the items from the real net to either validate (simulate)
-                    // or extract (modulate) when this is called
-                    IMEMonitor<IAEItemStack> monitor = holder.getMonitor();
-                    if (monitor == null) return ItemStack.EMPTY;
-
-                    Actionable action = simulate ? Actionable.SIMULATE : Actionable.MODULATE;
-                    IAEItemStack request;
-                    if (this.config instanceof WrappedItemStack wis) {
-                        request = wis.getAEStack();
-                    } else {
-                        request = this.config.copy();
+            if (slot != 0 || this.stock == null || this.stock.getStackSize() <= 0) return ItemStack.EMPTY;
+
+            if (this.config != null) {
+                // Extract the items from the real net to either validate (simulate)
+                // or extract (modulate) when this is called
+                IMEMonitor<IAEItemStack> monitor = holder.getMonitor();
+                if (monitor == null) return ItemStack.EMPTY;
+
+                Actionable action = simulate ? Actionable.SIMULATE : Actionable.MODULATE;
+                IAEItemStack request;
+                if (this.config instanceof WrappedItemStack wis) {
+                    request = wis.getAEStack();
+                } else {
+                    request = this.config.copy();
+                }
+                request.setStackSize(amount);
+
+                IAEItemStack result = monitor.extractItems(request, action, holder.getActionSource());
+                if (result != null) {
+                    int extracted = (int) Math.min(result.getStackSize(), amount);
+                    this.stock.decStackSize(extracted); // may as well update the display here
+                    if (this.trigger != null) {
+                        this.trigger.accept(0);
                     }
-                    request.setStackSize(amount);
-
-                    IAEItemStack result = monitor.extractItems(request, action, holder.getActionSource());
-                    if (result != null) {
-                        int extracted = (int) Math.min(result.getStackSize(), amount);
-                        this.stock.decStackSize(extracted); // may as well update the display here
-                        if (this.trigger != null) {
-                            this.trigger.accept(0);
-                        }
-                        if (extracted != 0) {
-                            ItemStack resultStack = this.config.createItemStack();
-                            resultStack.setCount(extracted);
-                            return resultStack;
-                        }
+                    if (extracted != 0) {
+                        ItemStack resultStack = this.config.createItemStack();
+                        resultStack.setCount(extracted);
+                        return resultStack;
                     }
                 }
             }
+
             return ItemStack.EMPTY;
         }
     }

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEStockingHatch.java

@@ -414,9 +414,10 @@ protected MetaTileEntityMEStockingHatch getHolder() {
 
         @Override
         public @Nullable FluidStack drain(int maxDrain, boolean doDrain) {
-            if (this.stock == null) {
+            if (this.stock == null || this.stock.getStackSize() <= 0) {
                 return null;
             }
+
             if (this.config != null) {
                 IMEMonitor<IAEFluidStack> monitor = getHolder().getMonitor();
                 if (monitor == null) return null;

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/slot/ExportOnlyAEFluidSlot.java

@@ -105,6 +105,7 @@ public FluidStack getFluid() {
         if (this.stock instanceof WrappedFluidStack wrappedFluidStack) {
             return wrappedFluidStack.getDefinition();
         }
+
         return null;
     }
 

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/stack/WrappedFluidStack.java

@@ -217,6 +217,7 @@ public Fluid getFluid() {
 
     @Override
     public @NotNull FluidStack getDefinition() {
+        delegate.amount = (int) stackSize;
         return delegate;
     }
 
@@ -247,6 +248,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return String.format("Wrapped: %s", delegate);
+        return String.format("Wrapped: %s, Stack Size: %d", delegate, stackSize);
     }
 }

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/stack/WrappedItemStack.java

@@ -250,6 +250,7 @@ public boolean isSameType(ItemStack itemStack) {
 
     @Override
     public @NotNull ItemStack getDefinition() {
+        delegate.setCount((int) stackSize);
         return this.delegate;
     }