World border improvements (#488)

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java

@@ -80,8 +80,28 @@ public class GeyserSpongeConfiguration implements GeyserConfiguration {
     }
 
     @Override
-    public boolean isPingPassthrough() {
-        return node.getNode("ping-passthrough").getBoolean(false);
+    public boolean isCommandSuggestions() {
+        return node.getNode("command-suggestions").getBoolean(true);
+    }
+
+    @Override
+    public boolean isPassthroughMotd() {
+        return node.getNode("passthrough-motd").getBoolean(false);
+    }
+
+    @Override
+    public boolean isPassthroughPlayerCounts() {
+        return node.getNode("passthrough-player-counts").getBoolean(false);
+    }
+
+    @Override
+    public boolean isLegacyPingPassthrough() {
+        return node.getNode("legacy-ping-passthrough").getBoolean(false);
+    }
+
+    @Override
+    public int getPingPassthroughInterval() {
+        return node.getNode("ping-passthrough-interval").getInt(3);
     }
 
     @Override
@@ -104,6 +124,11 @@ public class GeyserSpongeConfiguration implements GeyserConfiguration {
         return node.getNode("allow-third-party-capes").getBoolean(true);
     }
 
+    @Override
+    public boolean isAllowThirdPartyEars() {
+        return node.getNode("allow-third-party-ears").getBoolean(false);
+    }
+
     @Override
     public String getDefaultLocale() {
         return node.getNode("default-locale").getString("en_us");
@@ -119,6 +144,11 @@ public class GeyserSpongeConfiguration implements GeyserConfiguration {
         return node.getNode("cache-chunks").getBoolean(false);
     }
 
+    @Override
+    public boolean isAboveBedrockNetherBuilding() {
+        return node.getNode("above-bedrock-nether-building").getBoolean(false);
+    }
+
     @Override
     public SpongeMetricsInfo getMetrics() {
         return metricsInfo;
@@ -202,4 +232,9 @@ public class GeyserSpongeConfiguration implements GeyserConfiguration {
             return node.getNode("metrics").getNode("uuid").getString("generateduuid");
         }
     }
+
+    @Override
+    public int getConfigVersion() {
+        return node.getNode("config-version").getInt(0);
+    }
 }

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePingPassthrough.java

@@ -0,0 +1,99 @@
+/*
+ * 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.sponge;
+
+import org.geysermc.common.ping.GeyserPingInfo;
+import org.geysermc.connector.ping.IGeyserPingPassthrough;
+import org.spongepowered.api.MinecraftVersion;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.SpongeEventFactory;
+import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.cause.EventContext;
+import org.spongepowered.api.event.server.ClientPingServerEvent;
+import org.spongepowered.api.network.status.StatusClient;
+
+import java.lang.reflect.Method;
+import java.net.Inet4Address;
+import java.net.InetSocketAddress;
+import java.util.Optional;
+
+public class GeyserSpongePingPassthrough implements IGeyserPingPassthrough {
+
+    private static final GeyserStatusClient STATUS_CLIENT = new GeyserStatusClient();
+    private static final Cause CAUSE = Cause.of(EventContext.empty(), Sponge.getServer());
+
+    private static Method SpongeStatusResponse_create;
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    @Override
+    public GeyserPingInfo getPingInformation() {
+        // come on Sponge, this is in commons, why not expose it :(
+        ClientPingServerEvent event;
+        try {
+            if(SpongeStatusResponse_create == null) {
+                Class SpongeStatusResponse = Class.forName("org.spongepowered.common.network.status.SpongeStatusResponse");
+                Class MinecraftServer = Class.forName("net.minecraft.server.MinecraftServer");
+                SpongeStatusResponse_create = SpongeStatusResponse.getDeclaredMethod("create", MinecraftServer);
+            }
+
+            Object response = SpongeStatusResponse_create.invoke(null, Sponge.getServer());
+            event = SpongeEventFactory.createClientPingServerEvent(CAUSE, STATUS_CLIENT, (ClientPingServerEvent.Response) response);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+        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));
+        });
+        return geyserPingInfo;
+    }
+
+    @SuppressWarnings("NullableProblems")
+    private static class GeyserStatusClient implements StatusClient {
+
+        private static final InetSocketAddress FAKE_REMOTE = new InetSocketAddress(Inet4Address.getLoopbackAddress(), 69);
+
+        @Override
+        public InetSocketAddress getAddress() {
+            return FAKE_REMOTE;
+        }
+
+        @Override
+        public MinecraftVersion getVersion() {
+            return Sponge.getPlatform().getMinecraftVersion();
+        }
+
+        @Override
+        public Optional<InetSocketAddress> getVirtualHost() {
+            return Optional.empty();
+        }
+    }
+}

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java

@@ -30,9 +30,12 @@ import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.loader.ConfigurationLoader;
 import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 import org.geysermc.common.PlatformType;
+import org.geysermc.connector.GeyserConfiguration;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.bootstrap.GeyserBootstrap;
 import org.geysermc.connector.command.CommandManager;
+import org.geysermc.connector.ping.GeyserLegacyPingPassthrough;
+import org.geysermc.connector.ping.IGeyserPingPassthrough;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.platform.sponge.command.GeyserSpongeCommandExecutor;
 import org.geysermc.platform.sponge.command.GeyserSpongeCommandManager;
@@ -62,6 +65,7 @@ public class GeyserSpongePlugin implements GeyserBootstrap {
     private GeyserSpongeCommandManager geyserCommandManager;
     private GeyserSpongeConfiguration geyserConfig;
     private GeyserSpongeLogger geyserLogger;
+    private IGeyserPingPassthrough geyserSpongePingPassthrough;
 
     private GeyserConnector connector;
 
@@ -97,7 +101,7 @@ public class GeyserSpongePlugin implements GeyserBootstrap {
 
             // Don't change the ip if its listening on all interfaces
             // By default this should be 127.0.0.1 but may need to be changed in some circumstances
-            if (!javaAddr.getHostString().equals("0.0.0.0")) {
+            if (!javaAddr.getHostString().equals("0.0.0.0") && !javaAddr.getHostString().equals("")) {
                 serverIP.setValue("127.0.0.1");
             }
 
@@ -105,9 +109,16 @@ public class GeyserSpongePlugin implements GeyserBootstrap {
         }
 
         this.geyserLogger = new GeyserSpongeLogger(logger, geyserConfig.isDebugMode());
+        GeyserConfiguration.checkGeyserConfiguration(geyserConfig, geyserLogger);
         this.connector = GeyserConnector.start(PlatformType.SPONGE, this);
-        this.geyserCommandManager = new GeyserSpongeCommandManager(Sponge.getCommandManager(), connector);
 
+        if (geyserConfig.isLegacyPingPassthrough()) {
+            this.geyserSpongePingPassthrough = GeyserLegacyPingPassthrough.init(connector);
+        } else {
+            this.geyserSpongePingPassthrough = new GeyserSpongePingPassthrough();
+        }
+
+        this.geyserCommandManager = new GeyserSpongeCommandManager(Sponge.getCommandManager(), connector);
         Sponge.getCommandManager().register(this, new GeyserSpongeCommandExecutor(connector), "geyser");
     }
 
@@ -131,6 +142,11 @@ public class GeyserSpongePlugin implements GeyserBootstrap {
         return this.geyserCommandManager;
     }
 
+    @Override
+    public IGeyserPingPassthrough getGeyserPingPassthrough() {
+        return geyserSpongePingPassthrough;
+    }
+
     @Listener
     public void onServerStart(GameStartedServerEvent event) {
         onEnable();