Skip to content

Commit

Permalink
Use ChatColorHandler
Browse files Browse the repository at this point in the history
  • Loading branch information
OliverSchlueter committed Dec 11, 2023
1 parent cd78632 commit ebf4d65
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 24 deletions.
3 changes: 1 addition & 2 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ dependencies {

compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")

compileOnly("me.clip:placeholderapi:${findProperty("placeholderapiVersion")}")
compileOnly("io.github.miniplaceholders:miniplaceholders-api:${findProperty("miniplaceholdersVersion")}")
implementation("com.github.CoolDCB:ChatColorHandler:v2.5.0")
}

tasks {
Expand Down
21 changes: 2 additions & 19 deletions api/src/main/java/de/oliver/fancyholograms/api/Hologram.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
import de.oliver.fancyholograms.api.data.TextHologramData;
import de.oliver.fancyholograms.api.events.HologramHideEvent;
import de.oliver.fancyholograms.api.events.HologramShowEvent;
import de.oliver.fancyholograms.api.utils.LegacyColorConverter;
import io.github.miniplaceholders.api.MiniPlaceholders;
import me.clip.placeholderapi.PlaceholderAPI;
import me.dave.chatcolorhandler.ModernChatColorHandler;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -280,22 +276,9 @@ public final Component getShownText(@Nullable final Player player) {
return null;
}

var tags = TagResolver.empty();
var text = String.join("\n", textData.getText());

if (player != null) {
if (isUsingPlaceholderApi()) {
text = PlaceholderAPI.setPlaceholders(player, text);
}

if (isUsingMiniplaceholders()) {
tags = MiniPlaceholders.getAudienceGlobalPlaceholders(player);
}
}

text = LegacyColorConverter.legacyColorCodesToMiniMessages(text);

return MiniMessage.miniMessage().deserialize(text, tags);
return ModernChatColorHandler.translate(text, player);
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ allprojects {
maven(url = "https://repo.fancyplugins.de/snapshots")
maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/")
maven(url = "https://repo.viaversion.com/")
maven(url = "https://jitpack.io")
}
}

Expand Down Expand Up @@ -57,8 +58,11 @@ tasks {

downloadPlugins {
hangar("FancyNpcs", findProperty("fancyNpcsVersion").toString())
hangar("PlaceholderAPI", findProperty("placeholderapiVersion").toString())
hangar("PlaceholderAPI", "2.11.5")
modrinth("miniplaceholders", "M6gjRuIx")

hangar("ViaVersion", "4.9.3-SNAPSHOT+148")
hangar("ViaBackwards", "4.9.2-SNAPSHOT+89")
}
}

Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
minecraftVersion=1.20.4
fancyNpcsVersion=2.0.5
fancyLibVersion=1.0.5.1
placeholderapiVersion=2.11.5
miniplaceholdersVersion=2.2.3
viaversionVersion=4.7.0

0 comments on commit ebf4d65

Please sign in to comment.