pull down of QueryHandler into NetworkManager

src/main/java/org/cloudburstmc/server/CloudServer.java

@@ -12,7 +12,6 @@
 import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin;
 import com.nukkitx.protocol.bedrock.packet.PlayerListPacket;
 import com.spotify.futures.CompletableFutures;
-import io.netty.buffer.ByteBuf;
 import lombok.extern.log4j.Log4j2;
 import net.daporkchop.ldbjni.LevelDB;
 import org.cloudburstmc.api.Server;
@@ -47,10 +46,8 @@
 import org.cloudburstmc.server.locale.TranslationContainer;
 import org.cloudburstmc.server.math.NukkitMath;
 import org.cloudburstmc.server.metrics.CloudMetrics;
-import org.cloudburstmc.server.network.BedrockInterface;
 import org.cloudburstmc.server.network.NetworkManager;
 import org.cloudburstmc.server.network.ProtocolInfo;
-import org.cloudburstmc.server.network.query.QueryHandler;
 import org.cloudburstmc.server.pack.PackManager;
 import org.cloudburstmc.server.permission.BanEntry;
 import org.cloudburstmc.server.permission.BanList;
@@ -178,8 +175,6 @@ public class CloudServer implements Server {
 
     private final Set<UUID> uniquePlayers = new HashSet<>();
 
-    private QueryHandler queryHandler;
-
     private QueryRegenerateEvent queryRegenerateEvent;
     private CloudburstYaml cloudburstYaml;
 
@@ -689,9 +684,6 @@ public void forceShutdown() {
     }
 
     public void start() {
-        if (this.serverProperties.isEnableQuery()) {
-            this.queryHandler = new QueryHandler();
-        }
 
         for (BanEntry entry : this.getIPBans().getEntires().values()) {
             try {
@@ -712,26 +704,6 @@ public void start() {
         this.forceShutdown();
     }
 
-    public void handlePacket(InetSocketAddress address, ByteBuf payload) {
-        try {
-            if (!payload.isReadable(3)) {
-                return;
-            }
-            byte[] prefix = new byte[2];
-            payload.readBytes(prefix);
-
-            if (!Arrays.equals(prefix, new byte[]{(byte) 0xfe, (byte) 0xfd})) {
-                return;
-            }
-            if (this.queryHandler != null) {
-                this.queryHandler.handle(address, payload);
-            }
-        } catch (Exception e) {
-            log.error("Error whilst handling packet", e);
-            this.networkManager.blockAddress(address.getAddress());
-        }
-    }
-
     private int lastLevelGC;
 
     public void tickProcessor() {
@@ -935,8 +907,8 @@ private boolean tick() {
                 if ((this.tickCounter & 0b111111111) == 0) {
                     try {
                         this.eventManager.fire(this.queryRegenerateEvent = new QueryRegenerateEvent(this, 5));
-                        if (this.queryHandler != null) {
-                            this.queryHandler.regenerateInfo();
+                        if (this.networkManager.getQueryHandler() != null) {
+                            this.networkManager.getQueryHandler().regenerateInfo();
                         }
                     } catch (Exception e) {
                         log.error(e);

src/main/java/org/cloudburstmc/server/network/BedrockInterface.java

@@ -12,6 +12,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.cloudburstmc.api.event.server.QueryRegenerateEvent;
 import org.cloudburstmc.server.CloudServer;
+import org.cloudburstmc.server.network.query.QueryHandler;
 import org.cloudburstmc.server.player.CloudPlayer;
 import org.cloudburstmc.server.player.handler.LoginPacketHandler;
 import org.cloudburstmc.server.utils.Utils;
@@ -20,6 +21,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -32,12 +34,15 @@ public class BedrockInterface implements BedrockServerEventHandler, SourceInterf
 
     private final CloudServer server;
 
+    private final QueryHandler queryHandler;
+
     private final BedrockServer bedrock;
     private final BedrockPong advertisement = new BedrockPong();
     private final Queue<NukkitSessionListener> disconnectQueue = new ConcurrentLinkedQueue<>();
 
     public BedrockInterface(CloudServer server) throws Exception {
         this.server = server;
+        this.queryHandler = server.getNetwork().getQueryHandler();
 
         InetSocketAddress bindAddress = new InetSocketAddress(this.server.getIp(), this.server.getPort());
 
@@ -97,7 +102,27 @@ public void sendRawPacket(InetSocketAddress socketAddress, ByteBuf payload) {
 
     @Override
     public void onUnhandledDatagram(ChannelHandlerContext ctx, DatagramPacket packet) {
-        this.server.handlePacket(packet.sender(), packet.content());
+        this.handlePacket(packet.sender(), packet.content());
+    }
+
+    public void handlePacket(InetSocketAddress address, ByteBuf payload) {
+        try {
+            if (!payload.isReadable(3)) {
+                return;
+            }
+            byte[] prefix = new byte[2];
+            payload.readBytes(prefix);
+
+            if (!Arrays.equals(prefix, new byte[]{(byte) 0xfe, (byte) 0xfd})) {
+                return;
+            }
+            if (this.queryHandler != null) {
+                this.queryHandler.handle(address, payload);
+            }
+        } catch (Exception e) {
+            log.error("Error whilst handling packet", e);
+            this.server.getNetwork().blockAddress(address.getAddress());
+        }
     }
 
     @Override

src/main/java/org/cloudburstmc/server/network/NetworkManager.java

@@ -3,10 +3,13 @@
 import io.netty.buffer.ByteBuf;
 import lombok.extern.log4j.Log4j2;
 import org.cloudburstmc.server.CloudServer;
+import org.cloudburstmc.server.network.query.QueryHandler;
+import org.cloudburstmc.server.permission.BanEntry;
 import org.cloudburstmc.server.utils.Utils;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -24,13 +27,20 @@ public class NetworkManager {
 
     private final Set<SourceInterface> interfaces = new HashSet<>();
 
+    private final QueryHandler queryHandler;
+
     private String motd;
 
     private String subMotd;
 
     public NetworkManager(CloudServer server) {
         this.server = server;
         statistics = new NetworkStatistics();
+        if (this.server.getConfig().isEnableQuery()) {
+            this.queryHandler = new QueryHandler();
+        } else {
+            this.queryHandler = null;
+        }
     }
 
 
@@ -44,15 +54,14 @@ public void close() {
     }
 
 
-    public NetworkStatistics getStatistics() {
-        return this.statistics;
-    }
-
-
     public CloudServer getServer() {
         return server;
     }
 
+    public NetworkStatistics getStatistics() {
+        return this.statistics;
+    }
+
 
     public Set<SourceInterface> getInterfaces() {
         return interfaces;
@@ -121,4 +130,7 @@ public void unblockAddress(InetAddress address) {
         this.interfaces.forEach(it -> it.unblockAddress(address));
     }
 
+    public QueryHandler getQueryHandler() {
+        return queryHandler;
+    }
 }