diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-10-31 18:20:16 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2022-10-31 18:20:16 +0100 |
| commit | 751e9117abff08d46d82081bc043757d65d67823 (patch) | |
| tree | c63546423f436a5f1cd077dbb836fe0ea78b2c91 /src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines | |
| parent | 444c1846d07a7eec71879cf039034ef8dccc60d0 (diff) | |
| download | GT5-Unofficial-751e9117abff08d46d82081bc043757d65d67823.tar.gz GT5-Unofficial-751e9117abff08d46d82081bc043757d65d67823.tar.bz2 GT5-Unofficial-751e9117abff08d46d82081bc043757d65d67823.zip | |
Revert "ref(texture_api): update to the texture api (#386)"
This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270.
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines')
26 files changed, 219 insertions, 209 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 363e6b1c95..417833a2ef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -6,8 +6,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.objects.GT_ItemStack; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.*; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -611,35 +610,35 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter) + new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter) + new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes) + new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes) + new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter) + new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java index 3a55f81f9f..6ba1e373eb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java @@ -10,7 +10,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.PlayerUtils; import java.util.ArrayList; @@ -102,12 +102,16 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (pSide < 2) ? null - : pActive ? TextureFactory.of(_mGTIco_Norm_Active) : TextureFactory.of(_mGTIco_Norm_Idle) + : pActive + ? new GT_RenderedTexture(_mGTIco_Norm_Active) + : new GT_RenderedTexture(_mGTIco_Norm_Idle) }; else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], - (pSide < 2) ? null : pActive ? TextureFactory.of(_mGTIco_TE_Active) : TextureFactory.of(_mGTIco_TE_Idle) + (pSide < 2) + ? null + : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 9c6f252208..23263bd9fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -11,7 +11,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; 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_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; @@ -59,14 +59,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi "Recycler.png", "", new ITexture[] { - TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), - TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), - TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active), - TextureFactory.of(TexturesGtBlock.Overlay_MatterFab), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast), - TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent), - TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), - TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), + new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast), + new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index 3e7fddb792..531c7c5694 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.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 gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -44,28 +44,28 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase { final ITexture[][][] rTextures = new ITexture[5][17][]; for (byte i = -1; i < 16; i++) { rTextures[0][(i + 1)] = new ITexture[] { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)) }; rTextures[1][(i + 1)] = new ITexture[] { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i + 1)] = new ITexture[] { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[3][(i + 1)] = new ITexture[] { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) }; rTextures[4][(i + 1)] = new ITexture[] { - TextureFactory.of( + new GT_RenderedTexture( Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) }; } return rTextures; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java index 1c939f88b3..f1e0cc7161 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java @@ -4,7 +4,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.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -81,70 +81,70 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Redox_3) + new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Redox_3) + new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index b81430156f..ce04d50fab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -4,7 +4,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.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -88,70 +88,70 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index 7476739285..9ba3db911a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -4,7 +4,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.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; @@ -67,12 +67,12 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { 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) }; } @@ -102,70 +102,70 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom) + new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index 832f9165de..9b60732f62 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.render.TextureFactory; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; @@ -125,80 +125,80 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel), - TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), + new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel), - TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) + new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), + new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - Te |
