diff options
Diffstat (limited to 'src/main/java/gregtech/common')
4 files changed, 13 insertions, 11 deletions
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<MTELarge GTRenderUtil.renderBlockIcon( aRenderer, tBlock, - tX + tDirection.offsetX * 0.01, - tY + tDirection.offsetY * 0.01, - tZ + tDirection.offsetZ * 0.01, + tX + tDirection.offsetX * 0.001, + tY + tDirection.offsetY * 0.001, + tZ + tDirection.offsetZ * 0.001, tTextures[i].getIcon(), tFacing); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java index 28d8a21e83..b0ad701cc9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java @@ -92,7 +92,7 @@ public class MTELargeTurbineSteam extends MTELargeTurbine { @Override public int getCasingTextureIndex() { - return 16; + return 57; } @Override |