Better With Using Custom Ingredient Classes (#335)

* better with custom ingredients

* fix betterwithaddons rotting example using absent item

Author: WaitingIdly

examples/postInit/betterwithaddons.groovy

@@ -141,7 +141,7 @@ mods.betterwithaddons.rotting.recipeBuilder()
     .register()
 
 mods.betterwithaddons.rotting.recipeBuilder()
-    .input(item('placeholdername:snack'))
+    .input(item('minecraft:apple'))
     .time(100)
     .key('groovy_example')
     .rotted(item('minecraft:clay') * 4)

examples/postInit/betterwithmods.groovy

@@ -42,7 +42,7 @@ mods.betterwithmods.cauldron.removeByOutput(item('minecraft:gunpowder'))
 // mods.betterwithmods.cauldron.removeAll()
 
 mods.betterwithmods.cauldron.recipeBuilder()
-    .input(item('minecraft:clay'))
+    .input(item('minecraft:clay') * 3)
     .output(item('minecraft:diamond'))
     .heat(2)
     .register()
@@ -62,7 +62,7 @@ mods.betterwithmods.crucible.removeByOutput(item('minecraft:gunpowder'))
 // mods.betterwithmods.crucible.removeAll()
 
 mods.betterwithmods.crucible.recipeBuilder()
-    .input(item('minecraft:clay'))
+    .input(item('minecraft:clay') * 3)
     .output(item('minecraft:diamond'))
     .heat(2)
     .register()
@@ -98,7 +98,7 @@ mods.betterwithmods.hopper.recipeBuilder()
 
 mods.betterwithmods.hopper.recipeBuilder()
     .name('betterwithmods:wicker')
-    .input(item('minecraft:clay'))
+    .input(item('minecraft:clay') * 3)
     .inWorldItemOutput(item('minecraft:gold_ingot'))
     .register()
 
@@ -150,7 +150,7 @@ mods.betterwithmods.mill_stone.removeByOutput(item('minecraft:blaze_powder'))
 // mods.betterwithmods.mill_stone.removeAll()
 
 mods.betterwithmods.mill_stone.recipeBuilder()
-    .input(item('minecraft:diamond'))
+    .input(item('minecraft:diamond') * 3)
     .output(item('minecraft:gold_ingot') * 16)
     .register()
 

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/Rotting.java

@@ -39,7 +39,7 @@ public boolean isEnabled() {
 
     @RecipeBuilderDescription(example = {
             @Example(".input(item('minecraft:gold_ingot'))"),
-            @Example(".input(item('placeholdername:snack')).time(100).key('groovy_example').rotted(item('minecraft:clay') * 4)")
+            @Example(".input(item('minecraft:apple')).time(100).key('groovy_example').rotted(item('minecraft:clay') * 4)")
     })
     public RecipeBuilder recipeBuilder() {
         return new RecipeBuilder();

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/BetterWithMods.java

@@ -1,6 +1,9 @@
 package com.cleanroommc.groovyscript.compat.mods.betterwithmods;
 
+import betterwithmods.util.StackIngredient;
+import com.cleanroommc.groovyscript.api.IIngredient;
 import com.cleanroommc.groovyscript.compat.mods.GroovyPropertyContainer;
+import net.minecraft.item.crafting.Ingredient;
 
 public class BetterWithMods extends GroovyPropertyContainer {
 
@@ -14,4 +17,17 @@ public class BetterWithMods extends GroovyPropertyContainer {
     public final Heat heat = new Heat();
     public final Hopper hopper = new Hopper();
     public final HopperFilters hopperFilters = new HopperFilters();
+
+    public static class Helper {
+
+        /**
+         * Because Better With Mods checks if the ingredient is an instanceof {@link StackIngredient}
+         * to determine if the Ingredient has an amount, we have to use their custom Ingredient.
+         * <p>
+         * If this isn't used, then the recipe may appear correctly in JEI but will actually only consume 1 when done in-game.
+         */
+        public static Ingredient fromIIngredient(IIngredient ingredient) {
+            return StackIngredient.fromIngredient(ingredient.getAmount(), ingredient.toMcIngredient());
+        }
+    }
 }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Cauldron.java

@@ -19,7 +19,7 @@
 public class Cauldron extends StandardListRegistry<CookingPotRecipe> {
 
     @RecipeBuilderDescription(example = {
-            @Example(".input(item('minecraft:clay')).output(item('minecraft:diamond')).heat(2)"),
+            @Example(".input(item('minecraft:clay') * 3).output(item('minecraft:diamond')).heat(2)"),
             @Example(".input(item('minecraft:diamond')).output(item('minecraft:gold_ingot') * 16).ignoreHeat()")
     })
     public RecipeBuilder recipeBuilder() {
@@ -110,7 +110,7 @@ public void validate(GroovyLog.Msg msg) {
         public @Nullable CookingPotRecipe register() {
             if (!validate()) return null;
 
-            CookingPotRecipe recipe = new CookingPotRecipe(input.stream().map(IIngredient::toMcIngredient).collect(Collectors.toList()), output, heat);
+            CookingPotRecipe recipe = new CookingPotRecipe(input.stream().map(BetterWithMods.Helper::fromIIngredient).collect(Collectors.toList()), output, heat);
             recipe.setIgnoreHeat(ignoreHeat);
             recipe.setPriority(priority);
             ModSupport.BETTER_WITH_MODS.get().cauldron.add(recipe);

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Crucible.java

@@ -21,7 +21,7 @@
 public class Crucible extends StandardListRegistry<CookingPotRecipe> {
 
     @RecipeBuilderDescription(example = {
-            @Example(".input(item('minecraft:clay')).output(item('minecraft:diamond')).heat(2)"),
+            @Example(".input(item('minecraft:clay') * 3).output(item('minecraft:diamond')).heat(2)"),
             @Example(".input(item('minecraft:diamond')).output(item('minecraft:gold_ingot') * 16).ignoreHeat()")
     })
     public RecipeBuilder recipeBuilder() {
@@ -115,7 +115,7 @@ public void validate(GroovyLog.Msg msg) {
         public @Nullable CookingPotRecipe register() {
             if (!validate()) return null;
 
-            CookingPotRecipe recipe = new CookingPotRecipe(input.stream().map(IIngredient::toMcIngredient).collect(Collectors.toList()), output, heat);
+            CookingPotRecipe recipe = new CookingPotRecipe(input.stream().map(BetterWithMods.Helper::fromIIngredient).collect(Collectors.toList()), output, heat);
             recipe.setIgnoreHeat(ignoreHeat);
             recipe.setPriority(priority);
             ModSupport.BETTER_WITH_MODS.get().crucible.add(recipe);

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/Hopper.java

@@ -18,7 +18,7 @@ public class Hopper extends StandardListRegistry<HopperInteractions.HopperRecipe
 
     @RecipeBuilderDescription(example = {
             @Example(".name('betterwithmods:iron_bar').input(ore('sand')).output(item('minecraft:clay')).inWorldItemOutput(item('minecraft:gold_ingot'))"),
-            @Example(".name('betterwithmods:wicker').input(item('minecraft:clay')).inWorldItemOutput(item('minecraft:gold_ingot'))")
+            @Example(".name('betterwithmods:wicker').input(item('minecraft:clay') * 3).inWorldItemOutput(item('minecraft:gold_ingot'))")
     })
     public RecipeBuilder recipeBuilder() {
         return new RecipeBuilder();
@@ -103,7 +103,7 @@ public void validate(GroovyLog.Msg msg) {
         public @Nullable HopperInteractions.HopperRecipe register() {
             if (!validate()) return null;
 
-            HopperInteractions.HopperRecipe recipe = new HopperInteractions.HopperRecipe(super.name.toString(), input.get(0).toMcIngredient(), output, inWorldItemOutput);
+            HopperInteractions.HopperRecipe recipe = new HopperInteractions.HopperRecipe(super.name.toString(), BetterWithMods.Helper.fromIIngredient(input.get(0)), output, inWorldItemOutput);
             ModSupport.BETTER_WITH_MODS.get().hopper.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithmods/MillStone.java

@@ -30,7 +30,7 @@ public Collection<MillRecipe> getRecipes() {
     }
 
     @RecipeBuilderDescription(example = {
-            @Example(".input(item('minecraft:diamond')).output(item('minecraft:gold_ingot') * 16)"),
+            @Example(".input(item('minecraft:diamond') * 3).output(item('minecraft:gold_ingot') * 16)"),
             @Example(".input(item('minecraft:diamond_block')).output(item('minecraft:gold_ingot'), item('minecraft:gold_block'), item('minecraft:clay'))")
     })
     public RecipeBuilder recipeBuilder() {
@@ -105,11 +105,6 @@ public String getErrorMsg() {
             return "Error adding Better With Mods Mill recipe";
         }
 
-        @Override
-        protected int getMaxItemInput() {
-            return 1;
-        }
-
         @Override
         public void validate(GroovyLog.Msg msg) {
             validateItems(msg, 1, 3, 1, 3);
@@ -122,7 +117,7 @@ public void validate(GroovyLog.Msg msg) {
         public @Nullable MillRecipe register() {
             if (!validate()) return null;
 
-            MillRecipe recipe = new MillRecipe(input.stream().map(IIngredient::toMcIngredient).collect(Collectors.toList()), output);
+            MillRecipe recipe = new MillRecipe(input.stream().map(BetterWithMods.Helper::fromIIngredient).collect(Collectors.toList()), output);
             recipe.setSound(soundEvent);
             recipe.setTicks(ticks);
             recipe.setPriority(priority);