try to decrease the likely of recipe key collision.

WanionCane · Aug 21, 2016 · 2cf9b78 · 2cf9b78
1 parent 2247be0
commit 2cf9b78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/wanion/unidict/recipe/ForgeRecipeResearcher.java b/src/main/java/wanion/unidict/recipe/ForgeRecipeResearcher.java
@@ -30,13 +30,13 @@ public class ForgeRecipeResearcher implements IRecipeResearcher<ShapedOreRecipe,
     @Override
     public int getShapedRecipeKey(@Nonnull final IRecipe recipe, @Nonnull final ResourceHandler resourceHandler)
     {
-        return MetaItem.getCumulative(((ShapedOreRecipe) recipe).getInput(), resourceHandler);
+        return MetaItem.getCumulative(((ShapedOreRecipe) recipe).getInput(), resourceHandler) + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @Override
     public int getShapelessRecipeKey(@Nonnull final IRecipe recipe, @Nonnull final ResourceHandler resourceHandler)
     {
-        return MetaItem.getCumulative(((ShapelessOreRecipe) recipe).getInput().toArray(), resourceHandler);
+        return MetaItem.getCumulative(((ShapelessOreRecipe) recipe).getInput().toArray(), resourceHandler) + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/wanion/unidict/recipe/IC2RecipeResearcher.java b/src/main/java/wanion/unidict/recipe/IC2RecipeResearcher.java
@@ -43,7 +43,7 @@ else if (input instanceof List) {
             } else if (input instanceof IRecipeInput)
                 recipeId += MetaItem.get(((IRecipeInput) input).getInputs().get(0));
         }
-        return recipeId;
+        return recipeId + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @Override
@@ -63,7 +63,7 @@ else if (obj instanceof IRecipeInput)
                     recipeId += MetaItem.get(((IRecipeInput) obj).getInputs().get(0));
             }
         }
-        return recipeId;
+        return recipeId + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @Override

diff --git a/src/main/java/wanion/unidict/recipe/VanillaRecipeResearcher.java b/src/main/java/wanion/unidict/recipe/VanillaRecipeResearcher.java
@@ -29,13 +29,13 @@ public class VanillaRecipeResearcher implements IRecipeResearcher<ShapedRecipes,
     @Override
     public int getShapedRecipeKey(@Nonnull final IRecipe recipe, @Nonnull final ResourceHandler resourceHandler)
     {
-        return MetaItem.getCumulative(((ShapedRecipes) recipe).recipeItems, resourceHandler);
+        return MetaItem.getCumulative(((ShapedRecipes) recipe).recipeItems, resourceHandler) + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @Override
     public int getShapelessRecipeKey(@Nonnull final IRecipe recipe, @Nonnull final ResourceHandler resourceHandler)
     {
-        return MetaItem.getCumulative(((ShapelessRecipes) recipe).recipeItems.toArray(), resourceHandler);
+        return MetaItem.getCumulative(((ShapelessRecipes) recipe).recipeItems.toArray(), resourceHandler) + MetaItem.get(resourceHandler.getMainItemStack(recipe.getRecipeOutput()));
     }
 
     @Override