mirror of
https://github.com/GeyserMC/Floodgate.git
synced 2025-12-19 14:59:20 +00:00
Localize floodgate.core.not_linked (#383)
* Localize floodgate.core.not_linked * Update languages submodule * not_linked string has changed slightly --------- Co-authored-by: Tim203 <mctim203@gmail.com>
This commit is contained in:
@@ -69,6 +69,7 @@ import org.geysermc.floodgate.pluginmessage.PluginMessageManager;
|
|||||||
import org.geysermc.floodgate.skin.SkinUploadManager;
|
import org.geysermc.floodgate.skin.SkinUploadManager;
|
||||||
import org.geysermc.floodgate.util.Constants;
|
import org.geysermc.floodgate.util.Constants;
|
||||||
import org.geysermc.floodgate.util.HttpClient;
|
import org.geysermc.floodgate.util.HttpClient;
|
||||||
|
import org.geysermc.floodgate.util.LanguageManager;
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class CommonModule extends AbstractModule {
|
public class CommonModule extends AbstractModule {
|
||||||
@@ -165,10 +166,11 @@ public class CommonModule extends AbstractModule {
|
|||||||
FloodgateConfig config,
|
FloodgateConfig config,
|
||||||
SkinUploadManager skinUploadManager,
|
SkinUploadManager skinUploadManager,
|
||||||
@Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute,
|
@Named("playerAttribute") AttributeKey<FloodgatePlayer> playerAttribute,
|
||||||
FloodgateLogger logger) {
|
FloodgateLogger logger,
|
||||||
|
LanguageManager languageManager) {
|
||||||
|
|
||||||
return new FloodgateHandshakeHandler(handshakeHandlers, api, cipher, config,
|
return new FloodgateHandshakeHandler(handshakeHandlers, api, cipher, config,
|
||||||
skinUploadManager, playerAttribute, logger);
|
skinUploadManager, playerAttribute, logger, languageManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
|
|||||||
@@ -52,7 +52,9 @@ import org.geysermc.floodgate.config.FloodgateConfig;
|
|||||||
import org.geysermc.floodgate.crypto.FloodgateCipher;
|
import org.geysermc.floodgate.crypto.FloodgateCipher;
|
||||||
import org.geysermc.floodgate.skin.SkinUploadManager;
|
import org.geysermc.floodgate.skin.SkinUploadManager;
|
||||||
import org.geysermc.floodgate.util.BedrockData;
|
import org.geysermc.floodgate.util.BedrockData;
|
||||||
|
import org.geysermc.floodgate.util.Constants;
|
||||||
import org.geysermc.floodgate.util.InvalidFormatException;
|
import org.geysermc.floodgate.util.InvalidFormatException;
|
||||||
|
import org.geysermc.floodgate.util.LanguageManager;
|
||||||
import org.geysermc.floodgate.util.LinkedPlayer;
|
import org.geysermc.floodgate.util.LinkedPlayer;
|
||||||
import org.geysermc.floodgate.util.Utils;
|
import org.geysermc.floodgate.util.Utils;
|
||||||
|
|
||||||
@@ -64,6 +66,7 @@ public final class FloodgateHandshakeHandler {
|
|||||||
private final SkinUploadManager skinUploadManager;
|
private final SkinUploadManager skinUploadManager;
|
||||||
private final AttributeKey<FloodgatePlayer> playerAttribute;
|
private final AttributeKey<FloodgatePlayer> playerAttribute;
|
||||||
private final FloodgateLogger logger;
|
private final FloodgateLogger logger;
|
||||||
|
private final LanguageManager languageManager;
|
||||||
|
|
||||||
public FloodgateHandshakeHandler(
|
public FloodgateHandshakeHandler(
|
||||||
HandshakeHandlersImpl handshakeHandlers,
|
HandshakeHandlersImpl handshakeHandlers,
|
||||||
@@ -72,7 +75,8 @@ public final class FloodgateHandshakeHandler {
|
|||||||
FloodgateConfig config,
|
FloodgateConfig config,
|
||||||
SkinUploadManager skinUploadManager,
|
SkinUploadManager skinUploadManager,
|
||||||
AttributeKey<FloodgatePlayer> playerAttribute,
|
AttributeKey<FloodgatePlayer> playerAttribute,
|
||||||
FloodgateLogger logger) {
|
FloodgateLogger logger,
|
||||||
|
LanguageManager languageManager) {
|
||||||
|
|
||||||
this.handshakeHandlers = handshakeHandlers;
|
this.handshakeHandlers = handshakeHandlers;
|
||||||
this.api = api;
|
this.api = api;
|
||||||
@@ -81,6 +85,7 @@ public final class FloodgateHandshakeHandler {
|
|||||||
this.skinUploadManager = skinUploadManager;
|
this.skinUploadManager = skinUploadManager;
|
||||||
this.playerAttribute = playerAttribute;
|
this.playerAttribute = playerAttribute;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
|
this.languageManager = languageManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -211,7 +216,12 @@ public final class FloodgateHandshakeHandler {
|
|||||||
linkedPlayer != null ? linkedPlayer.clone() : null, hostname);
|
linkedPlayer != null ? linkedPlayer.clone() : null, hostname);
|
||||||
|
|
||||||
if (config.getPlayerLink().isRequireLink() && linkedPlayer == null) {
|
if (config.getPlayerLink().isRequireLink() && linkedPlayer == null) {
|
||||||
handshakeData.setDisconnectReason("floodgate.core.not_linked");
|
String reason = languageManager.getString(
|
||||||
|
"floodgate.core.not_linked",
|
||||||
|
bedrockData.getLanguageCode(),
|
||||||
|
Constants.LINK_INFO_URL
|
||||||
|
);
|
||||||
|
handshakeData.setDisconnectReason(reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
handshakeHandlers.callHandshakeHandlers(handshakeData);
|
handshakeHandlers.callHandshakeHandlers(handshakeData);
|
||||||
|
|||||||
Submodule core/src/main/resources/languages updated: 38cb4a52df...204f4fe492
Reference in New Issue
Block a user