~Changed Coke Oven Recipes

~Cleaned up a handful of classes (ModItems.java, RECIPES_Machines.java, Utils.java & UtilsItems.java)

+Added a handful of DEBUG classes (To resolve multiblock shaping issues)
+Added GregtechMetaTileEntityIndustrialPlatePress.java
+Added textures for itemStickyRubber, itemIngotBatteryAlloy & itemPlateBatteryAlloy.
+Added a basic wrapper for direct MineTweaker script usage (Ultra W.I.P.)
>This will probably be changed to preload .zs scripts, regex and handle appropriately, but undecided.

5 files changed, 247 insertions, 12 deletions

diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
index f433632163..75ea04e1e6 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java
@@ -43,7 +43,7 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addCokeOvenRecipe(
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
-					Materials.SulfuricAcid.getFluid(80L), //Fluid Input
+					Materials.SulfuricAcid.getFluid(60L), //Fluid Input
 					Materials.Creosote.getFluid(250L), //Fluid Output
 					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
 					600,  //Time in ticks
@@ -56,7 +56,7 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addCokeOvenRecipe(
 					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1
 					GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2
-					Materials.Water.getFluid(160L), //Fluid Input
+					Materials.SaltWater.getFluid(85L), //Fluid Input
 					Materials.Creosote.getFluid(145L), //Fluid Output
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output 
 					1200,  //Time in ticks
@@ -69,7 +69,7 @@ public class RECIPES_GREGTECH {
 			CORE.RA.addCokeOvenRecipe(
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1
 					GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2
-					null, //Fluid Input
+					Materials.SaltWater.getFluid(185L), //Fluid Input
 					Materials.Creosote.getFluid(200L), //Fluid Output
 					UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 
 					900,  //Time in ticks
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java b/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java
new file mode 100644
index 0000000000..16ba377b07
--- /dev/null
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java
@@ -0,0 +1,113 @@
+package miscutil.core.handler.registration;
+
+import java.util.ArrayList;
+
+import miscutil.core.util.Utils;
+import miscutil.core.util.UtilsItems;
+import miscutil.core.util.wrapper.var;
+import net.minecraft.item.ItemStack;
+
+public class RECIPES_MTWRAPPER {
+
+	public static int MT_RECIPES_LOADED = 0;
+	public static int MT_RECIPES_FAILED = 0;
+
+	static var chestWood = new var("minecraft:chest>");
+	static var slabWood = new var("ore:slabWood>");
+	static var gemNetherQuartz = new var("ore:gemNetherQuartz>");
+	static var glass = new var("ore:blockGlass>");
+	static var sensorDaylight = new var("minecraft:daylight_detector>");
+	static var blazeRod = new var("minecraft:blaze_rod>");
+	static var saw = new var("ore:craftingToolSaw>");
+	static var logWood = new var("ore:logWood>");
+	static var button = new var("minecraft:stone_button>");
+	static var stoneBlock = new var("minecraft:stone>");
+
+	public static void run(){
+		/*addShaped(button.getStack(2), 
+				null, stoneBlock, null,
+				null, stoneBlock, null,
+				null, null, null);*/
+		/*addShaped(stoneStick.getStack(1), 
+				stoneBlock, null, null,
+				stoneBlock, null, null,
+				null, null, null);*/
+		addShaped(chestWood.getStack(2), 
+				logWood, logWood, logWood,
+				logWood, null, logWood,
+				logWood, logWood, logWood);
+		addShaped(chestWood.getStack(4), 
+				logWood, logWood, logWood,
+				logWood, saw, logWood,
+				logWood, logWood, logWood);
+		//Recipe Fixes
+		//remove(sensorDaylight);
+		addShaped(sensorDaylight.getStack(1), 
+				glass, glass, glass,
+				gemNetherQuartz, gemNetherQuartz, gemNetherQuartz,
+				slabWood, slabWood, slabWood);
+		/*addShaped(ironBars .getStack( 8), 
+				null, "<ore:craftingToolWrench>", null,
+				"<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>",
+				"<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>");*/
+	}
+
+
+	public static void addShaped(Object item_Output,
+			Object item_1,	Object item_2,	Object item_3,
+			Object item_4,	Object item_5,	Object item_6,
+			Object item_7,	Object item_8,	Object item_9){
+
+
+		/*
+		 * 
+		 * var item_1,	var item_2,	var item_3,
+			var item_4,	var item_5,	var item_6,
+			var item_7,	var item_8,	var item_9
+		 * 
+		 * 
+		 */
+
+		ItemStack outputItem = UtilsItems.getCorrectStacktype(item_Output, 1);
+
+		ArrayList<Object> validSlots = new ArrayList<Object>();
+		String a,b,c,d,e,f,g,h,i;
+		if (item_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(item_1);}
+		if (item_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(item_2);}
+		if (item_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(item_3);}
+		if (item_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(item_4);}
+		if (item_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(item_5);}
+		if (item_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(item_6);}
+		if (item_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(item_7);}
+		if (item_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(item_8);}
+		if (item_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(item_9);}
+
+		String lineOne = a+b+c;
+		String lineTwo = d+e+f;
+		String lineThree = g+h+i;
+		validSlots.add(0, lineOne);
+		validSlots.add(1, lineTwo);
+		validSlots.add(2, lineThree);
+
+		try {
+			UtilsItems.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy());
+			MT_RECIPES_LOADED++;		
+		}
+		catch(NullPointerException | ClassCastException k){
+			k.getMessage();
+			k.getClass();
+			k.printStackTrace();
+			k.getLocalizedMessage();
+			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName());
+			MT_RECIPES_FAILED++;
+		}		
+	}
+
+	public static void addShapeless(){
+
+	}
+
+
+
+}
+
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index 995a77f6c8..dc544be0fb 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -1,6 +1,7 @@
 package miscutil.core.handler.registration;
 
 import gregtech.api.enums.ItemList;
+import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.UtilsItems;
 import miscutil.gregtech.api.enums.GregtechItemList;
@@ -23,9 +24,14 @@ public class RECIPES_Machines {
 	static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1);
 	static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1);
 	static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1);
