2023-07-11 20:52:11 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Tue, 11 Jul 2023 11:22:30 -0700
|
|
|
|
Subject: [PATCH] fix item meta for tadpole buckets
|
|
|
|
|
|
|
|
|
2024-06-15 18:28:18 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
|
2024-08-09 22:05:50 +02:00
|
|
|
index c9fbc01be0b0e7fd1cafb091d06496f4ba1e7c2c..a4c4ba0d02f9a072236ce86c1e98e2c60b059cb8 100644
|
2024-06-15 18:28:18 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemMetas.java
|
2024-08-09 22:05:50 +02:00
|
|
|
@@ -263,7 +263,7 @@ public final class CraftItemMetas {
|
2024-06-15 18:28:18 +02:00
|
|
|
if (itemType == ItemType.SUSPICIOUS_STEW) {
|
|
|
|
return CraftItemMetas.asType(CraftItemMetas.SUSPICIOUS_STEW_META_DATA);
|
|
|
|
}
|
|
|
|
- if (itemType == ItemType.COD_BUCKET || itemType == ItemType.PUFFERFISH_BUCKET
|
|
|
|
+ if (itemType == ItemType.COD_BUCKET || itemType == ItemType.PUFFERFISH_BUCKET || itemType == ItemType.TADPOLE_BUCKET // Paper
|
|
|
|
|| itemType == ItemType.SALMON_BUCKET || itemType == ItemType.ITEM_FRAME
|
|
|
|
|| itemType == ItemType.GLOW_ITEM_FRAME || itemType == ItemType.PAINTING) {
|
|
|
|
return CraftItemMetas.asType(CraftItemMetas.ENTITY_TAG_META_DATA);
|
2023-07-11 20:52:11 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
2024-04-25 00:36:49 +02:00
|
|
|
index 27af7ca9d62bdb4a24be5af139c181d7bc271ba5..3ff0340c40e9dc9a6e690de15ccade7a0c4e8f02 100644
|
2023-07-11 20:52:11 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -19,6 +19,7 @@ public class CraftMetaEntityTag extends CraftMetaItem {
|
2023-07-11 20:52:11 +02:00
|
|
|
Material.COD_BUCKET,
|
|
|
|
Material.PUFFERFISH_BUCKET,
|
|
|
|
Material.SALMON_BUCKET,
|
|
|
|
+ Material.TADPOLE_BUCKET, // Paper
|
|
|
|
Material.ITEM_FRAME,
|
|
|
|
Material.GLOW_ITEM_FRAME,
|
|
|
|
Material.PAINTING
|
|
|
|
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
2024-08-31 20:29:50 +02:00
|
|
|
index c0b7bb970bfd1ccd3bc071a77c47b374094a2fb6..3a9e5c6d781e9c24e040ebf95325f005ec9e8a3c 100644
|
2023-07-11 20:52:11 +02:00
|
|
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
|
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
2024-05-11 23:48:37 +02:00
|
|
|
@@ -208,6 +208,27 @@ public class ItemMetaTest extends AbstractTestingBase {
|
2023-07-11 20:52:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - check entity tag metas
|
|
|
|
+ private static final java.util.Set<Class<?>> ENTITY_TAG_METAS = java.util.Set.of(
|
|
|
|
+ CraftMetaEntityTag.class,
|
|
|
|
+ CraftMetaTropicalFishBucket.class,
|
|
|
|
+ CraftMetaAxolotlBucket.class
|
|
|
|
+ );
|
|
|
|
+ @Test
|
|
|
|
+ public void testEntityTagMeta() {
|
|
|
|
+ for (final Item item : BuiltInRegistries.ITEM) {
|
|
|
|
+ if (item instanceof net.minecraft.world.item.HangingEntityItem || item instanceof net.minecraft.world.item.MobBucketItem) {
|
2024-01-14 10:46:04 +01:00
|
|
|
+ ItemStack stack = new ItemStack(CraftItemType.minecraftToBukkit(item));
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertTrue(ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()), "missing entity tag meta handling for " + item);
|
2023-07-11 20:52:11 +02:00
|
|
|
+ stack = CraftItemStack.asNewCraftStack(net.minecraft.world.item.Items.STONE);
|
|
|
|
+ stack.editMeta(meta -> meta.displayName(net.kyori.adventure.text.Component.text("hello")));
|
2024-01-14 10:46:04 +01:00
|
|
|
+ stack.setType(CraftItemType.minecraftToBukkit(item));
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertTrue(ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()), "missing entity tag meta handling for " + item);
|
2023-07-11 20:52:11 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Test
|
|
|
|
public void testEachExtraData() {
|
|
|
|
final List<StackProvider> providers = Arrays.asList(
|