mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 03:55:14 +01:00
d1a72eac31
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: 1fc1020a PR-1049: Add MenuType API 8ae2e3be PR-1055: Expand riptiding API cac68bfb SPIGOT-7890: AttributeModifier#getUniqueId() doesn't match the UUID passed to its constructor 7004fcf2 SPIGOT-7886: Fix mistake in AttributeModifier UUID shim 1ac7f950 PR-1054: Add FireworkMeta#hasPower 4cfb565f SPIGOT-7873: Add powered state for skulls CraftBukkit Changes: bbb30e7a8 SPIGOT-7894: NPE when sending tile entity update ba21e9472 SPIGOT-7895: PlayerItemBreakEvent not firing 0fb24bbe0 SPIGOT-7875: Fix PlayerItemConsumeEvent cancellation causing client-side desync 815066449 SPIGOT-7891: Can't remove second ingredient of MerchantRecipe 45c206f2c PR-1458: Add MenuType API 19c8ef9ae SPIGOT-7867: Merchant instanceof AbstractVillager always returns false 4e006d28f PR-1468: Expand riptiding API bd8aded7d Ignore checks in CraftPlayerProfile for ResolvableProfile used in profile components 8679620b5 SPIGOT-7889: Fix tool component deserialisation without speed and/or correct-for-drops 8d5222691 SPIGOT-7882, PR-1467: Fix conversion of name in Profile Component to empty if it is missing 63f91669a SPIGOT-7887: Remove duplicate ProjectileHitEvent for fireballs 7070de8c8 SPIGOT-7878: Server#getLootTable does not return null on invalid loot table 060ee6cae SPIGOT-7876: Can't kick player or disconnect player in PlayerLoginEvent when checking for cookies 7ccb86cc0 PR-1465: Add FireworkMeta#hasPower 804ad6491 SPIGOT-7873: Add powered state for skulls f9610cdcb Improve minecart movement Spigot Changes: a759b629 Rebuild patches Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
190 lines
6.9 KiB
Diff
190 lines
6.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 29 Jun 2018 00:19:19 -0400
|
|
Subject: [PATCH] LivingEntity Active Item API
|
|
|
|
API relating to items being actively used by a LivingEntity
|
|
such as a bow or eating food.
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 0d01fe9c96a1b9076dbd6d031fa8cd41954ea8db..b0cb4377e14da5ef1e155513046c2340ab6e525e 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -336,7 +336,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
* blocking).
|
|
*
|
|
* @return Whether their hand is raised
|
|
+ * @see LivingEntity#hasActiveItem()
|
|
*/
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4") // Paper - active item API
|
|
public boolean isHandRaised();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 2d4d93a4fc3f712a21bd61e203407f3a84e16310..434ad8b07b6ee0b0919de8044d14fe3c789e203f 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*
|
|
* @return the item being used by the player, or null if they are not using
|
|
* an item
|
|
+ * @deprecated Use {@link #getActiveItem()}
|
|
*/
|
|
@Nullable
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public ItemStack getItemInUse();
|
|
|
|
/**
|
|
* Gets the number of ticks remaining for the current item's usage.
|
|
*
|
|
* @return The number of ticks remaining
|
|
+ * @deprecated use {@link #getActiveItemRemainingTime()}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public int getItemInUseTicks();
|
|
|
|
/**
|
|
@@ -219,7 +223,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* or throwing a trident.
|
|
*
|
|
* @param ticks The number of ticks remaining
|
|
+ * @deprecated use {@link #setActiveItemRemainingTime(int)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public void setItemInUseTicks(int ticks);
|
|
|
|
/**
|
|
@@ -862,4 +868,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
void setShieldBlockingDelay(int delay);
|
|
// Paper end
|
|
+
|
|
+ // Paper start - active item API
|
|
+ /**
|
|
+ * Starts using the item in the specified hand, making it the
|
|
+ * currently active item. When, for example, called on a skeleton,
|
|
+ * this will cause it to start drawing its bow.
|
|
+ * <p>
|
|
+ * Only HAND or OFF_HAND may be used for the hand parameter.
|
|
+ * <p>
|
|
+ * When used on a player, the client will stop using the item
|
|
+ * if right click is held down.
|
|
+ * <p>
|
|
+ * This method does not make any guarantees about the effect of this method
|
|
+ * as such depends on the entity and its state.
|
|
+ *
|
|
+ * @param hand the hand that contains the item to be used
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
|
+ void startUsingItem(@NotNull org.bukkit.inventory.EquipmentSlot hand);
|
|
+
|
|
+ /**
|
|
+ * Finishes using the currently active item. When, for example, a
|
|
+ * skeleton is drawing its bow, this will cause it to release and
|
|
+ * fire the arrow.
|
|
+ * <p>
|
|
+ * This method does not make any guarantees about the effect of this method
|
|
+ * as such depends on the entity and its state.
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
|
+ void completeUsingActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the item being actively "used" or consumed.
|
|
+ *
|
|
+ * @return the item
|
|
+ */
|
|
+ org.bukkit.inventory.@NotNull ItemStack getActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the remaining number of ticks for {@link #getActiveItem()}'s usage.
|
|
+ *
|
|
+ * @return remaining ticks to use {@link #getActiveItem()}
|
|
+ */
|
|
+ int getActiveItemRemainingTime();
|
|
+
|
|
+ /**
|
|
+ * Sets the number of ticks that remain for {@link #getActiveItem()}'s
|
|
+ * usage.
|
|
+ * <p>
|
|
+ * Valid values are between 0 and the max item use duration for
|
|
+ * the specific item type.
|
|
+ *
|
|
+ * @param ticks time in ticks remaining
|
|
+ */
|
|
+ void setActiveItemRemainingTime(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
|
|
+
|
|
+ /**
|
|
+ * Gets if the entity is using an item (eating, drinking, etc).
|
|
+ *
|
|
+ * @return true if using an item
|
|
+ */
|
|
+ boolean hasActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Get how long the {@link #getActiveItem()} has been in use for.
|
|
+ *
|
|
+ * @return time used in ticks
|
|
+ */
|
|
+ int getActiveItemUsedTime();
|
|
+
|
|
+ /**
|
|
+ * Get the hand using the active item. Will be either
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
|
|
+ *
|
|
+ * @return the hand being used
|
|
+ */
|
|
+ org.bukkit.inventory.@NotNull EquipmentSlot getActiveItemHand();
|
|
+
|
|
+ /**
|
|
+ * Gets remaining time a player needs to keep hands raised with an item to finish using it.
|
|
+ *
|
|
+ * @return remaining ticks to use the item
|
|
+ * @see #getActiveItemRemainingTime()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default int getItemUseRemainingTime() {
|
|
+ return this.getActiveItemRemainingTime();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get how long the entity's hands have been raised (Charging Bow attack, using a potion, etc)
|
|
+ *
|
|
+ * @return Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
|
|
+ * @see #getActiveItemUsedTime()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default int getHandRaisedTime() {
|
|
+ return this.getActiveItemUsedTime();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Whether this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
+ *
|
|
+ * @return whether this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
+ * @see #hasActiveItem()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default boolean isHandRaised() {
|
|
+ return this.hasActiveItem();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the hand raised by this living entity. Will be either
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
|
|
+ *
|
|
+ * @return the hand raised
|
|
+ * @see #getActiveItemHand()
|
|
+ */
|
|
+ @NotNull
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default org.bukkit.inventory.EquipmentSlot getHandRaised() {
|
|
+ return this.getActiveItemHand();
|
|
+ }
|
|
+ // Paper end - active item API
|
|
}
|