From 4c8cf9986d75f91b13281de1d9d476d6dd392d50 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Tue, 27 Apr 2021 23:13:38 +0200 Subject: fix(textfiles): add missing neline at end of files git and diff tools will complain if text file does not end with a newline. Fixed all text files in the repository with Linux bash shell: ```sh git ls-files -z | while IFS= read -rd '' f; do mime="$(file --brief --mime "$f")"; if [ -z "${mime##text/*}" ]; then tail -c1 "$f" | read -r _ || printf '\n' >>"$f"; fi; done ``` --- src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java') 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 3bb802fcf7..a27ee175ef 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -115,4 +115,4 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin } } } -} \ No newline at end of file +} -- cgit From ad450c8a3f2234bf392b8bb175d1eace8ad2ca20 Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Sat, 12 Jun 2021 11:19:19 -0400 Subject: No auto-output rendering for steam basic machines --- .../api/gui/GT_GUIContainer_BasicMachine.java | 17 ++++++++++++----- .../textures/gui/basicmachines/BronzeAlloySmelter.png | Bin 2541 -> 2821 bytes .../textures/gui/basicmachines/BronzeCompressor.png | Bin 2416 -> 2674 bytes .../textures/gui/basicmachines/BronzeExtractor.png | Bin 2460 -> 2766 bytes .../textures/gui/basicmachines/BronzeFurnace.png | Bin 2482 -> 2762 bytes .../textures/gui/basicmachines/BronzeHammer.png | Bin 2394 -> 2634 bytes .../textures/gui/basicmachines/BronzeMacerator.png | Bin 2532 -> 3012 bytes .../textures/gui/basicmachines/SteelAlloySmelter.png | Bin 2545 -> 2943 bytes .../textures/gui/basicmachines/SteelCompressor.png | Bin 2418 -> 2690 bytes .../textures/gui/basicmachines/SteelExtractor.png | Bin 2462 -> 2791 bytes .../textures/gui/basicmachines/SteelFurnace.png | Bin 2482 -> 2781 bytes .../textures/gui/basicmachines/SteelHammer.png | Bin 2404 -> 2686 bytes .../textures/gui/basicmachines/SteelMacerator.png | Bin 2534 -> 3027 bytes 13 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java') 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png 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 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png differ -- cgit From 35f33298f8420dd47496d029cfc8209c896b5de4 Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Mon, 14 Jun 2021 19:09:45 -0400 Subject: Using explicit steam machine check --- src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java') 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 3d7247b673..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; @@ -36,7 +37,7 @@ 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")); + mRenderAutoOutputSlots = !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_BasicMachine_Bronze); } @Override -- cgit