$ Fixed .09 features trying to work in .08.

+ Moved lots of things to reflection again.

3 files changed, 15 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 1ad37b1c56..fb14c50d04 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import net.minecraft.item.ItemStack;
 
 public class CoalTar {
@@ -114,7 +115,7 @@ public class CoalTar {
 	public static void recipeCoalToCoalTar(){
 		//Pyrolyse
 				//Lignite Coal
-				GT_Values.RA.addPyrolyseRecipe(
+				AddGregtechRecipe.PyrolyseOven(
 						GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
 						GT_Values.NF, //Fluid Input
 						8,
@@ -123,7 +124,7 @@ public class CoalTar {
 						150*20,
 						120);
 				//Coal
-				GT_Values.RA.addPyrolyseRecipe(
+				AddGregtechRecipe.PyrolyseOven(
 						GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
 						GT_Values.NF, //Fluid Input
 						8,
@@ -132,7 +133,7 @@ public class CoalTar {
 						120*20,
 						240);
 				//Coal Coke
-				GT_Values.RA.addPyrolyseRecipe(
+				AddGregtechRecipe.PyrolyseOven(
 						ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
 						GT_Values.NF, //Fluid Input
 						8,
diff --git a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
index 0c98751398..8ba355d57f 100644
--- a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java
@@ -71,16 +71,4 @@ class LibProxy2 extends LibraryProxy {
 			throw new RuntimeException(e);
 		}
 	}
-}
-
-/*class Lib { // v1
-	public static void addRecipe(ItemStack aInput, ItemStack aOutput) {
-		System.out.println("shit totally happened v1");
-	}
-}
-
-class Lib2 { // v2
-    public static void addRecipe(ItemStack aInput, ItemStack aOutput, boolean hidden) {
-        System.out.println("shit totally happened v2");
-    }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 7ed15ec27b..a46bd8c61d 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.util.math;
 import java.util.Map;
 import java.util.Random;
 
+import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.objects.XSTR;
 
@@ -96,7 +97,7 @@ public class MathUtils {
 		} while (((bits-val)+(n-1)) < 0L);
 		return val;
 	}
-	
+
 	/**
 	 * Returns a psuedo-random number between min and max, inclusive.
 	 * The difference between min and max can be at most
@@ -359,4 +360,12 @@ public class MathUtils {
 		}
 	}
 
+	public static int safeInt(long number, int margin){
+		return number>Integer.MAX_VALUE-margin ? Integer.MAX_VALUE-margin :(int)number;
+	}
+
+	public static int safeInt(long number){
+		return number>GT_Values.V[GT_Values.V.length-1] ? safeInt(GT_Values.V[GT_Values.V.length-1],1) : number<Integer.MIN_VALUE ? Integer.MIN_VALUE : (int)number;
+	}
+
 }