% More .08 Compatibility.

6 files changed, 38 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 1fb629976a..3da3c18836 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -136,7 +136,7 @@ public class CoalTar {
 
 
 	private static void recipeEthylBenzineFuelsIntoHeavyFuel() {
-			GT_Values.RA.addChemicalRecipe(
+			CORE.RA.addChemicalRecipe(
 					ItemUtils.getItemStackOfAmountFromOreDict("cellFuel", 9), 
 					ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), 
 					null,
@@ -144,7 +144,7 @@ public class CoalTar {
 					ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 
 					100,
 					CORE.GTNH ? 1000 : 500);
-			GT_Values.RA.addChemicalRecipe(
+			CORE.RA.addChemicalRecipe(
 					ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9), 
 					ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), 
 					null,
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index 4f2bf877f1..1d45dec183 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -5,6 +5,7 @@ import net.minecraft.init.Items;
 import gregtech.api.enums.GT_Values;
 
 import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -48,7 +49,7 @@ public class NuclearChem {
 	}
 	
 	private static void chemReator_CreateMutagen() {
-		GT_Values.RA.addChemicalRecipe(
+		CORE.RA.addChemicalRecipe(
 				CI.getNumberedCircuit(20),
 				ItemUtils.getSimpleStack(Items.nether_star, 2),
 				FluidUtils.getMobEssence(5000),
@@ -59,7 +60,7 @@ public class NuclearChem {
 	}
 	
 	private static void chemReactor_MutagenWithEggs() {
-		GT_Values.RA.addChemicalRecipe(
+		CORE.RA.addChemicalRecipe(
 				CI.getNumberedCircuit(20),
 				ItemUtils.getSimpleStack(Items.egg, 2),
 				FluidUtils.getFluidStack(GeneticMutagen, 500),
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 6b1a006098..7b5a90a64e 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -155,17 +155,20 @@ public class RocketFuels {
 		FluidStack fuelA = FluidUtils.getFluidStack("diesel", 400);
 		FluidStack fuelB = FluidUtils.getFluidStack("fuel", 400);
 		if (fuelA != null){
-			GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+			//GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
 		}
-		if (fuelA ==  null && fuelB != null){
-			GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+		if (fuelA == null && fuelB != null){
+			//GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
 		}
 	}
 
 	public static void createRP1(){
 		FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 100);
 		if (fuelA != null){
-			GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(RP1, 25), 400, 120, false);
+			//GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(RP1, 25), 400, 120, false);
+			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(RP1, 50), 400, 120, false);
 		}
 	}
 
@@ -279,13 +282,13 @@ public class RocketFuels {
 	}
 
 	private static void createUnsymmetricalDimethylhydrazine() {
-		GT_Values.RA.addChemicalRecipe(
+		CORE.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrazine", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellFormaldehyde", 2),
 				FluidUtils.getFluidStack("hydrogen", 4000),
 				FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 1000),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
 				20*60);
 
 	}
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 888f030f56..fd8df711e9 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -154,7 +154,7 @@ public final class ELEMENT {
 		//GTNH Trinium Handling		
 		if (CORE.GTNH){			
 			//yay
-			Materials a1 = MaterialUtils.getMaterialByName("Trinium");
+			Materials a1 = MaterialUtils.getMaterial("Trinium");
 			Materials a2 = Materials.valueOf("Trinium");
 			Materials a3 = Materials.get("Trinium");
 			Materials a4;
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 68fb856417..50658ee2a2 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -19,6 +19,7 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraftforge.fluids.FluidStack;
@@ -42,7 +43,11 @@ public class RECIPES_GREGTECH {
 		chemicalReactorRecipes();
 		dehydratorRecipes();
 		blastFurnaceRecipes();
-		largeChemReactorRecipes();
+		
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			largeChemReactorRecipes();
+		}
+		
 		fissionFuelRecipes();
 		autoclaveRecipes();
 		compressorRecipes();
@@ -501,27 +506,27 @@ public class RECIPES_GREGTECH {
 
 	private static void largeChemReactorRecipes() {
 		//Styrene
-		GT_Values.RA.addMultiblockChemicalRecipe(
-				new ItemStack[]{GT_Utility.getIntegratedCircuit(24)},
+		CORE.RA.addMultiblockChemicalRecipe(
+				new ItemStack[]{CI.getNumberedCircuit(24)},
 				new FluidStack[]{
 						FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)
 				},
 				new FluidStack[]{
-						Materials.Styrene.getFluid(1000),
+						MaterialUtils.getMaterial("Styrene").getFluid(1000),
 						Materials.Hydrogen.getGas(2000)
 				},
 				null,
 				30,
 				30);
 		//Short-cut Styrene
-		GT_Values.RA.addMultiblockChemicalRecipe(
-				new ItemStack[]{GT_Utility.getIntegratedCircuit(24)},
+		CORE.RA.addMultiblockChemicalRecipe(
+				new ItemStack[]{CI.getNumberedCircuit(24)},
 				new FluidStack[]{
-						Materials.Ethylene.getGas(500), 
-						Materials.Benzene.getFluid(500)
+						MaterialUtils.getMaterial("Ethylene").getGas(500), 
+						MaterialUtils.getMaterial("Benzene").getFluid(500)
 				},
 				new FluidStack[]{
-						Materials.Styrene.getFluid(500),
+						MaterialUtils.getMaterial("Styrene").getFluid(500),
 						Materials.Hydrogen.getGas(1000)
 				},
 				null,
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 98b02078c6..ae43abe3c5 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -183,7 +183,7 @@ public class MaterialUtils {
 		}
 	}
 
-	public static Materials getMaterialByName(String materialName) {
+	private static Materials getMaterialByName(String materialName) {
 
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 			return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
@@ -218,6 +218,14 @@ public class MaterialUtils {
 		TextureSet o =  (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
 		return o;
 	}
+	
+	public static Materials getMaterial(String aMaterialName) {
+		Materials m = gtPlusPlus.xmod.gregtech.common.StaticFields59.getMaterial(aMaterialName);
+		if (m == null) {
+			m = getMaterialByName(aMaterialName);
+		}
+		return m;
+	}
 
 
 }
\ No newline at end of file