From 14b789b68afb696a332d30530609ba5814a8b3bf Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Mon, 15 Jul 2024 07:38:20 -0700 Subject: [PATCH] Add ItemType#getItemRarity (#11049) --- patches/api/Improve-Item-Rarity-API.patch | 18 +++++++++++++++ .../server/Add-ItemType-getItemRarity.patch | 23 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 patches/server/Add-ItemType-getItemRarity.patch diff --git a/patches/api/Improve-Item-Rarity-API.patch b/patches/api/Improve-Item-Rarity-API.patch index 10708a5de3..7d4e2106dc 100644 --- a/patches/api/Improve-Item-Rarity-API.patch +++ b/patches/api/Improve-Item-Rarity-API.patch @@ -131,3 +131,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } // Paper end } +diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/inventory/ItemType.java ++++ b/src/main/java/org/bukkit/inventory/ItemType.java +@@ -0,0 +0,0 @@ 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/Add-ItemType-getItemRarity.patch b/patches/server/Add-ItemType-getItemRarity.patch new file mode 100644 index 0000000000..2ec43c0c81 --- /dev/null +++ b/patches/server/Add-ItemType-getItemRarity.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java +@@ -0,0 +0,0 @@ public class CraftItemType implements ItemType.Typed, 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 + }