Upstream has released updates that appears 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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
313 lines
11 KiB
Diff
313 lines
11 KiB
Diff
From da394890b3d09b3f04b96db7370d5ab7f5a25f5d Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Sat, 27 Jan 2018 17:04:14 -0500
|
|
Subject: [PATCH] Add ArmorStand Item Meta
|
|
|
|
This is adds basic item meta for armor stands. It does not add all
|
|
possible metadata however.
|
|
|
|
There are armor, hand, and equipment types, as well as position data
|
|
that can also be added here. This initial addition should serve a
|
|
starting point for future additions in this area.
|
|
|
|
Fixes GH-559
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
|
index f700522840..3723faccac 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
|
@@ -8,13 +8,39 @@ import org.bukkit.Material;
|
|
import org.bukkit.configuration.serialization.DelegateDeserialization;
|
|
|
|
@DelegateDeserialization(CraftMetaItem.SerializableMeta.class)
|
|
-public class CraftMetaArmorStand extends CraftMetaItem {
|
|
+public class CraftMetaArmorStand extends CraftMetaItem implements com.destroystokyo.paper.inventory.meta.ArmorStandMeta { // Paper
|
|
|
|
static final ItemMetaKey ENTITY_TAG = new ItemMetaKey("EntityTag", "entity-tag");
|
|
+ // Paper start
|
|
+ static final ItemMetaKey INVISIBLE = new ItemMetaKey("Invisible", "invisible");
|
|
+ static final ItemMetaKey NO_BASE_PLATE = new ItemMetaKey("NoBasePlate", "no-base-plate");
|
|
+ static final ItemMetaKey SHOW_ARMS = new ItemMetaKey("ShowArms", "show-arms");
|
|
+ static final ItemMetaKey SMALL = new ItemMetaKey("Small", "small");
|
|
+ static final ItemMetaKey MARKER = new ItemMetaKey("Marker", "marker");
|
|
+
|
|
+ private boolean invisible;
|
|
+ private boolean noBasePlate;
|
|
+ private boolean showArms;
|
|
+ private boolean small;
|
|
+ private boolean marker;
|
|
+ // Paper end
|
|
NBTTagCompound entityTag;
|
|
|
|
CraftMetaArmorStand(CraftMetaItem meta) {
|
|
super(meta);
|
|
+
|
|
+ // Paper start
|
|
+ if (!(meta instanceof CraftMetaArmorStand)) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ CraftMetaArmorStand standMeta = (CraftMetaArmorStand) meta;
|
|
+ this.invisible = standMeta.invisible;
|
|
+ this.noBasePlate = standMeta.noBasePlate;
|
|
+ this.showArms = standMeta.showArms;
|
|
+ this.small = standMeta.small;
|
|
+ this.marker = standMeta.marker;
|
|
+ // Paper end
|
|
}
|
|
|
|
CraftMetaArmorStand(NBTTagCompound tag) {
|
|
@@ -22,11 +48,47 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
|
|
if (tag.hasKey(ENTITY_TAG.NBT)) {
|
|
entityTag = tag.getCompound(ENTITY_TAG.NBT);
|
|
+
|
|
+ // Paper start
|
|
+ if (entityTag.hasKey(INVISIBLE.NBT)) {
|
|
+ invisible = entityTag.getBoolean(INVISIBLE.NBT);
|
|
+ }
|
|
+
|
|
+ if (entityTag.hasKey(NO_BASE_PLATE.NBT)) {
|
|
+ noBasePlate = entityTag.getBoolean(NO_BASE_PLATE.NBT);
|
|
+ }
|
|
+
|
|
+ if (entityTag.hasKey(SHOW_ARMS.NBT)) {
|
|
+ showArms = entityTag.getBoolean(SHOW_ARMS.NBT);
|
|
+ }
|
|
+
|
|
+ if (entityTag.hasKey(SMALL.NBT)) {
|
|
+ small = entityTag.getBoolean(SMALL.NBT);
|
|
+ }
|
|
+
|
|
+ if (entityTag.hasKey(MARKER.NBT)) {
|
|
+ marker = entityTag.getBoolean(MARKER.NBT);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
CraftMetaArmorStand(Map<String, Object> map) {
|
|
super(map);
|
|
+
|
|
+ // Paper start
|
|
+ boolean invis = SerializableMeta.getBoolean(map, INVISIBLE.BUKKIT);
|
|
+ boolean noBase = SerializableMeta.getBoolean(map, NO_BASE_PLATE.BUKKIT);
|
|
+ boolean showArms = SerializableMeta.getBoolean(map, SHOW_ARMS.BUKKIT);
|
|
+ boolean small = SerializableMeta.getBoolean(map, SMALL.BUKKIT);
|
|
+ boolean marker = SerializableMeta.getBoolean(map, MARKER.BUKKIT);
|
|
+
|
|
+ this.invisible = invis;
|
|
+ this.noBasePlate = noBase;
|
|
+ this.showArms = showArms;
|
|
+ this.small = small;
|
|
+ this.marker = marker;
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|
|
@@ -49,6 +111,32 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
void applyToItem(NBTTagCompound tag) {
|
|
super.applyToItem(tag);
|
|
|
|
+ // Paper start
|
|
+ if (!isArmorStandEmpty() && entityTag == null) {
|
|
+ entityTag = new NBTTagCompound();
|
|
+ }
|
|
+
|
|
+ if (isInvisible()) {
|
|
+ entityTag.setBoolean(INVISIBLE.NBT, invisible);
|
|
+ }
|
|
+
|
|
+ if (hasNoBasePlate()) {
|
|
+ entityTag.setBoolean(NO_BASE_PLATE.NBT, noBasePlate);
|
|
+ }
|
|
+
|
|
+ if (shouldShowArms()) {
|
|
+ entityTag.setBoolean(SHOW_ARMS.NBT, showArms);
|
|
+ }
|
|
+
|
|
+ if (isSmall()) {
|
|
+ entityTag.setBoolean(SMALL.NBT, small);
|
|
+ }
|
|
+
|
|
+ if (isMarker()) {
|
|
+ entityTag.setBoolean(MARKER.NBT, marker);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (entityTag != null) {
|
|
tag.set(ENTITY_TAG.NBT, entityTag);
|
|
}
|
|
@@ -70,7 +158,7 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
}
|
|
|
|
boolean isArmorStandEmpty() {
|
|
- return !(entityTag != null);
|
|
+ return !(isInvisible() || hasNoBasePlate() || shouldShowArms() || isSmall() || isMarker() || entityTag != null);
|
|
}
|
|
|
|
@Override
|
|
@@ -81,7 +169,13 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
if (meta instanceof CraftMetaArmorStand) {
|
|
CraftMetaArmorStand that = (CraftMetaArmorStand) meta;
|
|
|
|
- return entityTag != null ? that.entityTag != null && this.entityTag.equals(that.entityTag) : entityTag == null;
|
|
+ // Paper start
|
|
+ return invisible == that.invisible &&
|
|
+ noBasePlate == that.noBasePlate &&
|
|
+ showArms == that.showArms &&
|
|
+ small == that.small &&
|
|
+ marker == that.marker;
|
|
+ // Paper end
|
|
}
|
|
return true;
|
|
}
|
|
@@ -96,9 +190,14 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
final int original;
|
|
int hash = original = super.applyHash();
|
|
|
|
- if (entityTag != null) {
|
|
- hash = 73 * hash + entityTag.hashCode();
|
|
- }
|
|
+ // Paper start
|
|
+ hash += entityTag != null ? 73 * hash + entityTag.hashCode() : 0;
|
|
+ hash += isInvisible() ? 61 * hash + 1231 : 0;
|
|
+ hash += hasNoBasePlate() ? 61 * hash + 1231 : 0;
|
|
+ hash += shouldShowArms() ? 61 * hash + 1231 : 0;
|
|
+ hash += isSmall() ? 61 * hash + 1231 : 0;
|
|
+ hash += isMarker() ? 61 * hash + 1231 : 0;
|
|
+ // Paper end
|
|
|
|
return original != hash ? CraftMetaArmorStand.class.hashCode() ^ hash : hash;
|
|
}
|
|
@@ -107,6 +206,28 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
Builder<String, Object> serialize(Builder<String, Object> builder) {
|
|
super.serialize(builder);
|
|
|
|
+ // Paper start
|
|
+ if (isInvisible()) {
|
|
+ builder.put(INVISIBLE.BUKKIT, invisible);
|
|
+ }
|
|
+
|
|
+ if (hasNoBasePlate()) {
|
|
+ builder.put(NO_BASE_PLATE.BUKKIT, noBasePlate);
|
|
+ }
|
|
+
|
|
+ if (shouldShowArms()) {
|
|
+ builder.put(SHOW_ARMS.BUKKIT, showArms);
|
|
+ }
|
|
+
|
|
+ if (isSmall()) {
|
|
+ builder.put(SMALL.BUKKIT, small);
|
|
+ }
|
|
+
|
|
+ if (isMarker()) {
|
|
+ builder.put(MARKER.BUKKIT, marker);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
return builder;
|
|
}
|
|
|
|
@@ -120,4 +241,56 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
|
|
return clone;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public boolean isInvisible() {
|
|
+ return invisible;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasNoBasePlate() {
|
|
+ return noBasePlate;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean shouldShowArms() {
|
|
+ return showArms;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isSmall() {
|
|
+ return small;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isMarker() {
|
|
+ return marker;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setInvisible(boolean invisible) {
|
|
+ this.invisible = invisible;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setNoBasePlate(boolean noBasePlate) {
|
|
+ this.noBasePlate = noBasePlate;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setShowArms(boolean showArms) {
|
|
+ this.showArms = showArms;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setSmall(boolean small) {
|
|
+ this.small = small;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setMarker(boolean marker) {
|
|
+ this.marker = marker;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
index bd9e09f999..0682c6e859 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
@@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
|
CraftMetaTropicalFishBucket.VARIANT.NBT,
|
|
CraftMetaCrossbow.CHARGED.NBT,
|
|
CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
|
|
- CraftMetaSuspiciousStew.EFFECTS.NBT
|
|
+ CraftMetaSuspiciousStew.EFFECTS.NBT,
|
|
+ // Paper start
|
|
+ CraftMetaArmorStand.ENTITY_TAG.NBT,
|
|
+ CraftMetaArmorStand.INVISIBLE.NBT,
|
|
+ CraftMetaArmorStand.NO_BASE_PLATE.NBT,
|
|
+ CraftMetaArmorStand.SHOW_ARMS.NBT,
|
|
+ CraftMetaArmorStand.SMALL.NBT,
|
|
+ CraftMetaArmorStand.MARKER.NBT
|
|
+ // Paper end
|
|
));
|
|
}
|
|
return HANDLED_TAGS;
|
|
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
index 6302339601..3a82bede7c 100644
|
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
@@ -6,6 +6,7 @@ import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
+import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
|
|
import net.minecraft.server.Block;
|
|
import net.minecraft.server.IRegistry;
|
|
import net.minecraft.server.ITileEntity;
|
|
@@ -313,6 +314,7 @@ public class ItemMetaTest extends AbstractTestingBase {
|
|
final CraftMetaArmorStand meta = (CraftMetaArmorStand) cleanStack.getItemMeta();
|
|
meta.entityTag = new NBTTagCompound();
|
|
meta.entityTag.setBoolean("Small", true);
|
|
+ meta.setInvisible(true); // Paper
|
|
cleanStack.setItemMeta(meta);
|
|
return cleanStack;
|
|
}
|
|
--
|
|
2.25.1
|
|
|