diff --git a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java.patch b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java.patch index 34e6831a17..9ab3f2150c 100644 --- a/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java.patch +++ b/patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java.patch @@ -23,7 +23,7 @@ + boolean simple = true; + for (Ingredient i : p_i47500_3_) + simple &= i.isSimple(); -+ this.isSimple = simple; ++ this.isSimple = false; //simple; Always use Forge logic until Grum finds a fix for https://github.com/MinecraftForge/MinecraftForge/issues/4557 } - @SideOnly(Side.CLIENT) diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java index db07357ba6..58b2f9f3e1 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -49,7 +49,7 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl implem protected ItemStack output = ItemStack.EMPTY; protected NonNullList input = NonNullList.create(); protected ResourceLocation group; - protected boolean isSimple = true; + protected boolean isSimple = false; //true; Always use Forge logic until Grum finds a fix for https://github.com/MinecraftForge/MinecraftForge/issues/4557 public ShapelessOreRecipe(ResourceLocation group, Block result, Object... recipe){ this(group, new ItemStack(result), recipe); } public ShapelessOreRecipe(ResourceLocation group, Item result, Object... recipe){ this(group, new ItemStack(result), recipe); } diff --git a/src/test/resources/assets/forge/recipes/shapeless.json b/src/test/resources/assets/forge/recipes/shapeless.json new file mode 100644 index 0000000000..854444a7c8 --- /dev/null +++ b/src/test/resources/assets/forge/recipes/shapeless.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:stone", + "data": 0 + }, + { + "item": "minecraft:stone", + "data": 0 + } + ], + "result": { + "item": "minecraft:stone", + "data": 1 + } +} diff --git a/src/test/resources/assets/forge/recipes/shapeless_ore.json b/src/test/resources/assets/forge/recipes/shapeless_ore.json new file mode 100644 index 0000000000..06e1ded412 --- /dev/null +++ b/src/test/resources/assets/forge/recipes/shapeless_ore.json @@ -0,0 +1,20 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "type": "forge:ore_dict", + "ore": "gravel" + }, + { + "type": "forge:ore_dict", + "ore": "gravel" + }, + { + "type": "forge:ore_dict", + "ore": "gravel" + } + ], + "result": { + "item": "minecraft:flint" + } +}