Merge remote-tracking branch 'upstream/master' into dev

bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeeLogger.java

@@ -26,22 +26,19 @@
 package org.geysermc.geyser.platform.bungeecord;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.geysermc.geyser.GeyserLogger;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+@RequiredArgsConstructor
 public class GeyserBungeeLogger implements GeyserLogger {
     private final Logger logger;
     @Getter @Setter
     private boolean debug;
 
-    public GeyserBungeeLogger(Logger logger, boolean debug) {
-        this.logger = logger;
-        this.debug = debug;
-    }
-
     @Override
     public void severe(String message) {
         logger.severe(message);

bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java

@@ -58,14 +58,13 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 
 public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap {
 
     private GeyserCommandManager geyserCommandManager;
     private GeyserBungeeConfiguration geyserConfig;
     private GeyserBungeeInjector geyserInjector;
-    private GeyserBungeeLogger geyserLogger;
+    private final GeyserBungeeLogger geyserLogger = new GeyserBungeeLogger(getLogger());
     private IGeyserPingPassthrough geyserBungeePingPassthrough;
 
     private GeyserImpl geyser;
@@ -82,21 +81,21 @@ public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap {
         // Copied from ViaVersion.
         // https://github.com/ViaVersion/ViaVersion/blob/b8072aad86695cc8ec6f5e4103e43baf3abf6cc5/bungee/src/main/java/us/myles/ViaVersion/BungeePlugin.java#L43
         try {
-            ProtocolConstants.class.getField("MINECRAFT_1_20_3");
+            ProtocolConstants.class.getField("MINECRAFT_1_20_5");
         } catch (NoSuchFieldException e) {
-            getLogger().warning("      / \\");
+            geyserLogger.error("      / \\");
-            getLogger().warning("     /   \\");
+            geyserLogger.error("     /   \\");
-            getLogger().warning("    /  |  \\");
+            geyserLogger.error("    /  |  \\");
-            getLogger().warning("   /   |   \\    " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_proxy", getProxy().getName()));
+            geyserLogger.error("   /   |   \\    " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_proxy", getProxy().getName()));
-            getLogger().warning("  /         \\   " + GeyserLocale.getLocaleStringLog("geyser.may_not_work_as_intended_all_caps"));
+            geyserLogger.error("  /         \\   " + GeyserLocale.getLocaleStringLog("geyser.may_not_work_as_intended_all_caps"));
-            getLogger().warning(" /     o     \\");
+            geyserLogger.error(" /     o     \\");
-            getLogger().warning("/_____________\\");
+            geyserLogger.error("/_____________\\");
         }
 
         if (!this.loadConfig()) {
             return;
         }
-        this.geyserLogger = new GeyserBungeeLogger(getLogger(), geyserConfig.isDebugMode());
+        this.geyserLogger.setDebug(geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
         this.geyser = GeyserImpl.load(PlatformType.BUNGEECORD, this);
         this.geyserInjector = new GeyserBungeeInjector(this);
@@ -293,7 +292,7 @@ public class GeyserBungeePlugin extends Plugin implements GeyserBootstrap {
                     "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()), this);
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserBungeeConfiguration.class);
         } catch (IOException ex) {
-            getLogger().log(Level.SEVERE, GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
             return false;
         }

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java

@@ -34,7 +34,6 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
-import org.apache.logging.log4j.LogManager;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.GeyserBootstrap;
@@ -80,7 +79,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
     private GeyserCommandManager geyserCommandManager;
     private GeyserModConfiguration geyserConfig;
     private GeyserModInjector geyserInjector;
-    private GeyserModLogger geyserLogger;
+    private final GeyserModLogger geyserLogger = new GeyserModLogger();
     private IGeyserPingPassthrough geyserPingPassthrough;
     private WorldManager geyserWorldManager;
 
@@ -92,7 +91,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
         if (!loadConfig()) {
             return;
         }
-        this.geyserLogger = new GeyserModLogger(geyserConfig.isDebugMode());
+        this.geyserLogger.setDebug(geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
         this.geyser = GeyserImpl.load(this.platform.platformType(), this);
 
@@ -288,7 +287,7 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserModConfiguration.class);
             return true;
         } catch (IOException ex) {
-            LogManager.getLogger("geyser").error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
             return false;
         }

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModLogger.java

@@ -37,10 +37,6 @@ public class GeyserModLogger implements GeyserLogger {
 
     private boolean debug;
 
-    public GeyserModLogger(boolean isDebug) {
-        debug = isDebug;
-    }
-
     @Override
     public void severe(String message) {
         logger.fatal(message);

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperLogger.java

@@ -34,8 +34,8 @@ import java.util.logging.Logger;
 public final class GeyserPaperLogger extends GeyserSpigotLogger {
     private final ComponentLogger componentLogger;
 
-    public GeyserPaperLogger(Plugin plugin, Logger logger, boolean debug) {
+    public GeyserPaperLogger(Plugin plugin, Logger logger) {
-        super(logger, debug);
+        super(logger);
         componentLogger = plugin.getComponentLogger();
     }
 

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotLogger.java

@@ -25,15 +25,15 @@
 
 package org.geysermc.geyser.platform.spigot;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.geysermc.geyser.GeyserLogger;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class GeyserSpigotLogger implements GeyserLogger {
     private final Logger logger;
     @Getter @Setter

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java

@@ -79,14 +79,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.logging.Level;
 
 public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
 
     private GeyserSpigotCommandManager geyserCommandManager;
     private GeyserSpigotConfiguration geyserConfig;
     private GeyserSpigotInjector geyserInjector;
-    private GeyserSpigotLogger geyserLogger;
+    private final GeyserSpigotLogger geyserLogger = GeyserPaperLogger.supported() ?
+            new GeyserPaperLogger(this, getLogger()) : new GeyserSpigotLogger(getLogger());
     private IGeyserPingPassthrough geyserSpigotPingPassthrough;
     private GeyserSpigotWorldManager geyserWorldManager;
 
@@ -114,12 +114,12 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
             // We depend on this as a fallback in certain scenarios
             BlockData.class.getMethod("getAsString");
         } catch (ClassNotFoundException | NoSuchMethodException e) {
-            getLogger().severe("*********************************************");
+            geyserLogger.error("*********************************************");
-            getLogger().severe("");
+            geyserLogger.error("");
-            getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.header"));
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.header"));
-            getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.message", "1.13.2"));
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server.message", "1.13.2"));
-            getLogger().severe("");
+            geyserLogger.error("");
-            getLogger().severe("*********************************************");
+            geyserLogger.error("*********************************************");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
@@ -128,12 +128,12 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
             Class.forName("net.md_5.bungee.chat.ComponentSerializer");
         } catch (ClassNotFoundException e) {
             if (!PaperAdventure.canSendMessageUsingComponent()) { // Prepare for Paper eventually removing Bungee chat
-                getLogger().severe("*********************************************");
+                geyserLogger.error("*********************************************");
-                getLogger().severe("");
+                geyserLogger.error("");
-                getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server_type.header", getServer().getName()));
+                geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server_type.header", getServer().getName()));
-                getLogger().severe(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server_type.message", "Paper"));
+                geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_server_type.message", "Paper"));
-                getLogger().severe("");
+                geyserLogger.error("");
-                getLogger().severe("*********************************************");
+                geyserLogger.error("*********************************************");
                 Bukkit.getPluginManager().disablePlugin(this);
                 return;
             }
@@ -142,11 +142,11 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
         try {
             Class.forName("io.netty.util.internal.ObjectPool$ObjectCreator");
         } catch (ClassNotFoundException e) {
-            getLogger().severe("*********************************************");
+            geyserLogger.error("*********************************************");
-            getLogger().severe("");
+            geyserLogger.error("");
-            getLogger().severe("This version of Spigot is using an outdated version of netty. Please use Paper instead!");
+            geyserLogger.error("This version of Spigot is using an outdated version of netty. Please use Paper instead!");
-            getLogger().severe("");
+            geyserLogger.error("");
-            getLogger().severe("*********************************************");
+            geyserLogger.error("*********************************************");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
@@ -154,8 +154,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
         if (!loadConfig()) {
             return;
         }
-        this.geyserLogger = GeyserPaperLogger.supported() ? new GeyserPaperLogger(this, getLogger(), geyserConfig.isDebugMode())
+        this.geyserLogger.setDebug(geyserConfig.isDebugMode());
-                : new GeyserSpigotLogger(getLogger(), geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
         // Turn "(MC: 1.16.4)" into 1.16.4.
@@ -486,7 +485,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
                     (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()), this);
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserSpigotConfiguration.class);
         } catch (IOException ex) {
-            getLogger().log(Level.SEVERE, GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
             Bukkit.getPluginManager().disablePlugin(this);
             return false;

bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneBootstrap.java

@@ -71,7 +71,7 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap {
 
     private GeyserCommandManager geyserCommandManager;
     private GeyserStandaloneConfiguration geyserConfig;
-    private GeyserStandaloneLogger geyserLogger;
+    private final GeyserStandaloneLogger geyserLogger = new GeyserStandaloneLogger();
     private IGeyserPingPassthrough geyserPingPassthrough;
     private GeyserStandaloneGUI gui;
     @Getter
@@ -181,8 +181,6 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap {
             }
         }
 
-        this.geyserLogger = new GeyserStandaloneLogger();
-
         if (useGui && gui == null) {
             gui = new GeyserStandaloneGUI(geyserLogger);
             gui.redirectSystemStreams();

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java

@@ -25,13 +25,13 @@
 
 package org.geysermc.geyser.platform.velocity;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.geysermc.geyser.GeyserLogger;
 import org.slf4j.Logger;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class GeyserVelocityLogger implements GeyserLogger {
     private final Logger logger;
     @Getter @Setter

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java

@@ -64,44 +64,44 @@ import java.util.UUID;
 
 @Plugin(id = "geyser", name = GeyserImpl.NAME + "-Velocity", version = GeyserImpl.VERSION, url = "https://geysermc.org", authors = "GeyserMC")
 public class GeyserVelocityPlugin implements GeyserBootstrap {
-    @Inject
-    private Logger logger;
-
-    @Inject
-    private ProxyServer proxyServer;
-
-    @Inject
-    private CommandManager commandManager;
 
+    private final ProxyServer proxyServer;
+    private final CommandManager commandManager;
+    private final GeyserVelocityLogger geyserLogger;
     private GeyserCommandManager geyserCommandManager;
     private GeyserVelocityConfiguration geyserConfig;
     private GeyserVelocityInjector geyserInjector;
-    private GeyserVelocityLogger geyserLogger;
     private IGeyserPingPassthrough geyserPingPassthrough;
-
     private GeyserImpl geyser;
 
     @Getter
     private final Path configFolder = Paths.get("plugins/" + GeyserImpl.NAME + "-Velocity/");
 
+    @Inject
+    public GeyserVelocityPlugin(ProxyServer server, Logger logger, CommandManager manager) {
+        this.geyserLogger = new GeyserVelocityLogger(logger);
+        this.proxyServer = server;
+        this.commandManager = manager;
+    }
+
     @Override
     public void onGeyserInitialize() {
         GeyserLocale.init(this);
 
         if (!ProtocolVersion.isSupported(GameProtocol.getJavaProtocolVersion())) {
-            logger.error("      / \\");
+            geyserLogger.error("      / \\");
-            logger.error("     /   \\");
+            geyserLogger.error("     /   \\");
-            logger.error("    /  |  \\");
+            geyserLogger.error("    /  |  \\");
-            logger.error("   /   |   \\    " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_proxy", proxyServer.getVersion().getName()));
+            geyserLogger.error("   /   |   \\    " + GeyserLocale.getLocaleStringLog("geyser.bootstrap.unsupported_proxy", proxyServer.getVersion().getName()));
-            logger.error("  /         \\   " + GeyserLocale.getLocaleStringLog("geyser.may_not_work_as_intended_all_caps"));
+            geyserLogger.error("  /         \\   " + GeyserLocale.getLocaleStringLog("geyser.may_not_work_as_intended_all_caps"));
-            logger.error(" /     o     \\");
+            geyserLogger.error(" /     o     \\");
-            logger.error("/_____________\\");
+            geyserLogger.error("/_____________\\");
         }
 
         if (!loadConfig()) {
             return;
         }
-        this.geyserLogger = new GeyserVelocityLogger(logger, geyserConfig.isDebugMode());
+        this.geyserLogger.setDebug(geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
         this.geyser = GeyserImpl.load(PlatformType.VELOCITY, this);
@@ -249,7 +249,7 @@ public class GeyserVelocityPlugin implements GeyserBootstrap {
                     "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()), this);
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserVelocityConfiguration.class);
         } catch (IOException ex) {
-            logger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
+            geyserLogger.error(GeyserLocale.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
             return false;
         }

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -770,6 +770,7 @@ public class GeyserImpl implements GeyserApi {
             return 0;
         }
 
+        //noinspection DataFlowIssue
         return Integer.parseInt(BUILD_NUMBER);
     }
 

core/src/main/java/org/geysermc/geyser/text/GeyserLocale.java

@@ -148,9 +148,9 @@ public class GeyserLocale {
                 } catch (IOException ignored) {}
             }
         } else {
-            if (GeyserImpl.getInstance() != null && !validLocalLanguage) {
+            if (!validLocalLanguage) {
                 // Don't warn on missing locales if a local file has been found
-                GeyserImpl.getInstance().getLogger().warning("Missing locale: " + locale);
+                bootstrap.getGeyserLogger().warning("Missing locale: " + locale);
             }
         }
 
@@ -162,12 +162,7 @@ public class GeyserLocale {
                 localeProp.load(stream);
             } catch (IOException e) {
                 String message = "Unable to load custom language override!";
-                if (GeyserImpl.getInstance() != null) {
+                bootstrap.getGeyserLogger().error(message, e);
-                    GeyserImpl.getInstance().getLogger().error(message, e);
-                } else {
-                    System.err.println(message);
-                    e.printStackTrace();
-                }
             }
 
             LOCALE_MAPPINGS.putIfAbsent(locale, localeProp);

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java

@@ -26,8 +26,8 @@
 package org.geysermc.geyser.translator.protocol.bedrock;
 
 import org.cloudburstmc.protocol.bedrock.packet.CommandRequestPacket;
-import org.geysermc.geyser.api.util.PlatformType;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.util.PlatformType;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -39,15 +39,17 @@ public class BedrockCommandRequestTranslator extends PacketTranslator<CommandReq
     @Override
     public void translate(GeyserSession session, CommandRequestPacket packet) {
         String command = MessageTranslator.convertToPlainText(packet.getCommand());
+        handleCommand(session, MessageTranslator.normalizeSpace(command).substring(1));
+    }
+
+    static void handleCommand(GeyserSession session, String command) {
         if (!(session.getGeyser().getPlatformType() == PlatformType.STANDALONE
-                && GeyserImpl.getInstance().commandManager().runCommand(session, command.substring(1)))) {
+                && GeyserImpl.getInstance().commandManager().runCommand(session, command))) {
             if (MessageTranslator.isTooLong(command, session)) {
                 return;
             }
 
-            // running commands via Bedrock's command select menu adds a trailing whitespace which Java doesn't like
+            session.sendCommand(command);
-            // https://github.com/GeyserMC/Geyser/issues/3877
-            session.sendCommand(command.substring(1).stripTrailing());
         }
     }
 }

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockTextTranslator.java

@@ -36,13 +36,22 @@ public class BedrockTextTranslator extends PacketTranslator<TextPacket> {
 
     @Override
     public void translate(GeyserSession session, TextPacket packet) {
-        String message = MessageTranslator.convertToPlainText(packet.getMessage());
+        // Java trims all messages, and then checks for the leading slash
+        String message = MessageTranslator.convertToPlainText(
+                MessageTranslator.normalizeSpace(packet.getMessage())
+        );
 
         if (message.isBlank()) {
             // Java Edition (as of 1.17.1) just doesn't pass on these messages, so... we won't either!
             return;
         }
 
+        if (message.startsWith("/")) {
+            // Yes, Java actually allows whitespaces before commands and will still see those as valid
+            BedrockCommandRequestTranslator.handleCommand(session, message.substring(1));
+            return;
+        }
+
         if (MessageTranslator.isTooLong(message, session)) {
             return;
         }

core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java

@@ -387,6 +387,39 @@ public class MessageTranslator {
         return false;
     }
 
+    /**
+     * Normalizes whitespaces - a thing a vanilla client apparently does with commands and chat messages.
+     */
+    public static String normalizeSpace(String string) {
+        if (string == null || string.isEmpty()) {
+            return string;
+        }
+        final int size = string.length();
+        final char[] newChars = new char[size];
+        int count = 0;
+        int whitespacesCount = 0;
+        boolean startWhitespaces = true;
+        for (int i = 0; i < size; i++) {
+            final char actualChar = string.charAt(i);
+            final boolean isWhitespace = Character.isWhitespace(actualChar);
+            if (isWhitespace) {
+                if (whitespacesCount == 0 && !startWhitespaces) {
+                    newChars[count++] = ' ';
+                }
+                whitespacesCount++;
+            } else {
+                startWhitespaces = false;
+                // Replace non-breaking spaces with regular spaces for normalization
+                newChars[count++] = (actualChar == '\u00A0' ? ' ' : actualChar);
+                whitespacesCount = 0;
+            }
+        }
+        if (startWhitespaces) {
+            return "";
+        }
+        return new String(newChars, 0, count - (whitespacesCount > 0 ? 1 : 0)).trim();
+    }
+
     public static void init() {
         // no-op
     }