diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-09-12 23:06:55 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-09-12 23:06:55 +0200 |
| commit | a4a0a7c2cc3c299969c62e509cc3c366a90214f3 (patch) | |
| tree | 2266e68d17df268eb1e73513184169fd613947af /src/main/java/gregtech/api/gui | |
| parent | ffc256ab87f905fa21bdb7102212cafa54c9f6bd (diff) | |
| download | GT5-Unofficial-a4a0a7c2cc3c299969c62e509cc3c366a90214f3.tar.gz GT5-Unofficial-a4a0a7c2cc3c299969c62e509cc3c366a90214f3.tar.bz2 GT5-Unofficial-a4a0a7c2cc3c299969c62e509cc3c366a90214f3.zip | |
cherry pick
11213d18d7345ee29f2efce6c5d421a855bed056
fb163d1be0aa291508bb6513e34cacba3ca06b36
fb508132d91543d5e837dfa4fac09cf5e4b9e7a8
d682ca0d36e3824b1bf73cc800f58c4126bcf104
0f2db4f76a88c26ca08b2da444b264444ce01316
50229e4506687d184c93ed702cdeeecea65e326a
f5195f822d9951015c4ef6599e5b4f6544ec0714
fbdb6ceecf60183ab382f043b78b61941157eccf
55af1972b86a82bf6038342aa1a3bf9013d0f164
c0d9d5a268da4b58385ee95e27408e06829c74b8
416890142c0fa62617fc6e4537826689635e9eb3
d532cb67f7bc68243e3d2dc2a12a466ed9c9e2d9
d1671eaf33b3b4223da174e115f35b9bc1f19c5a
4d90afad87375e3f1013a493f4b3b5d4e92bf521
3c397d61697c13f0467e0cb67fb127fff8401f71
64957ccd0f51ef283cc561d52a5439c3752c4e71
b7e0863207253ee758742a22c607c3ccc37af6d3
ae5a1e117d47876de9d2d2e8ea581e15686c5e1a
a0eb30d03f8fc311598f628ad45b5365c7391917
505a9c263e88e5519bade6a3167f829e41e13e64
9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2
Drillers upgrade #1163
https://github.com/Blood-Asp/GT5-Unofficial/pull/1163
Diffstat (limited to 'src/main/java/gregtech/api/gui')
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java index 5a7c4873ec..62e6f8cea1 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java @@ -1,14 +1,18 @@ package gregtech.api.gui; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; + import static gregtech.api.enums.GT_Values.RES_PATH_GUI; + + import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + import gregtech.api.util.GT_LanguageManager; + import gregtech.api.util.GT_ModHandler; + import gregtech.api.util.GT_Utility; + import gregtech.common.items.GT_MetaGenerated_Tool_01; + import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DrillerBase; + import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; + import net.minecraft.entity.player.InventoryPlayer; + import net.minecraft.item.ItemStack; + -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -54,13 +58,12 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin } else { fontRendererObj.drawString(trans("142","Running perfectly."), 10, 16, 16448255); } - int id = mContainer.mTileEntity.getMetaTileID(); - if (id == 1157 || id == 1158 || id == 1177 || id == 1178 || id == 1179) { + if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DrillerBase) { ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) { fontRendererObj.drawString(trans("143", "Missing Mining Pipe"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); } - } else if (id == 1131 || id == 1151 || id == 1152 || id == 1153) { + } else if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine) { ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) { fontRendererObj.drawString(trans("144", "Missing Turbine Rotor"), 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); |