diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-06-02 22:18:29 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-06-02 22:18:29 +0500 |
| commit | c5402ee38998cc086ceb36fbce6c54aba6d9d79c (patch) | |
| tree | b4703ef0db0138b0f8e0e35f136e76b90444dfee /src/main/java/gregtech/api | |
| parent | 067f4491a812497f6bd013690cf9d8b13f8fc4b3 (diff) | |
| download | GT5-Unofficial-c5402ee38998cc086ceb36fbce6c54aba6d9d79c.tar.gz GT5-Unofficial-c5402ee38998cc086ceb36fbce6c54aba6d9d79c.tar.bz2 GT5-Unofficial-c5402ee38998cc086ceb36fbce6c54aba6d9d79c.zip | |
Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers
change build.gradle for debugging in IDEA
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 5 |
2 files changed, 12 insertions, 17 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 189e5d25f1..55c1ace559 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java @@ -53,18 +53,18 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin } else { fontRendererObj.drawString("Running perfectly.", 10, 16, 16448255); } - int id = mContainer.mTileEntity.getMetaTileID(); - if(id == 1157 || id == 1158){ - ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); - if(tItem==null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))){ - fontRendererObj.drawString("Missing Mining Pipe", 10,((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); - } - }else if(id == 1131 || id == 1151 || id == 1152 || id == 1153){ - 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("Missing Turbine Rotor", 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); - } - } + int id = mContainer.mTileEntity.getMetaTileID(); + if (id == 1157 || id == 1158 || id == 1177 || id == 1178 || id == 1179) { + ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); + if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) { + fontRendererObj.drawString("Missing Mining Pipe", 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); + } + } else if (id == 1131 || id == 1151 || id == 1152 || id == 1153) { + 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("Missing Turbine Rotor", 10, ((GT_Container_MultiMachine) mContainer).mActive == 0 ? 40 : 24, 16448255); + } + } } } } diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 642fc5d9a4..076442e4f0 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1971,11 +1971,6 @@ public class GT_Utility { return result; } - @SuppressWarnings("unchecked") - public static <T> T[] listToArray(List<T> list) { - return (T[]) list.toArray(); - } - public static class ItemNBT { public static void setNBT(ItemStack aStack, NBTTagCompound aNBT) { if (aNBT == null) { |