From 4384c932f9245dfce31e0e3cc1d6e84c44f7dac3 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sun, 3 Mar 2024 17:48:28 +0100 Subject: [PATCH] Deferred register the RecipeTypes --- .../mod/crafting/ActuallyRecipes.java | 20 ++++++++++--------- .../mod/crafting/ColorChangeRecipe.java | 2 +- .../mod/crafting/CrushingRecipe.java | 2 +- .../mod/crafting/EmpowererRecipe.java | 2 +- .../mod/crafting/FermentingRecipe.java | 2 +- .../mod/crafting/LaserRecipe.java | 2 +- .../mod/crafting/LiquidFuelRecipe.java | 2 +- .../mod/crafting/MiningLensRecipe.java | 2 +- .../mod/crafting/PressingRecipe.java | 2 +- .../mod/crafting/SolidFuelRecipe.java | 2 +- .../mod/tile/TileEntityEmpowerer.java | 4 ++-- .../mod/util/ResourceReloader.java | 18 ++++++++--------- 12 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ActuallyRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ActuallyRecipes.java index bc1d8fb67..95252e1fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ActuallyRecipes.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ActuallyRecipes.java @@ -9,9 +9,11 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; public class ActuallyRecipes { + public static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES, ActuallyAdditions.MODID); public static final DeferredRegister> SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, ActuallyAdditions.MODID); public static void init(IEventBus bus) { + RECIPE_TYPES.register(bus); SERIALIZERS.register(bus); } @@ -29,14 +31,14 @@ public class ActuallyRecipes { public static class Types { - public static final RecipeType LASER = RecipeType.register(ActuallyAdditions.MODID + ":laser"); - public static final RecipeType EMPOWERING = RecipeType.register(ActuallyAdditions.MODID + ":empower"); - public static final RecipeType CRUSHING = RecipeType.register(ActuallyAdditions.MODID + ":crushing"); - public static final RecipeType SOLID_FUEL = RecipeType.register(ActuallyAdditions.MODID + ":solid_fuel"); - public static final RecipeType LIQUID_FUEL = RecipeType.register(ActuallyAdditions.MODID + ":liquid_fuel"); - public static final RecipeType PRESSING = RecipeType.register(ActuallyAdditions.MODID + ":pressing"); - public static final RecipeType FERMENTING = RecipeType.register(ActuallyAdditions.MODID + ":fermenting"); - public static final RecipeType COLOR_CHANGE = RecipeType.register(ActuallyAdditions.MODID + ":color_change"); - public static final RecipeType MINING_LENS = RecipeType.register(ActuallyAdditions.MODID + ":mining_lens"); + public static final RegistryObject> LASER = RECIPE_TYPES.register("laser", () -> new RecipeType<>() {}); + public static final RegistryObject> EMPOWERING = RECIPE_TYPES.register("empower", () -> new RecipeType<>() {}); + public static final RegistryObject> CRUSHING = RECIPE_TYPES.register("crushing", () -> new RecipeType<>() {}); + public static final RegistryObject> SOLID_FUEL = RECIPE_TYPES.register("solid_fuel", () -> new RecipeType<>() {}); + public static final RegistryObject> LIQUID_FUEL = RECIPE_TYPES.register("liquid_fuel", () -> new RecipeType<>() {}); + public static final RegistryObject> PRESSING = RECIPE_TYPES.register("pressing", () -> new RecipeType<>() {}); + public static final RegistryObject> FERMENTING = RECIPE_TYPES.register("fermenting", () -> new RecipeType<>() {}); + public static final RegistryObject> COLOR_CHANGE = RECIPE_TYPES.register("color_change", () -> new RecipeType<>() {}); + public static final RegistryObject> MINING_LENS = RECIPE_TYPES.register("mining_lens", () -> new RecipeType<>() {}); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ColorChangeRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ColorChangeRecipe.java index 8a1e9177c..187da6737 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ColorChangeRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ColorChangeRecipe.java @@ -83,7 +83,7 @@ public class ColorChangeRecipe implements Recipe { @Override public RecipeType getType() { - return ActuallyRecipes.Types.COLOR_CHANGE; + return ActuallyRecipes.Types.COLOR_CHANGE.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java index 98adf64aa..bc64f5c7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrushingRecipe.java @@ -94,7 +94,7 @@ public class CrushingRecipe implements Recipe { @Override @Nonnull public RecipeType getType() { - return ActuallyRecipes.Types.CRUSHING; + return ActuallyRecipes.Types.CRUSHING.get(); } public ItemStack getOutputOne() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/EmpowererRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/EmpowererRecipe.java index ed1a89ae5..d5258cb3c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/EmpowererRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/EmpowererRecipe.java @@ -117,7 +117,7 @@ public class EmpowererRecipe implements Recipe { @Override @Nonnull public RecipeType getType() { - return ActuallyRecipes.Types.EMPOWERING; + return ActuallyRecipes.Types.EMPOWERING.get(); } public Ingredient getInput() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FermentingRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FermentingRecipe.java index 6d19a35e1..87294bd72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FermentingRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FermentingRecipe.java @@ -117,7 +117,7 @@ public class FermentingRecipe implements Recipe { @Nonnull @Override public RecipeType getType() { - return ActuallyRecipes.Types.FERMENTING; + return ActuallyRecipes.Types.FERMENTING.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LaserRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LaserRecipe.java index b6c96914d..19a46bff8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LaserRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LaserRecipe.java @@ -90,7 +90,7 @@ public class LaserRecipe implements Recipe { @Override public RecipeType getType() { - return ActuallyRecipes.Types.LASER; + return ActuallyRecipes.Types.LASER.get(); } public static Optional getRecipeForStack(ItemStack stack) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LiquidFuelRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LiquidFuelRecipe.java index fb1d81b1b..ccd19def2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LiquidFuelRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LiquidFuelRecipe.java @@ -103,7 +103,7 @@ public class LiquidFuelRecipe implements Recipe { @Nonnull @Override public RecipeType getType() { - return ActuallyRecipes.Types.LIQUID_FUEL; + return ActuallyRecipes.Types.LIQUID_FUEL.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiningLensRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiningLensRecipe.java index cd8eda4b4..aab82a228 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiningLensRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiningLensRecipe.java @@ -89,7 +89,7 @@ public class MiningLensRecipe implements Recipe, WeightedEntry { @Override public RecipeType getType() { - return ActuallyRecipes.Types.MINING_LENS; + return ActuallyRecipes.Types.MINING_LENS.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/PressingRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/PressingRecipe.java index 71860f323..14616115e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/PressingRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/PressingRecipe.java @@ -74,7 +74,7 @@ public class PressingRecipe implements Recipe { @Override public RecipeType getType() { - return ActuallyRecipes.Types.PRESSING; + return ActuallyRecipes.Types.PRESSING.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/SolidFuelRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/SolidFuelRecipe.java index f352765c2..6b4085979 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/SolidFuelRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/SolidFuelRecipe.java @@ -77,7 +77,7 @@ public class SolidFuelRecipe implements Recipe { @Override public RecipeType getType() { - return ActuallyRecipes.Types.SOLID_FUEL; + return ActuallyRecipes.Types.SOLID_FUEL.get(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index 3443c9547..2dac0afa4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -45,7 +45,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase { } public static boolean isPossibleInput(ItemStack stack) { - for (EmpowererRecipe r : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING)) { + for (EmpowererRecipe r : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING.get())) { if (r.getInput().test(stack)) { return true; } @@ -55,7 +55,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase { @Nullable public static EmpowererRecipe findMatchingRecipe(ItemStack base, ItemStack stand1, ItemStack stand2, ItemStack stand3, ItemStack stand4) { - for (EmpowererRecipe r : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING)) { + for (EmpowererRecipe r : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING.get())) { if (r.matches(base, stand1, stand2, stand3, stand4)) { return r; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ResourceReloader.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ResourceReloader.java index 229edd1d7..dfe4d9b84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/ResourceReloader.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/ResourceReloader.java @@ -19,30 +19,30 @@ public class ResourceReloader implements ResourceManagerReloadListener { public void onResourceManagerReload(ResourceManager pResourceManager) { RecipeManager recipeManager = data.getRecipeManager(); ActuallyAdditionsAPI.EMPOWERER_RECIPES.clear(); - ActuallyAdditionsAPI.EMPOWERER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING)); + ActuallyAdditionsAPI.EMPOWERER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING.get())); ActuallyAdditionsAPI.SOLID_FUEL_RECIPES.clear(); - ActuallyAdditionsAPI.SOLID_FUEL_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.SOLID_FUEL)); + ActuallyAdditionsAPI.SOLID_FUEL_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.SOLID_FUEL.get())); ActuallyAdditionsAPI.LIQUID_FUEL_RECIPES.clear(); - ActuallyAdditionsAPI.LIQUID_FUEL_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.LIQUID_FUEL)); + ActuallyAdditionsAPI.LIQUID_FUEL_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.LIQUID_FUEL.get())); ActuallyAdditionsAPI.PRESSING_RECIPES.clear(); - ActuallyAdditionsAPI.PRESSING_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.PRESSING)); + ActuallyAdditionsAPI.PRESSING_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.PRESSING.get())); ActuallyAdditionsAPI.FERMENTING_RECIPES.clear(); - ActuallyAdditionsAPI.FERMENTING_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.FERMENTING)); + ActuallyAdditionsAPI.FERMENTING_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.FERMENTING.get())); ActuallyAdditionsAPI.CONVERSION_LASER_RECIPES.clear(); - ActuallyAdditionsAPI.CONVERSION_LASER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.LASER)); + ActuallyAdditionsAPI.CONVERSION_LASER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.LASER.get())); ActuallyAdditionsAPI.COLOR_CHANGE_RECIPES.clear(); - ActuallyAdditionsAPI.COLOR_CHANGE_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.COLOR_CHANGE)); + ActuallyAdditionsAPI.COLOR_CHANGE_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.COLOR_CHANGE.get())); ActuallyAdditionsAPI.MINING_LENS_RECIPES.clear(); - ActuallyAdditionsAPI.MINING_LENS_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.MINING_LENS)); + ActuallyAdditionsAPI.MINING_LENS_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.MINING_LENS.get())); ActuallyAdditionsAPI.CRUSHER_RECIPES.clear(); - ActuallyAdditionsAPI.CRUSHER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.CRUSHING)); + ActuallyAdditionsAPI.CRUSHER_RECIPES.addAll(recipeManager.getAllRecipesFor(ActuallyRecipes.Types.CRUSHING.get())); } }