From e27b6eb469a829221366619c324ad2e5dfac5761 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 19 Dec 2023 19:02:18 +0100
Subject: [PATCH] More recipe cleanups

---
 .../betterx/bclib/recipes/AlloyingRecipe.java |  4 ++-
 .../java/org/betterx/bclib/util/ItemUtil.java | 34 -------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/recipes/AlloyingRecipe.java b/src/main/java/org/betterx/bclib/recipes/AlloyingRecipe.java
index daa77c40..c3b642ea 100644
--- a/src/main/java/org/betterx/bclib/recipes/AlloyingRecipe.java
+++ b/src/main/java/org/betterx/bclib/recipes/AlloyingRecipe.java
@@ -227,7 +227,9 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
                      .fieldOf("ingredients")
                      .forGetter(recipe -> List.of(recipe.primaryInput, recipe.secondaryInput)),
                 ExtraCodecs.strictOptionalField(Codec.STRING, "group")
-                           .forGetter(recipe -> Optional.ofNullable(recipe.group)),
+                           .forGetter(recipe -> recipe.group == null || recipe.group.isEmpty()
+                                   ? Optional.empty()
+                                   : Optional.ofNullable(recipe.group)),
                 ItemUtil.CODEC_ITEM_STACK_WITH_NBT.fieldOf("result").forGetter(recipe -> recipe.output),
                 Codec.FLOAT.optionalFieldOf("experience", 0f).forGetter(recipe -> recipe.experience),
                 Codec.INT.optionalFieldOf("smelttime", 350).forGetter(recipe -> recipe.smeltTime)
diff --git a/src/main/java/org/betterx/bclib/util/ItemUtil.java b/src/main/java/org/betterx/bclib/util/ItemUtil.java
index 6ad77ebf..ebf6b41b 100644
--- a/src/main/java/org/betterx/bclib/util/ItemUtil.java
+++ b/src/main/java/org/betterx/bclib/util/ItemUtil.java
@@ -1,54 +1,20 @@
 package org.betterx.bclib.util;
 
-import org.betterx.bclib.BCLib;
-
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.TagParser;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.ExtraCodecs;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
-import org.jetbrains.annotations.Nullable;
 
 public class ItemUtil {
-
-    @Nullable
-    public static ItemStack fromStackString(String stackString) {
-        if (stackString == null || stackString.isEmpty()) {
-            return null;
-        }
-        try {
-            String[] parts = stackString.split(":");
-            if (parts.length < 2) return null;
-            if (parts.length == 2) {
-                ResourceLocation itemId = new ResourceLocation(stackString);
-                Item item = BuiltInRegistries
-                        .ITEM
-                        .getOptional(itemId)
-                        .orElseThrow(() -> new IllegalStateException("Output item " + itemId + " does not exists!"));
-                return new ItemStack(item);
-            }
-            ResourceLocation itemId = new ResourceLocation(parts[0], parts[1]);
-            Item item = BuiltInRegistries
-                    .ITEM
-                    .getOptional(itemId)
-                    .orElseThrow(() -> new IllegalStateException("Output item " + itemId + " does not exists!"));
-            return new ItemStack(item, Integer.parseInt(parts[2]));
-        } catch (Exception ex) {
-            BCLib.LOGGER.error("ItemStack deserialization error!", ex);
-        }
-        return null;
-    }
-
     public static <T> Codec<T> codecItemStackWithNBT(
             Function<T, ItemStack> getter,
             Function<ItemStack, T> factory