Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-14 01:21:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move TranslationLoader to common

Browse Source
This commit is contained in:
Vankka 2025-02-03 19:36:59 +02:00
parent 859b2d3563
commit 4fd41397bd
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
4 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/discordsrv/api/reload/ReloadFlag.java
View File

@ -39,8 +39,6 @@ public enum ReloadFlag {
STORAGE(true),
DISCORD_CONNECTION(DiscordSRVApi::isReady),
DISCORD_COMMANDS(false),
// Bukkit only
TRANSLATIONS(false);
public static final Set<ReloadFlag> LOAD = Collections.unmodifiableSet(

16
bukkit/shared/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java
View File

@ -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<IBukkitBootstrap, BukkitConfig, ConnectionConfig, MessagesConfig> {
private BukkitAudiences audiences;
private BukkitTranslationLoader translationLoader;
private final BukkitPluginManager pluginManager;
@ -62,7 +56,6 @@ public abstract class BukkitDiscordSRV extends AbstractDiscordSRV<IBukkitBootstr
// Adventure related stuff
this.audiences = BukkitAudiences.create(bootstrap.getPlugin());
this.translationLoader = new BukkitTranslationLoader(this);
// Integrations
registerIntegration("com.discordsrv.bukkit.integration.VaultIntegration");
@ -80,15 +73,6 @@ public abstract class BukkitDiscordSRV extends AbstractDiscordSRV<IBukkitBootstr
super.enable();
}
@Override
protected List<ReloadResult> reload(Set<ReloadFlag> flags, boolean initial) throws Throwable {
if (flags.contains(ReloadFlag.TRANSLATIONS)) {
translationLoader.reload();
}
return super.reload(flags, initial);
}
@Override
public OnlineMode onlineMode() {
try {

8
common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java
View File

@ -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();
}

12
bukkit/shared/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java → common/src/main/java/com/discordsrv/common/core/component/translation/TranslationLoader.java
View File

@ -16,11 +16,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
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");
}