fix Magical Crops Recipes.

WanionCane · Jul 24, 2016 · 8f64788 · 8f64788
1 parent a63e1d6
commit 8f64788
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-2.8b"
+version = "1.7.10-2.8c"
 group= "wanion.unidict" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "UniDict"
 

diff --git a/src/main/java/wanion/unidict/common/Reference.java b/src/main/java/wanion/unidict/common/Reference.java
@@ -14,7 +14,7 @@ public final class Reference
 {
     public static final String MOD_ID = "UniDict";
     public static final String MOD_NAME = MOD_ID;
-    public static final String MOD_VERSION = "1.7.10-2.8b";
+    public static final String MOD_VERSION = "1.7.10-2.8c";
     public static final char SLASH = separatorChar;
     public static final String MC_VERSION = "[1.7.10]";
 

diff --git a/src/main/java/wanion/unidict/recipe/ForgeRecipeResearcher.java b/src/main/java/wanion/unidict/recipe/ForgeRecipeResearcher.java
@@ -68,7 +68,7 @@ public ShapedOreRecipe getNewShapedRecipe(@Nonnull final IRecipe recipe, @Nonnul
         final Object[] newRecipeInputs = new Object[9];
         for (int i = 0; i < 9; i++) {
             final Object input = i < recipeInputs.length ? recipeInputs[i] : null;
-            final String bufferOreName = input != null ? uniOreDictionary.getName(input) : null;
+            final String bufferOreName = input != null ? input instanceof List ? uniOreDictionary.getName(input) : input instanceof ItemStack ? resourceHandler.getContainerName((ItemStack) input) : null : null;
             newRecipeInputs[i] = input != null ? bufferOreName != null ? bufferOreName : input : null;
         }
         return new ShapedOreRecipe(resourceHandler.getMainItemStack(recipe.getRecipeOutput()), RecipeHelper.rawShapeToShape(newRecipeInputs));
@@ -83,7 +83,7 @@ public ShapedOreRecipe getNewShapedFromShapelessRecipe(@Nonnull final IRecipe re
         final Object[] newRecipeInputs = new Object[recipeInputs.length];
         for (int i = 0; i < recipeInputs.length; i++) {
             final Object input = i < recipeInputs.length ? recipeInputs[i] : null;
-            final String bufferOreName = input != null ? uniOreDictionary.getName(input) : null;
+            final String bufferOreName = input != null ? input instanceof List ? uniOreDictionary.getName(input) : input instanceof ItemStack ? resourceHandler.getContainerName((ItemStack) input) : null : null;
             newRecipeInputs[i] = input != null ? bufferOreName != null ? bufferOreName : input : null;
         }
         return new ShapedOreRecipe(resourceHandler.getMainItemStack(recipe.getRecipeOutput()), RecipeHelper.rawShapeToShape(newRecipeInputs));
@@ -97,7 +97,7 @@ public ShapelessOreRecipe getNewShapelessRecipe(@Nonnull final IRecipe recipe, @
         final List<Object> inputs = new ArrayList<>();
         ((ShapelessOreRecipe) recipe).getInput().forEach(object -> {
             if (object != null) {
-                final String bufferOreName = uniOreDictionary.getName(object);
+                final String bufferOreName = object instanceof List ? uniOreDictionary.getName(object) : object instanceof ItemStack ? resourceHandler.getContainerName((ItemStack) object) : null;
                 if (bufferOreName != null)
                     inputs.add(bufferOreName);
                 else if (object instanceof ItemStack)
@@ -115,7 +115,7 @@ public ShapelessOreRecipe getNewShapelessFromShapedRecipe(@Nonnull final IRecipe
         final List<Object> inputs = new ArrayList<>();
         for (Object object : ((ShapedOreRecipe) recipe).getInput()) {
             if (object != null) {
-                final String bufferOreName = uniOreDictionary.getName(object);
+                final String bufferOreName = object instanceof List ? uniOreDictionary.getName(object) : object instanceof ItemStack ? resourceHandler.getContainerName((ItemStack) object) : null;
                 if (bufferOreName != null)
                     inputs.add(bufferOreName);
                 else if (object instanceof ItemStack)

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "UniDict",
   "name": "UniDict",
   "description": "a mod about unifying all the things.",
-  "version": "2.8b",
+  "version": "2.8c",
   "mcversion": "${mcversion}",
   "url": "http://minecraft.curseforge.com/projects/unidict",
   "updateUrl": "",