aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLéa Gris <lea.gris@noiraude.net>2022-10-03 21:53:50 +0200
committerGitHub <noreply@github.com>2022-10-03 21:53:50 +0200
commit0121112e5ea9c72050957af2c2ad4aecd9d70270 (patch)
tree60ce9a75d20a6d24023a636ec454d214f6bb0696 /src/main
parentef2dd18e2aaf27615e2aec3ab476f64596befc72 (diff)
downloadGT5-Unofficial-0121112e5ea9c72050957af2c2ad4aecd9d70270.tar.gz
GT5-Unofficial-0121112e5ea9c72050957af2c2ad4aecd9d70270.tar.bz2
GT5-Unofficial-0121112e5ea9c72050957af2c2ad4aecd9d70270.zip
ref(texture_api): update to the texture api (#386)
* ref(textures): replace deprecated texture objects with api * :spotlessapply
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/enums/TAE.java23
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java16
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java62
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java118
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java129
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java28
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java48
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java42
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java34
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java34
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java4
99 files changed, 802 insertions, 925 deletions
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index e45e9e4e58..244053cfa8 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -1,16 +1,17 @@
package gregtech.api.enums;
import gregtech.api.interfaces.ITexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.HashSet;
+import net.minecraftforge.common.util.ForgeDirection;
public class TAE {
@@ -19,7 +20,7 @@ public class TAE {
public static int gtPPLastUsedIndex = 64;
public static int secondaryIndex = 0;
- public static HashMap<Integer, GTPP_CopiedBlockTexture> mTAE = new HashMap<Integer, GTPP_CopiedBlockTexture>();
+ public static HashMap<Integer, ITexture> mTAE = new HashMap<Integer, ITexture>();
private static final HashSet<Integer> mFreeSlots = new HashSet<Integer>(64);
static {
@@ -33,18 +34,18 @@ public class TAE {
*
* @param aPage - The Texture page (0-3)
* @param aID - The ID on the specified page (0-15)
- * @param GTPP_CopiedBlockTexture - The Texture to register
+ * @param iTexture - The Texture to register
* @return - Did it register correctly?
*/
- public static boolean registerTexture(int aPage, int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+ public static boolean registerTexture(int aPage, int aID, ITexture iTexture) {
int aRealID = aID + (aPage * 16);
- return registerTexture(64 + aRealID, GTPP_CopiedBlockTexture);
+ return registerTexture(64 + aRealID, iTexture);
}
- public static boolean registerTexture(int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+ public static boolean registerTexture(int aID, ITexture iTexture) {
if (mFreeSlots.contains(aID)) {
mFreeSlots.remove(aID);
- mTAE.put(aID, GTPP_CopiedBlockTexture);
+ mTAE.put(aID, iTexture);
return true;
} else {
CORE.crash("Tried to register texture with ID " + aID + " to TAE, but it is already in use.");
@@ -69,7 +70,7 @@ public class TAE {
Logger.INFO("Free Page slots within TAE: " + aPageAndSlotFree);
Logger.INFO("Filling them with ERROR textures.");
for (int aFreeSlot : aTemp.values()) {
- registerTexture(aFreeSlot, new GTPP_CopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15));
+ registerTexture(aFreeSlot, TextureFactory.of(ModBlocks.blockCasingsTieredGTPP, 15, ForgeDirection.UP));
}
Logger.INFO("Finalising TAE.");
for (int aKeyTae : mTAE.keySet()) {
@@ -78,7 +79,7 @@ public class TAE {
Logger.INFO("Finalised TAE.");
}
- private static boolean registerTextures(GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
+ private static boolean registerTextures(ITexture iTexture) {
try {
// Handle page 2.
Logger.INFO("[TAE} Registering Texture, Last used casing ID is " + gtPPLastUsedIndex + ".");
@@ -88,7 +89,7 @@ public class TAE {
if (x != null) {
ITexture[][] h = (ITexture[][]) x.get(null);
if (h != null) {
- h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
+ h[64][secondaryIndex++] = iTexture;
x.set(null, h);
Logger.INFO("[TAE} Registered Texture with ID " + (secondaryIndex - 1)
+ " in secondary index.");
@@ -100,7 +101,7 @@ public class TAE {
// set to page 1.
else {
- Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, GTPP_CopiedBlockTexture);
+ Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, iTexture);
Logger.INFO("[TAE} Registered Texture with ID " + (gtPPLastUsedIndex) + " in main index.");
gtPPLastUsedIndex++;
return true;
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 81f1737f8c..cfc107b4fa 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.interfaces.ITexturedBlock;
import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
@@ -14,8 +15,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture;
import java.lang.reflect.Field;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -23,6 +22,7 @@ import net.minecraft.entity.EnumCreatureType;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
@@ -101,11 +101,11 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
public ITexture[] getTexture(Block block, byte side) {
if (this.blockMaterial != null) {
- GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
+ ITexture aIconSet = TextureFactory.of(
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
if (aIconSet != null) {
- return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};
+ return new ITexture[] {TextureFactory.of(Blocks.stone, 0, ForgeDirection.DOWN), aIconSet};
}
}
@@ -126,7 +126,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
}
}
}
- return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
+ return new ITexture[] {TextureFactory.of(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
}
@Override
@@ -214,11 +214,11 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
public ITexture[] getTexture(Block block, byte side) {
if (this.blockMaterial != null) {
- GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
+ ITexture aIconSet = TextureFactory.of(
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
if (aIconSet != null) {
- return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};
+ return new ITexture[] {TextureFactory.of(Blocks.stone, 0, ForgeDirection.DOWN), aIconSet};
}
}
@@ -239,7 +239,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
}
}
}
- return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
+ return new ITexture[] {TextureFactory.of(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 8f513e9001..60685786f3 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TextureSet;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
@@ -127,13 +127,13 @@ public class BaseItemComponent extends Item {
if (componentType == ComponentTypes.PLATE) {
GregTech_API.registerCover(
componentMaterial.getPlate(1),
- new GT_RenderedTexture(
+ TextureFactory.of(
componentMaterial.getTextureSet().mTextures[71], componentMaterial.getRGBA(), false),
null);
} else if (componentType == ComponentTypes.PLATEDOUBLE) {
GregTech_API.registerCover(
componentMaterial.getPlateDouble(1),
- new GT_RenderedTexture(
+ TextureFactory.of(
componentMaterial.getTextureSet().mTextures[72], componentMaterial.getRGBA(), false),
null);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index a31e728e23..29609f7edc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.enums;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
@@ -16,7 +16,7 @@ public class CustomGtTextures {
PUMP,
SKOOKUMCHOOCHER;
- public static final ITexture[] ERROR_RENDERING = new ITexture[] {new GT_RenderedTexture(RENDERING_ERROR)};
+ public static final ITexture[] ERROR_RENDERING = new ITexture[] {TextureFactory.of(RENDERING_ERROR)};
protected IIcon mIcon, mOverlay;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
index f6cf2391b3..f7aab7d450 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
@@ -11,7 +11,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -991,42 +991,42 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
index 02f0a3ff40..b5dc81b542 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
@@ -9,7 +9,6 @@ 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_GT_Recipe;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
@@ -152,56 +151,56 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
@Override
public ITexture[] getFrontFacingInactive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[0])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[0])
};
}
@Override
public ITexture[] getBottomFacingInactive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[2])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[2])
};
}
@Override
public ITexture[] getTopFacingInactive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[3])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[3])
};
}
@Override
public ITexture[] getSideFacingInactive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[4])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[4])
};
}
@Override
public ITexture[] getFrontFacingActive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[5])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[5])
};
}
@Override
public ITexture[] getBottomFacingActive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[7])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[7])
};
}
@Override
public ITexture[] getTopFacingActive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[8])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[8])
};
}
@Override
public ITexture[] getSideFacingActive(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[9])
+ Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[9])
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
index 007e6a1761..bd70d916c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
@@ -10,7 +10,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -974,42 +974,42 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
index b2ea5a62ec..81a61e98b4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.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_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -50,12 +50,12 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Control_Core)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Control_Core)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
index 500f1945bc..a3847dfa50 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.api.objects.Logger;
@@ -43,12 +43,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
index b11b3bc78e..950ddbffbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
@@ -6,7 +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_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.random.XSTR;
import gtPlusPlus.core.lib.CORE;
@@ -89,15 +89,11 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
- };
+ return new ITexture[] {aBaseTexture, TextureFactory.of((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
- };
+ return new ITexture[] {aBaseTexture, TextureFactory.of((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
}
public boolean isSimpleMachine() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
index d56a95d60f..b20c463538 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
@@ -75,12 +75,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Charger)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Charger)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 94b927c80d..a908ea75f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.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_Hatch_Muffler;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Config;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.general.ItemAirFilter;
@@ -80,11 +80,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
}
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
}
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
}
public boolean isValidSlot(int aIndex) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
index 350b7a788a..1f3260c861 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
@@ -1,14 +1,12 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures;
import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -56,16 +54,11 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture,
- new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
- };
+ return new ITexture[] {aBaseTexture, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)};
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
- };
+ return new ITexture[] {aBaseTexture, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)};
}
public boolean allowPutStack(
@@ -98,7 +91,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
}
public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return (MetaTileEntity) new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures);
+ return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures);
}
@Override
@@ -201,9 +194,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
? StaticFields59.getCasingTexturePages(a2, texturePointer)
: BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
- return new ITexture[] {
- g, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)
- };
+ return new ITexture[] {g, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)};
}
return aSide != aFacing
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
index d6b0a570ac..b644aa9cd6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
@@ -6,7 +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_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
@@ -66,12 +66,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Discharger)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Discharger)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index 0a2ccdb8e5..0fdb0cee78 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.block.Block;
@@ -117,10 +117,10 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
public void generateParticles(World aWorld, String name) {}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Water)};
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Water)};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
index d50d55b721..6a0fcfe8d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
@@ -11,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -198,7 +197,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getSideFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -207,7 +206,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getSideFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -216,7 +215,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getFrontFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -225,7 +224,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getFrontFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -234,21 +233,21 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getTopFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
};
}
public ITexture[] getTopFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
};
}
public ITexture[] getBottomFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -257,7 +256,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getBottomFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -266,57 +265,57 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
index ab721cd605..f166d7f3bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
@@ -11,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.render.TextureFactory;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.EntityPlayer;
@@ -128,7 +127,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getSideFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -137,7 +136,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getSideFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -146,7 +145,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getFrontFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -155,7 +154,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getFrontFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -164,21 +163,21 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getTopFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
};
}
public ITexture[] getTopFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
};
}
public ITexture[] getBottomFacingActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -187,7 +186,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getBottomFacingInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -196,57 +195,57 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
: Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
mTier == 1
? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
: Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index 5973d21fc5..41433e50f9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -8,7 +8,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
@@ -276,8 +276,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
private ITexture getFrontFacingTurbineTexture() {
if (!mHasController) {
return this.getBaseMetaTileEntity().isActive()
- ? new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4])
- : new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]);
+ ? TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4])
+ : TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]);
} else {
if (usingAnimations()) {
if (isControllerActive()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index eff2413102..6d285a7f91 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable {
@@ -147,60 +147,60 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
if (!mInsulated)
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], Dyes.getModulation(aColorIndex, vRGB))
};
if (aConnected) {
float tThickNess = getThickNess();
if (tThickNess < 0.124F)
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.374F) // 0.375 x1
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_TINY,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.499F) // 0.500 x2
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_SMALL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.624F) // 0.625 x4
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_MEDIUM,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.749F) // 0.750 x8
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
INSULATION_MEDIUM_PLUS, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.874F) // 0.825 x12
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_LARGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_HUGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
@@ -235,60 +235,60 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
if (!(this.mInsulated))
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], Dyes.getModulation(aColorIndex, this.vRGB))
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], Dyes.getModulation(aColorIndex, this.vRGB))
};
if (aConnected) {
float tThickNess = getThickNess();
if (tThickNess < 0.124F)
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.374F)
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_TINY,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.499F)
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_SMALL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.624F)
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_MEDIUM,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.749F)
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_LARGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
if (tThickNess < 0.874F)
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_HUGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
+ TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
index 14399e525d..d0b8fc6cf6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaTreeFarmerBase;
import net.minecraft.nbt.NBTTagCompound;
@@ -47,7 +47,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase
@Override
public ITexture getOverlayIcon() {
- return new GT_RenderedTexture(Textures.BlockIcons.VOID);
+ return TextureFactory.of(Textures.BlockIcons.VOID);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index efc2d008bb..b6b588342b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -16,7 +16,7 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Proxy;
import gtPlusPlus.api.objects.Logger;
@@ -142,56 +142,52 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
final boolean aRedstone) {
if (!this.mInsulated) {
return new ITexture[] {
- new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa)
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa)
};
}
if (aConnected) {
final float tThickNess = this.getThickNess();
if (tThickNess < 0.37F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_TINY,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
if (tThickNess < 0.49F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_SMALL,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
if (tThickNess < 0.74F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_MEDIUM,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
if (tThickNess < 0.99F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_LARGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
return new ITexture[] {
- new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
+ TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_HUGE,
Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index 294bee0b05..458f53a8e7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -10,7 +10,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.*;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.api.objects.data.*;
@@ -65,9 +64,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex())};
}
- protected abstract GT_RenderedTexture getFrontOverlay();
+ protected abstract ITexture getFrontOverlay();
- protected abstract GT_RenderedTexture getFrontOverlayActive();
+ protected abstract ITexture getFrontOverlayActive();
private int getCasingTextureIndex() {
return 10;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index a76ed88a17..9f93f31251 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -46,8 +46,8 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
final ITexture[][][] rTextures = new ITexture[6][17][];
final ITexture tIcon = this.getOverlayIcon(),
- tOut = new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST),
- tUp = new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT);
+ tOut = TextureFactory.of(Textures.BlockIcons.OVERLAY_QCHEST),
+ tUp = TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_VENT);
for (byte i = -1; i < 16; i++) {
rTextures[0][i + 1] =
new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tUp, tIcon}; // Back
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
index 39d61acebc..b457387aa3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machine
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.entity.player.EntityPlayer;
@@ -158,23 +158,23 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Acacia_Log)};
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Podzol)};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
}
public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
index 46666114c1..cd12ef5869 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -24,12 +24,12 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Catalyst)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Catalyst)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
index 265088a9e0..bdab90d15c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -24,12 +24,12 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+ return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
deleted file mode 100644
index 5336b60fc7..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.objects;
-
-import gregtech.api.enums.Dyes;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import net.minecraft.block.Block;
-
-/**
- * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * @author Alkalus
- *
- */
-@SuppressWarnings("deprecation")
-public class GTPP_CopiedBlockTexture extends GT_CopiedBlockTexture {
-
- public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
- super(aBlock, aMeta, aMeta, aRGBa, aAllowAlpha);
- }
-
- public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) {
- this(aBlock, aSide, aMeta, aRGBa, true);
- }
-
- public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta) {
- this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
deleted file mode 100644
index 6764a1e206..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.objects;
-
-import gregtech.api.enums.Dyes;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.objects.GT_RenderedTexture;
-
-/**
- * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * @author Alkalus
- *
- */
-@SuppressWarnings("deprecation")
-public class GTPP_RenderedTexture extends GT_RenderedTexture {
-
- public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
- super(aIcon, aRGBa, aAllowAlpha);
- }
-
- public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
- this(aIcon, aRGBa, true);
- }
-
- public GTPP_RenderedTexture(IIconContainer aIcon) {
- this(aIcon, Dyes._NULL.mRGBa);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 026d3d471f..fda6ef9653 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -22,7 +22,7 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
if (i == 2 || i == 3 || i == 4) {
continue;
}
- TAE.registerTexture(0, i, new GTPP_CopiedBlockTexture(this, 6, i));
+ TAE.registerTexture(0, i, TextureFactory.of(this, i));
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index f71805784b..3efd94582c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -1,11 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
import java.util.List;
@@ -42,7 +42,7 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
if (i == 4 || i == 10 || i == 11 || i == 12 || i == 14) {
continue;
}
- TAE.registerTexture(1, i, new GTPP_CopiedBlockTexture(this, 6, i));
+ TAE.registerTexture(1, i, TextureFactory.of(this, i));
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 59bcfa5347..8adf468731 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -3,11 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
@@ -48,7 +48,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
if (i >= 4 && i <= 8) {
continue;
}
- TAE.registerTexture(2, i, new GTPP_CopiedBlockTexture(this, 6, i));
+ TAE.registerTexture(2, i, TextureFactory.of(this, i));
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index 5456aa27a2..89ef238eab 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -18,7 +18,7 @@ public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract
if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 12 || i == 13 || i == 14 || i == 15) {
continue;
}
- TAE.registerTexture(3, i, new GTPP_CopiedBlockTexture(this, 6, i));
+ TAE.registerTexture(3, i, TextureFactory.of(this, i));
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base"); // 48
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 834fb2c186..8f54ff8e57 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -4,10 +4,10 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGrinderMultiblock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.item.ItemStack;
@@ -25,23 +25,23 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", GT_Material_Casings.INSTANCE);
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill Casing
- TAE.registerTexture(0, 2, new GTPP_CopiedBlockTexture(this, 6, 0));
+ TAE.registerTexture(0, 2, TextureFactory.of(this, 0));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill Pipe
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill Gearbox
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator Casing
- TAE.registerTexture(0, 3, new GTPP_CopiedBlockTexture(this, 6, 3));
+ TAE.registerTexture(0, 3, TextureFactory.of(this, 3));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge Tower Casing
- TAE.registerTexture(0, 4, new GTPP_CopiedBlockTexture(this, 6, 4));
+ TAE.registerTexture(0, 4, TextureFactory.of(this, 4));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
- TAE.registerTexture(1, 10, new GTPP_CopiedBlockTexture(this, 6, 5));
+ TAE.registerTexture(1, 10, TextureFactory.of(this, 5));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer Casing
- TAE.registerTexture(1, 11, new GTPP_CopiedBlockTexture(this, 6, 6));
+ TAE.registerTexture(1, 11, TextureFactory.of(this, 6));
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", ""); // Unused
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", ""); // Unused
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", ""); // Unused
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index f0a69e49d3..9a375296d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import java.util.List;
import net.minecraft.block.Block;
@@ -42,7 +42,7 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing");
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing");
- TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2));
+ TAE.registerTexture(84, TextureFactory.of(this, 2));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index 96a4e6da82..a0a8a3bf34 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -4,10 +4,10 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler;
import java.util.List;
@@ -59,7 +59,7 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing");
- TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14));
+ TAE.registerTexture(1, 12, TextureFactory.of(this, 14));
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", ""); // Unused
GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index a0e7fd0875..67b2eef707 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
@@ -96,8 +96,8 @@ public class TexturesGtBlock {
}
}
- public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) {
- return new GT_RenderedTexture(aIcon, aRGB);
+ public static ITexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) {
+ return TextureFactory.of(aIcon, aRGB);
}
/*
@@ -744,68 +744,72 @@ public class TexturesGtBlock {
// Overlay Arrays
public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0})
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 100, 0, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 255, 30, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {128, 128, 128, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0})
};
public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0})
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 100, 0, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 255, 30, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {128, 128, 128, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+ TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0})
};
public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_1, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_2, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_3, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_4, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_5, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_6, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_7, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_8, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_9, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_10, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_11, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_12, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_13, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_14, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_15, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_CABINET_16, new short[] {255, 255, 255, 0}),
};
- public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] {255, 255, 255, 0}),
- };
+ public static ITexture[] OVERLAYS_COMPARTMENT_FRONT;
+
+ static {
+ OVERLAYS_COMPARTMENT_FRONT = new ITexture[] {
+ TextureFactory.of(OVERLAY_COMPARTMENT_1, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_2, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_3, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_4, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_5, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_6, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_7, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_8, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_9, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_10, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_11, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_12, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_13, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_14, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_15, new short[] {255, 255, 255, 0}),
+ TextureFactory.of(OVERLAY_COMPARTMENT_16, new short[] {255, 255, 255, 0}),
+ };
+ }
public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] {
TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
index 7012f6d0f7..9dc667974f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -4,8 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
@@ -65,7 +64,7 @@ public class MetaCustomCoverItem extends Item {
}
GregTech_API.registerCover(
thisStack,
- new GT_MultiTexture(new ITexture[] {new GT_RenderedTexture(mTextures[i])}),
+ TextureFactory.of(new ITexture[] {TextureFactory.of(mTextures[i])}),
new GTPP_Cover_ToggleVisual());
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 9ff348ddcc..84d6138a67 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -10,10 +10,9 @@ import gregtech.api.enums.SubTag;
import gregtech.api.enums.TC_Aspects;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_MultiTexture;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.objects.ItemData;
import gregtech.api.objects.MaterialStack;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_FoodStat;
import gregtech.api.util.GT_ModHandler;
import gregtech.common.covers.GT_Cover_Arm;
@@ -88,30 +87,26 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
}));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(8196));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[6][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[6][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(32768));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[7][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[7][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(131072));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(524288));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L),
@@ -244,30 +239,30 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.plate.get(Materials.Rubber)});
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
+ TextureFactory.of(new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(400));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
+ TextureFactory.of(new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(100));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
+ TextureFactory.of(new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(20));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
+ TextureFactory.of(new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(4));
tLastID = 12;
@@ -383,30 +378,26 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.cableGt01.get(Materials.Aluminium)});
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[1][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(400));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(100));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[3][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(20));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(4));
tLastID = 20;
@@ -777,44 +768,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(8));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_LV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(64));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_MV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(512));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_HV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(4096));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_EV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(32768));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_IV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)
}),
new GTPP_Cover_Overflow(262144));
@@ -925,7 +910,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
new Object[] {}));
GregTech_API.registerCover(
mMachineCasingCovers[i].get(1L),
- new GT_MultiTexture(new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[i][0]}),
+ TextureFactory.of(new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[i][0]}),
new GTPP_Cover_ToggleVisual());
}
}
@@ -972,12 +957,12 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregtechItemList.Cover_Overflow_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)", "Maximum void amount: 32768000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
GregtechItemList.Cover_Overflow_Item_IV.set(this.addItem(170, "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768));
+ GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), TextureFactory.of(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144));
*/
}
@@ -1030,21 +1015,20 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[5][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(8));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[1][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(1600));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[1][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(1600));
@@ -1097,21 +1081,20 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[8][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PUMP)
}),
new GT_Cover_Pump(524288));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_CONVEYOR)
}),
new GT_Cover_Conveyor(4));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
+ TextureFactory.of(new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[4][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ARM)
}),
new GT_Cover_Arm(4));
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 79400b68e6..6cdd391c49 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+ TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE)
+ Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+ TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+ TextureFactory.of(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 ebce1fcec6..be4eb1d4b8 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green)
};
}
public ITexture[] getNegativeZ(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue)
};
}
public ITexture[] getPositiveZ(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan)
};
}
public ITexture[] getNegativeX(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple)
};
}
public ITexture[] getPositiveX(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Yellow)
};
}
public ITexture[] getBottomRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
};
}
public ITexture[] getTopRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone)
};
}
public ITexture[] getNegativeZRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone)
};
}
public ITexture[] getPositiveZRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone)
};
}
public ITexture[] getNegativeXRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone)
};
}
public ITexture[] getPositiveXRedstone(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone)
+ TextureFactory.of(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 b990e3c55e..53886c1cac 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
}
: new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(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 5d2a9ae009..cd4379b488 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
}
: new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(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 5bd16c7fb2..9f8d56c42d 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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 new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT);
+ return TextureFactory.of(Textures.BlockIcons.BOILER_FRONT);
}
@Override
@@ -76,13 +76,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
return rTextures;
}
- protected GT_RenderedTexture getCasingTexture() {
+ protected ITexture getCasingTexture() {
if (this.tier == 1) {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+ return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE);
} else if (this.tier == 2) {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+ return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE);
} else {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+ return TextureFactory.of(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 867623f692..ebaf1cbab4 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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 GT_RenderedTexture getCasingTexture() {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+ protected ITexture getCasingTexture() {
+ return TextureFactory.of(Textures.BlockIcons.MACHINE_HV_SIDE);
}
@Override
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
+ super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(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(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite)
+ TextureFactory.of(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(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+ TextureFactory.of(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 6aeedaa6f3..7c6e725c4e 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
@@ -23,23 +23,21 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
}
@Override
- protected GT_RenderedTexture getCasingTexture() {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+ protected ITexture getCasingTexture() {
+ return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE);
}
@Override
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
+ super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT)
};
}
@Override
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
- super.getTop(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin)
+ super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Potin)
};
}
@@ -48,7 +46,7 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
return new ITexture[] {
super.getFrontActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+ TextureFactory.of(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 9f329f92da..46bb0fb9b1 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
@@ -23,23 +23,21 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
}
@Override
- protected GT_RenderedTexture getCasingTexture() {
- return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+ protected ITexture getCasingTexture() {
+ return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE);
}
@Override
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
+ super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT)
};
}
@Override
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
- super.getTop(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga)
+ super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Tumbaga)
};
}
@@ -48,7 +46,7 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
return new ITexture[] {
super.getFrontActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+ TextureFactory.of(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 ba6b037d76..c602d3172b 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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 = {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))
};
rTextures[0][(i + 1)] = tmp0;
final ITexture[] tmp1 = {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)
+ TextureFactory.of(Textures.BlockIcons.BOILER_SOLAR)
};
rTextures[1][(i + 1)] = tmp1;
final ITexture[] tmp2 = {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))
};
rTextures[2][(i + 1)] = tmp2;
final ITexture[] tmp3 = {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
+ TextureFactory.of(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 340a97fccf..09410c5747 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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][];
- GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide);
+ ITexture aTex = TextureFactory.of(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 7d9ecebf2c..76613a0a72 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe;
@@ -113,44 +113,38 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
public ITexture[] getFront(byte aColor) {
return new ITexture[] {
super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
+ TextureFactory.of(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], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
- };
+ return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};
}
@Override
public ITexture[] getBottom(byte aColor) {
return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
+ super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
};
}
@Override
public ITexture[] getTop(byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)
- };
+ return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)};
}
@Override
public ITexture[] getSides(byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
- };
+ return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};
}
@Override
public ITexture[] getFrontActive(byte aColor) {
return new ITexture[] {
super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
};
}
@@ -158,28 +152,28 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
@Override
public ITexture[] getBackActive(byte aColor) {
return new ITexture[] {
- super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
+ super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
};
}
@Override
public ITexture[] getBottomActive(byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
+ super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
};
}
@Override
public ITexture[] getTopActive(byte aColor) {
return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)
+ super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)
};
}
@Override
public ITexture[] getSidesActive(byte aColor) {
return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
+ super.getSidesActive(aColor)[0], TextureFactory.of(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 2897f621d6..93e21db944 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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 GT_RenderedTexture getCasingTexture() {
+ private ITexture getCasingTexture() {
if (this.mTier <= 4) {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
} else if (this.mTier == 5) {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
} else {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra);
}
- // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ // return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
}
@Override
@@ -113,24 +113,20 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
@Override
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
- super.getBack(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
+ super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent)
};
}
@Override
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
+ return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
}
@Override
@@ -138,7 +134,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
return new ITexture[] {
super.getSides(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
};
}
@@ -156,21 +152,21 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
return new ITexture[] {
super.getBackActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast)
};
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
@Override
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
+ super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)
};
}
@@ -179,7 +175,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
return new ITexture[] {
super.getSidesActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
+ TextureFactory.of(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 ba63952baf..fcf3ac37cc 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ TextureFactory.of(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],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
};
}
@Override
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
+ super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
};
}
@@ -119,22 +119,21 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
super.getTop(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
};
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)
- };
+ return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.BOILER_LAVA_FRONT)};
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
};
}
@@ -143,15 +142,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
super.getBackActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
};
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
+ super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
};
}
@@ -159,15 +158,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
super.getTopActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
+ TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
};
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)
+ super.getSidesActive(aColor)[0], TextureFactory.of(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 b6c2f27ce6..08e100f61c 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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 GT_RenderedTexture getCasingTexture() {
+ private ITexture getCasingTexture() {
if (this.mTier <= 4) {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
} else if (this.mTier == 5) {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
} else {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra);
}
- // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ // return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
}
@Override
@@ -100,24 +100,20 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
@Override
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
- super.getBack(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
+ super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent)
};
}
@Override
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
+ return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
}
@Override
@@ -125,7 +121,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
return new ITexture[] {
super.getSides(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
};
}
@@ -143,21 +139,21 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
return new ITexture[] {
super.getBackActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast)
};
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
@Override
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
+ super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)
};
}
@@ -166,7 +162,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
return new ITexture[] {
super.getSidesActive(aColor)[0],
this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
+ TextureFactory.of(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 660fdb50b6..8b1c0c7ee1 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
@@ -142,58 +142,52 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
}
ITexture SolarArray[] = {
- 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)
+ 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)
};
@Override
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
+ TextureFactory.of(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], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
}
@Override
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] {super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
+ return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)};
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
};
}
@@ -201,26 +195,26 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
@Override
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
- super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+ super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
};
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+ super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
};
}
@Override
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
+ return new ITexture[] {super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)};
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+ super.getSidesActive(aColor)[0], TextureFactory.of(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 5e8907073f..d18db633fd 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB)
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB)
};
}
@Override
public ITexture[] getBack(byte aColor) {
return new ITexture[] {
- super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
+ super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
};
}
@Override
public ITexture[] getBottom(byte aColor) {
return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
+ super.getBottom(aColor)[0], TextureFactory.of(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],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+ TextureFactory.of(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)],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()]
};
}
@@ -269,24 +269,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
public ITexture[] getFrontActive(byte aColor) {
return new ITexture[] {
super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE)
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE)
};
}
@Override
public ITexture[] getBackActive(byte aColor) {
return new ITexture[] {
- super.getBackActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
+ super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
};
}
@Override
public ITexture[] getBottomActive(byte aColor) {
return new ITexture[] {
- super.getBottomActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
+ super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
};
}
@@ -294,8 +292,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
public ITexture[] getTopActive(byte aColor) {
return new ITexture[] {
super.getTopActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
};
}
@@ -303,7 +301,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)],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ TextureFactory.of(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 b8f8004dad..58f8249a19 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
+ TextureFactory.of((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 09e3e3201c..a92b28cb50 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
+ TextureFactory.of((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
index fb2af1cd44..922d8ae37e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -7,7 +7,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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
@@ -80,9 +80,9 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
final ITexture[][][] rTextures = new ITexture[2][17][];
k = j ? g : h;
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] {new GT_RenderedTexture(k)};
+ rTextures[0][i + 1] = new ITexture[] {TextureFactory.of(k)};
rTextures[1][i + 1] = new ITexture[] {
- new GT_RenderedTexture(k),
+ TextureFactory.of(k),
this.mInventory.length > 4
? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mVoltageTier]
: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mVoltageTier]
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 bea3645a03..d18f52f3ff 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
@@ -5,7 +5,8 @@ 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.*;
+import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -656,35 +657,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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
+ TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
+ TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
+ TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
+ TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
+ TextureFactory.of(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 6ba1e373eb..3a55f81f9f 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.ArrayList;
@@ -102,16 +102,12 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
(pSide < 2)
? null
- : pActive
- ? new GT_RenderedTexture(_mGTIco_Norm_Active)
- : new GT_RenderedTexture(_mGTIco_Norm_Idle)
+ : pActive ? TextureFactory.of(_mGTIco_Norm_Active) : TextureFactory.of(_mGTIco_Norm_Idle)
};
else
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
- (pSide < 2)
- ? null
- : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle)
+ (pSide < 2) ? null : pActive ? TextureFactory.of(_mGTIco_TE_Active) : TextureFactory.of(_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 23263bd9fd..9c6f252208 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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[] {
- 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)
+ 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)
});
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 531c7c5694..3e7fddb792 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))
};
rTextures[1][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE)
};
rTextures[2][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE)
};
rTextures[3][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER)
};
rTextures[4][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE)
+ TextureFactory.of(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 f1e0cc7161..1c939f88b3 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
+ TextureFactory.of(TexturesGtBlock.Casing_Redox_3)
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
+ TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
+ TextureFactory.of(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 ce04d50fab..b81430156f 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(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 9ba3db911a..7476739285 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
}
: new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
+ TextureFactory.of(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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(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 9b60732f62..832f9165de 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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
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],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+ TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
+ TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
index ea2f47ab8e..c960b07767 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -74,13 +74,11 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_A)
- };
+ return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Metal_Grate_A)};
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_B)
- };
+ return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Metal_Grate_B)};
}
public ITexture[] getBottom(final byte aColor) {
@@ -88,13 +86,12 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+ return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)};
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -111,7 +108,7 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
- getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
index ae8be6a161..d31dbc6f88 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.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_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -32,14 +32,14 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
"Compressor.png",
"",
new ITexture[] {
- new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
- new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
- new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB)
+ TextureFactory.of(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+ TextureFactory.of(BlockIcons.OVERLAY_SIDE_MASSFAB),
+ TextureFactory.of(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
+ TextureFactory.of(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
+ TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active),
+ TextureFactory.of(TexturesGtBlock.Overlay_MatterFab),
+ TextureFactory.of(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+ TextureFactory.of(BlockIcons.OVERLAY_BOTTOM_MASSFAB)
});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
index 268863ffd2..3a82df61e2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.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_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
@@ -27,14 +27,14 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
"PotionBrewer.png",
"",
new ITexture[] {
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)
});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
index 2ae5e1e54a..a29d589c07 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
@@ -45,14 +45,14 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
"ChemicalReactor.png",
"",
new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top)
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Side),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Front),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+ TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top)
});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
index eb52042b9b..b79daae514 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
@@ -6,7 +6,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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
@@ -73,8 +73,8 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
return this.mTier == 6 ? 0 : this.mTier == 7 ? 1 : 2;
}
- private GT_RenderedTexture getCasingTexture() {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+ private ITexture getCasingTexture() {
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
}
@Override
@@ -382,47 +382,46 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab)};
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
- };
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active)};
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+ this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
index 08c9934db8..3986a90871 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
@@ -6,7 +6,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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
@@ -75,8 +75,8 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
return this.mTier == 6 ? 0 : this.mTier == 7 ? 1 : 2;
}
- private GT_RenderedTexture getCasingTexture() {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
+ private ITexture getCasingTexture() {
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
}
@Override
@@ -386,47 +386,46 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab)};
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
- };
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active)};
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+ this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
index f9ecc4be18..ecb11646fe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
@@ -16,14 +16,14 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba
public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, 1, "Just like the Arctic", 2, 9, "Dehydrator.png", "", new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
index 8f8711a7fe..21228465e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
@@ -27,14 +27,14 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt
"Dehydrator.png",
"",
new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+ TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index db74a46f1b..90a514a126 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.core.lib.CORE;
@@ -124,70 +124,70 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
index 439ab234cf..47a14750e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.block.ModBlocks;
@@ -25,11 +25,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity {
- private static final ITexture[] FACING_SIDE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
- private static final ITexture[] FACING_FRONT = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
- private static final ITexture[] FACING_ACTIVE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
- };
+ private static final ITexture[] FACING_SIDE = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
+ private static final ITexture[] FACING_FRONT = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
+ private static final ITexture[] FACING_ACTIVE = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)};
public int mMaxProgresstime = 0;
public int mUpdate = 30;
public int mProgresstime = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index 8df07d8990..c9406df111 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -11,7 +11,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
@@ -112,7 +111,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
final boolean aRedstone) {
if (aSide == aFacing) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
TextureFactory.builder()
.addIcon(this.getIconOverlay())
@@ -121,12 +120,12 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
};
} else if (!aActive) {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
};
} else {
return new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
};
}
@@ -134,7 +133,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
@Override
public ITexture getTextureOverlay() {
- return new GT_RenderedTexture(
+ return TextureFactory.of(
this.mMaxProgresstime > 0
? TexturesGtBlock.Casing_Machine_Screen_3
: TexturesGtBlock.Casing_Machine_Screen_1);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
index b030d58993..cc16341236 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
@@ -12,9 +12,10 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
@@ -42,13 +43,13 @@ public class GregtechMetaTileEntity_SteamCompressor
}
@Override
- protected GT_RenderedTexture getFrontOverlay() {
- return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
+ protected ITexture getFrontOverlay() {
+ return TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
}
@Override
- protected GT_RenderedTexture getFrontOverlayActive() {
- return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
+ protected ITexture getFrontOverlayActive() {
+ return TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
index b41ccfe2c8..2c55fc7419 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
@@ -11,10 +11,10 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import gregtech.api.enums.ItemList;
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.metatileentity.implementations.*;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
@@ -42,13 +42,13 @@ public class GregtechMetaTileEntity_SteamMacerator
}
@Override
- protected GT_RenderedTexture getFrontOverlay() {
- return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
+ protected ITexture getFrontOverlay() {
+ return TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
}
@Override
- protected GT_RenderedTexture getFrontOverlayActive() {
- return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
+ protected ITexture getFrontOverlayActive() {
+ return TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
index d0a7ba9da9..dde4c1127e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
@@ -5,7 +5,7 @@ import static gtPlusPlus.core.lib.CORE.RANDOM;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
@@ -161,11 +161,11 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
@Override
protected ITexture getTextureFrontFace() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5);
}
@Override
protected ITexture getTextureFrontFaceActive() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
index aad8b0c368..c41af18a23 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
@@ -268,11 +268,11 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
@Override
protected ITexture getTextureFrontFace() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU5);
}
@Override
protected ITexture getTextureFrontFaceActive() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
index f2de4a2e81..0702552aee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
@@ -4,7 +4,7 @@ import gregtech.GT_Mod;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
@@ -188,11 +188,11 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
@Override
protected ITexture getTextureFrontFace() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
}
@Override
protected ITexture getTextureFrontFaceActive() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
index 7ceda9c9eb..6cc3d57eba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
@@ -6,7 +6,7 @@ import gregtech.GT_Mod;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
@@ -196,11 +196,11 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
@Override
protected ITexture getTextureFrontFace() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5);
}
@Override
protected ITexture getTextureFrontFaceActive() {
- return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5);
+ return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 5b1b85b31a..6a06c91c1d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -24,7 +24,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
@@ -123,7 +123,7 @@ public class GregtechMetaTileEntity_PowerSubStationController
if (aSide == aFacing) {
return new ITexture[] {
Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
- new GT_RenderedTexture(
+ TextureFactory.of(
aActive
? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE
: Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
index 4a24de7c5a..afc2289982 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
@@ -11,7 +11,9 @@ 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.*;
+import gregtech.api.objects.GT_ItemStack;
+import gregtech.api.objects.ItemData;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.*;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.common.items.behaviors.Behaviour_DataOrb;
@@ -895,11 +897,11 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank {
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_3)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_3)};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Computer_Cube)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Computer_Cube)};
}
protected static final int DID_NOT_FIND_RECIPE = 0,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
index 5360ba612a..90f33691d5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -85,59 +85,59 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
};
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
};
}
public ITexture[] getFrontActive(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
};
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
+ TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
+ TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
index 3cf868a998..220d30fd55 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -200,7 +200,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
if (aSide == aFacing) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
+ TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
};
}
return this.mTextures[
@@ -220,42 +220,42 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Main_Off)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Main_On)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Main_On)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Main_Off)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Main_On)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
index caba805f65..5b76811b1a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.*;
import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_Container_RedstoneCircuitBlock;
import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_GUIContainer_RedstoneCircuitBlock;
@@ -456,47 +456,47 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
aColorIndex + 1];
}
- private GT_RenderedTexture getBase() {
- return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ private ITexture getBase() {
+ return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Off)};
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_On)};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
getBase(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off),
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red)
};
}
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
getBase(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On),
+ TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Off)};
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_On)};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off)};
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)};
+ return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On)};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
index dfb844654b..c992b71ae7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import net.minecraft.nbt.NBTTagCompound;
@@ -67,10 +67,10 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(sIconList[0])};
+ return new ITexture[] {TextureFactory.of(sIconList[0])};
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(sIconList[1])};
+ return new ITexture[] {TextureFactory.of(sIconList[1])};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
index 3b07f8b3ff..ef97f17d19 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
if (aSide == aFacing) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
+ TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
};
}
return this.mTextures[
@@ -135,42 +135,42 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Off)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_On)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Off)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_On)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)
+ TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
index 8945f3f7b5..48e63b6ad3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -50,7 +50,7 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
if (aSide == aFacing) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
+ TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
};
}
return this.mTextures[
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
index bb9865c8e5..584d0754e6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
@@ -525,37 +525,37 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
public ITexture[] getFront(final byte aColor) {
return new ITexture[] {
isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
+ ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
};
}
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
+ ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom)
+ ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
+ : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Bottom)
};
}
public ITexture[] getTop(final byte aColor) {
if (isAdvanced()) {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+ TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Top),
+ TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
};
} else {
return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay)
+ TextureFactory.of(TexturesGtBlock.Casing_Workbench_Top),
+ TextureFactory.of(TexturesGtBlock.Casing_Workbench_Crafting_Overlay)
};
}
}
@@ -563,8 +563,8 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
+ ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
index 1c0e682b62..1614883150 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -534,15 +534,15 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
boolean aRedstone) {
return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
+ TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+ TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
}
: (aSide == aBaseMetaTileEntity.getFrontFacing()
? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
+ TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+ TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
}
- : new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON)});
+ : new ITexture[] {TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON)});
}
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
index b5dcd8cd73..80d2ab8a50 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.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_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SuperChest;
@@ -206,12 +206,12 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
? new ITexture[] {
BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
+ TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
}
: (aSide == aBaseMetaTileEntity.getFrontFacing()
? new ITexture[] {
BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
+ TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
}
: new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]});
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index f46ba27204..a936156de8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -6,7 +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_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.EntityPlayer;
@@ -59,11 +59,11 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
return aSide == 1
? new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE)
}
: new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER)
+ TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER)
};
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
index 04c75f52f8..de7baf7a8a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.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.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
@@ -114,28 +114,28 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
public ITexture[] getBack(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getBottom(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getTop(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Screen_Logo)
};
}
public ITexture[] getSides(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
@@ -149,28 +149,28 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
public ITexture[] getBackActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getBottomActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
public ITexture[] getTopActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Screen_Logo)
};
}
public ITexture[] getSidesActive(final byte aColor) {
return new ITexture[] {
Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+ TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
};
}
@@ -178,10 +178,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
ITexture[][][] rTextures = new ITexture[2][17][];
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
+ rTextures[0][i + 1] = new ITexture[] { TextureFactory.of(
Textures.BlockIcons.MACHINE_HEATPROOFCASING) };
rTextures[1][i + 1] = new ITexture[] {
- new GT_RenderedTexture(
+ TextureFactory.of(
Textures.BlockIcons.MACHINE_HEATPROOFCASING),
mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
@@ -192,21 +192,21 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
/*
* @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {
* ITexture[][][] rTextures = new ITexture[5][17][]; for (byte i = -1; i <
- * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
+ * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { TextureFactory.of(
* Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i,
* Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; ITexture[] tmp1 = {
- * new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) };
- * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture(
+ * TextureFactory.of( Textures.BlockIcons.MACHINE_STEEL_TOP) };
+ * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { TextureFactory.of(
* Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
* Dyes._NULL.mRGBa)), new
* GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i +
- * 1)] = tmp2; ITexture[] tmp4 = { new GT_RenderedTexture(
+ * 1)] = tmp2; ITexture[] tmp4 = { TextureFactory.of(
* Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
* Dyes._NULL.mRGBa)), new
* GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i +
- * 1)] = tmp4; ITexture[] tmp5 = { new GT_RenderedTexture(
+ * 1)] = tmp4; ITexture[] tmp5 = { TextureFactory.of(
* Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
- * Dyes._NULL.mRGBa)), new GT_RenderedTexture(
+ * Dyes._NULL.mRGBa)), TextureFactory.of(
* Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] = tmp5;
* } return rTextures; }
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
index 064312fae2..db7e9d049e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
import gtPlusPlus.xmod.gregtech.api.gui.GUI_SafeBlock;
@@ -49,7 +49,7 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase {
@Override
public ITexture getOverlayIcon() {
- return new GT_RenderedTexture(Textures.BlockIcons.VOID);
+ return TextureFactory.of(Textures.BlockIcons.VOID);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
index 18e95861b3..494b32931a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Utility;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
import gtPlusPlus.core.util.Utils;
@@ -25,12 +25,10 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
public String mOldDesc = "";
public boolean mLocked = false;
protected byte mIndex = (byte) MathUtils.randInt(1, 3);
- public static GT_RenderedTexture texBottom =
- new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_bottom"));
- public static GT_RenderedTexture texTop = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_top"));
- public static GT_RenderedTexture texSide = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side"));
- public static GT_RenderedTexture texSideCabinet =
- new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
+ public static ITexture texBottom = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_bottom"));
+ public static ITexture texTop = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_top"));
+ public static ITexture texSide = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_side"));
+ public static ITexture texSideCabinet = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) {
super(aID, aName, aNameRegional, 0, aDescription);
@@ -282,9 +280,9 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
return tmp;
}
- private static GT_RenderedTexture x1 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_FRONT);
- private static GT_RenderedTexture x2 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_PAPER_FRONT);
- private static GT_RenderedTexture x3 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_CANS_FRONT);
+ private static ITexture x1 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_FRONT);
+ private static ITexture x2 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_PAPER_FRONT);
+ private static ITexture x3 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_CANS_FRONT);
public ITexture[] getFrontNormal() {
return new ITexture[] {x1};
@@ -299,19 +297,19 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Acacia_Log)};
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
index c9472e157c..ac4f37cbf1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
@@ -28,18 +28,18 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index d33c1d4ad6..e0caee92ee 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
@@ -122,7 +122,7 @@ public class RecipeGen_Plates extends RecipeGen_Base {
material.vVoltageMultiplier)) {
GregTech_API.registerCover(
material.getFoil(1),
- new GT_RenderedTexture(material.getTextureSet().mTextures[70], material.getRGBA(), false),
+ TextureFactory.of(material.getTextureSet().mTextures[70], material.getRGBA(), false),
null);
Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success");
} else {