$ Final 5.08 compatibility changes.

5 files changed, 42 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
index cbe1578c20..fe0ffd5dc8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
@@ -20,11 +20,7 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
     public GT_Recipe_Map mRecipeMap = null;
 
     public GT_MetaTileEntity_Hatch_ControlCore(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, getSlots(aTier), 
-        		new String[]{
-        				"Control Core Module for GT++ Multiblocks",
-        				"Core determines maximum tier machine will operate at"
-        		});
+        super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Core determines maximum tier machine will operate at");
     }
 
     public GT_MetaTileEntity_Hatch_ControlCore(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
index eb1c3cc1f7..2b7f44be59 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
@@ -13,6 +13,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
@@ -188,15 +189,17 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
 		int textureIndex = a1 | a2 << 7;
 		byte texturePointer = (byte) (a1 & 127);
 		
+		
+		
 		if (aSide == 1 || aSide == 0) {
-			ITexture g = textureIndex > 0 ?  BlockIcons.casingTexturePages[a2][texturePointer] : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
+			ITexture g = textureIndex > 0 ?  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 aSide != aFacing	? 
-				(textureIndex > 0 ? new ITexture[] { BlockIcons.casingTexturePages[a2][texturePointer] } : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
-				: (textureIndex > 0	? (aActive ? this.getTexturesActive(BlockIcons.casingTexturePages[a2][texturePointer]) : this.getTexturesInactive(BlockIcons.casingTexturePages[a2][texturePointer]))
+				(textureIndex > 0 ? new ITexture[] { StaticFields59.getCasingTexturePages(a2, texturePointer) } : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
+				: (textureIndex > 0	? (aActive ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer)) : this.getTexturesInactive(StaticFields59.getCasingTexturePages(a2, texturePointer)))
 						: (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]) : this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])));
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
index 1e7843b515..d5327a6a99 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
@@ -100,7 +100,7 @@ public class GregtechOreDictUnificator {
 
     public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, ItemStack aReplacement, long aAmount) {
         //if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial)) aPrefix.mDynamicItems.add((Materials) aMaterial);
-        if (StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aPrefix) && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial)) return aReplacement;
+        if (StaticFields59.geOrePrefixesBooleanPreventableComponents().contains(aPrefix) && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial)) return aReplacement;
         return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
     }
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
index 512d3bb8b5..4313ca53f6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
@@ -3,13 +3,18 @@ package gtPlusPlus.xmod.gregtech.common;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -23,6 +28,8 @@ public class StaticFields59 {
 	public static final Field mDisabledItems;
 	public static final Field mMultiblockChemicalRecipes;
 	public static final Field mDescriptionArray;
+	public static final Field mCasingTexturePages;
+	
 	public static final Method mCalculatePollutionReduction;
 
 	private static final Map<String, Materials> mMaterialCache = new LinkedHashMap<String, Materials>();
@@ -36,6 +43,8 @@ public class StaticFields59 {
 		mDisabledItems = getField(OrePrefixes.class, "mDisabledItems");
 		mMultiblockChemicalRecipes = getField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes");
 		mDescriptionArray = getField(GT_MetaTileEntity_TieredMachineBlock.class, "mDescriptionArray");
+		mCasingTexturePages = getField(BlockIcons.class, "casingTexturePages");
+		
 		mCalculatePollutionReduction = getMethod(GT_MetaTileEntity_Hatch_Muffler.class, "calculatePollutionReduction", int.class);		
 	}
 
@@ -67,19 +76,20 @@ public class StaticFields59 {
 		return ReflectionUtils.getMethod(a, b, params);
 	}
 
-	public static synchronized final Boolean getOrePrefixesBooleanDisabledItems() {
+	public static synchronized final Collection<Materials> getOrePrefixesBooleanDisabledItems() {
 		try {
-			return (Boolean) mDisabledItems.get(OrePrefixes.class);
+			return (Collection<Materials>) mDisabledItems.get(OrePrefixes.class);
 		} catch (IllegalArgumentException | IllegalAccessException e) {
-			return false;
+			return new ArrayList<Materials>();
 		}
 	}
+	
 
-	public static synchronized final Boolean geOrePrefixesBooleanPreventableComponents() {
+	public static synchronized final List<OrePrefixes> geOrePrefixesBooleanPreventableComponents() {
 		try {
-			return (Boolean) mPreventableComponents.get(OrePrefixes.class);
+			return (List<OrePrefixes>) mPreventableComponents.get(OrePrefixes.class);
 		} catch (IllegalArgumentException | IllegalAccessException e) {
-			return false;
+			return new ArrayList<OrePrefixes>();
 		}
 	}
 
@@ -113,6 +123,19 @@ public class StaticFields59 {
 			return new String[] {aTile.mDescription};
 		}
 	}
+	
+	public static ITexture getCasingTexturePages(int a, int b) {
+		try {
+			ITexture[][] g = (ITexture[][]) mCasingTexturePages.get(null);
+			if (g != null) {
+				return g[a][b];
+			}
+		}
+		catch (Throwable t) {
+			
+		}
+		return null;
+	}
 
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index 2fe4fc765f..adaabed10f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -5,6 +5,7 @@ import static gtPlusPlus.core.recipe.common.CI.bitsd;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -21,6 +22,9 @@ public class GregtechCustomHatches {
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
 			Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches.");
 			run1();
+			
+			//No pollution in 5.08
+			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
 			run2();
 		}
 	}