Fix version issues

KnockturnMC · Apr 10, 2024 · ac484fc · ac484fc
1 parent ad65b3c
commit ac484fc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/main/java/net/pandette/housepoints/commands/HousePointsCommand.java b/src/main/java/net/pandette/housepoints/commands/HousePointsCommand.java
@@ -137,10 +137,10 @@ private boolean runCommand(CommandSender sender, String[] args) {
             return false;
         }
 
-        final String name;
+        final Component name;
         if (sender instanceof Player) {
             name = PointsPlugin.getInstance().getPointsPlayerData().getName(((Player) sender));
-        } else name = PointsPlugin.getInstance().getConfig().getString("consoleSender");
+        } else name = Component.text(PointsPlugin.getInstance().getConfig().getString("consoleSender"));
 
         House house = null;
         for (House h : houseManager.getHouses()) {
@@ -164,7 +164,7 @@ private boolean runCommand(CommandSender sender, String[] args) {
         }
 
         final String path;
-        final String playerName;
+        final Component playerName;
 
         if (args.length > 3) {
             final Player player = Bukkit.getPlayer(args[3]);
@@ -222,7 +222,7 @@ private boolean runCommand(CommandSender sender, String[] args) {
     /*
     This gets the message based on the command and prepares it to be broadcast.
      */
-    private String getMessage(String[] args, LanguageHook languageHook, Player senderPlayer, String path, String playerName, HousePointsEvent event) {
+    private String getMessage(String[] args, LanguageHook languageHook, Player senderPlayer, String path, Component playerName, HousePointsEvent event) {
         String message;
         String reason = "";
         if (args.length == 3) {
@@ -321,15 +321,16 @@ private boolean validateEvent(CommandSender sender, HousePointsEvent event, Lang
      * @return Returns the message in a formatted form.
      */
     private static String formatMessage(String message, HousePointsEvent event, String reason) {
-        String pName = event.getReceiver();
-        if (pName == null) pName = "";
+        Component pName = event.getReceiver();
+        if (pName == null) pName = Component.text("");
+
         return message
-                .replace("{player}", pName)
+                .replace("{player}", MiniMessage.miniMessage().serialize(pName))
                 .replace("{points}", String.valueOf(Math.abs(event.getPoints())))
                 .replace("{reason}", reason)
                 .replace("{house}", event.getHouse().getName())
                 .replace("{hc}", "<" + event.getHouse().getTextColor() + ">")
-                .replace("{giver}", event.getGiver());
+                .replace("{giver}", MiniMessage.miniMessage().serialize(event.getGiver()));
     }
 
     /**

diff --git a/src/main/java/net/pandette/housepoints/config/DefaultPointsPlayerData.java b/src/main/java/net/pandette/housepoints/config/DefaultPointsPlayerData.java
@@ -1,14 +1,15 @@
 package net.pandette.housepoints.config;
 
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 
 public class DefaultPointsPlayerData implements PointsPlayerData {
 
     public DefaultPointsPlayerData(){}
 
     @Override
-    public String getName(Player player) {
-        return player.getDisplayName();
+    public Component getName(Player player) {
+        return player.displayName();
     }
 
 }
diff --git a/src/main/java/net/pandette/housepoints/config/PointsPlayerData.java b/src/main/java/net/pandette/housepoints/config/PointsPlayerData.java
@@ -1,5 +1,6 @@
 package net.pandette.housepoints.config;
 
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 
 public interface PointsPlayerData {
@@ -8,6 +9,6 @@ public interface PointsPlayerData {
      * Allows customizing the name of the House points player.
      * @return A String representation of a player's name.
      */
-    String getName(Player player);
+    Component getName(Player player);
 
 }
diff --git a/src/main/java/net/pandette/housepoints/events/HousePointsEvent.java b/src/main/java/net/pandette/housepoints/events/HousePointsEvent.java
@@ -22,6 +22,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.kyori.adventure.text.Component;
 import net.pandette.housepoints.dtos.House;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
@@ -34,8 +35,8 @@ public class HousePointsEvent extends Event implements Cancellable {
     private static HandlerList handlers = new HandlerList();
     private final House house;
     private final int points;
-    private final String giver;
-    private final String receiver;
+    private final Component giver;
+    private final Component receiver;
     private boolean cancelled;
 
     @Override