Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-8035: Fix load and save of CustomModelData Component

Browse Source
This commit is contained in:
Doc 2025-04-07 09:18:04 -04:00
parent ba251cc068
commit c6c8165aa0
No known key found for this signature in database
GPG Key ID: 569482E14CAEBE86
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@ -327,7 +327,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
this.lore = new ArrayList<IChatBaseComponent>(meta.lore); this.lore = new ArrayList<IChatBaseComponent>(meta.lore);
} }
if (meta.hasCustomModelData()) { if (meta.hasCustomModelDataComponent()) {
this.customModelData = new CraftCustomModelDataComponent(meta.customModelData); this.customModelData = new CraftCustomModelDataComponent(meta.customModelData);
} }
this.enchantableValue = meta.enchantableValue; this.enchantableValue = meta.enchantableValue;
@ -950,7 +950,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
itemTag.put(LORE, new ItemLore(lore)); itemTag.put(LORE, new ItemLore(lore));
} }
if (hasCustomModelData()) { if (hasCustomModelDataComponent()) {
itemTag.put(CUSTOM_MODEL_DATA, customModelData.getHandle()); itemTag.put(CUSTOM_MODEL_DATA, customModelData.getHandle());
} }
@ -1140,7 +1140,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@Overridden @Overridden
boolean isEmpty() { boolean isEmpty() {
return !(hasDisplayName() || hasItemName() || hasLocalizedName() || hasEnchants() || (lore != null) || hasCustomModelData() || hasEnchantable() || hasBlockData() || hasRepairCost() || !unhandledTags.build().isEmpty() || !removedTags.isEmpty() || !persistentDataContainer.isEmpty() || hasItemFlags() || isHideTooltip() || hasTooltipStyle() || hasItemModel() || isUnbreakable() || hasEnchantmentGlintOverride() || isGlider() || hasDamageResistant() || hasMaxStackSize() || hasRarity() || hasUseRemainder() || hasUseCooldown() || hasFood() || hasConsumable() || hasTool() || hasBlocksAttacks() || hasWeapon() || hasJukeboxPlayable() || hasBreakSound() || hasEquippable() || hasDamage() || hasMaxDamage() || hasAttributeModifiers() || customTag != null); return !(hasDisplayName() || hasItemName() || hasLocalizedName() || hasEnchants() || (lore != null) || hasCustomModelDataComponent() || hasEnchantable() || hasBlockData() || hasRepairCost() || !unhandledTags.build().isEmpty() || !removedTags.isEmpty() || !persistentDataContainer.isEmpty() || hasItemFlags() || isHideTooltip() || hasTooltipStyle() || hasItemModel() || isUnbreakable() || hasEnchantmentGlintOverride() || isGlider() || hasDamageResistant() || hasMaxStackSize() || hasRarity() || hasUseRemainder() || hasUseCooldown() || hasFood() || hasConsumable() || hasTool() || hasBlocksAttacks() || hasWeapon() || hasJukeboxPlayable() || hasBreakSound() || hasEquippable() || hasDamage() || hasMaxDamage() || hasAttributeModifiers() || customTag != null);
} }
@Override @Override
@ -1932,7 +1932,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
&& (this.hasItemName() ? that.hasItemName() && this.itemName.equals(that.itemName) : !that.hasItemName()) && (this.hasItemName() ? that.hasItemName() && this.itemName.equals(that.itemName) : !that.hasItemName())
&& (this.hasEnchants() ? that.hasEnchants() && this.enchantments.equals(that.enchantments) : !that.hasEnchants()) && (this.hasEnchants() ? that.hasEnchants() && this.enchantments.equals(that.enchantments) : !that.hasEnchants())
&& (Objects.equals(this.lore, that.lore)) && (Objects.equals(this.lore, that.lore))
&& (this.hasCustomModelData() ? that.hasCustomModelData() && this.customModelData.equals(that.customModelData) : !that.hasCustomModelData()) && (this.hasCustomModelDataComponent() ? that.hasCustomModelDataComponent() && this.customModelData.equals(that.customModelData) : !that.hasCustomModelDataComponent())
&& (this.hasEnchantable() ? that.hasEnchantable() && this.enchantableValue.equals(that.enchantableValue) : !that.hasEnchantable()) && (this.hasEnchantable() ? that.hasEnchantable() && this.enchantableValue.equals(that.enchantableValue) : !that.hasEnchantable())
&& (this.hasBlockData() ? that.hasBlockData() && this.blockData.equals(that.blockData) : !that.hasBlockData()) && (this.hasBlockData() ? that.hasBlockData() && this.blockData.equals(that.blockData) : !that.hasBlockData())
&& (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost()) && (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost())
@ -1987,7 +1987,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
hash = 61 * hash + (hasDisplayName() ? this.displayName.hashCode() : 0); hash = 61 * hash + (hasDisplayName() ? this.displayName.hashCode() : 0);
hash = 61 * hash + (hasItemName() ? this.itemName.hashCode() : 0); hash = 61 * hash + (hasItemName() ? this.itemName.hashCode() : 0);
hash = 61 * hash + ((lore != null) ? this.lore.hashCode() : 0); hash = 61 * hash + ((lore != null) ? this.lore.hashCode() : 0);
hash = 61 * hash + (hasCustomModelData() ? this.customModelData.hashCode() : 0); hash = 61 * hash + (hasCustomModelDataComponent() ? this.customModelData.hashCode() : 0);
hash = 61 * hash + (hasEnchantable() ? this.enchantableValue.hashCode() : 0); hash = 61 * hash + (hasEnchantable() ? this.enchantableValue.hashCode() : 0);
hash = 61 * hash + (hasBlockData() ? this.blockData.hashCode() : 0); hash = 61 * hash + (hasBlockData() ? this.blockData.hashCode() : 0);
hash = 61 * hash + (hasEnchants() ? this.enchantments.hashCode() : 0); hash = 61 * hash + (hasEnchants() ? this.enchantments.hashCode() : 0);
@ -2031,7 +2031,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
if (this.lore != null) { if (this.lore != null) {
clone.lore = new ArrayList<IChatBaseComponent>(this.lore); clone.lore = new ArrayList<IChatBaseComponent>(this.lore);
} }
if (this.hasCustomModelData()) { if (this.hasCustomModelDataComponent()) {
clone.customModelData = new CraftCustomModelDataComponent(customModelData); clone.customModelData = new CraftCustomModelDataComponent(customModelData);
} }
clone.enchantableValue = this.enchantableValue; clone.enchantableValue = this.enchantableValue;
@ -2125,7 +2125,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
builder.put(LORE.BUKKIT, jsonLore); builder.put(LORE.BUKKIT, jsonLore);
} }
if (hasCustomModelData()) { if (hasCustomModelDataComponent()) {
builder.put(CUSTOM_MODEL_DATA.BUKKIT, customModelData); builder.put(CUSTOM_MODEL_DATA.BUKKIT, customModelData);
} }
if (hasEnchantable()) { if (hasEnchantable()) {