feat: Allow most recipes to be bookmarked in JEI

TwelveIterationMods · Jul 4, 2024 · 890ea1f · 890ea1f
1 parent ed00c24
commit 890ea1f
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 16 deletions.
diff --git a/.../src/main/java/net/blay09/mods/excompressum/compat/jei/ChickenStickJeiRecipeCategory.java b/.../src/main/java/net/blay09/mods/excompressum/compat/jei/ChickenStickJeiRecipeCategory.java
@@ -14,6 +14,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class ChickenStickJeiRecipeCategory implements IRecipeCategory<ExpandedChickenStickRecipe> {
 
@@ -61,4 +62,8 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedChickenS
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedChickenStickRecipe recipe) {
+        return recipe.getId();
+    }
 }
diff --git a/.../main/java/net/blay09/mods/excompressum/compat/jei/CompressedHammerJeiRecipeCategory.java b/.../main/java/net/blay09/mods/excompressum/compat/jei/CompressedHammerJeiRecipeCategory.java
@@ -14,6 +14,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class CompressedHammerJeiRecipeCategory implements IRecipeCategory<ExpandedCompressedHammerRecipe> {
 
@@ -60,4 +61,8 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedCompress
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedCompressedHammerRecipe recipe) {
+        return recipe.getId();
+    }
 }
diff --git a/...main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickJeiRecipeCategory.java b/...main/java/net/blay09/mods/excompressum/compat/jei/CraftChickenStickJeiRecipeCategory.java
@@ -13,6 +13,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class CraftChickenStickJeiRecipeCategory implements IRecipeCategory<CraftChickenStickRecipe> {
 
@@ -54,4 +55,8 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, CraftChickenStic
         recipeLayoutBuilder.addSlot(RecipeIngredientRole.OUTPUT, 131, 21).addItemStack(recipe.getOutput());
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(CraftChickenStickRecipe recipe) {
+        return UID;
+    }
 }
diff --git a/common/src/main/java/net/blay09/mods/excompressum/compat/jei/HammerJeiRecipeCategory.java b/common/src/main/java/net/blay09/mods/excompressum/compat/jei/HammerJeiRecipeCategory.java
@@ -14,6 +14,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class HammerJeiRecipeCategory implements IRecipeCategory<ExpandedHammerRecipe> {
 
@@ -60,4 +61,8 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedHammerRe
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedHammerRecipe recipe) {
+        return recipe.getId();
+    }
 }
diff --git a/...on/src/main/java/net/blay09/mods/excompressum/compat/jei/HeavySieveJeiRecipeCategory.java b/...on/src/main/java/net/blay09/mods/excompressum/compat/jei/HeavySieveJeiRecipeCategory.java
@@ -15,6 +15,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 
 public class HeavySieveJeiRecipeCategory implements IRecipeCategory<ExpandedHeavySieveRecipe> {
@@ -64,4 +65,9 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedHeavySie
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedHeavySieveRecipe recipe) {
+        return recipe.getId();
+    }
+
 }
diff --git a/common/src/main/java/net/blay09/mods/excompressum/compat/jei/JEIAddon.java b/common/src/main/java/net/blay09/mods/excompressum/compat/jei/JEIAddon.java
@@ -45,10 +45,10 @@ public void registerRecipes(IRecipeRegistration registry) {
 
         final var heavySieveRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.heavySieveRecipeType);
         for (final var recipe : heavySieveRecipes) {
-            expandedHeavySieveRecipes.add(new ExpandedHeavySieveRecipe(recipe.value()));
+            expandedHeavySieveRecipes.add(new ExpandedHeavySieveRecipe(recipe.id(), recipe.value()));
         }
         for (final var recipe : ExNihilo.getInstance().getHeavySieveRecipes()) {
-            expandedHeavySieveRecipes.add(new ExpandedHeavySieveRecipe(recipe));
+            expandedHeavySieveRecipes.add(new ExpandedHeavySieveRecipe(null, recipe));
         }
 
         final var generatedHeavySieveRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.generatedHeavySieveRecipeType);
