Merge Master - Support 1.17

bundabrg · Jun 29, 2021 · 42aa097 · 42aa097
2 parents 9681e2e + 62174c0
commit 42aa097
Show file tree

Hide file tree

Showing 321 changed files with 8,016 additions and 5,132 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -92,8 +92,7 @@ pipeline {
         success {
             script {
                 if (env.BRANCH_NAME == 'master') {
-                    build propagate: false, wait: false, job: 'GeyserMC/Geyser-Fabric/java-1.16', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
-                    build propagate: false, wait: false, job: 'GeyserMC/GeyserAndroid/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
+                    build propagate: false, wait: false, job: 'GeyserMC/Geyser-Fabric/java-1.17', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                     build propagate: false, wait: false, job: 'GeyserMC/GeyserConnect/master', parameters: [booleanParam(name: 'SKIP_DISCORD', value: true)]
                 }
             }

diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ 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 joined us here!
 
-### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.220 and Minecraft Java v1.16.4 - v1.16.5.
+### Currently supporting Minecraft Bedrock 1.17 - 1.17.2 and Minecraft Java 1.17.
 
 ## Setting Up
-Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set up Geyser.
+Take a look [here](https://github.com/GeyserMC/Geyser/wiki/Setup) for how to set up Geyser.
 
 [![YouTube Video](https://img.youtube.com/vi/U7dZZ8w7Gi4/0.jpg)](https://www.youtube.com/watch?v=U7dZZ8w7Gi4)
 
@@ -39,13 +39,10 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set
 - Some Entity Flags
 - Structure block UI
 
-## What can't be fixed
-The following things cannot be fixed without changes to Bedrock. As of now, they are not fixable in Geyser.
+Extended height features can be "supported", but require additional work.
 
-- Custom heads in inventories
-- Clickable links in chat
-- Glowing effect
-- Custom armor stand poses
+## What can't be fixed
+There are a few things Geyser is unable to support due to various differences between Minecraft Bedrock and Java. For a list of these limitations, see the [Current Limitations](https://github.com/GeyserMC/Geyser/wiki/Current-Limitations) page.
 
 ## Compiling
 1. Clone the repo to your computer
@@ -58,6 +55,7 @@ Any contributions are appreciated. Please feel free to reach out to us on [Disco
 you're interested in helping out with Geyser.
 
 ## Libraries Used:
+- [Adventure Text Library](https://github.com/KyoriPowered/adventure)
 - [NukkitX Bedrock Protocol Library](https://github.com/NukkitX/Protocol)
 - [Steveice10's Java Protocol Library](https://github.com/Steveice10/MCProtocolLib)
 - [TerminalConsoleAppender](https://github.com/Minecrell/TerminalConsoleAppender)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
@@ -6,21 +6,21 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.16-R0.4-SNAPSHOT</version>
+            <version>1.16-R0.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -66,8 +66,10 @@
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.jackson</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
+                                    <!-- This is not used because relocating breaks natives, but we must include it
+                                     or else we get ClassDefNotFound -->
+                                    <pattern>io.netty.channel.kqueue</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.io.netty.channel.kqueue</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.reflections</pattern>
@@ -98,6 +100,15 @@
                         <excludes>
                             <exclude>com.google.code.gson:*</exclude>
                             <exclude>org.yaml:*</exclude>
+                            <exclude>io.netty:netty-transport-native-epoll:*</exclude>
+                            <exclude>io.netty:netty-transport-native-unix-common:*</exclude>
+                            <exclude>io.netty:netty-handler:*</exclude>
+                            <exclude>io.netty:netty-common:*</exclude>
+                            <exclude>io.netty:netty-buffer:*</exclude>
+                            <exclude>io.netty:netty-resolver:*</exclude>
+                            <exclude>io.netty:netty-transport:*</exclude>
+                            <exclude>io.netty:netty-codec:*</exclude>
+                            <exclude>io.netty:netty-resolver-dns:*</exclude>
                         </excludes>
                     </artifactSet>
                 </configuration>

diff --git a/.../bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java b/.../bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java
@@ -41,7 +41,7 @@ public final class GeyserBungeeConfiguration extends GeyserJacksonConfiguration
     private Path floodgateKeyPath;
 
     public void loadFloodgate(GeyserBungeePlugin plugin) {
-        Plugin floodgate = plugin.getProxy().getPluginManager().getPlugin("floodgate-bungee");
+        Plugin floodgate = plugin.getProxy().getPluginManager().getPlugin("floodgate");
         Path geyserDataFolder = plugin.getDataFolder().toPath();
         Path floodgateDataFolder = floodgate != null ? floodgate.getDataFolder().toPath() : null;
 

diff --git a/...strap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeDumpInfo.java b/...strap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeDumpInfo.java
@@ -32,17 +32,16 @@
 import org.geysermc.connector.dump.BootstrapDumpInfo;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 @Getter
 public class GeyserBungeeDumpInfo extends BootstrapDumpInfo {
-
-    private String platformName;
-    private String platformVersion;
-    private boolean onlineMode;
-    private List<ListenerInfo> listeners;
-    private List<PluginInfo> plugins;
+    private final String platformName;
+    private final String platformVersion;
+    private final boolean onlineMode;
+    private final List<ListenerInfo> listeners;
+    private final List<PluginInfo> plugins;
 
     GeyserBungeeDumpInfo(ProxyServer proxy) {
         super();
@@ -63,7 +62,7 @@ public class GeyserBungeeDumpInfo extends BootstrapDumpInfo {
         }
 
         for (Plugin plugin : proxy.getPluginManager().getPlugins()) {
-            this.plugins.add(new PluginInfo(true, plugin.getDescription().getName(), plugin.getDescription().getVersion(), plugin.getDescription().getMain(), Arrays.asList(plugin.getDescription().getAuthor())));
+            this.plugins.add(new PluginInfo(true, plugin.getDescription().getName(), plugin.getDescription().getVersion(), plugin.getDescription().getMain(), Collections.singletonList(plugin.getDescription().getAuthor())));
         }
     }
 }
diff --git a/...ungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePingPassthrough.java b/...ungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePingPassthrough.java
@@ -37,7 +37,6 @@
 import org.geysermc.connector.common.ping.GeyserPingInfo;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 
-import java.net.Inet4Address;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Arrays;
@@ -64,9 +63,8 @@ public GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
                 new GeyserPingInfo.Version(response.getVersion().getName(), response.getVersion().getProtocol())
         );
         if (event.getResponse().getPlayers().getSample() != null) {
-            Arrays.stream(event.getResponse().getPlayers().getSample()).forEach(proxiedPlayer -> {
-                geyserPingInfo.getPlayerList().add(proxiedPlayer.getName());
-            });
+            Arrays.stream(event.getResponse().getPlayers().getSample()).forEach(proxiedPlayer ->
+                    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
@@ -95,10 +95,16 @@ public void onEnable() {
         this.geyserLogger = new GeyserBungeeLogger(getLogger(), geyserConfig.isDebugMode());
         GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
 
-        if (geyserConfig.getRemote().getAuthType().equals("floodgate") && getProxy().getPluginManager().getPlugin("floodgate-bungee") == null) {
+        // Remove this in like a year
+        if (getProxy().getPluginManager().getPlugin("floodgate-bungee") != null) {
+            geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.outdated", "https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/"));
+            return;
+        }
+
+        if (geyserConfig.getRemote().getAuthType().equals("floodgate") && getProxy().getPluginManager().getPlugin("floodgate") == null) {
             geyserLogger.severe(LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.not_installed") + " " + LanguageUtils.getLocaleStringLog("geyser.bootstrap.floodgate.disabling"));
             return;
-        } else if (geyserConfig.isAutoconfiguredRemote() && getProxy().getPluginManager().getPlugin("floodgate-bungee") != null) {
+        } else if (geyserConfig.isAutoconfiguredRemote() && getProxy().getPluginManager().getPlugin("floodgate") != null) {
             // Floodgate installed means that the user wants Floodgate authentication
             geyserLogger.debug("Auto-setting to Floodgate authentication.");
             geyserConfig.getRemote().setAuthType("floodgate");

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
@@ -6,15 +6,22 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
+    <repositories>
+        <repository>
+            <id>viaversion-repo</id>
+            <url>https://repo.viaversion.com</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -24,15 +31,15 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>us.myles</groupId>
+            <groupId>com.viaversion</groupId>
             <artifactId>viaversion</artifactId>
-            <version>3.2.0</version>
+            <version>4.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc.geyser.adapters</groupId>
             <artifactId>spigot-all</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -68,10 +75,6 @@
                         </goals>
                         <configuration>
                             <relocations>
-                                <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.netty</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.fastutil</shadedPattern>
@@ -100,6 +103,10 @@
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.kyori</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.asm</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -109,6 +116,20 @@
                         <excludes>
                             <exclude>com.google.code.gson:*</exclude>
                             <exclude>org.yaml:*</exclude>
+                            <!-- We cannot shade Netty, or else native libraries will not load -->
+                            <!-- Needed because older Spigot builds do not provide the haproxy module -->
+                            <exclude>io.netty:netty-transport-native-epoll:*</exclude>
+                            <exclude>io.netty:netty-transport-native-unix-common:*</exclude>
+                            <exclude>io.netty:netty-transport-native-kqueue:*</exclude>
+                            <exclude>io.netty:netty-handler:*</exclude>
+                            <exclude>io.netty:netty-common:*</exclude>
+                            <exclude>io.netty:netty-buffer:*</exclude>
+                            <exclude>io.netty:netty-resolver:*</exclude>
+                            <exclude>io.netty:netty-transport:*</exclude>
+                            <exclude>io.netty:netty-codec:*</exclude>
+                            <exclude>io.netty:netty-codec-dns:*</exclude>
+                            <exclude>io.netty:netty-resolver-dns:*</exclude>
+                            <exclude>io.netty:netty-resolver-dns-native-macos:*</exclude>
                         </excludes>
                     </artifactSet>
                 </configuration>

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java
@@ -42,15 +42,10 @@ public final class GeyserSpigotConfiguration extends GeyserJacksonConfiguration
     private Path floodgateKeyPath;
 
     public void loadFloodgate(GeyserSpigotPlugin plugin) {
-        Plugin floodgate = Bukkit.getPluginManager().getPlugin("floodgate-bukkit");
+        Plugin floodgate = Bukkit.getPluginManager().getPlugin("floodgate");
         Path geyserDataFolder = plugin.getDataFolder().toPath();
         Path floodgateDataFolder = floodgate != null ? floodgate.getDataFolder().toPath() : null;
 
         floodgateKeyPath = FloodgateKeyLoader.getKeyPath(this, floodgate, floodgateDataFolder, geyserDataFolder, plugin.getGeyserLogger());
     }
-
-    @Override
-    public boolean isCacheChunks() {
-        return true; // We override this as with Bukkit, we have direct access to the server implementation
-    }
 }
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotDumpInfo.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotDumpInfo.java
@@ -37,13 +37,13 @@
 @Getter
 public class GeyserSpigotDumpInfo extends BootstrapDumpInfo {
 
-    private String platformName;
-    private String platformVersion;
-    private String platformAPIVersion;
-    private boolean onlineMode;
-    private String serverIP;
-    private int serverPort;
-    private List<PluginInfo> plugins;
+    private final String platformName;
+    private final String platformVersion;
+    private final String platformAPIVersion;
+    private final boolean onlineMode;
+    private final String serverIP;
+    private final int serverPort;
+    private final List<PluginInfo> plugins;
 
     GeyserSpigotDumpInfo() {
         super();

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
@@ -34,6 +34,7 @@
 import org.geysermc.connector.common.ping.GeyserPingInfo;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 
+import javax.annotation.Nonnull;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Collections;
@@ -72,9 +73,10 @@ public GeyserPingEvent(InetAddress address, String motd, int numPlayers, int max
         public void setServerIcon(CachedServerIcon icon) throws IllegalArgumentException, UnsupportedOperationException {
         }
 
+        @Nonnull
         @Override
         public Iterator<Player> iterator() throws UnsupportedOperationException {
-            return Collections.EMPTY_LIST.iterator();
+            return Collections.emptyIterator();
         }
     }