aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/api/enums/TAE.java23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index 244053cfa8..e45e9e4e58 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -1,17 +1,16 @@
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 {
@@ -20,7 +19,7 @@ public class TAE {
public static int gtPPLastUsedIndex = 64;
public static int secondaryIndex = 0;
- public static HashMap<Integer, ITexture> mTAE = new HashMap<Integer, ITexture>();
+ public static HashMap<Integer, GTPP_CopiedBlockTexture> mTAE = new HashMap<Integer, GTPP_CopiedBlockTexture>();
private static final HashSet<Integer> mFreeSlots = new HashSet<Integer>(64);
static {
@@ -34,18 +33,18 @@ public class TAE {
*
* @param aPage - The Texture page (0-3)
* @param aID - The ID on the specified page (0-15)
- * @param iTexture - The Texture to register
+ * @param GTPP_CopiedBlockTexture - The Texture to register
* @return - Did it register correctly?
*/
- public static boolean registerTexture(int aPage, int aID, ITexture iTexture) {
+ public static boolean registerTexture(int aPage, int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
int aRealID = aID + (aPage * 16);
- return registerTexture(64 + aRealID, iTexture);
+ return registerTexture(64 + aRealID, GTPP_CopiedBlockTexture);
}
- public static boolean registerTexture(int aID, ITexture iTexture) {
+ public static boolean registerTexture(int aID, GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
if (mFreeSlots.contains(aID)) {
mFreeSlots.remove(aID);
- mTAE.put(aID, iTexture);
+ mTAE.put(aID, GTPP_CopiedBlockTexture);
return true;
} else {
CORE.crash("Tried to register texture with ID " + aID + " to TAE, but it is already in use.");
@@ -70,7 +69,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, TextureFactory.of(ModBlocks.blockCasingsTieredGTPP, 15, ForgeDirection.UP));
+ registerTexture(aFreeSlot, new GTPP_CopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15));
}
Logger.INFO("Finalising TAE.");
for (int aKeyTae : mTAE.keySet()) {
@@ -79,7 +78,7 @@ public class TAE {
Logger.INFO("Finalised TAE.");
}
- private static boolean registerTextures(ITexture iTexture) {
+ private static boolean registerTextures(GTPP_CopiedBlockTexture GTPP_CopiedBlockTexture) {
try {
// Handle page 2.
Logger.INFO("[TAE} Registering Texture, Last used casing ID is " + gtPPLastUsedIndex + ".");
@@ -89,7 +88,7 @@ public class TAE {
if (x != null) {
ITexture[][] h = (ITexture[][]) x.get(null);
if (h != null) {
- h[64][secondaryIndex++] = iTexture;
+ h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
x.set(null, h);
Logger.INFO("[TAE} Registered Texture with ID " + (secondaryIndex - 1)
+ " in secondary index.");
@@ -101,7 +100,7 @@ public class TAE {
// set to page 1.
else {
- Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, iTexture);
+ Textures.BlockIcons.setCasingTextureForId(gtPPLastUsedIndex, GTPP_CopiedBlockTexture);
Logger.INFO("[TAE} Registered Texture with ID " + (gtPPLastUsedIndex) + " in main index.");
gtPPLastUsedIndex++;
return true;