diff options
| author | Pelotrio <45769595+Pelotrio@users.noreply.github.com> | 2023-10-28 01:26:48 +0200 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2023-10-28 17:48:54 +0200 |
| commit | 9b7bdbc1b73ccde3e51ddbff213b7a7cd51c2ffb (patch) | |
| tree | bea817618d0eb0c049e4781457ffc1a45b4af586 | |
| parent | 2bb3b9425edc20ad93b221a907021256a4fdfcd5 (diff) | |
| download | GT5-Unofficial-9b7bdbc1b73ccde3e51ddbff213b7a7cd51c2ffb.tar.gz GT5-Unofficial-9b7bdbc1b73ccde3e51ddbff213b7a7cd51c2ffb.tar.bz2 GT5-Unofficial-9b7bdbc1b73ccde3e51ddbff213b7a7cd51c2ffb.zip | |
Rename the hatches to make it consistent with `MetaTileEntityIDs`
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 4250ada9c9..ed2cad0ce1 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2000,10 +2000,10 @@ public enum ItemList implements IItemContainer { VOLUMETRIC_FLASK, - Hatch_Input_Bus_ME_Basic, Hatch_Input_Bus_ME, - Hatch_Input_ME_Basic, + Hatch_Input_Bus_ME_Advanced, Hatch_Input_ME, + Hatch_Input_ME_Advanced, Hatch_CraftingInput_Bus_ME, Hatch_CraftingInput_Bus_ME_ItemOnly, Hatch_CraftingInput_Bus_Slave, 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 4f5a484da8..404548282c 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 @@ -304,7 +304,7 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In gridProxy = new AENetworkProxy( (IGridProxyable) getBaseMetaTileEntity(), "proxy", - ItemList.Hatch_Input_ME.get(1), + autoPullAvailable ? ItemList.Hatch_Input_ME_Advanced.get(1) : ItemList.Hatch_Input_ME.get(1), true); gridProxy.setFlags(GridFlags.REQUIRE_CHANNEL); updateValidGridProxySides(); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index fb5cafc259..d2c7c3e6a5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -2317,25 +2317,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Output_Bus_ME.set( new GT_MetaTileEntity_Hatch_OutputBus_ME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)") .getStackForm(1L)); - ItemList.Hatch_Input_Bus_ME_Basic.set( + ItemList.Hatch_Input_Bus_ME.set( new GT_MetaTileEntity_Hatch_InputBus_ME( INPUT_BUS_ME.ID, false, "hatch.input_bus.me.basic", "Stocking Input Bus (ME)").getStackForm(1L)); - ItemList.Hatch_Input_Bus_ME.set( + ItemList.Hatch_Input_Bus_ME_Advanced.set( new GT_MetaTileEntity_Hatch_InputBus_ME( INPUT_BUS_ME_ADVANCED.ID, true, "hatch.input_bus.me", "Advanced Stocking Input Bus (ME)").getStackForm(1L)); - ItemList.Hatch_Input_ME_Basic.set( + ItemList.Hatch_Input_ME.set( new GT_MetaTileEntity_Hatch_Input_ME( INPUT_HATCH_ME.ID, false, "hatch.input.me.basic", "Stocking Input Hatch (ME)").getStackForm(1L)); - ItemList.Hatch_Input_ME.set( + ItemList.Hatch_Input_ME_Advanced.set( new GT_MetaTileEntity_Hatch_Input_ME( INPUT_HATCH_ME_ADVANCED.ID, true, |