Updated ChatColorHandler to 4.0.0 (#171)

* Updated ChatColorHandler to v2.5.2 * Updated ChatColorHandler to v2.5.3 * Updated ChatColorHandler to 4.0.0
FancyMcPlugins · Sep 26, 2024 · e705aca · e705aca
1 parent 18d6710
commit e705aca
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 38 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -10,14 +10,14 @@ dependencies {
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
     compileOnly("de.oliver.FancyAnalytics:logger:${findProperty("fancyLoggerVersion")}")
 
-    implementation("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    implementation("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 tasks {
     shadowJar {
         archiveClassifier.set("")
 
-        relocate("me.dave.chatcolorhandler", "de.oliver.fancynpcs.libs.chatcolorhandler")
+        relocate("org.lushplugins.chatcolorhandler", "de.oliver.fancynpcs.libs.chatcolorhandler")
     }
 
     publishing {

diff --git a/api/src/main/java/de/oliver/fancynpcs/api/actions/types/ConsoleCommandAction.java b/api/src/main/java/de/oliver/fancynpcs/api/actions/types/ConsoleCommandAction.java
@@ -3,13 +3,11 @@
 import de.oliver.fancynpcs.api.FancyNpcsPlugin;
 import de.oliver.fancynpcs.api.actions.NpcAction;
 import de.oliver.fancynpcs.api.actions.executor.ActionExecutionContext;
-import me.dave.chatcolorhandler.ChatColorHandler;
-import me.dave.chatcolorhandler.parsers.custom.PlaceholderAPIParser;
+import org.lushplugins.chatcolorhandler.ChatColorHandler;
+import org.lushplugins.chatcolorhandler.parsers.ParserTypes;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 /**
  * Represents a console command action that can be executed for an NPC.
  */
@@ -35,7 +33,7 @@ public void execute(@NotNull ActionExecutionContext context, String value) {
             command = value.replace("{player}", context.getPlayer().getName());
         }
 
-        String finalCommand = ChatColorHandler.translate(command, context.getPlayer(), List.of(PlaceholderAPIParser.class));
+        String finalCommand = ChatColorHandler.translate(command, context.getPlayer(), ParserTypes.placeholder());
 
         FancyNpcsPlugin.get().getScheduler().runTask(null, () -> {
             try {

diff --git a/api/src/main/java/de/oliver/fancynpcs/api/actions/types/MessageAction.java b/api/src/main/java/de/oliver/fancynpcs/api/actions/types/MessageAction.java
@@ -2,7 +2,7 @@
 
 import de.oliver.fancynpcs.api.actions.NpcAction;
 import de.oliver.fancynpcs.api.actions.executor.ActionExecutionContext;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/api/src/main/java/de/oliver/fancynpcs/api/actions/types/PlayerCommandAction.java b/api/src/main/java/de/oliver/fancynpcs/api/actions/types/PlayerCommandAction.java
@@ -5,12 +5,10 @@
 import de.oliver.fancynpcs.api.FancyNpcsPlugin;
 import de.oliver.fancynpcs.api.actions.NpcAction;
 import de.oliver.fancynpcs.api.actions.executor.ActionExecutionContext;
-import me.dave.chatcolorhandler.ChatColorHandler;
-import me.dave.chatcolorhandler.parsers.custom.PlaceholderAPIParser;
+import org.lushplugins.chatcolorhandler.ChatColorHandler;
+import org.lushplugins.chatcolorhandler.parsers.ParserTypes;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 /**
  * Represents a player command action that can be executed when triggered by an NPC interaction.
  */
@@ -33,7 +31,7 @@ public void execute(@NotNull ActionExecutionContext context, String value) {
             return;
         }
 
-        String command = ChatColorHandler.translate(value, context.getPlayer(), List.of(PlaceholderAPIParser.class));
+        String command = ChatColorHandler.translate(value, context.getPlayer(), ParserTypes.placeholder());
 
         if (command.toLowerCase().startsWith("server")) {
             String[] args = value.split(" ");

diff --git a/api/src/main/java/de/oliver/fancynpcs/api/actions/types/PlayerCommandAsOpAction.java b/api/src/main/java/de/oliver/fancynpcs/api/actions/types/PlayerCommandAsOpAction.java
@@ -5,12 +5,10 @@
 import de.oliver.fancynpcs.api.FancyNpcsPlugin;
 import de.oliver.fancynpcs.api.actions.NpcAction;
 import de.oliver.fancynpcs.api.actions.executor.ActionExecutionContext;
-import me.dave.chatcolorhandler.ChatColorHandler;
-import me.dave.chatcolorhandler.parsers.custom.PlaceholderAPIParser;
+import org.lushplugins.chatcolorhandler.ChatColorHandler;
+import org.lushplugins.chatcolorhandler.parsers.ParserTypes;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 /**
  * PlayerCommandAsOpAction is a npc action that allows a player to execute a command as an operator when triggered by an NPC interaction.
  */
@@ -33,7 +31,7 @@ public void execute(@NotNull ActionExecutionContext context, String value) {
             return;
         }
 
-        String command = ChatColorHandler.translate(value, context.getPlayer(), List.of(PlaceholderAPIParser.class));
+        String command = ChatColorHandler.translate(value, context.getPlayer(), ParserTypes.placeholder());
 
         if (command.toLowerCase().startsWith("server")) {
             String[] args = value.split(" ");

diff --git a/api/src/main/java/de/oliver/fancynpcs/api/utils/SkinFetcher.java b/api/src/main/java/de/oliver/fancynpcs/api/utils/SkinFetcher.java
@@ -5,8 +5,8 @@
 import com.google.gson.JsonParser;
 import de.oliver.fancylib.UUIDFetcher;
 import de.oliver.fancynpcs.api.FancyNpcsPlugin;
-import me.dave.chatcolorhandler.ChatColorHandler;
-import me.dave.chatcolorhandler.parsers.custom.PlaceholderAPIParser;
+import org.lushplugins.chatcolorhandler.ChatColorHandler;
+import org.lushplugins.chatcolorhandler.parsers.ParserTypes;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
@@ -37,7 +37,7 @@ private SkinFetcher() {
      */
     public static CompletableFuture<SkinData> fetchSkin(String identifier) {
         return CompletableFuture.supplyAsync(() -> {
-            String parsedIdentifier = ChatColorHandler.translate(identifier, List.of(PlaceholderAPIParser.class));
+            String parsedIdentifier = ChatColorHandler.translate(identifier, ParserTypes.placeholder());
 
             // try to get skin from cache
             if (skinCache.containsKey(parsedIdentifier)) {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,7 @@ allprojects {
         mavenCentral()
         maven(url = "https://repo.papermc.io/repository/maven-public/")
         maven(url = "https://repo.fancyplugins.de/releases")
-        maven(url = "https://repo.smrt-1.com/releases")
+        maven(url = "https://repo.lushplugins.org/releases")
     }
 }
 
@@ -46,7 +46,7 @@ dependencies {
     implementation(project(":implementation_1_19_4", configuration = "reobf"))
 
     implementation("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
     implementation("de.oliver.FancyAnalytics:api:${findProperty("fancyAnalyticsVersion")}")
     implementation("de.oliver.FancyAnalytics:logger:${findProperty("fancyLoggerVersion")}")
     implementation("org.incendo:cloud-core:${findProperty("cloudCoreVersion")}")

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ fancyLibVersion=1.0.31
 fancyAnalyticsVersion=0.0.8
 fancyLoggerVersion=0.0.5
 plotsquaredVersion=7.2.0
-chatcolorhandlerVersion=v2.5.3
+chatcolorhandlerVersion=4.0.0
 cloudCoreVersion=2.0.0-rc.2
 cloudPaperVersion=2.0.0-beta.8
 cloudAnnotationsVersion=2.0.0-rc.2
diff --git a/implementation_1_19_4/build.gradle.kts b/implementation_1_19_4/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java b/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
@@ -13,7 +13,7 @@
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;

diff --git a/implementation_1_20/build.gradle.kts b/implementation_1_20/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_20_1/build.gradle.kts b/implementation_1_20_1/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java b/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
@@ -13,7 +13,7 @@
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.Optionull;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;

diff --git a/implementation_1_20_2/build.gradle.kts b/implementation_1_20_2/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java b/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
@@ -13,7 +13,7 @@
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.Optionull;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;

diff --git a/implementation_1_20_4/build.gradle.kts b/implementation_1_20_4/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java b/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
@@ -13,7 +13,7 @@
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.Optionull;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;

diff --git a/implementation_1_20_6/build.gradle.kts b/implementation_1_20_6/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java b/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
@@ -12,7 +12,7 @@
 import de.oliver.fancynpcs.api.events.NpcSpawnEvent;
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.Optionull;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;

diff --git a/implementation_1_21_1/build.gradle.kts b/implementation_1_21_1/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 
     compileOnly(project(":api"))
     compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("me.dave:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
+    compileOnly("org.lushplugins:ChatColorHandler:${findProperty("chatcolorhandlerVersion")}")
 }
 
 

diff --git a/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -12,7 +12,7 @@
 import de.oliver.fancynpcs.api.events.NpcSpawnEvent;
 import de.oliver.fancynpcs.api.utils.NpcEquipmentSlot;
 import io.papermc.paper.adventure.PaperAdventure;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.minecraft.Optionull;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;

diff --git a/src/main/java/de/oliver/fancynpcs/commands/npc/DisplayNameCMD.java b/src/main/java/de/oliver/fancynpcs/commands/npc/DisplayNameCMD.java
@@ -4,7 +4,7 @@
 import de.oliver.fancynpcs.FancyNpcs;
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.events.NpcModifyEvent;
-import me.dave.chatcolorhandler.ModernChatColorHandler;
+import org.lushplugins.chatcolorhandler.ModernChatColorHandler;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentIteratorType;
 import net.kyori.adventure.text.event.ClickEvent;