mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
b5ce6e3dc5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: eb4b416d PR-822: Add experimental armor trim API 33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API CraftBukkit Changes: 19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled 1eb88374e PR-1147: Add experimental armor trim API c4c0bb0e9 Show clean error for invalidly configured server.properties options 3ae90697f Fix UUID not being updated when changing world of MapView e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells Spigot Changes: d2fdfe39 Rebuild patches
110 lines
3.9 KiB
Diff
110 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 12 Mar 2021 17:09:40 -0800
|
|
Subject: [PATCH] Item Rarity API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db20272cc2734
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
|
|
@@ -0,0 +1,28 @@
|
|
+package io.papermc.paper.inventory;
|
|
+
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
+import net.kyori.adventure.text.format.TextColor;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+public enum ItemRarity {
|
|
+
|
|
+ COMMON(NamedTextColor.WHITE),
|
|
+ UNCOMMON(NamedTextColor.YELLOW),
|
|
+ RARE(NamedTextColor.AQUA),
|
|
+ EPIC(NamedTextColor.LIGHT_PURPLE);
|
|
+
|
|
+ TextColor color;
|
|
+
|
|
+ ItemRarity(TextColor color) {
|
|
+ this.color = color;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the color formatting associated with the rarity.
|
|
+ * @return
|
|
+ */
|
|
+ @NotNull
|
|
+ public TextColor getColor() {
|
|
+ return color;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index 6ec19c038ce3c551b5207028355594f8a0c80bd2..22649f3ba10a0b6e33c584ee84b76cbbda992919 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -4573,6 +4573,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
return Bukkit.getUnsafe().getBlockTranslationKey(this);
|
|
}
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Returns the item rarity for the item. The Material <b>MUST</b> be an Item not a block.
|
|
+ * Use {@link #isItem()} before this.
|
|
+ *
|
|
+ * @return the item rarity
|
|
+ */
|
|
+ @NotNull
|
|
+ public io.papermc.paper.inventory.ItemRarity getItemRarity() {
|
|
+ return Bukkit.getUnsafe().getItemRarity(this);
|
|
+ }
|
|
// Paper end
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
|
index 6c45841538f2f073691331f975741a62b03a6637..e87cbaf9c1ea1330ab1597f98c8864d0c5b8bdcd 100644
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
|
@@ -137,5 +137,22 @@ public interface UnsafeValues {
|
|
* Just don't use it.
|
|
*/
|
|
@org.jetbrains.annotations.NotNull String getMainLevelName();
|
|
+
|
|
+ /**
|
|
+ * Gets the item rarity of a material. The material <b>MUST</b> be an item.
|
|
+ * Use {@link Material#isItem()} before this.
|
|
+ *
|
|
+ * @param material the material to get the rarity of
|
|
+ * @return the item rarity
|
|
+ */
|
|
+ public io.papermc.paper.inventory.ItemRarity getItemRarity(Material material);
|
|
+
|
|
+ /**
|
|
+ * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
|
|
+ *
|
|
+ * @param itemStack the itemstack to get the rarity of
|
|
+ * @return the itemstack rarity
|
|
+ */
|
|
+ public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index e4ad3a550050c4bf9cc7a2a1082bfdf668050efe..4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -877,5 +877,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
public @NotNull String translationKey() {
|
|
return Bukkit.getUnsafe().getTranslationKey(this);
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
|
|
+ *
|
|
+ * @return the itemstack rarity
|
|
+ */
|
|
+ @NotNull
|
|
+ public io.papermc.paper.inventory.ItemRarity getRarity() {
|
|
+ return Bukkit.getUnsafe().getItemStackRarity(this);
|
|
+ }
|
|
// Paper end
|
|
}
|