chore: convert spotlight page codecs to lazy codecs to match itemstack

klikli-dev · Dec 3, 2024 · 185bfcf · 185bfcf
1 parent 0c9fa71
commit 185bfcf
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/common/src/main/java/com/klikli_dev/modonomicon/book/page/BookSpotlightPage.java b/common/src/main/java/com/klikli_dev/modonomicon/book/page/BookSpotlightPage.java
@@ -19,7 +19,6 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponentPatch;
@@ -29,6 +28,7 @@
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ExtraCodecs;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -37,27 +37,27 @@
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-
 public class BookSpotlightPage extends BookPage {
     /**
      * A custom codec that still uses the "item" field instead of "id" for backwards comp,
      */
-    public static final Codec<ItemStack> CUSTOM_ITEM_STACK_CODEC = RecordCodecBuilder.create((builder) -> builder.group(
-            Item.CODEC.fieldOf("item").forGetter(ItemStack::getItemHolder),
-            Codec.INT.optionalFieldOf("count", 1).forGetter(ItemStack::getCount),
-            DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter(ItemStack::getComponentsPatch)
-    ).apply(builder, ItemStack::new));
-
+    public static final Codec<ItemStack> CUSTOM_ITEM_STACK_CODEC = Codec.lazyInitialized(
+            () -> RecordCodecBuilder.create((builder) -> builder.group(
+                    Item.CODEC.fieldOf("item").forGetter(ItemStack::getItemHolder),
+                    ExtraCodecs.intRange(1, 99).fieldOf("count").orElse(1).forGetter(ItemStack::getCount),
+                    DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter(ItemStack::getComponentsPatch)
+            ).apply(builder, ItemStack::new))
+    );
+
     /**
      * We allow both vanilla item stack syntax and our custom syntax.
      */
-    public static final Codec<ItemStack> ITEM_STACK_CODEC = Codec.withAlternative(CUSTOM_ITEM_STACK_CODEC, ItemStack.CODEC);
+    public static final Codec<ItemStack> ITEM_STACK_CODEC = Codec.lazyInitialized(() -> Codec.withAlternative(CUSTOM_ITEM_STACK_CODEC, ItemStack.CODEC));
 
     /**
      * We allow both ingredients and item stacks.
      */
-    public static final Codec<Either<ItemStack, Ingredient>> ITEM_CODEC = Codec.either(ITEM_STACK_CODEC, Ingredient.CODEC);
+    public static final Codec<Either<ItemStack, Ingredient>> ITEM_CODEC = Codec.lazyInitialized(() -> Codec.either(ITEM_STACK_CODEC, Ingredient.CODEC));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, Either<ItemStack, Ingredient>> ITEM_STREAM_CODEC = new StreamCodec<>() {
 
@@ -143,7 +143,7 @@ public void build(Level level, BookContentEntry parentEntry, int pageNum) {
 
         if (this.title.isEmpty()) {
             //use ingredient name if we don't have a custom title
-            var item = this.item.map(i -> i , i -> i.display().resolveForFirstStack(SlotDisplayContext.fromLevel(level)));
+            var item = this.item.map(i -> i, i -> i.display().resolveForFirstStack(SlotDisplayContext.fromLevel(level)));
 
             this.title = new BookTextHolder(((MutableComponent) item.getHoverName())
                     .withStyle(Style.EMPTY