From c5662df8336d32c9650010e6c96496419fdc6aa1 Mon Sep 17 00:00:00 2001
From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Sat, 17 Sep 2022 12:15:00 +0800
Subject: [PATCH] 2.0-PRE-12

---
 .../momirealms/customnameplates/ConfigManager.java    |  2 ++
 .../customnameplates/nameplates/NameplatesTeam.java   | 11 ++++++++++-
 .../customnameplates/resource/ResourceManager.java    |  6 +++---
 src/main/resources/nameplate.yml                      |  7 ++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/momirealms/customnameplates/ConfigManager.java b/src/main/java/net/momirealms/customnameplates/ConfigManager.java
index 18c4e51..f6b97e9 100644
--- a/src/main/java/net/momirealms/customnameplates/ConfigManager.java
+++ b/src/main/java/net/momirealms/customnameplates/ConfigManager.java
@@ -176,6 +176,7 @@ public class ConfigManager {
         public static String default_nameplate;
         public static String player_prefix;
         public static String player_suffix;
+        public static String player_name;
         public static long preview;
         public static boolean update;
         public static int refresh;
@@ -192,6 +193,7 @@ public class ConfigManager {
 
             YamlConfiguration config = getConfig("nameplate.yml");
             default_nameplate = config.getString("nameplate.default-nameplate");
+            player_name = config.getString("nameplate.player-name", "%player_name%");
             preview = config.getLong("nameplate.preview-duration");
             mode = config.getString("nameplate.mode","team");
             update = config.getBoolean("nameplate.update.enable",true);
diff --git a/src/main/java/net/momirealms/customnameplates/nameplates/NameplatesTeam.java b/src/main/java/net/momirealms/customnameplates/nameplates/NameplatesTeam.java
index a81374a..d436a61 100644
--- a/src/main/java/net/momirealms/customnameplates/nameplates/NameplatesTeam.java
+++ b/src/main/java/net/momirealms/customnameplates/nameplates/NameplatesTeam.java
@@ -130,7 +130,16 @@ public class NameplatesTeam {
 
         this.dynamic = playerPrefix + playerSuffix;
 
-        String name = this.player.getName();
+        String name;
+        if (ConfigManager.Nameplate.player_name.equals("%player_name%")) {
+            name = this.player.getName();
+        }
+        else if (ConfigManager.Main.placeholderAPI) {
+            name = CustomNameplates.instance.getPlaceholderManager().parsePlaceholders(player, ConfigManager.Nameplate.player_name);
+        }
+        else {
+            name = this.player.getName();
+        }
 
         this.prefixText = NameplateUtil.makeCustomNameplate(
                 MiniMessage.miniMessage().stripTags(playerPrefix),
diff --git a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java
index fd2115b..1b1961b 100644
--- a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java
+++ b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java
@@ -434,9 +434,9 @@ public class ResourceManager {
             AdventureUtil.consoleMessage("<red>[CustomNameplates] Error! Failed to generate font json...</red>");
         }
 
-        if (NAMEPLATES.size() != 1) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + (NAMEPLATES.size() -1) + " <gray>nameplates");
-        if (BUBBLES.size() != 0) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + BUBBLES.size() + " <gray>bubbles");
-        if (BACKGROUNDS.size() != 0) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + BACKGROUNDS.size() + " <gray>backgrounds");
+        if (NAMEPLATES != null) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + (NAMEPLATES.size() -1) + " <gray>nameplates");
+        if (BUBBLES != null) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + BUBBLES.size() + " <gray>bubbles");
+        if (BACKGROUNDS != null) AdventureUtil.consoleMessage("[CustomNameplates] Loaded <green>" + BACKGROUNDS.size() + " <gray>backgrounds");
         //复制到其他插件文件夹中
         hookCopy(gd_file);
     }
diff --git a/src/main/resources/nameplate.yml b/src/main/resources/nameplate.yml
index bdfc933..91a4525 100644
--- a/src/main/resources/nameplate.yml
+++ b/src/main/resources/nameplate.yml
@@ -1,5 +1,5 @@
 # Do not change
-config-version: '7'
+config-version: '8'
 
 nameplate:
   # mode: Team / Riding / Teleporting
@@ -18,6 +18,11 @@ nameplate:
   # Or installing BungeeTabListPlus / TAB on the proxy server would fix
   create-fake-team: true
 
+  # This decides what %nameplates_prefix/suffix% would return
+  # This only works on Riding / Teleporting mode
+  # Don't change this if you are using Team mode
+  player-name: '%player_name%'
+
   update:
     # Nameplates will be updated every x ticks
     # If your nameplate content is static, it's better to disable updating for better performance