diff options
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity')
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java | 23 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java | 18 |
2 files changed, 11 insertions, 30 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index cb577e6bc5..42b7bb4b89 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -3,8 +3,6 @@ package goodgenerator.blocks.tileEntity; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; -import java.lang.reflect.Field; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -44,10 +42,6 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { power = new AdvFusionPower((byte) 9, Integer.MAX_VALUE); } - // Some hacky shit - public static Block mMK4Casing = null; - public static int mMK4CasingMeta; - @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); @@ -89,25 +83,12 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public Block getCasingBlock() { - if (mMK4Casing == null) doCasingInit(); - return mMK4Casing; + return ModBlocks.blockCasings3Misc; } @Override public int getCasingMeta() { - if (mMK4Casing == null) doCasingInit(); - return mMK4CasingMeta; - } - - private void doCasingInit() { - try { - Field f = ModBlocks.class.getDeclaredField("blockCasings6Misc"); - mMK4Casing = (Block) f.get(null); - mMK4CasingMeta = 0; - } catch (NoSuchFieldException | IllegalAccessException e) { - mMK4Casing = ModBlocks.blockCasings3Misc; - mMK4CasingMeta = 12; - } + return 12; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index 6aed8a2a95..e070b9598c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -83,12 +83,12 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public Block getCasingBlock() { - return ModBlocks.blockCasings3Misc; + return ModBlocks.blockCasings6Misc; } @Override public int getCasingMeta() { - return 12; + return 0; } @Override @@ -123,8 +123,8 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public ITexture getTextureOverlay() { - if (this.mMaxProgresstime > 0) return TextureFactory - .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_3).extFacing().build()); + if (this.getBaseMetaTileEntity().isActive()) return TextureFactory.of( + TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_Rainbow).extFacing().build()); else return TextureFactory .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_1).extFacing().build()); } @@ -164,22 +164,22 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { - hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); + hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.eEnergyMulti != null) { for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { - hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); + hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mOutputHatches != null) { for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { - hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); + hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mInputHatches != null) { for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { - hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); + hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } return true; @@ -192,7 +192,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), getTextureOverlay() }; if (!aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; - return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA) + return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER) .extFacing().build() }; } |