Merge branch 'master' into plugin

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserConfiguration.java

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import org.geysermc.common.IGeyserConfiguration;
 
+import java.io.File;
 import java.util.Map;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -61,6 +62,11 @@ public class GeyserConfiguration implements IGeyserConfiguration {
 
     private MetricsInfo metrics;
 
+    @Override
+    public File getFloodgateKeyFile() {
+        return new File(floodgateKeyFile);
+    }
+
     @Getter
     public static class BedrockConfiguration implements IBedrockConfiguration {
 

connector/pom.xml

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.github.steveice10</groupId>
             <artifactId>mcprotocollib</artifactId>
-            <version>1.15.1-1-SNAPSHOT</version>
+            <version>1.15.2-1-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

connector/src/main/resources/config.yml

@@ -20,7 +20,7 @@ remote:
   address: 127.0.0.1
   # The port of the remote (Java Edition) server
   port: 25565
-  # Authentication type. Can be offline, online, or floodgate (see the wiki).
+  # Authentication type. Can be offline, online, or floodgate (see https://github.com/GeyserMC/Geyser/wiki/Floodgate).
   auth-type: online
 
 # Floodgate uses encryption to ensure use from authorised sources.