Configuration updates (#653)

* Configuration updates

The main feature of this commit is switching Bukkit and BungeeCord to using Jackson configuration. This allows comments to load. Along with this, the Jackson configs have been consolidated into one abstract class, and a check is made to ensure auth-type cannot be set to Floodgate if Floodgate is not installed.

* Add deleted file; remove imports

* Re-add changing of Bukkit port

* Alphabetize import

* Alphabetize Bungee import

* Updates

* Swap values in GeyserJacksonConfiguration

* Add a null check for GeyserConnector in Bukkit's onDisable

connector/src/main/java/org/geysermc/connector/FloodgateKeyLoader.java

@@ -26,6 +26,8 @@
 
 package org.geysermc.connector;
 
+import org.geysermc.connector.configuration.GeyserConfiguration;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 

connector/src/main/java/org/geysermc/connector/GeyserConnector.java

@@ -35,6 +35,7 @@ import org.geysermc.common.AuthType;
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.bootstrap.GeyserBootstrap;
 import org.geysermc.connector.command.CommandManager;
+import org.geysermc.connector.configuration.GeyserConfiguration;
 import org.geysermc.connector.metrics.Metrics;
 import org.geysermc.connector.network.ConnectorServerEventHandler;
 import org.geysermc.connector.network.remote.RemoteServer;

connector/src/main/java/org/geysermc/connector/bootstrap/GeyserBootstrap.java

@@ -27,7 +27,7 @@
 package org.geysermc.connector.bootstrap;
 
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
-import org.geysermc.connector.GeyserConfiguration;
+import org.geysermc.connector.configuration.GeyserConfiguration;
 import org.geysermc.connector.GeyserLogger;
 import org.geysermc.connector.command.CommandManager;
 import org.geysermc.connector.network.translators.world.CachedChunkManager;

connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java

@@ -24,7 +24,9 @@
  *
  */
 
-package org.geysermc.connector;
+package org.geysermc.connector.configuration;
+
+import org.geysermc.connector.GeyserLogger;
 
 import java.nio.file.Path;
 import java.util.Map;

connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java

@@ -0,0 +1,135 @@
+/*
+ * 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.connector.configuration;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.nio.file.Path;
+import java.util.Map;
+
+@Getter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public abstract class GeyserJacksonConfiguration implements GeyserConfiguration {
+
+    private BedrockConfiguration bedrock;
+    private RemoteConfiguration remote;
+
+    @JsonProperty("floodgate-key-file")
+    private String floodgateKeyFile;
+
+    public abstract Path getFloodgateKeyFile();
+
+    private Map<String, UserAuthenticationInfo> userAuths;
+
+    @JsonProperty("command-suggestions")
+    private boolean commandSuggestions;
+
+    @JsonProperty("passthrough-motd")
+    private boolean isPassthroughMotd;
+
+    @JsonProperty("passthrough-player-counts")
+    private boolean isPassthroughPlayerCounts;
+
+    @JsonProperty("legacy-ping-passthrough")
+    private boolean isLegacyPingPassthrough;
+
+    @JsonProperty("ping-passthrough-interval")
+    private int pingPassthroughInterval;
+
+    @JsonProperty("max-players")
+    private int maxPlayers;
+
+    @JsonProperty("debug-mode")
+    private boolean debugMode;
+
+    @JsonProperty("general-thread-pool")
+    private int generalThreadPool;
+
+    @JsonProperty("allow-third-party-capes")
+    private boolean allowThirdPartyCapes;
+
+    @JsonProperty("allow-third-party-ears")
+    private boolean allowThirdPartyEars;
+
+    @JsonProperty("default-locale")
+    private String defaultLocale;
+
+    @JsonProperty("cache-chunks")
+    private boolean cacheChunks;
+
+    @JsonProperty("above-bedrock-nether-building")
+    private boolean aboveBedrockNetherBuilding;
+
+    private MetricsInfo metrics;
+
+    @Getter
+    public static class BedrockConfiguration implements IBedrockConfiguration {
+
+        private String address;
+        private int port;
+
+        private String motd1;
+        private String motd2;
+    }
+
+    @Getter
+    public static class RemoteConfiguration implements IRemoteConfiguration {
+
+        @Setter
+        private String address;
+
+        @Setter
+        private int port;
+
+        private String motd1;
+        private String motd2;
+
+        @JsonProperty("auth-type")
+        private String authType;
+    }
+
+    @Getter
+    public static class UserAuthenticationInfo implements IUserAuthenticationInfo {
+        private String email;
+        private String password;
+    }
+
+    @Getter
+    public static class MetricsInfo implements IMetricsInfo {
+
+        private boolean enabled;
+
+        @JsonProperty("uuid")
+        private String uniqueId;
+    }
+
+    @JsonProperty("config-version")
+    private int configVersion;
+}

connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java

@@ -31,7 +31,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import org.geysermc.common.ping.GeyserPingInfo;
 import org.geysermc.connector.ping.IGeyserPingPassthrough;
-import org.geysermc.connector.GeyserConfiguration;
+import org.geysermc.connector.configuration.GeyserConfiguration;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.utils.MessageUtils;

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -28,7 +28,7 @@ package org.geysermc.connector.network;
 import com.nukkitx.protocol.bedrock.BedrockPacket;
 import com.nukkitx.protocol.bedrock.packet.*;
 import org.geysermc.common.AuthType;
-import org.geysermc.connector.GeyserConfiguration;
+import org.geysermc.connector.configuration.GeyserConfiguration;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslatorRegistry;

connector/src/main/java/org/geysermc/connector/ping/GeyserLegacyPingPassthrough.java

@@ -33,9 +33,7 @@ import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoHandler;
 import com.github.steveice10.packetlib.Client;
 import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
 import org.geysermc.common.ping.GeyserPingInfo;
-import org.geysermc.connector.GeyserConfiguration;
 import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.GeyserLogger;
 
 import java.util.concurrent.TimeUnit;