-	static ItemStack RECIPE_IndustrialCentrifuge = GregtechItemList.Industrial_Centrifuge.get(1);
+	//Industrial Centrifuge
+	static ItemStack RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);
 	static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
+	//Industrial Coke Oven
+	static ItemStack RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1);
 	static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1);
+	static ItemStack RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1);
+	static ItemStack RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1);
 
 
 	//Buffer Cores
@@ -79,6 +85,19 @@ public class RECIPES_Machines {
 	static String plateTier10 = "plateNaquadah";
 	static String plateTier11 = "plateNeutronium";
 
+	//rods
+	static String rodTier1 = "stickLead";
+	static String rodTier2 = "stickTin";
+	static String rodTier3 = "stickCopper";
+	static String rodTier4 = "stickGold";
+	static String rodTier5 = "stickAluminium";
+	static String rodTier6 = "stickThorium";
+	static String rodTier7 = "stickTungsten";
+	static String rodTier8 = "stickTungstenSteel";
+	static String rodTier9 = "stickOsmium";
+	static String rodTier10 = "stickNaquadah";
+	static String rodTier11 = "stickNeutronium";
+
 
 	//Machine Casings
 	static ItemStack machineCasing_ULV = ItemList.Casing_ULV.get(1);
@@ -91,6 +110,12 @@ public class RECIPES_Machines {
 	static ItemStack machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
 	static ItemStack machineCasing_UV = ItemList.Casing_UV.get(1);
 	static ItemStack machineCasing_MAX = ItemList.Casing_MAX.get(1);
+	
+	//Gearbox Casings
+	static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
+	static ItemStack gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
+	static ItemStack gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
+	static ItemStack gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
 
 	//Cables
 	static String cableGt02Electrum = "cableGt02Electrum";
@@ -99,6 +124,9 @@ public class RECIPES_Machines {
 	//Plates
 	static String plateElectricalSteel= "plateElectricalSteel";	
 	static String plateEnergeticAlloy= "plateEnergeticAlloy";
+	static String plateCobalt = "plateCobalt";
+	static String plateBronze = "plateBronze";
+	static String plateSteel = "plateSteel";
 
 	//Pipes
 	static String pipeLargeCopper="pipeLargeCopper";
@@ -126,7 +154,7 @@ public class RECIPES_Machines {
 	static String circuitElite = "circuitElite";
 	static String circuitMaster = "circuitMaster";
 	static String circuitUltimate = "circuitUltimate";
-	
+
 	//Machine Components
 	static ItemStack electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
 	static ItemStack electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
@@ -169,8 +197,11 @@ public class RECIPES_Machines {
 	static ItemStack sensor_EV = ItemList.Sensor_EV.get(1);
 	static ItemStack sensor_IV = ItemList.Sensor_IV.get(1);
 	
-	
-	
+	//Misc
+	static ItemStack INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
+
+
+
 	//RobotArm, Conveyor, Emitter, Sensor, Field Generator
 
 
@@ -328,23 +359,70 @@ public class RECIPES_Machines {
 				"plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
 				RECIPE_IronPlatedBricks);
 
-		
-		
-		
+
+
+
 		//Industrial Centrifuge
 		UtilsItems.recipeBuilder(
 				circuitElite, pipeHugeStainlessSteel, circuitElite,
 				plateTier6, electricPump_EV, plateTier6,
 				plateTier8, machineCasing_EV, plateTier8,
-				RECIPE_IndustrialCentrifuge);
+				RECIPE_IndustrialCentrifugeController);
 
-		//Steam Condenser
+		//Centrifuge Casing
 		UtilsItems.recipeBuilder(
 				plateTier6, "stickElectrum", plateTier6,
 				plateTier8, "stickElectrum", plateTier8,
 				plateTier6, "stickElectrum", plateTier6,
 				RECIPE_IndustrialCentrifugeCasing);
 
+		//Industrial Coke Oven
+		UtilsItems.recipeBuilder(
+				plateCobalt, circuitAdvanced, plateCobalt,
+				machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV,
+				plateCobalt, circuitAdvanced, plateCobalt,
+				RECIPE_IndustrialCokeOvenController);
+
+		//Coke Oven Frame Casing
+		UtilsItems.recipeBuilder(
+				plateTier8, rodTier8, plateTier8,
+				rodTier8, "frameGtCobalt", rodTier8,
+				plateTier8, rodTier8, plateTier8,
+				RECIPE_IndustrialCokeOvenFrame);
+
+		//Coke Oven Coil 1
+		UtilsItems.recipeBuilder(
+				plateBronze, plateBronze, plateBronze,
+				"frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze",
+				plateBronze, plateBronze, plateBronze,
+				RECIPE_IndustrialCokeOvenCasingA);
+
+		//Coke Oven Coil 2
+		UtilsItems.recipeBuilder(
+				plateSteel, plateSteel, plateSteel,
+				"frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel",
+				plateSteel, plateSteel, plateSteel,
+				RECIPE_IndustrialCokeOvenCasingB);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 		Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
 
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java
new file mode 100644
index 0000000000..c249bb9d77
--- /dev/null
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java
@@ -0,0 +1,41 @@
+package miscutil.core.handler.registration;
+
+import gregtech.api.enums.ItemList;
+import miscutil.core.lib.LoadedMods;
+import miscutil.core.util.Utils;
+import miscutil.core.util.UtilsItems;
+import net.minecraft.item.ItemStack;
+
+public class RECIPES_Shapeless {
+	
+	static ItemStack dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1);
+	
+	//Circuits
+		static String circuitPrimitive = "circuitPrimitive";
+		static String circuitBasic = "circuitBasic";
+		static String circuitGood = "circuitGood";
+		static String circuitAdvanced = "circuitAdvanced";
+		static String circuitData = "circuitData";
+		static String circuitElite = "circuitElite";
+		static String circuitMaster = "circuitMaster";
+		static String circuitUltimate = "circuitUltimate";
+		static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
+	
+	public static final void RECIPES_LOAD(){
+		run();
+		Utils.LOG_INFO("Loading Shapeless Recipes.");
+	}
+
+	private static void run(){
+		UtilsItems.shapelessBuilder(dustStaballoy, 
+				"dustTitanium", "dustUranium", "dustUranium",
+				"dustUranium", "dustUranium", "dustUranium",
+				"dustUranium", "dustUranium", "dustUranium");
+		
+		UtilsItems.shapelessBuilder(gearboxCasing_Tier_1, 
+				circuitPrimitive, circuitPrimitive, circuitPrimitive,
+				circuitPrimitive, circuitPrimitive, circuitPrimitive,
+				circuitPrimitive, circuitPrimitive, circuitPrimitive);
+	}
+	
+}
diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
index 8c66bb1cc9..9f100117fc 100644
--- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
+++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
@@ -14,12 +14,15 @@ public class RegistrationHandler {
 	private final static void init(){
 		RECIPES_Tools.RECIPES_LOAD();
 		RECIPES_Machines.RECIPES_LOAD();
+		RECIPES_Shapeless.RECIPES_LOAD();
+		//RECIPES_MTWRAPPER.run();
 		try {
 			Thread.sleep(10);
 		} catch (InterruptedException e) {
 			Utils.LOG_INFO(e.toString());
 		}
 		Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed);
+		Utils.LOG_INFO("MT Loaded: "+RECIPES_MTWRAPPER.MT_RECIPES_LOADED+" MT Failed: "+RECIPES_MTWRAPPER.MT_RECIPES_FAILED);
 	}
 	
 }