add back positive checks

Author: Machine-Maker

paper-api/src/main/java/org/bukkit/OfflinePlayer.java

@@ -313,17 +313,17 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
      *
      * @param statistic the stat to decrement
      * @param amount the value to decrement by
+     * @throws IllegalArgumentException if amount is negative
      * @throws IllegalArgumentException if the stat would have a negative value after decrementing it
      */
-    default void decrementStatistic(final io.papermc.paper.statistic.Statistic<?> statistic, final int amount) {
-        this.incrementStatistic(statistic, -amount);
-    }
+    void decrementStatistic(final io.papermc.paper.statistic.Statistic<?> statistic, final int amount);
 
     /**
      * Increments the given stat for this player.
      *
      * @param statistic the stat to increment
      * @param amount the amount to increment by
+     * @throws IllegalArgumentException if amount is negative
      */
     void incrementStatistic(io.papermc.paper.statistic.Statistic<?> statistic, int amount);
 
@@ -377,6 +377,7 @@ default void decrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
      */
     @Nullable Location getRespawnLocation(boolean loadLocationAndValidate);
 
+    //<editor-fold desc="deprecated statistic methods" defaultstate="collapsed">
     /**
      * Increments the given statistic for this player.
      * <p>
@@ -422,6 +423,7 @@ default void decrementStatistic(Statistic statistic) throws IllegalArgumentExcep
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if the statistic requires an
      *     additional parameter
+     * @throws IllegalArgumentException if amount isn't positive
      * @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
      */
     @Deprecated(since = "1.21.6")
@@ -438,6 +440,7 @@ default void incrementStatistic(Statistic statistic, int amount) throws IllegalA
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if the statistic requires an
      *     additional parameter
+     * @throws IllegalArgumentException if amount isn't positive
      * @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
      * @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
      */
@@ -550,6 +553,7 @@ default int getStatistic(Statistic statistic, Material material) throws IllegalA
      * @param amount Amount to increment this statistic by
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if material is null
+     * @throws IllegalArgumentException if amount isn't positive
      * @throws IllegalArgumentException if the given parameter is not valid
      *     for the statistic
      * @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
@@ -569,6 +573,7 @@ default void incrementStatistic(Statistic statistic, Material material, int amou
      * @param amount Amount to decrement this statistic by
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if material is null
+     * @throws IllegalArgumentException if amount isn't positive
      * @throws IllegalArgumentException if the given parameter is not valid
      *     for the statistic
      * @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
@@ -671,6 +676,7 @@ default int getStatistic(Statistic statistic, EntityType entityType) throws Ille
      * @param amount Amount to increment this statistic by
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if entityType is null
+     * @throws IllegalArgumentException if amount isn't positive
      * @throws IllegalArgumentException if the given parameter is not valid
      *     for the statistic
      * @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
@@ -690,6 +696,7 @@ default void incrementStatistic(Statistic statistic, EntityType entityType, int
      * @param amount Amount to decrement this statistic by
      * @throws IllegalArgumentException if statistic is null
      * @throws IllegalArgumentException if entityType is null
+     * @throws IllegalArgumentException if amount isn't positive
      * @throws IllegalArgumentException if the given parameter is not valid
      *     for the statistic
      * @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
@@ -721,6 +728,7 @@ default void setStatistic(Statistic statistic, EntityType entityType, int newVal
         Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
         this.setStatistic(statistic.toModern(entityType, null),  newValue);
     }
+    //</editor-fold>
 
     /**
      * Gets the player's last death location.

paper-api/src/main/java/org/bukkit/Statistic.java

@@ -192,7 +192,7 @@ public enum Type {
         ENTITY;
     }
 
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.Internal
     public static Statistic toLegacy(final io.papermc.paper.statistic.Statistic<?> stat) {
         Key key = stat.type().key();
@@ -203,7 +203,7 @@ public static Statistic toLegacy(final io.papermc.paper.statistic.Statistic<?> s
     }
 
     @SuppressWarnings("unchecked")
-    @Deprecated(forRemoval = true)
+    @Deprecated
     @ApiStatus.Internal
     public io.papermc.paper.statistic.Statistic<?> toModern(@Nullable EntityType entityType, @Nullable Material material) {
         Preconditions.checkArgument(entityType == null || material == null, "No stat has an entity type and material value at the same time");

paper-server/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java

@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit;
 
+import com.google.common.base.Preconditions;
 import com.mojang.authlib.GameProfile;
 import io.papermc.paper.statistic.PaperStatistics;
 import io.papermc.paper.statistic.Statistic;
@@ -383,8 +384,21 @@ private ServerStatsCounter getStatisticManager() {
         return this.server.getHandle().getPlayerStats(this.getUniqueId(), this.getName());
     }
 
+    @Override
+    public void decrementStatistic(final Statistic<?> statistic, final int amount) {
+        Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
+        if (this.isOnline()) {
+            this.getPlayer().decrementStatistic(statistic, amount);
+        } else {
+            final ServerStatsCounter manager = this.getStatisticManager();
+            PaperStatistics.changeStatistic(manager, statistic, -amount, null);
+            manager.save();
+        }
+    }
+
     @Override
     public void incrementStatistic(final Statistic<?> statistic, final int amount) {
+        Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
         if (this.isOnline()) {
             this.getPlayer().incrementStatistic(statistic, amount);
         } else {

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

@@ -1636,8 +1636,15 @@ public Set<NamespacedKey> getDiscoveredRecipes() {
         return bukkitRecipeKeys.build();
     }
 
+    @Override
+    public void decrementStatistic(final Statistic<?> statistic, final int amount) {
+        Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
+        PaperStatistics.changeStatistic(this.getHandle().getStats(), statistic, -amount, this.getHandle());
+    }
+
     @Override
     public void incrementStatistic(final Statistic<?> statistic, final int amount) {
+        Preconditions.checkArgument(amount > 0, "Amount must be greater than 0");
         PaperStatistics.changeStatistic(this.getHandle().getStats(), statistic, amount, this.getHandle());
     }