Merge pull request #93 from GTNewHorizons/New-Multis-3

New multis 3

11 files changed, 329 insertions, 367 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 0817202e85..e71e71d6ed 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -1,13 +1,18 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import gregtech.api.GregTech_API;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.*;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler;
+import gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube;
+import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.*;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable;
+import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*;
 
 public class Gregtech4Content {
@@ -16,20 +21,75 @@ public class Gregtech4Content {
 
 	public static void run() {
 		if (LoadedMods.Gregtech) {
+			Logger.INFO("Max MTE: "+GregTech_API.METATILEENTITIES.length+" | "+GregTech_API.MAXIMUM_METATILE_IDS);
 			workbenches();
 			thermalBoiler();
 			multiCrafter();
 			tesseracts();
 			shelves();
+			basic();
+			automation();
+			redstone();
+			computer();
 		}
 	}
 
+
+	private static void computer() {
+		Logger.INFO("Gregtech 4 Content | Registering Computer Cube.");	
+		GregtechItemList.Gregtech_Computer_Cube_Machine.set(new GT_TileEntity_ComputerCube(31130, "C-O-M-P-U-T-E-R").getStackForm(1L));
+	}
+	
 	private static void workbenches() {
 		// Gregtech 4 Workbenches
-		//Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches.");
-		// Free //GregtechItemList.GT4_Workbench_Bronze.set(new
-		// GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze",
-		// "Bronze Workbench", 0).getStackForm(1L));
+		Logger.INFO("Gregtech 4 Content | Registering Workbenches.");		
+		GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(31081, "workbench.basic", "Bronze Workbench", 0, "Stores 16000L of fluid").getStackForm(1L));
+		GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(31082, "workbench.advanced", "Advanced Workbench", 3, "Stores 64000L of fluid").getStackForm(1L));
+		
+	}
+	
+	private static void redstone() {
+		Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks.");		
+		GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L));
+		GregtechItemList.GT4_Redstone_Button_Panel.set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L));
+		GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L));
+		GregtechItemList.GT4_Redstone_Display.set(new GT_MetaTileEntity_RedstoneStrengthDisplay(31123, "redstone.display.strength", "Redstone Display", "Displays Redstone Strength").getStackForm(1L));
+		GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L));
+		
+	}
+	
+	private static void automation() {
+		Logger.INFO("Gregtech 4 Content | Registering Auto Workbenches.");		
+		GregtechItemList.GT4_Electric_Auto_Workbench_LV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31091, 1, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_MV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31092, 2, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_HV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31093, 3, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_EV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31094, 4, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_IV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31095, 5, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_LuV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31096, 6, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_ZPM.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31097, 7, "Automatic crafting machine").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Auto_Workbench_UV.set(new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L));
+
+		Logger.INFO("Gregtech 4 Content | Registering Inventory Managers.");		
+		GregtechItemList.GT4_Electric_Inventory_Manager_LV.set(new GT_MetaTileEntity_ElectricInventoryManager(31101, 1, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_MV.set(new GT_MetaTileEntity_ElectricInventoryManager(31102, 2, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_HV.set(new GT_MetaTileEntity_ElectricInventoryManager(31103, 3, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_EV.set(new GT_MetaTileEntity_ElectricInventoryManager(31104, 4, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_IV.set(new GT_MetaTileEntity_ElectricInventoryManager(31105, 5, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_LuV.set(new GT_MetaTileEntity_ElectricInventoryManager(31106, 6, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_ZPM.set(new GT_MetaTileEntity_ElectricInventoryManager(31107, 7, "Manages your inventory and stuff").getStackForm(1L));
+		GregtechItemList.GT4_Electric_Inventory_Manager_UV.set(new GT_MetaTileEntity_ElectricInventoryManager(31108, 8, "Manages your inventory and stuff").getStackForm(1L));
+	}
+	
+	private static void basic() {
+		Logger.INFO("Gregtech 4 Content | Registering Crop Managers.");		
+		GregtechItemList.GT4_Crop_Harvester_LV.set(new GT_MetaTileEntity_CropHarvestor(31111, 1, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_MV.set(new GT_MetaTileEntity_CropHarvestor(31112, 2, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_HV.set(new GT_MetaTileEntity_CropHarvestor(31113, 3, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_EV.set(new GT_MetaTileEntity_CropHarvestor(31114, 4, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_IV.set(new GT_MetaTileEntity_CropHarvestor(31115, 5, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_LuV.set(new GT_MetaTileEntity_CropHarvestor(31116, 6, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_ZPM.set(new GT_MetaTileEntity_CropHarvestor(31117, 7, "Harvests the Cropsticks in front of it").getStackForm(1L));
+		GregtechItemList.GT4_Crop_Harvester_UV.set(new GT_MetaTileEntity_CropHarvestor(31118, 8, "Harvests the Cropsticks in front of it").getStackForm(1L));
 	}
 
 	private static void tesseracts() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 9a5fa6f6de..3c1140fea0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -40,7 +40,7 @@ public class GregtechConduits {
 	 *
 	 */
 
-	private static OrePrefixes cableGt16;
+	public static OrePrefixes cableGt16;
 	static{
 		if(GTNH) {
 			try {
@@ -52,7 +52,7 @@ public class GregtechConduits {
 	}
 
 	//30000-30999
-	
+
 	private static int BaseWireID = 30600;
 	private static int BasePipeID = 30700;
 	private static int BasePipeHexadecupleID = 30100;
@@ -74,7 +74,7 @@ public class GregtechConduits {
 	}
 
 	private static void run3() {
-		
+
 		if (Utils.getGregtechVersionAsInt() >= 50930) {
 			try {
 				Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
@@ -103,17 +103,17 @@ public class GregtechConduits {
 				e.printStackTrace();
 			}		
 		}	
-		
-		
+
+
 		//Generate Heat Pipes
 		//GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021,	"gtpp.pipe.heat.basic.01", "Lead Heat Pipe (500C)", Materials.Lead, 500).getStackForm(1L));
 		//GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022,	"gtpp.pipe.heat.basic.02", "Iron Heat Pipe (500C)", Materials.Iron, 500).getStackForm(1L));
 		//GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023,	"gtpp.pipe.heat.basic.03", "Silver Heat Pipe (1500C)", Materials.Silver, 1500).getStackForm(1L));
-		
-		
-		
+
+
+
 	}
-	
+
 	private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial, String name, String displayName, int startID, int baseCapacity, int heatCapacity, boolean gasProof){
 		GT_MetaPipeEntity_Fluid aPipe;
 		try {
@@ -453,245 +453,165 @@ public class GregtechConduits {
 		return true;
 	}
 
-	public static boolean generateWireRecipes(Material aMaterial){
+	public static boolean generateWireRecipes(Material aMaterial) {
+
+		ItemStack aPlate = aMaterial.getPlate(1);
+		ItemStack aIngot = aMaterial.getIngot(1);
+		ItemStack aWire01 = aMaterial.getWire01(1);
+		ItemStack aWire02 = aMaterial.getWire02(1);
+		ItemStack aWire04 = aMaterial.getWire04(1);
+		ItemStack aWire08 = aMaterial.getWire08(1);
+		ItemStack aWire12 = aMaterial.getWire12(1);
+		ItemStack aWire16 = aMaterial.getWire16(1);
+		ItemStack aCable01 = aMaterial.getCable01(1);
+		ItemStack aCable02 = aMaterial.getCable02(1);
+		ItemStack aCable04 = aMaterial.getCable04(1);
+		ItemStack aCable08 = aMaterial.getCable08(1);
+		ItemStack aCable12 = aMaterial.getCable12(1);
+		ItemStack aCable16 = aMaterial.getCable16(1);
+
+		// Adds manual crafting recipe
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aPlate, aWire01})) {
+			RecipeUtils.addShapedRecipe(aPlate, CI.craftingToolWireCutter, null, null, null, null, null, null, null, aWire01);
+		}
 
-		//Adds manual crafting recipe
-		RecipeUtils.addShapedRecipe(
-				Utils.sanitizeString("plate"+aMaterial.getLocalizedName()), CI.craftingToolWireCutter, null,
-				null, null, null,
-				null, null, null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1));
-
-		//Wire mill
-		GT_Values.RA.addWiremillRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("ingot"+aMaterial.getLocalizedName()), 1),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				5*20,
-				4);
-
-		//Extruder
-		GT_Values.RA.addExtruderRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("ingot"+aMaterial.getLocalizedName()), 1),
-				ItemList.Shape_Extruder_Wire.get(0),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				196,
-				96);
-
-		GT_Values.RA.addUnboxingRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt01"+aMaterial.getLocalizedName()), 1),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-				null,
-				100,
-				8);
-
-		//Shapeless Down-Crafting
-		//2x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1)},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2)
-				);
-		//4x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1)},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 4)
-				);
-		//8x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1)},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 8)
-				);
-		//12x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt12"+aMaterial.getLocalizedName()), 1)},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 12)
-				);
-		//16x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt16"+aMaterial.getLocalizedName()), 1)},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 16)
-				);
-
-
-		//1x -> 2x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//2x -> 4x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//4x -> 8x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//8x -> 12x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt12"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//12x -> 16x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt12"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt16"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//8x -> 16x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt16"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//1x -> 4x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1)
-				);
-
-		//1x -> 8x
-		RecipeUtils.addShapelessGregtechRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-						ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1)
-				},
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1)
-				);
-
-
-		//Wire to Cable
-		//1x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 1),
-				CI.getNumberedCircuit(24),
-				FluidUtils.getFluidStack("molten.rubber", 144),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt01"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-		//2x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1),
-				CI.getNumberedCircuit(24),
-				FluidUtils.getFluidStack("molten.rubber", 144),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt02"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-		//4x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1),
-				CI.getNumberedCircuit(24),
-				FluidUtils.getFluidStack("molten.rubber", 288),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt04"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-		//8x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1),
-				CI.getNumberedCircuit(24),
-				FluidUtils.getFluidStack("molten.rubber", 432),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt08"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-		//12x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt12"+aMaterial.getLocalizedName()), 1),
-				CI.getNumberedCircuit(24),
-				FluidUtils.getFluidStack("molten.rubber", 576),
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt12"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-
-		if(GTNH){
-			//16x
-			GT_Values.RA.addAssemblerRecipe(
-					ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt16"+aMaterial.getLocalizedName()), 1),
-					CI.getNumberedCircuit(24),
-					FluidUtils.getFluidStack("molten.rubber", 720),
-					ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("cableGt16"+aMaterial.getLocalizedName()), 1),
-					100,
-					8);
-		}
-
-		//Assemble small wires into bigger wires
-
-		//2x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				CI.getNumberedCircuit(2),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt02"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-
-		//4x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				CI.getNumberedCircuit(4),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt04"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-
-		//8x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				CI.getNumberedCircuit(8),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt08"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-
-		//12x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				CI.getNumberedCircuit(12),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt12"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
-
-		//16x
-		GT_Values.RA.addAssemblerRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt01"+aMaterial.getLocalizedName()), 2),
-				CI.getNumberedCircuit(16),
-				null,
-				ItemUtils.getItemStackOfAmountFromOreDict(Utils.sanitizeString("wireGt16"+aMaterial.getLocalizedName()), 1),
-				100,
-				8);
+		// Wire mill
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aIngot, aWire01})) {
+			GT_Values.RA.addWiremillRecipe(aIngot, aMaterial.getWire01(2), 5 * 20, 4);
+		}
+
+		// Extruder
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aIngot, aWire01})) {
+			GT_Values.RA.addExtruderRecipe(aIngot, ItemList.Shape_Extruder_Wire.get(0), aMaterial.getWire01(2), 196, 96);
+		}
+
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aCable01, aWire01})) {
+			GT_Values.RA.addUnboxingRecipe(aCable01, aWire01, null, 100, 8);
+		}
+
+		// Shapeless Down-Crafting
+		// 2x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire02}, aMaterial.getWire01(2));
+		}
+
+		// 4x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire04})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire04}, aMaterial.getWire01(4));
+		}
+
+		// 8x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire08})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire08}, aMaterial.getWire01(8));
+		}
+
+		// 12x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire12})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire12}, aMaterial.getWire01(12));
+		}
+
+		// 16x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire16})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire16}, aMaterial.getWire01(16));
+		}
+
+		// 1x -> 2x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire01, aWire01}, aWire02);
+		}
+
+		// 2x -> 4x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire02, aWire04})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire02, aWire02}, aWire04);
+		}
+
+		// 4x -> 8x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire04, aWire08})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire04, aWire04}, aWire08);
+		}
+
+		// 8x -> 12x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire04, aWire08, aWire12})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire04, aWire08}, aWire12);
+		}
+
+		// 12x -> 16x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire04, aWire12, aWire16})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire04, aWire12}, aWire16);
+		}
+
+		// 8x -> 16x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire08, aWire16})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire08, aWire08}, aWire16);
+		}
+
+		// 1x -> 4x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire04})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire01, aWire01, aWire01, aWire01}, aWire04);
+		}
+
+		// 1x -> 8x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire08})) {
+			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01}, aWire08);
+		}
+
+		// Wire to Cable
+		// 1x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aCable01})) {
+			GT_Values.RA.addAssemblerRecipe(aWire01, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 144), aCable01, 100, 8);
+		}
+
+		// 2x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire02, aCable02})) {
+			GT_Values.RA.addAssemblerRecipe(aWire02, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 144), aCable02, 100, 8);
+		}
+
+		// 4x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire04, aCable04})) {
+			GT_Values.RA.addAssemblerRecipe(aWire04, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 288), aCable04, 100, 8);
+		}
+
+		// 8x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire08, aCable08})) {
+			GT_Values.RA.addAssemblerRecipe(aWire08, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 432), aCable08, 100, 8);
+		}
+
+		// 12x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire12, aCable12})) {
+			GT_Values.RA.addAssemblerRecipe(aWire12, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 576), aCable12, 100, 8);
+		}
+
+		// 16x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire16, aCable16})) {
+			GT_Values.RA.addAssemblerRecipe(aWire16, CI.getNumberedCircuit(24), FluidUtils.getFluidStack("molten.rubber", 720), aCable16, 100, 8);
+		}
+
+		// Assemble small wires into bigger wires
+
+		// 2x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(2), CI.getNumberedCircuit(2), null, aWire02, 100, 8);
+		}
+
+		// 4x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(4), CI.getNumberedCircuit(4), null, aWire04, 100, 8);
+		}
+
+		// 8x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(8), CI.getNumberedCircuit(8), null, aWire08, 100, 8);
+		}
+
+		// 12x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(12), CI.getNumberedCircuit(12), null, aWire12, 100, 8);
+		}
+
+		// 16x
+		if (ItemUtils.checkForInvalidItems(new ItemStack[]{aWire01, aWire02})) {
+			GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(16), CI.getNumberedCircuit(16), null, aWire16, 100, 8);
+		}
 
 		return true;
 	}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
