Release 2.1.20 (#426)

* Backport codecs from Sonar 3.0

api/src/main/java/xyz/jonesdev/sonar/api/fallback/protocol/ProtocolVersion.java

@@ -69,7 +69,8 @@ public enum ProtocolVersion {
   MINECRAFT_1_20_3(765, "1.20.3"),
   MINECRAFT_1_20_5(766, "1.20.5"),
   MINECRAFT_1_21(767, "1.21"),
-  MINECRAFT_1_21_2(768, "1.21.2");
+  MINECRAFT_1_21_2(768, "1.21.2"),
+  MINECRAFT_1_21_4(769, "1.21.4");
 
   private final int protocol;
   private final String name;

build.gradle.kts

@@ -40,7 +40,6 @@ allprojects {
       removeUnusedImports()
       trimTrailingWhitespace()
       indentWithSpaces(2)
-      licenseHeaderFile("../HEADER")
     }
   }
 

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/BukkitServerVersion.java

@@ -70,7 +70,11 @@ public enum BukkitServerVersion {
   MINECRAFT_1_20_4,
   MINECRAFT_1_20_5,
   MINECRAFT_1_20_6,
-  MINECRAFT_1_21;
+  MINECRAFT_1_21,
+  MINECRAFT_1_21_1,
+  MINECRAFT_1_21_2,
+  MINECRAFT_1_21_3,
+  MINECRAFT_1_21_4;
 
   static final BukkitServerVersion[] REVERSED_VALUES;
 

common/src/main/java/xyz/jonesdev/sonar/common/boot/LibraryLoader.java

@@ -72,19 +72,19 @@ class LibraryLoader {
         Library.builder()
           .groupId("net{}kyori")
           .artifactId("adventure-text-minimessage")
-          .version("4.17.0")
+          .version("4.18.0")
           .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
           .build(),
         Library.builder()
           .groupId("net{}kyori")
           .artifactId("adventure-text-serializer-gson")
-          .version("4.17.0")
+          .version("4.18.0")
           .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
           .build(),
         Library.builder()
           .groupId("net{}kyori")
           .artifactId("adventure-nbt")
-          .version("4.17.0")
+          .version("4.18.0")
           .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
           .build()
       );

common/src/main/java/xyz/jonesdev/sonar/common/fallback/FallbackUserWrapper.java

@@ -100,13 +100,11 @@ public final class FallbackUserWrapper implements FallbackUser {
       Sonar.get().getFallback().getConnected().compute(inetAddress, (__, v) -> true);
 
       // Replace normal encoder to allow custom packets
-      // TODO: recode injection
       final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
       channel.pipeline().addFirst(FALLBACK_FRAME_ENCODER, FallbackVarIntLengthEncoder.INSTANCE);
       channel.pipeline().addLast(FALLBACK_PACKET_ENCODER, newEncoder);
 
       // Replace normal decoder to allow custom packets
-      // TODO: recode injection
       final FallbackPacketDecoder newDecoder = new FallbackPacketDecoder(protocolVersion);
       channel.pipeline().addFirst(FALLBACK_FRAME_DECODER, new FallbackVarInt21FrameDecoder());
       channel.pipeline().addLast(FALLBACK_PACKET_DECODER, newDecoder);
@@ -127,7 +125,6 @@ public final class FallbackUserWrapper implements FallbackUser {
       newDecoder.setListener(new FallbackPreJoinHandler(this));
 
       // Make sure to catch all exceptions during the verification
-      // TODO: recode injection
       channel.pipeline().addLast(FALLBACK_TAIL_EXCEPTIONS, FallbackTailExceptionsHandler.INSTANCE);
     });
   }

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacketRegistry.java

@@ -383,26 +383,6 @@ public enum FallbackPacketRegistry {
         map(0x03, MINECRAFT_1_19, true),
         map(0x04, MINECRAFT_1_19_4, true),
         map(0x03, MINECRAFT_1_20_2, true));
-      clientbound.register(TeleportEntityPacket.class, TeleportEntityPacket::new,
-        map(0x18, MINECRAFT_1_7_2, true),
-        map(0x4A, MINECRAFT_1_9, true),
-        map(0x49, MINECRAFT_1_9_4, true),
-        map(0x4B, MINECRAFT_1_12, true),
-        map(0x4C, MINECRAFT_1_12_1, true),
-        map(0x50, MINECRAFT_1_13, true),
-        map(0x56, MINECRAFT_1_14, true),
-        map(0x57, MINECRAFT_1_15, true),
-        map(0x56, MINECRAFT_1_16, true),
-        map(0x61, MINECRAFT_1_17, true),
-        map(0x62, MINECRAFT_1_18, true),
-        map(0x63, MINECRAFT_1_19, true),
-        map(0x66, MINECRAFT_1_19_1, true),
-        map(0x64, MINECRAFT_1_19_3, true),
-        map(0x68, MINECRAFT_1_19_4, true),
-        map(0x6B, MINECRAFT_1_20_2, true),
-        map(0x6D, MINECRAFT_1_20_3, true),
-        map(0x70, MINECRAFT_1_20_5, true),
-        map(0x77, MINECRAFT_1_21_2, true));
       clientbound.register(UpdateTimePacket.class, UpdateTimePacket::new,
         map(0x03, MINECRAFT_1_7_2, true),
         map(0x44, MINECRAFT_1_9, true),
@@ -437,7 +417,8 @@ public enum FallbackPacketRegistry {
         map(0x2B, MINECRAFT_1_20_2, false),
         map(0x2C, MINECRAFT_1_20_3, false),
         map(0x2F, MINECRAFT_1_20_5, false),
-        map(0x31, MINECRAFT_1_21_2, false));
+        map(0x31, MINECRAFT_1_21_2, false),
+        map(0x33, MINECRAFT_1_21_4, false));
       serverbound.register(PaddleBoatPacket.class, PaddleBoatPacket::new,
         map(0x11, MINECRAFT_1_9, false),
         map(0x12, MINECRAFT_1_12, false),
@@ -469,7 +450,8 @@ public enum FallbackPacketRegistry {
         map(0x22, MINECRAFT_1_20_2, false),
         map(0x23, MINECRAFT_1_20_3, false),
         map(0x26, MINECRAFT_1_20_5, false),
-        map(0x28, MINECRAFT_1_21_2, false));
+        map(0x28, MINECRAFT_1_21_2, false),
+        map(0x29, MINECRAFT_1_21_4, false));
       serverbound.register(VehicleMovePacket.class, VehicleMovePacket::new,
         map(0x10, MINECRAFT_1_9, false),
         map(0x11, MINECRAFT_1_12, false),
@@ -526,7 +508,7 @@ public enum FallbackPacketRegistry {
         map(0x08, MINECRAFT_1_19_4, false),
         map(0x09, MINECRAFT_1_20_2, false),
         map(0x0A, MINECRAFT_1_20_5, false),
-        map(0xC, MINECRAFT_1_21_2, false));
+        map(0x0C, MINECRAFT_1_21_2, false));
       serverbound.register(PluginMessagePacket.class, PluginMessagePacket::new,
         map(0x17, MINECRAFT_1_7_2, false),
         map(0x09, MINECRAFT_1_9, false),
@@ -627,7 +609,8 @@ public enum FallbackPacketRegistry {
         map(0x23, MINECRAFT_1_20_2, false),
         map(0x24, MINECRAFT_1_20_3, false),
         map(0x27, MINECRAFT_1_20_5, false),
-        map(0x29, MINECRAFT_1_21_2, false));
+        map(0x29, MINECRAFT_1_21_2, false),
+        map(0x2B, MINECRAFT_1_21_4, false));
       serverbound.register(AnimationPacket.class, AnimationPacket::new,
         map(0x0A, MINECRAFT_1_7_2, false),
         map(0x1A, MINECRAFT_1_9, false),
@@ -641,7 +624,8 @@ public enum FallbackPacketRegistry {
         map(0x32, MINECRAFT_1_20_2, false),
         map(0x33, MINECRAFT_1_20_3, false),
         map(0x36, MINECRAFT_1_20_5, false),
-        map(0x38, MINECRAFT_1_21_2, false));
+        map(0x38, MINECRAFT_1_21_2, false),
+        map(0x3A, MINECRAFT_1_21_4, false));
     }
   };
 

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPreparer.java

