From e6829fb7c99c026f9a1d7f0425e19aa5c6b0d12d Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sat, 29 Oct 2016 20:45:52 +0200
Subject: [PATCH] Added commands

---
 .../discordplugin/DiscordPlayer.java          | 10 ++--
 .../mccommands/AcceptMCCommand.java           |  8 ++--
 .../mccommands/DeclineMCCommand.java          | 47 ++++++++++++++++++
 .../mccommands/DiscordMCCommand.java          | 48 +++++++++++++++++++
 4 files changed, 106 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java
 create mode 100644 src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java

diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java b/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
index 0a87e9b..45f82b2 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
@@ -2,10 +2,12 @@ package buttondevteam.discordplugin;
 
 import buttondevteam.lib.TBMCPlayer;
 
-public class DiscordPlayer {
-	private TBMCPlayer player;
-
+public class DiscordPlayer extends TBMCPlayer {
 	public String getDiscordID() {
-		return null; // TODO: Return player.getData("discordid") or similar
+		return getData();
+	}
+
+	public void setDiscrodID(String id) {
+		setData(id);
 	}
 }
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
index 36d7533..64c59d9 100644
--- a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
@@ -1,15 +1,17 @@
 package buttondevteam.discordplugin.mccommands;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.TBMCPlayer;
 
 public class AcceptMCCommand extends DiscordMCCommandBase {
 
 	@Override
 	public String GetDiscordCommandPath() {
-		return "connect";
+		return "accept";
 	}
 
 	@Override
@@ -37,9 +39,9 @@ public class AcceptMCCommand extends DiscordMCCommandBase {
 		String did = ConnectCommand.WaitingToConnect.get(sender.getName());
 		if (did == null) {
 			sender.sendMessage("§cYou don't have a pending connection to Discord.");
-			return false;
+			return true;
 		}
-		new DiscordPlayer(did); // TODO: Add to player storage
+		TBMCPlayer.getPlayerAs((Player) sender, DiscordPlayer.class).setDiscrodID(did);
 		return true;
 	}
 
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java
new file mode 100644
index 0000000..9661c3a
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java
@@ -0,0 +1,47 @@
+package buttondevteam.discordplugin.mccommands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import buttondevteam.discordplugin.DiscordPlayer;
+import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.TBMCPlayer;
+
+public class DeclineMCCommand extends DiscordMCCommandBase {
+
+	@Override
+	public String GetDiscordCommandPath() {
+		return "decline";
+	}
+
+	@Override
+	public String[] GetHelpText(String alias) {
+		return new String[] { //
+				"§6---- Decline Discord connection ----", //
+				"Decline a pending connection between your Discord and Minecraft account.", //
+				"To start the connection process, do §b@ChromaBot connect <MCname>§r in the #bot channel on Discord", //
+				"Usage: /" + alias + " decline" //
+		};
+	}
+
+	@Override
+	public boolean GetModOnly() {
+		return false;
+	}
+
+	@Override
+	public boolean GetPlayerOnly() {
+		return true;
+	}
+
+	@Override
+	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
+		String did = ConnectCommand.WaitingToConnect.remove(sender.getName());
+		if (did == null) {
+			sender.sendMessage("§cYou don't have a pending connection to Discord.");
+			return true;
+		}
+		return true;
+	}
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java
new file mode 100644
index 0000000..f83bee3
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java
@@ -0,0 +1,48 @@
+package buttondevteam.discordplugin.mccommands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import buttondevteam.discordplugin.DiscordPlayer;
+import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.TBMCPlayer;
+import buttondevteam.lib.chat.TBMCCommandBase;
+
+public class DiscordMCCommand extends TBMCCommandBase {
+
+	@Override
+	public String GetCommandPath() {
+		return "discord";
+	}
+
+	@Override
+	public String[] GetHelpText(String alias) {
+		return new String[] { // TODO
+				"§6---- Decline Discord connection ----", //
+				"Decline a pending connection between your Discord and Minecraft account.", //
+				"To start the connection process, do §b@ChromaBot connect <MCname>§r in the #bot channel on Discord", //
+				"Usage: /" + alias + " decline" //
+		};
+	}
+
+	@Override
+	public boolean GetModOnly() {
+		return false;
+	}
+
+	@Override
+	public boolean GetPlayerOnly() {
+		return true;
+	}
+
+	@Override
+	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
+		String did = ConnectCommand.WaitingToConnect.remove(sender.getName());
+		if (did == null) {
+			sender.sendMessage("§cYou don't have a pending connection to Discord.");
+			return true;
+		}
+		return true;
+	}
+
+}