Fix Attachments Not Including Colors

* Fixed Database on reload timing out the server
* Added an error for the db manager
* Fixed an issue where the LostConnectionListener was not being compiled
* Made attachments use a prepend color instead of the provided color to fix formatting
* Updated FirePlugin to finalize onEnable and onDisable
* Updated FirePlugin to make every variable protected
* Added FirePlugin#onShutdown
* Added FirePlugin#saveTranslations
* Temporarily added TrueDiscordlink#migrateConfigurations
* Added the property messages.to_mc_attachment_color to en.yml

Author: FireController1847

src/main/java/com/firecontroller1847/truediscordlink/DatabaseManager.java

@@ -58,11 +58,14 @@ public void connect() {
         } catch (Exception e) {
             e.printStackTrace();
             connected.set(false);
+            this.discordlink.getLogger().info("There was an error attempting to log in to the database. Reload to try again.");
+            return;
         }
 
         // Initialize
         this.initialize();
 
+        // Log
         this.discordlink.getLogger().info("Logged in to Database!");
     }
 

src/main/java/com/firecontroller1847/truediscordlink/DiscordManager.java

@@ -24,6 +24,8 @@
 import org.javacord.api.entity.message.Message;
 import org.javacord.api.entity.server.Server;
 import org.javacord.api.entity.user.User;
+import org.javacord.api.event.connection.LostConnectionEvent;
+import org.javacord.api.listener.connection.LostConnectionListener;
 import org.javacord.api.util.logging.ExceptionLogger;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -131,7 +133,13 @@ public void shutdown() {
 
             // See issue https://github.com/Javacord/Javacord/issues/598 for why we wait
             CountDownLatch shutdownWaiter = new CountDownLatch(1);
-            api.addLostConnectionListener(event -> shutdownWaiter.countDown());
+            // WARNING: Do not use LAMBDA! Otherwise compiler won't include the class for some reason...
+            api.addLostConnectionListener(new LostConnectionListener() {
+                @Override
+                public void onLostConnection(LostConnectionEvent event) {
+                    shutdownWaiter.countDown();
+                }
+            });
             api.disconnect();
             try {
                 shutdownWaiter.await(2, TimeUnit.MINUTES);
@@ -199,6 +207,7 @@ public void sendMinecraftMessage(Message message, boolean edit) {
             }
         }
 
+        // Handle message attachments
         if (message.getAttachments().size() > 0) {
             TextComponent text = buildAttachmentTextComponent(message, content);
             discordlink.getServer().spigot().broadcast(text);
@@ -210,7 +219,10 @@ public void sendMinecraftMessage(Message message, boolean edit) {
                 new String[] { "%discriminator%", message.getAuthor().getDiscriminator().toString() },
                 new String[] { "%id%", message.getAuthor().getIdAsString() }
             );
-            text = text.replace("%message%", content); // Replace content after translation to prevent parsing color codes
+
+            // Replace content after translation to prevent parsing color codes
+            // They are parsed earlier if the configuration option is enabled
+            text = text.replace("%message%", content);
             discordlink.getServer().broadcastMessage(text);
         }
     }
@@ -236,6 +248,9 @@ public TextComponent buildAttachmentTextComponent(Message message, String conten
             content = discordlink.getTranslation("messages.to_mc_attachment_placeholder", true);
         }
 
+        // Prepend color
+        content = discordlink.getTranslation("messages.to_mc_attachment_color", true) + content;
+
         // Make sure only the %message% is clickable by splitting the message into three parts: pre-message, message, post-message
         int messageIndex = attachmentFormat.indexOf("%message%");
         String preMessage = attachmentFormat.substring(0, messageIndex);
