Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-31 04:46:37 +00:00
Code Issues Releases Activity

feat(core): 优化外部数据构建逻辑并改进日志处理

Browse Source
This commit is contained in:
jhqwqmc
2025-09-10 09:04:58 +08:00
parent 76efd052dc
commit f105a18a52
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/main/java/net/momirealms/craftengine/core/item/modifier/ExternalModifier.java
View File

@@ -8,12 +8,13 @@ import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.locale.LocalizedResourceConfigException;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.ResourceConfigUtils;
import org.jetbrains.annotations.NotNull;
import java.util.*;
public class ExternalModifier<I> implements ItemDataModifier<I> {
public static final Factory<?> FACTORY = new Factory<>();
private static final ThreadLocal<Deque<String>> BUILD_STACK = ThreadLocal.withInitial(ArrayDeque::new);
private static final ThreadLocal<Set<Dependency>> BUILD_STACK = ThreadLocal.withInitial(LinkedHashSet::new);
private final String id;
private final ExternalItemSource<I> provider;
@@ -38,21 +39,20 @@ public class ExternalModifier<I> implements ItemDataModifier<I> {
@SuppressWarnings("unchecked")
@Override
public Item<I> apply(Item<I> item, ItemBuildContext context) {
String stackElement = provider.plugin() + "[id=" + id + "]";
Deque<String> buildStack = BUILD_STACK.get();
Dependency dependency = new Dependency(provider.plugin(), id);
Set<Dependency> buildStack = BUILD_STACK.get();
if (buildStack.contains(stackElement)) {
if (buildStack.contains(dependency)) {
StringJoiner dependencyChain = new StringJoiner(" -> ");
buildStack.forEach(dependencyChain::add);
dependencyChain.add(stackElement);
CraftEngine.instance().logger().warn("Item '" + item.customId().orElseGet(item::id) +
"' encountered circular dependency while building external item '" + this.id +
"' (from plugin '" + provider.plugin() + "'). Dependency chain: " + dependencyChain
buildStack.forEach(element -> dependencyChain.add(element.toString()));
dependencyChain.add(dependency.toString());
CraftEngine.instance().logger().warn(
"Failed to build '" + this.id + "' because of a dependency loop: " + dependencyChain
);
return item;
}
buildStack.push(stackElement);
buildStack.add(dependency);
try {
I another = this.provider.build(this.id, context);
if (another == null) {
@@ -62,11 +62,12 @@ public class ExternalModifier<I> implements ItemDataModifier<I> {
Item<I> anotherWrapped = (Item<I>) CraftEngine.instance().itemManager().wrap(another);
item.merge(anotherWrapped);
return item;
} catch (Throwable e) {
CraftEngine.instance().logger().warn("Failed to build '" + this.id + "'", e);
return item;
} finally {
buildStack.pop();
if (buildStack.isEmpty()) {
BUILD_STACK.remove();
}
buildStack.remove(dependency);
BUILD_STACK.remove();
}
}
@@ -82,4 +83,11 @@ public class ExternalModifier<I> implements ItemDataModifier<I> {
return new ExternalModifier<>(id, ResourceConfigUtils.requireNonNullOrThrow(provider, () -> new LocalizedResourceConfigException("warning.config.item.data.external.invalid_source", plugin)));
}
}
private record Dependency(String source, String id) {
@Override
public @NotNull String toString() {
return source + "[id=" + id + "]";
}
}
}

8
core/src/main/java/net/momirealms/craftengine/core/pack/PackCacheData.java
View File

@@ -21,8 +21,8 @@ public class PackCacheData {
.map(it -> plugin.dataFolderPath().getParent().resolve(it))
.filter(Files::exists)
.collect(Collectors.toSet()),
add -> Debugger.RESOURCE_PACK.debug(() -> "Adding external folder: " + add),
remove -> Debugger.RESOURCE_PACK.debug(() -> "Removing external folder: " + remove),
add -> plugin.logger().info("Adding external folder: " + add),
remove -> plugin.logger().info("Removing external folder: " + remove),
true
);
this.externalZips = new SetMonitor<>(
@@ -32,8 +32,8 @@ public class PackCacheData {
.filter(Files::isRegularFile)
.filter(file -> file.getFileName().toString().endsWith(".zip"))
.collect(Collectors.toSet()),
add -> Debugger.RESOURCE_PACK.debug(() -> "Adding external zip: " + add),
remove -> Debugger.RESOURCE_PACK.debug(() -> "Removing external zip: " + remove),
add -> plugin.logger().info("Adding external zip: " + add),
remove -> plugin.logger().info("Removing external zip: " + remove),
true
);
}