v2.1.0.1

Author: byteful

build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation 'com.jeff-media:MorePersistentDataTypes:2.4.0'
 
     compileOnly files('libs/folia-api-1.20.4-R0.1-SNAPSHOT.jar') // Modified API jar with Java 8 support
-    compileOnly 'net.kyori:adventure-api:4.26.1' // Not used but needed for Folia compilation
+    compileOnly 'net.kyori:adventure-api:4.26.1'
     compileOnly 'net.kyori:adventure-platform-bukkit:4.4.1'
     compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
     compileOnly 'org.jetbrains:annotations:26.0.2'

src/main/java/me/byteful/plugin/leveltools/profile/item/ItemProfileLoader.java

@@ -1,5 +1,6 @@
 package me.byteful.plugin.leveltools.profile.item;
 
+import com.cryptomorin.xseries.XMaterial;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -152,9 +153,10 @@ private Set<Material> parseMaterials(@NotNull List<String> materialNames) {
 
         for (String name : materialNames) {
             try {
-                Material material = Material.valueOf(name.toUpperCase());
-                materials.add(material);
-            } catch (IllegalArgumentException e) {
+                Optional<XMaterial> material = XMaterial.matchXMaterial(name.toUpperCase());
+
+                materials.add(Objects.requireNonNull(material.get().get()));
+            } catch (IllegalArgumentException | NoSuchElementException | NullPointerException e) {
                 logger.warning("Unknown material: " + name);
             }
         }

src/main/java/me/byteful/plugin/leveltools/util/AdventureHelper.java

@@ -0,0 +1,47 @@
+package me.byteful.plugin.leveltools.util;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+final class AdventureHelper {
+    private AdventureHelper() {
+    }
+
+    static void setDisplayNameWithTranslatable(ItemMeta meta, String text, ItemStack stack) {
+        Component translatable = Component.translatable(stack.getType().translationKey());
+        TextComponent parsed = LegacyComponentSerializer.legacySection().deserialize(text);
+
+        TextComponent.Builder result = Component.text();
+        processComponent(parsed, translatable, result);
+
+        meta.displayName(result.build());
+    }
+
+    private static void processComponent(TextComponent component, Component translatable, TextComponent.Builder result) {
+        String content = component.content();
+        if (content.contains("{item}")) {
+            String[] parts = content.split("\\{item}", -1);
+            for (int i = 0; i < parts.length; i++) {
+                if (!parts[i].isEmpty()) {
+                    result.append(Component.text(parts[i]).style(component.style()));
+                }
+                if (i < parts.length - 1) {
+                    result.append(translatable);
+                }
+            }
+        } else if (!content.isEmpty()) {
+            result.append(Component.text(content).style(component.style()));
+        }
+
+        for (Component child : component.children()) {
+            if (child instanceof TextComponent) {
+                processComponent((TextComponent) child, translatable, result);
+            } else {
+                result.append(child);
+            }
+        }
+    }
+}

src/main/java/me/byteful/plugin/leveltools/util/LevelToolsUtil.java

@@ -15,8 +15,6 @@
 import me.byteful.plugin.leveltools.profile.item.ItemProfile;
 import me.byteful.plugin.leveltools.profile.reward.RewardEntry;
 import me.byteful.plugin.leveltools.profile.reward.RewardProfile;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
@@ -38,7 +36,6 @@
 import java.util.stream.Collectors;
 
 import static me.byteful.plugin.leveltools.util.Text.*;
-import static net.kyori.adventure.text.Component.translatable;
 
 public final class LevelToolsUtil {
     public static final int MID_VERSION;
@@ -171,14 +168,8 @@ public static ItemStack buildItemStack(
                         .replace("{xp_formatted}", formatMoney(xp))
                         .replace("{progress_bar}", progressBar));
 
-                if (nameDisplay.getText().contains("{item}") && IS_PAPER) {
-                    final net.kyori.adventure.text.TextComponent component = LegacyComponentSerializer.legacySection().deserialize(text);
-                    for (Component child : component.children()) {
-                        if (child instanceof net.kyori.adventure.text.TextComponent && ((net.kyori.adventure.text.TextComponent) child).content().equals("{item}")) {
-                            ((net.kyori.adventure.text.TextComponent) child).content("");
-                            child.append(translatable(stack.getType().translationKey()));
-                        }
-                    }
+                if (nameDisplay.getText().contains("{item}") && MID_VERSION >= 13 && IS_PAPER) {
+                    AdventureHelper.setDisplayNameWithTranslatable(meta, text, stack);
                 } else {
                     meta.setDisplayName(text);
                 }