From 3d51632577d3e0cd6e898201699217e72d152ee4 Mon Sep 17 00:00:00 2001
From: Pelotrio <45769595+Pelotrio@users.noreply.github.com>
Date: Sat, 28 Oct 2023 14:49:05 +0200
Subject: Address requested changes

---
 .../tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java | 3 ++-
 .../tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/common')

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
index 9a48d9ee64..01a9892f9e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
@@ -177,7 +177,8 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
                 gridProxy = new AENetworkProxy(
                     (IGridProxyable) getBaseMetaTileEntity(),
                     "proxy",
-                    ItemList.Hatch_Output_Bus_ME.get(1),
+                    autoPullAvailable ? ItemList.Hatch_Input_Bus_ME_Advanced.get(1)
+                        : ItemList.Hatch_Input_Bus_ME.get(1),
                     true);
                 gridProxy.setFlags(GridFlags.REQUIRE_CHANNEL);
                 updateValidGridProxySides();
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
index 404548282c..4a4e9c83c9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
@@ -518,9 +518,12 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
 
         NBTTagCompound nbt = dataStick.stackTagCompound;
 
-        setAutoPullFluidList(nbt.getBoolean("autoPull"));
-        minAutoPullAmount = nbt.getInteger("minAmount");
+        if (autoPullAvailable) {
+            setAutoPullFluidList(nbt.getBoolean("autoPull"));
+            minAutoPullAmount = nbt.getInteger("minAmount");
+        }
         additionalConnection = nbt.getBoolean("additionalConnection");
+
         if (!autoPullFluidList) {
             NBTTagList stockingFluids = nbt.getTagList("fluidsToStock", 10);
             for (int i = 0; i < stockingFluids.tagCount(); i++) {
-- 
cgit