diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java | 17 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java | 6 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index a20678c354..0a5779d109 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.util.minecraft; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -417,6 +418,20 @@ public static int mInvalidID = 1; } return false; } + + public static boolean addShapelessGregtechRecipe( + final Object InputItem1, final Object InputItem2, final Object InputItem3, + final Object InputItem4, final Object InputItem5, final Object InputItem6, + final Object InputItem7, final Object InputItem8, final Object InputItem9, + final ItemStack OutputItem){ + + Object[] inputItems = { + InputItem1, InputItem2, InputItem3, + InputItem4, InputItem5, InputItem6, + InputItem7, InputItem8, InputItem9 + }; + return addShapelessGregtechRecipe(inputItems, OutputItem); + } public static boolean addShapelessGregtechRecipe(final Object[] inputItems, final ItemStack OutputItem){ //Catch Invalid Recipes @@ -728,7 +743,7 @@ public static int mInvalidID = 1; Logger.INFO("Data Size: "+aDataObject.length); aDataObject = ArrayUtils.removeNulls(aDataObject); Logger.INFO("Clean Size: "+aDataObject.length); - Logger.INFO("ArrayData: "+aDataObject.toString()); + Logger.INFO("ArrayData: "+Arrays.toString(aDataObject)); ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 773480104a..9cd3fdaca4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -57,8 +57,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) { - if (RecipeUtils.addShapedRecipe( + if (tinyDust != null && normalDust != null) { + if (RecipeUtils.addShapelessGregtechRecipe( tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, @@ -81,7 +81,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } } - if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) { + if (smallDust != null && normalDust != null) { if (RecipeUtils.addShapedRecipe( smallDust, smallDust, null, smallDust, smallDust, null, |