+ Made Advanced Boilers Load.

% Finished recipes for the Dehydrator.
+ Added some temporary recipes for the Advanced Boilers.
$ Fixed an error in addShapedGregtechRecipe where NPE's were thrown.

2 files changed, 16 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index 1b792f7433..3ed456d841 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.*;
 import net.minecraft.item.ItemStack;
@@ -14,21 +15,21 @@ public class GregtechAdvancedBoilers {
 
 	public static void run() {
 		if (LoadedMods.Gregtech){
-			Utils.LOG_INFO("Gregtech5u Content | Registering Electric Boilers.");
+			Utils.LOG_INFO("Gregtech5u Content | Registering Advanced Boilers.");
 			run1();
 		}
 	}
 
 	private static void run1(){
 		//Boilers
-		GregtechItemList.Boiler_Advanced_LV.set(new GT_MetaTileEntity_Boiler_LV(601, "Advanced Boiler [LV]", 1).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_MV.set(new GT_MetaTileEntity_Boiler_MV(602, "Advanced Boiler [MV]", 2).getStackForm(1L));
-		GregtechItemList.Boiler_Advanced_HV.set(new GT_MetaTileEntity_Boiler_HV(603, "Advanced Boiler [HV]", 3).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_LV.set(new GT_MetaTileEntity_Boiler_LV(756, "Advanced Boiler [LV]", 1).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_MV.set(new GT_MetaTileEntity_Boiler_MV(757, "Advanced Boiler [MV]", 2).getStackForm(1L));
+		GregtechItemList.Boiler_Advanced_HV.set(new GT_MetaTileEntity_Boiler_HV(758, "Advanced Boiler [HV]", 3).getStackForm(1L));
 		
 		
-		ItemStack chassisT1;
-		ItemStack chassisT2;
-		ItemStack chassisT3;
+		ItemStack chassisT1 = ItemUtils.getItemStack("miscutils:itemBoilerChassis", 1);
+		ItemStack chassisT2 = ItemUtils.getItemStack("miscutils:itemBoilerChassis:1", 1);
+		ItemStack chassisT3 = ItemUtils.getItemStack("miscutils:itemBoilerChassis:2", 1);
 
 
 		//Make the Coil in each following recipe a hammer and a Screwdriver.
@@ -39,7 +40,7 @@ public class GregtechAdvancedBoilers {
 		new Object[]{"ECE", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_LV,
 			Character.valueOf('P'), ItemList.Robot_Arm_EV, //TODO
-			Character.valueOf('E'), coilT1, //TODO
+			Character.valueOf('E'), chassisT1, //TODO
 			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
 			Character.valueOf('W'), chassisT1,
 			Character.valueOf('G'), OrePrefixes.gear.get(Materials.Steel)});
@@ -50,7 +51,7 @@ public class GregtechAdvancedBoilers {
 		new Object[]{"ECE", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_MV,
 			Character.valueOf('P'), ItemList.Robot_Arm_IV, //TODO
-			Character.valueOf('E'), coilT2, //TODO
+			Character.valueOf('E'), chassisT2, //TODO
 			Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
 			Character.valueOf('W'), chassisT2,
 			Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1)});
@@ -61,7 +62,7 @@ public class GregtechAdvancedBoilers {
 		new Object[]{"ECE", "WMW", "GPG",
 			Character.valueOf('M'), ItemList.Hull_HV,
 			Character.valueOf('P'), RECIPE_CONSTANTS.robotArm_LuV, //TODO
-			Character.valueOf('E'), coilT3, //TODO
+			Character.valueOf('E'), chassisT3, //TODO
 			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 038d367afd..2bd3ce71d9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -9,6 +9,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
@@ -100,10 +101,10 @@ public class GregtechDehydrator
 		//GregtechItemList..set(new GregtechMetaTileEntitySolarGenerator(816, "dehydrator.tier.04", "ZPM Voltage Chemical Dehydrator", 7).getStackForm(1L));
 
 
-		ItemStack coilT1 = null;
-		ItemStack coilT2 = null;
-		ItemStack coilT3 = null;
-		ItemStack coilT4 = null;
+		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);
 
 		GT_ModHandler.addCraftingRecipe(
 		GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),