Fix a heap of conflicting dehydrator recipes.

4 files changed, 15 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 229bc234e9..b4091cb42f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -62,7 +62,7 @@ public interface IGregtech_RecipeAdder {
 	 * @return true if the Recipe got added, otherwise false.
 	 */
 
-	public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
+	//public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
 	/*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/
 	/*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index a346464eeb..773480104a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -47,7 +47,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
 	private void generateRecipes(final Material material, final boolean disableOptional){
 
-		Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName());
+		Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName());
 
 		final ItemStack normalDust = material.getDust(1);
 		final ItemStack smallDust = material.getSmallDust(1);
@@ -59,14 +59,14 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
 		if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) {
 			if (RecipeUtils.addShapedRecipe(
-					tinyDust,	tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					tinyDust, tinyDust, tinyDust,
 					normalDust)){
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 
 			if (RecipeUtils.addShapedRecipe(
@@ -74,10 +74,10 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					null, null, null,
 					null, null, null,
 					material.getTinyDust(9))){
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 		}
 
@@ -87,20 +87,20 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					smallDust, smallDust, null,
 					null, null, null,
 					normalDust)){
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 			if (RecipeUtils.addShapedRecipe(
 					null, normalDust, null,
 					null, null, null,
 					null, null, null,
 					material.getSmallDust(4))){
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
 			}
 			else {
-				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+				Logger.INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 		}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 90bd1d8f1a..f8108852f4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -186,7 +187,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
 
 				ItemStack emptyCell = null;
 				if (mCellCount > 0){
-					emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount);
+					emptyCell = CI.emptyCells(mCellCount);
 					Logger.MATERIALS("[Dehydrator] Recipe now requires "+mCellCount+" empty cells as input.");
 				}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 0b4649e414..58f9f1d12c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -332,7 +332,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	 * aOutputItems, aDuration, aEUt); return true; }
 	 */
 
-	@Override
+	/*@Override
 	public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput,
 			int aDuration, final int aEUt) {
 		Logger.WARNING("Trying to add a Dehydrator recipe.");
@@ -363,7 +363,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 			Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
 			return false;
 		}
-	}
+	}*/
 
 	@Override
 	public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput,