All done

Author: HMJosh

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.Joshb</groupId>
   <artifactId>DiscordBotAPI</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <resources>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.Joshb</groupId>
     <artifactId>DiscordBotAPI</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.0</version>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

src/main/java/me/joshb/discordbotapi/server/AccountManager.java

@@ -38,7 +38,6 @@ public void setDiscordID(String discordID, String code){
                 LinkedAccounts.getInstance().save();
             }
         }
-
     }
 
     public String getDiscordID(UUID uuid){
@@ -54,6 +53,20 @@ public UUID getUUID(String discordID){
         return null;
     }
 
+    public void unlinkAccount(UUID uuid){
+        getConfig().set(uuid.toString(), null);
+        LinkedAccounts.getInstance().save();
+    }
+
+    public void unlinkAccount(String discordID){
+        for(String uuid : getConfig().getKeys(false)){
+            if(getConfig().getString(uuid + ".Discord-ID").equals(discordID)) {
+                getConfig().set(uuid, null);
+                LinkedAccounts.getInstance().save();
+            }
+        }
+    }
+
     private FileConfiguration getConfig(){
         return LinkedAccounts.getInstance().getConfig();
     }

src/main/java/me/joshb/discordbotapi/server/assets/Permission.java

@@ -3,7 +3,8 @@
 public enum Permission {
 
     GAME_DISCORD("discordbotapi.command.discord"),
-    GAME_DISCORD_LINK("discordbotapi.command.discord.link");
+    GAME_DISCORD_LINK("discordbotapi.command.discord.link"),
+    GAME_DISCORD_UNLINK("discordbotapi.command.discord.unlink");
 
     private final String value;
 

src/main/java/me/joshb/discordbotapi/server/config/command/CommandManager.java

@@ -12,14 +12,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 
 public class CommandManager implements CommandExecutor {
 
     private List<DiscordCommand> commands = new ArrayList<>();
 
     public void initializeSubCommands(){
         commands.add(new CommandLink());
+        commands.add(new CommandUnlink());
     }
 
     @Override
@@ -56,7 +56,7 @@ public boolean onCommand(CommandSender sender, Command command, String cmdLabel,
         } else {
             DiscordCommand cmd = get(args[0]);
             if (!(cmd == null)) {
-                ArrayList<String> a = new ArrayList<String>(Arrays.asList(args));
+                ArrayList<String> a = new ArrayList<>(Arrays.asList(args));
                 a.remove(0);
                 args = a.toArray(new String[a.size()]);
                 cmd.onCommand(p, args);

src/main/java/me/joshb/discordbotapi/server/config/command/CommandUnlink.java

@@ -0,0 +1,50 @@
+package me.joshb.discordbotapi.server.config.command;
+
+import me.joshb.discordbotapi.server.DiscordBotAPI;
+import me.joshb.discordbotapi.server.assets.Assets;
+import me.joshb.discordbotapi.server.assets.Permission;
+import me.joshb.discordbotapi.server.config.Config;
+import net.dv8tion.jda.api.entities.User;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Random;
+
+public class CommandUnlink extends DiscordCommand {
+
+    private final String command = Config.getInstance().getConfig().getString("Bot.Command-Prefix");
+
+    @Override
+    public String command() {
+        return "unlink";
+    }
+
+    @Override
+    public void onCommand(Player p, String[] args) {
+        if(!p.hasPermission(Permission.GAME_DISCORD_UNLINK.getValue())){
+            p.sendMessage(Assets.format("Game.Discord.Commands.No-Permission"));
+            return;
+        }
+        if(DiscordBotAPI.getAccountManager().getDiscordID(p.getUniqueId()) == null){
+            //Not linked
+            List<String> notLinked = Assets.formatStringList("Game.Commands.Discord.Sub-Commands.Unlink.Not-Linked");
+            for(String s : notLinked){
+                p.sendMessage(s
+                        .replaceAll("%player%", p.getName())
+                        .replaceAll("%discord_bot_name%", DiscordBotAPI.getJDA().getSelfUser().getName()));
+            }
+        } else {
+            //Linked
+            User u = DiscordBotAPI.getJDA().getUserById(DiscordBotAPI.getAccountManager().getDiscordID(p.getUniqueId()));
+            List<String> linked = Assets.formatStringList("Game.Commands.Discord.Sub-Commands.Unlink.Linked");
+            for(String s : linked){
+                p.sendMessage(s
+                        .replaceAll("%player%", p.getName())
+                        .replaceAll("%discord_bot_name%", DiscordBotAPI.getJDA().getSelfUser().getName())
+                        .replaceAll("%discord_author_name%", u.getName())
+                        .replaceAll("%discord_author_discriminator%", u.getDiscriminator()));
+            }
+            DiscordBotAPI.getAccountManager().unlinkAccount(p.getUniqueId());
+        }
+    }
+}

src/main/resources/Messages.yml

@@ -15,7 +15,7 @@ Game:
         - ''
       Linked:
         - ''
-        - '&aYour account (&e%player%) is linked with discord (%discord_name%#%discord_discriminator%)'
+        - '&aYour account (&e%player%&a) is linked with discord (&e%discord_author_name%#%discord_author_discriminator%&a)'
         - '&c(your invite link here)'
         - ''
       Sub-Commands:
@@ -31,6 +31,17 @@ Game:
             - '&a- That"s it!'
           Linked:
             - ''
-            - '&aYour account (&e%player%) is linked with discord (%discord_author_name%#%discord_author_discriminator%)'
+            - '&aYour account (&e%player%&a) is linked with discord (&e%discord_author_name%#%discord_author_discriminator%&a)'
+            - '&c(your invite link here)'
+            - ''
+        Unlink:
+          Not-Linked:
+            - ''
+            - '&e%player%&a, your account is not linked on our discord!'
+            - '&e(invite link)'
+            - ''
+          Linked:
+            - ''
+            - '&aYour account (&e%player%&a) has been unlinked with discord (&e%discord_author_name%#%discord_author_discriminator%&a)'
             - '&c(your invite link here)'
             - ''

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: DiscordBotAPI
-version: 1.0.2
+version: 1.0.3
 main: me.joshb.discordbotapi.server.DiscordBotAPI
 author: Joshb_
 commands:

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sun Nov 22 16:49:40 EST 2020
-version=1.0.2
+#Wed Nov 25 17:49:14 EST 2020
+version=1.0.3
 groupId=me.Joshb
 artifactId=DiscordBotAPI

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -8,6 +8,7 @@ me\joshb\discordbotapi\server\config\Messages.class
 me\joshb\discordbotapi\bungee\DiscordBotAPI.class
 me\joshb\discordbotapi\server\config\command\DiscordCommand.class
 me\joshb\discordbotapi\server\config\ConfigUpdater.class
+me\joshb\discordbotapi\server\config\command\CommandUnlink.class
 me\joshb\discordbotapi\server\config\Config.class
 me\joshb\discordbotapi\server\config\command\CommandLink.class
 me\joshb\discordbotapi\server\DiscordBotAPI.class