small improvements

Author: Machine-Maker

paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistic.java

@@ -174,7 +174,7 @@ public interface CustomStatistic extends Keyed, Translatable {
      * @return the statistic for the custom stat.
      */
     default Statistic<CustomStatistic> stat() {
-        return StatisticType.CUSTOM.of(this);
+        return StatisticType.CUSTOM.forValue(this);
     }
 
     private static CustomStatistic get(@KeyPattern.Value final String key) {

paper-api/src/main/java/io/papermc/paper/statistic/Statistic.java

@@ -4,7 +4,7 @@
 import org.jetbrains.annotations.ApiStatus;
 
 /**
- * Represents an individual statistic. Obtained via {@link StatisticType#of(Object)}.
+ * Represents an individual statistic. Obtained via {@link StatisticType#forValue(Object)}.
  * Can be used as a criteria for {@link org.bukkit.scoreboard.Scoreboard#registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
  *
  * @param <S> stat value type.
@@ -13,11 +13,11 @@
 public interface Statistic<S> extends Criteria {
 
     /**
-     * Gets the statistic.
+     * Gets the owner of the statistic.
      *
-     * @return the stat
+     * @return the stat owner
      */
-    S value();
+    S owner();
 
     /**
      * Gets the stat type.

paper-api/src/main/java/io/papermc/paper/statistic/StatisticType.java

@@ -47,7 +47,7 @@ private static <S> StatisticType<S> get(@KeyPattern.Value final String key) {
      * @return the statistic for that thing
      * @throws IllegalArgumentException if the thing is not valid for this {@link StatisticType}
      */
-    Statistic<S> of(S value);
+    Statistic<S> forValue(S value);
 
     /**
      * Gets the registry key associated with this stat type.

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

@@ -196,7 +196,7 @@ public enum Type {
     @ApiStatus.Internal
     public static Statistic toLegacy(final io.papermc.paper.statistic.Statistic<?> stat) {
         Key key = stat.type().key();
-        if (stat.type() == StatisticType.CUSTOM && stat.value() instanceof final CustomStatistic customStatistic) {
+        if (stat.type() == StatisticType.CUSTOM && stat.owner() instanceof final CustomStatistic customStatistic) {
             key = customStatistic.getKey();
         }
         return Objects.requireNonNull(Registry.STATISTIC.get(key), "Couldn't convert " + stat + " to a legacy stat");
@@ -212,13 +212,13 @@ public io.papermc.paper.statistic.Statistic<?> toModern(@Nullable EntityType ent
         Preconditions.checkArgument(this.type != Type.BLOCK || material != null && material.isBlock(), "Must provide a valid block material");
         Preconditions.checkArgument(this.type != Type.ITEM || material != null && material.isItem(), "Must provide a valid item material");
         if (this.type == Type.UNTYPED) {
-            return StatisticType.CUSTOM.of(Objects.requireNonNull(Registry.CUSTOM_STAT.get(this.key), "Couldn't convert " + this + " to a modern stat"));
+            return StatisticType.CUSTOM.forValue(Objects.requireNonNull(Registry.CUSTOM_STAT.get(this.key), "Couldn't convert " + this + " to a modern stat"));
         } else {
             StatisticType<?> statType = Objects.requireNonNull(Registry.STAT_TYPE.get(this.key), "Couldn't convert " + this + " to a modern stat");
             return switch (this.type) {
-                case Type.BLOCK -> ((StatisticType<BlockType>) statType).of(Objects.requireNonNull(material.asBlockType()));
-                case Type.ITEM -> ((StatisticType<ItemType>) statType).of(Objects.requireNonNull(material.asItemType()));
-                case Type.ENTITY -> ((StatisticType<EntityType>) statType).of(Objects.requireNonNull(entityType));
+                case Type.BLOCK -> ((StatisticType<BlockType>) statType).forValue(Objects.requireNonNull(material.asBlockType()));
+                case Type.ITEM -> ((StatisticType<ItemType>) statType).forValue(Objects.requireNonNull(material.asItemType()));
+                case Type.ENTITY -> ((StatisticType<EntityType>) statType).forValue(Objects.requireNonNull(entityType));
                 default -> throw new IllegalStateException("Unexpected value: " + this.type);
             };
         }

paper-api/src/main/java/org/bukkit/event/player/PlayerStatisticIncrementEvent.java

@@ -37,10 +37,10 @@ public PlayerStatisticIncrementEvent(final Player player, final Statistic<?> sta
         this.statistic = statistic;
         this.initialValue = initialValue;
         this.newValue = newValue;
-        this.entityType = statistic.value() instanceof final EntityType et ? et : null;
-        if (statistic.value() instanceof final ItemType it) {
+        this.entityType = statistic.owner() instanceof final EntityType et ? et : null;
+        if (statistic.owner() instanceof final ItemType it) {
             this.material = it.asMaterial();
-        } else if (statistic.value() instanceof final BlockType bt) {
+        } else if (statistic.owner() instanceof final BlockType bt) {
             this.material = bt.asMaterial();
         } else {
             this.material = null;

paper-server/src/main/java/io/papermc/paper/statistic/PaperStatistic.java

@@ -4,7 +4,7 @@
 import org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations;
 import org.bukkit.scoreboard.RenderType;
 
-public record PaperStatistic<S, M>(Stat<M> handle, S value, M nmsValue, StatisticType<S> type) implements Statistic<S> {
+public record PaperStatistic<S, M>(Stat<M> handle, S owner, M nmsValue, StatisticType<S> type) implements Statistic<S> {
 
     @Override
     public String getName() {

paper-server/src/main/java/io/papermc/paper/statistic/PaperStatisticType.java

@@ -60,20 +60,20 @@ public static <M> StatisticType<?> create(final Holder<StatType<?>> holder) {
         }
     }
 
-    public static StatisticType<?> minecraftToBukkit(final StatType<?> minecraft) {
+    public static <A, M> StatisticType<A> minecraftToBukkit(final StatType<M> minecraft) {
         return CraftRegistry.minecraftToBukkit(minecraft, Registries.STAT_TYPE);
     }
 
-    public static StatType<?> bukkitToMinecraft(final StatisticType<?> bukkit) {
+    public static <A, M> StatType<M> bukkitToMinecraft(final StatisticType<A> bukkit) {
         return CraftRegistry.bukkitToMinecraft(bukkit);
     }
 
     public Statistic<S> convertStat(final Stat<? extends M> nmsStat) {
-        return this.of(this.minecraftToBukkit.apply(nmsStat.getValue(), this.getHandle().getRegistry().key()));
+        return this.forValue(this.minecraftToBukkit.apply(nmsStat.getValue(), this.getHandle().getRegistry().key()));
     }
 
     @Override
-    public Statistic<S> of(final S value) {
+    public Statistic<S> forValue(final S value) {
         if (!this.typeCheck.test(value)) {
             throw new IllegalArgumentException(value + " is not valid for stat type " + this.getKey());
         }

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

@@ -105,7 +105,7 @@ public static <B extends Keyed, M> M bukkitToMinecraft(B bukkit) {
         return ((Handleable<M>) bukkit).getHandle();
     }
 
-    public static <B extends Keyed, M> Holder<M> bukkitToMinecraftHolder(B bukkit, ResourceKey<net.minecraft.core.Registry<M>> registryKey) {
+    public static <B extends Keyed, M> Holder<M> bukkitToMinecraftHolder(B bukkit, ResourceKey<? extends net.minecraft.core.Registry<M>> registryKey) {
         Preconditions.checkArgument(bukkit != null);
         // Paper start - support direct Holder
         if (bukkit instanceof io.papermc.paper.util.Holderable<?>) {

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -1574,7 +1574,7 @@ public static PlayerShearEntityEvent handlePlayerShearEntityEvent(net.minecraft.
     public static Cancellable handleStatisticsIncrease(final net.minecraft.world.entity.player.Player entityHuman, final Stat<?> statistic, final int current, final int newValue) {
         final Player player = ((ServerPlayer) entityHuman).getBukkitEntity();
         final Statistic<?> stat = PaperStatistics.getPaperStatistic(statistic);
-        if (stat.value() instanceof final CustomStatistic customStatistic && PaperStatistics.IGNORED_STATS_FOR_EVENT.contains(customStatistic.key())) {
+        if (stat.owner() instanceof final CustomStatistic customStatistic && PaperStatistics.IGNORED_STATS_FOR_EVENT.contains(customStatistic.key())) {
             // Do not process event for these - too spammy
             return null;
         }