some stuff

Author: jamezrin

balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

@@ -143,7 +143,7 @@ private void execStart() {
                 }
 
                 networkManager = new NetworkManager(this);
-
+                getProxy().registerChannel("BungeeCord");
                 sectionManager = new SectionManager(this);
                 sectionManager.load();
 

balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java

@@ -16,10 +16,13 @@
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.stream.Collectors;
 
 public class PluginMessageListener implements Listener {
     private final PlayerBalancer plugin;
@@ -38,7 +41,7 @@ public PluginMessageListener(PlayerBalancer plugin) {
         gson = builder.create();
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPluginMessage(PluginMessageEvent event) {
         if (event.getTag().equals("PlayerBalancer") && event.getSender() instanceof Server) {
             ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());

balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java

@@ -9,7 +9,10 @@
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PostLoginEvent;
+import net.md_5.bungee.api.event.PreLoginEvent;
 import net.md_5.bungee.api.event.ServerConnectEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;

balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java

@@ -128,11 +128,8 @@ public void execute(String sectionName, SectionProps sectionProps, ServerSection
             @Override
             public void execute(String sectionName, SectionProps sectionProps, ServerSection section) throws RuntimeException {
                 if (sectionProps.getServerName() != null) {
-                    SectionServer server = new SectionServer(props, section);
-                    section.setServer(server);
-                    plugin.getSectionManager().registerServer(server, section);
-                    FixedAdapter.getFakeServers().put(server.getName(), server);
-                    plugin.getProxy().getServers().put(server.getName(), server);
+                    SectionServer server = new SectionServer(plugin, props, section);
+                    plugin.getProxy().getPluginManager().registerListener(plugin, server);
                 }
             }
         });

balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java

@@ -1,5 +1,10 @@
 package com.jaimemartz.playerbalancer.section;
 
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
+import com.jaimemartz.playerbalancer.listeners.PluginMessageListener;
 import com.jaimemartz.playerbalancer.settings.props.features.BalancerProps;
 import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.api.Callback;
@@ -8,76 +13,45 @@
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
 import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-public class SectionServer extends BungeeServerInfo {
+public class SectionServer implements Listener {
+    private final PlayerBalancer plugin;
     private final BalancerProps props;
     private final ServerSection section;
 
-    public SectionServer(BalancerProps props, ServerSection section) {
-        super(
-                "@" + section.getProps().getServerName(),
-                new InetSocketAddress("0.0.0.0", (int) Math.floor(Math.random() * (0xFFFF + 1))),
-                "Section server of " + section.getName(),
-                false
-        );
-
+    public SectionServer(PlayerBalancer plugin, BalancerProps props, ServerSection section) {
+        this.plugin = plugin;
         this.props = props;
         this.section = section;
     }
 
-    @Override
-    public Collection<ProxiedPlayer> getPlayers() {
-        if (props.isShowPlayers()) {
-            return section.getServers().stream()
-                    .map(ServerInfo::getPlayers)
-                    .flatMap(Collection::stream)
-                    .collect(Collectors.toList());
-        } else return Collections.emptyList();
-    }
-
-    @Override
-    public void sendData(String channel, byte[] data) {
-        this.sendData(channel, data, true);
-    }
-
-    @Override
-    public boolean sendData(String channel, byte[] data, boolean queue) {
-        //Nothing to do
-        return true;
-    }
-
-    @Override
-    public void ping(Callback<ServerPing> callback) {
-        this.ping(callback, ProxyServer.getInstance().getProtocolVersion());
-    }
-
-    @Override
-    public void ping(Callback<ServerPing> callback, int protocolVersion) {
-        ServerPing ping = new ServerPing();
-
-        ping.setDescriptionComponent(new TextComponent(
-                TextComponent.fromLegacyText(this.getMotd())
-        ));
-
-        ping.setVersion(new ServerPing.Protocol(
-                ProxyServer.getInstance().getName(),
-                protocolVersion
-        ));
-
-        Collection<ProxiedPlayer> players = getPlayers();
-        ping.setPlayers(new ServerPing.Players(
-                Integer.MAX_VALUE,
-                players.size(),
-                players.stream().map(
-                        player -> new ServerPing.PlayerInfo(player.getName(), player.getUniqueId())
-                ).toArray(ServerPing.PlayerInfo[]::new)
-        ));
-
-        callback.done(ping, null);
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void on(PluginMessageEvent event) {
+        if (event.getTag().equals("BungeeCord")) {
+            ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
+            String request = in.readUTF();
+
+            if (request.equals("Connect")) {
+                if (event.getReceiver() instanceof ProxiedPlayer) {
+                    ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
+                    String target = in.readUTF();
+
+                    if (target.equals("@" + section.getProps().getServerName())) {
+                        ConnectionIntent.simple(plugin, player, section);
+                        event.setCancelled(true);
+                    }
+                }
+            }
+        }
     }
 }