geforkt von Mirrors/Paper
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
110 Zeilen
3.9 KiB
Diff
110 Zeilen
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Sat, 27 Jan 2018 17:06:24 -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.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..7e4acfff16db80a75e1ff2fee1972b16955b0918
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
|
|
@@ -0,0 +1,78 @@
|
|
+package com.destroystokyo.paper.inventory.meta;
|
|
+
|
|
+import org.bukkit.inventory.meta.ItemMeta;
|
|
+
|
|
+public interface ArmorStandMeta extends ItemMeta {
|
|
+
|
|
+ /**
|
|
+ * Gets whether the ArmorStand should be invisible when spawned
|
|
+ *
|
|
+ * @return true if this should be invisible
|
|
+ */
|
|
+ boolean isInvisible();
|
|
+
|
|
+ /**
|
|
+ * Gets whether this ArmorStand should have no base plate when spawned
|
|
+ *
|
|
+ * @return true if it will not have a base plate
|
|
+ */
|
|
+ boolean hasNoBasePlate();
|
|
+
|
|
+ /**
|
|
+ * Gets whether this ArmorStand should show arms when spawned
|
|
+ *
|
|
+ * @return true if it will show arms
|
|
+ */
|
|
+ boolean shouldShowArms();
|
|
+
|
|
+ /**
|
|
+ * Gets whether this ArmorStand will be small when spawned
|
|
+ *
|
|
+ * @return true if it will be small
|
|
+ */
|
|
+ boolean isSmall();
|
|
+
|
|
+ /**
|
|
+ * Gets whether this ArmorStand will be a marker when spawned
|
|
+ * The exact details of this flag are an implementation detail
|
|
+ *
|
|
+ * @return true if it will be a marker
|
|
+ */
|
|
+ boolean isMarker();
|
|
+
|
|
+ /**
|
|
+ * Sets that this ArmorStand should be invisible when spawned
|
|
+ *
|
|
+ * @param invisible true if set invisible
|
|
+ */
|
|
+ void setInvisible(boolean invisible);
|
|
+
|
|
+ /**
|
|
+ * Sets that this ArmorStand should have no base plate when spawned
|
|
+ *
|
|
+ * @param noBasePlate true if no base plate
|
|
+ */
|
|
+ void setNoBasePlate(boolean noBasePlate);
|
|
+
|
|
+ /**
|
|
+ * Sets that this ArmorStand should show arms when spawned
|
|
+ *
|
|
+ * @param showArms true if show arms
|
|
+ */
|
|
+ void setShowArms(boolean showArms);
|
|
+
|
|
+ /**
|
|
+ * Sets that this ArmorStand should be small when spawned
|
|
+ *
|
|
+ * @param small true if small
|
|
+ */
|
|
+ void setSmall(boolean small);
|
|
+
|
|
+ /**
|
|
+ * Sets that this ArmorStand should be a marker when spawned
|
|
+ * The exact details of this flag are an implementation detail
|
|
+ *
|
|
+ * @param marker true if a marker
|
|
+ */
|
|
+ void setMarker(boolean marker);
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
|
|
index 8dc744f253be42191ca04f8e2942c4c618655fa8..aa0f66b7187c800cd22905bfa43af3ffb53edb5f 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemType.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemType.java
|
|
@@ -1879,7 +1879,7 @@ public interface ItemType extends Keyed, Translatable {
|
|
ItemType.Typed<ItemMeta> RABBIT_STEW = getItemType("rabbit_stew");
|
|
ItemType.Typed<ItemMeta> RABBIT_FOOT = getItemType("rabbit_foot");
|
|
ItemType.Typed<ItemMeta> RABBIT_HIDE = getItemType("rabbit_hide");
|
|
- ItemType.Typed<ItemMeta> ARMOR_STAND = getItemType("armor_stand");
|
|
+ ItemType.Typed<com.destroystokyo.paper.inventory.meta.ArmorStandMeta> ARMOR_STAND = getItemType("armor_stand");
|
|
ItemType.Typed<ItemMeta> IRON_HORSE_ARMOR = getItemType("iron_horse_armor");
|
|
ItemType.Typed<ItemMeta> GOLDEN_HORSE_ARMOR = getItemType("golden_horse_armor");
|
|
ItemType.Typed<ItemMeta> DIAMOND_HORSE_ARMOR = getItemType("diamond_horse_armor");
|