implement placeholder replacement in sb title

andrei1058 · Oct 8, 2023 · ca73e40 · ca73e40
1 parent 9bce6cd
commit ca73e40
Show file tree

Hide file tree

Showing 19 changed files with 107 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.andrei1058.spigot.sidebar</groupId>
     <artifactId>sidebar-pom</artifactId>
     <packaging>pom</packaging>
-    <version>23.8-SNAPSHOT</version>
+    <version>23.10-SNAPSHOT</version>
     <modules>
         <module>sidebar-base</module>
         <module>sidebar-v1_20_R1</module>

diff --git a/sidebar-base/pom.xml b/sidebar-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-base/sidebar-base.iml b/sidebar-base/sidebar-base.iml
@@ -4,6 +4,7 @@
     <facet type="minecraft" name="Minecraft">
       <configuration>
         <autoDetectTypes>
+          <platformType>ADVENTURE</platformType>
           <platformType>SPIGOT</platformType>
         </autoDetectTypes>
       </configuration>

diff --git a/sidebar-v1_12_R1/pom.xml b/sidebar-v1_12_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_12_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_12_R1/SidebarImpl.java b/sidebar-v1_12_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_12_R1/SidebarImpl.java
@@ -73,6 +73,18 @@ public void sendRemove(Player player) {
         @Override
         public String getDisplayName() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 16) {
                 t = t.substring(0, 16);
             }

diff --git a/sidebar-v1_16_R1/pom.xml b/sidebar-v1_16_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_16_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_16_R1/SidebarImpl.java b/sidebar-v1_16_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_16_R1/SidebarImpl.java
@@ -68,6 +68,18 @@ public void sendRemove(Player player) {
         @Override
         public IChatBaseComponent getDisplayName() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 32) {
                 t = t.substring(0, 32);
             }

diff --git a/sidebar-v1_17_R1/pom.xml b/sidebar-v1_17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_17_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_17_R1/SidebarImpl.java b/sidebar-v1_17_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_17_R1/SidebarImpl.java
@@ -83,6 +83,18 @@ public void sendRemove(Player player) {
         @Override
         public IChatBaseComponent getDisplayName() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 32) {
                 t = t.substring(0, 32);
             }

diff --git a/sidebar-v1_18_R2/pom.xml b/sidebar-v1_18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_18_R2/src/main/java/com/andrei1058/spigot/sidebar/v1_18_R2/SidebarImpl.java b/sidebar-v1_18_R2/src/main/java/com/andrei1058/spigot/sidebar/v1_18_R2/SidebarImpl.java
@@ -73,6 +73,18 @@ public String getName() {
         @Override
         public IChatBaseComponent d() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 32) {
                 t = t.substring(0, 32);
             }

diff --git a/sidebar-v1_19_R2/pom.xml b/sidebar-v1_19_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_19_R2/src/main/java/com/andrei1058/spigot/sidebar/v1_19_R2/SidebarImpl.java b/sidebar-v1_19_R2/src/main/java/com/andrei1058/spigot/sidebar/v1_19_R2/SidebarImpl.java
@@ -72,6 +72,18 @@ public String getName() {
         @Override
         public IChatBaseComponent d() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 32) {
                 t = t.substring(0, 32);
             }

diff --git a/sidebar-v1_19_R3/pom.xml b/sidebar-v1_19_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_19_R3/src/main/java/com/andrei1058/spigot/sidebar/v1_19_R3/SidebarImpl.java b/sidebar-v1_19_R3/src/main/java/com/andrei1058/spigot/sidebar/v1_19_R3/SidebarImpl.java
@@ -72,6 +72,18 @@ public String getName() {
         @Override
         public IChatBaseComponent d() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 32) {
                 t = t.substring(0, 32);
             }

diff --git a/sidebar-v1_20_R1/pom.xml b/sidebar-v1_20_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_20_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_20_R1/SidebarImpl.java b/sidebar-v1_20_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_20_R1/SidebarImpl.java
@@ -72,6 +72,18 @@ public String getName() {
         @Override
         public IChatBaseComponent d() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 256) {
                 t = t.substring(0, 256);
             }

diff --git a/sidebar-v1_8_R3/pom.xml b/sidebar-v1_8_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>23.8-SNAPSHOT</version>
+        <version>23.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sidebar-v1_8_R3/src/main/java/com/andrei1058/spigot/sidebar/v1_8_R3/SidebarImpl.java b/sidebar-v1_8_R3/src/main/java/com/andrei1058/spigot/sidebar/v1_8_R3/SidebarImpl.java
@@ -73,6 +73,18 @@ public void sendRemove(Player player) {
         @Override
         public String getDisplayName() {
             String t = displayName.getLine();
+
+            if (null != getPlaceholders()) {
+                for (PlaceholderProvider placeholderProvider : getPlaceholders()) {
+                    if (t.contains(placeholderProvider.getPlaceholder())) {
+                        t = t.replace(placeholderProvider.getPlaceholder(), placeholderProvider.getReplacement());
+                    }
+                }
+            }
+            t = ChatColor.translateAlternateColorCodes('&',
+                    SidebarManager.getInstance().getPapiSupport().replacePlaceholders(null, t)
+            );
+
             if (t.length() > 16) {
                 t = t.substring(0, 16);
             }