From 23537e09f398caf1e816454857d4e602a76318ec Mon Sep 17 00:00:00 2001 From: Uko Koknevics Date: Sun, 3 Nov 2024 19:29:57 +0200 Subject: Support Chipped fully. --- .../mc/eris_alchemy/recipe/SimplifiedRecipe.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java') diff --git a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java index 518cf89..b63e4c5 100644 --- a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java +++ b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java @@ -28,7 +28,12 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Stream; -public record SimplifiedRecipe(ItemStack output, List remainder, List> input) { +public record SimplifiedRecipe( + ItemStack output, + List remainder, + List> input, + boolean fromChipped +) { public static List of(Recipe recipe, RegistryAccess registryAccess) { if (ForeignUtils.isClassAvailable("earth.terrarium.chipped.common.recipes.ChippedRecipe") && recipe instanceof ChippedRecipe chippedRecipe) { @@ -46,10 +51,10 @@ public record SimplifiedRecipe(ItemStack output, List remainder, List .toList(); var outputs = items.stream().filter(isOutput).map(Item::getDefaultInstance).toList(); return outputs.stream() - .flatMap( - output -> - inputs.stream() - .map(input -> new SimplifiedRecipe(output, remainder, input)) + .flatMap(output -> + inputs.stream() + .map(input -> + new SimplifiedRecipe(output, remainder, input, true)) ); }) .toList(); @@ -62,7 +67,8 @@ public record SimplifiedRecipe(ItemStack output, List remainder, List .stream() .filter(ingredient -> !ingredient.isEmpty()) .map(x -> (Supplier)() -> x) - .toList() + .toList(), + false )); } @@ -110,7 +116,7 @@ public record SimplifiedRecipe(ItemStack output, List remainder, List var output = parseOutputOrRemainder(obj.get("output")); var remainder = parseRemainders(obj.get("remainder")); var input = parseInputs(obj.get("input")); - return new SimplifiedRecipe(output, remainder, input); + return new SimplifiedRecipe(output, remainder, input, false); } private List> parseInputs(JsonElement el) { -- cgit v1.2.3