Registry sync for JEI

Author: legobmw99

src/main/generated_resources/data/allomancy/recipe/lerasium_investing.json

@@ -1,6 +1,6 @@
 {
   "type": "allomancy:investing",
-  "input": "#allomancy:converts_to_lerasium",
+  "ingredient": "#allomancy:converts_to_lerasium",
   "result": {
     "count": 1,
     "id": "allomancy:lerasium_nugget"

src/main/java/com/legobmw99/allomancy/integration/jei/AllomancyJeiPlugin.java

@@ -1,25 +1,16 @@
 package com.legobmw99.allomancy.integration.jei;
 
 import com.legobmw99.allomancy.Allomancy;
-import com.legobmw99.allomancy.modules.consumables.ConsumeSetup;
 import com.legobmw99.allomancy.modules.consumables.item.recipe.VialItemRecipe;
 import com.legobmw99.allomancy.modules.extras.ExtrasSetup;
-import com.legobmw99.allomancy.modules.world.recipe.InvestingRecipe;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
-import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import mezz.jei.api.registration.IRecipeCategoryRegistration;
 import mezz.jei.api.registration.IRecipeRegistration;
 import mezz.jei.api.registration.IVanillaCategoryExtensionRegistration;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeHolder;
-
-import java.util.List;
 
 @JeiPlugin
 public class AllomancyJeiPlugin implements IModPlugin {
@@ -40,19 +31,22 @@ public void registerCategories(IRecipeCategoryRegistration registration) {
         registration.addRecipeCategories(new InvestingRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
     }
 
+    @Override
+    public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
+        registration.addCraftingStation(InvestingRecipeCategory.TYPE, ExtrasSetup.CHARGED_BRONZE_EARRING);
+    }
+
     @Override
     public void registerRecipes(IRecipeRegistration registration) {
-        // TODO: actually list/show mobs? Would have same registry problem as below.
-        registration.addIngredientInfo(
-                List.of(ExtrasSetup.CHARGED_BRONZE_EARRING.toStack(), ExtrasSetup.BRONZE_EARRING.toStack()),
-                VanillaTypes.ITEM_STACK, Component.translatable("allomancy.jei.charged_earring.1"),
-                Component.translatable("allomancy.jei.charged_earring.2"),
-                Component.translatable("allomancy.jei.charged_earring.3"));
-
-        // TODO figure out how to use Registry now
-        registration.addRecipes(InvestingRecipeCategory.TYPE, List.of(new RecipeHolder<>(
-                ResourceKey.create(Registries.RECIPE, Allomancy.rl("lerasium_investing")),
-                new InvestingRecipe(Ingredient.of(Items.NETHER_STAR), ConsumeSetup.LERASIUM_NUGGET.toStack()))));
+        // TODO: actually list/show mobs?
+        registration.addIngredientInfo(ExtrasSetup.CHARGED_BRONZE_EARRING,
+                                       Component.translatable("allomancy.jei.charged_earring.1"),
+                                       Component.translatable("allomancy.jei.charged_earring.2"),
+                                       Component.translatable("allomancy.jei.charged_earring.3"));
+
+        if (RecipeEventHandler.recipes != null) {
+            registration.addRecipes(InvestingRecipeCategory.TYPE, RecipeEventHandler.recipes);
+        }
     }
 
 }

src/main/java/com/legobmw99/allomancy/integration/jei/InvestingRecipeCategory.java

@@ -20,10 +20,11 @@
 import org.jetbrains.annotations.Nullable;
 
 public class InvestingRecipeCategory implements IRecipeCategory<RecipeHolder<InvestingRecipe>> {
-    private final IDrawable icon;
     public static final IRecipeHolderType<InvestingRecipe> TYPE =
             IRecipeType.create(WorldSetup.INVESTING_RECIPE.get());
 
+    private final IDrawable icon;
+
     public InvestingRecipeCategory(IGuiHelper helper) {
         icon = helper.createDrawableItemLike(ConsumeSetup.LERASIUM_NUGGET.get());
     }
@@ -46,6 +47,7 @@ public Component getTitle() {
     @Override
     public void setRecipe(IRecipeLayoutBuilder builder, RecipeHolder<InvestingRecipe> recipe, IFocusGroup focuses) {
         builder.addInputSlot(30, 14).add(recipe.value().getIngredient());
+
         // TODO better liquid rendering?
         builder.addSlot(RecipeIngredientRole.CRAFTING_STATION, 40, 24).add(WorldSetup.LERASIUM_FLUID.get());
         builder.addOutputSlot(96, 24).add(recipe.value().getResult()).setOutputSlotBackground();

src/main/java/com/legobmw99/allomancy/integration/jei/RecipeEventHandler.java

@@ -0,0 +1,38 @@
+package com.legobmw99.allomancy.integration.jei;
+
+import com.legobmw99.allomancy.Allomancy;
+import com.legobmw99.allomancy.modules.world.WorldSetup;
+import com.legobmw99.allomancy.modules.world.recipe.InvestingRecipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
+import net.neoforged.neoforge.client.event.RecipesReceivedEvent;
+import net.neoforged.neoforge.event.OnDatapackSyncEvent;
+
+import java.util.List;
+
+/**
+ * This handles the fact that recipes are not, by default, sent to the client any more.
+ */
+@EventBusSubscriber(modid = Allomancy.MODID)
+final class RecipeEventHandler {
+    private RecipeEventHandler() {}
+
+    public static List<RecipeHolder<InvestingRecipe>> recipes = null;
+
+    @SubscribeEvent
+    public static void onRecipesRecieved(final RecipesReceivedEvent event) {
+        recipes = event.getRecipeMap().byType(WorldSetup.INVESTING_RECIPE.get()).stream().toList();
+    }
+
+    @SubscribeEvent
+    public static void onClientDisconnect(final ClientPlayerNetworkEvent.LoggingOut event) {
+        recipes = null;
+    }
+
+    @SubscribeEvent
+    public static void onDataSync(final OnDatapackSyncEvent event) {
+        event.sendRecipes(WorldSetup.INVESTING_RECIPE.get());
+    }
+}

src/main/java/com/legobmw99/allomancy/modules/world/WorldSetup.java

@@ -232,7 +232,7 @@ public String toString() {
                 @Override
                 public MapCodec<InvestingRecipe> codec() {
                     return RecordCodecBuilder.mapCodec(instance -> instance
-                            .group(Ingredient.CODEC.fieldOf("input").forGetter(InvestingRecipe::getIngredient),
+                            .group(Ingredient.CODEC.fieldOf("ingredient").forGetter(InvestingRecipe::getIngredient),
                                    ItemStack.CODEC.fieldOf("result").forGetter(InvestingRecipe::getResult))
                             .apply(instance, InvestingRecipe::new));
                 }

src/test/resources/data/allomancytest/recipe/alchemy_investing.json

@@ -0,0 +1,11 @@
+{
+  "type": "allomancy:investing",
+  "ingredient": "#minecraft:dirt",
+  "result": {
+    "count": 1,
+    "id": "minecraft:diamond",
+    "components": {
+      "minecraft:item_name": "dirty diamond"
+    }
+  }
+}