diff --git a/src/main/java/net/Indyuce/mmoitems/api/item/build/ItemStackBuilder.java b/src/main/java/net/Indyuce/mmoitems/api/item/build/ItemStackBuilder.java index 4ac3ff4f..3ad8cd13 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/item/build/ItemStackBuilder.java +++ b/src/main/java/net/Indyuce/mmoitems/api/item/build/ItemStackBuilder.java @@ -4,9 +4,9 @@ import com.google.gson.JsonArray; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.api.item.ItemTag; import io.lumine.mythic.lib.api.item.NBTItem; -import io.lumine.mythic.lib.api.util.ComponentUtil; import io.lumine.mythic.utils.text.Component; import io.lumine.mythic.utils.text.format.TextDecoration; +import io.lumine.mythic.utils.text.minimessage.MiniMessage; import net.Indyuce.mmoitems.ItemStats; import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.api.Type; @@ -194,7 +194,7 @@ public class ItemStackBuilder { nbtItem.addTag(tags); nbtItem.setDisplayNameComponent(Component.text() - .append(ComponentUtil.legacyMiniMessage(meta.getDisplayName())) + .append(MiniMessage.get().parse(meta.getDisplayName())) .decoration(TextDecoration.ITALIC, false) .build()); diff --git a/src/main/java/net/Indyuce/mmoitems/api/item/util/DynamicLore.java b/src/main/java/net/Indyuce/mmoitems/api/item/util/DynamicLore.java index 7b0fcccc..298ece20 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/item/util/DynamicLore.java +++ b/src/main/java/net/Indyuce/mmoitems/api/item/util/DynamicLore.java @@ -4,10 +4,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.api.item.NBTItem; -import io.lumine.mythic.lib.api.util.ComponentUtil; import io.lumine.mythic.utils.text.Component; import io.lumine.mythic.utils.text.format.TextDecoration; +import io.lumine.mythic.utils.text.minimessage.MiniMessage; import net.Indyuce.mmoitems.MMOItems; +import net.md_5.bungee.api.ChatColor; import org.bukkit.inventory.ItemStack; import java.util.ArrayList; @@ -28,7 +29,7 @@ public class DynamicLore { String s = replace(e.getAsString()); if(!s.equals("!INVALID!")) lore.add(Component.text() - .append(ComponentUtil.legacyMiniMessage(s)) + .append(MiniMessage.get().parse(ChatColor.translateAlternateColorCodes('&', s))) .decoration(TextDecoration.ITALIC, false) .build()); } @@ -42,7 +43,7 @@ public class DynamicLore { switch(input.toLowerCase()) { case "%durability%": if(item.hasTag("MMOITEMS_DURABILITY") && item.hasTag("MMOITEMS_MAX_DURABILITY")) - return MythicLib.plugin.parseColors(MMOItems.plugin.getLanguage().getDynLoreFormat("durability") + return (MMOItems.plugin.getLanguage().getDynLoreFormat("durability") .replace("%durability%", "" + item.getInteger("MMOITEMS_DURABILITY")) .replace("%max_durability%", "" + item.getInteger("MMOITEMS_MAX_DURABILITY"))); else return "!INVALID!"; diff --git a/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java b/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java index bbdb2f61..abb1cacc 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java @@ -2,7 +2,6 @@ package net.Indyuce.mmoitems.stat; import io.lumine.mythic.lib.api.item.ItemTag; import io.lumine.mythic.lib.version.VersionMaterial; -import net.Indyuce.mmoitems.ItemStats; import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.api.ItemTier; import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder; @@ -30,7 +29,7 @@ public class DisplayName extends StringStat { format = format.replace("", tier != null ? ChatColor.stripColor(tier.getName()) : ""); format = format.replace("", tier != null ? ChatColor.getLastColors(tier.getName()) : "&f"); - item.getMeta().setDisplayName(format); + item.getMeta().setDisplayName(ChatColor.translateAlternateColorCodes('&', format)); } /**