geforkt von Mirrors/Paper
75 Zeilen
4.0 KiB
Diff
75 Zeilen
4.0 KiB
Diff
|
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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||
|
|
@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
|
||
|
|
case COD_BUCKET:
|
||
|
|
case PUFFERFISH_BUCKET:
|
||
|
|
case SALMON_BUCKET:
|
||
|
|
+ case TADPOLE_BUCKET: // Paper
|
||
|
|
case ITEM_FRAME:
|
||
|
|
case GLOW_ITEM_FRAME:
|
||
|
|
case PAINTING:
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||
|
|
@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
|
||
|
|
case COD_BUCKET:
|
||
|
|
case PUFFERFISH_BUCKET:
|
||
|
|
case SALMON_BUCKET:
|
||
|
|
+ case TADPOLE_BUCKET: // Paper
|
||
|
|
case ITEM_FRAME:
|
||
|
|
case GLOW_ITEM_FRAME:
|
||
|
|
case PAINTING:
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java
|
||
|
|
@@ -0,0 +0,0 @@ public class CraftMetaEntityTag extends CraftMetaItem {
|
||
|
|
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
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||
|
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||
|
|
@@ -0,0 +0,0 @@ public class ItemMetaTest extends AbstractTestingBase {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // 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) {
|
||
|
|
+ ItemStack stack = new ItemStack(CraftMagicNumbers.getMaterial(item));
|
||
|
|
+ assertTrue("missing entity tag meta handling for " + item, ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()));
|
||
|
|
+ stack = CraftItemStack.asNewCraftStack(net.minecraft.world.item.Items.STONE);
|
||
|
|
+ stack.editMeta(meta -> meta.displayName(net.kyori.adventure.text.Component.text("hello")));
|
||
|
|
+ stack.setType(CraftMagicNumbers.getMaterial(item));
|
||
|
|
+ assertTrue("missing entity tag meta handling for " + item, ENTITY_TAG_METAS.contains(stack.getItemMeta().getClass()));
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Test
|
||
|
|
public void testEachExtraData() {
|
||
|
|
final List<StackProvider> providers = Arrays.asList(
|