@@ -83,6 +83,7 @@ public class FallbackPreparer {
   public final FallbackPacket[] REGISTRY_SYNC_1_20_5 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_20);
   public final FallbackPacket[] REGISTRY_SYNC_1_21 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21);
   public final FallbackPacket[] REGISTRY_SYNC_1_21_2 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_2);
+  public final FallbackPacket[] REGISTRY_SYNC_1_21_4 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_4);
   public final FallbackPacket START_WRITING_CHUNKS = new GameEventPacket(13, 0);
   public final static FallbackPacket INVALID_HELD_ITEM_SLOT = new SetHeldItemPacket(-1);
   public final FallbackPacket RANDOM_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(RANDOM.nextInt()));
@@ -269,13 +270,13 @@ public class FallbackPreparer {
   }
 
   public static FallbackPacket[] getRegistryPackets(final @NotNull ProtocolVersion protocolVersion) {
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_2)) {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_4)) {
+      return REGISTRY_SYNC_1_21_4;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_2)) {
       return REGISTRY_SYNC_1_21_2;
-    }
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21)) {
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21)) {
       return REGISTRY_SYNC_1_21;
-    }
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_20_5)) {
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_20_5)) {
       return REGISTRY_SYNC_1_20_5;
     }
     return REGISTRY_SYNC_1_20;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/block/BlockType.java