@@ -61,34 +61,34 @@ public void registerRecipes(IRecipeRegistration registry) {
 
         final var expandedSieveRecipes = new ArrayList<ExpandedSieveRecipe>();
         for (final var recipe : ExNihilo.getInstance().getSieveRecipes()) {
-            expandedSieveRecipes.add(new ExpandedSieveRecipe(recipe));
+            expandedSieveRecipes.add(new ExpandedSieveRecipe(null, recipe));
         }
         registry.addRecipes(SieveJeiRecipeCategory.TYPE, expandedSieveRecipes);
 
         List<ExpandedCompressedHammerRecipe> expandedCompressedHammerRecipes = new ArrayList<>();
         final var compressedHammerRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.compressedHammerRecipeType);
         for (final var recipe : compressedHammerRecipes) {
-            expandedCompressedHammerRecipes.add(new ExpandedCompressedHammerRecipe(recipe.value()));
+            expandedCompressedHammerRecipes.add(new ExpandedCompressedHammerRecipe(recipe.id(), recipe.value()));
         }
         for (final var recipe : ExNihilo.getInstance().getCompressedHammerRecipes()) {
-            expandedCompressedHammerRecipes.add(new ExpandedCompressedHammerRecipe(recipe));
+            expandedCompressedHammerRecipes.add(new ExpandedCompressedHammerRecipe(null, recipe));
         }
         registry.addRecipes(CompressedHammerJeiRecipeCategory.TYPE, expandedCompressedHammerRecipes);
 
         List<ExpandedHammerRecipe> expandedHammerRecipes = new ArrayList<>();
         final var hammerRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.hammerRecipeType);
         for (final var recipe : hammerRecipes) {
-            expandedHammerRecipes.add(new ExpandedHammerRecipe(recipe.value()));
+            expandedHammerRecipes.add(new ExpandedHammerRecipe(recipe.id(), recipe.value()));
         }
         for (final var recipe : ExNihilo.getInstance().getHammerRecipes()) {
-            expandedHammerRecipes.add(new ExpandedHammerRecipe(recipe));
+            expandedHammerRecipes.add(new ExpandedHammerRecipe(null, recipe));
         }
         registry.addRecipes(HammerJeiRecipeCategory.TYPE, expandedHammerRecipes);
 
         List<ExpandedChickenStickRecipe> expandedChickenStickRecipes = new ArrayList<>();
         final var chickenStickRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.chickenStickRecipeType);
         for (final var recipe : chickenStickRecipes) {
-            expandedChickenStickRecipes.add(new ExpandedChickenStickRecipe(recipe.value()));
+            expandedChickenStickRecipes.add(new ExpandedChickenStickRecipe(recipe.id(), recipe.value()));
         }
         registry.addRecipes(ChickenStickJeiRecipeCategory.TYPE, expandedChickenStickRecipes);
 
@@ -118,7 +118,7 @@ public void registerRecipes(IRecipeRegistration registry) {
             final int pageSize = 45;
             final var pages = Lists.partition(inputs, pageSize);
             for (final var page : pages) {
-                expandedWoodenCrucibleRecipes.add(new ExpandedWoodenCrucibleRecipe(fluid, page));
+                expandedWoodenCrucibleRecipes.add(new ExpandedWoodenCrucibleRecipe(null, fluid, page));
             }
         }
 
@@ -138,7 +138,7 @@ private void loadGeneratedHeavySieveRecipe(Level level, boolean waterlogged, Gen
                         lootTable,
                         waterlogged,
                         List.of(mesh.getMeshType()));
-                outRecipes.add(new ExpandedHeavySieveRecipe(recipe));
+                outRecipes.add(new ExpandedHeavySieveRecipe(null, recipe));
             }
         }
     }

diff --git a/common/src/main/java/net/blay09/mods/excompressum/compat/jei/SieveJeiRecipeCategory.java b/common/src/main/java/net/blay09/mods/excompressum/compat/jei/SieveJeiRecipeCategory.java
@@ -15,6 +15,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 
 public class SieveJeiRecipeCategory implements IRecipeCategory<ExpandedSieveRecipe> {
@@ -64,4 +65,9 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedSieveRec
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedSieveRecipe recipe) {
+        return recipe.getId();
+    }
+
 }
