Fix #4521: Register RecipeTypes. (#4523)

AppliedEnergistics · Jul 31, 2020 · 825a241 · 825a241
1 parent 662dbca
commit 825a241
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 25 deletions.
diff --git a/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java
diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
@@ -428,9 +428,6 @@ private <T extends AEBaseContainer> ContainerType<T> registerContainer(IForgeReg
     public void registerRecipeSerializers(RegistryEvent.Register<IRecipeSerializer<?>> event) {
         IForgeRegistry<IRecipeSerializer<?>> r = event.getRegistry();
 
-        GrinderRecipe.TYPE = new AERecipeType<>(GrinderRecipeSerializer.INSTANCE.getRegistryName());
-        InscriberRecipe.TYPE = new AERecipeType<>(InscriberRecipeSerializer.INSTANCE.getRegistryName());
-
         FacadeItem facadeItem = (FacadeItem) Api.INSTANCE.definitions().items().facade().item();
         r.registerAll(DisassembleRecipe.SERIALIZER, GrinderRecipeSerializer.INSTANCE,
                 InscriberRecipeSerializer.INSTANCE, FacadeRecipe.getSerializer(facadeItem));

diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java
@@ -14,9 +14,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
+import appeng.core.AppEng;
+
 public class GrinderRecipe implements IRecipe<IInventory> {
 
-    public static IRecipeType<GrinderRecipe> TYPE;
+    public static final ResourceLocation TYPE_ID = new ResourceLocation(AppEng.MOD_ID, "grinder");
+
+    public static final IRecipeType<GrinderRecipe> TYPE = IRecipeType.register(TYPE_ID.toString());
 
     private final ResourceLocation id;
     private final String group;

diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
@@ -29,7 +29,7 @@ public class GrinderRecipeSerializer extends ForgeRegistryEntry<IRecipeSerialize
     public static final GrinderRecipeSerializer INSTANCE = new GrinderRecipeSerializer();
 
     static {
-        INSTANCE.setRegistryName(AppEng.MOD_ID, "grinder");
+        INSTANCE.setRegistryName(GrinderRecipe.TYPE_ID);
     }
 
     private GrinderRecipeSerializer() {

diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java
@@ -11,10 +11,13 @@
 import net.minecraft.world.World;
 
 import appeng.api.features.InscriberProcessType;
+import appeng.core.AppEng;
 
 public class InscriberRecipe implements IRecipe<IInventory> {
 
-    public static IRecipeType<InscriberRecipe> TYPE;
+    public static final ResourceLocation TYPE_ID = new ResourceLocation(AppEng.MOD_ID, "inscriber");
+
+    public static final IRecipeType<InscriberRecipe> TYPE = IRecipeType.register(TYPE_ID.toString());
 
     private final ResourceLocation id;
     private final String group;

diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java
@@ -23,7 +23,7 @@ public class InscriberRecipeSerializer extends ForgeRegistryEntry<IRecipeSeriali
     public static final InscriberRecipeSerializer INSTANCE = new InscriberRecipeSerializer();
 
     static {
-        INSTANCE.setRegistryName(AppEng.MOD_ID, "inscriber");
+        INSTANCE.setRegistryName(InscriberRecipe.TYPE_ID);
     }
 
     private InscriberRecipeSerializer() {