Skip to content
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

Jump to bottom

Add custom model data support for kits #5433

Merged
merged 4 commits into from
Aug 5, 2023
Merged

Add custom model data support for kits #5433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb5bbd2
Support CustomModelData in kits
YanisBft Jul 17, 2023
0d7657a
Serialize custom model data
YanisBft Jul 18, 2023
fc17561
Merge branch '2.x' into kits-custom-model-data
YanisBft Jul 28, 2023
98e2020
Merge branch '2.x' into kits-custom-model-data
YanisBft Aug 5, 2023
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
7 changes: 7 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/MetaItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ public void addStringMeta(final CommandSource sender, final boolean allowUnsafe,
final ItemMeta meta = stack.getItemMeta();
meta.setLore(lore);
stack.setItemMeta(meta);
} else if ((split[0].equalsIgnoreCase("custom-model-data") || split[0].equalsIgnoreCase("cmd")) && hasMetaPermission(sender, "custom-model-data", false, true, ess)) {
if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_R01)) {
final int value = split.length <= 1 ? 0 : Integer.parseInt(split[1]);
final ItemMeta meta = stack.getItemMeta();
meta.setCustomModelData(value);
stack.setItemMeta(meta);
}
} else if (split[0].equalsIgnoreCase("unbreakable") && hasMetaPermission(sender, "unbreakable", false, true, ess)) {
final boolean value = split.length <= 1 || Boolean.parseBoolean(split[1]);
setUnbreakable(ess, stack, value);
Expand Down
6 changes: 6 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/items/AbstractItemDb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,12 @@ public String serialize(final ItemStack is, final boolean useResolvers) {
sb.append("lore:").append(serializeLines(meta.getLore())).append(" ");
}

if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_R01)) {
if (meta.hasCustomModelData()) {
sb.append("custom-model-data:").append(meta.getCustomModelData()).append(" ");
}
}

if (meta.hasEnchants()) {
for (final Enchantment e : meta.getEnchants().keySet()) {
sb.append(e.getName().toLowerCase()).append(":").append(meta.getEnchantLevel(e)).append(" ");
Expand Down