Use adventure

Winds-Studio · May 1, 2023 · 160e7f5 · 160e7f5
1 parent 45f8ef1
commit 160e7f5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -87,6 +87,11 @@
             <version>1.19.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.13.1</version>
+        </dependency>
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>

diff --git a/src/main/java/org/surf/command/BaseCommand.java b/src/main/java/org/surf/command/BaseCommand.java
@@ -4,6 +4,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.surf.Main;
+import org.surf.util.Utils;
 
 public abstract class BaseCommand {
     public final String CONSOLE_ONLY = "This command is console only";
@@ -54,19 +55,17 @@ public String[] getSubCommands() {
         return subCommands;
     }
     public void sendMessage(CommandSender sender, String message) {
-        sender.sendMessage(ChatColor.translateAlternateColorCodes('&', message));
+        Utils.sendMessage(sender, message);
     }
 
     public void sendNoPermission(CommandSender sender) {
-        sender.sendMessage(ChatColor.translateAlternateColorCodes(
-                '&',
-                "&4Error:&r&c You are lacking the permission " + getPermission()));
+        Utils.sendMessage(sender, "&4Error:&r&c You are lacking the permission " + getPermission());
     }
 
     public void sendErrorMessage(CommandSender sender, String message) {
         String finalMessage = "&4Error:&r&c " + message;
         finalMessage = ChatColor.translateAlternateColorCodes('&', finalMessage);
-        sender.sendMessage(finalMessage);
+        Utils.sendMessage(sender, finalMessage);
     }
 
     public Player getSenderAsPlayer(CommandSender sender) {

diff --git a/src/main/java/org/surf/command/commands/BaseCommand.java b/src/main/java/org/surf/command/commands/BaseCommand.java
@@ -28,7 +28,7 @@ public void execute(CommandSender sender, String[] args, Main plugin) {
                 case "reload":
                     plugin.reloadConfig();
                     ConfigCache.loadConfig();
-                    Utils.sendMessage(sender, Utils.getPrefix() + "&aReloaded configuration file");
+                    sendMessage(sender, Utils.getPrefix() + "&aReloaded configuration file");
                     break;
                 case "version":
                     sendMessage(sender, Utils.getPrefix() + "&6Version &r&c" + plugin.getDescription().getVersion());

diff --git a/src/main/java/org/surf/modules/patches/ChunkBan.java b/src/main/java/org/surf/modules/patches/ChunkBan.java
@@ -12,6 +12,7 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.surf.util.ConfigCache;
+import org.surf.util.Utils;
 
 import java.util.Arrays;
 
@@ -30,15 +31,15 @@ public void onPlace(BlockPlaceEvent event) {
         }
         if (isChecked(block) && chunk.getTileEntities().length > ConfigCache.ChunkBanTileEntityMax) {
             event.setCancelled(true);
-            player.sendMessage(ChatColor.translateAlternateColorCodes('&', ConfigCache.ChunkBanPreventMessage));
+            Utils.sendMessage(player, ConfigCache.ChunkBanPreventMessage);
             return;
         }
         if (isSkull(block.getType())) {
             // get chunk skull count
             long skullCount = Arrays.stream(chunk.getTileEntities()).filter(tileEntity -> isSkull(tileEntity.getType())).count();
             if (skullCount > ConfigCache.ChunkBanSkullMax) {
                 event.setCancelled(true);
-                player.sendMessage(ChatColor.translateAlternateColorCodes('&', ConfigCache.ChunkBanPreventMessage));
+                Utils.sendMessage(player, ConfigCache.ChunkBanPreventMessage);
             }
         }
     }
@@ -59,7 +60,7 @@ public void onSpawn(PlayerInteractEvent event) {
             long amount = Arrays.stream(chunk.getEntities()).filter(entity -> entity instanceof ItemFrame).count();
             if (amount + chunk.getTileEntities().length > ConfigCache.ChunkBanTileEntityMax) {
                 event.setCancelled(true);
-                event.getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', ConfigCache.ChunkBanPreventMessage));
+                Utils.sendMessage(event.getPlayer(), ConfigCache.ChunkBanPreventMessage);
             }
         }
     }

diff --git a/src/main/java/org/surf/modules/patches/GateWay.java b/src/main/java/org/surf/modules/patches/GateWay.java
@@ -36,10 +36,10 @@ public void onCrashAttempt(EntityTeleportEndGatewayEvent event) {
             return;
         }
         for (Player nearby : entity.getLocation().getNearbyPlayers(30)) {
-            nearby.sendMessage(ChatColor.GOLD
-                    + "Going through ENDGATEWAY while riding "
+            nearby.sendMessage(net.kyori.adventure.text.Component.text(
+                    "Going through ENDGATEWAY while riding "
                     + entity.getName()
-                    + " is currently patched");
+                    + " is currently patched", net.kyori.adventure.text.format.NamedTextColor.GOLD));
             nearby.teleport(new Location(nearby.getWorld(), nearby.getLocation().getBlockX(),
                     nearby.getLocation().getBlockY() + 5, nearby.getLocation().getBlockZ() + 30));
             entity.setVelocity(vector);

diff --git a/src/main/java/org/surf/util/Utils.java b/src/main/java/org/surf/util/Utils.java
@@ -6,9 +6,6 @@
 import org.bukkit.entity.Player;
 import org.surf.Main;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
 import java.util.logging.Level;
 
 public class Utils {
@@ -25,11 +22,11 @@ public static double getTps() {
 	}
 
 	public static void sendMessage(Player player, String string) {
-		player.sendMessage(ChatColor.translateAlternateColorCodes('&', string));
+		player.sendMessage(net.kyori.adventure.text.Component.text(ChatColor.translateAlternateColorCodes('&', string)));
 	}
 
 	public static void sendMessage(CommandSender sender, String string) {
-		sender.sendMessage(ChatColor.translateAlternateColorCodes('&', string));
+		sender.sendMessage(net.kyori.adventure.text.Component.text(ChatColor.translateAlternateColorCodes('&', string)));
 	}
 
 	public static void kickPlayer(Player player, String string) {
@@ -39,7 +36,7 @@ public static void kickPlayer(Player player, String string) {
 	public static void sendOpMessage(String message) {
 		for (Player online : Bukkit.getOnlinePlayers()) {
 			if (online.isOp()) {
-				online.sendMessage(ChatColor.translateAlternateColorCodes('&', message));
+				online.sendMessage(net.kyori.adventure.text.Component.text(ChatColor.translateAlternateColorCodes('&', message)));
 
 			}
 		}