aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/util/recipe
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-30 00:39:34 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-30 00:39:34 +1000
commitd8c84e1d4515d956a2ab6c30e777dcdcbd96b660 (patch)
tree475dc6265549ee21adf7a8cfc5d3eda0d52c6560 /src/Java/miscutil/core/util/recipe
parenta7385909239911de292261c11a33576bdf755d09 (diff)
downloadGT5-Unofficial-d8c84e1d4515d956a2ab6c30e777dcdcbd96b660.tar.gz
GT5-Unofficial-d8c84e1d4515d956a2ab6c30e777dcdcbd96b660.tar.bz2
GT5-Unofficial-d8c84e1d4515d956a2ab6c30e777dcdcbd96b660.zip
+ Materials handler now generates blocks and frames from each metal.
+ Static materials added are now added dynamically with no side effects. + Added some new Materials.
Diffstat (limited to 'src/Java/miscutil/core/util/recipe')
-rw-r--r--src/Java/miscutil/core/util/recipe/UtilsRecipe.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
index 3de2e5e887..9e36652b10 100644
--- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
@@ -318,17 +318,17 @@ public class UtilsRecipe {
Object InputItem1, Object InputItem2, Object InputItem3,
Object InputItem4, Object InputItem5, Object InputItem6,
Object InputItem7, Object InputItem8, Object InputItem9,
- ItemStack OutputItem){
-
- if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String)) ||
- (!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String)) ||
- (!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String)) ||
- (!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String)) ||
- (!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String)) ||
- (!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String)) ||
- (!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String)) ||
- (!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String)) ||
- (!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String))){
+ ItemStack OutputItem){
+
+ if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String) && (InputItem1 != null)) ||
+ (!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String) && (InputItem2 != null)) ||
+ (!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String) && (InputItem3 != null)) ||
+ (!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String) && (InputItem4 != null)) ||
+ (!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String) && (InputItem5 != null)) ||
+ (!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String) && (InputItem6 != null)) ||
+ (!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String) && (InputItem7 != null)) ||
+ (!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String) && (InputItem8 != null)) ||
+ (!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String) && (InputItem9 != null))){
Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
return;
}