mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more ItemFlag fixes

Browse source
This commit is contained in:
Jake Potrebic 2024-04-27 14:32:14 -07:00
parent 20af7a753c
commit b3ea907b77
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
2 changed files with 93 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

66
patches/api/0472-Fix-ItemFlags.patch Normal file
View file

@ -0,0 +1,66 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 27 Apr 2024 13:28:17 -0700
Subject: [PATCH] Fix ItemFlags
Adds new flag in HIDE_STORED_ENCHANTS which was split
from HIDE_ADDITIONAL_INFO. Adds a migration to account for
this, adding the new flag if the itemstack is old and had the
old flag.
diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
index a435f6c8947e4ac50b8c04f37b107055970937dd..92e30c281eab4801298b280bd388a0399212a0c1 100644
--- a/src/main/java/org/bukkit/inventory/ItemFlag.java
+++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
@@ -2,6 +2,8 @@ package org.bukkit.inventory;
/**
* A ItemFlag can hide some Attributes from ItemStacks
+ * @apiNote Setting these without also setting the data they are hiding
+ * may not result in the item flag being persisted in the ItemMeta/ItemStack.
*/
public enum ItemFlag {
@@ -27,7 +29,8 @@ public enum ItemFlag {
HIDE_PLACED_ON,
/**
* Setting to show/hide potion effects, book and firework information, map
- * tooltips, patterns of banners, and enchantments of enchanted books.
+ * tooltips, patterns of banners.
+ * @see #HIDE_STORED_ENCHANTS HIDE_STORED_ENCHANTS for hiding stored enchants (like on enchanted books)
*/
HIDE_ADDITIONAL_TOOLTIP,
/**
@@ -37,7 +40,13 @@ public enum ItemFlag {
/**
* Setting to show/hide armor trim from armor.
*/
- HIDE_ARMOR_TRIM;
+ HIDE_ARMOR_TRIM,
+ /**
+ * Setting to show/hide stored enchants on an item, such as enchantments
+ * on an enchanted book.
+ */
+ HIDE_STORED_ENCHANTS,
+ ;
// Paper start
/**
* Setting to show/hide item-specific information, including, but not limited to:
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 91083a135a7e979e32cbb3531b5ef69b7a28f305..2b465bd3264cccd5203775e1aa99dcfa6226368d 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -572,6 +572,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
Object raw = args.get("meta");
if (raw instanceof ItemMeta) {
((ItemMeta) raw).setVersion(version);
+ // Paper start - for pre 1.20.5 itemstacks, add HIDE_STORED_ENCHANTS flag if HIDE_ADDITIONAL_TOOLTIP is set
+ if (version < 3837) { // 1.20.5
+ if (((ItemMeta) raw).hasItemFlag(ItemFlag.HIDE_ADDITIONAL_TOOLTIP)) {
+ ((ItemMeta) raw).addItemFlags(ItemFlag.HIDE_STORED_ENCHANTS);
+ }
+ }
+ // Paper end
result.setItemMeta((ItemMeta) raw);
}
}