Finish converting most of the undeprecated api to jspecify

patches/api/Add-Position.patch

@@ -16,15 +16,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.block.BlockFace;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
++import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * A position represented with integers.
 + * <p>
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
++ *
 + * @see FinePosition
 + */
 +@ApiStatus.Experimental
++@NullMarked
 +public interface BlockPosition extends Position {
 +
 +    @Override
@@ -53,17 +55,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition toBlock() {
++    default BlockPosition toBlock() {
 +        return this;
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition offset(int x, int y, int z) {
++    default BlockPosition offset(final int x, final int y, final int z) {
 +        return x == 0 && y == 0 && z == 0 ? this : new BlockPositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z);
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
++    default FinePosition offset(final double x, final double y, final double z) {
 +        return new FinePositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z);
 +    }
 +
@@ -74,7 +76,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return the offset block position
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace) {
++    default BlockPosition offset(final BlockFace blockFace) {
 +        return this.offset(blockFace, 1);
 +    }
 +
@@ -87,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return the offset block position
 +     */
 +    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace, int amount) {
++    default BlockPosition offset(final BlockFace blockFace, final int amount) {
 +        return amount == 0 ? this : new BlockPositionImpl(this.blockX() + (blockFace.getModX() * amount), this.blockY() + (blockFace.getModY() * amount), this.blockZ() + (blockFace.getModZ() * amount));
 +    }
 +
@@ -100,7 +102,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return the offset block position
 +     */
 +    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull Axis axis, int amount) {
++    default BlockPosition offset(final Axis axis, final int amount) {
 +        return amount == 0 ? this : switch (axis) {
 +            case X -> new BlockPositionImpl(this.blockX() + amount, this.blockY(), this.blockZ());
 +            case Y -> new BlockPositionImpl(this.blockX(), this.blockY() + amount, this.blockZ());
@@ -127,17 +129,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +package io.papermc.paper.math;
 +
 +import org.bukkit.util.NumberConversions;
-+import org.bukkit.util.Vector;
 +import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
++import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * A position represented with doubles.
 + * <p>
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
++ *
 + * @see BlockPosition
 + */
 +@ApiStatus.Experimental
++@NullMarked
 +public interface FinePosition extends Position {
 +
 +    @Override
@@ -166,17 +169,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    default @NotNull BlockPosition toBlock() {
++    default BlockPosition toBlock() {
 +        return new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ());
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(int x, int y, int z) {
++    default FinePosition offset(final int x, final int y, final int z) {
 +        return this.offset((double) x, y, z);
 +    }
 +
 +    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
++    default FinePosition offset(final double x, final double y, final double z) {
 +        return x == 0.0 && y == 0.0 && z == 0.0 ? this : new FinePositionImpl(this.x() + x, this.y() + y, this.z() + z);
 +    }
 +}
@@ -203,7 +206,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.util.Vector;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
++import org.jspecify.annotations.NullMarked;
 +
 +/**
 + * Common interface for {@link FinePosition} and {@link BlockPosition}.
@@ -211,6 +214,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * <b>May see breaking changes until Experimental annotation is removed.</b>
 + */
 +@ApiStatus.Experimental
++@NullMarked
 +public interface Position {
 +
 +    FinePosition FINE_ZERO = new FinePositionImpl(0, 0, 0);
@@ -287,7 +291,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param z z value to offset
 +     * @return the offset position
 +     */
-+    @NotNull Position offset(int x, int y, int z);
++    Position offset(int x, int y, int z);
 +
 +    /**
 +     * Returns a position offset by the specified amounts.
@@ -297,7 +301,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param z z value to offset
 +     * @return the offset position
 +     */
-+    @NotNull FinePosition offset(double x, double y, double z);
++    FinePosition offset(double x, double y, double z);
 +
 +    /**
 +     * Returns a new position at the center of the block position this represents
@@ -305,7 +309,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a new center position
 +     */
 +    @Contract(value = "-> new", pure = true)
-+    default @NotNull FinePosition toCenter() {
++    default FinePosition toCenter() {
 +        return new FinePositionImpl(this.blockX() + 0.5, this.blockY() + 0.5, this.blockZ() + 0.5);
 +    }
 +
@@ -316,7 +320,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return the block position
 +     */
 +    @Contract(pure = true)
-+    @NotNull BlockPosition toBlock();
++    BlockPosition toBlock();
 +
 +    /**
 +     * Converts this position to a vector
@@ -324,7 +328,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a new vector
 +     */
 +    @Contract(value = "-> new", pure = true)
-+    default @NotNull Vector toVector() {
++    default Vector toVector() {
 +        return new Vector(this.x(), this.y(), this.z());
 +    }
 +
@@ -335,7 +339,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a new location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull Location toLocation(@NotNull World world) {
++    default Location toLocation(final World world) {
 +        return new Location(world, this.x(), this.y(), this.z());
 +    }
 +
@@ -348,7 +352,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a position with those coords
 +     */
 +    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull BlockPosition block(int x, int y, int z) {
++    static BlockPosition block(final int x, final int y, final int z) {
 +        return new BlockPositionImpl(x, y, z);
 +    }
 +
@@ -359,7 +363,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a new position at that location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull BlockPosition block(@NotNull Location location) {
++    static BlockPosition block(final Location location) {
 +        return new BlockPositionImpl(location.getBlockX(), location.getBlockY(), location.getBlockZ());
 +    }
 +
@@ -372,7 +376,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a position with those coords
 +     */
 +    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull FinePosition fine(double x, double y, double z) {
++    static FinePosition fine(final double x, final double y, final double z) {
 +        return new FinePositionImpl(x, y, z);
 +    }
 +
@@ -383,7 +387,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a new position at that location
 +     */
 +    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull FinePosition fine(@NotNull Location location) {
++    static FinePosition fine(final Location location) {
 +        return new FinePositionImpl(location.getX(), location.getY(), location.getZ());
 +    }
 +}