@@ -69,7 +69,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 7389;
     }
-    return 7619;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 7619;
+    }
+    return 8163;
   }, protocolVersion -> (double) 0.75f),
   TRAPDOOR(protocolVersion -> {
     // We have to use wooden trapdoors for 1.7 since 1.7 doesn't have iron trapdoors
@@ -112,7 +115,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 10414;
     }
-    return 10749;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 10749;
+    }
+    return 11285;
   }, protocolVersion -> 0.1875),
   END_PORTAL_FRAME(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -148,7 +154,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 7414;
     }
-    return 7644;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 7644;
+    }
+    return 8188;
   }, protocolVersion -> 0.8125),
   DAYLIGHT_SENSOR(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -187,7 +196,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 9207;
     }
-    return 9462;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 9462;
+    }
+    return 10005;
   }, protocolVersion -> 0.375),
   COBBLESTONE_WALL(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -223,7 +235,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 7922;
     }
-    return 8152;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 8152;
+    }
+    return 8696;
   }, protocolVersion -> 1.5),
   STONE_SLABS(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -262,7 +277,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 11231;
     }
-    return 11566;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 11566;
+    }
+    return 12116;
   }, protocolVersion -> 0.5),
   WHITE_CARPET(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -301,7 +319,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 10728;
     }
-    return 11063;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 11063;
+    }
+    return 11607;
   }, protocolVersion -> protocolVersion.compareTo(MINECRAFT_1_8) < 0 ? 0 : 0.0625);
 
   private final Function<ProtocolVersion, Integer> id;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/dimension/DimensionRegistry.java

@@ -37,6 +37,7 @@ public final class DimensionRegistry {
   public final CompoundBinaryTag CODEC_1_20;
   public final CompoundBinaryTag CODEC_1_21;
   public final CompoundBinaryTag CODEC_1_21_2;
+  public final CompoundBinaryTag CODEC_1_21_4;
 
   static {
     CODEC_1_16 = getCodec("codec_1_16.nbt");
@@ -48,6 +49,7 @@ public final class DimensionRegistry {
     CODEC_1_20 = getCodec("codec_1_20.nbt");
     CODEC_1_21 = getCodec("codec_1_21.nbt");
     CODEC_1_21_2 = getCodec("codec_1_21_2.nbt");
+    CODEC_1_21_4 = getCodec("codec_1_21_4.nbt");
   }
 
   private @NotNull CompoundBinaryTag getCodec(final @NotNull String fileName) {

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/entity/EntityType.java

@@ -54,7 +54,11 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 10;
     }
-    return 85; // 1.21.2 split the boat type in id registries.
+    // 1.21.2 split the boat type in id registries.
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 85;
+    }
+    return 84;
   }),
   MINECART(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_13_2)) {
@@ -87,7 +91,10 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 69;
     }
-    return 82;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 82;
+    }
+    return 81;
   });
 
   private final Function<ProtocolVersion, Integer> id;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/item/ItemType.java

@@ -70,7 +70,10 @@ public enum ItemType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 982;
     }
-    return 1022;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
+      return 1022;
+    }
+    return 1031;
   }, protocolVersion -> protocolVersion.greaterThanOrEquals(MINECRAFT_1_21_2) ? 36 : 26);
 
   private final Function<ProtocolVersion, Integer> id;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/JoinGamePacket.java

@@ -27,6 +27,7 @@ import net.kyori.adventure.nbt.ListBinaryTag;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
 import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionType;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 