diff --git a/...rc/main/java/net/blay09/mods/excompressum/compat/jei/WoodenCrucibleJeiRecipeCategory.java b/...rc/main/java/net/blay09/mods/excompressum/compat/jei/WoodenCrucibleJeiRecipeCategory.java
@@ -14,6 +14,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class WoodenCrucibleJeiRecipeCategory implements IRecipeCategory<ExpandedWoodenCrucibleRecipe> {
 
@@ -62,4 +63,9 @@ public void setRecipe(IRecipeLayoutBuilder recipeLayoutBuilder, ExpandedWoodenCr
         }
     }
 
+    @Override
+    public @Nullable ResourceLocation getRegistryName(ExpandedWoodenCrucibleRecipe recipe) {
+        return recipe.getId();
+    }
+
 }
diff --git a/...in/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedChickenStickRecipe.java b/...in/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedChickenStickRecipe.java
@@ -4,6 +4,7 @@
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
 import net.blay09.mods.excompressum.registry.chickenstick.ChickenStickRecipe;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
@@ -12,11 +13,13 @@
 
 public class ExpandedChickenStickRecipe {
 
+    private final ResourceLocation id;
     private final Ingredient ingredient;
     private final List<MergedLootTableEntry> outputs;
     private final List<ItemStack> outputItems;
 
-    public ExpandedChickenStickRecipe(ChickenStickRecipe recipe) {
+    public ExpandedChickenStickRecipe(ResourceLocation id, ChickenStickRecipe recipe) {
+        this.id = id;
         ingredient = recipe.getIngredient();
         List<LootTableEntry> entries = LootTableUtils.getLootTableEntries(recipe.getLootTable());
         outputs = LootTableUtils.mergeLootTableEntries(entries);
@@ -34,4 +37,8 @@ public List<MergedLootTableEntry> getOutputs() {
     public List<ItemStack> getOutputItems() {
         return outputItems;
     }
+
+    public ResourceLocation getId() {
+        return id;
+    }
 }
diff --git a/...ava/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedCompressedHammerRecipe.java b/...ava/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedCompressedHammerRecipe.java
@@ -4,6 +4,7 @@
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
@@ -12,11 +13,13 @@
 
 public class ExpandedCompressedHammerRecipe {
 
+    private final ResourceLocation id;
     private final Ingredient ingredient;
     private final List<MergedLootTableEntry> outputs;
     private final List<ItemStack> outputItems;
 
-    public ExpandedCompressedHammerRecipe(CompressedHammerRecipe recipe) {
+    public ExpandedCompressedHammerRecipe(ResourceLocation id, CompressedHammerRecipe recipe) {
+        this.id = id;
         ingredient = recipe.getIngredient();
         List<LootTableEntry> entries = LootTableUtils.getLootTableEntries(recipe.getLootTable());
         outputs = LootTableUtils.mergeLootTableEntries(entries);
@@ -34,4 +37,8 @@ public List<MergedLootTableEntry> getOutputs() {
     public List<ItemStack> getOutputItems() {
         return outputItems;
     }
+
+    public ResourceLocation getId() {
+        return id;
+    }
 }
diff --git a/...src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHammerRecipe.java b/...src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHammerRecipe.java
@@ -4,6 +4,7 @@
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
@@ -12,11 +13,13 @@
 
 public class ExpandedHammerRecipe {
 
+    private final ResourceLocation id;
     private final Ingredient ingredient;
     private final List<MergedLootTableEntry> outputs;
     private final List<ItemStack> outputItems;
 
-    public ExpandedHammerRecipe(HammerRecipe recipe) {
+    public ExpandedHammerRecipe(ResourceLocation id, HammerRecipe recipe) {
+        this.id = id;
         ingredient = recipe.getIngredient();
         List<LootTableEntry> entries = LootTableUtils.getLootTableEntries(recipe.getLootTable());
         outputs = LootTableUtils.mergeLootTableEntries(entries);
@@ -34,4 +37,8 @@ public List<MergedLootTableEntry> getOutputs() {
     public List<ItemStack> getOutputItems() {
         return outputItems;
     }
+
+    public ResourceLocation getId() {
+        return id;
+    }
 }
diff --git a/...main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHeavySieveRecipe.java b/...main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedHeavySieveRecipe.java
@@ -5,6 +5,7 @@
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
 import net.blay09.mods.excompressum.registry.sievemesh.SieveMeshRegistry;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
@@ -13,14 +14,16 @@
 
 public class ExpandedHeavySieveRecipe {
 
+    private final ResourceLocation id;
     private final HeavySieveRecipe recipe;
     private final Ingredient ingredient;
     private final List<ItemStack> meshItems;
     private final List<MergedLootTableEntry> outputs;
     private final List<ItemStack> outputItems;
     private final boolean waterlogged;
 
-    public ExpandedHeavySieveRecipe(HeavySieveRecipe recipe) {
+    public ExpandedHeavySieveRecipe(ResourceLocation id, HeavySieveRecipe recipe) {
+        this.id = id;
         this.recipe = recipe;
         meshItems = new ArrayList<>();
         for (final var meshType : recipe.getMeshes()) {
@@ -61,4 +64,8 @@ public List<ItemStack> getOutputItems() {
     public boolean isWaterlogged() {
         return waterlogged;
     }
+
+    public ResourceLocation getId() {
+        return id;
+    }
 }
diff --git a/.../src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedSieveRecipe.java b/.../src/main/java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedSieveRecipe.java
@@ -5,6 +5,7 @@
 import net.blay09.mods.excompressum.loot.LootTableUtils;
 import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
 import net.blay09.mods.excompressum.registry.sievemesh.SieveMeshRegistry;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 
@@ -14,14 +15,16 @@
 
 public class ExpandedSieveRecipe {
 
+    private final ResourceLocation id;
     private final SieveRecipe recipe;
     private final Ingredient ingredient;
     private final List<ItemStack> meshItems;
     private final List<MergedLootTableEntry> outputs;
     private final List<ItemStack> outputItems;
     private final boolean waterlogged;
 
-    public ExpandedSieveRecipe(SieveRecipe recipe) {
+    public ExpandedSieveRecipe(ResourceLocation id, SieveRecipe recipe) {
+        this.id = id;
         this.recipe = recipe;
         meshItems = new ArrayList<>();
         for (final var meshType : recipe.getMeshes()) {
@@ -61,4 +64,8 @@ public List<ItemStack> getOutputItems() {
     public boolean isWaterlogged() {
         return waterlogged;
     }
+
+    public ResourceLocation getId() {
+        return id;
+    }
 }
diff --git a/.../java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedWoodenCrucibleRecipe.java b/.../java/net/blay09/mods/excompressum/compat/recipeviewers/ExpandedWoodenCrucibleRecipe.java
@@ -2,6 +2,7 @@
 
 import com.mojang.datafixers.util.Pair;
 import net.blay09.mods.excompressum.registry.woodencrucible.WoodenCrucibleRecipe;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.Fluid;
 
@@ -10,11 +11,13 @@
 
 public class ExpandedWoodenCrucibleRecipe {
 
+    private final ResourceLocation id;
     private final Fluid fluid;
     private final List<Pair<WoodenCrucibleRecipe, ItemStack>> entries;
     private final List<ItemStack> inputs;
 
-    public ExpandedWoodenCrucibleRecipe(Fluid fluid, List<Pair<WoodenCrucibleRecipe, ItemStack>> entries) {
+    public ExpandedWoodenCrucibleRecipe(ResourceLocation id, Fluid fluid, List<Pair<WoodenCrucibleRecipe, ItemStack>> entries) {
+        this.id = id;
         this.fluid = fluid;
         this.entries = entries;
 
@@ -40,4 +43,8 @@ public WoodenCrucibleRecipe getEntryAt(int index) {
         return entries.get(index).getFirst();
     }
 
+    public ResourceLocation getId() {
+        return id;
+    }
+
 }