From 891e88b895714bd357d30ceda4606e20147d5037 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sun, 6 Mar 2022 10:40:37 +0100
Subject: [PATCH] Add minimessage placeholders

---
 .../GriefPrevention/GriefPrevention.java         | 16 +++++++++++-----
 .../GriefPrevention/alttd/config/Config.java     | 12 ++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 379bd10..e2e1842 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -29,6 +29,7 @@ import me.ryanhamshire.GriefPrevention.alttd.util.SafeZone;
 import me.ryanhamshire.GriefPrevention.events.PreventBlockBreakEvent;
 import me.ryanhamshire.GriefPrevention.events.SaveTrappedPlayerEvent;
 import me.ryanhamshire.GriefPrevention.events.TrustChangedEvent;
+import net.kyori.adventure.text.minimessage.Template;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
@@ -2469,9 +2470,13 @@ public class GriefPrevention extends JavaPlugin
                 player.sendMiniMessage(Config.PlayerNotSpecified, null); // todo placeholders.
                 return true;
             }
+            List<Template> templates = new ArrayList<>(List.of(
+                    Template.template("target", args[0]),
+                    Template.template("player", player.name())
+                    ));
             Player target = Bukkit.getPlayer(args[0]);
             if (target == null) {
-                player.sendMiniMessage(Config.PlayerOffline, null); // todo placeholders.
+                player.sendMiniMessage(Config.PlayerOffline, templates); // todo placeholders.
                 return true;
             }
             if (player.equals(target)) {
@@ -2480,17 +2485,18 @@ public class GriefPrevention extends JavaPlugin
             }
             Claim claim = this.dataStore.getClaimAt(target.getLocation(), true, null);
             if (claim == null || (claim.checkPermission(player, ClaimPermission.Manage, null) != null)) {
-                player.sendMiniMessage(Config.TargetNotInClaim, null); // todo placeholders.
+                player.sendMiniMessage(Config.TargetNotInClaim, templates); // todo placeholders.
                 return true;
             }
+            templates.add(Template.template("claim_owner", claim.getOwnerName()));
             SafeZone zone = new SafeZone(claim);
             if ((target.hasPermission("griefprevention.adminclaims") && claim.isAdminClaim()) || zone
                     .hasTrust(target.getUniqueId())) {
-                player.sendMiniMessage(Config.CannotKickTrustedTarget, null); // todo placeholders.
+                player.sendMiniMessage(Config.CannotKickTrustedTarget, templates); // todo placeholders.
                 return true;
             }
             if (target.hasPermission("griefprevention.kickfromclaimexempt")) {
-                player.sendMiniMessage(Config.CannotKickExemptTarget, null); // todo placeholders.
+                player.sendMiniMessage(Config.CannotKickExemptTarget, templates); // todo placeholders.
                 return true;
             }
             zone.testForSafeSpot();
@@ -2501,7 +2507,7 @@ public class GriefPrevention extends JavaPlugin
                 if (target.isInsideVehicle()) target.leaveVehicle();
                 target.teleport(safe);
                 Bukkit.getPluginManager().callEvent(new PlayerTeleportEvent(target, safe, safe));
-                player.sendMiniMessage(Config.KickSuccess, null); // todo placeholders.
+                player.sendMiniMessage(Config.KickSuccess, templates); // todo placeholders.
                 target.sendMiniMessage(Config.KickedFromClaim, null); // todo placeholders.
             }
             return true;
diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java
index c876c9b..527cc1c 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java
@@ -176,14 +176,14 @@ public class Config extends AbstractConfig {
     }
 
     public static String PlayerNotSpecified = "<red>You must specify a player.";
-    public static String PlayerOffline = "<red>There isn't anyone online with <white>{INPUT} <red>in their name!";
+    public static String PlayerOffline = "<red>There isn't anyone online with <white><target> <red>in their name!";
     public static String CannotKickSelf = "<red>You cannot kick yourself!";
-    public static String TargetNotInClaim = "<red>{TARGET} is not inside of any claims that you control!";
-    public static String CannotKickTrustedTarget = "<red>{TARGET} has trust in the claims they're in, therefore they cannot be kicked!";
-    public static String CannotKickExemptTarget = "<red>{TARGET} cannot be kicked from claims.";
-    public static String KickSuccess = "<green>{TARGET} was successfully kicked from the claim!";
+    public static String TargetNotInClaim = "<red><target> is not inside of any claims that you control!";
+    public static String CannotKickTrustedTarget = "<red><target> has trust in the claims they're in, therefore they cannot be kicked!";
+    public static String CannotKickExemptTarget = "<red><target> cannot be kicked from claims.";
+    public static String KickSuccess = "<green><target> was successfully kicked from the claim!";
     public static String NoSafeLocation = "<red>Kick Unsuccessful... No Safe Location Available!"; // send to spawn?
-    public static String KickedFromClaim = "{PLAYER} <yellow>has kicked you out of {CLAIM_OWNER}'s claim!";
+    public static String KickedFromClaim = "<player> <yellow>has kicked you out of <claim_owner>'s claim!";
     private static void kickFromClaimMessages() {
         PlayerNotSpecified = config.getString("kickfromclaim.PlayerNotSpecified", PlayerNotSpecified);
         PlayerOffline = config.getString("kickfromclaim.PlayerOffline", PlayerOffline);