@@ -77,7 +78,7 @@ public final class JoinGamePacket implements FallbackPacket {
 
       ProtocolUtil.writeStringArray(byteBuf, levelNames);
 
-      final CompoundBinaryTag codec = ProtocolUtil.getCodec(protocolVersion);
+      final CompoundBinaryTag codec = getCodec(protocolVersion);
 
       if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
         ProtocolUtil.writeBinaryTag(byteBuf, protocolVersion, codec);
@@ -172,6 +173,23 @@ public final class JoinGamePacket implements FallbackPacket {
     }
   }
 
+  private static CompoundBinaryTag getCodec(final @NotNull ProtocolVersion protocolVersion) {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_20)) {
+      return DimensionRegistry.CODEC_1_20;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19_4)) {
+      return DimensionRegistry.CODEC_1_19_4;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19_1)) {
+      return DimensionRegistry.CODEC_1_19_1;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19)) {
+      return DimensionRegistry.CODEC_1_19;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_18_2)) {
+      return DimensionRegistry.CODEC_1_18_2;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_16_2)) {
+      return DimensionRegistry.CODEC_1_16_2;
+    }
+    return DimensionRegistry.CODEC_1_16;
+  }
+
   @Override
   public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
     throw new UnsupportedOperationException();

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SetHeldItemPacket.java

@@ -25,6 +25,7 @@ import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 
 @Getter
 @ToString
@@ -34,8 +35,12 @@ public final class SetHeldItemPacket implements FallbackPacket {
   private int slot;
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
-    byteBuf.writeByte(slot);
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_4)) {
+      ProtocolUtil.writeVarInt(byteBuf, slot);
+    } else {
+      byteBuf.writeByte(slot);
+    }
   }
 
   @Override

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/TeleportEntityPacket.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
-
-import io.netty.buffer.ByteBuf;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.util.ProtocolUtil;
-
-@Getter
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public final class TeleportEntityPacket implements FallbackPacket {
-  private int entityId;
-  private double x, y, z;
-  private boolean onGround;
-
-  @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_8)) {
-      ProtocolUtil.writeVarInt(byteBuf, entityId);
-    } else {
-      byteBuf.writeInt(entityId);
-    }
-
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_9)) {
-      byteBuf.writeDouble(x);
-      byteBuf.writeDouble(y);
-      byteBuf.writeDouble(z);
-    } else {
-      byteBuf.writeInt((int) (x * 32D));
-      byteBuf.writeInt((int) (y * 32D));
-      byteBuf.writeInt((int) (z * 32D));
-    }
-
-    byteBuf.writeByte(0); // pitch or yaw
-    byteBuf.writeByte(0); // yaw or pitch
-
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_8)) {
-      byteBuf.writeBoolean(onGround);
-    }
-  }
-
-  @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
-    throw new UnsupportedOperationException();
-  }
-}

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/VehicleMovePacket.java

@@ -33,6 +33,7 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 public final class VehicleMovePacket implements FallbackPacket {
   private double x, y, z;
   private float yaw, pitch;
+  private boolean onGround;
 
   @Override
   public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
@@ -44,11 +45,14 @@ public final class VehicleMovePacket implements FallbackPacket {
   }
 
   @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
+  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     x = byteBuf.readDouble();
     y = byteBuf.readDouble();
     z = byteBuf.readDouble();
     yaw = byteBuf.readFloat();
     pitch = byteBuf.readFloat();
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_4)) {
+      onGround = byteBuf.readBoolean();
+    }
   }
 }

common/src/main/java/xyz/jonesdev/sonar/common/util/ComponentHolder.java

@@ -43,7 +43,7 @@ public final class ComponentHolder {
   }
 
   // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/ComponentHolder.java
