Finished game roles

Still needs testing

Couldn't set GPG signing up - yet

src/main/java/buttondevteam/discordplugin/ChromaBot.java

@@ -1,19 +1,18 @@
 package buttondevteam.discordplugin;
 
-import java.awt.Color;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitScheduler;
-
 import buttondevteam.discordplugin.listeners.MCChatListener;
 import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitScheduler;
 import sx.blah.discord.api.internal.json.objects.EmbedObject;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.util.EmbedBuilder;
 
+import java.awt.*;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public class ChromaBot {
 	/**
 	 * May be null if it's not initialized. Initialization happens after the server is done loading (using {@link BukkitScheduler#runTaskAsynchronously(org.bukkit.plugin.Plugin, Runnable)})

src/main/java/buttondevteam/discordplugin/DiscordConnectedPlayer.java

@@ -1,13 +1,13 @@
 package buttondevteam.discordplugin;
 
-import java.util.UUID;
-
 import buttondevteam.discordplugin.playerfaker.DiscordFakePlayer;
 import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
 import lombok.Getter;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.UUID;
+
 public class DiscordConnectedPlayer extends DiscordFakePlayer implements IMCPlayer<DiscordConnectedPlayer> {
 	private static int nextEntityId = 10000;
 	private @Getter VanillaCommandListener<DiscordConnectedPlayer> vanillaCmdListener;

src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java

@@ -1,13 +1,7 @@
 package buttondevteam.discordplugin;
 
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
+import lombok.Getter;
 import org.bukkit.*;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
@@ -24,18 +18,20 @@ import org.bukkit.inventory.*;
 import org.bukkit.inventory.InventoryView.Property;
 import org.bukkit.map.MapView;
 import org.bukkit.metadata.MetadataValue;
-import org.bukkit.permissions.*;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.Vector;
-
-import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
-import lombok.Getter;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.net.InetSocketAddress;
+import java.util.*;
+
 @SuppressWarnings("deprecation")
 public class DiscordPlayerSender extends DiscordSenderBase implements IMCPlayer<DiscordPlayerSender> {
 

src/main/java/buttondevteam/discordplugin/DiscordSender.java

@@ -1,15 +1,18 @@
 package buttondevteam.discordplugin;
 
-import java.util.Set;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.*;
+import org.bukkit.permissions.PermissibleBase;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
-
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.Set;
+
 public class DiscordSender extends DiscordSenderBase implements CommandSender {
 	private PermissibleBase perm = new PermissibleBase(this);
 

src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java

@@ -1,20 +1,19 @@
 package buttondevteam.discordplugin;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitTask;
-
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.chat.Channel;
 import buttondevteam.lib.chat.IDiscordSender;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.scheduler.BukkitTask;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public abstract class DiscordSenderBase implements IDiscordSender {
 	/**
 	 * May be null.

src/main/java/buttondevteam/discordplugin/IMCPlayer.java

@@ -1,8 +1,7 @@
 package buttondevteam.discordplugin;
 
-import org.bukkit.entity.Player;
-
 import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
+import org.bukkit.entity.Player;
 
 public interface IMCPlayer<T extends DiscordSenderBase & IMCPlayer<T>> extends Player {
 	VanillaCommandListener<T> getVanillaCmdListener();

src/main/java/buttondevteam/discordplugin/PlayerListWatcher.java

@@ -1,10 +1,10 @@
 package buttondevteam.discordplugin;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import java.util.UUID;
-
+import buttondevteam.discordplugin.listeners.MCChatListener;
+import buttondevteam.lib.TBMCCoreAPI;
+import com.mojang.authlib.GameProfile;
+import lombok.val;
+import net.minecraft.server.v1_12_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
@@ -12,33 +12,10 @@ import org.bukkit.craftbukkit.v1_12_R1.util.CraftChatMessage;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.objenesis.ObjenesisStd;
 
-import com.mojang.authlib.GameProfile;
-
-import buttondevteam.discordplugin.listeners.MCChatListener;
-import buttondevteam.lib.TBMCCoreAPI;
-import lombok.val;
-import net.minecraft.server.v1_12_R1.AdvancementDataPlayer;
-import net.minecraft.server.v1_12_R1.ChatMessageType;
-import net.minecraft.server.v1_12_R1.DedicatedPlayerList;
-import net.minecraft.server.v1_12_R1.DedicatedServer;
-import net.minecraft.server.v1_12_R1.Entity;
-import net.minecraft.server.v1_12_R1.EntityHuman;
-import net.minecraft.server.v1_12_R1.EntityPlayer;
-import net.minecraft.server.v1_12_R1.GameProfileBanList;
-import net.minecraft.server.v1_12_R1.IChatBaseComponent;
-import net.minecraft.server.v1_12_R1.IpBanList;
-import net.minecraft.server.v1_12_R1.LoginListener;
-import net.minecraft.server.v1_12_R1.MinecraftServer;
-import net.minecraft.server.v1_12_R1.NBTTagCompound;
-import net.minecraft.server.v1_12_R1.NetworkManager;
-import net.minecraft.server.v1_12_R1.OpList;
-import net.minecraft.server.v1_12_R1.Packet;
-import net.minecraft.server.v1_12_R1.PacketPlayOutChat;
-import net.minecraft.server.v1_12_R1.ScoreboardServer;
-import net.minecraft.server.v1_12_R1.ServerStatisticManager;
-import net.minecraft.server.v1_12_R1.WhiteList;
-import net.minecraft.server.v1_12_R1.World;
-import net.minecraft.server.v1_12_R1.WorldServer;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import java.util.UUID;
 
 public class PlayerListWatcher extends DedicatedPlayerList {
 	private DedicatedPlayerList plist;

src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java

@@ -1,16 +1,14 @@
 package buttondevteam.discordplugin.commands;
 
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
-import com.google.common.collect.HashBiMap;
-
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
+import com.google.common.collect.HashBiMap;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import sx.blah.discord.handle.obj.IMessage;
 
 public class ConnectCommand extends DiscordCommandBase {

src/main/java/buttondevteam/discordplugin/commands/DiscordCommandBase.java

@@ -1,11 +1,11 @@
 package buttondevteam.discordplugin.commands;
 
-import java.util.HashMap;
-
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
 import sx.blah.discord.handle.obj.IMessage;
 
+import java.util.HashMap;
+
 public abstract class DiscordCommandBase {
 	public abstract String getCommandName();
 

src/main/java/buttondevteam/discordplugin/commands/HelpCommand.java

@@ -1,11 +1,11 @@
 package buttondevteam.discordplugin.commands;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 import buttondevteam.discordplugin.DiscordPlugin;
 import sx.blah.discord.handle.obj.IMessage;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public class HelpCommand extends DiscordCommandBase {
 
 	@Override

src/main/java/buttondevteam/discordplugin/commands/RoleCommand.java

@@ -48,7 +48,7 @@ public class RoleCommand extends DiscordCommandBase {
 			}
 		} else if (argsa[0].equalsIgnoreCase("list")) {
 			DiscordPlugin.sendMessageToChannel(message.getChannel(),
-					"List of game roles:\n" + DiscordPlugin.GameRoles.stream().collect(Collectors.joining("\n")));
+					"List of game roles:\n" + DiscordPlugin.GameRoles.stream().sorted().collect(Collectors.joining("\n")));
 		} else DiscordPlugin.sendMessageToChannel(message.getChannel(), usagemsg);
 	}
 

src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java

@@ -1,8 +1,5 @@
 package buttondevteam.discordplugin.commands;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
@@ -11,6 +8,10 @@ import buttondevteam.lib.player.ChromaGamerBase.InfoTarget;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class UserinfoCommand extends DiscordCommandBase {
 
 	@Override

src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java

@@ -1,12 +1,11 @@
 package buttondevteam.discordplugin.listeners;
 
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
 import buttondevteam.discordplugin.DPUtils;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.PluginUpdater;
 import buttondevteam.lib.TBMCCoreAPI;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
 public class AutoUpdaterListener implements Listener {
 	@EventHandler

src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java

@@ -135,10 +135,18 @@ public class CommandListener {
         }, (IListener<RoleDeleteEvent>) event -> {
             if (DiscordPlugin.GameRoles.remove(event.getRole().getName()))
                 DiscordPlugin.sendMessageToChannel(DiscordPlugin.modlogchannel, "Removed " + event.getRole().getName() + " as a game role.");
-        }, (IListener<RoleUpdateEvent>) event -> {
-            if (event.getNewRole().getColor().getAlpha() != 0 && DiscordPlugin.GameRoles.remove(event.getOldRole().getName()))
+		}, (IListener<RoleUpdateEvent>) event -> { //Role update event
+			if (event.getNewRole().getColor().getAlpha() != 0)
+				if (DiscordPlugin.GameRoles.remove(event.getOldRole().getName()))
                 DiscordPlugin.sendMessageToChannel(DiscordPlugin.modlogchannel, "Removed " + event.getOldRole().getName() + " as a game role because it's color changed.");
-            //else if() - TODO
+				else {
+					boolean removed = DiscordPlugin.GameRoles.remove(event.getOldRole().getName()); //Regardless of whether it was a game role
+					DiscordPlugin.GameRoles.add(event.getNewRole().getName()); //Add it because it has no color
+					if (removed)
+						DiscordPlugin.sendMessageToChannel(DiscordPlugin.modlogchannel, "Changed game role from " + event.getOldRole().getName() + " to " + event.getNewRole().getName() + ".");
+					else
+						DiscordPlugin.sendMessageToChannel(DiscordPlugin.modlogchannel, "Added " + event.getNewRole().getName() + " as game role because it has no color.");
+				}
         }};
 	}
 

src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java

@@ -1,9 +1,9 @@
 package buttondevteam.discordplugin.listeners;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCDebugMessageEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
 public class DebugMessageListener implements Listener{
 	@EventHandler

src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java

@@ -1,7 +1,5 @@
 package buttondevteam.discordplugin.mccommands;
 
-import org.bukkit.entity.Player;
-
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.commands.ConnectCommand;
 import buttondevteam.discordplugin.listeners.MCChatListener;
@@ -9,6 +7,7 @@ import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
+import org.bukkit.entity.Player;
 
 @CommandClass(modOnly = false, path = "accept")
 public class AcceptMCCommand extends DiscordMCCommandBase {

src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java

@@ -1,9 +1,8 @@
 package buttondevteam.discordplugin.mccommands;
 
-import org.bukkit.entity.Player;
-
 import buttondevteam.discordplugin.commands.ConnectCommand;
 import buttondevteam.lib.chat.CommandClass;
+import org.bukkit.entity.Player;
 
 @CommandClass(modOnly = false, path = "decline")
 public class DeclineMCCommand extends DiscordMCCommandBase {

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordEntity.java

@@ -1,7 +1,8 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.util.*;
-
+import buttondevteam.discordplugin.DiscordSenderBase;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.*;
 import org.bukkit.block.PistonMoveReaction;
 import org.bukkit.entity.Entity;
@@ -10,13 +11,11 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.util.Vector;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import lombok.Getter;
-import lombok.Setter;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.*;
+
 @Getter
 @Setter
 @SuppressWarnings("deprecated")

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordFakePlayer.java

@@ -1,25 +1,27 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.net.InetSocketAddress;
-import java.util.*;
+import buttondevteam.discordplugin.DiscordPlugin;
+import lombok.Getter;
+import lombok.experimental.Delegate;
 import org.bukkit.*;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationAbandonedEvent;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.map.MapView;
 import org.bukkit.permissions.PermissibleBase;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scoreboard.Scoreboard;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import lombok.experimental.Delegate;
-import lombok.Getter;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.net.InetSocketAddress;
+import java.util.*;
+
 public class DiscordFakePlayer extends DiscordHumanEntity implements Player {
 	protected DiscordFakePlayer(IUser user, IChannel channel, int entityId, UUID uuid, String mcname) {
 		super(user, channel, entityId, uuid);

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordHumanEntity.java

@@ -1,7 +1,5 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.util.UUID;
-
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -10,10 +8,11 @@ import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Villager;
 import org.bukkit.inventory.*;
 import org.bukkit.inventory.InventoryView.Property;
-
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.UUID;
+
 public abstract class DiscordHumanEntity extends DiscordLivingEntity implements HumanEntity {
 	protected DiscordHumanEntity(IUser user, IChannel channel, int entityId, UUID uuid) {
 		super(user, channel, entityId, uuid);

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java

@@ -1,12 +1,5 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
@@ -14,6 +7,13 @@ import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
 public class DiscordInventory implements Inventory {
 	public DiscordInventory(DiscordHumanEntity holder) {
 		this.holder = holder;

src/main/java/buttondevteam/discordplugin/playerfaker/DiscordLivingEntity.java

@@ -1,12 +1,7 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
@@ -21,12 +16,11 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Vector;
-
-import lombok.Getter;
-import lombok.Setter;
 import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
+import java.util.*;
+
 public abstract class DiscordLivingEntity extends DiscordEntity implements LivingEntity {
 
 	protected DiscordLivingEntity(IUser user, IChannel channel, int entityId, UUID uuid) {

src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java

@@ -1,7 +1,10 @@
 package buttondevteam.discordplugin.playerfaker;
 
-import java.util.Arrays;
-
+import buttondevteam.discordplugin.DiscordSenderBase;
+import buttondevteam.discordplugin.IMCPlayer;
+import lombok.Getter;
+import lombok.val;
+import net.minecraft.server.v1_12_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
@@ -9,17 +12,7 @@ import org.bukkit.craftbukkit.v1_12_R1.command.VanillaCommandWrapper;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.val;
-import net.minecraft.server.v1_12_R1.ChatMessage;
-import net.minecraft.server.v1_12_R1.CommandException;
-import net.minecraft.server.v1_12_R1.EnumChatFormat;
-import net.minecraft.server.v1_12_R1.IChatBaseComponent;
-import net.minecraft.server.v1_12_R1.ICommandListener;
-import net.minecraft.server.v1_12_R1.MinecraftServer;
-import net.minecraft.server.v1_12_R1.World;
+import java.util.Arrays;
 
 public class VanillaCommandListener<T extends DiscordSenderBase & IMCPlayer<T>> implements ICommandListener {
 	private @Getter T player;