Plugin message kinda works, next up: creating more subchannels on the bungee side, creating the command and creating the placeholders

jamezrin · jamezrin · commit d4cea35eb003 · 2017-10-10T22:56:17.000+02:00
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java
@@ -12,7 +12,7 @@ public class MainCommand extends Command {
     private final PlayerBalancer plugin;
 
     public MainCommand(PlayerBalancer plugin) {
-        super("balancer");
+        super("balancer", "", "playerbalancer", "pb");
         this.plugin = plugin;
     }
 
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/json/ServerInfoAdapter.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/json/ServerInfoAdapter.java
@@ -0,0 +1,13 @@
+package com.jaimemartz.playerbalancer.json;
+
+import com.google.gson.*;
+import net.md_5.bungee.api.config.ServerInfo;
+
+import java.lang.reflect.Type;
+
+public class ServerInfoAdapter implements JsonSerializer<ServerInfo> {
+    @Override
+    public JsonElement serialize(ServerInfo server, Type type, JsonSerializationContext context) {
+        return context.serialize(server.getName());
+    }
+}
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listener/PluginMessageListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listener/PluginMessageListener.java
@@ -7,6 +7,7 @@
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.json.ServerInfoAdapter;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
@@ -24,10 +25,9 @@ public class PluginMessageListener implements Listener {
 
     public PluginMessageListener(PlayerBalancer plugin) {
         this.plugin = plugin;
-
         GsonBuilder builder = new GsonBuilder();
+        builder.registerTypeAdapter(ServerInfo.class, new ServerInfoAdapter());
         builder.serializeNulls();
-        builder.excludeFieldsWithoutExposeAnnotation();
         gson = builder.create();
     }
 
@@ -37,6 +37,7 @@ public void onPluginMessage(PluginMessageEvent event) {
             ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
             String request = in.readUTF();
             ServerInfo sender = ((Server) event.getSender()).getInfo();
+
             switch (request) {
                 case "Connect": {
                     if (event.getReceiver() instanceof ProxiedPlayer) {
@@ -78,6 +79,7 @@ public void onPluginMessage(PluginMessageEvent event) {
 
                     try {
                         String output = gson.toJson(section);
+                        out.writeUTF("GetSectionByName");
                         out.writeUTF(output);
                     } catch (IOException e) {
                         e.printStackTrace();
@@ -103,6 +105,7 @@ public void onPluginMessage(PluginMessageEvent event) {
 
                     try {
                         String output = gson.toJson(section);
+                        out.writeUTF("GetSectionByServer");
                         out.writeUTF(output);
                     } catch (IOException e) {
                         e.printStackTrace();
@@ -125,6 +128,7 @@ public void onPluginMessage(PluginMessageEvent event) {
 
                         try {
                             String output = gson.toJson(section);
+                            out.writeUTF("GetSectionOfPlayer");
                             out.writeUTF(output);
                         } catch (IOException e) {
                             e.printStackTrace();
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java
@@ -19,10 +19,10 @@ public class ServerSection {
     private ServerSection parent;
     private int position;
 
-    private ServerInfo server;
-    private SectionCommand command;
-    private NavigableSet<ServerInfo> servers;
-    private AbstractProvider externalProvider;
+    private transient ServerInfo server;
+    private transient SectionCommand command;
+    private transient AbstractProvider externalProvider;
+    private Set<ServerInfo> servers;
 
     private boolean valid = false;
 
@@ -109,7 +109,7 @@ public void setCommand(SectionCommand command) {
         this.command = command;
     }
 
-    public NavigableSet<ServerInfo> getServers() {
+    public Set<ServerInfo> getServers() {
         return servers;
     }
 
diff --git a/Spigot Addon/pom.xml b/Spigot Addon/pom.xml
@@ -18,7 +18,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.0.2</version>
                 <configuration>
                     <outputDirectory>../target</outputDirectory>
                 </configuration>
@@ -32,7 +32,7 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>placeholderapi</id>
+            <id>papi-repo</id>
             <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java
@@ -6,6 +6,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class MainCommand implements CommandExecutor {
     private final PlayerBalancerAddon plugin;
@@ -16,12 +17,48 @@ public MainCommand(PlayerBalancerAddon plugin) {
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-        if (cmd.getName().equalsIgnoreCase("balanceraddon"))
+        if (cmd.getName().equalsIgnoreCase("spb")) {
+            if (args.length != 0) {
+                switch (args[0].toLowerCase()) {
+                    case "connect": {
+                        if (args.length >= 2) {
+                            String input = args[1];
+                            if (args.length == 3) {
+                                Player player = plugin.getServer().getPlayer(args[2]);
+                                if (player != null) {
+                                    plugin.getManager().connectPlayer(player, input);
+                                } else {
+                                    sender.spigot().sendMessage(new ComponentBuilder("There is no player with that name connected to this proxy").color(ChatColor.RED).create());
+                                }
+                            } else {
+                                if (sender instanceof Player) {
+                                    plugin.getManager().connectPlayer((Player) sender, input);
+                                } else {
+                                    sender.spigot().sendMessage(new ComponentBuilder("This command can only be executed by a player").color(ChatColor.RED).create());
+                                }
+                            }
+                        } else {
+                            sender.spigot().sendMessage(new ComponentBuilder("Usage: /section connect <section> [player]").color(ChatColor.RED).create());
+                        }
+                        break;
+                    }
 
-        sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
-        sender.spigot().sendMessage(new ComponentBuilder("Available commands:").color(ChatColor.GRAY).create());
-        sender.spigot().sendMessage(new ComponentBuilder("/section connect <section> [player]").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Connects you or the specified player to that section").color(ChatColor.RED).create());
-        sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
+                    case "info": {
+                        plugin.getManager().getSectionOfPlayer((Player) sender, (a) -> {
+                            System.out.println(a);
+                            sender.sendMessage(a);
+                        });
+                        break;
+                    }
+                }
+            } else {
+                sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
+                sender.spigot().sendMessage(new ComponentBuilder("Available commands:").color(ChatColor.GRAY).create());
+                sender.spigot().sendMessage(new ComponentBuilder("/spb connect <section> [player]").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Connects you or the specified player to that section").color(ChatColor.RED).create());
+                sender.spigot().sendMessage(new ComponentBuilder("/spb fallback").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Connects you to the parent section").color(ChatColor.RED).create());
+                sender.spigot().sendMessage(new ComponentBuilder(Strings.repeat("-", 53)).strikethrough(true).color(ChatColor.GRAY).create());
+            }
+        }
         return false;
     }
 }
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java
@@ -8,7 +8,7 @@ public class PlayerBalancerAddon extends JavaPlugin {
     @Override
     public void onEnable() {
         manager = new PluginMessageManager(this);
-        getCommand("balanceraddon").setExecutor(new MainCommand(this));
+        getCommand("spb").setExecutor(new MainCommand(this));
     }
 
     @Override
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -1,24 +1,21 @@
 package com.jaimemartz.playerbalanceraddon;
 
-import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.Messenger;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
 import java.util.*;
+import java.util.concurrent.Future;
 import java.util.function.Consumer;
 
 public class PluginMessageManager implements PluginMessageListener {
-    private final Multimap<MessageContext, Consumer<ByteArrayDataInput>> contexts = LinkedListMultimap.create();
+    private final Multimap<MessageContext, Consumer<ByteArrayDataInput>> contexts = HashMultimap.create();
     private final PlayerBalancerAddon plugin;
 
     public PluginMessageManager(PlayerBalancerAddon plugin) {
@@ -38,8 +35,14 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
             ByteArrayDataInput in = ByteStreams.newDataInput(message);
             String subchannel = in.readUTF();
 
-            contexts.get(new MessageContext(channel, subchannel, player.getUniqueId()))
-                    .stream().findFirst().ifPresent(a -> a.accept(in));
+            Iterator<Consumer<ByteArrayDataInput>> iterator = contexts.get(
+                    new MessageContext(channel, subchannel, player.getUniqueId())
+            ).iterator();
+
+            if (iterator.hasNext()) {
+                iterator.next().accept(in);
+                iterator.remove();
+            }
         }
     }
 
@@ -59,13 +62,14 @@ public boolean getSectionByName(String section, Consumer<String> consumer) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("GetSectionByName");
         out.writeUTF(section);
-        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
 
         contexts.put(new MessageContext(
                 "PlayerBalancer",
                 "GetSectionByName",
                 player.getUniqueId()
-        ), ByteArrayDataInput::readUTF);
+        ), (response) -> consumer.accept(response.readUTF()));
+
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
 
         return true;
     }
@@ -79,27 +83,29 @@ public boolean getSectionByServer(String server, Consumer<String> consumer) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("GetSectionByServer");
         out.writeUTF(server);
-        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
 
         contexts.put(new MessageContext(
                 "PlayerBalancer",
                 "GetSectionByServer",
                 player.getUniqueId()
-        ), ByteArrayDataInput::readUTF);
+        ), (response) -> consumer.accept(response.readUTF()));
+
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
         return true;
     }
 
     public void getSectionOfPlayer(Player player, Consumer<String> consumer) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("GetSectionOfPlayer");
         out.writeUTF(player.getName());
-        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
 
         contexts.put(new MessageContext(
                 "PlayerBalancer",
                 "GetSectionOfPlayer",
                 player.getUniqueId()
-        ), ByteArrayDataInput::readUTF);
+        ), (response) -> consumer.accept(response.readUTF()));
+
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
     }
 
     private final class MessageContext {
@@ -132,5 +138,14 @@ public int hashCode() {
             result = 31 * result + (player != null ? player.hashCode() : 0);
             return result;
         }
+
+        @Override
+        public String toString() {
+            return "MessageContext{" +
+                    "channel='" + channel + '\'' +
+                    ", subchannel='" + subchannel + '\'' +
+                    ", player=" + player +
+                    '}';
+        }
     }
 }
diff --git a/Spigot Addon/src/main/resources/plugin.yml b/Spigot Addon/src/main/resources/plugin.yml
@@ -2,5 +2,9 @@ name: PlayerBalancerAddon
 main: com.jaimemartz.playerbalanceraddon.PlayerBalancerAddon
 version: ${project.version}
 author: jaime29010
+softdepend: [PlaceholderAPI]
 
-softdepend: [PlaceholderAPI]
+commands:
+  spb:
+    description: Command to interact with the bungee side of PlayerBalancer
+    permission: playerbalancer.admin

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class MainCommand extends Command {`
`12`	`12`	`private final PlayerBalancer plugin;`
`13`	`13`
`14`	`14`	`public MainCommand(PlayerBalancer plugin) {`
`15`		`- super("balancer");`
	`15`	`+ super("balancer", "", "playerbalancer", "pb");`
`16`	`16`	`this.plugin = plugin;`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class PlayerBalancerAddon extends JavaPlugin {`
`8`	`8`	`@Override`
`9`	`9`	`public void onEnable() {`
`10`	`10`	`manager = new PluginMessageManager(this);`
`11`		`- getCommand("balanceraddon").setExecutor(new MainCommand(this));`
	`11`	`+ getCommand("spb").setExecutor(new MainCommand(this));`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@Override`