使用更高效的合成配方判定

2025-12-30 04:19:27 +00:00 · 2025-08-02 01:27:05 +08:00
parent f1da4dc4a1
commit 36cc67bcef
32 changed files with 163 additions and 109 deletions
--- 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
@@ -174,7 +174,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
    }

    static {
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SMITHING_TRANSFORM, (BukkitRecipeConvertor<CustomSmithingTransformRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SMITHING_TRANSFORM, (BukkitRecipeConvertor<CustomSmithingTransformRecipe<ItemStack>>) (id, recipe) -> {
            try {
                Object nmsRecipe = createMinecraftSmithingTransformRecipe(recipe);
                return () -> MINECRAFT_RECIPE_ADDER.accept(id, nmsRecipe);
@@ -185,7 +185,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                return null;
            }
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SMITHING_TRIM, (BukkitRecipeConvertor<CustomSmithingTrimRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SMITHING_TRIM, (BukkitRecipeConvertor<CustomSmithingTrimRecipe<ItemStack>>) (id, recipe) -> {
            try {
                Object nmsRecipe = createMinecraftSmithingTrimRecipe(recipe);
                return () -> MINECRAFT_RECIPE_ADDER.accept(id, nmsRecipe);
@@ -197,7 +197,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
            }
        });
        // TODO DO NOT USE BUKKIT RECIPE AS BRIDGE IN FUTURE VERSIONS, WE SHOULD DIRECTLY CONSTRUCT THOSE NMS RECIPES
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SHAPED, (BukkitRecipeConvertor<CustomShapedRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SHAPED, (BukkitRecipeConvertor<CustomShapedRecipe<ItemStack>>) (id, recipe) -> {
            ShapedRecipe shapedRecipe = new ShapedRecipe(new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY));
            if (recipe.group() != null) shapedRecipe.setGroup(Objects.requireNonNull(recipe.group()));
            if (recipe.category() != null) shapedRecipe.setCategory(CraftingBookCategory.valueOf(Objects.requireNonNull(recipe.category()).name()));
@@ -210,7 +210,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectShapedRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SHAPELESS, (BukkitRecipeConvertor<CustomShapelessRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SHAPELESS, (BukkitRecipeConvertor<CustomShapelessRecipe<ItemStack>>) (id, recipe) -> {
            ShapelessRecipe shapelessRecipe = new ShapelessRecipe(new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY));
            if (recipe.group() != null) shapelessRecipe.setGroup(Objects.requireNonNull(recipe.group()));
            if (recipe.category() != null) shapelessRecipe.setCategory(CraftingBookCategory.valueOf(Objects.requireNonNull(recipe.category()).name()));
@@ -222,7 +222,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectShapelessRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SMELTING, (BukkitRecipeConvertor<CustomSmeltingRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SMELTING, (BukkitRecipeConvertor<CustomSmeltingRecipe<ItemStack>>) (id, recipe) -> {
            FurnaceRecipe furnaceRecipe = new FurnaceRecipe(
                    new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY),
                    ingredientToBukkitRecipeChoice(recipe.ingredient()),
@@ -235,7 +235,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectCookingRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.SMOKING, (BukkitRecipeConvertor<CustomSmokingRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.SMOKING, (BukkitRecipeConvertor<CustomSmokingRecipe<ItemStack>>) (id, recipe) -> {
            SmokingRecipe smokingRecipe = new SmokingRecipe(
                    new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY),
                    ingredientToBukkitRecipeChoice(recipe.ingredient()),
@@ -248,7 +248,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectCookingRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.BLASTING, (BukkitRecipeConvertor<CustomBlastingRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.BLASTING, (BukkitRecipeConvertor<CustomBlastingRecipe<ItemStack>>) (id, recipe) -> {
            BlastingRecipe blastingRecipe = new BlastingRecipe(
                    new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY),
                    ingredientToBukkitRecipeChoice(recipe.ingredient()),
@@ -261,7 +261,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectCookingRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.CAMPFIRE_COOKING, (BukkitRecipeConvertor<CustomCampfireRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.CAMPFIRE_COOKING, (BukkitRecipeConvertor<CustomCampfireRecipe<ItemStack>>) (id, recipe) -> {
            CampfireRecipe campfireRecipe = new CampfireRecipe(
                    new NamespacedKey(id.namespace(), id.value()), recipe.result(ItemBuildContext.EMPTY),
                    ingredientToBukkitRecipeChoice(recipe.ingredient()),
@@ -274,7 +274,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
                injectCookingRecipe(id, recipe);
            };
        });
-        MIXED_RECIPE_CONVERTORS.put(RecipeTypes.STONECUTTING, (BukkitRecipeConvertor<CustomStoneCuttingRecipe<ItemStack>>) (id, recipe) -> {
+        MIXED_RECIPE_CONVERTORS.put(RecipeSerializers.STONECUTTING, (BukkitRecipeConvertor<CustomStoneCuttingRecipe<ItemStack>>) (id, recipe) -> {
            List<ItemStack> itemStacks = new ArrayList<>();
            for (UniqueKey item : recipe.ingredient().items()) {
                itemStacks.add(BukkitItemManager.instance().buildItemStack(item.key(), null));
@@ -304,10 +304,10 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
    private final BukkitCraftEngine plugin;
    private final RecipeEventListener recipeEventListener;
    private final CrafterEventListener crafterEventListener;
-    // To optimize recipes loading, will return the flag later
-    private Object stolenFeatureFlagSet;
    // Some delayed tasks on main thread
    private final List<Runnable> delayedTasksOnMainThread = new ArrayList<>();
+    // To optimize recipes loading, will return the flag later
+    private Object stolenFeatureFlagSet;

    public BukkitRecipeManager(BukkitCraftEngine plugin) {
        instance = this;
@@ -431,7 +431,7 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {

    @SuppressWarnings("unchecked")
    private <T extends Recipe<ItemStack>> BukkitRecipeConvertor<T> findNMSRecipeConvertor(T recipe) {
-        return (BukkitRecipeConvertor<T>) MIXED_RECIPE_CONVERTORS.get(recipe.type());
+        return (BukkitRecipeConvertor<T>) MIXED_RECIPE_CONVERTORS.get(recipe.serializerType());
    }

    @SuppressWarnings("unchecked")
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/CrafterEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/CrafterEventListener.java
@@ -6,7 +6,7 @@ import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.item.ItemBuildContext;
 import net.momirealms.craftengine.core.item.ItemManager;
 import net.momirealms.craftengine.core.item.recipe.Recipe;
-import net.momirealms.craftengine.core.item.recipe.RecipeTypes;
+import net.momirealms.craftengine.core.item.recipe.RecipeType;
 import net.momirealms.craftengine.core.item.recipe.UniqueIdItem;
 import net.momirealms.craftengine.core.item.recipe.input.CraftingInput;
 import net.momirealms.craftengine.core.plugin.config.Config;
@@ -71,12 +71,7 @@ public class CrafterEventListener implements Listener {
            return;
        }

-        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SHAPELESS, input);
-        if (ceRecipe != null) {
-            event.setResult(ceRecipe.assemble(input, ItemBuildContext.EMPTY));
-            return;
-        }
-        ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SHAPED, input);
+        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeType.CRAFTING, input);
        if (ceRecipe != null) {
            event.setResult(ceRecipe.assemble(input, ItemBuildContext.EMPTY));
            return;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java
@@ -75,13 +75,13 @@ public class RecipeEventListener implements Listener {
                if (ItemStackUtils.isEmpty(item)) return;
                if (ItemStackUtils.isEmpty(fuelStack)) {
                    SingleItemInput<ItemStack> input = new SingleItemInput<>(getUniqueIdItem(item));
-                    Key recipeType;
+                    RecipeType recipeType;
                    if (furnaceInventory.getType() == InventoryType.FURNACE) {
-                        recipeType = RecipeTypes.SMELTING;
+                        recipeType = RecipeType.SMELTING;
                    } else if (furnaceInventory.getType() == InventoryType.BLAST_FURNACE) {
-                        recipeType = RecipeTypes.BLASTING;
+                        recipeType = RecipeType.BLASTING;
                    } else {
-                        recipeType = RecipeTypes.SMOKING;
+                        recipeType = RecipeType.SMOKING;
                    }

                    Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(recipeType, input);
@@ -352,7 +352,7 @@ public class RecipeEventListener implements Listener {
                return;
            }
            SingleItemInput<ItemStack> input = new SingleItemInput<>(getUniqueIdItem(itemStack));
-            CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeTypes.CAMPFIRE_COOKING, input);
+            CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeType.CAMPFIRE_COOKING, input);
            if (ceRecipe == null) {
                event.setCancelled(true);
            }
@@ -377,7 +377,7 @@ public class RecipeEventListener implements Listener {

        ItemStack itemStack = event.getSource();
        SingleItemInput<ItemStack> input = new SingleItemInput<>(getUniqueIdItem(itemStack));
-        CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeTypes.CAMPFIRE_COOKING, input);
+        CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeType.CAMPFIRE_COOKING, input);
        if (ceRecipe == null) {
            event.setTotalCookTime(Integer.MAX_VALUE);
            return;
@@ -405,7 +405,7 @@ public class RecipeEventListener implements Listener {

        ItemStack itemStack = event.getSource();
        SingleItemInput<ItemStack> input = new SingleItemInput<>(getUniqueIdItem(itemStack));
-        CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeTypes.CAMPFIRE_COOKING, input);
+        CustomCampfireRecipe<ItemStack> ceRecipe = (CustomCampfireRecipe<ItemStack>) this.recipeManager.recipeByInput(RecipeType.CAMPFIRE_COOKING, input);
        if (ceRecipe == null) {
            event.setCancelled(true);
            return;
@@ -815,18 +815,8 @@ public class RecipeEventListener implements Listener {

        Player player = InventoryUtils.getPlayerFromInventoryEvent(event);
        BukkitServerPlayer serverPlayer = this.plugin.adapt(player);
-        Key lastRecipe = serverPlayer.lastUsedRecipe();

-        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SHAPELESS, input, lastRecipe);
-        if (ceRecipe != null) {
-            inventory.setResult(ceRecipe.assemble(input, new ItemBuildContext(serverPlayer, ContextHolder.EMPTY)));
-            serverPlayer.setLastUsedRecipe(ceRecipe.id());
-            if (!ceRecipe.id().equals(recipeId)) {
-                correctCraftingRecipeUsed(inventory, ceRecipe);
-            }
-            return;
-        }
-        ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SHAPED, input, lastRecipe);
+        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeType.CRAFTING, input, recipeId);
        if (ceRecipe != null) {
            inventory.setResult(ceRecipe.assemble(input, new ItemBuildContext(serverPlayer, ContextHolder.EMPTY)));
            serverPlayer.setLastUsedRecipe(ceRecipe.id());
@@ -902,7 +892,7 @@ public class RecipeEventListener implements Listener {
                getUniqueIdItem(inventory.getInputMineral())
        );

-        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SMITHING_TRIM, input);
+        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeType.SMITHING, input, recipeId);
        if (ceRecipe == null) {
            event.setResult(null);
            return;
@@ -940,7 +930,7 @@ public class RecipeEventListener implements Listener {
                getUniqueIdItem(addition)
        );

-        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeTypes.SMITHING_TRANSFORM, input);
+        Recipe<ItemStack> ceRecipe = this.recipeManager.recipeByInput(RecipeType.SMITHING, input, recipeId);
        if (ceRecipe == null) {
            event.setResult(null);
            return;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/InjectedCacheCheck.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/InjectedCacheCheck.java
@@ -1,5 +1,6 @@
 package net.momirealms.craftengine.bukkit.plugin.injector;

+import net.momirealms.craftengine.core.item.recipe.RecipeType;
 import net.momirealms.craftengine.core.util.Key;

 public interface InjectedCacheCheck {
@@ -8,9 +9,9 @@ public interface InjectedCacheCheck {

    void recipeType(Object recipeType);

-    Key customRecipeType();
+    RecipeType customRecipeType();

-    void customRecipeType(Key customRecipeType);
+    void customRecipeType(RecipeType customRecipeType);

    Object lastRecipe();

--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/RecipeInjector.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/RecipeInjector.java
@@ -29,7 +29,7 @@ import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.item.ItemKeys;
 import net.momirealms.craftengine.core.item.data.FireworkExplosion;
 import net.momirealms.craftengine.core.item.recipe.CustomCookingRecipe;
-import net.momirealms.craftengine.core.item.recipe.RecipeTypes;
+import net.momirealms.craftengine.core.item.recipe.RecipeType;
 import net.momirealms.craftengine.core.item.recipe.UniqueIdItem;
 import net.momirealms.craftengine.core.item.recipe.input.SingleItemInput;
 import net.momirealms.craftengine.core.util.*;
@@ -61,7 +61,7 @@ public class RecipeInjector {
                .defineField("recipeType", Object.class, Visibility.PUBLIC)
                .method(ElementMatchers.named("recipeType"))
                .intercept(FieldAccessor.ofField("recipeType"))
-                .defineField("customRecipeType", Key.class, Visibility.PUBLIC)
+                .defineField("customRecipeType", RecipeType.class, Visibility.PUBLIC)
                .method(ElementMatchers.named("customRecipeType"))
                .intercept(FieldAccessor.ofField("customRecipeType"))
                .defineField("lastRecipe", Object.class, Visibility.PUBLIC)
@@ -158,13 +158,13 @@ public class RecipeInjector {
            Object recipeType = FastNMS.INSTANCE.field$AbstractFurnaceBlockEntity$recipeType(entity);
            InjectedCacheCheck injectedChecker = (InjectedCacheCheck) ReflectionUtils.UNSAFE.allocateInstance(clazz$InjectedCacheChecker);
            if (recipeType == MRecipeTypes.SMELTING) {
-                injectedChecker.customRecipeType(RecipeTypes.SMELTING);
+                injectedChecker.customRecipeType(RecipeType.SMELTING);
                injectedChecker.recipeType(MRecipeTypes.SMELTING);
            } else if (recipeType == MRecipeTypes.BLASTING) {
-                injectedChecker.customRecipeType(RecipeTypes.BLASTING);
+                injectedChecker.customRecipeType(RecipeType.BLASTING);
                injectedChecker.recipeType(MRecipeTypes.BLASTING);
            } else if (recipeType == MRecipeTypes.SMOKING) {
-                injectedChecker.customRecipeType(RecipeTypes.SMOKING);
+                injectedChecker.customRecipeType(RecipeType.SMOKING);
                injectedChecker.recipeType(MRecipeTypes.SMOKING);
            } else {
                throw new IllegalStateException("RecipeType " + recipeType + " not supported");
@@ -174,7 +174,7 @@ public class RecipeInjector {
            Object quickCheck = CoreReflections.field$CampfireBlockEntity$quickCheck.get(entity);
            if (clazz$InjectedCacheChecker.isInstance(quickCheck)) return; // already injected
            InjectedCacheCheck injectedChecker = (InjectedCacheCheck) ReflectionUtils.UNSAFE.allocateInstance(clazz$InjectedCacheChecker);
-            injectedChecker.customRecipeType(RecipeTypes.CAMPFIRE_COOKING);
+            injectedChecker.customRecipeType(RecipeType.CAMPFIRE_COOKING);
            injectedChecker.recipeType(MRecipeTypes.CAMPFIRE_COOKING);
            CoreReflections.field$CampfireBlockEntity$quickCheck.set(entity, injectedChecker);
        }
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/InteractUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/InteractUtils.java
@@ -9,7 +9,7 @@ import net.momirealms.craftengine.core.entity.EntityTypeKeys;
 import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.item.ItemKeys;
 import net.momirealms.craftengine.core.item.behavior.ItemBehavior;
-import net.momirealms.craftengine.core.item.recipe.RecipeTypes;
+import net.momirealms.craftengine.core.item.recipe.RecipeType;
 import net.momirealms.craftengine.core.item.recipe.UniqueIdItem;
 import net.momirealms.craftengine.core.item.recipe.input.SingleItemInput;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
@@ -129,13 +129,13 @@ public class InteractUtils {
        });
        registerInteraction(BlockKeys.SOUL_CAMPFIRE, (player, item, blockState, result) -> {
            if (!Config.enableRecipeSystem()) return false;
-            return BukkitRecipeManager.instance().recipeByInput(RecipeTypes.CAMPFIRE_COOKING, new SingleItemInput<>(new UniqueIdItem<>(
+            return BukkitRecipeManager.instance().recipeByInput(RecipeType.CAMPFIRE_COOKING, new SingleItemInput<>(new UniqueIdItem<>(
                    item.recipeIngredientId(), item
            ))) != null;
        });
        registerInteraction(BlockKeys.CAMPFIRE, (player, item, blockState, result) -> {
            if (!Config.enableRecipeSystem()) return false;
-            return BukkitRecipeManager.instance().recipeByInput(RecipeTypes.CAMPFIRE_COOKING, new SingleItemInput<>(new UniqueIdItem<>(
+            return BukkitRecipeManager.instance().recipeByInput(RecipeType.CAMPFIRE_COOKING, new SingleItemInput<>(new UniqueIdItem<>(
                    item.recipeIngredientId(), item
            ))) != null;
        });