2019-07-17 00:09:32 +02:00
|
|
|
From 0bac19a94d325c1ec051fd683298d44d478cb580 Mon Sep 17 00:00:00 2001
|
2018-01-28 02:40:42 +01:00
|
|
|
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
|
2019-07-02 06:51:06 +02:00
|
|
|
index f70052284..3723facca 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
2018-01-28 02:40:42 +01:00
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
2019-07-02 06:51:06 +02:00
|
|
|
@@ -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
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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;
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
|
|
|
NBTTagCompound entityTag;
|
|
|
|
|
|
|
|
CraftMetaArmorStand(CraftMetaItem meta) {
|
|
|
|
super(meta);
|
|
|
|
+
|
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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;
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // 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);
|
2018-01-28 02:40:42 +01:00
|
|
|
+
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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);
|
|
|
|
+ }
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CraftMetaArmorStand(Map<String, Object> map) {
|
|
|
|
super(map);
|
2018-01-28 02:40:42 +01:00
|
|
|
+
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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;
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@@ -49,6 +111,32 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
|
|
void applyToItem(NBTTagCompound tag) {
|
|
|
|
super.applyToItem(tag);
|
|
|
|
|
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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);
|
|
|
|
+ }
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
2018-01-28 02:40:42 +01:00
|
|
|
+
|
2019-07-02 06:51:06 +02:00
|
|
|
if (entityTag != null) {
|
|
|
|
tag.set(ENTITY_TAG.NBT, entityTag);
|
|
|
|
}
|
|
|
|
@@ -70,7 +158,7 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
|
|
}
|
|
|
|
|
|
|
|
boolean isArmorStandEmpty() {
|
|
|
|
- return !(entityTag != null);
|
2018-01-28 02:40:42 +01:00
|
|
|
+ return !(isInvisible() || hasNoBasePlate() || shouldShowArms() || isSmall() || isMarker() || entityTag != null);
|
2019-07-02 06:51:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@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
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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);
|
|
|
|
+ }
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
2018-01-28 02:40:42 +01:00
|
|
|
+
|
2019-07-02 06:51:06 +02:00
|
|
|
return builder;
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -120,4 +241,56 @@ public class CraftMetaArmorStand extends CraftMetaItem {
|
|
|
|
|
|
|
|
return clone;
|
|
|
|
}
|
2018-01-28 02:40:42 +01:00
|
|
|
+
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ @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;
|
|
|
|
+ }
|
2019-07-02 06:51:06 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
2018-01-28 02:40:42 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
2019-07-11 18:59:21 +02:00
|
|
|
index b0682e529..704a7d91e 100644
|
2018-01-28 02:40:42 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
2019-07-11 18:59:21 +02:00
|
|
|
@@ -162,6 +162,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2018-02-02 04:24:37 +01:00
|
|
|
.put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK")
|
2018-07-18 20:55:52 +02:00
|
|
|
.put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
|
2019-05-06 04:58:04 +02:00
|
|
|
.put(CraftMetaCrossbow.class, "CROSSBOW")
|
2018-02-02 04:24:37 +01:00
|
|
|
+ .put(CraftMetaArmorStand.class, "ARMOR_STAND")
|
|
|
|
.put(CraftMetaItem.class, "UNSPECIFIC")
|
|
|
|
.build();
|
|
|
|
|
2019-07-11 18:59:21 +02:00
|
|
|
@@ -1421,7 +1422,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2018-07-18 20:55:52 +02:00
|
|
|
CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
|
2019-05-06 04:58:04 +02:00
|
|
|
CraftMetaTropicalFishBucket.VARIANT.NBT,
|
|
|
|
CraftMetaCrossbow.CHARGED.NBT,
|
|
|
|
- CraftMetaCrossbow.CHARGED_PROJECTILES.NBT
|
|
|
|
+ CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
|
2018-11-11 09:30:57 +01:00
|
|
|
+ // Paper start
|
2018-01-28 02:40:42 +01:00
|
|
|
+ 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
|
2019-07-02 06:51:06 +02:00
|
|
|
index dd4ba3874..48c5e0621 100644
|
2018-01-28 02:40:42 +01:00
|
|
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
|
|
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
2019-04-28 19:59:47 +02:00
|
|
|
@@ -6,6 +6,7 @@ import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
2018-01-28 02:40:42 +01:00
|
|
|
import java.util.List;
|
2018-09-29 01:31:59 +02:00
|
|
|
import java.util.UUID;
|
2018-07-18 20:55:52 +02:00
|
|
|
+import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
|
2018-01-28 02:40:42 +01:00
|
|
|
import net.minecraft.server.Block;
|
2018-08-26 20:11:49 +02:00
|
|
|
import net.minecraft.server.IRegistry;
|
2018-01-28 02:40:42 +01:00
|
|
|
import net.minecraft.server.ITileEntity;
|
2019-07-02 06:51:06 +02:00
|
|
|
@@ -351,6 +352,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
|
2018-01-28 02:40:42 +01:00
|
|
|
cleanStack.setItemMeta(meta);
|
|
|
|
return cleanStack;
|
|
|
|
}
|
|
|
|
--
|
2019-06-25 21:18:50 +02:00
|
|
|
2.22.0
|
2018-01-28 02:40:42 +01:00
|
|
|
|