Skip to content

Fix item names not showing for items using the item_name component #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniel-skopek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix item names not showing for items using the item_name component #963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/main/java/net/coreprotect/utility/ItemUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.ByteArrayOutputStream;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.*;
import java.util.logging.Logger;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -691,7 +692,8 @@ public static String getEnchantments(byte[] metadata, int type, int amount) {
var item = getItemStack(metadata, type, amount);
if (item == null) return "";

String displayName = item.hasItemMeta() && item.getItemMeta().hasDisplayName() ? item.getItemMeta().getDisplayName() : "";
ItemMeta itemMeta = item.hasItemMeta() ? item.getItemMeta() : null;
String displayName = itemMeta == null ? "" : getItemDisplayName(itemMeta);
StringBuilder message = new StringBuilder(Color.ITALIC + displayName + Color.GREY);

List<String> enchantments = ItemMetaHandler.getEnchantments(item, displayName);
Expand All @@ -713,6 +715,27 @@ else if (!enchantments.isEmpty()) {
return message.toString();
}

private static String getItemDisplayName(ItemMeta itemMeta) {
try {
if (itemMeta.hasDisplayName()) {
return itemMeta.getDisplayName();
}

// The item_name component only exists on 1.20.5+, so access it reflectively.
Method hasItemName = itemMeta.getClass().getMethod("hasItemName");
if (Boolean.TRUE.equals(hasItemName.invoke(itemMeta))) {
Method getItemName = itemMeta.getClass().getMethod("getItemName");
Object name = getItemName.invoke(itemMeta);
return name == null ? "" : (String) name;
}
}
catch (Exception e) {
// item_name is not supported on this server version
}

return "";
}

public static Map<Integer, Object> serializeItemStackLegacy(ItemStack itemStack, String faceData, int slot) {
Map<Integer, Object> result = new HashMap<>();
Map<String, Object> itemMap = serializeItemStack(itemStack, faceData, slot);
Expand Down