feat: support ingredient notation in item recipe results

klikli-dev · Aug 21, 2024 · 3e7e994 · 3e7e994
1 parent 2b7d7ce
commit 3e7e994
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/main/java/com/klikli_dev/theurgy/content/recipe/result/ItemRecipeResult.java b/src/main/java/com/klikli_dev/theurgy/content/recipe/result/ItemRecipeResult.java
@@ -5,7 +5,11 @@
 package com.klikli_dev.theurgy.content.recipe.result;
 
 import com.klikli_dev.theurgy.registry.RecipeResultRegistry;
+import com.klikli_dev.theurgy.util.TheurgyExtraCodecs;
+import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.item.ItemStack;
@@ -16,7 +20,18 @@
  */
 public class ItemRecipeResult extends RecipeResult {
 
-    public static final MapCodec<ItemRecipeResult> CODEC = MapCodec.assumeMapUnsafe(ItemStack.STRICT_CODEC.xmap(ItemRecipeResult::new, ItemRecipeResult::getStack));
+    public static final MapCodec<ItemRecipeResult> INGREDIENT_COMPAT_CODEC = RecordCodecBuilder.mapCodec((builder) -> builder.group(
+            ItemStack.ITEM_NON_AIR_CODEC.fieldOf("item").forGetter(t -> t.stack.getItemHolder()),
+            Codec.INT.fieldOf("count").forGetter(t -> t.stack.getCount()),
+            DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter(t -> t.stack.getComponentsPatch())
+    ).apply(builder, (item, count, components) -> new ItemRecipeResult(new ItemStack(item, count, components))));
+
+    public static final MapCodec<ItemRecipeResult> ITEM_STACK_COMPAT_CODEC = MapCodec.assumeMapUnsafe(ItemStack.STRICT_CODEC.xmap(ItemRecipeResult::new, ItemRecipeResult::getStack));
+
+    public static final MapCodec<ItemRecipeResult> CODEC = TheurgyExtraCodecs.mapWithAlternative(
+            ITEM_STACK_COMPAT_CODEC,
+            INGREDIENT_COMPAT_CODEC
+    );
 
     public static final StreamCodec<RegistryFriendlyByteBuf, ItemRecipeResult> STREAM_CODEC = StreamCodec.composite(
             ItemStack.OPTIONAL_STREAM_CODEC,

diff --git a/src/main/java/com/klikli_dev/theurgy/util/TheurgyExtraCodecs.java b/src/main/java/com/klikli_dev/theurgy/util/TheurgyExtraCodecs.java
@@ -6,7 +6,9 @@
 
 import com.google.common.graph.EndpointPair;
 import com.google.common.graph.MutableGraph;
+import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
@@ -38,6 +40,16 @@ public class TheurgyExtraCodecs {
 
     public static final Codec<FluidStack> SINGLE_FLUID_CODEC = BuiltInRegistries.FLUID.byNameCodec().xmap(fluid -> new FluidStack(fluid, 1), FluidStack::getFluid);
 
+    public static <T> MapCodec<T> mapWithAlternative(final MapCodec<T> primary, final MapCodec<? extends T> alternative) {
+        return Codec.mapEither(
+                primary,
+                alternative
+        ).xmap(
+                Either::unwrap,
+                Either::left
+        );
+    }
+
     @SuppressWarnings("UnstableApiUsage")
     public static <V> Codec<MutableGraph<V>> graph(Codec<V> elementCodec, Supplier<MutableGraph<V>> graphSupplier) {
         return internalGraph(elementCodec).xmap(