From 3b11db7b2a0d567885172cdb8cfb3e2c61c00abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Mart=C3=ADnez=20Rinc=C3=B3n?= Date: Sat, 7 Oct 2017 21:13:35 +0200 Subject: [PATCH] Didn't notice the order IDEA generated the onEnable and onDisable methods... --- .../jaimemartz/playerbalanceraddon/MainCommand.java | 9 +++++++++ .../playerbalanceraddon/PlayerBalancerAddon.java | 8 ++++---- .../playerbalanceraddon/PluginMessageManager.java | 12 ++++++------ Spigot Addon/src/main/resources/plugin.yml | 4 +++- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java index fc9ffdc..6c5b678 100644 --- a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java +++ b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/MainCommand.java @@ -1,5 +1,8 @@ package com.jaimemartz.playerbalanceraddon; +import com.google.common.base.Strings; +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.chat.ComponentBuilder; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -13,6 +16,12 @@ public class MainCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + if (cmd.getName().equalsIgnoreCase("balanceraddon")) + + 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
[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()); 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 index abd3ca3..1d9ace0 100644 --- a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java +++ b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java @@ -6,14 +6,14 @@ public class PlayerBalancerAddon extends JavaPlugin { private PluginMessageManager manager; @Override - public void onDisable() { + public void onEnable() { manager = new PluginMessageManager(this); - getCommand("balancer").setExecutor(new MainCommand(this)); + getCommand("balanceraddon").setExecutor(new MainCommand(this)); } @Override - public void onEnable() { - + public void onDisable() { + //Nothing to do... } public PluginMessageManager getManager() { diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java index 5dd7176..5ee2eb6 100644 --- a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java +++ b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java @@ -38,7 +38,7 @@ public class PluginMessageManager implements PluginMessageListener { ByteArrayDataInput in = ByteStreams.newDataInput(message); String subchannel = in.readUTF(); - contexts.get(new MessageContext(channel, subchannel, player)) + contexts.get(new MessageContext(channel, subchannel, player.getUniqueId())) .stream().findFirst().ifPresent(a -> a.accept(in)); } } @@ -64,7 +64,7 @@ public class PluginMessageManager implements PluginMessageListener { contexts.put(new MessageContext( "PlayerBalancer", "GetSectionByName", - player + player.getUniqueId() ), ByteArrayDataInput::readUTF); return true; @@ -84,7 +84,7 @@ public class PluginMessageManager implements PluginMessageListener { contexts.put(new MessageContext( "PlayerBalancer", "GetSectionByServer", - player + player.getUniqueId() ), ByteArrayDataInput::readUTF); return true; } @@ -98,16 +98,16 @@ public class PluginMessageManager implements PluginMessageListener { contexts.put(new MessageContext( "PlayerBalancer", "GetSectionOfPlayer", - player + player.getUniqueId() ), ByteArrayDataInput::readUTF); } private final class MessageContext { private final String channel; private final String subchannel; - private final Player player; + private final UUID player; - public MessageContext(String channel, String subchannel, Player player) { + public MessageContext(String channel, String subchannel, UUID player) { this.channel = channel; this.subchannel = subchannel; this.player = player; diff --git a/Spigot Addon/src/main/resources/plugin.yml b/Spigot Addon/src/main/resources/plugin.yml index 73d539a..6a1d78b 100644 --- a/Spigot Addon/src/main/resources/plugin.yml +++ b/Spigot Addon/src/main/resources/plugin.yml @@ -1,4 +1,6 @@ name: PlayerBalancerAddon main: com.jaimemartz.playerbalanceraddon.PlayerBalancerAddon version: ${project.version} -author: jaime29010 \ No newline at end of file +author: jaime29010 + +softdepend: [PlaceholderAPI] \ No newline at end of file