@@ -276,6 +291,8 @@ public ArrayList<String[]> sendDiscordMessage(String content, boolean blocking,
         // Run Modifications
         this.modifyAddCheckMentions(atomicContent, atomicModifications, player);
 
+        // TODO: Add support for custom emoji parsing
+
         // Send Messages
         this.sendDiscordBotMessage(atomicContent.get(), blocking, player);
         this.sendDiscordWebhookMessage(atomicContent.get(), player); // Webhooks are always blocking because of HTTP requests... Is this able to be changed?

src/main/java/com/firecontroller1847/truediscordlink/FirePlugin.java

@@ -41,30 +41,30 @@
  * </p>
  *
  * @author FireController#1847
- * @version 1
+ * @version 2
  */
 // TODO: Add support for multiple configurations
 public abstract class FirePlugin extends JavaPlugin {
 
     // The instance of this plugin for singleton usage.
-    private static FirePlugin instance;
+    protected static FirePlugin instance;
 
     // Variables
-    private FileConfiguration translations; // The translations file configuration
+    private Path translationsFile; // The file for the translations file
+    // TODO: Remove protected when we handle configuration migrations
+    protected FileConfiguration translations; // The translations file configuration
     private LinkedHashMap<String, Thread> loops = new LinkedHashMap<>(); // Utility to allow for looping methods
 
     /**
      * <p>
      *     Sets up the configuration and translations and logs enablement.
      *     <br><br>
-     *     If you choose to override this method, ensure you call the super,
-     *     otherwise you will get no benefits from extending this class. It
-     *     is recommended to instead override {@link FirePlugin#onAfterConfiguration()}.
+     *     Cannot be overridden. For similar execution, override {@link FirePlugin#onAfterConfiguration()}.
      * </p>
      * @see FirePlugin#onAfterConfiguration()
      */
     @Override
-    public void onEnable() {
+    public final void onEnable() {
         instance = this;
 
         // Called before configuring
@@ -107,11 +107,9 @@ public boolean onBeforeConfiguration() {
 
     /**
      * <p>
-     *     This is the primary method you should use when setting up anything in your plugin.
+     *     This is the primary method you should override when setting up anything in your plugin.
      *     <br><br>
-     *     Called after the configuration has been loaded. This method is
-     *     provided because it is called before the final logging message
-     *     has been sent.
+     *     Called after the configuration has been loaded.
      *     <br><br>
      *     If you return false, it will automatically disable the plugin.
      *     Please note that it will not send an error message.
@@ -136,11 +134,23 @@ public boolean onConfigReload() {
         return true; // This method does nothing, it's here in case the user wants to override it.
     }
 
+    /**
+     * This is the primary method you should override when cleaning up anything in your plugin.
+     * <br><br>
+     * Called before all threads have been shut down.
+     */
+    public void onShutdown() {
+        // This method does nothing, it's here in case the user wants to override it.
+    }
+
     /**
      * Shuts down all loops and logs disablement
      */
     @Override
-    public void onDisable() {
+    public final void onDisable() {
+        // Called before thread shutdown
+        this.onShutdown();
+
         // Shutdown Loops
         for (Thread thread : loops.values()) {
             thread.interrupt();
@@ -201,7 +211,8 @@ public Plugin loadPlugin(String plugin) {
      */
     protected void loadTranslations() {
         // Destroy it if it exists
-        if (translations != null) {
+        if (translationsFile != null || translations != null) {
+            translationsFile = null;
             translations = null;
         }
 
@@ -211,31 +222,38 @@ protected void loadTranslations() {
             if (code == null) {
                 code = "en";
             }
-            Path filePath = Paths.get(this.getDataFolder() + "/lang/" + code + ".yml");
+            translationsFile = Paths.get(this.getDataFolder() + "/lang/" + code + ".yml");
 
             // Ensure Directories Exist
-            Files.createDirectories(filePath.getParent());
+            Files.createDirectories(translationsFile.getParent());
 
             // Ensure File Exists
-            if (!Files.exists(filePath)) {
+            if (!Files.exists(translationsFile)) {
                 try {
                     this.saveResource("lang/" + code + ".yml", false);
                 } catch (IllegalArgumentException e) {
                     (new InvalidConfigurationException("Invalid language file! Using default en.yml")).printStackTrace();
-                    filePath = Paths.get(this.getDataFolder() + "/lang/en.yml");
+                    translationsFile = Paths.get(this.getDataFolder() + "/lang/en.yml");
                     this.saveResource("lang/en.yml", false);
                 }
             }
 
             // Load Configuration
             translations = new YamlConfiguration();
-            translations.load(filePath.toFile());
+            translations.load(translationsFile.toFile());
         } catch (IOException | InvalidConfigurationException e) {
             e.printStackTrace();
             this.disable();
         }
     }
 
+    /**
+     * Saves the translations configuration file.
+     */
+    protected void saveTranslations() throws IOException {
+        translations.save(translationsFile.toFile());
+    }
+
     /**
      * <p>
      *     Fetches a translation from the translations configuration.

src/main/java/com/firecontroller1847/truediscordlink/TrueDiscordLink.java

@@ -8,6 +8,7 @@
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.PluginManager;
 
+import java.io.IOException;
 import java.util.Objects;
 
 public class TrueDiscordLink extends FirePlugin {
@@ -34,6 +35,15 @@ public boolean onAfterConfiguration() {
             return false;
         }
 
+        // Migrate configurations
+        try {
+            this.migrateConfigurations();
+        } catch (Exception e) {
+            e.printStackTrace();
+            this.getLogger().severe("There was an error attempting to migrate the old configurations to the new ones. Please contact the developer(s), " + this.getDescription().getAuthors().get(0) + ".");
+            return false;
+        }
+
         // Initialize Managers
         versionHelper = new VersionHelper(this);
         discordManager = new DiscordManager(this);
@@ -42,6 +52,7 @@ public boolean onAfterConfiguration() {
         // Register Commands
         PluginCommand cmdtdl = Objects.requireNonNull(this.getCommand("truediscordlink"));
         cmdtdl.setExecutor(new CommandTrueDiscordLink());
+
         cmdtdl.setTabCompleter(new TabCompleterTrueDiscordLink());
 
         // Register Events
@@ -57,9 +68,7 @@ public boolean onAfterConfiguration() {
     }
 
     @Override
-    public void onDisable() {
-        super.onDisable();
-
+    public void onShutdown() {
         if (this.getConfig().getBoolean("configured")) {
             // Disable Discord Manager
             discordManager.shutdown();
@@ -69,6 +78,28 @@ public void onDisable() {
         }
     }
 
+    // TODO: FirePlugin should handle this stuff!
+    private void migrateConfigurations() throws IOException {
+        this.getLogger().info("Checking for version migrations...");
+        boolean migrated = false;
+
+        // v1.0.3 -> v1.0.4
+        if (!translations.contains("messages.to_mc_attachment_color")) {
+            translations.set("messages.to_mc_attachment_color", "§9§n");
+            this.getLogger().info("[en.yml] Added messages.to_mc_attachment_color");
+            migrated = true;
+        }
+
+        // Save
+        if (migrated) {
+            this.saveConfig();
+            this.saveTranslations();
+            this.getLogger().info("Migrations saved!");
+        } else {
+            this.getLogger().info("No migrations found!");
+        }
+    }
+
     // Escapes formatting for Discord messages
     public String escapeDiscordFormatting(String content) {
         return content.replace("*", "\\*").replace("_", "\\_").replace("~", "\\~");

src/main/java/com/firecontroller1847/truediscordlink/commands/CommandReload.java

@@ -20,7 +20,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
         // Reconnect database
         discordlink.getDatabaseManager().disconnect();
-        discordlink.getDatabaseManager().connect();
+        new Thread(discordlink.getDatabaseManager()::connect).start();
 
         // Send notification message
         sender.sendMessage(discordlink.getTranslation("config.reloaded"));

src/main/resources/lang/en.yml

@@ -24,8 +24,9 @@ config:
   reloaded: "%prefix% Configuration reloaded!"
 messages:
   to_mc_format: "%prefix% <%nickname%> %message%"
-  to_mc_attachment_format: "%prefix% <%nickname%> §9§n%message%"
-  to_mc_attachment_placeholder: "§9§nOpen Attachment"
+  to_mc_attachment_format: "%prefix% <%nickname%> %message%"
+  to_mc_attachment_placeholder: "Open Attachment"
+  to_mc_attachment_color: "§9§n"
   from_mc_webhook_format: "%message%"
   from_mc_bot_format: "**%name%** >> %message%"
 tagging: