[ci skip] Move logic in our patches to ItemType/BlockType (#10772)

This commit is contained in:
Jake Potrebic 2024-05-23 10:32:02 -07:00 committed by GitHub
parent b14958485d
commit a9201d4a7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 208 additions and 108 deletions

View file

@ -5,13 +5,13 @@ Subject: [PATCH] ItemStack Tooltip API
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 89e4f53598c14ea2ca2b6678edc97366649d0145..9bd51aeedf2556e714960b081029f48afbc0f3f5 100644
index b137d4518727bfb4a058abbf33e6cfd3b6e05772..5572ecea5df864db291eff182969f0367fb7c5f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -647,6 +647,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
return org.bukkit.craftbukkit.CraftStatistic.getNMSStatistic(statistic).getName();
@@ -646,6 +646,21 @@ public final class CraftMagicNumbers implements UnsafeValues {
}
// Paper end
// Paper end - fix custom stats criteria creation
+ // Paper start - expose itemstack tooltip lines
+ @Override
+ public java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(final ItemStack itemStack, final io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, final org.bukkit.entity.Player player) {
@ -26,6 +26,7 @@ index 89e4f53598c14ea2ca2b6678edc97366649d0145..9bd51aeedf2556e714960b081029f48a
+ return lines.stream().map(io.papermc.paper.adventure.PaperAdventure::asAdventure).toList();
+ }
+ // Paper end - expose itemstack tooltip lines
+
@Override
public String get(Class<?> aClass, String s) {
if (aClass == Enchantment.class) {