FrancyHologram update and gradle relocation

AerWyn81 · Aug 5, 2024 · 6e60a0c · 6e60a0c
1 parent e41584e
commit 6e60a0c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ allprojects {
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
         maven("https://repo.codemc.org/repository/maven-public")
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-        maven("https://jitpack.io")
         maven("https://repo.fancyplugins.de/releases")
+        maven("https://jitpack.io")
     }
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -14,16 +14,17 @@ dependencies {
     compileOnly("com.arcaniax:HeadDatabase-API:1.3.2")
     compileOnly("com.github.decentsoftware-eu:decentholograms:2.8.8")
     compileOnly("me.filoghost.holographicdisplays:holographicdisplays-api:3.0.4")
+    compileOnly("de.oliver:FancyHolograms:2.3.1")
     compileOnly(files("../libs/CMILib1.4.7.16.jar"))
     compileOnly(files("../libs/CMI-9.7.3.2.jar"))
-    compileOnly("de.oliver:FancyHolograms:2.3.0")
-    implementation(files("../libs/holoeasy-core-3.4.4.jar"))
-    //implementation("com.github.unldenis.holoeasy:holoeasy-core:3.4.0")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.21")
     implementation("redis.clients:jedis:5.1.3")
     implementation("com.zaxxer:HikariCP:5.1.0")
     implementation("org.apache.commons:commons-lang3:3.12.0")
     implementation("de.tr7zw:item-nbt-api:2.13.1")
+    implementation(files("../libs/holoeasy-core-3.4.4.jar"))
+    implementation("net.kyori:adventure-api:4.17.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
 }
 
 tasks {
@@ -38,7 +39,19 @@ tasks {
     }
 
     shadowJar {
-        relocate("de.tr7zw.changeme.nbtapi", "fr.aerwyn81.headblocks.bukkit.shaded.nbtapi")
+        relocate("kotlin", "fr.aerwyn81.libs.kotlin")
+        relocate("com.google.gson", "fr.aerwyn81.libs.gson")
+        relocate("com.jetbrains.annotations", "fr.headblocks.libs.gson")
+        relocate("redis.clients.jedis", "fr.aerwyn81.libs.jedis")
+        relocate("com.zaxxer", "fr.aerwyn81.libs.hikariCP")
+        relocate("org.apache.commons", "fr.aerwyn81.libs.commons-lang3")
+        relocate("de.tr7zw.changeme.nbtapi", "fr.aerwyn81.libs.nbtapi")
+        relocate("org.lushplugins", "fr.aerwyn81.libs.chatColorHandler")
+        relocate("org.holoeasy", "fr.aerwyn81.libs.holoEasy")
+        relocate("org.jetbrains.annotations", "fr.aerwyn81.libs.jetbrains-annotations")
+        relocate("org.json", "fr.aerwyn81.libs.json")
+        relocate("org.slf4j", "fr.aerwyn81.libs.slf4j")
+        relocate("net.kyori", "fr.aerwyn81.libs.adventure-api")
 
         if (project.hasProperty("cd"))
             archiveFileName.set("HeadBlocks.jar")

diff --git a/core/src/main/java/fr/aerwyn81/headblocks/holograms/types/FHHologram.java b/core/src/main/java/fr/aerwyn81/headblocks/holograms/types/FHHologram.java
@@ -3,7 +3,7 @@
 import de.oliver.fancyholograms.api.FancyHologramsPlugin;
 import de.oliver.fancyholograms.api.HologramManager;
 import de.oliver.fancyholograms.api.data.TextHologramData;
-import de.oliver.fancyholograms.api.data.property.visibility.Visibility;
+import de.oliver.fancyholograms.api.data.property.Visibility;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import fr.aerwyn81.headblocks.HeadBlocks;
 import fr.aerwyn81.headblocks.holograms.EnumTypeHologram;

diff --git a/core/src/main/java/fr/aerwyn81/headblocks/services/HeadService.java b/core/src/main/java/fr/aerwyn81/headblocks/services/HeadService.java
@@ -34,7 +34,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class HeadService {
@@ -76,7 +75,7 @@ private static void saveConfig() {
         try {
             config.save(configFile);
         } catch (IOException e) {
-            Bukkit.getLogger().log(Level.SEVERE, "Cannot save the config file to {0}", configFile.getName());
+            HeadBlocks.log.sendMessage("&cCannot save the config file to {0}", configFile.getName());
         }
     }
 

diff --git a/core/src/main/java/fr/aerwyn81/headblocks/services/PlaceholdersService.java b/core/src/main/java/fr/aerwyn81/headblocks/services/PlaceholdersService.java
@@ -34,10 +34,6 @@ public static String parse(String pName, UUID pUuid, HeadLocation headLocation,
         return MessageUtils.centerMessage(message);
     }
 
-    public static String[] parse(Player player, List<String> messages) {
-        return parse(player, null, messages);
-    }
-
     public static String[] parse(Player player, HeadLocation headLocation, List<String> messages) {
         List<String> msgs = new ArrayList<>();
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,2 +1,3 @@
-include("HeadBlocks")
+rootProject.name = "HeadBlocks"
+
 include("core")