diff --git a/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java deleted file mode 100644 index 8d7a572df..000000000 --- a/src/main/java/appeng/core/AERecipeType.java +++ /dev/null @@ -1,18 +0,0 @@ -package appeng.core; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; - -public class AERecipeType> implements IRecipeType { - private final String id; - - public AERecipeType(ResourceLocation registryName) { - this.id = registryName.toString(); - } - - @Override - public String toString() { - return id; - } -} diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 34321d1a6..215ef3d61 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -428,9 +428,6 @@ final class Registration { public void registerRecipeSerializers(RegistryEvent.Register> event) { IForgeRegistry> 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 index dcbfa8ce5..81f57fe9a 100644 --- 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.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import appeng.core.AppEng; + public class GrinderRecipe implements IRecipe { - public static IRecipeType TYPE; + public static final ResourceLocation TYPE_ID = new ResourceLocation(AppEng.MOD_ID, "grinder"); + + public static final IRecipeType 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 index 38d5b8c08..434dd71b3 100644 --- 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 { - public static IRecipeType TYPE; + public static final ResourceLocation TYPE_ID = new ResourceLocation(AppEng.MOD_ID, "inscriber"); + + public static final IRecipeType 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 index f25c0d513..8e46d9072 100644 --- 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