deprecate a bunch of duplicates

Author: Lulu13022002

paper-api/src/main/java/org/bukkit/entity/LivingEntity.java

@@ -22,6 +22,7 @@
 import org.bukkit.scoreboard.Team;
 import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
+import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -402,106 +403,120 @@ default RayTraceResult rayTraceBlocks(double maxDistance) {
      *
      * @return ticks until arrow leaves
      */
-    public int getArrowCooldown();
+    public @NonNegative int getArrowCooldown();
 
     /**
      * Sets the time in ticks until the next arrow leaves the entity's body.
+     * <p>
+     * A value of 0 will cause the server to re-calculate the time on the next tick.
      *
      * @param ticks time until arrow leaves
      */
-    public void setArrowCooldown(int ticks);
+    public void setArrowCooldown(@NonNegative int ticks);
 
     /**
      * Gets the amount of arrows in an entity's body.
      *
      * @return amount of arrows in body
      */
-    public int getArrowsInBody();
+    public @NonNegative int getArrowsInBody();
 
-    // Paper start
     /**
      * Set the amount of arrows in the entity's body.
      * <p>
      * Does not fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent}.
      *
      * @param count amount of arrows in entity's body
      */
-    default void setArrowsInBody(final int count) {
+    default void setArrowsInBody(final @NonNegative int count) {
         this.setArrowsInBody(count, false);
     }
-    // Paper end
 
     /**
      * Set the amount of arrows in the entity's body.
      *
      * @param count amount of arrows in entity's body
      * @param fireEvent whether to fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent} event
      */
-    void setArrowsInBody(int count, boolean fireEvent); // Paper
+    void setArrowsInBody(@NonNegative int count, boolean fireEvent); // Paper
 
-    // Paper start - Add methods for working with arrows stuck in living entities
     /**
      * Sets the amount of ticks before the next arrow gets removed from the entities body.
      * <p>
      * A value of 0 will cause the server to re-calculate the amount of ticks on the next tick.
      *
      * @param ticks Amount of ticks
+     * @deprecated use {@link #setArrowCooldown(int)}
      */
-    void setNextArrowRemoval(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
+    @Deprecated(since = "1.21.10")
+    default void setNextArrowRemoval(@NonNegative int ticks) {
+        this.setArrowCooldown(ticks);
+    }
 
     /**
      * Gets the amount of ticks before the next arrow gets removed from the entities body.
      *
      * @return ticks Amount of ticks
+     * @deprecated use {@link #getArrowCooldown()}
      */
-    int getNextArrowRemoval();
-    // Paper end - Add methods for working with arrows stuck in living entities
+    @Deprecated(since = "1.21.10")
+    default @NonNegative int getNextArrowRemoval() {
+        return this.getArrowCooldown();
+    }
 
-    // Paper start - Bee Stinger API
     /**
      * Gets the time in ticks until the next bee stinger leaves the entity's body.
      *
      * @return ticks until bee stinger leaves
      */
-    public int getBeeStingerCooldown();
+    public @NonNegative int getBeeStingerCooldown();
 
     /**
      * Sets the time in ticks until the next stinger leaves the entity's body.
+     * <p>
+     * A value of 0 will cause the server to re-calculate the time on the next tick.
      *
      * @param ticks time until bee stinger leaves
      */
-    public void setBeeStingerCooldown(int ticks);
+    public void setBeeStingerCooldown(@NonNegative int ticks);
 
     /**
      * Gets the amount of bee stingers in an entity's body.
      *
      * @return amount of bee stingers in body
      */
-    public int getBeeStingersInBody();
+    public @NonNegative int getBeeStingersInBody();
 
     /**
      * Set the amount of bee stingers in the entity's body.
      *
      * @param count amount of bee stingers in entity's body
      */
-    public void setBeeStingersInBody(int count);
+    public void setBeeStingersInBody(@NonNegative int count);
 
     /**
      * Sets the amount of ticks before the next bee stinger gets removed from the entities body.
      * <p>
      * A value of 0 will cause the server to re-calculate the amount of ticks on the next tick.
      *
      * @param ticks Amount of ticks
+     * @deprecated use {@link #setBeeStingerCooldown(int)}
      */
-    void setNextBeeStingerRemoval(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
+    @Deprecated(since = "1.21.10")
+    default void setNextBeeStingerRemoval(@NonNegative int ticks) {
+        this.setBeeStingerCooldown(ticks);
+    }
 
     /**
      * Gets the amount of ticks before the next bee stinger gets removed from the entities body.
      *
      * @return ticks Amount of ticks
+     * @deprecated use {@link #getBeeStingerCooldown()}
      */
-    int getNextBeeStingerRemoval();
-    // Paper end - Stinger API
+    @Deprecated(since = "1.21.10")
+    default @NonNegative int getNextBeeStingerRemoval() {
+        return this.getBeeStingerCooldown();
+    }
 
     /**
      * Returns the living entity's current maximum no damage ticks.
@@ -1065,11 +1080,14 @@ default boolean addPotionEffect(@NotNull PotionEffect effect) {
 
     /**
      * Get the number of arrows stuck in this entity
+     *
      * @return Number of arrows stuck
      * @deprecated use {@link #getArrowsInBody()}
      */
     @Deprecated
-    int getArrowsStuck();
+    default @NonNegative int getArrowsStuck() {
+        return this.getArrowsInBody();
+    }
 
     /**
      * Set the number of arrows stuck in this entity
@@ -1079,7 +1097,9 @@ default boolean addPotionEffect(@NotNull PotionEffect effect) {
      * you want to retain exact functionality, pass {@code true} for {@code fireEvent}.</b>
      */
     @Deprecated
-    void setArrowsStuck(int arrows);
+    default void setArrowsStuck(@NonNegative int arrows) {
+        this.setArrowsInBody(arrows, true);
+    }
 
     /**
      * Get the delay (in ticks) before blocking is effective for this entity

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

@@ -347,6 +347,7 @@ public int getArrowCooldown() {
 
     @Override
     public void setArrowCooldown(int ticks) {
+        Preconditions.checkArgument(ticks >= 0, "Amount of ticks before next arrow removal must be non-negative");
         this.getHandle().removeArrowTime = ticks;
     }
 
@@ -357,65 +358,41 @@ public int getArrowsInBody() {
 
     @Override
     public void setArrowsInBody(final int count, final boolean fireEvent) { // Paper
-        Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0");
+        Preconditions.checkArgument(count >= 0, "New arrow amount must be non-negative");
         if (!fireEvent) {
             this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count);
         } else {
             this.getHandle().setArrowCount(count);
         }
     }
 
-    // Paper start - Add methods for working with arrows stuck in living entities
-    @Override
-    public void setNextArrowRemoval(final int ticks) {
-        Preconditions.checkArgument(ticks >= 0, "New amount of ticks before next arrow removal must be >= 0");
-        this.getHandle().removeArrowTime = ticks;
-    }
-
-    @Override
-    public int getNextArrowRemoval() {
-        return this.getHandle().removeArrowTime;
-    }
-    // Paper end - Add methods for working with arrows stuck in living entities
-
     @Override
     public boolean isInvulnerable() {
         return this.getHandle().isInvulnerableTo((ServerLevel) this.getHandle().level(), this.getHandle().damageSources().generic());
     }
-    // Paper start - Bee Stinger API
+
     @Override
     public int getBeeStingerCooldown() {
-        return getHandle().removeStingerTime;
+        return this.getHandle().removeStingerTime;
     }
 
     @Override
     public void setBeeStingerCooldown(int ticks) {
-        getHandle().removeStingerTime = ticks;
+        Preconditions.checkArgument(ticks >= 0, "New amount of ticks before next bee stinger removal must be non-negative");
+        this.getHandle().removeStingerTime = ticks;
     }
 
     @Override
     public int getBeeStingersInBody() {
-        return getHandle().getStingerCount();
+        return this.getHandle().getStingerCount();
     }
 
     @Override
     public void setBeeStingersInBody(int count) {
         Preconditions.checkArgument(count >= 0, "New bee stinger amount must be >= 0");
-        getHandle().setStingerCount(count);
-    }
-
-    @Override
-    public void setNextBeeStingerRemoval(final int ticks) {
-        Preconditions.checkArgument(ticks >= 0, "New amount of ticks before next bee stinger removal must be >= 0");
-        this.getHandle().removeStingerTime = ticks;
+        this.getHandle().setStingerCount(count);
     }
 
-    @Override
-    public int getNextBeeStingerRemoval() {
-        return this.getHandle().removeStingerTime;
-    }
-    // Paper end - Bee Stinger API
-
     @Override
     public void damage(double amount) {
         this.damage(amount, this.getHandle().damageSources().generic());
@@ -966,16 +943,6 @@ public float getUpwardsMovement() {
         return this.getHandle().yya;
     }
 
-    @Override
-    public int getArrowsStuck() {
-        return this.getHandle().getArrowCount();
-    }
-
-    @Override
-    public void setArrowsStuck(final int arrows) {
-        this.getHandle().setArrowCount(arrows);
-    }
-
     @Override
     public void startUsingItem(org.bukkit.inventory.EquipmentSlot hand) {
         Preconditions.checkArgument(hand != null, "hand must not be null");