Merge pull request #560 from YannickMG/steam-gui-cleanup

No auto-output rendering for steam basic machines

13 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
index a27ee175ef..bd28bb11e9 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import java.util.ArrayList;
@@ -23,6 +24,8 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
     public final byte
             mProgressBarDirection,
             mProgressBarAmount;
+    public final boolean
+        mRenderAutoOutputSlots;
 
     public GT_GUIContainer_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile, String aNEI) {
         this(aInventoryPlayer, aTileEntity, aName, aTextureFile, aNEI, (byte) 0, (byte) 1);
@@ -34,12 +37,15 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
         mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount);
         mName = aName;
         mNEI = aNEI;
+        mRenderAutoOutputSlots = !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_BasicMachine_Bronze);
     }
 
     @Override
     public void drawScreen(int par1, int par2, float par3) {
         super.drawScreen(par1, par2, par3);
-        drawTooltip(par1, par2);
+        if (mRenderAutoOutputSlots){
+            drawTooltip(par1, par2);
+        }
     }
 
     @Override
@@ -72,10 +78,12 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
         int y = (height - ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
         if (mContainer != null) {
-            if (((GT_Container_BasicMachine) mContainer).mFluidTransfer)
-                drawTexturedModalRect(x + 7, y + 62, 176, 18, 18, 18);
-            if (((GT_Container_BasicMachine) mContainer).mItemTransfer)
-                drawTexturedModalRect(x + 25, y + 62, 176, 36, 18, 18);
+            if (mRenderAutoOutputSlots){
+                if (((GT_Container_BasicMachine) mContainer).mFluidTransfer)
+                    drawTexturedModalRect(x + 7, y + 62, 176, 18, 18, 18);
+                if (((GT_Container_BasicMachine) mContainer).mItemTransfer)
+                    drawTexturedModalRect(x + 25, y + 62, 176, 36, 18, 18);
+            }
             if (((GT_Container_BasicMachine) mContainer).mStuttering)
                 drawTexturedModalRect(x + 79, y + 44, 176, 54, 18, 18);
 
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png
index 54e112e67b..7d8bc973b8 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png
index d34569c5f3..dd44d80d76 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png
index decb60232f..4dae2b1794 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png
index 6bbe2eb904..6f9f50584f 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png
index dc9bbc559d..6509aad78d 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png
index 38af0ee224..7d7d3ea74a 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png
index 862c785606..a7aad64078 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png
index cca9978663..8d1815f389 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png
index 700944727f..9bd354a0b3 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png
index 0250f22b31..da52514474 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png
index f379f8c000..30e2d2a09b 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png
index 141879d5b6..c313c26bc5 100644
--- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png