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 |