From 89d0c5a37a6b982d30a24350492fe8d7acb0d63c Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 7 Oct 2017 17:11:52 +1000 Subject: $ Fixed Textures further on the Industrial Centrifuge. $ Fixed the issue where two textures would become Fusion Reactor casings. Fixed thanks to @Technus --- .../xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java | 3 --- .../xmod/gregtech/common/blocks/textures/CasingTextureHandler.java | 2 +- .../gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index c05df6ade3..852fd6c72b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -8,7 +8,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.common.blocks.GT_Material_Casings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -62,8 +61,6 @@ extends GregtechMetaCasingBlocksAbstract { return CasingTextureHandler.getIcon(aSide, aMeta); } - - @Override @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index 3becc6b1ec..1ddf68bf94 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -34,7 +34,7 @@ public class CasingTextureHandler { return TexturesGtBlock.Casing_Material_Potin.getIcon(); //Broken Blue Fusion Casings case 6: - return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon(); + return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); //Maceration Stack Casings case 7: return TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index 356bc2f9e0..fe31836899 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -81,7 +81,7 @@ public class TexturesCentrifugeMultiblock { public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks thisBlock) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) { + if (tMeta != 0) { return CasingTextureHandler.getIcon(aSide, tMeta); } final int tStartIndex = tMeta == 6 ? 1 : 13; -- cgit