+ Added Recipes for Coil Wires.

+ Added Recipes for Wire Coils.
% Tweaked Advanced Boiler recipes to now require Huge pipes.
% Changed a handful of recipes to utilise the new GT circuits.
+ Added my custom circuits to the same OreDict tags as the new GT ones, so they are interchangeable.

5 files changed, 21 insertions, 22 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index 1724b7fe77..5dae3f5602 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
+import gtPlusPlus.core.recipe.RECIPES_MachineComponents;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -67,13 +67,17 @@ public class GregtechAdvancedBoilers {
 			Character.valueOf('G'), OrePrefixes.pipeSmall.get(Materials.Steel)});
 
 		
+		ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1);
+		ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1);
+		ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1);
+		
 		//Boiler Recipes
 		GT_ModHandler.addCraftingRecipe(
 		GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]),
 		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
 		new Object[]{"dCw", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_LV,
-			Character.valueOf('P'), ItemList.Robot_Arm_EV, //TODO
+			Character.valueOf('P'), pipeTier1,
 			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
 			Character.valueOf('W'), chassisT1,
 			Character.valueOf('G'), OrePrefixes.gear.get(Materials.Steel)});
@@ -83,7 +87,7 @@ public class GregtechAdvancedBoilers {
 		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
 		new Object[]{"dCw", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_MV,
-			Character.valueOf('P'), ItemList.Robot_Arm_IV, //TODO
+			Character.valueOf('P'), pipeTier2,
 			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
 			Character.valueOf('W'), chassisT2,
 			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
@@ -93,7 +97,7 @@ public class GregtechAdvancedBoilers {
 		GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
 		new Object[]{"dCw", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_HV,
-			Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_LuV, //TODO
+			Character.valueOf('P'), pipeTier3,
 			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
 			Character.valueOf('W'), chassisT3,
 			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 2bd3ce71d9..7bcb4f715f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -101,10 +101,10 @@ public class GregtechDehydrator
 		//GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(816, "dehydrator.tier.04", "ZPM Voltage Chemical Dehydrator", 7).getStackForm(1L));
 
 
-		ItemStack coilT1 = ItemUtils.getItemStack("miscutils:itemDehydratorCoil", 1);
-		ItemStack coilT2 = ItemUtils.getItemStack("miscutils:itemDehydratorCoil:1", 1);
-		ItemStack coilT3 = ItemUtils.getItemStack("miscutils:itemDehydratorCoil:2", 1);
-		ItemStack coilT4 = ItemUtils.getItemStack("miscutils:itemDehydratorCoil:3", 1);
+		ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1);
+		ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1);
+		ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1);
+		ItemStack coilT4 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:3", "coil4", 3, 1);
 
 		GT_ModHandler.addCraftingRecipe(
 		GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index 86749e1f40..a5b36a0589 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -8,8 +8,6 @@ import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator;
 import net.minecraft.item.ItemStack;
 
@@ -38,7 +36,7 @@ public class GregtechGeothermalThermalGenerator {
 						Character.valueOf('M'), ItemList.Hull_EV,
 						Character.valueOf('P'), ItemList.Electric_Piston_EV,
 						Character.valueOf('E'), ItemList.Electric_Motor_EV,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate),
 						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
 						Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
 
@@ -48,7 +46,7 @@ public class GregtechGeothermalThermalGenerator {
 						Character.valueOf('M'), ItemList.Hull_IV,
 						Character.valueOf('P'), ItemList.Electric_Piston_IV,
 						Character.valueOf('E'), ItemList.Electric_Motor_IV,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor),
 						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
 						Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
 
@@ -60,7 +58,7 @@ public class GregtechGeothermalThermalGenerator {
 						Character.valueOf('M'), ItemList.Hull_LuV,
 						Character.valueOf('P'), INGREDIENT_1,
 						Character.valueOf('E'), INGREDIENT_2,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite),
 						Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
 						Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 37e8075353..788618a660 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -8,8 +8,6 @@ import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
 import net.minecraft.item.ItemStack;
 
@@ -38,7 +36,7 @@ public class GregtechRocketFuelGenerator {
 						Character.valueOf('M'), ItemList.Hull_EV,
 						Character.valueOf('P'), ItemList.Electric_Piston_EV,
 						Character.valueOf('E'), ItemList.Electric_Motor_EV,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate),
 						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium),
 						Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
 
@@ -48,7 +46,7 @@ public class GregtechRocketFuelGenerator {
 						Character.valueOf('M'), ItemList.Hull_IV,
 						Character.valueOf('P'), ItemList.Electric_Piston_IV,
 						Character.valueOf('E'), ItemList.Electric_Motor_IV,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor),
 						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum),
 						Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
 
@@ -60,7 +58,7 @@ public class GregtechRocketFuelGenerator {
 						Character.valueOf('M'), ItemList.Hull_LuV,
 						Character.valueOf('P'), INGREDIENT_1,
 						Character.valueOf('E'), INGREDIENT_2,
-						Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic),
+						Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite),
 						Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten),
 						Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 3e58f2e516..3f20fa7a25 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -5,7 +5,6 @@ import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 
 public class GregtechSafeBlock
@@ -43,9 +42,9 @@ public class GregtechSafeBlock
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_EV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite)});
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_IV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(GT_Materials.Symbiotic)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(GT_Materials.Neutronic)});
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(GT_Materials.Quantum)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),  GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite)});