diff options
| author | Jake Potrebic <[email protected]> | 2024-07-15 07:38:20 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-15 16:38:20 +0200 |
| commit | 05e5865da30d072e729d4681d02a316f6ae072fa (patch) | |
| tree | 63a35e30520859753f517d9153d6526af947b057 /patches | |
| parent | b4f04ff4b31bc46d47c1d050686a2582c222073c (diff) | |
| download | Paper-05e5865da30d072e729d4681d02a316f6ae072fa.tar.gz Paper-05e5865da30d072e729d4681d02a316f6ae072fa.zip | |
Add ItemType#getItemRarity (#11049)
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/api/0254-Improve-Item-Rarity-API.patch | 18 | ||||
| -rw-r--r-- | patches/server/1041-Add-ItemType-getItemRarity.patch | 23 |
2 files changed, 41 insertions, 0 deletions
diff --git a/patches/api/0254-Improve-Item-Rarity-API.patch b/patches/api/0254-Improve-Item-Rarity-API.patch index 4a53134873..0882e2924c 100644 --- a/patches/api/0254-Improve-Item-Rarity-API.patch +++ b/patches/api/0254-Improve-Item-Rarity-API.patch @@ -131,3 +131,21 @@ index ef36a696f2f926d70c5d93ce08f75fa9a749e32f..fb1d7ff51f267225ac76c29a56d67fb4 + } // Paper end } +diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java +index 5dd1c084e42ee93f3a358f58ed76b0a7d36f0713..2b5a18fe7e885fa9b581c0afb299e31f3db2690c 100644 +--- a/src/main/java/org/bukkit/inventory/ItemType.java ++++ b/src/main/java/org/bukkit/inventory/ItemType.java +@@ -2311,4 +2311,13 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans + @Override + @NotNull String getTranslationKey(); + // Paper end - add Translatable ++ ++ // Paper start - expand ItemRarity API ++ /** ++ * Returns the item rarity for the item. ++ * ++ * @return the item rarity (or null if none is set) ++ */ ++ @Nullable ItemRarity getItemRarity(); ++ // Paper end - expand ItemRarity API + } diff --git a/patches/server/1041-Add-ItemType-getItemRarity.patch b/patches/server/1041-Add-ItemType-getItemRarity.patch new file mode 100644 index 0000000000..35ebf5036b --- /dev/null +++ b/patches/server/1041-Add-ItemType-getItemRarity.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Tue, 9 Jul 2024 18:37:37 -0700 +Subject: [PATCH] Add ItemType#getItemRarity + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java +index bae3dd5fc67e6b3d98a5e63ffbf639c5042f8843..450c63c31d2f5d056d989aa00452231f50c8224d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java +@@ -265,4 +265,12 @@ public class CraftItemType<M extends ItemMeta> implements ItemType.Typed<M>, Han + return this.item.getDescriptionId(); + } + // Paper end - add Translatable ++ ++ // Paper start - expand ItemRarity API ++ @Override ++ public org.bukkit.inventory.ItemRarity getItemRarity() { ++ final net.minecraft.world.item.Rarity rarity = this.item.components().get(DataComponents.RARITY); ++ return rarity == null ? null : org.bukkit.inventory.ItemRarity.valueOf(rarity.name()); ++ } ++ // Paper end - expand ItemRarity API + } |