From c06ed2fbc1bf7bc254df2a60c351fe86928779ad Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 25 Apr 2024 10:36:08 +0100 Subject: [PATCH] Fix javax annotations compilation error --- .../mapsync/common/net/packet/ChunkTilePacket.java | 4 +--- .../ClientboundChunkTimestampsResponsePacket.java | 6 +++--- .../net/packet/ClientboundEncryptionRequestPacket.java | 10 ++++------ .../net/packet/ServerboundCatchupRequestPacket.java | 3 +-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ChunkTilePacket.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ChunkTilePacket.java index c83bcac..e48492d 100644 --- a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ChunkTilePacket.java +++ b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ChunkTilePacket.java @@ -5,8 +5,6 @@ import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; - /** * This packet is sent in two situations: * @@ -19,7 +17,7 @@ public class ChunkTilePacket implements Packet { public final ChunkTile chunkTile; - public ChunkTilePacket(@Nonnull ChunkTile chunkTile) { + public ChunkTilePacket(@NotNull ChunkTile chunkTile) { this.chunkTile = chunkTile; } diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundChunkTimestampsResponsePacket.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundChunkTimestampsResponsePacket.java index 86ec383..03545ae 100644 --- a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundChunkTimestampsResponsePacket.java +++ b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundChunkTimestampsResponsePacket.java @@ -4,8 +4,8 @@ import gjum.minecraft.mapsync.common.net.Packet; import io.netty.buffer.ByteBuf; import net.minecraft.core.Registry; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -20,9 +20,9 @@ public class ClientboundChunkTimestampsResponsePacket implements Packet { /** * sorted by newest to oldest */ - public final @Nonnull List chunks; + public final @NotNull List chunks; - public ClientboundChunkTimestampsResponsePacket(@Nonnull List chunks) { + public ClientboundChunkTimestampsResponsePacket(@NotNull List chunks) { this.chunks = chunks; } diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundEncryptionRequestPacket.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundEncryptionRequestPacket.java index 8efc14b..67ff10c 100644 --- a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundEncryptionRequestPacket.java +++ b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ClientboundEncryptionRequestPacket.java @@ -2,8 +2,8 @@ import gjum.minecraft.mapsync.common.net.Packet; import io.netty.buffer.ByteBuf; +import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.security.*; import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; @@ -15,12 +15,10 @@ public class ClientboundEncryptionRequestPacket implements Packet { public static final int PACKET_ID = 2; - @Nonnull - public final PublicKey publicKey; - @Nonnull - public final byte[] verifyToken; + public final @NotNull PublicKey publicKey; + public final byte @NotNull [] verifyToken; - public ClientboundEncryptionRequestPacket(@Nonnull PublicKey publicKey, @Nonnull byte[] verifyToken) { + public ClientboundEncryptionRequestPacket(@NotNull PublicKey publicKey, byte @NotNull [] verifyToken) { this.publicKey = publicKey; this.verifyToken = verifyToken; } diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ServerboundCatchupRequestPacket.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ServerboundCatchupRequestPacket.java index 8a1bde3..edae312 100644 --- a/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ServerboundCatchupRequestPacket.java +++ b/mod/common/src/main/java/gjum/minecraft/mapsync/common/net/packet/ServerboundCatchupRequestPacket.java @@ -7,7 +7,6 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; import java.util.List; /** @@ -27,7 +26,7 @@ public class ServerboundCatchupRequestPacket implements Packet { /** * Chunks must all be in the same dimension */ - public ServerboundCatchupRequestPacket(@Nonnull List chunks) { + public ServerboundCatchupRequestPacket(@NotNull List chunks) { if (chunks.isEmpty()) throw new Error("Chunks list must not be empty"); ResourceKey dim = null; for (CatchupChunk chunk : chunks) {