Merge branch 'feature/1.16' into feature/plugins

# Conflicts: # connector/src/main/java/org/geysermc/connector/GeyserConnector.java # connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
bundabrg · Jul 6, 2020 · 58545e3 · 58545e3
2 parents 5583373 + afcf1e3
commit 58545e3
Show file tree

Hide file tree

Showing 126 changed files with 2,700 additions and 947 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,7 @@
 [submodule "connector/src/main/resources/mappings"]
 	path = connector/src/main/resources/mappings
 	url = https://github.com/GeyserMC/mappings.git
-	branch = feature/1.16
+    branch = feature/1.16
+[submodule "connector/src/main/resources/languages"]
+	path = connector/src/main/resources/languages
+	url = https://github.com/GeyserMC/languages.git
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have now joined us here!
 
-### Currently supporting Minecraft Bedrock v1.16.0 and Minecraft Java v1.16.1.
+### Currently supporting Minecraft Bedrock v1.16.0/1 and Minecraft Java v1.16.1.
 
 ## Setting Up
 Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set up Geyser.

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...ungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePingPassthrough.java b/...ungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePingPassthrough.java
@@ -60,14 +60,15 @@ public GeyserPingInfo getPingInformation() {
             else future.complete(event);
         }));
         ProxyPingEvent event = future.join();
+        ServerPing response = event.getResponse();
         GeyserPingInfo geyserPingInfo = new GeyserPingInfo(
-                event.getResponse().getDescription(),
-                event.getResponse().getPlayers().getOnline(),
-                event.getResponse().getPlayers().getMax()
+                response.getDescriptionComponent().toLegacyText(),
+                new GeyserPingInfo.Players(response.getPlayers().getMax(), response.getPlayers().getOnline()),
+                new GeyserPingInfo.Version(response.getVersion().getName(), response.getVersion().getProtocol())
         );
         if (event.getResponse().getPlayers().getSample() != null) {
             Arrays.stream(event.getResponse().getPlayers().getSample()).forEach(proxiedPlayer -> {
-                geyserPingInfo.addPlayer(proxiedPlayer.getName());
+                geyserPingInfo.getPlayerList().add(proxiedPlayer.getName());
             });
         }
         return geyserPingInfo;

diff --git a/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java b/bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java
@@ -39,6 +39,7 @@
 import org.geysermc.connector.ping.GeyserLegacyPingPassthrough;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.connector.utils.LanguageUtils;
 import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandExecutor;
 import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandManager;
 
