Implement workaround for out of order StartGame packet

.github/workflows/pullrequest.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/cache@v1
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -24,31 +24,31 @@ jobs:
       - name: Build with Maven
         run: mvn -B package
       - name: Archive artifacts (Geyser Standalone)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Standalone
           path: bootstrap/standalone/target/Geyser.jar
-      - name: Archive artifacts (Geyser Bukkit)
-        uses: actions/upload-artifact@v1
+      - name: Archive artifacts (Geyser Spigot)
+        uses: actions/upload-artifact@v2
         if: success()
         with:
-          name: Geyser Bukkit
-          path: bootstrap/bukkit/target/Geyser-Bukkit.jar
+          name: Geyser Spigot
+          path: bootstrap/spigot/target/Geyser-Spigot.jar
       - name: Archive artifacts (Geyser BungeeCord)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser BungeeCord
           path: bootstrap/bungeecord/target/Geyser-BungeeCord.jar
       - name: Archive artifacts (Geyser Sponge)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Sponge
           path: bootstrap/sponge/target/Geyser-Sponge.jar
       - name: Archive artifacts (Geyser Velocity)
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         if: success()
         with:
           name: Geyser Velocity

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "connector/src/main/resources/mappings"]
 	path = connector/src/main/resources/mappings
 	url = https://github.com/GeyserMC/mappings.git
+	branch = feature/1.16

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.14.6(0) and Minecraft Java v1.15.2.
+### Currently supporting Minecraft Bedrock v1.16.0 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.

bootstrap/bungeecord/pom.xml

@@ -65,6 +65,10 @@
                                     <pattern>io.netty</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.reflections.reflections</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeDumpInfo.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Geyser
+ *
+ */
+
+package org.geysermc.platform.bungeecord;
+
+import lombok.Getter;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.plugin.Plugin;
+import org.geysermc.connector.dump.BootstrapDumpInfo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+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;
+
+    GeyserBungeeDumpInfo(ProxyServer proxy) {
+        super();
+        this.platformName = proxy.getName();
+        this.platformVersion = proxy.getVersion();
+        this.onlineMode = proxy.getConfig().isOnlineMode();
+        this.listeners = new ArrayList<>();
+        this.plugins = new ArrayList<>();
+
+        for (net.md_5.bungee.api.config.ListenerInfo listener : proxy.getConfig().getListeners()) {
+            this.listeners.add(new ListenerInfo(listener.getHost().getHostString(), listener.getHost().getPort()));
+        }
+
+        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())));
+        }
+    }
+}

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeMain.java

@@ -26,7 +26,7 @@
 
 package org.geysermc.platform.bungeecord;
 
