From 85012f7058960c485dad89394e66af1ff630a5f2 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Mon, 4 Aug 2025 17:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E7=89=88=E9=85=8D=E6=96=B9=E8=AF=BB=E5=8F=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/recipe/BukkitRecipeManager.java | 2 - .../bukkit/pack/BukkitPackManager.java | 2 - .../bukkit/world/BukkitWorldManager.java | 1 - .../craftengine/core/item/AbstractItem.java | 1 - .../craftengine/core/item/Item.java | 1 - .../item/recipe/AbstractGroupedRecipe.java | 6 +-- .../item/recipe/AbstractRecipeSerializer.java | 14 +++--- .../item/recipe/CustomBlastingRecipe.java | 2 +- .../core/item/recipe/CustomBrewingRecipe.java | 6 +-- .../item/recipe/CustomCampfireRecipe.java | 2 +- .../core/item/recipe/CustomCookingRecipe.java | 4 +- .../recipe/CustomCraftingTableRecipe.java | 2 +- .../core/item/recipe/CustomShapedRecipe.java | 2 +- .../item/recipe/CustomShapelessRecipe.java | 2 +- .../item/recipe/CustomSmeltingRecipe.java | 2 +- .../recipe/CustomSmithingTransformRecipe.java | 6 +-- .../core/item/recipe/CustomSmokingRecipe.java | 2 +- .../item/recipe/CustomStoneCuttingRecipe.java | 2 +- .../core/item/recipe/FixedResultRecipe.java | 2 +- ...ipeResult.java => SimpleRecipeResult.java} | 2 +- .../VanillaRecipeReader.java | 2 +- .../reader/VanillaRecipeReader1_20.java | 1 - .../recipe/vanilla/VanillaBlastingRecipe.java | 20 --------- .../recipe/vanilla/VanillaCampfireRecipe.java | 20 --------- .../recipe/vanilla/VanillaCookingRecipe.java | 37 --------------- .../recipe/vanilla/VanillaCraftingRecipe.java | 17 ------- .../recipe/vanilla/VanillaGroupedRecipe.java | 21 --------- .../item/recipe/vanilla/VanillaRecipe.java | 8 ---- .../recipe/vanilla/VanillaShapedRecipe.java | 37 --------------- .../vanilla/VanillaShapelessRecipe.java | 26 ----------- .../recipe/vanilla/VanillaSmeltingRecipe.java | 20 --------- .../VanillaSmithingTransformRecipe.java | 42 ----------------- .../vanilla/VanillaSmithingTrimRecipe.java | 45 ------------------- .../recipe/vanilla/VanillaSmokingRecipe.java | 20 --------- .../vanilla/VanillaStoneCuttingRecipe.java | 25 ----------- .../core/registry/BuiltInRegistries.java | 4 +- .../craftengine/core/registry/Registries.java | 4 +- 37 files changed, 33 insertions(+), 379 deletions(-) rename core/src/main/java/net/momirealms/craftengine/core/item/recipe/{CustomRecipeResult.java => SimpleRecipeResult.java} (98%) rename core/src/main/java/net/momirealms/craftengine/core/item/recipe/{vanilla => reader}/VanillaRecipeReader.java (95%) delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaBlastingRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCampfireRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCookingRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCraftingRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaGroupedRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapedRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapelessRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmeltingRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTransformRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTrimRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmokingRecipe.java delete mode 100644 core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaStoneCuttingRecipe.java diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java index 7ec945e9c..bcbe55a26 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java @@ -28,10 +28,8 @@ import org.bukkit.NamespacedKey; import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -import java.io.IOException; import java.io.Reader; import java.lang.reflect.Array; -import java.sql.Ref; import java.util.*; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java index bad128c87..0cea939f3 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/pack/BukkitPackManager.java @@ -3,7 +3,6 @@ package net.momirealms.craftengine.bukkit.pack; import net.momirealms.craftengine.bukkit.api.event.AsyncResourcePackGenerateEvent; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.plugin.command.feature.ReloadCommand; -import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections; import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer; import net.momirealms.craftengine.bukkit.util.EventUtils; import net.momirealms.craftengine.bukkit.util.ResourcePackUtils; @@ -22,7 +21,6 @@ import org.bukkit.event.player.PlayerJoinEvent; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.concurrent.CompletableFuture; public class BukkitPackManager extends AbstractPackManager implements Listener { diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorldManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorldManager.java index e4d090bad..7d557cd21 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorldManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorldManager.java @@ -2,7 +2,6 @@ package net.momirealms.craftengine.bukkit.world; import net.momirealms.craftengine.bukkit.nms.FastNMS; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; -import net.momirealms.craftengine.bukkit.plugin.injector.RecipeInjector; import net.momirealms.craftengine.bukkit.plugin.injector.WorldStorageInjector; import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections; import net.momirealms.craftengine.bukkit.util.BlockStateUtils; diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java index de299e7ac..3f7a75d8f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java @@ -8,7 +8,6 @@ import net.momirealms.craftengine.core.item.data.Enchantment; import net.momirealms.craftengine.core.item.data.FireworkExplosion; import net.momirealms.craftengine.core.item.data.JukeboxPlayable; import net.momirealms.craftengine.core.item.data.Trim; -import net.momirealms.craftengine.core.item.recipe.UniqueIdItem; import net.momirealms.craftengine.core.item.setting.EquipmentData; import net.momirealms.craftengine.core.util.Color; import net.momirealms.craftengine.core.util.Key; diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/Item.java b/core/src/main/java/net/momirealms/craftengine/core/item/Item.java index 7cb3454fa..69c9a68f8 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/Item.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/Item.java @@ -18,7 +18,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Objects; import java.util.Optional; /** diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractGroupedRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractGroupedRecipe.java index 9af70aabb..226ebb3ec 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractGroupedRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractGroupedRecipe.java @@ -7,9 +7,9 @@ import org.jetbrains.annotations.Nullable; public abstract class AbstractGroupedRecipe implements FixedResultRecipe { protected final String group; protected final Key id; - protected final CustomRecipeResult result; + protected final SimpleRecipeResult result; - protected AbstractGroupedRecipe(Key id, String group, CustomRecipeResult result) { + protected AbstractGroupedRecipe(Key id, String group, SimpleRecipeResult result) { this.group = group == null ? "" : group; this.id = id; this.result = result; @@ -31,7 +31,7 @@ public abstract class AbstractGroupedRecipe implements FixedResultRecipe { } @Override - public CustomRecipeResult result() { + public SimpleRecipeResult result() { return this.result; } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java index 4c17b43a1..257bb938a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java @@ -4,10 +4,10 @@ import net.momirealms.craftengine.core.item.CloneableConstantItem; import net.momirealms.craftengine.core.item.CustomItem; import net.momirealms.craftengine.core.item.Item; import net.momirealms.craftengine.core.item.ItemManager; +import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader; import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader1_20; import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader1_20_5; import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader1_21_2; -import net.momirealms.craftengine.core.item.recipe.vanilla.VanillaRecipeReader; import net.momirealms.craftengine.core.plugin.CraftEngine; import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException; import net.momirealms.craftengine.core.util.*; @@ -58,25 +58,25 @@ public abstract class AbstractRecipeSerializer> implement } @SuppressWarnings({"unchecked", "rawtypes"}) - protected CustomRecipeResult parseResult(Map arguments) { + protected SimpleRecipeResult parseResult(Map arguments) { Map resultMap = MiscUtils.castToMap(arguments.get("result"), true); if (resultMap == null) { throw new LocalizedResourceConfigException("warning.config.recipe.missing_result"); } String id = ResourceConfigUtils.requireNonEmptyStringOrThrow(resultMap.get("id"), "warning.config.recipe.result.missing_id"); int count = ResourceConfigUtils.getAsInt(resultMap.getOrDefault("count", 1), "count"); - List> processors = ResourceConfigUtils.parseConfigAsList(resultMap.get("post-processors"), CustomRecipeResult.PostProcessor::fromMap); - return new CustomRecipeResult( + List> processors = ResourceConfigUtils.parseConfigAsList(resultMap.get("post-processors"), SimpleRecipeResult.PostProcessor::fromMap); + return new SimpleRecipeResult( CraftEngine.instance().itemManager().getBuildableItem(Key.of(id)).orElseThrow(() -> new LocalizedResourceConfigException("warning.config.recipe.invalid_result", id)), count, - processors.isEmpty() ? null : processors.toArray(new CustomRecipeResult.PostProcessor[0]) + processors.isEmpty() ? null : processors.toArray(new SimpleRecipeResult.PostProcessor[0]) ); } @SuppressWarnings("unchecked") - protected CustomRecipeResult parseResult(DatapackRecipeResult recipeResult) { + protected SimpleRecipeResult parseResult(DatapackRecipeResult recipeResult) { Item result = (Item) CraftEngine.instance().itemManager().build(recipeResult); - return new CustomRecipeResult<>(CloneableConstantItem.of(result), recipeResult.count(), null); + return new SimpleRecipeResult<>(CloneableConstantItem.of(result), recipeResult.count(), null); } @Nullable diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBlastingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBlastingRecipe.java index 3dcf683e7..937954b43 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBlastingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBlastingRecipe.java @@ -10,7 +10,7 @@ import java.util.Map; public class CustomBlastingRecipe extends CustomCookingRecipe { public static final Serializer SERIALIZER = new Serializer<>(); - public CustomBlastingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, CustomRecipeResult result) { + public CustomBlastingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, SimpleRecipeResult result) { super(id, category, group, ingredient, cookingTime, experience, result); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBrewingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBrewingRecipe.java index 994af19c4..41b621e5e 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBrewingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomBrewingRecipe.java @@ -19,12 +19,12 @@ public class CustomBrewingRecipe implements FixedResultRecipe { private final Key id; private final Ingredient container; private final Ingredient ingredient; - private final CustomRecipeResult result; + private final SimpleRecipeResult result; public CustomBrewingRecipe(@NotNull Key id, @NotNull Ingredient container, @NotNull Ingredient ingredient, - @NotNull CustomRecipeResult result) { + @NotNull SimpleRecipeResult result) { this.id = id; this.container = container; this.ingredient = ingredient; @@ -32,7 +32,7 @@ public class CustomBrewingRecipe implements FixedResultRecipe { } @Override - public CustomRecipeResult result() { + public SimpleRecipeResult result() { return this.result; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCampfireRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCampfireRecipe.java index de0afd5a6..3ccde065f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCampfireRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCampfireRecipe.java @@ -10,7 +10,7 @@ import java.util.Map; public class CustomCampfireRecipe extends CustomCookingRecipe { public static final Serializer SERIALIZER = new Serializer<>(); - public CustomCampfireRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, CustomRecipeResult result) { + public CustomCampfireRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, SimpleRecipeResult result) { super(id, category, group, ingredient, cookingTime, experience, result); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCookingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCookingRecipe.java index 87847a545..a29aace6e 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCookingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCookingRecipe.java @@ -18,7 +18,7 @@ public abstract class CustomCookingRecipe extends AbstractGroupedRecipe { Ingredient ingredient, int cookingTime, float experience, - CustomRecipeResult result) { + SimpleRecipeResult result) { super(id, group, result); this.category = category == null ? CookingRecipeCategory.MISC : category; this.ingredient = ingredient; @@ -40,7 +40,7 @@ public abstract class CustomCookingRecipe extends AbstractGroupedRecipe { return ingredient; } - public CustomRecipeResult result() { + public SimpleRecipeResult result() { return result; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java index 9eb9153d4..34f7618de 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java @@ -5,7 +5,7 @@ import net.momirealms.craftengine.core.util.Key; public abstract class CustomCraftingTableRecipe extends AbstractGroupedRecipe { protected final CraftingRecipeCategory category; - protected CustomCraftingTableRecipe(Key id, CraftingRecipeCategory category, String group, CustomRecipeResult result) { + protected CustomCraftingTableRecipe(Key id, CraftingRecipeCategory category, String group, SimpleRecipeResult result) { super(id, group, result); this.category = category == null ? CraftingRecipeCategory.MISC : category; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapedRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapedRecipe.java index 4e7d62a5d..7f6cd7135 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapedRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapedRecipe.java @@ -17,7 +17,7 @@ public class CustomShapedRecipe extends CustomCraftingTableRecipe { private final ParsedPattern parsedPattern; private final Pattern pattern; - public CustomShapedRecipe(Key id, CraftingRecipeCategory category, String group, Pattern pattern, CustomRecipeResult result) { + public CustomShapedRecipe(Key id, CraftingRecipeCategory category, String group, Pattern pattern, SimpleRecipeResult result) { super(id, category, group, result); this.pattern = pattern; this.parsedPattern = pattern.parse(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapelessRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapelessRecipe.java index 9449ec83f..786e7f937 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapelessRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomShapelessRecipe.java @@ -16,7 +16,7 @@ public class CustomShapelessRecipe extends CustomCraftingTableRecipe { private final List> ingredients; private final PlacementInfo placementInfo; - public CustomShapelessRecipe(Key id, CraftingRecipeCategory category, String group, List> ingredients, CustomRecipeResult result) { + public CustomShapelessRecipe(Key id, CraftingRecipeCategory category, String group, List> ingredients, SimpleRecipeResult result) { super(id, category, group, result); this.ingredients = ingredients; this.placementInfo = PlacementInfo.create(ingredients); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmeltingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmeltingRecipe.java index 2b03dec6e..bc564c379 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmeltingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmeltingRecipe.java @@ -10,7 +10,7 @@ import java.util.Map; public class CustomSmeltingRecipe extends CustomCookingRecipe { public static final Serializer SERIALIZER = new Serializer<>(); - public CustomSmeltingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, CustomRecipeResult result) { + public CustomSmeltingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, SimpleRecipeResult result) { super(id, category, group, ingredient, cookingTime, experience, result); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java index f1134f90f..24ff7b8a3 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java @@ -22,7 +22,7 @@ import java.util.Objects; public class CustomSmithingTransformRecipe implements FixedResultRecipe { public static final Serializer SERIALIZER = new Serializer<>(); private final Key id; - private final CustomRecipeResult result; + private final SimpleRecipeResult result; private final Ingredient base; private final Ingredient template; private final Ingredient addition; @@ -33,7 +33,7 @@ public class CustomSmithingTransformRecipe implements FixedResultRecipe { @NotNull Ingredient base, @Nullable Ingredient template, @Nullable Ingredient addition, - CustomRecipeResult result, + SimpleRecipeResult result, boolean mergeComponents, List processors ) { @@ -116,7 +116,7 @@ public class CustomSmithingTransformRecipe implements FixedResultRecipe { return finalResult.getItem(); } - public CustomRecipeResult result() { + public SimpleRecipeResult result() { return this.result; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmokingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmokingRecipe.java index e59d341de..df7e682e3 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmokingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmokingRecipe.java @@ -10,7 +10,7 @@ import java.util.Map; public class CustomSmokingRecipe extends CustomCookingRecipe { public static final Serializer SERIALIZER = new Serializer<>(); - public CustomSmokingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, CustomRecipeResult result) { + public CustomSmokingRecipe(Key id, CookingRecipeCategory category, String group, Ingredient ingredient, int cookingTime, float experience, SimpleRecipeResult result) { super(id, category, group, ingredient, cookingTime, experience, result); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomStoneCuttingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomStoneCuttingRecipe.java index 3bc3a14e9..b3d517c4b 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomStoneCuttingRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomStoneCuttingRecipe.java @@ -13,7 +13,7 @@ public class CustomStoneCuttingRecipe extends AbstractGroupedRecipe { public static final Serializer SERIALIZER = new Serializer<>(); protected final Ingredient ingredient; - public CustomStoneCuttingRecipe(Key id, String group, Ingredient ingredient, CustomRecipeResult result) { + public CustomStoneCuttingRecipe(Key id, String group, Ingredient ingredient, SimpleRecipeResult result) { super(id, group, result); this.ingredient = ingredient; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/FixedResultRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/FixedResultRecipe.java index 6a17c507c..3bbd1e6f2 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/FixedResultRecipe.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/FixedResultRecipe.java @@ -7,7 +7,7 @@ public interface FixedResultRecipe extends Recipe { T result(ItemBuildContext context); - CustomRecipeResult result(); + SimpleRecipeResult result(); @Override default T assemble(RecipeInput input, ItemBuildContext context) { diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomRecipeResult.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/SimpleRecipeResult.java similarity index 98% rename from core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomRecipeResult.java rename to core/src/main/java/net/momirealms/craftengine/core/item/recipe/SimpleRecipeResult.java index db7caeed0..5ce0ad88f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomRecipeResult.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/SimpleRecipeResult.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Optional; @SuppressWarnings("unchecked") -public record CustomRecipeResult(BuildableItem item, int count, PostProcessor[] postProcessors) { +public record SimpleRecipeResult(BuildableItem item, int count, PostProcessor[] postProcessors) { public T buildItemStack(ItemBuildContext context) { return buildItem(context).getItem(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipeReader.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader.java similarity index 95% rename from core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipeReader.java rename to core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader.java index 4b09b88c0..3f5e432d9 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipeReader.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader.java @@ -1,4 +1,4 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; +package net.momirealms.craftengine.core.item.recipe.reader; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader1_20.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader1_20.java index 4cf75aa23..4a34fd17d 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader1_20.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/reader/VanillaRecipeReader1_20.java @@ -6,7 +6,6 @@ import com.google.gson.JsonObject; import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory; import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.vanilla.VanillaRecipeReader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaBlastingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaBlastingRecipe.java deleted file mode 100644 index 9a81d0698..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaBlastingRecipe.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaBlastingRecipe extends VanillaCookingRecipe { - - public VanillaBlastingRecipe(CookingRecipeCategory category, String group, DatapackRecipeResult result, List ingredient, float experience, int cookingTime) { - super(category, group, result, ingredient, experience, cookingTime); - } - - @Override - public Key type() { - return RecipeSerializers.BLASTING; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCampfireRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCampfireRecipe.java deleted file mode 100644 index ae53346b0..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCampfireRecipe.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaCampfireRecipe extends VanillaCookingRecipe { - - public VanillaCampfireRecipe(CookingRecipeCategory category, String group, DatapackRecipeResult result, List ingredient, float experience, int cookingTime) { - super(category, group, result, ingredient, experience, cookingTime); - } - - @Override - public Key type() { - return RecipeSerializers.CAMPFIRE_COOKING; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCookingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCookingRecipe.java deleted file mode 100644 index a87f385f7..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCookingRecipe.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; - -import java.util.List; - -public abstract class VanillaCookingRecipe extends VanillaGroupedRecipe { - protected final List ingredient; - protected final CookingRecipeCategory category; - protected final float experience; - protected final int cookingTime; - - protected VanillaCookingRecipe(CookingRecipeCategory category, String group, DatapackRecipeResult result, List ingredient, float experience, int cookingTime) { - super(group, result); - this.ingredient = ingredient; - this.experience = experience; - this.cookingTime = cookingTime; - this.category = category; - } - - public CookingRecipeCategory category() { - return category; - } - - public List ingredient() { - return ingredient; - } - - public float experience() { - return experience; - } - - public int cookingTime() { - return cookingTime; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCraftingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCraftingRecipe.java deleted file mode 100644 index 80b19b799..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaCraftingRecipe.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; - -public abstract class VanillaCraftingRecipe extends VanillaGroupedRecipe { - protected final CraftingRecipeCategory category; - - protected VanillaCraftingRecipe(CraftingRecipeCategory category, String group, DatapackRecipeResult result) { - super(group, result); - this.category = category; - } - - public CraftingRecipeCategory category() { - return category; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaGroupedRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaGroupedRecipe.java deleted file mode 100644 index 0e3c3c81b..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaGroupedRecipe.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; - -public abstract class VanillaGroupedRecipe implements VanillaRecipe { - protected final String group; - protected final DatapackRecipeResult result; - - protected VanillaGroupedRecipe(String group, DatapackRecipeResult result) { - this.group = group; - this.result = result; - } - - public String group() { - return group; - } - - public DatapackRecipeResult result() { - return result; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipe.java deleted file mode 100644 index a58cc6523..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaRecipe.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.util.Key; - -public interface VanillaRecipe { - - Key type(); -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapedRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapedRecipe.java deleted file mode 100644 index 7b40adea4..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapedRecipe.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; -import java.util.Map; - -public class VanillaShapedRecipe extends VanillaCraftingRecipe { - private final String[] pattern; - private final Map> key; - - public VanillaShapedRecipe(CraftingRecipeCategory category, - String group, - Map> key, - String[] pattern, - DatapackRecipeResult result) { - super(category, group, result); - this.key = key; - this.pattern = pattern; - } - - public Map> ingredients() { - return key; - } - - public String[] pattern() { - return pattern; - } - - @Override - public Key type() { - return RecipeSerializers.SHAPED; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapelessRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapelessRecipe.java deleted file mode 100644 index 54e9a01ba..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaShapelessRecipe.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CraftingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaShapelessRecipe extends VanillaCraftingRecipe { - private final List> ingredients; - - public VanillaShapelessRecipe(CraftingRecipeCategory category, String group, List> ingredients, DatapackRecipeResult result) { - super(category, group, result); - this.ingredients = ingredients; - } - - public List> ingredients() { - return ingredients; - } - - @Override - public Key type() { - return RecipeSerializers.SHAPELESS; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmeltingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmeltingRecipe.java deleted file mode 100644 index f5bca29dc..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmeltingRecipe.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaSmeltingRecipe extends VanillaCookingRecipe { - - public VanillaSmeltingRecipe(CookingRecipeCategory category, String group, DatapackRecipeResult result, List ingredient, float experience, int cookingTime) { - super(category, group, result, ingredient, experience, cookingTime); - } - - @Override - public Key type() { - return RecipeSerializers.SMELTING; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTransformRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTransformRecipe.java deleted file mode 100644 index 8452b3f22..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTransformRecipe.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaSmithingTransformRecipe implements VanillaRecipe { - private final DatapackRecipeResult result; - private final List base; - private final List template; - private final List addition; - - public VanillaSmithingTransformRecipe(List base, List template, List addition, DatapackRecipeResult result) { - this.result = result; - this.base = base; - this.template = template; - this.addition = addition; - } - - @Override - public Key type() { - return RecipeSerializers.SMITHING_TRANSFORM; - } - - public DatapackRecipeResult result() { - return result; - } - - public List base() { - return base; - } - - public List template() { - return template; - } - - public List addition() { - return addition; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTrimRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTrimRecipe.java deleted file mode 100644 index 432b131c2..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmithingTrimRecipe.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class VanillaSmithingTrimRecipe implements VanillaRecipe { - @Nullable // 1.21.5 - private final String pattern; - - private final List base; - private final List template; - private final List addition; - - public VanillaSmithingTrimRecipe(List base, List template, List addition, @Nullable String pattern) { - this.base = base; - this.template = template; - this.addition = addition; - this.pattern = pattern; - } - - @Override - public Key type() { - return RecipeSerializers.SMITHING_TRIM; - } - - public List base() { - return base; - } - - public List template() { - return template; - } - - public List addition() { - return addition; - } - - @Nullable - public String pattern() { - return pattern; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmokingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmokingRecipe.java deleted file mode 100644 index cc22dea5c..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaSmokingRecipe.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.CookingRecipeCategory; -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaSmokingRecipe extends VanillaCookingRecipe { - - public VanillaSmokingRecipe(CookingRecipeCategory category, String group, DatapackRecipeResult result, List ingredient, float experience, int cookingTime) { - super(category, group, result, ingredient, experience, cookingTime); - } - - @Override - public Key type() { - return RecipeSerializers.SMOKING; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaStoneCuttingRecipe.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaStoneCuttingRecipe.java deleted file mode 100644 index a273f5e04..000000000 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/vanilla/VanillaStoneCuttingRecipe.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.momirealms.craftengine.core.item.recipe.vanilla; - -import net.momirealms.craftengine.core.item.recipe.DatapackRecipeResult; -import net.momirealms.craftengine.core.item.recipe.RecipeSerializers; -import net.momirealms.craftengine.core.util.Key; - -import java.util.List; - -public class VanillaStoneCuttingRecipe extends VanillaGroupedRecipe { - private final List ingredient; - - public VanillaStoneCuttingRecipe(String group, DatapackRecipeResult result, List ingredient) { - super(group, result); - this.ingredient = ingredient; - } - - public List ingredient() { - return ingredient; - } - - @Override - public Key type() { - return RecipeSerializers.STONECUTTING; - } -} diff --git a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java index fd0da1023..061c5d4fc 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java +++ b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java @@ -7,10 +7,10 @@ import net.momirealms.craftengine.core.entity.furniture.HitBoxFactory; import net.momirealms.craftengine.core.item.ItemDataModifierFactory; import net.momirealms.craftengine.core.item.behavior.ItemBehaviorFactory; import net.momirealms.craftengine.core.item.equipment.EquipmentFactory; -import net.momirealms.craftengine.core.item.recipe.CustomRecipeResult; import net.momirealms.craftengine.core.item.recipe.CustomSmithingTransformRecipe; import net.momirealms.craftengine.core.item.recipe.Recipe; import net.momirealms.craftengine.core.item.recipe.RecipeSerializer; +import net.momirealms.craftengine.core.item.recipe.SimpleRecipeResult; import net.momirealms.craftengine.core.item.recipe.network.legacy.LegacyRecipe; import net.momirealms.craftengine.core.item.recipe.network.modern.display.RecipeDisplay; import net.momirealms.craftengine.core.item.recipe.network.modern.display.slot.SlotDisplay; @@ -78,7 +78,7 @@ public class BuiltInRegistries { public static final Registry SLOT_DISPLAY_TYPE = createConstantBoundRegistry(Registries.SLOT_DISPLAY_TYPE); public static final Registry RECIPE_DISPLAY_TYPE = createConstantBoundRegistry(Registries.RECIPE_DISPLAY_TYPE); public static final Registry LEGACY_RECIPE_TYPE = createConstantBoundRegistry(Registries.LEGACY_RECIPE_TYPE); - public static final Registry> RECIPE_POST_PROCESSOR_TYPE = createConstantBoundRegistry(Registries.RECIPE_POST_PROCESSOR_TYPE); + public static final Registry> RECIPE_POST_PROCESSOR_TYPE = createConstantBoundRegistry(Registries.RECIPE_POST_PROCESSOR_TYPE); private static Registry createConstantBoundRegistry(ResourceKey> key) { return new ConstantBoundRegistry<>(key); diff --git a/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java b/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java index e0845e4ff..291233df3 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java +++ b/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java @@ -7,10 +7,10 @@ import net.momirealms.craftengine.core.entity.furniture.HitBoxFactory; import net.momirealms.craftengine.core.item.ItemDataModifierFactory; import net.momirealms.craftengine.core.item.behavior.ItemBehaviorFactory; import net.momirealms.craftengine.core.item.equipment.EquipmentFactory; -import net.momirealms.craftengine.core.item.recipe.CustomRecipeResult; import net.momirealms.craftengine.core.item.recipe.CustomSmithingTransformRecipe; import net.momirealms.craftengine.core.item.recipe.Recipe; import net.momirealms.craftengine.core.item.recipe.RecipeSerializer; +import net.momirealms.craftengine.core.item.recipe.SimpleRecipeResult; import net.momirealms.craftengine.core.item.recipe.network.legacy.LegacyRecipe; import net.momirealms.craftengine.core.item.recipe.network.modern.display.RecipeDisplay; import net.momirealms.craftengine.core.item.recipe.network.modern.display.slot.SlotDisplay; @@ -80,5 +80,5 @@ public class Registries { public static final ResourceKey> SLOT_DISPLAY_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("slot_display_type")); public static final ResourceKey> RECIPE_DISPLAY_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("recipe_display_type")); public static final ResourceKey> LEGACY_RECIPE_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("legacy_recipe_type")); - public static final ResourceKey>> RECIPE_POST_PROCESSOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("recipe_post_processor_type")); + public static final ResourceKey>> RECIPE_POST_PROCESSOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("recipe_post_processor_type")); }