@@ -71,7 +72,7 @@ public void onEnable() {
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserBungeeConfiguration.class);
             configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
         } catch (IOException ex) {
-            getLogger().log(Level.WARNING, "Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
+            getLogger().log(Level.WARNING, LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
         }
 
@@ -93,7 +94,7 @@ public void onEnable() {
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && getProxy().getPluginManager().getPlugin("floodgate-bungee") == null) {
-            geyserLogger.severe("Auth type set to Floodgate but Floodgate not found! Disabling...");
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             return;
         }
 

diff --git a/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java b/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
@@ -33,6 +33,8 @@
 
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.GeyserCommand;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.utils.LanguageUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,7 +54,14 @@ public void execute(CommandSender sender, String[] args) {
         if (args.length > 0) {
             if (getCommand(args[0]) != null) {
                 if (!sender.hasPermission(getCommand(args[0]).getPermission())) {
-                    sender.sendMessage(TextComponent.fromLegacyText(ChatColor.RED + "You do not have permission to execute this command!"));
+                    String message = "";
+                    if (sender instanceof GeyserSession) {
+                        message = LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", ((GeyserSession) sender).getClientData().getLanguageCode());
+                    } else {
+                        message = LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail");
+                    }
+
+                    sender.sendMessage(TextComponent.fromLegacyText(ChatColor.RED + message));
                     return;
                 }
                 getCommand(args[0]).execute(new BungeeCommandSender(sender), args);

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
     <repositories>
         <repository>

diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPingPassthrough.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPingPassthrough.java
@@ -26,6 +26,7 @@
 
 package org.geysermc.platform.spigot;
 
+import com.github.steveice10.mc.protocol.MinecraftConstants;
 import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -48,14 +49,15 @@ public GeyserPingInfo getPingInformation() {
         try {
             ServerListPingEvent event = new GeyserPingEvent(InetAddress.getLocalHost(), Bukkit.getMotd(), Bukkit.getOnlinePlayers().size(), Bukkit.getMaxPlayers());
             Bukkit.getPluginManager().callEvent(event);
-            GeyserPingInfo geyserPingInfo = new GeyserPingInfo(event.getMotd(), event.getNumPlayers(), event.getMaxPlayers());
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                geyserPingInfo.addPlayer(player.getName());
-            });
+            GeyserPingInfo geyserPingInfo = new GeyserPingInfo(event.getMotd(),
+                    new GeyserPingInfo.Players(event.getMaxPlayers(), event.getNumPlayers()),
+                    new GeyserPingInfo.Version(Bukkit.getVersion(), MinecraftConstants.PROTOCOL_VERSION) // thanks Spigot for not exposing this, just default to latest
+            );
+            Bukkit.getOnlinePlayers().stream().map(Player::getName).forEach(geyserPingInfo.getPlayerList()::add);
             return geyserPingInfo;
         } catch (Exception e) {
             logger.debug("Error while getting Bukkit ping passthrough: " + e.toString());
-            return new GeyserPingInfo(null, 0, 0);
+            return new GeyserPingInfo(null, null, null);
         }
     }
 

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java
@@ -37,6 +37,7 @@
 import org.geysermc.connector.ping.GeyserLegacyPingPassthrough;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.connector.utils.LanguageUtils;
 import org.geysermc.platform.spigot.command.GeyserSpigotCommandExecutor;
 import org.geysermc.platform.spigot.command.GeyserSpigotCommandManager;
 import org.geysermc.platform.spigot.world.GeyserSpigotBlockPlaceListener;
@@ -68,15 +69,15 @@ public void onEnable() {
                 getDataFolder().mkdir();
                 File bukkitConfig = new File("plugins/Geyser-Bukkit/config.yml");
                 if (bukkitConfig.exists()) { // Copy over old configs
-                    getLogger().log(Level.INFO, "Existing config found in the Geyser-Bukkit folder; copying over...");
+                    getLogger().log(Level.INFO, LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.copy_bukkit_config"));
                     Files.copy(bukkitConfig.toPath(), new File(getDataFolder().toString() + "/config.yml").toPath());
-                    getLogger().log(Level.INFO, "Copied!");
+                    getLogger().log(Level.INFO, LanguageUtils.getLocaleStringLog("geyser.bootstrap.config.copied_bukkit_config"));
                 }
             }
             File configFile = FileUtils.fileOrCopiedFromResource(new File(getDataFolder(), "config.yml"), "config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()));
             this.geyserConfig = FileUtils.loadConfig(configFile, GeyserSpigotConfiguration.class);
         } catch (IOException ex) {
-            getLogger().log(Level.WARNING, "Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
+            getLogger().log(Level.WARNING, LanguageUtils.getLocaleStringLog("geyser.config.failed"), ex);
             ex.printStackTrace();
         }
 
@@ -92,7 +93,7 @@ public void onEnable() {
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
         if (geyserConfig.getRemote().getAuthType().equals("floodgate") && Bukkit.getPluginManager().getPlugin("floodgate-bukkit") == null) {
-            geyserLogger.severe("Auth type set to Floodgate but Floodgate not found! Disabling...");
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             this.getPluginLoader().disablePlugin(this);
             return;
         }

diff --git a/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java b/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java
@@ -26,13 +26,14 @@
 package org.geysermc.platform.spigot.command;
 
 import lombok.AllArgsConstructor;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.GeyserCommand;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.utils.LanguageUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -48,7 +49,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         if (args.length > 0) {
             if (getCommand(args[0]) != null) {
                 if (!sender.hasPermission(getCommand(args[0]).getPermission())) {
-                    sender.sendMessage(ChatColor.RED + "You do not have permission to execute this command!");
+                    String message = "";
+                    if (sender instanceof GeyserSession) {
+                        message = LanguageUtils.getPlayerLocaleString("geyser.bootstrap.command.permission_fail", ((GeyserSession) sender).getClientData().getLanguageCode());
+                    } else {
+                        message = LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail");
+                    }
+
+                    sender.sendMessage(ChatColor.RED + message);
                     return true;
                 }
                 getCommand(args[0]).execute(new SpigotCommandSender(sender), args);

diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>bootstrap-sponge</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePingPassthrough.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePingPassthrough.java
@@ -26,6 +26,7 @@
 
 package org.geysermc.platform.sponge;
 
+import com.github.steveice10.mc.protocol.MinecraftConstants;
 import org.geysermc.connector.common.ping.GeyserPingInfo;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.spongepowered.api.MinecraftVersion;
@@ -35,6 +36,7 @@
 import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.event.server.ClientPingServerEvent;
 import org.spongepowered.api.network.status.StatusClient;
+import org.spongepowered.api.profile.GameProfile;
 
 import java.lang.reflect.Method;
 import java.net.Inet4Address;
@@ -68,11 +70,18 @@ public GeyserPingInfo getPingInformation() {
         Sponge.getEventManager().post(event);
         GeyserPingInfo geyserPingInfo = new GeyserPingInfo(
                 event.getResponse().getDescription().toPlain(),
-                event.getResponse().getPlayers().orElseThrow(IllegalStateException::new).getOnline(),
-                event.getResponse().getPlayers().orElseThrow(IllegalStateException::new).getMax());
-        event.getResponse().getPlayers().get().getProfiles().forEach(player -> {
-            geyserPingInfo.addPlayer(player.getName().orElseThrow(IllegalStateException::new));
-        });
+                new GeyserPingInfo.Players(
+                        event.getResponse().getPlayers().orElseThrow(IllegalStateException::new).getMax(),
+                        event.getResponse().getPlayers().orElseThrow(IllegalStateException::new).getOnline()
+                ),
+                new GeyserPingInfo.Version(
+                        event.getResponse().getVersion().getName(),
+                        MinecraftConstants.PROTOCOL_VERSION) // thanks for also not exposing this sponge
+                );
+        event.getResponse().getPlayers().get().getProfiles().stream()
+                .map(GameProfile::getName)
+                .map(op -> op.orElseThrow(IllegalStateException::new))
+                .forEach(geyserPingInfo.getPlayerList()::add);
         return geyserPingInfo;
     }
 

diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java
@@ -38,6 +38,7 @@
 import org.geysermc.connector.ping.GeyserLegacyPingPassthrough;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.connector.utils.LanguageUtils;
 import org.geysermc.platform.sponge.command.GeyserSpongeCommandExecutor;
 import org.geysermc.platform.sponge.command.GeyserSpongeCommandManager;
 import org.slf4j.Logger;
@@ -80,7 +81,7 @@ public void onEnable() {
         try {
             configFile = FileUtils.fileOrCopiedFromResource(new File(configDir, "config.yml"), "config.yml", (file) -> file.replaceAll("generateduuid", UUID.randomUUID().toString()));
         } catch (IOException ex) {
-            logger.warn("Failed to copy config.yml from jar path!");
+            logger.warn(LanguageUtils.getLocaleStringLog("geyser.config.failed"));
             ex.printStackTrace();
         }
 
@@ -90,7 +91,7 @@ public void onEnable() {
             config = loader.load();
             this.geyserConfig = new GeyserSpongeConfiguration(configDir, config);
         } catch (IOException ex) {
-            logger.warn("Failed to load config.yml!");
+            logger.warn(LanguageUtils.getLocaleStringLog("geyser.config.failed"));
             ex.printStackTrace();
             return;
         }

diff --git a/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java b/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java
@@ -26,10 +26,10 @@
 package org.geysermc.platform.sponge.command;
 
 import lombok.AllArgsConstructor;
-
-import org.geysermc.connector.common.ChatColor;
 import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.common.ChatColor;
 import org.geysermc.connector.command.GeyserCommand;
+import org.geysermc.connector.utils.LanguageUtils;
 import org.spongepowered.api.command.CommandCallable;
 import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
@@ -55,7 +55,8 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
         if (args.length > 0) {
             if (getCommand(args[0]) != null) {
                 if (!source.hasPermission(getCommand(args[0]).getPermission())) {
-                    source.sendMessage(Text.of(ChatColor.RED + "You do not have permission to execute this command!"));
+                    // Not ideal to use log here but we dont get a session
+                    source.sendMessage(Text.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail")));
                     return CommandResult.success();
                 }
                 getCommand(args[0]).execute(new SpongeCommandSender(source), args);

diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
@@ -6,21 +6,21 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.minecrell</groupId>
             <artifactId>terminalconsoleappender</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>