+ Added MV/HV Dehydrators.

+ Added recipes for new Dehydrators.
$ More recipe smoothing.

4 files changed, 53 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index b402f19ced..31bca6d40c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -128,7 +128,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	PowerSubStation,
 
 	//Chemical Dehydrators for nuclear fuels
-	GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
+	 GT_Dehydrator_MV, GT_Dehydrator_HV, GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM,
 
 	//Fluid Storage Tanks
 	GT_FluidTank_ULV, GT_FluidTank_LV, GT_FluidTank_MV, GT_FluidTank_HV, GT_FluidTank_EV,
@@ -333,7 +333,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_Adv_ImplosionCompressor, 
 	//Advanced Vacuum Freezer
 	Industrial_Cryogenic_Freezer, Casing_AdvancedVacuum,
-	FusionComputer_UV2, 
+	FusionComputer_UV2,
 	
 	
 	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index eed1e4a4ad..f15eb5cf3a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.recipes;
 
+import static gtPlusPlus.core.lib.CORE.GTNH;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.GregTech_API;
@@ -9,6 +11,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
@@ -479,6 +482,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		if ((aDuration = GregTech_API.sRecipeFile.get("machinecomponents", aOutput1, aDuration)) <= 0) {
 			return false;
 		}
+		if (GTNH) {
+			return false;
+		}
 		Recipe_GT.Gregtech_Recipe_Map.sComponentAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[] { aOutput1 },
 				null, new FluidStack[] { aFluidInput }, null, aDuration, aEUt, 0);
 		return true;
@@ -489,6 +495,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs) || aEUtick <= 0) {
 			return false;
 		}
+
+		if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+			return false;
+		}
 		Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
 		return true;
 	}
@@ -497,6 +507,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs) || aEUtick <= 0) {
 			return false;
 		}
+		if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+			return false;
+		}
 		Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
 		return true;
 	}
@@ -506,6 +519,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs) || aEUtick <= 0) {
 			return false;
 		}
+
+		if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+			return false;
+		}
 		if (Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial) != null) {
 			return true;
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index de716141dd..148b1254b1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -312,8 +312,7 @@ public class GregtechConduits {
 				pipePlate, "craftingToolWrench", pipePlate,
 				ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1));
 
-		if (pipeIngot != null) {
-
+		if (pipeIngot != null && ItemUtils.checkForInvalidItems(pipeIngot)) {
 			GT_Values.RA.addExtruderRecipe(
 					ItemUtils.getSimpleStack(pipeIngot, 1),
 					ItemList.Shape_Extruder_Pipe_Tiny.get(0),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 753aec72ee..2c8a63312f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -40,6 +40,19 @@ public class GregtechDehydrator {
 		 * 
 		 */
 
+		//Basic
+		GregtechItemList.GT_Dehydrator_MV
+		.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(911, "machine.dehydrator.tier.00",
+				"Basic Dehydrator I", 2, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip,
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+				"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
+		GregtechItemList.GT_Dehydrator_HV
+		.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(912, "machine.dehydrator.tier.01",
+				"Basic Dehydrator II", 3, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip,
+				Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png",
+				"", false, false, 0, "UNBOXINATOR", null).getStackForm(1L));
+		
+		//Chemical
 		GregtechItemList.GT_Dehydrator_EV
 				.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01",
 						"Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip,
@@ -85,6 +98,26 @@ public class GregtechDehydrator {
 		GT_Values.RA.addAssemblerRecipe(coilWire4, spoolT4, coilT4, 8 * 20, 960);
 
 		// Add recipes for the Dehydrators.
+		
+		//Basic
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_MV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+						ItemList.Robot_Arm_MV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.RedAlloy), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Copper), Character.valueOf('G'),
+						OrePrefixes.gearGt.get(Materials.Steel) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_HV.get(1L, new Object[0]),
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+						ItemList.Robot_Arm_HV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.Electrum), Character.valueOf('C'),
+						OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+						OrePrefixes.cableGt04.get(Materials.Silver), Character.valueOf('G'),
+						ALLOY.POTIN.getGear(1) });
+		
+		//Chemical
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
 				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
 						| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,