-  private BinaryTag serialize(final @NotNull JsonElement json) {
+  private static BinaryTag serialize(final @NotNull JsonElement json) {
     if (json instanceof JsonPrimitive) {
       final JsonPrimitive jsonPrimitive = (JsonPrimitive) json;
 

common/src/main/java/xyz/jonesdev/sonar/common/util/ProtocolUtil.java

@@ -28,10 +28,8 @@ import io.netty.util.Version;
 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.nbt.BinaryTag;
 import net.kyori.adventure.nbt.BinaryTagType;
-import net.kyori.adventure.nbt.CompoundBinaryTag;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
 import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;
 
 import java.io.IOException;
@@ -320,25 +318,6 @@ public class ProtocolUtil {
     return ((high & 0xFF) << 15) | low;
   }
 
-  public static CompoundBinaryTag getCodec(final @NotNull ProtocolVersion protocolVersion) {
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21)) {
-      return DimensionRegistry.CODEC_1_21;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_20)) {
-      return DimensionRegistry.CODEC_1_20;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19_4)) {
-      return DimensionRegistry.CODEC_1_19_4;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19_1)) {
-      return DimensionRegistry.CODEC_1_19_1;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_19)) {
-      return DimensionRegistry.CODEC_1_19;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_18_2)) {
-      return DimensionRegistry.CODEC_1_18_2;
-    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_16_2)) {
-      return DimensionRegistry.CODEC_1_16_2;
-    }
-    return DimensionRegistry.CODEC_1_16;
-  }
-
   private void checkState(final boolean expression, final String message) {
     if (!expression) {
       throw DEBUG ? new DecoderException(message) : QuietDecoderException.INSTANCE;

common/src/main/resources/assets/config/cs.yml

@@ -71,10 +71,9 @@ queue:
 # Jednoduchého limbo serveru kde proběhnou zkoušky proti botům
 verification:
   # Kdy by měl Sonar verifikovat nové hráče?
-  # TYPY: ALWAYS, DURING_ATTACK, NEVER (Vždy, Pouze při útoku, Nikdy)
+  # TYPY: ALWAYS, DURING_ATTACK
   # - ALWAYS: Noví hráči budou vždy verifikováni (Doporučeno)
   # - DURING_ATTACK: New players will only be checked during an attack Noví hráči budou verifikováni pouze při útoku
-  # - NEVER: Noví hráči nebudou nikdy vyžkoušeni
   timing: ALWAYS
   checks:
     # Kontroluje, zda pohyb hráčů je roven gravitační formuli Minecraftu

common/src/main/resources/assets/config/de.yml

@@ -68,10 +68,9 @@ queue:
 # einem leichtgewichtigen Limbo-Server gesendet, wo fortgeschrittene Bot-Überprüfungen durchgeführt werden
 verification:
   # Wann sollte Sonar neue Spieler überprüfen?
-  # Mögliche Typen: ALWAYS, DURING_ATTACK, NEVER
+  # Mögliche Typen: ALWAYS, DURING_ATTACK
   # - ALWAYS: Neue Spieler werden immer überprüft (Empfohlen)
   # - DURING_ATTACK: Neue Spieler werden nur während eines Angriffs überprüft
-  # - NEVER: Neue Spieler werden nie überprüft
   timing: ALWAYS
   checks:
     # Überprüft, ob die Fallbewegung der Spieler der Gravitationsformel von Minecraft folgt

common/src/main/resources/assets/config/en.yml

@@ -70,10 +70,9 @@ queue:
 # a lightweight limbo server where advanced bot checks are performed
 verification:
   # When should Sonar verify new players?
-  # Possible types: ALWAYS, DURING_ATTACK, NEVER
+  # Possible types: ALWAYS, DURING_ATTACK
   # - ALWAYS: New players will always be checked (Recommended)
   # - DURING_ATTACK: New players will only be checked during an attack
-  # - NEVER: New players will never be checked
   timing: ALWAYS
   checks:
     # Checks if the players' falling motion is following Minecraft's gravity formula

common/src/main/resources/assets/config/fr.yml

@@ -70,10 +70,9 @@ queue:
 # un serveur limbo léger où des vérifications avancées de bot sont effectuées
 verification:
   # Quand Sonar devrait-il vérifier les nouveaux joueurs ?
-  # Types possibles : ALWAYS, DURING_ATTACK, NEVER
+  # Types possibles : ALWAYS, DURING_ATTACK
   # - ALWAYS : Les nouveaux joueurs seront toujours vérifiés (Recommandé)
   # - DURING_ATTACK : Les nouveaux joueurs ne seront vérifiés que pendant une attaque
-  # - NEVER : Les nouveaux joueurs ne seront jamais vérifiés
   timing: ALWAYS
   checks:
     # Vérifie si le mouvement de chute des joueurs suit la formule de la gravité de Minecraft

common/src/main/resources/assets/config/ka.yml

@@ -70,10 +70,9 @@ queue:
 # ლიმბო სერვერში, სადაც მოთამაშეების ვერიფიკაცია ხდება
 verification:
   # როდის უნდა გადაამოწმოს Sonar-მა ახალი მოთამაშეები?
-  # შესაძლო ტიპები: ALWAYS, DURING_ATTACK, NEVER
+  # შესაძლო ტიპები: ALWAYS, DURING_ATTACK
   # - ALWAYS (ყოველთვის): ახალი მოთამაშეები ყოველთვის მოწმდება (რეკომენდებულია)
   # - DURING_ATTACK (შეტევის დროს): ახალი მოთამაშეები შემოწმდებიან მხოლოდ შეტევის დროს
-  # - NEVER (არასდროს): ახალი მოთამაშეები არასდროს შემოწმდებიან
   timing: ALWAYS
   checks:
     # ამოწმებს, მიჰყვება თუ არა მოთამაშეების ვარდნის მოძრაობა Minecraft-ის გრავიტაციის ფორმულას

common/src/main/resources/assets/config/nl.yml

@@ -70,10 +70,9 @@ queue:
 # een lichtgewicht limbo-server waar geavanceerde bot-controles worden uitgevoerd
 verification:
   # Wanneer moet Sonar nieuwe spelers verifiëren?
-  # Mogelijke typen: ALWAYS, DURING_ATTACK, NEVER
+  # Mogelijke typen: ALWAYS, DURING_ATTACK
   # - ALWAYS: Nieuwe spelers worden altijd gecontroleerd (Aanbevolen)
   # - DURING_ATTACK: Nieuwe spelers worden alleen gecontroleerd tijdens een aanval
-  # - NEVER: Nieuwe spelers worden nooit gecontroleerd
   timing: ALWAYS
   checks:
     # Controleert of de valbeweging van de spelers de zwaartekrachtformule van Minecraft volgt

common/src/main/resources/assets/config/pl.yml

@@ -70,10 +70,9 @@ queue:
 # lekkiego serwera Limbo, na którym przeprowadzane są zaawansowane kontrole antybotowe
 verification:
   # Kiedy Sonar powinien weryfikować nowych graczy?
-  # Możliwe rodzaje: ALWAYS, DURING_ATTACK, NEVER
+  # Możliwe rodzaje: ALWAYS, DURING_ATTACK
   # - ALWAYS: Nowi gracze będą zawsze weryfikowani (zalecane)
   # - DURING_ATTACK: Nowi gracze będą weryfikowani tylko podczas ataku
-  # - NEVER: Nowi gracze nigdy nie będą weryfikowani
   timing: ALWAYS
   checks:
     # Sprawdza, czy ruch spadający gracza jest zgodny z działaniem grawitacji Minecraft.

common/src/main/resources/assets/config/ru.yml

@@ -70,10 +70,9 @@ queue:
 # лимбо-сервер, на котором проводятся расширенные проверки ботов
 verification:
   # Когда Sonar должен проверять новых игроков?
-  # Возможные типы: ALWAYS, DURING_ATTACK, NEVER
+  # Возможные типы: ALWAYS, DURING_ATTACK
   # - ALWAYS: Новые игроки будут проверяться всегда (Рекомендуется)
   # - DURING_ATTACK: Новые игроки будут проверяться только во время атаки
-  # - NEVER: Новые игроки никогда не будут проверены
   timing: ALWAYS
   checks:
     # Проверяет, следует ли движение игрока формуле гравитации Minecraft.

common/src/main/resources/assets/config/zh.yml

@@ -70,10 +70,9 @@ queue:
 # 每个需要验证的玩家都将被发送到一个轻量级的虚拟服务器来检查高级机器人
 verification:
   # Sonar 应该在什么时候验证玩家?
-  # 可用类型: ALWAYS, DURING_ATTACK, NEVER
+  # 可用类型: ALWAYS, DURING_ATTACK
   # - ALWAYS: 玩家始终需要验证 直到他们通过验证为止
   # - DURING_ATTACK: 玩家仅在服务器疑似遭到攻击时验证
-  # - NEVER: 永远不检查未被验证过的玩家
   timing: ALWAYS
   checks:
     # 检查玩家的下落移动是否遵循原版客户端.

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev
-version=2.1.18
+version=2.1.20
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-netty = "4.1.115.Final"
-adventure = "4.17.0"
+netty = "4.1.116.Final"
+adventure = "4.18.0"
 adventure-platform = "4.3.4"
 bstats = "3.1.0"
 libby = "2.0.0-SNAPSHOT"

lombok.config

@@ -0,0 +1 @@
+lombok.addLombokGeneratedAnnotation = false