fixaros

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.8</version>
+  <version>1.1.0</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <resources>

pom.xml

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

src/main/java/me/joshb/discordbotapi/bungee/DiscordBotAPI.java

@@ -21,7 +21,7 @@ public class DiscordBotAPI extends Plugin {
 
     public DiscordMessageReceived discordMessageReceived;
 
-    public void onEnable(){
+    public void onLoad(){
         plugin = this;
 
         Config.getInstance().initialize();
@@ -48,6 +48,10 @@ public void onEnable(){
         } catch (LoginException e) {
             getLogger().severe("Plugin Disabled. The bot token is invalid. Reason: " + e.getMessage());
         }
+    }
+
+    public void onEnable(){
+
         discordMessageReceived = new DiscordMessageReceived();
         registerEvent(this, discordMessageReceived);
     }

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

@@ -1,9 +1,9 @@
 package me.joshb.discordbotapi.server;
 
+import me.joshb.discordbotapi.server.command.CommandManager;
 import me.joshb.discordbotapi.server.config.Config;
 import me.joshb.discordbotapi.server.config.LinkedAccounts;
 import me.joshb.discordbotapi.server.config.Messages;
-import me.joshb.discordbotapi.server.command.CommandManager;
 import me.joshb.discordbotapi.server.listener.DiscordMessageReceived;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -22,15 +22,17 @@ public class DiscordBotAPI extends JavaPlugin {
 
     public DiscordMessageReceived discordMessageReceived;
 
-    public void onEnable() {
+    public void onEnable(){
         plugin = this;
 
         Config.getInstance().initialize();
         Messages.getInstance().initialize();
         LinkedAccounts.getInstance().initialize();
 
         CommandManager cm = new CommandManager();
+        Bukkit.broadcastMessage(cm.toString());
         cm.initializeSubCommands();
+
         getCommand("discord").setExecutor(cm);
 
         if (Config.getInstance().getConfig().getString("Bot.Token").equals("token_here")) {

src/main/java/me/joshb/discordbotapi/server/config/Config.java

@@ -5,9 +5,6 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Arrays;
 
 public class Config {
@@ -32,7 +29,7 @@ public void save(){
         try {
             ConfigUpdater.update(DiscordBotAPI.plugin, fileName + ".yml", file, Arrays.asList());
         } catch (Exception e){
-            System.out.println("COULD NOT SAVE FILE: " +fileName);
+            System.out.println("COULD NOT SAVE FILE: " + fileName);
             e.printStackTrace();
         }
     }
@@ -55,25 +52,10 @@ public void initialize(){
 
         if(!file.exists()){
             file.getParentFile().mkdirs();
-            copy(DiscordBotAPI.plugin.getResource(fileName + ".yml"), file);
+            DiscordBotAPI.plugin.saveResource(fileName + ".yml", false);
         }
         config = YamlConfiguration.loadConfiguration(file);
         save();
         reload();
     }
-
-    private void copy(InputStream in, File file) {
-        try {
-            OutputStream out = new FileOutputStream(file);
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            out.close();
-            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }

src/main/java/me/joshb/discordbotapi/server/config/ConfigUpdater.java

@@ -12,25 +12,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * A class to update/add new sections/keys to your config while keeping your current values and keeping your comments
- * Algorithm:
- * Read the new file and scan for comments and ignored sections, if ignored section is found it is treated as a comment.
- * Read and write each line of the new config, if the old config has value for the given key it writes that value in the new config.
- * If a key has an attached comment above it, it is written first.
- * @author tchristofferson
- * @Editor Joshb_ for UTF_8 Support
- */
 public class ConfigUpdater {
 
-    /**
-     * Update a yaml file from a resource inside your plugin jar
-     * @param plugin You plugin
-     * @param resourceName The yaml file name to update from, typically Config.yml
-     * @param toUpdate The yaml file to update
-     * @param ignoredSections List of sections to ignore and copy from the current config
-     * @throws IOException If an IOException occurs
-     */
     public static void update(Plugin plugin, String resourceName, File toUpdate, List<String> ignoredSections) throws IOException {
         BufferedReader newReader = new BufferedReader(new InputStreamReader(plugin.getResource(resourceName), StandardCharsets.UTF_8));
         List<String> newLines = newReader.lines().collect(Collectors.toList());
@@ -147,12 +130,15 @@ private static String getListAsString(List list, String actualKey, String prefix
         for (int i = 0; i < list.size(); i++) {
             Object o = list.get(i);
 
-            if (o instanceof String || o instanceof Character) {
-                builder.append(prefixSpaces).append("- '").append(o).append("'");
+            if (o instanceof String) {
+                String s = String.valueOf(o);
+                builder.append(prefixSpaces).append("  - \"").append(s).append("\"");
+            } else if(o instanceof Character){
+                builder.append(prefixSpaces).append("  - '").append(o).append("'");
             } else if (o instanceof List) {
-                builder.append(prefixSpaces).append("- ").append(yaml.dump(o));
+                builder.append(prefixSpaces).append("  - ").append(yaml.dump(o));
             } else {
-                builder.append(prefixSpaces).append("- ").append(o);
+                builder.append(prefixSpaces).append("  - ").append(o);
             }
 
             if (i != list.size()) {

src/main/java/me/joshb/discordbotapi/server/config/Messages.java

@@ -55,24 +55,9 @@ public void initialize(){
 
         if(!file.exists()){
             file.getParentFile().mkdirs();
-            copy(DiscordBotAPI.plugin.getResource(fileName + ".yml"), file);
+            DiscordBotAPI.plugin.saveResource(fileName + ".yml", false);
         }
         config = YamlConfiguration.loadConfiguration(file);
         reload();
     }
-
-    private void copy(InputStream in, File file) {
-        try {
-            OutputStream out = new FileOutputStream(file);
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            out.close();
-            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }

src/main/resources/Config.yml

@@ -1,3 +1,3 @@
 Bot:
-  Token: 'token_here'
-  Command-Prefix: '!ticketgui'
+  Token: "token_here"
+  Command-Prefix: "!ticketgui"

target/classes/Config.yml

@@ -1,3 +1,3 @@
 Bot:
-  Token: 'token_here'
-  Command-Prefix: '!ticketgui'
+  Token: "token_here"
+  Command-Prefix: "!ticketgui"

target/classes/plugin.yml

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