From 4fd41397bdf5344a7ea528bab6ac0145657ef3f6 Mon Sep 17 00:00:00 2001 From: Vankka Date: Mon, 3 Feb 2025 19:36:59 +0200 Subject: [PATCH] Move TranslationLoader to common --- .../com/discordsrv/api/reload/ReloadFlag.java | 2 -- .../com/discordsrv/bukkit/BukkitDiscordSRV.java | 16 ---------------- .../discordsrv/common/AbstractDiscordSRV.java | 8 ++++++++ .../component/translation/TranslationLoader.java | 12 +++++------- 4 files changed, 13 insertions(+), 25 deletions(-) rename bukkit/shared/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java => common/src/main/java/com/discordsrv/common/core/component/translation/TranslationLoader.java (93%) diff --git a/api/src/main/java/com/discordsrv/api/reload/ReloadFlag.java b/api/src/main/java/com/discordsrv/api/reload/ReloadFlag.java index aeba6893..42dfd987 100644 --- a/api/src/main/java/com/discordsrv/api/reload/ReloadFlag.java +++ b/api/src/main/java/com/discordsrv/api/reload/ReloadFlag.java @@ -39,8 +39,6 @@ public enum ReloadFlag { STORAGE(true), DISCORD_CONNECTION(DiscordSRVApi::isReady), DISCORD_COMMANDS(false), - - // Bukkit only TRANSLATIONS(false); public static final Set LOAD = Collections.unmodifiableSet( diff --git a/bukkit/shared/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java b/bukkit/shared/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java index 62ac1ee7..5dd905eb 100644 --- a/bukkit/shared/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java +++ b/bukkit/shared/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java @@ -19,9 +19,6 @@ package com.discordsrv.bukkit; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.reload.ReloadFlag; -import com.discordsrv.api.reload.ReloadResult; -import com.discordsrv.bukkit.component.translation.BukkitTranslationLoader; import com.discordsrv.bukkit.config.main.BukkitConfig; import com.discordsrv.bukkit.player.BukkitPlayerProvider; import com.discordsrv.bukkit.plugin.BukkitPluginManager; @@ -39,13 +36,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -import java.util.List; -import java.util.Set; public abstract class BukkitDiscordSRV extends AbstractDiscordSRV { private BukkitAudiences audiences; - private BukkitTranslationLoader translationLoader; private final BukkitPluginManager pluginManager; @@ -62,7 +56,6 @@ public abstract class BukkitDiscordSRV extends AbstractDiscordSRV reload(Set flags, boolean initial) throws Throwable { - if (flags.contains(ReloadFlag.TRANSLATIONS)) { - translationLoader.reload(); - } - - return super.reload(flags, initial); - } - @Override public OnlineMode onlineMode() { try { diff --git a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java index 8291eb21..15862482 100644 --- a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java @@ -40,6 +40,7 @@ import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.main.linking.LinkedAccountConfig; import com.discordsrv.common.config.messages.MessagesConfig; import com.discordsrv.common.core.component.ComponentFactory; +import com.discordsrv.common.core.component.translation.TranslationLoader; import com.discordsrv.common.core.dependency.DiscordSRVDependencyManager; import com.discordsrv.common.core.eventbus.EventBusImpl; import com.discordsrv.common.core.logging.Logger; @@ -158,6 +159,7 @@ public abstract class AbstractDiscordSRV< private ChannelConfigHelper channelConfig; private DestinationLookupHelper destinationLookupHelper; private TemporaryLocalData temporaryLocalData; + private TranslationLoader translationLoader; private Storage storage; private LinkProvider linkProvider; @@ -664,6 +666,8 @@ public abstract class AbstractDiscordSRV< // Logging DependencyLoggerAdapter.setAppender(new DependencyLoggingHandler(this)); + this.translationLoader = new TranslationLoader(this); + // Placeholder result stringifiers & global contexts placeholderService().addResultMapper(new ComponentResultStringifier(this)); placeholderService().addGlobalContext(new TextHandlingContext(this)); @@ -916,6 +920,10 @@ public abstract class AbstractDiscordSRV< results.addAll(moduleManager().reload()); } + if (translationLoader != null && flags.contains(ReloadFlag.TRANSLATIONS)) { + translationLoader.reload(); + } + if (flags.contains(ReloadFlag.DISCORD_COMMANDS) && isReady()) { discordAPI().commandRegistry().reloadCommands(); } diff --git a/bukkit/shared/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java b/common/src/main/java/com/discordsrv/common/core/component/translation/TranslationLoader.java similarity index 93% rename from bukkit/shared/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java rename to common/src/main/java/com/discordsrv/common/core/component/translation/TranslationLoader.java index 96aeb151..35ea5566 100644 --- a/bukkit/shared/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java +++ b/common/src/main/java/com/discordsrv/common/core/component/translation/TranslationLoader.java @@ -16,11 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.bukkit.component.translation; +package com.discordsrv.common.core.component.translation; -import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.core.component.translation.Translation; -import com.discordsrv.common.core.component.translation.TranslationRegistry; +import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.core.logging.NamedLogger; import com.fasterxml.jackson.databind.JsonNode; @@ -36,12 +34,12 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; -public class BukkitTranslationLoader { +public class TranslationLoader { - private final BukkitDiscordSRV discordSRV; + private final DiscordSRV discordSRV; private final NamedLogger logger; - public BukkitTranslationLoader(BukkitDiscordSRV discordSRV) { + public TranslationLoader(DiscordSRV discordSRV) { this.discordSRV = discordSRV; this.logger = new NamedLogger(discordSRV, "TRANSLATION_LOADER"); }