-import org.geysermc.common.main.IGeyserMain;
+import org.geysermc.connector.common.main.IGeyserMain;
 
 public class GeyserBungeeMain extends IGeyserMain {
 

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePingPassthrough.java

@@ -35,7 +35,7 @@
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import org.geysermc.common.ping.GeyserPingInfo;
+import org.geysermc.connector.common.ping.GeyserPingInfo;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 
 import java.net.Inet4Address;

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

@@ -30,11 +30,12 @@
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
-import org.geysermc.common.PlatformType;
+import org.geysermc.connector.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.bootstrap.GeyserBootstrap;
 import org.geysermc.connector.command.CommandManager;
 import org.geysermc.connector.configuration.GeyserConfiguration;
+import org.geysermc.connector.dump.BootstrapDumpInfo;
 import org.geysermc.connector.ping.GeyserLegacyPingPassthrough;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
@@ -140,4 +141,9 @@ public IGeyserPingPassthrough getGeyserPingPassthrough() {
     public Path getConfigFolder() {
         return getDataFolder().toPath();
     }
+
+    @Override
+    public BootstrapDumpInfo getDumpInfo() {
+        return new GeyserBungeeDumpInfo(getProxy());
+    }
 }

bootstrap/pom.xml

@@ -35,8 +35,8 @@
         </repository>
     </repositories>
     <modules>
-        <module>bukkit</module>
         <module>bungeecord</module>
+        <module>spigot</module>
         <module>sponge</module>
         <module>standalone</module>
         <module>velocity</module>

bootstrap/bukkit/pom.xml → bootstrap/spigot/pom.xml

@@ -9,7 +9,7 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
-    <artifactId>bootstrap-bukkit</artifactId>
+    <artifactId>bootstrap-spigot</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
@@ -26,12 +26,12 @@
         <dependency>
             <groupId>us.myles</groupId>
             <artifactId>viaversion</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
-        <finalName>${outputName}-Bukkit</finalName>
+        <finalName>${outputName}-Spigot</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources/</directory>
@@ -46,7 +46,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Main-Class>org.geysermc.platform.bukkit.GeyserBukkitMain</Main-Class>
+                            <Main-Class>org.geysermc.platform.spigot.GeyserSpigotMain</Main-Class>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -65,15 +65,19 @@
                             <relocations>
                                 <relocation>
                                     <pattern>io.netty</pattern>
-                                    <shadedPattern>org.geysermc.platform.bukkit.shaded.netty</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.netty</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>it.unimi.dsi.fastutil</pattern>
-                                    <shadedPattern>org.geysermc.platform.bukkit.shaded.fastutil</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.fastutil</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.fasterxml.jackson</pattern>
-                                    <shadedPattern>org.geysermc.platform.bukkit.shaded.jackson</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.reflections.reflections</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java → bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotConfiguration.java

@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.platform.bukkit;
+package org.geysermc.platform.spigot;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -38,14 +38,14 @@
 
 @Getter
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GeyserBukkitConfiguration extends GeyserJacksonConfiguration {
+public class GeyserSpigotConfiguration extends GeyserJacksonConfiguration {
 
     @JsonProperty("floodgate-key-file")
     private String floodgateKeyFile;
 
     private Path floodgateKey;
 
-    public void loadFloodgate(GeyserBukkitPlugin plugin) {
+    public void loadFloodgate(GeyserSpigotPlugin plugin) {
         Plugin floodgate = Bukkit.getPluginManager().getPlugin("floodgate-bukkit");
         floodgateKey = FloodgateKeyLoader.getKey(plugin.getGeyserLogger(), this, Paths.get(plugin.getDataFolder().toString(), plugin.getConfig().getString("floodgate-key-file", "public-key.pem")), floodgate, floodgate != null ? floodgate.getDataFolder().toPath() : null);
     }

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotDumpInfo.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Geyser
+ *
+ */
+
+package org.geysermc.platform.spigot;
+
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.geysermc.connector.dump.BootstrapDumpInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@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;
+
+    GeyserSpigotDumpInfo() {
+        super();
+        this.platformName = Bukkit.getName();
+        this.platformVersion = Bukkit.getVersion();
+        this.platformAPIVersion = Bukkit.getBukkitVersion();
+        this.onlineMode = Bukkit.getOnlineMode();
+        this.serverIP = Bukkit.getIp();
+        this.serverPort = Bukkit.getPort();
+        this.plugins = new ArrayList<>();
+
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+            this.plugins.add(new PluginInfo(plugin.isEnabled(), plugin.getName(), plugin.getDescription().getVersion(), plugin.getDescription().getMain(), plugin.getDescription().getAuthors()));
+        }
+    }
+}

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java → bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotLogger.java

@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.platform.bukkit;
+package org.geysermc.platform.spigot;
 
 import lombok.AllArgsConstructor;
 
@@ -33,7 +33,7 @@
 import java.util.logging.Logger;
 
 @AllArgsConstructor
-public class GeyserBukkitLogger implements GeyserLogger {
+public class GeyserSpigotLogger implements GeyserLogger {
 
     private Logger logger;
     private boolean debugMode;

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitMain.java → bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotMain.java

@@ -24,14 +24,14 @@
  *
  */
 
-package org.geysermc.platform.bukkit;
+package org.geysermc.platform.spigot;
 
-import org.geysermc.common.main.IGeyserMain;
+import org.geysermc.connector.common.main.IGeyserMain;
 
-public class GeyserBukkitMain extends IGeyserMain {
+public class GeyserSpigotMain extends IGeyserMain {
 
     public static void main(String[] args) {
-        new GeyserBukkitMain().displayMessage();
+        new GeyserSpigotMain().displayMessage();
     }
 
     public String getPluginType() {