From 6b1b7e35bd72da8a81e6fec859e81bbb18530437 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Tue, 8 Apr 2025 16:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../craftengine/bukkit/block/BukkitBlockManager.java | 1 + .../craftengine/core/pack/AbstractPackManager.java | 6 +++--- .../craftengine/core/plugin/CraftEngine.java | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java index d0f1c9975..bf9365b43 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java @@ -114,6 +114,7 @@ public class BukkitBlockManager extends AbstractBlockManager { this.stateId2ImmutableBlockStates = new ImmutableBlockState[customBlockCount]; Arrays.fill(this.stateId2ImmutableBlockStates, EmptyBlock.INSTANCE.defaultState()); instance = this; + this.resetPacketConsumers(); } public static BukkitBlockManager instance() { diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java index 94d59d1b7..c99a83be3 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java @@ -395,14 +395,14 @@ public abstract class AbstractPackManager implements PackManager { for (Pack pack : loadedPacks()) { Pair, List> files = FileUtils.getConfigsDeeply(pack.configurationFolder()); for (Path path : files.left()) { - Yaml yaml = new Yaml(new StringKeyConstructor(new LoaderOptions())); try (InputStreamReader inputStream = new InputStreamReader(new FileInputStream(path.toFile()), StandardCharsets.UTF_8)) { + Yaml yaml = new Yaml(new StringKeyConstructor(new LoaderOptions())); Map data = yaml.load(inputStream); if (data == null) continue; for (Map.Entry entry : data.entrySet()) { processConfigEntry(entry, path, pack); } - } catch (IOException e) { + } catch (Exception e) { this.plugin.logger().warn(path, "Error loading config file", e); } } @@ -413,7 +413,7 @@ public abstract class AbstractPackManager implements PackManager { for (Map.Entry entry : data.entrySet()) { processConfigEntry(entry, path, pack); } - } catch (IOException e) { + } catch (Exception e) { this.plugin.logger().warn(path, "Error loading config file", e); } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 868152174..64b0a6569 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -142,12 +142,16 @@ public abstract class CraftEngine implements Plugin { if (reloadRecipe) { this.recipeManager.reload(); } - // now we load resources - this.packManager.loadResources(reloadRecipe); - // handle some special client lang for instance block_name - this.translationManager.delayedLoad(); + try { + // now we load resources + this.packManager.loadResources(reloadRecipe); + } catch (Exception e) { + this.logger().warn("Failed to load resources folder", e); + } // init suggestions and packet mapper this.blockManager.delayedLoad(); + // handle some special client lang for instance block_name + this.translationManager.delayedLoad(); // init suggestions this.furnitureManager.delayedLoad(); // sort the categories