feat: Add sortIndex field to market recipes #221

TwelveIterationMods · Oct 29, 2024 · e3e8b9a · e3e8b9a
1 parent e082b07
commit e3e8b9a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/common/src/main/java/net/blay09/mods/farmingforblockheads/menu/MarketMenu.java b/common/src/main/java/net/blay09/mods/farmingforblockheads/menu/MarketMenu.java
@@ -386,6 +386,7 @@ private Comparator<RecipeDisplayEntry> sorting() {
                         (RecipeDisplayEntry recipe) -> recipe.display() instanceof MarketRecipeDisplay marketRecipeDisplay ? resolveMarketCategory(marketRecipeDisplay.category())
                                 .map(MarketCategory::sortIndex)
                                 .orElse(0) : 0)
+                .thenComparing(recipe -> recipe.display() instanceof MarketRecipeDisplay marketRecipeDisplay ? marketRecipeDisplay.sortIndex() : 0)
                 .thenComparing(recipe -> recipe.display().result().resolveForFirstStack(contextMap)
                         .getDisplayName()
                         .getString());

diff --git a/common/src/main/java/net/blay09/mods/farmingforblockheads/recipe/MarketRecipe.java b/common/src/main/java/net/blay09/mods/farmingforblockheads/recipe/MarketRecipe.java
@@ -1,5 +1,6 @@
 package net.blay09.mods.farmingforblockheads.recipe;
 
+import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.blay09.mods.farmingforblockheads.api.Payment;
@@ -30,12 +31,14 @@ public class MarketRecipe implements Recipe<RecipeInput> {
     private final ResourceLocation category;
     private final ItemStack result;
     private final Payment payment;
+    private final int sortIndex;
 
-    public MarketRecipe(ItemStack result, String defaults, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ResourceLocation> category, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<Payment> payment) {
+    public MarketRecipe(ItemStack result, String defaults, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ResourceLocation> category, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<Payment> payment, int sortIndex) {
         this.defaults = defaults;
         this.category = category.orElse(null);
         this.result = result;
         this.payment = payment.orElse(null);
+        this.sortIndex = sortIndex;
     }
 
     @Override
@@ -83,6 +86,7 @@ public List<RecipeDisplay> display() {
                 new SlotDisplay.ItemSlotDisplay(
                         ModBlocks.market.asItem()),
                 effectiveCategory,
+                sortIndex,
                 enabled()));
     }
 
@@ -119,6 +123,10 @@ public Optional<ResourceLocation> getCategory() {
         return Optional.ofNullable(category);
     }
 
+    public int getSortIndex() {
+        return sortIndex;
+    }
+
     static class Serializer implements RecipeSerializer<MarketRecipe> {
 
         private static final MapCodec<ItemStack> RESULT_CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group(
@@ -133,7 +141,8 @@ static class Serializer implements RecipeSerializer<MarketRecipe> {
                 RESULT_CODEC.fieldOf("result").forGetter(recipe -> recipe.result),
                 ExtraCodecs.NON_EMPTY_STRING.fieldOf("defaults").forGetter(recipe -> recipe.defaults),
                 ResourceLocation.CODEC.optionalFieldOf("category").forGetter(MarketRecipe::getCategory),
-                PaymentImpl.CODEC.optionalFieldOf("payment").forGetter(MarketRecipe::getPayment)
+                PaymentImpl.CODEC.optionalFieldOf("payment").forGetter(MarketRecipe::getPayment),
+                Codec.INT.fieldOf("sortIndex").orElse(0).forGetter(MarketRecipe::getSortIndex)
         ).apply(instance, MarketRecipe::new));
 
         public static final StreamCodec<RegistryFriendlyByteBuf, MarketRecipe> STREAM_CODEC = StreamCodec.of(Serializer::toNetwork, Serializer::fromNetwork);
@@ -153,14 +162,16 @@ public static MarketRecipe fromNetwork(RegistryFriendlyByteBuf buf) {
             final var defaults = buf.readUtf();
             final var category = buf.readResourceLocation();
             final var payment = PaymentImpl.fromNetwork(buf);
-            return new MarketRecipe(resultItem, defaults, Optional.of(category), Optional.of(payment));
+            final var sortIndex = buf.readVarInt();
+            return new MarketRecipe(resultItem, defaults, Optional.of(category), Optional.of(payment), sortIndex);
         }
 
         public static void toNetwork(RegistryFriendlyByteBuf buf, MarketRecipe recipe) {
             ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, recipe.result);
             buf.writeUtf(recipe.defaults);
             buf.writeResourceLocation(recipe.category);
             PaymentImpl.toNetwork(buf, recipe.payment);
+            buf.writeVarInt(recipe.sortIndex);
         }
     }
 

diff --git a/common/src/main/java/net/blay09/mods/farmingforblockheads/recipe/MarketRecipeDisplay.java b/common/src/main/java/net/blay09/mods/farmingforblockheads/recipe/MarketRecipeDisplay.java
@@ -12,12 +12,14 @@
 import net.minecraft.world.item.crafting.display.SlotDisplay;
 
 public record MarketRecipeDisplay(SlotDisplay payment, SlotDisplay result, SlotDisplay craftingStation, ResourceLocation category,
+                                  int sortIndex,
                                   boolean enabled) implements RecipeDisplay {
     public static final MapCodec<MarketRecipeDisplay> MAP_CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group(
             SlotDisplay.CODEC.fieldOf("payment").forGetter(MarketRecipeDisplay::payment),
             SlotDisplay.CODEC.fieldOf("result").forGetter(MarketRecipeDisplay::result),
             SlotDisplay.CODEC.fieldOf("crafting_station").forGetter(MarketRecipeDisplay::craftingStation),
             ResourceLocation.CODEC.fieldOf("category").forGetter(MarketRecipeDisplay::category),
+            Codec.INT.fieldOf("sort_index").forGetter(MarketRecipeDisplay::sortIndex),
             Codec.BOOL.fieldOf("enabled").forGetter(MarketRecipeDisplay::enabled)
     ).apply(instance, MarketRecipeDisplay::new));
     public static final StreamCodec<RegistryFriendlyByteBuf, MarketRecipeDisplay> STREAM_CODEC = StreamCodec.composite(SlotDisplay.STREAM_CODEC,
@@ -28,6 +30,8 @@ public record MarketRecipeDisplay(SlotDisplay payment, SlotDisplay result, SlotD
             MarketRecipeDisplay::craftingStation,
             ResourceLocation.STREAM_CODEC,
             MarketRecipeDisplay::category,
+            ByteBufCodecs.INT,
+            MarketRecipeDisplay::sortIndex,
             ByteBufCodecs.BOOL,
             MarketRecipeDisplay::enabled,
             MarketRecipeDisplay::new);