diff options
author | Pelotrio <45769595+Pelotrio@users.noreply.github.com> | 2023-10-28 14:49:05 +0200 |
---|---|---|
committer | Martin Robertz <dream-master@gmx.net> | 2023-10-28 17:48:54 +0200 |
commit | 3d51632577d3e0cd6e898201699217e72d152ee4 (patch) | |
tree | a90de8540b45e39f947a4942b002710405cf60ca | |
parent | 9b7bdbc1b73ccde3e51ddbff213b7a7cd51c2ffb (diff) | |
download | GT5-Unofficial-3d51632577d3e0cd6e898201699217e72d152ee4.tar.gz GT5-Unofficial-3d51632577d3e0cd6e898201699217e72d152ee4.tar.bz2 GT5-Unofficial-3d51632577d3e0cd6e898201699217e72d152ee4.zip |
Address requested changes
2 files changed, 7 insertions, 3 deletions
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++) { |