diff --git a/gradle.properties b/gradle.properties index 4fc097d..bf88968 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,9 +47,9 @@ lwjgl_version=3.3.4 fastutil_version=8.5.15 # Proxy settings -systemProp.socks.proxyHost=127.0.0.1 -systemProp.socks.proxyPort=7890 -systemProp.http.proxyHost=127.0.0.1 -systemProp.http.proxyPort=7890 -systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=7890 \ No newline at end of file +#systemProp.socks.proxyHost=127.0.0.1 +#systemProp.socks.proxyPort=7890 +#systemProp.http.proxyHost=127.0.0.1 +#systemProp.http.proxyPort=7890 +#systemProp.https.proxyHost=127.0.0.1 +#systemProp.https.proxyPort=7890 \ No newline at end of file diff --git a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/emoji/ItemsAdderEmojiProvider.java b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/emoji/ItemsAdderEmojiProvider.java index 1f8ee9f..8ef320e 100644 --- a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/emoji/ItemsAdderEmojiProvider.java +++ b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/emoji/ItemsAdderEmojiProvider.java @@ -19,6 +19,7 @@ package net.momirealms.customnameplates.bukkit.compatibility.emoji; import dev.lone.itemsadder.api.FontImages.FontImageWrapper; import net.momirealms.customnameplates.api.CNPlayer; +import net.momirealms.customnameplates.api.CustomNameplates; import net.momirealms.customnameplates.api.feature.chat.emoji.EmojiProvider; import org.bukkit.entity.Player; @@ -27,7 +28,10 @@ public class ItemsAdderEmojiProvider implements EmojiProvider { @Override public String replace(CNPlayer player, String text) { try { - return FontImageWrapper.replaceFontImages((Player) player.player(), text).replace("§f","").replace("§r",""); + CustomNameplates.getInstance().debug(() -> "before: " + text); + String result = FontImageWrapper.replaceFontImages((Player) player.player(), text).replace("§f","").replace("§r",""); + CustomNameplates.getInstance().debug(() -> "after: " + result); + return result; } catch (NoSuchMethodError ignore) { return text; } diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java index 451a52d..277d657 100644 --- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java +++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitChatManager.java @@ -64,10 +64,11 @@ public class BukkitChatManager extends AbstractChatManager { @Override protected void setUpPlatformEmojiProviders() { - if (Bukkit.getPluginManager().isPluginEnabled("ItemsAdder")) { + if (Bukkit.getPluginManager().getPlugin("ItemsAdder") != null) { this.emojiProviders.add(new ItemsAdderEmojiProvider()); + plugin.debug(() -> "ItemsAdderEmojiProvider Enabled"); } - if (Bukkit.getPluginManager().isPluginEnabled("Oraxen")) { + if (Bukkit.getPluginManager().getPlugin("Oraxen") != null) { try { this.emojiProviders.add(new OraxenEmojiProvider(Bukkit.getPluginManager().getPlugin("Oraxen").getDescription().getVersion().startsWith("1") ? 1 : 2)); } catch (Exception ignore) {