index 8340b7088c..67c54a7699 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
@@ -4,7 +4,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialVacuumFreezer;
-//import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_AssemblyLine;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_AssemblyLine;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_DistillationTower;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_EBF;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK4;
@@ -26,9 +26,9 @@ public class GregtechFactoryGradeReplacementMultis {
 	
 		//31021
 		GregtechItemList.Machine_Adv_DistillationTower.set(new GregtechMetaTileEntity_Adv_DistillationTower(31021, "multimachine.adv.distillationtower", "Dangote Distillus").getStackForm(1L));
-		/*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 			GregtechItemList.Machine_Adv_AssemblyLine.set(new GregtechMetaTileEntity_Adv_AssemblyLine(31024, "multimachine.adv.assemblyline", "Compound Fabricator").getStackForm(1L));
-		}*/
+		}
 		
 	}
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
index 9e940dff26..9301844071 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
@@ -12,7 +12,7 @@ public class GregtechIndustrialElementDuplicator {
 		Logger.INFO("Gregtech5u Content | Registering Elemental Duplicator Multiblock.");
 		
 		GregtechItemList.Controller_ElementalDuplicator.set(new GregtechMTE_ElementalDuplicator(31050, "gtpp.multimachine.replicator", "Elemental Duplicator").getStackForm(1L));
-		GregtechItemList.Hatch_Input_Elemental_Duplicator.set(new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(31051, "hatch.input_bus.elementalorbholder", "Elemental Data Orb Storage", 7).getStackForm(1L));
+		GregtechItemList.Hatch_Input_Elemental_Duplicator.set(new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(31051, "hatch.input_bus.elementalorbholder", "Data Orb Repository", 7).getStackForm(1L));
 		
 	}
 	
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
new file mode 100644
index 0000000000..6e13934a8d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialForgeHammer;
+
+public class GregtechIndustrialForgeHammer {
+
+	public static void run() {
+		if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+			Logger.INFO("Gregtech5u Content | Registering Industrial Forge Hammer Multiblock.");
+			run1();
+		}		
+
+	}
+
+	private static void run1() {
+		GregtechItemList.Controller_IndustrialForgeHammer.set(new GregtechMetaTileEntity_IndustrialForgeHammer(31075,
+				"industrialhammer.controller.tier.single", "Industrial Sledgehammer").getStackForm(1L));
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index f07be17ffd..8489f0d59c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
+import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
 import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -33,9 +34,9 @@ public class GregtechIndustrialMassFabricator {
 	}
 
 	private static void generateRecipes() {
-		
+
 		//Generate Scrap->UUA Recipes
-		
+
 
 
 		//Basic UUA1
@@ -63,7 +64,7 @@ public class GregtechIndustrialMassFabricator {
 
 		GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_Scrap);
 		GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_ScrapBoxes);		
-		
+
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {					
 			//Basic UUM
 			GT_Recipe generateUUM = new GTPP_Recipe(
@@ -94,10 +95,13 @@ public class GregtechIndustrialMassFabricator {
 		}
 		else {
 
+			GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe(false, null, null, null, null, new FluidStack[]{Materials.UUMatter.getFluid(1L)}, GT_MetaTileEntity_Massfabricator.sDurationMultiplier, 256, 0);
+			GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe(false, null, null, null, new FluidStack[]{Materials.UUAmplifier.getFluid(GT_MetaTileEntity_Massfabricator.sUUAperUUM)}, new FluidStack[]{Materials.UUMatter.getFluid(1L)}, GT_MetaTileEntity_Massfabricator.sDurationMultiplier / GT_MetaTileEntity_Massfabricator.sUUASpeedBonus, 256, 0);
+
 			//Basic UUM
 			GT_Recipe generateUUM_LV = new GTPP_Recipe(
 					false,