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

refactor(pack): 实现异步资源包生成事件

Browse Source 
- 将 GenerateResourcePackEvent 系列事件重命名为 AsyncGenerateResourcePackEvent
- 在 CraftEngine 中添加 Platform 接口实现
- 在 PackManagerImpl 中集成 Platform 接口，用于处理异步事件
- 优化资源包生成流程，支持异步事件处理
This commit is contained in:
jhqwqmc
2025-02-13 03:25:31 +08:00
parent 5df5fa320f
commit a4bff4981c
9 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/AsyncGenerateResourcePackEndEvent.java Normal file
View File

@@ -0,0 +1,9 @@
package net.momirealms.craftengine.bukkit.api.event;
import java.nio.file.Path;
public class AsyncGenerateResourcePackEndEvent extends AsyncGenerateResourcePackEvent {
public AsyncGenerateResourcePackEndEvent(Path generatedPackPath, Path zipFile) {
super(generatedPackPath, zipFile);
}
}

5
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/GenerateResourcePackEvent.java → bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/AsyncGenerateResourcePackEvent.java
View File

@@ -6,12 +6,13 @@ import org.jetbrains.annotations.NotNull;
import java.nio.file.Path;
public class GenerateResourcePackEvent extends Event {
public class AsyncGenerateResourcePackEvent extends Event {
private static final HandlerList handlerList = new HandlerList();
private final Path generatedPackPath;
private final Path zipFile;
public GenerateResourcePackEvent(Path generatedPackPath, Path zipFile) {
public AsyncGenerateResourcePackEvent(Path generatedPackPath, Path zipFile) {
super(true);
this.generatedPackPath = generatedPackPath;
this.zipFile = zipFile;
}

4
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/GenerateResourcePackStartEvent.java → bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/AsyncGenerateResourcePackStartEvent.java
View File

@@ -4,10 +4,10 @@ import org.bukkit.event.Cancellable;
import java.nio.file.Path;
public class GenerateResourcePackStartEvent extends GenerateResourcePackEvent implements Cancellable {
public class AsyncGenerateResourcePackStartEvent extends AsyncGenerateResourcePackEvent implements Cancellable {
private boolean cancelled;
public GenerateResourcePackStartEvent(Path generatedPackPath, Path zipFile) {
public AsyncGenerateResourcePackStartEvent(Path generatedPackPath, Path zipFile) {
super(generatedPackPath, zipFile);
}

9
bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/event/GenerateResourcePackEndEvent.java
View File

@@ -1,9 +0,0 @@
package net.momirealms.craftengine.bukkit.api.event;
import java.nio.file.Path;
public class GenerateResourcePackEndEvent extends GenerateResourcePackEvent {
public GenerateResourcePackEndEvent(Path generatedPackPath, Path zipFile) {
super(generatedPackPath, zipFile);
}
}

22
bukkit/src/main/java/net/momirealms/craftengine/bukkit/platform/BukkitPlatform.java Normal file
View File

@@ -0,0 +1,22 @@
package net.momirealms.craftengine.bukkit.platform;
import net.momirealms.craftengine.bukkit.api.event.AsyncGenerateResourcePackEndEvent;
import net.momirealms.craftengine.bukkit.api.event.AsyncGenerateResourcePackStartEvent;
import net.momirealms.craftengine.bukkit.util.EventUtils;
import net.momirealms.craftengine.core.platform.Platform;
import java.nio.file.Path;
public class BukkitPlatform implements Platform {
@Override
public boolean AsyncGenerateResourcePackStartEvent(Path generatedPackPath, Path zipFile) {
AsyncGenerateResourcePackStartEvent startEvent = new AsyncGenerateResourcePackStartEvent(generatedPackPath, zipFile);
return EventUtils.fireAndCheckCancel(startEvent);
}
@Override
public void AsyncGenerateResourcePackEndEvent(Path generatedPackPath, Path zipFile) {
AsyncGenerateResourcePackEndEvent endEvent = new AsyncGenerateResourcePackEndEvent(generatedPackPath, zipFile);
EventUtils.fireAndForget(endEvent);
}
}

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java
View File

@@ -1,5 +1,6 @@
package net.momirealms.craftengine.bukkit.plugin;
import net.momirealms.craftengine.bukkit.platform.BukkitPlatform;
import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
import net.momirealms.craftengine.bukkit.block.behavior.BukkitBlockBehaviors;
import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
@@ -117,6 +118,7 @@ public class BukkitCraftEngine extends CraftEngine {
}
BukkitBlockBehaviors.init();
BukkitItemBehaviors.init();
super.platform = new BukkitPlatform();
super.senderFactory = new BukkitSenderFactory(this);
super.itemManager = new BukkitItemManager(this);
super.recipeManager = new BukkitRecipeManager(this);

20
core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java
View File

@@ -11,6 +11,7 @@ import net.momirealms.craftengine.core.font.Font;
import net.momirealms.craftengine.core.pack.generator.ModelGeneration;
import net.momirealms.craftengine.core.pack.generator.ModelGenerator;
import net.momirealms.craftengine.core.pack.model.ItemModel;
import net.momirealms.craftengine.core.platform.Platform;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.plugin.PluginProperties;
import net.momirealms.craftengine.core.plugin.config.ConfigManager;
@@ -35,12 +36,14 @@ public class PackManagerImpl implements PackManager {
private static final String LEGACY_TEMPLATES = PluginProperties.getValue("legacy-templates").replace(".", "_");
private static final String LATEST_TEMPLATES = PluginProperties.getValue("latest-templates").replace(".", "_");
private final CraftEngine plugin;
private final Platform platform;
private final Map<String, Pack> loadedPacks = new HashMap<>();
private final Map<String, ConfigSectionParser> sectionParsers = new HashMap<>();
private final TreeMap<ConfigSectionParser, List<CachedConfig>> cachedConfigs = new TreeMap<>();
public PackManagerImpl(CraftEngine plugin) {
public PackManagerImpl(CraftEngine plugin, Platform platform) {
this.plugin = plugin;
this.platform = platform;
}
@Override
@@ -238,6 +241,16 @@ public class PackManagerImpl implements PackManager {
.resolve("generated")
.resolve("resource_pack");
Path zipFile = plugin.dataFolderPath()
.resolve("generated")
.resolve("resource_pack.zip");
boolean isCancelled = platform.AsyncGenerateResourcePackStartEvent(generatedPackPath, zipFile);
if (isCancelled) {
plugin.logger().info("Resource pack generation cancelled by event");
return;
}
try {
org.apache.commons.io.FileUtils.deleteDirectory(generatedPackPath.toFile());
} catch (IOException e) {
@@ -264,9 +277,6 @@ public class PackManagerImpl implements PackManager {
this.generateItemModels(generatedPackPath, plugin.blockManager());
this.generateSounds(generatedPackPath);
Path zipFile = plugin.dataFolderPath()
.resolve("generated")
.resolve("resource_pack.zip");
try {
ZipUtils.zipDirectory(generatedPackPath, zipFile);
} catch (IOException e) {
@@ -275,6 +285,8 @@ public class PackManagerImpl implements PackManager {
long end = System.currentTimeMillis();
plugin.logger().info("Finished generating resource pack in " + (end - start) + "ms");
platform.AsyncGenerateResourcePackEndEvent(generatedPackPath, zipFile);
}
private void generateSounds(Path generatedPackPath) {

8
core/src/main/java/net/momirealms/craftengine/core/platform/Platform.java Normal file
View File

@@ -0,0 +1,8 @@
package net.momirealms.craftengine.core.platform;
import java.nio.file.Path;
public interface Platform {
boolean AsyncGenerateResourcePackStartEvent(Path generatedPackPath, Path zipFile);
void AsyncGenerateResourcePackEndEvent(Path generatedPackPath, Path zipFile);
}

4
core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java
View File

@@ -8,6 +8,7 @@ import net.momirealms.craftengine.core.item.ItemManager;
import net.momirealms.craftengine.core.item.recipe.RecipeManager;
import net.momirealms.craftengine.core.pack.PackManager;
import net.momirealms.craftengine.core.pack.PackManagerImpl;
import net.momirealms.craftengine.core.platform.Platform;
import net.momirealms.craftengine.core.plugin.classpath.ClassPathAppender;
import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager;
import net.momirealms.craftengine.core.plugin.command.sender.SenderFactory;
@@ -33,6 +34,7 @@ import java.util.List;
public abstract class CraftEngine implements Plugin {
public static final String NAMESPACE = "craftengine";
private static CraftEngine instance;
protected Platform platform;
protected DependencyManager dependencyManager;
protected SchedulerAdapter<?> scheduler;
protected NetworkManager networkManager;
@@ -90,7 +92,7 @@ public abstract class CraftEngine implements Plugin {
@Override
public void enable() {
this.networkManager.enable();
this.packManager = new PackManagerImpl(this);
this.packManager = new PackManagerImpl(this, this.platform);
this.fontManager = new FontManagerImpl(this);
this.templateManager = new TemplateManagerImpl(this);
this.commandManager.registerDefaultFeatures();