Forgot to Commit before the weekend.. Not sure what I change, but making this as a rollback point/changelog.

3 files changed, 79 insertions, 27 deletions

diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
index 63360e1260..b1b6312956 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
@@ -15,11 +15,18 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void execute(){
+		cokeOvenRecipes();
+		assemblerRecipes();
+		
+	}
+	
+	private static void cokeOvenRecipes(){
 		Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven.");
 
 		try {
 
 			//GT Logs to Charcoal Recipe	
+			//With Sulfuric Acid
 			CORE.RA.addCokeOvenRecipe(
 					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1
 					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 2
@@ -29,11 +36,9 @@ public class RECIPES_GREGTECH {
 					800,  //Time in ticks
 					30); //EU
 
-		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 
-		try {
-
-			//Coal -> Coke Recipe		
+			//Coal -> Coke Recipe
+			//With Sulfuric Acid
 			CORE.RA.addCokeOvenRecipe(
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 2
@@ -41,8 +46,39 @@ public class RECIPES_GREGTECH {
 					Materials.Creosote.getFluid(250L), //Fluid Output
 					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
 					600,  //Time in ticks
+					120); //EU			
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		
+		try {
+			//GT Logs to Charcoal Recipe	
+			//Without Sulfuric Acid
+			CORE.RA.addCokeOvenRecipe(
+					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1
+					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 2
+					null, //Fluid Input
+					Materials.Creosote.getFluid(145L), //Fluid Output
+					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output 
+					1200,  //Time in ticks
+					30); //EU
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+	
+		try {
+			//Coal -> Coke Recipe
+			//Without Sulfuric Acid
+			CORE.RA.addCokeOvenRecipe(
+					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1
+					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 2
+					null, //Fluid Input
+					Materials.Creosote.getFluid(200L), //Fluid Output
+					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
+					900,  //Time in ticks
 					120); //EU
-
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 	}
+	
+	private static void assemblerRecipes(){
+		//GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine2.get(1L, new Object[0]), 50, 16);
+		//GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6L), ItemList.Casing_Turbine.get(1L, new Object[0]), ItemList.Casing_Turbine3.get(1L, new Object[0]), 50, 16);
+				
+	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index 173892ce68..995a77f6c8 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -1,8 +1,8 @@
 package miscutil.core.handler.registration;
 
 import gregtech.api.enums.ItemList;
-import miscutil.core.util.UtilsItems;
 import miscutil.core.util.Utils;
+import miscutil.core.util.UtilsItems;
 import miscutil.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
@@ -25,7 +25,7 @@ public class RECIPES_Machines {
 	static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1);
 	static ItemStack RECIPE_IndustrialCentrifuge = GregtechItemList.Industrial_Centrifuge.get(1);
 	static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
-	static ItemStack RECIPE_IndustrialCentrifugeCasingVibration = GregtechItemList.Casing_Centrifuge2.get(1);
+	static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1);
 
 
 	//Buffer Cores
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index c79a69b791..4e303c8e39 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -130,7 +130,7 @@ public class Utils {
 		return FluidRegistry.getFluidStack("ic2steam", (int)aAmount);
 	}
 
-	
+
 
 	/*public static void recipeBuilderBlock(ItemStack slot_1, ItemStack slot_2, ItemStack slot_3, ItemStack slot_4, ItemStack slot_5, ItemStack slot_6, ItemStack slot_7, ItemStack slot_8, ItemStack slot_9, Block resultBlock){
 		GameRegistry.addRecipe(new ItemStack(resultBlock),
@@ -155,26 +155,42 @@ public class Utils {
 
 		return correctTool;
 	}
-	
+
 	/**
-	* 
-	* @param colorStr e.g. "#FFFFFF"
-	* @return String - formatted "rgb(0,0,0)"
-	*/
+	 * 
+	 * @param colorStr e.g. "#FFFFFF"
+	 * @return String - formatted "rgb(0,0,0)"
+	 */
 	public static String hex2Rgb(String hexString) {
-	    Color c = new Color(
-	        Integer.valueOf(hexString.substring(1, 3), 16), 
-	        Integer.valueOf(hexString.substring(3, 5), 16), 
-	        Integer.valueOf(hexString.substring(5, 7), 16));
-
-	    StringBuffer sb = new StringBuffer();
-	    sb.append("rgb(");
-	    sb.append(c.getRed());
-	    sb.append(",");
-	    sb.append(c.getGreen());
-	    sb.append(",");
-	    sb.append(c.getBlue());
-	    sb.append(")");
-	    return sb.toString();
+		Color c = new Color(
+				Integer.valueOf(hexString.substring(1, 3), 16), 
+				Integer.valueOf(hexString.substring(3, 5), 16), 
+				Integer.valueOf(hexString.substring(5, 7), 16));
+
+		StringBuffer sb = new StringBuffer();
+		sb.append("rgb(");
+		sb.append(c.getRed());
+		sb.append(",");
+		sb.append(c.getGreen());
+		sb.append(",");
+		sb.append(c.getBlue());
+		sb.append(")");
+		return sb.toString();
+	}
+
+	//Smooth Rounding Function
+	public static double decimalRounding(double d) {
+		return Math.round(d * 2) / 2.0;
+	}
+
+	//Smooth Rounding Function (Nearest 5)
+	public static double decimalRoundingToWholes(double d) {
+		return 5*(Math.round(d/5));
+	}
+
+	//Converts temps for GT machines, then rounds for ease of use.
+	public static float celsiusToKelvin(int i){
+		double f = i + 273.15F;
+		return (int)decimalRoundingToWholes(f);
 	}
 }