[ci skip] migrate remaining patches to jspecify

Author: Lulu13022002

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -33466,7 +33466,7 @@ index 8d3eb23eb607c862e15fb9e2e7f71a2019b02d04..6eb1a3a83c5bae8935c042396d676f7a
          }
      }
 diff --git a/net/minecraft/world/level/chunk/status/ChunkStep.java b/net/minecraft/world/level/chunk/status/ChunkStep.java
-index 3e381c26fe9a646c73704515f57ba09d9533f37e..06d5de6ccdd07b1645f656170863b419d8d23fc5 100644
+index 3e381c26fe9a646c73704515f57ba09d9533f37e..554faa6ebfc7c7db11634fc9a8cac846df9b92fb 100644
 --- a/net/minecraft/world/level/chunk/status/ChunkStep.java
 +++ b/net/minecraft/world/level/chunk/status/ChunkStep.java
 @@ -11,9 +11,50 @@ import net.minecraft.world.level.chunk.ChunkAccess;
@@ -33476,7 +33476,7 @@ index 3e381c26fe9a646c73704515f57ba09d9533f37e..06d5de6ccdd07b1645f656170863b419
 -public record ChunkStep(
 -    ChunkStatus targetStatus, ChunkDependencies directDependencies, ChunkDependencies accumulatedDependencies, int blockStateWriteRadius, ChunkStatusTask task
 -) {
-+// Paper start - rewerite chunk system - convert record to class
++// Paper start - rewrite chunk system - convert record to class
 +public final class ChunkStep implements ca.spottedleaf.moonrise.patches.chunk_system.status.ChunkSystemChunkStep { // Paper - rewrite chunk system
 +    private final ChunkStatus targetStatus;
 +    private final ChunkDependencies directDependencies;
@@ -33518,16 +33518,16 @@ index 3e381c26fe9a646c73704515f57ba09d9533f37e..06d5de6ccdd07b1645f656170863b419
 +    }
 +    // Paper end - rewrite chunk system
 +
-+    // Paper end - rewerite chunk system - convert record to class
++    // Paper end - rewrite chunk system - convert record to class
 +
      public int getAccumulatedRadiusOf(final ChunkStatus status) {
          return status == this.targetStatus ? 0 : this.accumulatedDependencies.getRadiusOf(status);
      }
-@@ -39,6 +80,56 @@ public record ChunkStep(
+@@ -39,6 +80,55 @@ public record ChunkStep(
          return newCenterChunk;
      }
 
-+    // Paper start - rewerite chunk system - convert record to class
++    // Paper start - rewrite chunk system - convert record to class
 +    public ChunkStatus targetStatus() {
 +        return targetStatus;
 +    }
@@ -33574,8 +33574,7 @@ index 3e381c26fe9a646c73704515f57ba09d9533f37e..06d5de6ccdd07b1645f656170863b419
 +            "blockStateWriteRadius=" + blockStateWriteRadius + ", " +
 +            "task=" + task + ']';
 +    }
-+    // Paper end - rewerite chunk system - convert record to class
-+
++    // Paper end - rewrite chunk system - convert record to class
 +
      public static class Builder {
          private final ChunkStatus status;
@@ -34157,7 +34156,7 @@ index b0b7af7e541eef20063c11ee94d7a6ceaec1626a..18be8647455dee182622f3bbefa91225
 
      private record PackedChunk<T>(Int2ObjectMap<T> sectionsByY, boolean versionChanged) {
 diff --git a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
-index 480623c30777fd230bf8428b16364db09806562b..22a83f312d357176a5489e5b6b71c3ef3e737df7 100644
+index 480623c30777fd230bf8428b16364db09806562b..1e0afa9590de7fe492cf29aded96be3db498c51e 100644
 --- a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
 +++ b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
 @@ -145,7 +145,7 @@ public record SerializableChunkData(
@@ -34368,20 +34367,17 @@ index 480623c30777fd230bf8428b16364db09806562b..22a83f312d357176a5489e5b6b71c3ef
          return tag;
      }
 
-@@ -668,6 +775,66 @@ public record SerializableChunkData(
+@@ -668,6 +775,60 @@ public record SerializableChunkData(
          }
      }
 
 -    public record SectionData(int y, @Nullable LevelChunkSection chunkSection, @Nullable DataLayer blockLight, @Nullable DataLayer skyLight) {
 +    // Paper start - starlight - convert from record
 +    public static final class SectionData implements ca.spottedleaf.moonrise.patches.starlight.storage.StarlightSectionData { // Paper - starlight - our diff
 +        private final int y;
-+        @javax.annotation.Nullable
-+        private final net.minecraft.world.level.chunk.LevelChunkSection chunkSection;
-+        @javax.annotation.Nullable
-+        private final net.minecraft.world.level.chunk.DataLayer blockLight;
-+        @javax.annotation.Nullable
-+        private final net.minecraft.world.level.chunk.DataLayer skyLight;
++        private final @Nullable LevelChunkSection chunkSection;
++        private final @Nullable DataLayer blockLight;
++        private final @Nullable DataLayer skyLight;
 +
 +        // Paper start - starlight - our diff
 +        private int blockLightState = -1;
@@ -34408,30 +34404,27 @@ index 480623c30777fd230bf8428b16364db09806562b..22a83f312d357176a5489e5b6b71c3ef
 +        }
 +        // Paper end - starlight - our diff
 +
-+        public SectionData(int y, @javax.annotation.Nullable net.minecraft.world.level.chunk.LevelChunkSection chunkSection, @javax.annotation.Nullable net.minecraft.world.level.chunk.DataLayer blockLight, @javax.annotation.Nullable net.minecraft.world.level.chunk.DataLayer skyLight) {
++        public SectionData(int y, @Nullable LevelChunkSection chunkSection, @Nullable DataLayer blockLight, @Nullable DataLayer skyLight) {
 +            this.y = y;
 +            this.chunkSection = chunkSection;
 +            this.blockLight = blockLight;
 +            this.skyLight = skyLight;
 +        }
 +
 +        public int y() {
-+            return y;
++            return this.y;
 +        }
 +
-+        @javax.annotation.Nullable
-+        public net.minecraft.world.level.chunk.LevelChunkSection chunkSection() {
-+            return chunkSection;
++        public @Nullable LevelChunkSection chunkSection() {
++            return this.chunkSection;
 +        }
 +
-+        @javax.annotation.Nullable
-+        public net.minecraft.world.level.chunk.DataLayer blockLight() {
-+            return blockLight;
++        public @Nullable DataLayer blockLight() {
++            return this.blockLight;
 +        }
 +
-+        @javax.annotation.Nullable
-+        public net.minecraft.world.level.chunk.DataLayer skyLight() {
-+            return skyLight;
++        public @Nullable DataLayer skyLight() {
++            return this.skyLight;
 +        }
 +        // Paper end - starlight - convert from record
      }

paper-server/patches/features/0003-Optimize-Connection-and-add-advanced-packet-support.patch

@@ -335,26 +335,26 @@ index 0bc6ab5e498f82c5b3cbdf8dddfed6c8406ad511..9cd6ec17981da310be1d35054af080d6
 +    // Paper end - Optimize network
  }
 diff --git a/net/minecraft/network/protocol/Packet.java b/net/minecraft/network/protocol/Packet.java
-index 1480d0db90f5797e3dee19503e52d1e783493ac3..f6cfce2ce30a426cd57a89f3f8ccf144b6050363 100644
+index 1480d0db90f5797e3dee19503e52d1e783493ac3..bd76e55ea56dd7c1e232806d1d13a747af157ced 100644
 --- a/net/minecraft/network/protocol/Packet.java
 +++ b/net/minecraft/network/protocol/Packet.java
-@@ -35,4 +35,32 @@ public interface Packet<T extends PacketListener> {
+@@ -35,4 +35,31 @@ public interface Packet<T extends PacketListener> {
      static <B extends ByteBuf, T extends Packet<?>> StreamCodec<B, T> codec(final StreamMemberEncoder<B, T> writer, final StreamDecoder<B, T> reader) {
          return StreamCodec.ofMember(writer, reader);
      }
 +
 +    // Paper start
 +    /**
-+     * @param player Null if not at PLAY stage yet
++     * @param player null if not at PLAY stage yet
 +     */
-+    default void onPacketDispatch(@javax.annotation.Nullable net.minecraft.server.level.ServerPlayer player) {
++    default void onPacketDispatch(net.minecraft.server.level.@org.jspecify.annotations.Nullable ServerPlayer player) {
 +    }
 +
 +    /**
-+     * @param player Null if not at PLAY stage yet
-+     * @param future Can be null if packet was cancelled
++     * @param player null if not at PLAY stage yet
++     * @param future can be null if packet was cancelled
 +     */
-+    default void onPacketDispatchFinish(@javax.annotation.Nullable net.minecraft.server.level.ServerPlayer player, @javax.annotation.Nullable io.netty.channel.ChannelFuture future) {
++    default void onPacketDispatchFinish(net.minecraft.server.level.@org.jspecify.annotations.Nullable ServerPlayer player, io.netty.channel.@org.jspecify.annotations.Nullable ChannelFuture future) {
 +    }
 +
 +    default boolean hasFinishListener() {
@@ -365,8 +365,7 @@ index 1480d0db90f5797e3dee19503e52d1e783493ac3..f6cfce2ce30a426cd57a89f3f8ccf144
 +        return true;
 +    }
 +
-+    @javax.annotation.Nullable
-+    default java.util.List<Packet<?>> getExtraPackets() {
++    default java.util.@org.jspecify.annotations.Nullable List<Packet<?>> getExtraPackets() {
 +        return null;
 +    }
 +    // Paper end

paper-server/patches/features/0008-Use-Velocity-compression-and-cipher-natives.patch

@@ -169,25 +169,25 @@ index 2f660186f00414b37fa5c01d00c048173feaef13..fe3f0b59561e7b7236aba9cca2a13cee
          this.validateDecompressed = validateDecompressed;
      }
 diff --git a/net/minecraft/network/CompressionEncoder.java b/net/minecraft/network/CompressionEncoder.java
-index 319325e741cc314b84844bb49ea569aaf014f319..7d8986fe3c96cef829275ddd113bcd8a8d7ec583 100644
+index 319325e741cc314b84844bb49ea569aaf014f319..20b5cfe1ce36d74cd6b2f95566a1bc34fc0aaa7f 100644
 --- a/net/minecraft/network/CompressionEncoder.java
 +++ b/net/minecraft/network/CompressionEncoder.java
-@@ -6,17 +6,31 @@ import io.netty.handler.codec.MessageToByteEncoder;
+@@ -6,17 +6,30 @@ import io.netty.handler.codec.MessageToByteEncoder;
  import java.util.zip.Deflater;
 
  public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
 -    private final byte[] encodeBuf = new byte[8192];
-+    @javax.annotation.Nullable private final byte[] encodeBuf; // Paper - Use Velocity cipher
-+    @javax.annotation.Nullable // Paper - Use Velocity cipher
-     private final Deflater deflater;
-+    @javax.annotation.Nullable private final com.velocitypowered.natives.compression.VelocityCompressor compressor; // Paper - Use Velocity cipher
+-    private final Deflater deflater;
++    private final byte @org.jspecify.annotations.Nullable [] encodeBuf; // Paper - Use Velocity cipher
++    private final @org.jspecify.annotations.Nullable Deflater deflater; // Paper - Use Velocity cipher
++    private final com.velocitypowered.natives.compression.@org.jspecify.annotations.Nullable VelocityCompressor compressor; // Paper - Use Velocity cipher
      private int threshold;
 
 +    // Paper start - Use Velocity cipher
      public CompressionEncoder(final int threshold) {
 +        this(null, threshold);
 +    }
-+    public CompressionEncoder(@javax.annotation.Nullable final com.velocitypowered.natives.compression.VelocityCompressor compressor, final int threshold) {
++    public CompressionEncoder(final com.velocitypowered.natives.compression.@org.jspecify.annotations.Nullable VelocityCompressor compressor, final int threshold) {
          this.threshold = threshold;
 -        this.deflater = new Deflater();
 +        if (compressor == null) {
@@ -207,15 +207,15 @@ index 319325e741cc314b84844bb49ea569aaf014f319..7d8986fe3c96cef829275ddd113bcd8a
          int uncompressedLength = uncompressed.readableBytes();
          if (uncompressedLength > 8388608) {
              throw new IllegalArgumentException("Packet too big (is " + uncompressedLength + ", should be less than 8388608)");
-@@ -25,6 +39,7 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
+@@ -25,6 +38,7 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
                  VarInt.write(out, 0);
                  out.writeBytes(uncompressed);
              } else {
 +                if (this.deflater != null) { // Paper - Use Velocity cipher
                  byte[] input = new byte[uncompressedLength];
                  uncompressed.readBytes(input);
                  VarInt.write(out, input.length);
-@@ -37,6 +52,17 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
+@@ -37,6 +51,17 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
                  }
 
                  this.deflater.reset();
@@ -233,7 +233,7 @@ index 319325e741cc314b84844bb49ea569aaf014f319..7d8986fe3c96cef829275ddd113bcd8a
              }
          }
      }
-@@ -48,4 +74,31 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
+@@ -48,4 +73,31 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
      public void setThreshold(final int threshold) {
          this.threshold = threshold;
      }