From 751e9117abff08d46d82081bc043757d65d67823 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 31 Oct 2022 18:20:16 +0100 Subject: Revert "ref(texture_api): update to the texture api (#386)" This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270. --- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 10 ++--- ...GT_MetaTileEntity_ElectricInventoryManager.java | 26 ++++++------ .../GT_MetaTileEntity_TesseractGenerator.java | 10 ++--- .../GT_MetaTileEntity_TesseractTerminal.java | 10 ++--- .../generators/GT_MetaTileEntity_Boiler_Base.java | 12 +++--- .../generators/GT_MetaTileEntity_Boiler_HV.java | 12 +++--- .../generators/GT_MetaTileEntity_Boiler_LV.java | 14 ++++--- .../generators/GT_MetaTileEntity_Boiler_MV.java | 14 ++++--- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 14 +++---- .../generators/GT_MetaTileEntity_RfConvertor.java | 4 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 28 ++++++++----- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 32 ++++++++------- .../GregtechMetaTileEntityGeothermalGenerator.java | 31 +++++++------- .../GregtechMetaTileEntityRocketFuelGenerator.java | 32 ++++++++------- .../GregtechMetaTileEntitySolarGenerator.java | 48 ++++++++++++---------- .../generators/GregtechMetaTileEntity_RTG.java | 32 ++++++++------- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 4 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 4 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 6 +-- .../basic/GT_MetaTileEntity_CropHarvestor.java | 13 +++--- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 10 +++-- .../GregtechMetaAtmosphericReconditioner.java | 18 ++++---- .../machines/basic/GregtechMetaCondensor.java | 20 ++++----- .../basic/GregtechMetaGarbageCollector.java | 22 +++++----- .../basic/GregtechMetaPollutionCreator.java | 22 +++++----- .../basic/GregtechMetaPollutionDetector.java | 30 +++++++------- .../basic/GregtechMetaTileEntityChunkLoader.java | 42 +++++++++---------- ...GregtechMetaTileEntityThaumcraftResearcher.java | 15 ++++--- .../basic/GregtechMetaTileEntity_AutoChisel.java | 18 ++++---- .../basic/GregtechMetaTileEntity_BasicWasher.java | 18 ++++---- .../GregtechMetaTileEntity_ChemicalReactor.java | 18 ++++---- ...regtechMetaTileEntity_CompactFusionReactor.java | 27 ++++++------ .../basic/GregtechMetaTileEntity_PocketFusion.java | 27 ++++++------ .../GregtechMetaTileEntity_ReactorColdTrap.java | 18 ++++---- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 18 ++++---- .../basic/GregtechMetaWirelessCharger.java | 22 +++++----- .../GregtechMetaTileEntity_IronBlastFurnace.java | 10 +++-- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 9 ++-- .../GregtechMetaTileEntity_SteamCompressor.java | 11 +++-- .../GregtechMetaTileEntity_SteamMacerator.java | 12 +++--- .../turbines/GT_MTE_LargeTurbine_Gas.java | 6 +-- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 6 +-- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 6 +-- .../turbines/GT_MTE_LargeTurbine_Steam.java | 6 +-- ...chMetaTileEntity_PowerSubStationController.java | 4 +- .../misc/GT_TileEntity_ComputerCube.java | 8 ++-- .../tileentities/misc/TileEntitySolarHeater.java | 34 +++++++-------- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 16 ++++---- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 26 ++++++------ .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 6 +-- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 16 ++++---- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 4 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 26 ++++++------ .../GT_MetaTileEntity_ConnectableCrate.java | 12 +++--- .../storage/GT_MetaTileEntity_TieredChest.java | 6 +-- .../storage/GT_MetaTileEntity_TieredTank.java | 6 +-- .../storage/GregtechMetaEnergyBuffer.java | 34 +++++++-------- .../storage/GregtechMetaSafeBlock.java | 4 +- .../storage/shelving/GT4Entity_Shelf.java | 26 ++++++------ .../storage/shelving/GT4Entity_Shelf_Desk.java | 10 ++--- 60 files changed, 521 insertions(+), 484 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index 6cdd391c49..79400b68e6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -836,13 +836,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(BlockIcons.OVERLAY_PIPE) + Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) }; } @@ -855,14 +855,14 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java index be4eb1d4b8..ebce1fcec6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java @@ -7,7 +7,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.automation.GT_Container_ElectricInventoryManager; @@ -520,84 +520,84 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) }; } public ITexture[] getNegativeZ(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue) }; } public ITexture[] getPositiveZ(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan) }; } public ITexture[] getNegativeX(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple) }; } public ITexture[] getPositiveX(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Yellow) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow) }; } public ITexture[] getBottomRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) }; } public ITexture[] getTopRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone) }; } public ITexture[] getNegativeZRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone) }; } public ITexture[] getPositiveZRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone) }; } public ITexture[] getNegativeXRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone) }; } public ITexture[] getPositiveXRedstone(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone) + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 53886c1cac..b990e3c55e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Config; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; @@ -683,12 +683,12 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi final boolean aRedstone) { return aSide == aFacing ? new ITexture[] { - TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional), - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } : new ITexture[] { - TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional), - TextureFactory.of(Textures.BlockIcons.VOID) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GT_RenderedTexture(Textures.BlockIcons.VOID) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index cd4379b488..5d2a9ae009 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Config; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; @@ -551,12 +551,12 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic final boolean aRedstone) { return aSide == aFacing ? new ITexture[] { - TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional), - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } : new ITexture[] { - TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional), - TextureFactory.of(Textures.BlockIcons.VOID) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GT_RenderedTexture(Textures.BlockIcons.VOID) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 9f8d56c42d..5bd16c7fb2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -8,7 +8,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } public ITexture getOverlayIcon() { - return TextureFactory.of(Textures.BlockIcons.BOILER_FRONT); + return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT); } @Override @@ -76,13 +76,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { return rTextures; } - protected ITexture getCasingTexture() { + protected GT_RenderedTexture getCasingTexture() { if (this.tier == 1) { - return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE); + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); } else if (this.tier == 2) { - return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE); + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); } else { - return TextureFactory.of(Textures.BlockIcons.MACHINE_HV_SIDE); + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } // return new // GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); 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 ebaf1cbab4..867623f692 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 @@ -4,7 +4,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +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 { @@ -23,14 +23,14 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { } @Override - protected ITexture getCasingTexture() { - return TextureFactory.of(Textures.BlockIcons.MACHINE_HV_SIDE); + protected GT_RenderedTexture getCasingTexture() { + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { - super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT) + super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @@ -39,7 +39,7 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Casing_Material_Talonite) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite) }; } @@ -48,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } 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 7c6e725c4e..6aeedaa6f3 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 @@ -4,7 +4,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +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 { @@ -23,21 +23,23 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { } @Override - protected ITexture getCasingTexture() { - return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE); + protected GT_RenderedTexture getCasingTexture() { + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { - super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT) + super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { - super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Potin) + super.getTop(aColor)[0], + this.getCasingTexture(), + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin) }; } @@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } 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 46bb0fb9b1..9f329f92da 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 @@ -4,7 +4,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +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 { @@ -23,21 +23,23 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { } @Override - protected ITexture getCasingTexture() { - return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE); + protected GT_RenderedTexture getCasingTexture() { + return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { - super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT) + super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { - super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Tumbaga) + super.getTop(aColor)[0], + this.getCasingTexture(), + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga) }; } @@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java index c602d3172b..ba6b037d76 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java @@ -5,7 +5,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; import gtPlusPlus.core.lib.CORE; @@ -39,25 +39,25 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { final ITexture[][][] rTextures = new ITexture[4][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { final ITexture[] tmp0 = { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; final ITexture[] tmp1 = { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.BOILER_SOLAR) + new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) }; rTextures[1][(i + 1)] = tmp1; final ITexture[] tmp2 = { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[2][(i + 1)] = tmp2; final ITexture[] tmp3 = { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[3][(i + 1)] = tmp3; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java index 09410c5747..340a97fccf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java @@ -14,7 +14,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -70,7 +70,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[12][17][]; - ITexture aTex = TextureFactory.of(TexturesGtBlock.Casing_Material_ZirconiumCarbide); + GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide); for (byte i = -1; i < 16; i++) { rTextures[0][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]}; rTextures[1][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]}; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index 76613a0a72..7d9ecebf2c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -10,7 +10,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; @@ -113,38 +113,44 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBack(byte aColor) { - return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)}; + return new ITexture[] { + super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) + }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { - super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) + super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; } @Override public ITexture[] getTop(byte aColor) { - return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)}; + return new ITexture[] { + super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) + }; } @Override public ITexture[] getSides(byte aColor) { - return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)}; + return new ITexture[] { + super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) + }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -152,28 +158,28 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { - super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) + super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) + super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { - super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) + super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { - super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) + super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java index 93e21db944..2897f621d6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java @@ -8,7 +8,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.lib.CORE; @@ -88,17 +88,17 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke return rValue; } - private ITexture getCasingTexture() { + private GT_RenderedTexture getCasingTexture() { if (this.mTier <= 4) { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } else if (this.mTier == 5) { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced); } else { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra); } - // return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top); + // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } @Override @@ -113,20 +113,24 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke @Override public ITexture[] getBack(final byte aColor) { return new ITexture[] { - super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent) + super.getBack(aColor)[0], + this.getCasingTexture(), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) }; } @Override public ITexture[] getBottom(final byte aColor) { return new ITexture[] { - super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTop(final byte aColor) { - return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)}; + return new ITexture[] { + super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) + }; } @Override @@ -134,7 +138,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) }; } @@ -152,21 +156,21 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { - super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On) + super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) }; } @@ -175,7 +179,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java index fcf3ac37cc..ba63952baf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.core.lib.CORE; @@ -94,7 +94,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } @@ -103,15 +103,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public ITexture[] getBack(final byte aColor) { return new ITexture[] { super.getBack(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) }; } @Override public ITexture[] getBottom(final byte aColor) { return new ITexture[] { - super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) + super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; } @@ -119,21 +119,22 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) }; } @Override public ITexture[] getSides(final byte aColor) { - return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.BOILER_LAVA_FRONT)}; + return new ITexture[] {super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) + }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } @@ -142,15 +143,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) + super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; } @@ -158,15 +159,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) }; } @Override public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { - super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) + super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index 08e100f61c..b6c2f27ce6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java @@ -8,7 +8,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; @@ -75,17 +75,17 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue return rValue; } - private ITexture getCasingTexture() { + private GT_RenderedTexture getCasingTexture() { if (this.mTier <= 4) { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } else if (this.mTier == 5) { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced); } else { - return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra); + return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra); } - // return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top); + // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } @Override @@ -100,20 +100,24 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public ITexture[] getBack(final byte aColor) { return new ITexture[] { - super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent) + super.getBack(aColor)[0], + this.getCasingTexture(), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) }; } @Override public ITexture[] getBottom(final byte aColor) { return new ITexture[] { - super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTop(final byte aColor) { - return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)}; + return new ITexture[] { + super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) + }; } @Override @@ -121,7 +125,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) }; } @@ -139,21 +143,21 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { - super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On) + super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) }; } @@ -162,7 +166,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index 8b1c0c7ee1..660fdb50b6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -8,7 +8,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator; @@ -142,52 +142,58 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener } ITexture SolarArray[] = { - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_8V), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_MV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_HV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_EV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_ZPM), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL_UV), - TextureFactory.of(Textures.BlockIcons.SOLARPANEL) + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), + new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) }; @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } @Override public ITexture[] getBack(final byte aColor) { - return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)}; + return new ITexture[] { + super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) + }; } @Override public ITexture[] getBottom(final byte aColor) { - return new ITexture[] {super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)}; + return new ITexture[] { + super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) + }; } @Override public ITexture[] getTop(final byte aColor) { - return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)}; + return new ITexture[] {super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)}; } @Override public ITexture[] getSides(final byte aColor) { - return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)}; + return new ITexture[] { + super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) + }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -195,26 +201,26 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener @Override public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { - super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) + super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) + super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; } @Override public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] {super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)}; + return new ITexture[] {super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)}; } @Override public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { - super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) + super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index d18db633fd..5e8907073f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -228,22 +228,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { - super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) + super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { - super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) + super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; } @@ -251,8 +251,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getTop(byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; } @@ -260,7 +260,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getSides(byte aColor) { return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } @@ -269,22 +269,24 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { - super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) + super.getBackActive(aColor)[0], + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { - super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) + super.getBottomActive(aColor)[0], + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; } @@ -292,8 +294,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; } @@ -301,7 +303,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index 58f8249a19..b8f8004dad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], - TextureFactory.of((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) + new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index a92b28cb50..09e3e3201c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], - TextureFactory.of((IIcon