aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYannick Marcotte-Gourde <yannickmg@gmail.com>2021-06-12 11:19:19 -0400
committerYannick Marcotte-Gourde <yannickmg@gmail.come>2021-06-13 11:10:31 -0400
commitad450c8a3f2234bf392b8bb175d1eace8ad2ca20 (patch)
treedd441b1ebbeefd103b47b647afbb58b32e2d7894 /src
parent8fc187ecbb6d7a5913c1f8d00553f0a5284176be (diff)
downloadGT5-Unofficial-ad450c8a3f2234bf392b8bb175d1eace8ad2ca20.tar.gz
GT5-Unofficial-ad450c8a3f2234bf392b8bb175d1eace8ad2ca20.tar.bz2
GT5-Unofficial-ad450c8a3f2234bf392b8bb175d1eace8ad2ca20.zip
No auto-output rendering for steam basic machines
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java17
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.pngbin2541 -> 2821 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.pngbin2416 -> 2674 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.pngbin2460 -> 2766 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.pngbin2482 -> 2762 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.pngbin2394 -> 2634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.pngbin2532 -> 3012 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.pngbin2545 -> 2943 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.pngbin2418 -> 2690 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.pngbin2462 -> 2791 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.pngbin2482 -> 2781 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.pngbin2404 -> 2686 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.pngbin2534 -> 3027 bytes
13 files changed, 12 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..3d7247b673 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
@@ -23,6 +23,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 +36,15 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount);
mName = aName;
mNEI = aNEI;
+ mRenderAutoOutputSlots = !(aTextureFile.startsWith("Steel") || aTextureFile.startsWith("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 +77,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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