From a168cb85916091188e48d833bf03356b805d06b1 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:14:33 +0800 Subject: [PATCH] modules --- .../feature/background/BackgroundManagerImpl.java | 2 ++ .../backend/feature/image/ImageManagerImpl.java | 2 ++ .../feature/nameplate/NameplateManagerImpl.java | 2 ++ .../backend/feature/tag/UnlimitedTagManagerImpl.java | 1 - .../customnameplates/bukkit/BukkitChatManager.java | 12 ++++++------ common/src/main/resources/translations/en.yml | 2 +- common/src/main/resources/translations/zh_cn.yml | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/background/BackgroundManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/background/BackgroundManagerImpl.java index 620bba0..89896b3 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/background/BackgroundManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/background/BackgroundManagerImpl.java @@ -18,6 +18,7 @@ package net.momirealms.customnameplates.backend.feature.background; import dev.dejvokep.boostedyaml.YamlDocument; +import net.momirealms.customnameplates.api.ConfigManager; import net.momirealms.customnameplates.api.CustomNameplates; import net.momirealms.customnameplates.api.feature.ConfiguredCharacter; import net.momirealms.customnameplates.api.feature.background.Background; @@ -44,6 +45,7 @@ public class BackgroundManagerImpl implements BackgroundManager { @Override public void load() { + if (!ConfigManager.backgroundModule()) return; this.loadConfigs(); } diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/image/ImageManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/image/ImageManagerImpl.java index 9b4a033..c98faa6 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/image/ImageManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/image/ImageManagerImpl.java @@ -18,6 +18,7 @@ package net.momirealms.customnameplates.backend.feature.image; import dev.dejvokep.boostedyaml.YamlDocument; +import net.momirealms.customnameplates.api.ConfigManager; import net.momirealms.customnameplates.api.CustomNameplates; import net.momirealms.customnameplates.api.feature.ConfiguredCharacter; import net.momirealms.customnameplates.api.feature.image.Image; @@ -47,6 +48,7 @@ public class ImageManagerImpl implements ImageManager { @Override public void load() { + if (!ConfigManager.imageModule()) return; this.loadConfigs(); } diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java index 47f81cc..3871ae0 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java @@ -19,6 +19,7 @@ package net.momirealms.customnameplates.backend.feature.nameplate; import dev.dejvokep.boostedyaml.YamlDocument; import net.momirealms.customnameplates.api.CNPlayer; +import net.momirealms.customnameplates.api.ConfigManager; import net.momirealms.customnameplates.api.CustomNameplates; import net.momirealms.customnameplates.api.feature.ConfiguredCharacter; import net.momirealms.customnameplates.api.feature.nameplate.Nameplate; @@ -47,6 +48,7 @@ public class NameplateManagerImpl implements NameplateManager { @Override public void load() { + if (!ConfigManager.nameplateModule()) return; this.loadConfig(); this.loadConfigs(); } diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/tag/UnlimitedTagManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/tag/UnlimitedTagManagerImpl.java index 4191c19..b627ac8 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/tag/UnlimitedTagManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/tag/UnlimitedTagManagerImpl.java @@ -141,7 +141,6 @@ public class UnlimitedTagManagerImpl implements UnlimitedTagManager, JoinQuitLis @Override public void load() { - if (!ConfigManager.nameplateModule()) return; this.loadConfig(); this.resetArray(); for (CNPlayer online : plugin.getOnlinePlayers()) { diff --git a/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java b/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java index 8c3ed2c..625ec70 100644 --- a/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java +++ b/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java @@ -35,22 +35,22 @@ public class BukkitChatManager extends AbstractChatManager { protected void setUpPlatformProvider() { if (ConfigManager.chatTrChat() && Bukkit.getPluginManager().isPluginEnabled("TrChat")) { this.chatProvider = new TrChatProvider(plugin, this); - plugin.getPluginLogger().info("TrChat hooked"); + plugin.getPluginLogger().info("TrChat hooked!"); } else if (ConfigManager.chatVenture() && Bukkit.getPluginManager().isPluginEnabled("VentureChat")) { this.chatProvider = new VentureChatProvider(plugin, this); - plugin.getPluginLogger().info("VentureChat hooked"); + plugin.getPluginLogger().info("VentureChat hooked!"); } else if (ConfigManager.chatHusk() && Bukkit.getPluginManager().isPluginEnabled("HuskChat")) { this.chatProvider = new HuskChatProvider(plugin, this); - plugin.getPluginLogger().info("HuskChat hooked"); + plugin.getPluginLogger().info("HuskChat hooked!"); } else if (ConfigManager.chatCarbon() && Bukkit.getPluginManager().isPluginEnabled("CarbonChat")) { this.chatProvider = new CarbonChatProvider(plugin, this); - plugin.getPluginLogger().info("CarbonChat hooked"); + plugin.getPluginLogger().info("CarbonChat hooked!"); } else if (ConfigManager.chatAdvanced() && Bukkit.getPluginManager().isPluginEnabled("AdvancedChat")) { this.chatProvider = new AdvancedChatProvider(plugin, this); - plugin.getPluginLogger().info("AdvancedChat hooked"); + plugin.getPluginLogger().info("AdvancedChat hooked!"); } else if (ConfigManager.chatEss() && Bukkit.getPluginManager().isPluginEnabled("EssentialsChat")) { this.chatProvider = new EssentialsChatProvider(plugin, this); - plugin.getPluginLogger().info("EssentialsChat hooked"); + plugin.getPluginLogger().info("EssentialsChat hooked!"); } else { this.chatProvider = new AsyncChatProvider(plugin, this); } diff --git a/common/src/main/resources/translations/en.yml b/common/src/main/resources/translations/en.yml index 322dcfc..4b4078d 100644 --- a/common/src/main/resources/translations/en.yml +++ b/common/src/main/resources/translations/en.yml @@ -1,5 +1,5 @@ # Don't change this -config-version: "36" +config-version: "37" exception.invalid_syntax: "Invalid syntax. Correct syntax: " exception.invalid_argument: "Invalid argument. Reason: " diff --git a/common/src/main/resources/translations/zh_cn.yml b/common/src/main/resources/translations/zh_cn.yml index f96ddc5..2fc92d9 100644 --- a/common/src/main/resources/translations/zh_cn.yml +++ b/common/src/main/resources/translations/zh_cn.yml @@ -1,5 +1,5 @@ # 别动这个 -config-version: "36" +config-version: "37" exception.invalid_syntax: "无效语法. 正确语法:" exception.invalid_argument: "无效参数. 原因:"