Make message system more modular

Vyladence · May 5, 2023 · f270d2e · f270d2e
1 parent 9d6bb6a
commit f270d2e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'org'
-version = '1.0'
+version = '1.1'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/org/simplelinks/commands/LinksCommand.java b/src/main/java/org/simplelinks/commands/LinksCommand.java
@@ -4,7 +4,7 @@
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
 
-import org.simplelinks.util.ChatFormat;
+import org.simplelinks.util.PlayerSend;
 
 public class LinksCommand implements CommandExecutor {
 
@@ -14,7 +14,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
         if (sender instanceof Player player) {
             for (String line : lines) {
-                player.sendMessage(ChatFormat.format(line));
+                PlayerSend.message(player, line);
             }
         } else {
             System.out.println("This command can only run in-game!");

diff --git a/src/main/java/org/simplelinks/commands/ReloadConfig.java b/src/main/java/org/simplelinks/commands/ReloadConfig.java
@@ -4,7 +4,7 @@
 
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
-import org.simplelinks.util.ChatFormat;
+import org.simplelinks.util.PlayerSend;
 
 public class ReloadConfig implements CommandExecutor {
     @Override
@@ -17,15 +17,15 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 SimpleLinks.getPlugin(SimpleLinks.class).reloadConfig();
 
                 if (sender instanceof Player player) {
-                    player.sendMessage(ChatFormat.format("&8[&dSimpleLinks&8] &fConfig Reloaded!"));
+                    PlayerSend.message(player, "&8[&dSimpleLinks&8] &fConfig Reloaded!");
                 } else {
                     System.out.println("Config Reloaded!");
                 }
             } else {
                 // Unknown Command fallback
 
                 if (sender instanceof Player player) {
-                    player.sendMessage(ChatFormat.format("&8[&dSimpleLinks&8] &cUnknown subcommand!"));
+                    PlayerSend.message(player, "&8[&dSimpleLinks&8] &cUnknown subcommand!");
                 } else {
                     System.out.println("Unknown Subcommand!");
                 }
@@ -35,7 +35,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             String version = SimpleLinks.getPlugin(SimpleLinks.class).getDescription().getVersion();
 
             if (sender instanceof Player player) {
-                player.sendMessage(ChatFormat.format("&8[&dSimpleLinks&8] &fRunning &fLinksPlugin &av" + version));
+                PlayerSend.message(player, "&8[&dSimpleLinks&8] &fRunning &fLinksPlugin &av" + version);
             } else {
                 System.out.println("Running SimpleLinks v" + version);
             }

diff --git a/src/main/java/org/simplelinks/util/ChatFormat.java b/src/main/java/org/simplelinks/util/ChatFormat.java
@@ -3,8 +3,5 @@
 import org.bukkit.ChatColor;
 
 public class ChatFormat {
-    public static String format (String message) {
-        String formattedHex = ConvertHex.convert(message);
-        return ChatColor.translateAlternateColorCodes('&', formattedHex);
-    }
+
 }
diff --git a/src/main/java/org/simplelinks/util/PlayerSend.java b/src/main/java/org/simplelinks/util/PlayerSend.java
@@ -0,0 +1,12 @@
+package org.simplelinks.util;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+public class PlayerSend {
+    public static void message (Player player, String message) {
+        String formattedHex = ConvertHex.convert(message);
+        String formattedYAML = ChatColor.translateAlternateColorCodes('&', formattedHex);
+        player.sendMessage(formattedYAML);
+    }
+}