Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-20 15:39:22 +00:00
Code Issues Releases Activity

修复配方移除功能

Browse Source
This commit is contained in:
XiaoMoMi
2025-08-20 17:35:35 +08:00
parent 80279d3b89
commit c54ce3b660
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,7 +403,18 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
this.plugin.logger().warn("Failed to load datapack recipes", e); this.plugin.logger().warn("Failed to load datapack recipes", e);
} }
} }
if (Config.disableAllVanillaRecipes()) {
this.recipesToUnregister.addAll(this.lastDatapackRecipes.keySet().stream().map(it -> Pair.of(it, false)).toList());
return;
}
boolean hasDisabledAny = !Config.disabledVanillaRecipes().isEmpty();
for (Map.Entry<Key, Recipe<ItemStack>> entry : this.lastDatapackRecipes.entrySet()) { for (Map.Entry<Key, Recipe<ItemStack>> entry : this.lastDatapackRecipes.entrySet()) {
if (hasDisabledAny && Config.disabledVanillaRecipes().contains(entry.getKey())) {
this.recipesToUnregister.add(Pair.of(entry.getKey(), false));
continue;
}
markAsDataPackRecipe(entry.getKey()); markAsDataPackRecipe(entry.getKey());
registerInternalRecipe(entry.getKey(), entry.getValue()); registerInternalRecipe(entry.getKey(), entry.getValue());
} }
@@ -420,19 +431,11 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
packResources.add(CoreReflections.methodHandle$Pack$open.invokeExact(pack)); packResources.add(CoreReflections.methodHandle$Pack$open.invokeExact(pack));
} }
Map<Key, Recipe<ItemStack>> recipes = new HashMap<>(); Map<Key, Recipe<ItemStack>> recipes = new HashMap<>();
boolean hasDisabledAny = !Config.disabledVanillaRecipes().isEmpty();
try (AutoCloseable resourceManager = (AutoCloseable) CoreReflections.methodHandle$MultiPackResourceManagerConstructor.invokeExact(CoreReflections.instance$PackType$SERVER_DATA, packResources)) { try (AutoCloseable resourceManager = (AutoCloseable) CoreReflections.methodHandle$MultiPackResourceManagerConstructor.invokeExact(CoreReflections.instance$PackType$SERVER_DATA, packResources)) {
Map<Object, Object> scannedResources = (Map<Object, Object>) CoreReflections.methodHandle$FileToIdConverter$listMatchingResources.invokeExact(fileToIdConverter, resourceManager); Map<Object, Object> scannedResources = (Map<Object, Object>) CoreReflections.methodHandle$FileToIdConverter$listMatchingResources.invokeExact(fileToIdConverter, resourceManager);
for (Map.Entry<Object, Object> entry : scannedResources.entrySet()) { for (Map.Entry<Object, Object> entry : scannedResources.entrySet()) {
Key id = extractKeyFromResourceLocation(entry.getKey().toString()); Key id = extractKeyFromResourceLocation(entry.getKey().toString());
if (Config.disableAllVanillaRecipes()) {
this.recipesToUnregister.add(new Pair<>(id, false));
continue;
}
if (hasDisabledAny && Config.disabledVanillaRecipes().contains(id)) {
this.recipesToUnregister.add(new Pair<>(id, false));
continue;
}
Reader reader = (Reader) CoreReflections.methodHandle$Resource$openAsReader.invokeExact(entry.getValue()); Reader reader = (Reader) CoreReflections.methodHandle$Resource$openAsReader.invokeExact(entry.getValue());
JsonObject jsonObject = JsonParser.parseReader(reader).getAsJsonObject(); JsonObject jsonObject = JsonParser.parseReader(reader).getAsJsonObject();
Key serializerType = Key.of(jsonObject.get("type").getAsString()); Key serializerType = Key.of(jsonObject.get("type").getAsString());
@@ -470,6 +473,9 @@ public class BukkitRecipeManager extends AbstractRecipeManager<ItemStack> {
for (Pair<Key, Boolean> pair : this.recipesToUnregister) { for (Pair<Key, Boolean> pair : this.recipesToUnregister) {
unregisterPlatformRecipeMainThread(pair.left(), pair.right()); unregisterPlatformRecipeMainThread(pair.left(), pair.right());
} }
this.recipesToUnregister.clear();
// 注册新的配方 // 注册新的配方
for (Recipe<ItemStack> recipe : this.byId.values()) { for (Recipe<ItemStack> recipe : this.byId.values()) {
try { try {

2
gradle.properties
View File

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G
# Project settings # Project settings
# Rule: [major update].[feature update].[bug fix] # Rule: [major update].[feature update].[bug fix]
project_version=0.0.61.9 project_version=0.0.61.10
config_version=44 config_version=44
lang_version=24 lang_version=24
project_group=net.momirealms project_group=net.momirealms