diff options
Diffstat (limited to 'src/main/java')
48 files changed, 484 insertions, 469 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index eac8634632..d00c5dccb9 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -645,12 +645,12 @@ public class Textures { OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE, OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW, - OVERLAY_TOP_POTIONBREWER, - OVERLAY_TOP_POTIONBREWER_GLOW, - OVERLAY_TOP_REPLICATOR, - OVERLAY_TOP_REPLICATOR_GLOW, OVERLAY_TOP_MASSFAB, OVERLAY_TOP_MASSFAB_GLOW, + OVERLAY_TOP_SCANNER, + OVERLAY_TOP_SCANNER_ACTIVE, + OVERLAY_TOP_SCANNER_GLOW, + OVERLAY_TOP_SCANNER_ACTIVE_GLOW, OVERLAY_TOP_STEAM_HAMMER, OVERLAY_TOP_STEAM_HAMMER_GLOW, OVERLAY_TOP_STEAM_FURNACE, @@ -667,21 +667,17 @@ public class Textures { OVERLAY_TOP_STEAM_EXTRACTOR_GLOW, OVERLAY_TOP_DISASSEMBLER, OVERLAY_TOP_DISASSEMBLER_GLOW, - OVERLAY_TOP_BOXINATOR, - OVERLAY_TOP_BOXINATOR_GLOW, OVERLAY_TOP_ROCK_BREAKER, OVERLAY_TOP_ROCK_BREAKER_GLOW, - OVERLAY_TOP_SCANNER, - OVERLAY_TOP_SCANNER_GLOW, OVERLAY_TOP_INDUSTRIAL_APIARY, OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW, - OVERLAY_FRONT_POTIONBREWER, - OVERLAY_FRONT_POTIONBREWER_GLOW, - OVERLAY_FRONT_REPLICATOR, - OVERLAY_FRONT_REPLICATOR_GLOW, OVERLAY_FRONT_MASSFAB, OVERLAY_FRONT_MASSFAB_GLOW, + OVERLAY_FRONT_SCANNER, + OVERLAY_FRONT_SCANNER_ACTIVE, + OVERLAY_FRONT_SCANNER_ACTIVE_GLOW, + OVERLAY_FRONT_SCANNER_GLOW, OVERLAY_FRONT_STEAM_HAMMER, OVERLAY_FRONT_STEAM_HAMMER_GLOW, OVERLAY_FRONT_STEAM_HAMMER_ACTIVE, @@ -690,6 +686,8 @@ public class Textures { OVERLAY_FRONT_STEAM_FURNACE_GLOW, OVERLAY_FRONT_STEAM_ALLOY_SMELTER, OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW, + OVERLAY_FRONT_NUCLEAR_REACTOR, + OVERLAY_FRONT_NUCLEAR_REACTOR_ACTIVE, OVERLAY_FRONT_STEAM_MACERATOR, OVERLAY_FRONT_STEAM_MACERATOR_GLOW, @@ -711,21 +709,17 @@ public class Textures { OVERLAY_FRONT_DISASSEMBLER_GLOW, OVERLAY_FRONT_DISASSEMBLER_ACTIVE, OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW, - OVERLAY_FRONT_BOXINATOR, - OVERLAY_FRONT_BOXINATOR_GLOW, OVERLAY_FRONT_ROCK_BREAKER, OVERLAY_FRONT_ROCK_BREAKER_GLOW, - OVERLAY_FRONT_SCANNER, - OVERLAY_FRONT_SCANNER_GLOW, OVERLAY_FRONT_INDUSTRIAL_APIARY, OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW, - OVERLAY_BOTTOM_POTIONBREWER, - OVERLAY_BOTTOM_POTIONBREWER_GLOW, - OVERLAY_BOTTOM_REPLICATOR, - OVERLAY_BOTTOM_REPLICATOR_GLOW, OVERLAY_BOTTOM_MASSFAB, OVERLAY_BOTTOM_MASSFAB_GLOW, + OVERLAY_BOTTOM_SCANNER, + OVERLAY_BOTTOM_SCANNER_ACTIVE, + OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW, + OVERLAY_BOTTOM_SCANNER_GLOW, OVERLAY_BOTTOM_STEAM_HAMMER, OVERLAY_BOTTOM_STEAM_HAMMER_GLOW, OVERLAY_BOTTOM_STEAM_FURNACE, @@ -741,21 +735,18 @@ public class Textures { OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW, OVERLAY_BOTTOM_DISASSEMBLER, OVERLAY_BOTTOM_DISASSEMBLER_GLOW, - OVERLAY_BOTTOM_BOXINATOR, - OVERLAY_BOTTOM_BOXINATOR_GLOW, OVERLAY_BOTTOM_ROCK_BREAKER, OVERLAY_BOTTOM_ROCK_BREAKER_GLOW, - OVERLAY_BOTTOM_SCANNER, - OVERLAY_BOTTOM_SCANNER_GLOW, OVERLAY_BOTTOM_INDUSTRIAL_APIARY, OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW, - OVERLAY_SIDE_POTIONBREWER, - OVERLAY_SIDE_POTIONBREWER_GLOW, - OVERLAY_SIDE_REPLICATOR, - OVERLAY_SIDE_REPLICATOR_GLOW, + OVERLAY_SIDE_FLUIDTANK, OVERLAY_SIDE_MASSFAB, OVERLAY_SIDE_MASSFAB_GLOW, + OVERLAY_SIDE_SCANNER, + OVERLAY_SIDE_SCANNER_ACTIVE, + OVERLAY_SIDE_SCANNER_ACTIVE_GLOW, + OVERLAY_SIDE_SCANNER_GLOW, OVERLAY_SIDE_STEAM_HAMMER, OVERLAY_SIDE_STEAM_HAMMER_GLOW, OVERLAY_SIDE_STEAM_FURNACE, @@ -770,20 +761,13 @@ public class Textures { OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW, OVERLAY_SIDE_DISASSEMBLER, OVERLAY_SIDE_DISASSEMBLER_GLOW, - OVERLAY_SIDE_BOXINATOR, - OVERLAY_SIDE_BOXINATOR_GLOW, OVERLAY_SIDE_ROCK_BREAKER, OVERLAY_SIDE_ROCK_BREAKER_GLOW, - OVERLAY_SIDE_SCANNER, - OVERLAY_SIDE_SCANNER_GLOW, OVERLAY_SIDE_INDUSTRIAL_APIARY, OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW, OVERLAY_SIDE_JUKEBOX, - OVERLAY_TOP_POTIONBREWER_ACTIVE, - OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW, - OVERLAY_TOP_REPLICATOR_ACTIVE, - OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW, + OVERLAY_TOP_FLUIDTANK, OVERLAY_TOP_MASSFAB_ACTIVE, OVERLAY_TOP_MASSFAB_ACTIVE_GLOW, @@ -802,19 +786,11 @@ public class Textures { OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW, OVERLAY_TOP_DISASSEMBLER_ACTIVE, OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW, - OVERLAY_TOP_BOXINATOR_ACTIVE, - OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW, OVERLAY_TOP_ROCK_BREAKER_ACTIVE, OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW, - OVERLAY_TOP_SCANNER_ACTIVE, - OVERLAY_TOP_SCANNER_ACTIVE_GLOW, OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE, OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW, - OVERLAY_FRONT_POTIONBREWER_ACTIVE, - OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW, - OVERLAY_FRONT_REPLICATOR_ACTIVE, - OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW, OVERLAY_FRONT_MASSFAB_ACTIVE, OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW, OVERLAY_FRONT_STEAM_FURNACE_ACTIVE, @@ -826,19 +802,11 @@ public class Textures { OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW, OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE, OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW, - OVERLAY_FRONT_BOXINATOR_ACTIVE, - OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW, OVERLAY_FRONT_ROCK_BREAKER_ACTIVE, OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW, - OVERLAY_FRONT_SCANNER_ACTIVE, - OVERLAY_FRONT_SCANNER_ACTIVE_GLOW, OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE, OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW, - OVERLAY_BOTTOM_POTIONBREWER_ACTIVE, - OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW, - OVERLAY_BOTTOM_REPLICATOR_ACTIVE, - OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW, OVERLAY_BOTTOM_MASSFAB_ACTIVE, OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW, OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE, @@ -856,19 +824,11 @@ public class Textures { OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW, OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE, OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW, - OVERLAY_BOTTOM_BOXINATOR_ACTIVE, - OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW, OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE, OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW, - OVERLAY_BOTTOM_SCANNER_ACTIVE, - OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW, OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE, OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW, - OVERLAY_SIDE_POTIONBREWER_ACTIVE, - OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW, - OVERLAY_SIDE_REPLICATOR_ACTIVE, - OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW, OVERLAY_SIDE_MASSFAB_ACTIVE, OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW, OVERLAY_SIDE_STEAM_HAMMER_ACTIVE, @@ -886,12 +846,8 @@ public class Textures { OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW, OVERLAY_SIDE_DISASSEMBLER_ACTIVE, OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW, - OVERLAY_SIDE_BOXINATOR_ACTIVE, - OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE, OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW, - OVERLAY_SIDE_SCANNER_ACTIVE, - OVERLAY_SIDE_SCANNER_ACTIVE_GLOW, OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE, OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW, @@ -1005,6 +961,9 @@ public class Textures { LARGETURBINE_TU_ACTIVE9, MACHINE_CASING_TURBINE, + MACHINE_CASING_TURBINE_STAINLESSSTEEL, + MACHINE_CASING_TURBINE_TITANIUM, + MACHINE_CASING_TURBINE_TUNGSTENSTEEL, MACHINE_CASING_ADVANCEDGAS, BLOCK_ADAMANTIUM, BLOCK_ALUMINIUM, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index d5472e9217..77f36a4523 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -90,9 +90,9 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { @Override public IIcon getIcon(int ordinalSide, int aMeta) { return switch (aMeta) { - case 0, 12 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - case 1, 10 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 2, 11 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 0 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); case 3 -> ordinalSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon() : Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); case 4 -> @@ -105,6 +105,9 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { 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 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(); case 13 -> Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon(); case 14 -> Textures.BlockIcons.MACHINE_CASING_MINING_OSMIRIDIUM.getIcon(); case 15 -> Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS.getIcon(); @@ -213,9 +216,9 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { } } return switch (tMeta) { - case 10 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 11 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 12 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.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(); }; } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java index 6c908aadac..8d2e0959e1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java @@ -1,27 +1,11 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_GLOW; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.ItemList; import gregtech.api.enums.MachineType; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -49,51 +33,65 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine 2, 1, TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_BOXINATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_BOXINATOR), + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_BOXINATOR_GLOW) + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_SIDE_BOXINATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_BOXINATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_BOXINATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_BOXINATOR_GLOW) + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_FRONT_BOXINATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_BOXINATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_BOXINATOR), + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_BOXINATOR_GLOW) + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_TOP_BOXINATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_BOXINATOR_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/boxinator/OVERLAY_BOTTOM_BOXINATOR_GLOW")) .glow() .build())); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java index 15150abf67..8254c6440d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java @@ -1,22 +1,5 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_GLOW; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -26,6 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -49,51 +33,74 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi 1, 0, TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_POTIONBREWER_ACTIVE), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_POTIONBREWER), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_POTIONBREWER_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_SIDE_POTIONBREWER_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_POTIONBREWER_ACTIVE), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_POTIONBREWER), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_POTIONBREWER_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_FRONT_POTIONBREWER_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_POTIONBREWER_ACTIVE), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_POTIONBREWER), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_POTIONBREWER_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_TOP_POTIONBREWER_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_POTIONBREWER_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/potionbrewer/OVERLAY_BOTTOM_POTIONBREWER_GLOW")) .glow() .build())); } @@ -136,31 +143,14 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi tInputName = tInputName.replaceFirst("." + tModifier, ""); } if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) { - if (tInputName.equals("poison")) { - return setOutput("potion.damage" + tModifier); - } - if (tInputName.equals("health")) { - return setOutput("potion.damage" + tModifier); - } - if (tInputName.equals("waterbreathing")) { - return setOutput("potion.damage" + tModifier); - } - if (tInputName.equals("nightvision")) { - return setOutput("potion.invisibility" + tModifier); - } - if (tInputName.equals("fireresistance")) { - return setOutput("potion.slowness" + tModifier); - } - if (tInputName.equals("speed")) { - return setOutput("potion.slowness" + tModifier); - } - if (tInputName.equals("strength")) { - return setOutput("potion.weakness" + tModifier); - } - if (tInputName.equals("regen")) { - return setOutput("potion.poison" + tModifier); - } - return setOutput("potion.weakness"); + return switch (tInputName) { + case "poison", "health", "waterbreathing" -> setOutput("potion.damage" + tModifier); + case "nightvision" -> setOutput("potion.invisibility" + tModifier); + case "fireresistance", "speed" -> setOutput("potion.slowness" + tModifier); + case "strength" -> setOutput("potion.weakness" + tModifier); + case "regen" -> setOutput("potion.poison" + tModifier); + default -> setOutput("potion.weakness"); + }; } if (GT_Utility.areStacksEqual( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java index a15d5b7f6d..e9f3d98dd5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java @@ -1,22 +1,5 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_GLOW; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -24,6 +7,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -45,51 +29,70 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine 1, 1, TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_REPLICATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_REPLICATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR")), TextureFactory.builder() - .addIcon(OVERLAY_SIDE_REPLICATOR_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_SIDE_REPLICATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_REPLICATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_REPLICATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR")), TextureFactory.builder() - .addIcon(OVERLAY_FRONT_REPLICATOR_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_FRONT_REPLICATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_REPLICATOR_ACTIVE), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/replicator/OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_REPLICATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR")), TextureFactory.builder() - .addIcon(OVERLAY_TOP_REPLICATOR_GLOW) + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_TOP_REPLICATOR_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR_ACTIVE), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_ACTIVE")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW")) .glow() .build()), TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR")), TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_REPLICATOR_GLOW) + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/replicator/OVERLAY_BOTTOM_REPLICATOR_GLOW")) .glow() .build())); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java index fa6d3a5b91..fd92983af4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java @@ -31,21 +31,21 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H protected String mTempMod = null; public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName, - final String aNameRegional) { + final String aNameRegional, int aTier) { super( aID, aName, aNameRegional, - 6, + aTier, 3, new String[] { "Fluid Input for Multiblocks", "Capacity: " + GT_Utility.formatNumbers(aAmount) + "L" }); this.mLockedFluid = aFluid; this.mFluidCapacity = aAmount; } - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, + public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { - super(aName, 6, 3, aDescription[0], aTextures); + super(aName, aTier, 3, aDescription[0], aTextures); this.mLockedFluid = aFluid; this.mFluidCapacity = aAmount; } @@ -198,6 +198,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H this.mLockedFluid, this.mFluidCapacity, this.mName, + this.mTier, this.mDescriptionArray, this.mTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 4025668966..7b58e35a68 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -16,9 +16,8 @@ import gtPlusPlus.core.lib.CORE; public class TexturesGtBlock { - private static boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures; - - private static AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); + private static final boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures; + private static final AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); /* * Handles Custom Textures. @@ -67,80 +66,54 @@ public class TexturesGtBlock { } /* - * Add Some Custom Textures below. I am not sure whether or not I need to declare them as such, but better to be + * Add Some Custom Textures below. I am not sure whether I need to declare them as such, but better to be * safe than sorry. Right? */ // PlaceHolder Texture - private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); - public static final CustomIcon _PlaceHolder = Internal_PlaceHolder; - + public static final CustomIcon _PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder"); public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon( "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER"); // Machine Casings // Simple - private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top"); - public static final CustomIcon Casing_Machine_Simple_Top = Internal_Casing_Machine_Simple_Top; - private static final CustomIcon Internal_Casing_Machine_Simple_Bottom = new CustomIcon( - "TileEntities/machine_bottom"); - public static final CustomIcon Casing_Machine_Simple_Bottom = Internal_Casing_Machine_Simple_Bottom; + public static final CustomIcon Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top"); + public static final CustomIcon Casing_Machine_Simple_Bottom = new CustomIcon("TileEntities/machine_bottom"); // Advanced and Ultra - private static final CustomIcon Internal_Casing_Machine_Advanced = new CustomIcon("TileEntities/high_adv_machine"); - public static final CustomIcon Casing_Machine_Advanced = Internal_Casing_Machine_Advanced; - private static final CustomIcon Internal_Casing_Machine_Ultra = new CustomIcon("TileEntities/adv_machine_lesu"); - public static final CustomIcon Casing_Machine_Ultra = Internal_Casing_Machine_Ultra; + public static final CustomIcon Casing_Machine_Advanced = new CustomIcon("TileEntities/high_adv_machine"); + public static final CustomIcon Casing_Machine_Ultra = new CustomIcon("TileEntities/adv_machine_lesu"); // Dimensional - Non Overlay - private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon( - "TileEntities/adv_machine_dimensional"); - public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional; + public static final CustomIcon Casing_Machine_Dimensional = new CustomIcon("TileEntities/adv_machine_dimensional"); // Material Casings - private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon( + public static final CustomIcon Casing_Material_Tantalloy61 = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TANTALLOY61"); - public static final CustomIcon Casing_Material_Tantalloy61 = Internal_Casing_Tantalloy61; - private static final CustomIcon Internal_Casing_MaragingSteel = new CustomIcon( + public static final CustomIcon Casing_Material_MaragingSteel = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL"); - public static final CustomIcon Casing_Material_MaragingSteel = Internal_Casing_MaragingSteel; - private static final CustomIcon Internal_Casing_Stellite = new CustomIcon( + public static final CustomIcon Casing_Material_Stellite = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_STELLITE"); - public static final CustomIcon Casing_Material_Stellite = Internal_Casing_Stellite; - private static final CustomIcon Internal_Casing_Talonite = new CustomIcon( + public static final CustomIcon Casing_Material_Talonite = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TALONITE"); - public static final CustomIcon Casing_Material_Talonite = Internal_Casing_Talonite; - private static final CustomIcon Internal_Turbine_SC_Casing = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE"); - public static final CustomIcon Turbine_SC_Material_Casing = Internal_Turbine_SC_Casing; - private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon( + public static final CustomIcon Turbine_SC_Material_Casing = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE"); + public static final CustomIcon Casing_Material_Tumbaga = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_TUMBAGA"); - public static final CustomIcon Casing_Material_Tumbaga = Internal_Casing_Tumbaga; - private static final CustomIcon Internal_Casing_Zeron100 = new CustomIcon( + public static final CustomIcon Casing_Material_Zeron100 = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_ZERON100"); - public static final CustomIcon Casing_Material_Zeron100 = Internal_Casing_Zeron100; - private static final CustomIcon Internal_Casing_Potin = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_POTIN"); - public static final CustomIcon Casing_Material_Potin = Internal_Casing_Potin; + public static final CustomIcon Casing_Material_Potin = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_POTIN"); - private static final CustomIcon Internal_Casing_Grisium = new CustomIcon( + public static final CustomIcon Casing_Material_Grisium = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_GRISIUM"); - public static final CustomIcon Casing_Material_Grisium = Internal_Casing_Grisium; - private static final CustomIcon Internal_Casing_RedSteel = new CustomIcon( + public static final CustomIcon Casing_Material_RedSteel = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_RED_STEEL"); - public static final CustomIcon Casing_Material_RedSteel = Internal_Casing_RedSteel; - private static final CustomIcon Internal_Casing_ZirconiumCarbide = new CustomIcon( + public static final CustomIcon Casing_Material_ZirconiumCarbide = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE"); - public static final CustomIcon Casing_Material_ZirconiumCarbide = Internal_Casing_ZirconiumCarbide; - - private static final CustomIcon Internal_Casing_HastelloyX = new CustomIcon( + public static final CustomIcon Casing_Material_HastelloyX = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X"); - public static final CustomIcon Casing_Material_HastelloyX = Internal_Casing_HastelloyX; - private static final CustomIcon Internal_Casing_HastelloyN = new CustomIcon( + public static final CustomIcon Casing_Material_HastelloyN = new CustomIcon( "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N"); - public static final CustomIcon Casing_Material_HastelloyN = Internal_Casing_HastelloyN; - private static final CustomIcon Internal_Casing_Fluid_IncoloyDS = new CustomIcon( + public static final CustomIcon Casing_Material_Fluid_IncoloyDS = new CustomIcon( "TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS"); - public static final CustomIcon Casing_Material_Fluid_IncoloyDS = Internal_Casing_Fluid_IncoloyDS; - - private static final CustomIcon Internal_Casing_Laurenium = new CustomIcon("TileEntities/MACHINE_CASING_LAURENIUM"); - public static final CustomIcon Casing_Material_Laurenium = Internal_Casing_Laurenium; + public static final CustomIcon Casing_Material_Laurenium = new CustomIcon("TileEntities/MACHINE_CASING_LAURENIUM"); // Trinium Alloys public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon( @@ -149,17 +122,13 @@ public class TexturesGtBlock { "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT"); // Material Machine/Firebox Casings - private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon( + public static final CustomIcon Casing_Staballoy_Firebox = new CustomIcon( "TileEntities/MACHINE_CASING_FIREBOX_STABALLOY"); - public static final CustomIcon Casing_Staballoy_Firebox = Internal_Casing_Staballoy_Firebox; // Misc Casings - private static final CustomIcon Internal_Casing_Machine_Redstone_Off = new CustomIcon( + public static final CustomIcon Casing_Machine_Redstone_Off = new CustomIcon( "TileEntities/cover_redstone_conductor"); - public static final CustomIcon Casing_Machine_Redstone_Off = Internal_Casing_Machine_Redstone_Off; - private static final CustomIcon Internal_Casing_Machine_Redstone_On = new CustomIcon( - "TileEntities/cover_redstone_emitter"); - public static final CustomIcon Casing_Machine_Redstone_On = Internal_Casing_Machine_Redstone_On; + public static final CustomIcon Casing_Machine_Redstone_On = new CustomIcon("TileEntities/cover_redstone_emitter"); // Redox Cells public static final CustomIcon Casing_Redox_1 = new CustomIcon("redox/redox1"); @@ -180,23 +149,29 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Modulator_4 = new CustomIcon("special/block_8"); // Centrifuge Casing - private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon( + public static final CustomIcon Casing_Material_Centrifuge = new CustomIcon( "TileEntities/MACHINE_CASING_CENTRIFUGE"); - public static final CustomIcon Casing_Material_Centrifuge = Internal_Casing_Centrifuge; // Quantum Force Transformer Casing // spotless:off - private static final CustomIcon Internal_Casing_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); - public static final CustomIcon Casing_Coil_QFT = Internal_Casing_QFT; - public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon("NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); - public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon("CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic"); - public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon("InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic"); - public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon("SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic"); + public static final CustomIcon Casing_Coil_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); + public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon( + "NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); + public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon( + "CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic"); + public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon( + "InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic"); + public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon( + "SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic"); public static final CustomIcon Manipulator_Top = new CustomIcon("Manipulator_Top"); - public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon("NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic"); - public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon("CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic"); - public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon("InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic"); - public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon("SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic"); + public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon( + "NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic"); + public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon( + "CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic"); + public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon( + "InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic"); + public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon( + "SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic"); public static final CustomIcon ForceFieldGlass = new CustomIcon("ForceFieldGlass"); public static final CustomIcon ForceField = new CustomIcon("rendering/ForceField"); public static final CustomIcon Blank = new CustomIcon("Blank"); @@ -204,30 +179,20 @@ public class TexturesGtBlock { // MACHINE_CASING_FARM_MANAGER_STRUCTURAL // Farm Manager Casings - private static final CustomIcon Internal_Casing_Machine_Farm_Manager = new CustomIcon( + public static final CustomIcon Casing_Machine_Farm_Manager = new CustomIcon( "TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL"); - public static final CustomIcon Casing_Machine_Farm_Manager = Internal_Casing_Machine_Farm_Manager; // Acacia_Log - private static final CustomIcon Internal_Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top"); - public static final CustomIcon Casing_Machine_Acacia_Log = Internal_Casing_Machine_Acacia_Log; + public static final CustomIcon Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top"); // Podzol Top - private static final CustomIcon Internal_Casing_Machine_Podzol = new CustomIcon("TileEntities/dirt_podzol_top"); - public static final CustomIcon Casing_Machine_Podzol = Internal_Casing_Machine_Podzol; + public static final CustomIcon Casing_Machine_Podzol = new CustomIcon("TileEntities/dirt_podzol_top"); // Structural Blocks - private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate"); - public static final CustomIcon Casing_Machine_Metal_Grate_A = Internal_Casing_Machine_Metal_Grate_A; - - private static final CustomIcon Internal_Casing_Machine_Metal_Panel_A = new CustomIcon("chrono/MetalPanel"); - public static final CustomIcon Casing_Machine_Metal_Panel_A = Internal_Casing_Machine_Metal_Panel_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_A = new CustomIcon("chrono/MetalSheet"); - public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_H = new CustomIcon("chrono/MetalSheet8"); - public static final CustomIcon Casing_Machine_Metal_Sheet_H = Internal_Casing_Machine_Metal_Sheet_H; - private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_I = new CustomIcon("chrono/MetalSheet9"); - public static final CustomIcon Casing_Machine_Metal_Sheet_I = Internal_Casing_Machine_Metal_Sheet_I; - private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); - public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; + public static final CustomIcon Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate"); + public static final CustomIcon Casing_Machine_Metal_Panel_A = new CustomIcon("chrono/MetalPanel"); + public static final CustomIcon Casing_Machine_Metal_Sheet_A = new CustomIcon("chrono/MetalSheet"); + public static final CustomIcon Casing_Machine_Metal_Sheet_H = new CustomIcon("chrono/MetalSheet8"); + public static final CustomIcon Casing_Machine_Metal_Sheet_I = new CustomIcon("chrono/MetalSheet9"); + public static final CustomIcon Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON"); public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon( @@ -321,117 +286,229 @@ public class TexturesGtBlock { // Overlays // Fan Textures - private static final CustomIcon Internal_Overlay_Machine_Vent = new CustomIcon( - "TileEntities/machine_top_vent_rotating"); - public static final CustomIcon Overlay_Machine_Vent = Internal_Overlay_Machine_Vent; - private static final CustomIcon Internal_Overlay_Machine_Vent_Fast = new CustomIcon( + public static final CustomIcon Overlay_Machine_Vent = new CustomIcon("TileEntities/machine_top_vent_rotating"); + public static final CustomIcon Overlay_Machine_Vent_Fast = new CustomIcon( "TileEntities/machine_top_vent_rotating_fast"); - public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast; - private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon( - "TileEntities/adv_machine_vent_rotating"); // Diesel Engines - private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical = new CustomIcon( + public static final CustomIcon Overlay_Machine_Diesel_Vertical = new CustomIcon( "TileEntities/machine_top_dieselmotor"); - public static final CustomIcon Overlay_Machine_Diesel_Vertical = Internal_Overlay_Machine_Diesel_Vertical; - private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal = new CustomIcon( + public static final CustomIcon Overlay_Machine_Diesel_Horizontal = new CustomIcon( "TileEntities/machine_top_dieselmotor2"); - public static final CustomIcon Overlay_Machine_Diesel_Horizontal = Internal_Overlay_Machine_Diesel_Horizontal; - private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical_Active = new CustomIcon( + public static final CustomIcon Overlay_Machine_Diesel_Vertical_Active = new CustomIcon( "TileEntities/machine_top_dieselmotor_active"); - public static final CustomIcon Overlay_Machine_Diesel_Vertical_Active = Internal_Overlay_Machine_Diesel_Vertical_Active; - private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal_Active = new CustomIcon( + public static final CustomIcon Overlay_Machine_Diesel_Horizontal_Active = new CustomIcon( "TileEntities/machine_top_dieselmotor2_active"); - public static final CustomIcon Overlay_Machine_Diesel_Horizontal_Active = Internal_Overlay_Machine_Diesel_Horizontal_Active; // Computer Screens - private static final CustomIcon Internal_Casing_Machine_Screen_1 = new CustomIcon( - "TileEntities/adv_machine_screen_random1"); - public static final CustomIcon Casing_Machine_Screen_1 = Internal_Casing_Machine_Screen_1; - private static final CustomIcon Internal_Casing_Machine_Screen_2 = new CustomIcon( - "TileEntities/adv_machine_screen_random2"); - public static final CustomIcon Casing_Machine_Screen_2 = Internal_Casing_Machine_Screen_2; - private static final CustomIcon Internal_Casing_Machine_Screen_3 = new CustomIcon( - "TileEntities/adv_machine_screen_random3"); - public static final CustomIcon Casing_Machine_Screen_3 = Internal_Casing_Machine_Screen_3; - - private static final CustomIcon Internal_Casing_Machine_Screen_Rainbow = new CustomIcon( - "TileEntities/overlay_rainbowscreen"); - public static final CustomIcon Casing_Machine_Screen_Rainbow = Internal_Casing_Machine_Screen_Rainbow; - private static final CustomIcon Internal_Casing_Machine_Screen_Frequency = new CustomIcon( + public static final CustomIcon Casing_Machine_Screen_1 = new CustomIcon("TileEntities/adv_machine_screen_random1"); + public static final CustomIcon Casing_Machine_Screen_2 = new CustomIcon("TileEntities/adv_machine_screen_random2"); + public static final CustomIcon Casing_Machine_Screen_3 = new CustomIcon("TileEntities/adv_machine_screen_random3"); + + public static final CustomIcon Casing_Machine_Screen_Rainbow = new CustomIcon("TileEntities/overlay_rainbowscreen"); + public static final CustomIcon Casing_Machine_Screen_Frequency = new CustomIcon( "TileEntities/adv_machine_screen_frequency"); - public static final CustomIcon Casing_Machine_Screen_Frequency = Internal_Casing_Machine_Screen_Frequency; - private static final CustomIcon Internal_Overlay_Machine_Screen_Logo = new CustomIcon( - "TileEntities/adv_machine_screen_logo"); - public static final CustomIcon Overlay_Machine_Screen_Logo = Internal_Overlay_Machine_Screen_Logo; + public static final CustomIcon Overlay_Machine_Screen_Logo = new CustomIcon("TileEntities/adv_machine_screen_logo"); // Machine Controller Overlays - private static final CustomIcon Internal_Overlay_Machine_Controller_Default = new CustomIcon( - "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED"); - public static final CustomIcon Overlay_Machine_Controller_Default = Internal_Overlay_Machine_Controller_Default; - private static final CustomIcon Internal_Overlay_Machine_Controller_Default_Active = new CustomIcon( - "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE"); - public static final CustomIcon Overlay_Machine_Controller_Default_Active = Internal_Overlay_Machine_Controller_Default_Active; - - private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced = new CustomIcon( + // public static final CustomIcon Overlay_Machine_Controller_Default = new CustomIcon( + // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED"); + // public static final CustomIcon Overlay_Machine_Controller_Default_Active = new CustomIcon( + // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE"); + + // oMCD = Overlay_Machine_Controller_Default + public static final CustomIcon oMCDSolarTower = new CustomIcon("iconsets/controllerFaces/solarTower"); + public static final CustomIcon oMCDSolarTowerActive = new CustomIcon("iconsets/controllerFaces/solarTowerActive"); + + public static final CustomIcon oMCDIndustrialWireMill = new CustomIcon( + "iconsets/controllerFaces/industrialWiremill"); + public static final CustomIcon oMCDIndustrialWireMillActive = new CustomIcon( + "iconsets/controllerFaces/industrialWiremillActive"); + + public static final CustomIcon oMCDIndustrialSifter = new CustomIcon("iconsets/controllerFaces/industrialSifter"); + public static final CustomIcon oMCDIndustrialSifterActive = new CustomIcon( + "iconsets/controllerFaces/industrialSifterActive"); + + public static final CustomIcon oMCDAlgaePondBase = new CustomIcon("iconsets/controllerFaces/algaePondBase"); + public static final CustomIcon oMCDAlgaePondBaseActive = new CustomIcon( + "iconsets/controllerFaces/algaePondBaseActive"); + + public static final CustomIcon oMCDIndustrialMixer = new CustomIcon("iconsets/controllerFaces/industrialMixer"); + public static final CustomIcon oMCDIndustrialMixerActive = new CustomIcon( + "iconsets/controllerFaces/industrialMixerActive"); + + public static final CustomIcon oMCDIndustrialThermalCentrifuge = new CustomIcon( + "iconsets/controllerFaces/industrialThermalCentrifuge"); + public static final CustomIcon oMCDIndustrialThermalCentrifugeActive = new CustomIcon( + "iconsets/controllerFaces/industrialThermalCentrifugeActive"); + + public static final CustomIcon oMCDIndustrialExtruder = new CustomIcon( + "iconsets/controllerFaces/industrialExtruder"); + public static final CustomIcon oMCDIndustrialExtruderActive = new CustomIcon( + "iconsets/controllerFaces/industrialExtruderActive"); + + public static final CustomIcon oMCDIndustrialWashPlant = new CustomIcon( + "iconsets/controllerFaces/industrialWashPlant"); + public static final CustomIcon oMCDIndustrialWashPlantActive = new CustomIcon( + "iconsets/controllerFaces/industrialWashPlantActive"); + + public static final CustomIcon oMCDAlloyBlastSmelter = new CustomIcon("iconsets/controllerFaces/alloyBlastSmelter"); + public static final CustomIcon oMCDAlloyBlastSmelterActive = new CustomIcon( + "iconsets/controllerFaces/alloyBlastSmelterActive"); + + public static final CustomIcon oMCDIndustrialArcFurnace = new CustomIcon( + "iconsets/controllerFaces/industrialArcFurnace"); + public static final CustomIcon oMCDIndustrialArcFurnaceActive = new CustomIcon( + "iconsets/controllerFaces/industrialArcFurnaceActive"); + + public static final CustomIcon oMCDIndustrialCuttingMachine = new CustomIcon( + "iconsets/controllerFaces/industrialCuttingMachine"); + public static final CustomIcon oMCDIndustrialCuttingMachineActive = new CustomIcon( + "iconsets/controllerFaces/industrialCuttingMachineActive"); + + public static final CustomIcon oMCDIndustrialPlatePress = new CustomIcon( + "iconsets/controllerFaces/industrialPlatePress"); + public static final CustomIcon oMCDIndustrialPlatePressActive = new CustomIcon( + "iconsets/controllerFaces/industrialPlatePressActive"); + + public static final CustomIcon oMCDIndustrialElectrolyzer = new CustomIcon( + "iconsets/controllerFaces/industrialElectrolyzer"); + public static final CustomIcon oMCDIndustrialElectrolyzerActive = new CustomIcon( + "iconsets/controllerFaces/industrialElectrolyzerActive"); + + public static final CustomIcon oMCDFrothFlotationCell = new CustomIcon( + "iconsets/controllerFaces/frothFlotationCell"); + public static final CustomIcon oMCDFrothFlotationCellActive = new CustomIcon( + "iconsets/controllerFaces/frothFlotationCellActive"); + + public static final CustomIcon Overlay_Machine_Controller_Advanced = new CustomIcon( "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED"); - public static final CustomIcon Overlay_Machine_Controller_Advanced = Internal_Overlay_Machine_Controller_Advanced; - private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced_Active = new CustomIcon( + public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = new CustomIcon( "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE"); - public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active; + + // oMCA = Overlay_Machine_Controller_Advanced + public static final CustomIcon oMCACokeOven = new CustomIcon("iconsets/controllerFaces/cokeOven"); + public static final CustomIcon oMCACokeOvenActive = new CustomIcon("iconsets/controllerFaces/cokeOvenActive"); + + public static final CustomIcon oMCAChemicalPlant = new CustomIcon("iconsets/controllerFaces/chemicalPlant"); + public static final CustomIcon oMCAChemicalPlantActive = new CustomIcon( + "iconsets/controllerFaces/chemicalPlantActive"); + + public static final CustomIcon oMCAMegaAlloyBlastSmelter = new CustomIcon( + "iconsets/controllerFaces/megaAlloyBlastSmelter"); + public static final CustomIcon oMCAMegaAlloyBlastSmelterActive = new CustomIcon( + "iconsets/controllerFaces/megaAlloyBlastSmelterActive"); + + public static final CustomIcon oMCATreeFarm = new CustomIcon("iconsets/controllerFaces/treeFarm"); + public static final CustomIcon oMCATreeFarmActive = new CustomIcon("iconsets/controllerFaces/treeFarmActive"); + + public static final CustomIcon oMCAIndustrialRockBreaker = new CustomIcon( + "iconsets/controllerFaces/industrialRockBreaker"); + public static final CustomIcon oMCAIndustrialRockBreakerActive = new CustomIcon( + "iconsets/controllerFaces/industrialRockBreakerActive"); + + public static final CustomIcon oMCAAdvancedHeatExchanger = new CustomIcon( + "iconsets/controllerFaces/advancedHeatExchanger"); + public static final CustomIcon oMCAAdvancedHeatExchangerActive = new CustomIcon( + "iconsets/controllerFaces/advancedHeatExchangerActive"); + + public static final CustomIcon oMCALargeRocketEngine = new CustomIcon("iconsets/controllerFaces/largeRocketEngine"); + public static final CustomIcon oMCALargeRocketEngineActive = new CustomIcon( + "iconsets/controllerFaces/largeRocketEngineActive"); + + public static final CustomIcon oMCAIndustrialChisel = new CustomIcon("iconsets/controllerFaces/industrialChisel"); + public static final CustomIcon oMCAIndustrialChiselActive = new CustomIcon( + "iconsets/controllerFaces/industrialChiselActive"); + + public static final CustomIcon oMCAIndustrialMolecularTransformer = new CustomIcon( + "iconsets/controllerFaces/industrialMolecularTransformer"); + public static final CustomIcon oMCAIndustrialMolecularTransformerActive = new CustomIcon( + "iconsets/controllerFaces/industrialMolecularTransformerActive"); + + public static final CustomIcon oMCAElementalDuplicator = new CustomIcon( + "iconsets/controllerFaces/elementalDuplicator"); + public static final CustomIcon oMCAElementalDuplicatorActive = new CustomIcon( + "iconsets/controllerFaces/elementalDuplicatorActive"); + + public static final CustomIcon oMCAFluidHeater = new CustomIcon("iconsets/controllerFaces/fluidHeater"); + public static final CustomIcon oMCAFluidHeaterActive = new CustomIcon("iconsets/controllerFaces/fluidHeaterActive"); + + public static final CustomIcon oMCAAmazonPackager = new CustomIcon("iconsets/controllerFaces/amazonPackager"); + public static final CustomIcon oMCAAmazonPackagerActive = new CustomIcon( + "iconsets/controllerFaces/amazonPackagerActive"); + + public static final CustomIcon oMCAIndustrialDehydrator = new CustomIcon( + "iconsets/controllerFaces/industrialDehydrator"); + public static final CustomIcon oMCAIndustrialDehydratorActive = new CustomIcon( + "iconsets/controllerFaces/industrialDehydratorActive"); + + public static final CustomIcon oMCAIndustrialForgeHammer = new CustomIcon( + "iconsets/controllerFaces/industrialForgeHammer"); + public static final CustomIcon oMCAIndustrialForgeHammerActive = new CustomIcon( + "iconsets/controllerFaces/industrialForgeHammerActive"); + + public static final CustomIcon oMCAAdvancedEBF = new CustomIcon("iconsets/controllerFaces/advancedEBF"); + public static final CustomIcon oMCAAdvancedEBFActive = new CustomIcon("iconsets/controllerFaces/advancedEBFActive"); + + public static final CustomIcon oMCASpargeTower = new CustomIcon("iconsets/controllerFaces/spargeTower"); + public static final CustomIcon oMCASpargeTowerActive = new CustomIcon("iconsets/controllerFaces/spargeTowerActive"); + + public static final CustomIcon oMCAIndustrialVacuumFreezer = new CustomIcon( + "iconsets/controllerFaces/industrialVacuumFreezer"); + public static final CustomIcon oMCAIndustrialVacuumFreezerActive = new CustomIcon( + "iconsets/controllerFaces/industrialVacuumFreezerActive"); + + public static final CustomIcon oMCAThermalBoiler = new CustomIcon("iconsets/controllerFaces/thermalBoiler"); + public static final CustomIcon oMCAThermalBoilerActive = new CustomIcon( + "iconsets/controllerFaces/thermalBoilerActive"); + + public static final CustomIcon oMCAQFT = new CustomIcon("iconsets/controllerFaces/quantumForceTransformer"); + public static final CustomIcon oMCAQFTActive = new CustomIcon( + "iconsets/controllerFaces/quantumForceTransformerActive"); + + public static final CustomIcon oMCAIndustrialMultiMachine = new CustomIcon( + "iconsets/controllerFaces/industrialMultiMachine"); + public static final CustomIcon oMCAIndustrialMultiMachineActive = new CustomIcon( + "iconsets/controllerFaces/industrialMultiMachineActive"); + + public static final CustomIcon oMCAAdvancedImplosion = new CustomIcon("iconsets/controllerFaces/advancedImplosion"); + public static final CustomIcon oMCAAdvancedImplosionActive = new CustomIcon( + "iconsets/controllerFaces/advancedImplosionActive"); // Crafting Overlays public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay = new CustomIcon( "TileEntities/gt4/machine_top_crafting"); - public static final CustomIcon Casing_CropHarvester_Cutter = new CustomIcon("TileEntities/gt4/OVERLAY_CROP"); public static final CustomIcon Casing_CropHarvester_Boxes = new CustomIcon("TileEntities/gt4/OVERLAY_BOXES"); // Covers - private static final CustomIcon Internal_Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE"); - public static final CustomIcon Overlay_Overflow_Valve = Internal_Overlay_Overflow_Valve; + public static final CustomIcon Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE"); // Hatch Overlays // Charger Texture - private static final CustomIcon Internal_Overlay_Hatch_Charger = new CustomIcon("TileEntities/cover_charger"); - public static final CustomIcon Overlay_Hatch_Charger = Internal_Overlay_Hatch_Charger; + public static final CustomIcon Overlay_Hatch_Charger = new CustomIcon("TileEntities/cover_charger"); // Discharger Texture - private static final CustomIcon Internal_Overlay_Hatch_Discharger = new CustomIcon("TileEntities/cover_discharge"); - public static final CustomIcon Overlay_Hatch_Discharger = Internal_Overlay_Hatch_Discharger; + public static final CustomIcon Overlay_Hatch_Discharger = new CustomIcon("TileEntities/cover_discharge"); // Advanced Muffler - private static final CustomIcon Internal_Overlay_Hatch_Muffler_Adv = new CustomIcon("iconsets/OVERLAY_MUFFLER_ADV"); - public static final CustomIcon Overlay_Hatch_Muffler_Adv = Internal_Overlay_Hatch_Muffler_Adv; + public static final CustomIcon Overlay_Hatch_Muffler_Adv = new CustomIcon("iconsets/OVERLAY_MUFFLER_ADV"); // Milling Ball Bus - private static final CustomIcon Internal_Overlay_Bus_Milling_Balls = new CustomIcon( - "iconsets/OVERLAY_MILLING_BALL_BUS"); - public static final CustomIcon Overlay_Bus_Milling_Balls = Internal_Overlay_Bus_Milling_Balls; + public static final CustomIcon Overlay_Bus_Milling_Balls = new CustomIcon("iconsets/OVERLAY_MILLING_BALL_BUS"); // Catalyst Bus - private static final CustomIcon Internal_Overlay_Bus_Catalyst = new CustomIcon("iconsets/OVERLAY_CATALYSTS"); - public static final CustomIcon Overlay_Bus_Catalyst = Internal_Overlay_Bus_Catalyst; - + public static final CustomIcon Overlay_Bus_Catalyst = new CustomIcon("iconsets/OVERLAY_CATALYSTS"); // Data Orb Hatch public static final CustomIcon Overlay_Hatch_Data_Orb = new CustomIcon("iconsets/OVERLAY_DATA_ORB"); // Dimensional - private static final CustomIcon Internal_Overlay_Machine_Dimensional_Orange = new CustomIcon( + public static final CustomIcon Overlay_Machine_Dimensional_Orange = new CustomIcon( "TileEntities/adv_machine_dimensional_cover_orange"); - public static final CustomIcon Overlay_Machine_Dimensional_Orange = Internal_Overlay_Machine_Dimensional_Orange; // Icons - private static final CustomIcon Internal_Overlay_MatterFab = new CustomIcon("TileEntities/adv_machine_matterfab"); - public static final CustomIcon Overlay_MatterFab = Internal_Overlay_MatterFab; - private static final CustomIcon Internal_Overlay_MatterFab_Active = new CustomIcon( + public static final CustomIcon Overlay_MatterFab = new CustomIcon("TileEntities/adv_machine_matterfab"); + public static final CustomIcon Overlay_MatterFab_Active = new CustomIcon( "TileEntities/adv_machine_matterfab_active"); - public static final CustomIcon Overlay_MatterFab_Active = Internal_Overlay_MatterFab_Active; - - private static final CustomIcon Internal_Overlay_MatterFab_Animated = new CustomIcon( + public static final CustomIcon Overlay_MatterFab_Animated = new CustomIcon( "TileEntities/adv_machine_matterfab_animated"); - public static final CustomIcon Overlay_MatterFab_Animated = Internal_Overlay_MatterFab_Animated; - private static final CustomIcon Internal_Overlay_MatterFab_Active_Animated = new CustomIcon( + public static final CustomIcon Overlay_MatterFab_Active_Animated = new CustomIcon( "TileEntities/adv_machine_matterfab_active_animated"); - public static final CustomIcon Overlay_MatterFab_Active_Animated = Internal_Overlay_MatterFab_Active_Animated; - - private static final CustomIcon Internal_Overlay_Water = new CustomIcon("TileEntities/adv_machine_water"); - public static final CustomIcon Overlay_Water = Internal_Overlay_Water; - private static final CustomIcon Internal_Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum"); - public static final CustomIcon Overlay_UU_Matter = Internal_Overlay_UU_Matter; + public static final CustomIcon Overlay_Water = new CustomIcon("TileEntities/adv_machine_water"); + public static final CustomIcon Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum"); // GT++ Tiered Hulls public static final CustomIcon TEXTURE_CASING_TIERED_ULV = new CustomIcon("iconsets/TieredHulls/CASING_ULV"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java index e77915aa01..e24698812f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java @@ -5,7 +5,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { @@ -36,7 +35,7 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite) }; + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_TOP) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java index 23abfe1e3f..adaec8a51e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java @@ -5,7 +5,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { @@ -36,7 +35,7 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin) }; + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java index 379f67b55d..dce70d4ccf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java @@ -5,7 +5,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { @@ -36,7 +35,7 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga) }; + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_TOP) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index 6487fa18e6..52804f9ad2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -126,12 +126,12 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAAmazonPackagerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAAmazonPackager; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index efdf055bb2..cc182cf6d2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -218,12 +218,12 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialArcFurnaceActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialArcFurnace; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java index a9f18dfce8..82d18a9347 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -142,12 +142,12 @@ public class GregtechMetaTileEntity_IndustrialChisel @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialChiselActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialChisel; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index b71600e3fd..a20b879fb8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -158,12 +158,12 @@ public class GregtechMetaTileEntity_IndustrialCokeOven @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCACokeOvenActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCACokeOven; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index 779584e73e..4910ee4d2f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -142,12 +142,12 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialCuttingMachineActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialCuttingMachine; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 14e45a1a3f..f4b10890c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -155,12 +155,12 @@ public class GregtechMetaTileEntity_IndustrialDehydrator @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialDehydratorActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialDehydrator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index f12007b952..cf03c6aae9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -121,12 +121,12 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialElectrolyzerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialElectrolyzer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java index ea61048f33..9114fb5eac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java @@ -126,12 +126,12 @@ public class GregtechMetaTileEntity_IndustrialExtruder @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialExtruderActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialExtruder; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java index a34532ee83..254402d4c1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java @@ -137,12 +137,12 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAFluidHeaterActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAFluidHeater; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java index 8e2f040d75..44484cb90e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java @@ -190,12 +190,12 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialForgeHammerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialForgeHammer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index 0e2a72cfa4..39b5d6e73e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -152,12 +152,12 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialMixerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialMixer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java index 02b0bcf978..f40e851c55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java @@ -186,12 +186,12 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialMolecularTransformerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialMolecularTransformer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index ace7735725..d9a9a1549a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -193,12 +193,12 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialMultiMachineActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialMultiMachine; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index cb02137ba6..d7e7b2047f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -144,12 +144,12 @@ public class GregtechMetaTileEntity_IndustrialPlatePress @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialPlatePressActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialPlatePress; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index e4dd3d11ba..5189e546a5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -127,12 +127,12 @@ public class GregtechMetaTileEntity_IndustrialSifter @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialSifterActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialSifter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 14ff4ebb6d..d1e9e0d6a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -125,12 +125,12 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialThermalCentrifugeActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialThermalCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 36fb1d526d..a38b7f1a9e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -176,12 +176,12 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialVacuumFreezerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialVacuumFreezer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index 4a8a7df037..8645bc6686 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -179,12 +179,12 @@ public class GregtechMetaTileEntity_IndustrialWashPlant @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialWashPlantActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialWashPlant; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index ef4123273f..4304b5b52a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -128,12 +128,12 @@ public class GregtechMetaTileEntity_IndustrialWireMill @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDIndustrialWireMillActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDIndustrialWireMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java index 5f4203b99e..19873c9dca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -157,12 +157,12 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCASpargeTowerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCASpargeTower; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 4d8c4fb128..91a1274d69 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -200,12 +200,12 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAAdvancedEBFActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAAdvancedEBF; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java index 8685322ab8..f8579957f3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java @@ -156,12 +156,12 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAAdvancedHeatExchangerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAAdvancedHeatExchanger; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index 432ce23e74..a2bb155809 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -110,12 +110,12 @@ public class GregtechMetaTileEntity_Adv_Implosion @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAAdvancedImplosionActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAAdvancedImplosion; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index b7a4afb878..694444f423 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -301,12 +301,12 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAThermalBoilerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAThermalBoiler; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index d835d9be4c..3b99849803 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -260,12 +260,12 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAElementalDuplicatorActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAElementalDuplicator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index 8f807b94fd..b887c74a47 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -101,12 +101,12 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDFrothFlotationCellActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDFrothFlotationCell; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index cdb3ec58cb..5bea6bb91f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -141,12 +141,12 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE) + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_NUCLEAR_REACTOR_ACTIVE) .extFacing() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR) + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_NUCLEAR_REACTOR) .extFacing() .build() }; } @@ -155,12 +155,12 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE) + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_NUCLEAR_REACTOR_ACTIVE) .extFacing() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR) + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_NUCLEAR_REACTOR) .extFacing() .build() }; } @@ -435,7 +435,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg @Override public void explodeMultiblock() { this.mInventory[1] = null; - long explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + long explodevalue; for (final MetaTileEntity tTileEntity : this.mInputBusses) { explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); tTileEntity.getBaseMetaTileEntity() @@ -486,11 +486,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg if (aBaseMetaTileEntity.getWorld().isRemote) { if (aBaseMetaTileEntity.isActive()) { // Set casings active if we're warmed up. - if (this.mEfficiency == this.getMaxEfficiency(null)) { - this.turnCasingActive(true); - } else { - this.turnCasingActive(false); - } + this.turnCasingActive(this.mEfficiency == this.getMaxEfficiency(null)); } else { this.turnCasingActive(false); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 4c0fd015a4..8017ffbf47 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -150,12 +150,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCATreeFarmActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCATreeFarm; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index babf05a4e1..506a68ea12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -145,12 +145,12 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCDAlloyBlastSmelterActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCDAlloyBlastSmelter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java index a6f98b6d1f..520d52c9c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java @@ -154,12 +154,12 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAIndustrialRockBreakerActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAIndustrialRockBreaker; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index e77ac454ee..96a477bb26 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -189,12 +189,12 @@ public class GregtechMetaTileEntity_LargeRocketEngine @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCALargeRocketEngineActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCALargeRocketEngine; } @Override @@ -320,7 +320,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine /** * Consumes Fuel if required. Free Fuel Ticks are handled here. - * + * * @param aFuel * @return */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index d6e8fc728a..9f25f59f1f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -427,11 +427,11 @@ public class GregtechMetaTileEntity_QuantumForceTransformer } protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAQFTActive; } protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAQFT; } protected int getCasingTextureId() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index 0395ab5a01..0f3d201cb5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java @@ -402,12 +402,12 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa if (side == ForgeDirection.DOWN || side == ForgeDirection.UP) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory.builder() - .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default_Active) + .addIcon(TexturesGtBlock.oMCDSolarTowerActive) .extFacing() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory.builder() - .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default) + .addIcon(TexturesGtBlock.oMCDSolarTower) .extFacing() .build() }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index bec0812232..17e1093b71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -206,12 +206,12 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default_Active; + return TexturesGtBlock.oMCDAlgaePondBaseActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Default; + return TexturesGtBlock.oMCDAlgaePondBase; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 30d2f75457..b359a3b831 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -431,12 +431,12 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @Override protected IIconContainer getActiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; + return TexturesGtBlock.oMCAChemicalPlantActive; } @Override protected IIconContainer getInactiveOverlay() { - return TexturesGtBlock.Overlay_Machine_Controller_Advanced; + return TexturesGtBlock.oMCAChemicalPlant; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java index 91aeba3208..2e3370fe4c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java @@ -401,13 +401,13 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter if (aActive) { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)), TextureFactory.builder() - .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active) + .addIcon(TexturesGtBlock.oMCAMegaAlloyBlastSmelterActive) .extFacing() .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)), TextureFactory.builder() - .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced) + .addIcon(TexturesGtBlock.oMCAMegaAlloyBlastSmelter) .extFacing() .build() }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 90702f5bdc..e277eb4076 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -64,9 +64,9 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return side == ForgeDirection.UP ? new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE) } + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_FLUIDTANK) } : new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER) }; + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_FLUIDTANK) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 2e9c73808b..c3e2f8ea4e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -52,29 +52,23 @@ public class GregtechCustomHatches { GregtechItemList.Hatch_Input_Cryotheum.set( new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getFluidStack("cryotheum", 1) - .getFluid(), // Fluid - // to - // resitrct - // hatch - // to + .getFluid(), // Fluid to restrict hatch to 128000, // Capacity Hatch_Input_Cryotheum.ID, // ID "hatch.cryotheum.input.tier.00", // unlocal name - "Cryotheum Cooling Hatch" // Local name + "Cryotheum Cooling Hatch", // Local name + 5 // Casing Texture ).getStackForm(1L)); GregtechItemList.Hatch_Input_Pyrotheum.set( new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getFluidStack("pyrotheum", 1) - .getFluid(), // Fluid - // to - // resitrct - // hatch - // to + .getFluid(), // Fluid to restrict hatch to 128000, // Capacity Hatch_Input_Pyrotheum.ID, // ID "hatch.pyrotheum.input.tier.00", // unlocal name - "Pyrotheum Heating Vent" // Local name + "Pyrotheum Heating Vent", // Local name + 5 // Casing texture ).getStackForm(1L)); GregtechItemList.Hatch_Input_Naquadah.set( @@ -117,15 +111,12 @@ public class GregtechCustomHatches { GregtechItemList.Hatch_Input_Steam.set( new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getSteam(1) - .getFluid(), // Fluid - // to - // resitrct - // hatch - // to + .getFluid(), // Fluid to restrict hatch to 64000, // Capacity Hatch_Input_Steam.ID, // ID "hatch.steam.input.tier.00", // unlocal name - "Steam Hatch" // Local name + "Steam Hatch", // Local name + 0 // Casing texture ).getStackForm(1L)); } |