From 409f50d563831e7fb53ff5bf6deca805a91154c1 Mon Sep 17 00:00:00 2001 From: BlueHero233 <87818077+BlueHero233@users.noreply.github.com> Date: Fri, 8 Nov 2024 21:00:41 -0300 Subject: Turbine Texture Refactor (#3435) Co-authored-by: Martin Robertz --- src/main/java/gregtech/api/enums/Textures.java | 5 +++-- src/main/java/gregtech/common/blocks/BlockCasings4.java | 12 +++++++----- src/main/java/gregtech/common/blocks/BlockCasings8.java | 4 ++-- .../common/tileentities/machines/multi/MTELargeTurbine.java | 6 +++--- .../tileentities/machines/multi/MTELargeTurbineSteam.java | 2 +- .../common/blocks/GregtechMetaSpecialMultiCasings.java | 2 +- .../multi/production/turbines/MTELargeTurbineSteam.java | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 5e21d6e9e9..92a213fb30 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -997,11 +997,12 @@ public class Textures { LARGETURBINE_TU_ACTIVE8, LARGETURBINE_TU_ACTIVE9, - MACHINE_CASING_TURBINE, + MACHINE_CASING_TURBINE_HSSS, MACHINE_CASING_TURBINE_STAINLESSSTEEL, + MACHINE_CASING_TURBINE_STEEL, MACHINE_CASING_TURBINE_TITANIUM, MACHINE_CASING_TURBINE_TUNGSTENSTEEL, - MACHINE_CASING_ADVANCEDGAS, + BLOCK_ADAMANTIUM, BLOCK_ALUMINIUM, BLOCK_AMERICIUM, diff --git a/src/main/java/gregtech/common/blocks/BlockCasings4.java b/src/main/java/gregtech/common/blocks/BlockCasings4.java index 0cba916548..fbb73044a5 100644 --- a/src/main/java/gregtech/common/blocks/BlockCasings4.java +++ b/src/main/java/gregtech/common/blocks/BlockCasings4.java @@ -104,7 +104,7 @@ public class BlockCasings4 extends BlockCasingsAbstract { case 6 -> Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon(); case 7 -> Textures.BlockIcons.MACHINE_CASING_FUSION_COIL.getIcon(); case 8 -> Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon(); - case 9 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STEEL.getIcon(); case 10 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon(); case 11 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon(); case 12 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon(); @@ -118,6 +118,9 @@ public class BlockCasings4 extends BlockCasingsAbstract { @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { return switch (meta) { + case 9 -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); case 10 -> active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE1[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY1[iconIndex].getIcon(); @@ -127,9 +130,7 @@ public class BlockCasings4 extends BlockCasingsAbstract { case 12 -> active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() : hasTurbine ? Textures.BlockIcons.TURBINE3[iconIndex].getIcon() : Textures.BlockIcons.TURBINE_EMPTY3[iconIndex].getIcon(); - default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); + default -> throw new IllegalStateException("Unexpected value: " + meta); }; } @@ -216,10 +217,11 @@ public class BlockCasings4 extends BlockCasingsAbstract { } } return switch (tMeta) { + case 9 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STEEL.getIcon(); case 10 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon(); case 11 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon(); case 12 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon(); - default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + default -> throw new IllegalStateException("Unexpected value: " + tMeta); }; } int tStartIndex = tMeta == 6 ? 1 : 13; diff --git a/src/main/java/gregtech/common/blocks/BlockCasings8.java b/src/main/java/gregtech/common/blocks/BlockCasings8.java index 400f1aadac..e21418b791 100644 --- a/src/main/java/gregtech/common/blocks/BlockCasings8.java +++ b/src/main/java/gregtech/common/blocks/BlockCasings8.java @@ -90,7 +90,7 @@ public class BlockCasings8 extends BlockCasingsAbstract { case 6 -> Textures.BlockIcons.MACHINE_CASING_RHODIUM_PALLADIUM.getIcon(); case 7 -> Textures.BlockIcons.MACHINE_CASING_IRIDIUM.getIcon(); case 8 -> Textures.BlockIcons.MACHINE_CASING_MAGICAL.getIcon(); - case 9 -> Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_HSSS.getIcon(); case 10 -> Textures.BlockIcons.MACHINE_CASING_RADIANT_NAQUADAH_ALLOY.getIcon(); case 11 -> Textures.BlockIcons.MACHINE_CASING_PCB_TIER_1.getIcon(); case 12 -> Textures.BlockIcons.MACHINE_CASING_PCB_TIER_2.getIcon(); @@ -183,6 +183,6 @@ public class BlockCasings8 extends BlockCasingsAbstract { } } - return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_TURBINE_HSSS.getIcon(); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java index de35a7d3bc..ffea5e40f6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java @@ -214,9 +214,9 @@ public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase TexturesGtBlock.Casing_Redox_1.getIcon(); - case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STEEL.getIcon(); case 2 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon(); case 3 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon(); case 4 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java index beeaa2726b..6445e2ad23 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java @@ -40,7 +40,7 @@ public class MTELargeTurbineSteam extends MTELargerTurbineBase { @Override public int getCasingTextureIndex() { - return 16; + return 57; } @Override -- cgit