From 2b21b0472f7875128c68e43512dec59642389334 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 19 Dec 2023 19:02:17 +0100 Subject: [PATCH] More recipe cleanups --- .../betterx/betterend/recipe/builders/InfusionRecipe.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java index ac9aa89f..39ff89b8 100644 --- a/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java @@ -52,12 +52,14 @@ public class InfusionRecipe implements Recipe, UnknownReceipBook public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance .group( - ItemUtil.CODEC_INGREDIENT_WITH_NBT.fieldOf("input").forGetter(i -> i.input), + ItemUtil.CODEC_INGREDIENT_WITH_NBT_NOT_EMPTY.fieldOf("input").forGetter(i -> i.input), ItemUtil.CODEC_ITEM_STACK_WITH_NBT.fieldOf("result").forGetter(i -> i.output), Codec.INT.optionalFieldOf("time", 1).forGetter(InfusionRecipe::getInfusionTime), CODEC_CATALYSTS.fieldOf("catalysts").forGetter(i -> i.catalysts), ExtraCodecs.strictOptionalField(Codec.STRING, "group") - .forGetter(i -> Optional.ofNullable(i.group)) + .forGetter(i -> i.group == null || i.group.isEmpty() + ? Optional.empty() + : Optional.ofNullable(i.group)) ).apply(instance, InfusionRecipe::new) );