2019-06-14 04:27:40 +02:00
|
|
|
From b178b138b10df28838e9e5d73dcb424ae4fbc38f Mon Sep 17 00:00:00 2001
|
2018-07-30 05:53:59 +02:00
|
|
|
From: willies952002 <admin@domnian.com>
|
|
|
|
Date: Thu, 26 Jul 2018 02:22:44 -0400
|
|
|
|
Subject: [PATCH] Expand ArmorStand API
|
|
|
|
|
|
|
|
Add the following:
|
|
|
|
- Add proper methods for getting and setting items in both hands. Deprecates old methods
|
|
|
|
- Enable/Disable slot interactions
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
|
2019-06-06 17:36:57 +02:00
|
|
|
index 492df420b..e7f71e65e 100644
|
2018-07-30 05:53:59 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
package org.bukkit.entity;
|
|
|
|
|
|
|
|
+import org.bukkit.inventory.EquipmentSlot;
|
|
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
import org.bukkit.util.EulerAngle;
|
2019-03-20 01:28:15 +01:00
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
@@ -12,8 +13,13 @@ public interface ArmorStand extends LivingEntity {
|
2018-07-30 05:53:59 +02:00
|
|
|
* currently holding
|
|
|
|
*
|
|
|
|
* @return the held item
|
|
|
|
+ // Paper start - Deprecate in favor of setItemInMainHand
|
|
|
|
+ * @deprecated use {@link ArmorStand#getItem(EquipmentSlot)} instead
|
|
|
|
+ * @see ArmorStand#getItem(EquipmentSlot)
|
|
|
|
+ // Paper end
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
@NotNull
|
2018-07-30 05:53:59 +02:00
|
|
|
+ @Deprecated // Paper
|
|
|
|
ItemStack getItemInHand();
|
|
|
|
|
|
|
|
/**
|
2019-03-20 01:28:15 +01:00
|
|
|
@@ -21,7 +27,12 @@ public interface ArmorStand extends LivingEntity {
|
2018-07-30 05:53:59 +02:00
|
|
|
* holding
|
|
|
|
*
|
|
|
|
* @param item the item to hold
|
|
|
|
+ // Paper start - Deprecate in favor of setItemInMainHand
|
|
|
|
+ * @deprecated use {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} instead
|
|
|
|
+ * @see ArmorStand#setItem(EquipmentSlot, ItemStack)
|
|
|
|
+ // Paper end
|
|
|
|
*/
|
|
|
|
+ @Deprecated // Paper
|
2019-03-20 01:28:15 +01:00
|
|
|
void setItemInHand(@Nullable ItemStack item);
|
2018-07-30 05:53:59 +02:00
|
|
|
|
|
|
|
/**
|
2019-03-20 01:28:15 +01:00
|
|
|
@@ -304,5 +315,71 @@ public interface ArmorStand extends LivingEntity {
|
2018-08-17 00:11:35 +02:00
|
|
|
* @param tick {@code true} if this armour stand can tick, {@code false} otherwise
|
2018-07-30 05:53:59 +02:00
|
|
|
*/
|
2018-08-17 00:11:35 +02:00
|
|
|
void setCanTick(final boolean tick);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the item the armor stand has
|
|
|
|
+ * equip in the given equipment slot
|
|
|
|
+ *
|
|
|
|
+ * @param slot the equipment slot to get
|
2018-08-17 06:29:16 +02:00
|
|
|
+ * @return the ItemStack in the equipment slot
|
2018-07-30 05:53:59 +02:00
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ @NotNull
|
|
|
|
+ ItemStack getItem(@NotNull final org.bukkit.inventory.EquipmentSlot slot);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets the item the armor stand has
|
|
|
|
+ * equip in the given equipment slot
|
|
|
|
+ *
|
|
|
|
+ * @param slot the equipment slot to set
|
|
|
|
+ * @param item the item to hold
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ void setItem(@NotNull final org.bukkit.inventory.EquipmentSlot slot, @Nullable final ItemStack item);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the list of disabled slots
|
|
|
|
+ *
|
|
|
|
+ * @return list of disabled slots
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ @NotNull
|
2018-07-30 05:53:59 +02:00
|
|
|
+ java.util.Set<org.bukkit.inventory.EquipmentSlot> getDisabledSlots();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Set the disabled slots
|
|
|
|
+ *
|
|
|
|
+ * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
|
|
|
|
+ * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
|
|
|
|
+ *
|
|
|
|
+ * @param slots var-arg array of slots to lock
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ void setDisabledSlots(@NotNull org.bukkit.inventory.EquipmentSlot... slots);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Disable specific slots, adding them
|
|
|
|
+ * to the currently disabled slots
|
|
|
|
+ *
|
|
|
|
+ * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
|
|
|
|
+ * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
|
|
|
|
+ *
|
|
|
|
+ * @param slots var-arg array of slots to lock
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ void addDisabledSlots(@NotNull final org.bukkit.inventory.EquipmentSlot... slots);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Remove the given slots from the disabled
|
|
|
|
+ * slots list, enabling them.
|
|
|
|
+ *
|
|
|
|
+ * This makes it so a player is able to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
|
|
|
|
+ *
|
|
|
|
+ * @param slots var-arg array of slots to unlock
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ void removeDisabledSlots(@NotNull final org.bukkit.inventory.EquipmentSlot... slots);
|
2018-07-30 05:53:59 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Check if a specific slot is disabled
|
|
|
|
+ *
|
2018-08-17 06:29:16 +02:00
|
|
|
+ * @param slot The slot to check
|
2018-07-30 05:53:59 +02:00
|
|
|
+ * @return {@code true} if the slot is disabled, else {@code false}.
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ boolean isSlotDisabled(@NotNull org.bukkit.inventory.EquipmentSlot slot);
|
2018-07-30 05:53:59 +02:00
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2019-03-20 01:28:15 +01:00
|
|
|
2.21.0
|
2018-07-30 05:53:59 +02:00
|
|
|
|