Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-06 15:52:03 +00:00
Code Issues Releases Activity

优化配方书匹配

Browse Source
This commit is contained in:
XiaoMoMi
2025-08-22 19:36:52 +08:00
parent 8157ad3099
commit 6f6bb4c9da
6 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/loader/build.gradle.kts
View File

@@ -47,7 +47,7 @@ bukkit {
name = "CraftEngine"
apiVersion = "1.20"
authors = listOf("XiaoMoMi")
contributors = listOf("jhqwqmc", "iqtesterrr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon")
contributors = listOf("jhqwqmc", "iqtesterrr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon", "Halogly", "ArubikU", "Maxsh001", "Sasha2294", "MrPanda8")
softDepend = listOf("PlaceholderAPI", "WorldEdit", "FastAsyncWorldEdit", "Skript")
foliaSupported = true
}

2
bukkit/paper-loader/build.gradle.kts
View File

@@ -50,7 +50,7 @@ paper {
name = "CraftEngine"
apiVersion = "1.20"
authors = listOf("XiaoMoMi")
contributors = listOf("jhqwqmc", "iqtesterrr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon")
contributors = listOf("jhqwqmc", "iqtesterrr", "WhiteProject1", "Catnies", "xiaozhangup", "TamashiiMon", "Halogly", "ArubikU", "Maxsh001", "Sasha2294", "MrPanda8")
foliaSupported = true
serverDependencies {
register("PlaceholderAPI") {

21
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java
View File

@@ -3,7 +3,6 @@ package net.momirealms.craftengine.bukkit.item.recipe;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import io.papermc.paper.potion.PotionMix;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
@@ -85,7 +84,6 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
}
}
private static final List<Object> MODIFIED_INGREDIENTS = new ArrayList<>();
private static final Map<Key, Function<Recipe<ItemStack>, Object>> ADD_RECIPE_FOR_MINECRAFT_RECIPE_HOLDER = Map.of(
RecipeSerializers.SHAPED, recipe -> {
CustomShapedRecipe<ItemStack> shapedRecipe = (CustomShapedRecipe<ItemStack>) recipe;
@@ -245,9 +243,9 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
Ingredient<ItemStack> actualIngredient = actualIngredients.get(i);
List<Object> items = getIngredientLooks(actualIngredient.items());
if (VersionHelper.isOrAbove1_21_4()) {
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (Set<Object>) new ObjectOpenHashSet<>(items));
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (Set<Object>) new CustomIngredientSet(items, actualIngredient));
} else if (VersionHelper.isOrAbove1_21_2()) {
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (List<Object>) items);
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (List<Object>) new CustomIngredientList(items, actualIngredient));
} else {
Object itemStackArray = Array.newInstance(CoreReflections.clazz$ItemStack, items.size());
for (int j = 0; j < items.size(); j++) {
@@ -255,7 +253,6 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
}
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (Object) itemStackArray);
}
MODIFIED_INGREDIENTS.add(ingredient);
}
}
@@ -498,20 +495,6 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
// send to players
CoreReflections.methodHandle$DedicatedPlayerList$reloadRecipes.invokeExact(CraftBukkitReflections.methodHandle$CraftServer$playerListGetter.invokeExact(Bukkit.getServer()));
// now we need to remove the fake `exact` choices
if (VersionHelper.isOrAbove1_21_4()) {
for (Object ingredient : MODIFIED_INGREDIENTS) {
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (Set<Object>) null);
}
} else if (VersionHelper.isOrAbove1_21_2()) {
for (Object ingredient : MODIFIED_INGREDIENTS) {
CoreReflections.methodHandle$Ingredient$itemStacksSetter.invokeExact(ingredient, (List<Object>) null);
}
}
// clear cache
MODIFIED_INGREDIENTS.clear();
} catch (Throwable e) {
this.plugin.logger().warn("Failed to run delayed recipe tasks", e);
}

29
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/CustomIngredientList.java Normal file
View File

@@ -0,0 +1,29 @@
package net.momirealms.craftengine.bukkit.item.recipe;
import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
import net.momirealms.craftengine.bukkit.nms.FastNMS;
import net.momirealms.craftengine.core.item.recipe.Ingredient;
import net.momirealms.craftengine.core.item.recipe.UniqueIdItem;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
public class CustomIngredientList extends ArrayList<Object> {
private final Ingredient<ItemStack> ingredient;
public CustomIngredientList(@NotNull Collection<?> c, Ingredient<ItemStack> ingredient) {
super(c);
this.ingredient = ingredient;
}
@Override
public boolean contains(Object o) {
if (o == null || FastNMS.INSTANCE.method$ItemStack$isEmpty(o)) {
return false;
}
return this.ingredient.test(UniqueIdItem.of(BukkitItemManager.instance().wrap(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(o))));
}
}

28
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/CustomIngredientSet.java Normal file
View File

@@ -0,0 +1,28 @@
package net.momirealms.craftengine.bukkit.item.recipe;
import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
import net.momirealms.craftengine.bukkit.nms.FastNMS;
import net.momirealms.craftengine.core.item.recipe.Ingredient;
import net.momirealms.craftengine.core.item.recipe.UniqueIdItem;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.HashSet;
public class CustomIngredientSet extends HashSet<Object> {
private final Ingredient<ItemStack> ingredient;
public CustomIngredientSet(@NotNull Collection<?> c, Ingredient<ItemStack> ingredient) {
super(c);
this.ingredient = ingredient;
}
@Override
public boolean contains(Object o) {
if (o == null || FastNMS.INSTANCE.method$ItemStack$isEmpty(o)) {
return false;
}
return this.ingredient.test(UniqueIdItem.of(BukkitItemManager.instance().wrap(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(o))));
}
}

4
gradle.properties
View File

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G
# Project settings
# Rule: [major update].[feature update].[bug fix]
project_version=0.0.62
project_version=0.0.62.1
config_version=44
lang_version=24
project_group=net.momirealms
@@ -50,7 +50,7 @@ byte_buddy_version=1.17.5
ahocorasick_version=0.6.3
snake_yaml_version=2.4
anti_grief_version=0.19
nms_helper_version=1.0.57
nms_helper_version=1.0.58
evalex_version=3.5.0
reactive_streams_version=1.0.4
amazon_awssdk_version=2.31.23