Release 2.1.41 (#528)

Bumps [io.netty:netty-all](https://github.com/netty/netty) from 4.2.6.Final to 4.2.7.Final.
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-all
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

api/src/main/java/xyz/jonesdev/sonar/api/config/SonarConfiguration.java

@@ -30,6 +30,7 @@ import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.database.ormlite.H2DatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.database.ormlite.MariaDbDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.database.ormlite.MysqlDatabaseTypeAdapter;
+import xyz.jonesdev.sonar.api.database.ormlite.PostgresDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;
 
 import java.io.File;
@@ -139,7 +140,7 @@ public final class SonarConfiguration {
 
     // General settings
     logPlayerAddresses = generalConfig.getBoolean("general.log-player-addresses");
-    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), 0, 99);
+    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), -1, 99);
 
     // Attack tracker
     minPlayersForAttack = clamp(generalConfig.getInt("attack-tracker.min-players-for-attack"), 2, 1024);
@@ -468,6 +469,13 @@ public final class SonarConfiguration {
           .version("2.2.220")
           .relocate("org{}h2", "xyz{}jonesdev{}sonar{}libs{}h2")
           .build()),
+      POSTGRESQL("PostgreSQL", "jdbc:postgresql://%s:%d/%s%s", new PostgresDatabaseTypeAdapter(),
+        Library.builder()
+          .groupId("org{}postgresql")
+          .artifactId("postgresql")
+          .version("42.7.8")
+          .relocate("org{}postgresql", "xyz{}jonesdev{}sonar{}libs{}postgresql")
+          .build()),
       NONE("None", null, null, null);
 
       private final String displayName;

api/src/main/java/xyz/jonesdev/sonar/api/database/ormlite/PostgresDatabaseTypeAdapter.java

@@ -0,0 +1,14 @@
+package xyz.jonesdev.sonar.api.database.ormlite;
+
+import com.j256.ormlite.jdbc.db.PostgresDatabaseType;
+import org.jetbrains.annotations.NotNull;
+
+public final class PostgresDatabaseTypeAdapter extends PostgresDatabaseType {
+
+  // We need to override the default driver class name
+  // to use the custom relocated Postgres driver
+  @Override
+  protected String @NotNull [] getDriverClassNames() {
+     return new String[]{"xyz.jonesdev.sonar.libs.postgresql.Driver"};
+  }
+}

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

@@ -73,7 +73,8 @@ public enum ProtocolVersion {
   MINECRAFT_1_21_4(769, "1.21.4"),
   MINECRAFT_1_21_5(770, "1.21.5"),
   MINECRAFT_1_21_6(771, "1.21.6"),
-  MINECRAFT_1_21_7(772, "1.21.7");
+  MINECRAFT_1_21_7(772, "1.21.7"),
+  MINECRAFT_1_21_9(773, "1.21.9");
 
   private final int protocol;
   private final String name;

build.gradle.kts

@@ -62,6 +62,7 @@ allprojects {
       relocate("org.mariadb", "xyz.jonesdev.sonar.libs.mariadb")
       relocate("org.h2", "xyz.jonesdev.sonar.libs.h2")
       relocate("com.jhlabs", "xyz.jonesdev.sonar.libs.jhlabs")
+      relocate("org.postgresql", "xyz.jonesdev.sonar.libs.postgresql")
 
       // Exclude unnecessary metadata information
       exclude("META-INF/*/**")

captcha/src/main/java/xyz/jonesdev/sonar/captcha/StandardCaptchaGenerator.java

@@ -113,8 +113,8 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
     }
 
     // Apply the random gradient effect
-    graphics.setPaint(new LinearGradientPaint(0, 0, width, height,
-      COLOR_FRACTIONS, COLORS, MultipleGradientPaint.CycleMethod.REPEAT));
+    graphics.setPaint(new RadialGradientPaint(0, 0, width,
+      COLOR_FRACTIONS, COLORS, MultipleGradientPaint.CycleMethod.REFLECT));
   }
 
   private void drawCharacters(final @NotNull Graphics2D graphics,

captcha/src/main/resources/assets/fonts/kingthingsEULA.txt

@@ -0,0 +1,12 @@
+Kingthings EULA - (End User License Agreement).
+
+All the fonts currently published on my website (www.kingthingsfonts.co.uk) are free for you to use for any purpose you wish.  Please do not change my original font files (.TTF).
+
+There are some paid-for versions of my fonts (with much enhanced character sets) available from to buy from www.cheapprofonts.com, these contain their own EULA and are not included or implied in this notice.
+
+Please enjoy all your creative work - and if you come up with anything you like, I would appreciate a picture.
+
+Regards
+
+Kevin King
+Exeter, England - February 2009

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

@@ -169,11 +169,13 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
                                     final @NotNull InetAddress inetAddress,
                                     final @NotNull Runnable loginPacket) throws Exception {
     final int maxOnlinePerIp = Sonar.get0().getConfig().getMaxOnlinePerIp();
-    final int newCount = Sonar.get0().getFallback().getOnline().compute(inetAddress,
-      (__, count) -> count == null ? 1 : count + 1);
-    if (newCount > maxOnlinePerIp) {
-      customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
-      return;
+    if (maxOnlinePerIp > 0) {
+      final int newCount = Sonar.get0().getFallback().getOnline().compute(inetAddress,
+        (__, count) -> count == null ? 1 : count + 1);
+      if (newCount > maxOnlinePerIp) {
+        customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
+        return;
+      }
     }
     loginPacket.run();
   }

common/src/main/java/xyz/jonesdev/sonar/common/fallback/netty/FallbackInjectedChannelInitializer.java

@@ -53,6 +53,10 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
 
   @Override
   protected void initChannel(final Channel channel) throws Exception {
+    if (!channel.isActive()) {
+      return;
+    }
+
     // Invoke the original method
     try {
       INIT_CHANNEL_METHOD.invokeExact(originalChannelInitializer, channel);

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

@@ -108,7 +108,8 @@ public enum FallbackPacketRegistry {
         map(0x29, MINECRAFT_1_20_2, true),
         map(0x2B, MINECRAFT_1_20_5, true),
         map(0x2C, MINECRAFT_1_21_2, true),
-        map(0x2B, MINECRAFT_1_21_5, true));
+        map(0x2B, MINECRAFT_1_21_5, true),
+        map(0x30, MINECRAFT_1_21_9, true));
       // minecraft:keep_alive
       clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
         map(0x00, MINECRAFT_1_7_2, true),
@@ -126,7 +127,8 @@ public enum FallbackPacketRegistry {
         map(0x24, MINECRAFT_1_20_2, true),
         map(0x26, MINECRAFT_1_20_5, true),
         map(0x27, MINECRAFT_1_21_2, true),
-        map(0x26, MINECRAFT_1_21_5, true));
+        map(0x26, MINECRAFT_1_21_5, true),
+        map(0x2B, MINECRAFT_1_21_9, true));
       // minecraft:disconnect
       clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
         map(0x40, MINECRAFT_1_7_2, true),
@@ -143,7 +145,8 @@ public enum FallbackPacketRegistry {
         map(0x1A, MINECRAFT_1_19_4, true),
         map(0x1B, MINECRAFT_1_20_2, true),
         map(0x1D, MINECRAFT_1_20_5, true),
-        map(0x1C, MINECRAFT_1_21_5, true));
+        map(0x1C, MINECRAFT_1_21_5, true),
+        map(0x20, MINECRAFT_1_21_9, true));
       // minecraft:player_position
       clientbound.register(SetPlayerPositionRotationPacket.class, SetPlayerPositionRotationPacket::new,
         map(0x08, MINECRAFT_1_7_2, true),
@@ -162,7 +165,8 @@ public enum FallbackPacketRegistry {
         map(0x3E, MINECRAFT_1_20_2, true),
         map(0x40, MINECRAFT_1_20_5, true),
         map(0x42, MINECRAFT_1_21_2, true),
-        map(0x41, MINECRAFT_1_21_5, true));
+        map(0x41, MINECRAFT_1_21_5, true),
+        map(0x46, MINECRAFT_1_21_9, true));
       // minecraft:player_abilities
       clientbound.register(PlayerAbilitiesPacket.class, PlayerAbilitiesPacket::new,
         map(0x39, MINECRAFT_1_7_2, true),
@@ -181,7 +185,8 @@ public enum FallbackPacketRegistry {
         map(0x36, MINECRAFT_1_20_2, true),
         map(0x38, MINECRAFT_1_20_5, true),
         map(0x3A, MINECRAFT_1_21_2, true),
-        map(0x39, MINECRAFT_1_21_5, true));
+        map(0x39, MINECRAFT_1_21_5, true),
+        map(0x3E, MINECRAFT_1_21_9, true));
       // minecraft:level_chunk_with_light
       clientbound.register(ChunkDataPacket.class, ChunkDataPacket::new,
         map(0x21, MINECRAFT_1_7_2, true),
@@ -199,7 +204,8 @@ public enum FallbackPacketRegistry {
         map(0x25, MINECRAFT_1_20_2, true),
         map(0x27, MINECRAFT_1_20_5, true),
         map(0x28, MINECRAFT_1_21_2, true),
-        map(0x27, MINECRAFT_1_21_5, true));
+        map(0x27, MINECRAFT_1_21_5, true),
+        map(0x2C, MINECRAFT_1_21_9, true));
       // minecraft:remove_entities
       clientbound.register(RemoveEntitiesPacket.class, RemoveEntitiesPacket::new,
         map(0x13, MINECRAFT_1_7_2, true),
@@ -220,7 +226,8 @@ public enum FallbackPacketRegistry {
         map(0x40, MINECRAFT_1_20_2, true),
         map(0x42, MINECRAFT_1_20_5, true),
         map(0x47, MINECRAFT_1_21_2, true),
-        map(0x46, MINECRAFT_1_21_5, true));
+        map(0x46, MINECRAFT_1_21_5, true),
+        map(0x4B, MINECRAFT_1_21_9, true));
       // minecraft:set_passengers
       clientbound.register(SetPassengersPacket.class, SetPassengersPacket::new,
         map(0x1B, MINECRAFT_1_7_2, true),
@@ -238,7 +245,8 @@ public enum FallbackPacketRegistry {
         map(0x5D, MINECRAFT_1_20_3, true),
         map(0x5F, MINECRAFT_1_20_5, true),
         map(0x65, MINECRAFT_1_21_2, true),
-        map(0x64, MINECRAFT_1_21_5, true));
+        map(0x64, MINECRAFT_1_21_5, true),
+        map(0x69, MINECRAFT_1_21_9, true));
       // minecraft:add_entity
       clientbound.register(SpawnEntityPacket.class, SpawnEntityPacket::new,
         map(0x0E, MINECRAFT_1_7_2, true),
@@ -261,7 +269,8 @@ public enum FallbackPacketRegistry {
         map(0x47, MINECRAFT_1_20_3, true),
         map(0x49, MINECRAFT_1_20_5, true),
         map(0x4E, MINECRAFT_1_21_2, true),
-        map(0x4D, MINECRAFT_1_21_5, true));
+        map(0x4D, MINECRAFT_1_21_5, true),
+        map(0x52, MINECRAFT_1_21_9, true));
       // minecraft:ping
       clientbound.register(TransactionPacket.class, TransactionPacket::new,
         map(0x32, MINECRAFT_1_7_2, true),
@@ -278,7 +287,8 @@ public enum FallbackPacketRegistry {
         map(0x33, MINECRAFT_1_20_2, true),
         map(0x35, MINECRAFT_1_20_5, true),
         map(0x37, MINECRAFT_1_21_2, true),
-        map(0x36, MINECRAFT_1_21_5, true));
+        map(0x36, MINECRAFT_1_21_5, true),
+        map(0x3B, MINECRAFT_1_21_9, true));
       // minecraft:set_default_spawn_position
       clientbound.register(SetDefaultSpawnPositionPacket.class, SetDefaultSpawnPositionPacket::new,
         map(0x05, MINECRAFT_1_7_2, true),
@@ -298,7 +308,8 @@ public enum FallbackPacketRegistry {
         map(0x54, MINECRAFT_1_20_3, true),
         map(0x56, MINECRAFT_1_20_5, true),
         map(0x5B, MINECRAFT_1_21_2, true),
-        map(0x5A, MINECRAFT_1_21_5, true));
+        map(0x5A, MINECRAFT_1_21_5, true),
+        map(0x5F, MINECRAFT_1_21_9, true));
       // minecraft:map_item_data
       clientbound.register(MapDataPacket.class, MapDataPacket::new,
         map(0x34, MINECRAFT_1_7_2, true),
@@ -315,7 +326,8 @@ public enum FallbackPacketRegistry {
         map(0x2A, MINECRAFT_1_20_2, true),
         map(0x2C, MINECRAFT_1_20_5, true),
         map(0x2D, MINECRAFT_1_21_2, true),
-        map(0x2C, MINECRAFT_1_21_5, true));
+        map(0x2C, MINECRAFT_1_21_5, true),
+        map(0x31, MINECRAFT_1_21_9, true));
       // minecraft:container_set_slot
       clientbound.register(SetContainerSlotPacket.class, SetContainerSlotPacket::new,
         map(0x2F, MINECRAFT_1_7_2, true),
@@ -348,7 +360,8 @@ public enum FallbackPacketRegistry {
         map(0x5A, MINECRAFT_1_20_3, true),
         map(0x5C, MINECRAFT_1_20_5, true),
         map(0x61, MINECRAFT_1_21_2, true),
-        map(0x60, MINECRAFT_1_21_5, true));
+        map(0x60, MINECRAFT_1_21_5, true),
+        map(0x65, MINECRAFT_1_21_9, true));
       // minecraft:system_chat
       clientbound.register(SystemChatPacket.class, SystemChatPacket::new,
         map(0x02, MINECRAFT_1_7_2, true),
@@ -365,17 +378,20 @@ public enum FallbackPacketRegistry {
         map(0x69, MINECRAFT_1_20_3, true),
         map(0x6C, MINECRAFT_1_20_5, true),
         map(0x73, MINECRAFT_1_21_2, true),
-        map(0x72, MINECRAFT_1_21_5, true));
+        map(0x72, MINECRAFT_1_21_5, true),
+        map(0x77, MINECRAFT_1_21_9, true));
       // minecraft:game_event
       clientbound.register(GameEventPacket.class, GameEventPacket::new,
         map(0x20, MINECRAFT_1_20_3, true),
         map(0x22, MINECRAFT_1_20_5, true),
         map(0x23, MINECRAFT_1_21_2, true),
-        map(0x22, MINECRAFT_1_21_5, true));
+        map(0x22, MINECRAFT_1_21_5, true),
+        map(0x26, MINECRAFT_1_21_9, true));
       // minecraft:transfer
       clientbound.register(TransferPacket.class, TransferPacket::new,
         map(0x73, MINECRAFT_1_20_5, true),
-        map(0x7A, MINECRAFT_1_21_2, true));
+        map(0x7A, MINECRAFT_1_21_2, true),
+        map(0x7F, MINECRAFT_1_21_9, true));
       // minecraft:set_held_slot
       clientbound.register(SetHeldItemPacket.class, SetHeldItemPacket::new,
         map(0x09, MINECRAFT_1_7_2, true),
@@ -395,7 +411,8 @@ public enum FallbackPacketRegistry {
         map(0x51, MINECRAFT_1_20_3, true),
         map(0x53, MINECRAFT_1_20_5, true),
         map(0x63, MINECRAFT_1_21_2, true),
-        map(0x62, MINECRAFT_1_21_5, true));
+        map(0x62, MINECRAFT_1_21_5, true),
+        map(0x67, MINECRAFT_1_21_9, true));
       // minecraft:animate
       clientbound.register(EntityAnimationPacket.class, EntityAnimationPacket::new,
         map(0x0B, MINECRAFT_1_7_2, true),
@@ -425,7 +442,8 @@ public enum FallbackPacketRegistry {
         map(0x62, MINECRAFT_1_20_3, true),
         map(0x64, MINECRAFT_1_20_5, true),
         map(0x6B, MINECRAFT_1_21_2, true),
-        map(0x6A, MINECRAFT_1_21_5, true));
+        map(0x6A, MINECRAFT_1_21_5, true),
+        map(0x6F, MINECRAFT_1_21_9, true));
 
       // minecraft:client_tick_end
       serverbound.register(ClientTickEndPacket.class, ClientTickEndPacket::new,

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

@@ -168,6 +168,7 @@ public class FallbackPreparer {
     // Set the dynamic block and collide Y position based on the maximum fall distance
     dynamicSpawnYPosition = PLATFORM_Y_POSITION + (int) Math.ceil(fallDistance);
     defaultSpawnPosition = new FallbackPacketSnapshot(new SetDefaultSpawnPositionPacket(
+      "minecraft:overworld",
       SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION));
     spawnPosition = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
       SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION,

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

@@ -34,7 +34,6 @@ public enum BlockType {
   // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
   // - https://pokechu22.github.io/Burger/
   // - https://github.com/ViaVersion/Mappings/tree/main/mappings
-  //STONE(protocolVersion -> 1, 1),
   ENCHANTMENT_TABLE(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
       return 116;
@@ -75,7 +74,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 8163;
     }
-    return 8173;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 8173;
+    }
+    return 9250;
   }, protocolVersion -> (double) 0.75f),
   TRAPDOOR(protocolVersion -> {
     // We have to use wooden trapdoors for 1.7 since 1.7 doesn't have iron trapdoors
@@ -124,7 +126,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 11293;
     }
-    return 11303;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 11303;
+    }
+    return 12380;
   }, protocolVersion -> 0.1875),
   END_PORTAL_FRAME(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -166,7 +171,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 8185;
     }
-    return 8195;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 8195;
+    }
+    return 9272;
   }, protocolVersion -> 0.8125),
   DAYLIGHT_SENSOR(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -211,7 +219,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 10006;
     }
-    return 10016;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 10016;
+    }
+    return 11093;
   }, protocolVersion -> 0.375),
   COBBLESTONE_WALL(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -253,7 +264,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 8696;
     }
-    return 8706;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 8706;
+    }
+    return 9783;
   }, protocolVersion -> 1.5),
   STONE_SLABS(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -298,7 +312,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 12110;
     }
-    return 12120;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 12120;
+    }
+    return 13197;
   }, protocolVersion -> 0.5),
   WHITE_CARPET(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -343,7 +360,10 @@ public enum BlockType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 11607;
     }
-    return 11617;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 11617;
+    }
+    return 12694;
   }, 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/entity/EntityType.java

@@ -61,7 +61,10 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
       return 84;
     }
-    return 85;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 85;
+    }
+    return 87;
   }),
   MINECART(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_13_2)) {
@@ -100,7 +103,10 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
       return 81;
     }
-    return 82;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 82;
+    }
+    return 84;
   });
 
   private final Function<ProtocolVersion, Integer> id;

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

@@ -79,7 +79,10 @@ public enum ItemType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
       return 1042;
     }
-    return 1059;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
+      return 1059;
+    }
+    return 1104;
   }, protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
       return 26;

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

@@ -25,12 +25,14 @@ 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 SetDefaultSpawnPositionPacket implements FallbackPacket {
+  private String dimensionName;
   private int x, y, z;
 
   @Override
@@ -40,6 +42,10 @@ public final class SetDefaultSpawnPositionPacket implements FallbackPacket {
       byteBuf.writeInt(y);
       byteBuf.writeInt(z);
     } else {
+      if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_9)) {
+        ProtocolUtil.writeString(byteBuf, dimensionName);
+      }
+
       final long encoded = protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_14)
         ? ((x & 0x3FFFFFFL) << 38) | ((y & 0xFFFL) << 26) | (z & 0x3FFFFFFL)
         : ((x & 0x3FFFFFFL) << 38) | ((y & 0x3FFFFFFL) << 12) | (z & 0xFFFL);
@@ -48,6 +54,10 @@ public final class SetDefaultSpawnPositionPacket implements FallbackPacket {
 
       if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_17)) {
         byteBuf.writeFloat(0f);
+
+        if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_9)) {
+          byteBuf.writeFloat(0f); // pitch
+        }
       }
     }
   }

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

@@ -59,6 +59,10 @@ public final class SpawnEntityPacket implements FallbackPacket {
       byteBuf.writeDouble(x);
       byteBuf.writeDouble(y);
       byteBuf.writeDouble(z);
+
+      if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_9)) {
+        encodeVelocity(byteBuf, velocityX, velocityY, velocityZ);
+      }
     } else {
       byteBuf.writeInt((int) (x * 32D));
       byteBuf.writeInt((int) (y * 32D));
@@ -75,13 +79,43 @@ public final class SpawnEntityPacket implements FallbackPacket {
       byteBuf.writeInt(data); // data
     }
 
-    if (data > 0 || protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_9)) {
-      byteBuf.writeShort((int) (velocityX * 8000D));
-      byteBuf.writeShort((int) (velocityY * 8000D));
-      byteBuf.writeShort((int) (velocityZ * 8000D));
+    if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_21_9)) {
+      if (data > 0 || protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_9)) {
+        byteBuf.writeShort((int) (velocityX * 8000D));
+        byteBuf.writeShort((int) (velocityY * 8000D));
+        byteBuf.writeShort((int) (velocityZ * 8000D));
+      }
     }
   }
 
+  private static void encodeVelocity(final ByteBuf byteBuf, final double x, final double y, final double z) {
+    final double maxVal = Math.max(Math.abs(x), Math.max(Math.abs(y), Math.abs(z)));
+    if (maxVal < 3.051944088384301E-5) {
+      byteBuf.writeByte(0);
+      return;
+    }
+
+    final long scale = (long) Math.ceil(maxVal);
+    final boolean scaleTooLargeForBits = (scale & 3L) != scale;
+    final long scaleBits = scaleTooLargeForBits ? scale & 3L | 4L : scale;
+    final long encodedX = packLpVec3Component(x / scale) << 3;
+    final long encodedY = packLpVec3Component(y / scale) << 18;
+    final long encodedZ = packLpVec3Component(z / scale) << 33;
+    final long packed = scaleBits | encodedX | encodedY | encodedZ;
+
+    byteBuf.writeByte((byte) packed);
+    byteBuf.writeByte((byte) (packed >> 8));
+    byteBuf.writeInt((int) (packed >> 16));
+
+    if (scaleTooLargeForBits) {
+      ProtocolUtil.writeVarInt(byteBuf, (int) (scale >> 2));
+    }
+  }
+
+  private static long packLpVec3Component(double d) {
+    return Math.round((d * 0.5 + 0.5) * 32766.0);
+  }
+
   @Override
   public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
     throw new UnsupportedOperationException();

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

@@ -44,7 +44,7 @@ attack-tracker:
 # Nicméně, IP adresy nemůžou být vystopovány zpátky k hráči, protože Sonar používá UUID na ukládní místo jmeno hráčů
 database:
   # Typy datábázi se kterýma Sonar bude pracovat
-  # Typy: NONE, MYSQL, MARIADB, H2
+  # Typy: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Soubor v adresáři zásuvných modulů Sonaru použitý pro databázi H2
   filename: verified_players

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

@@ -41,7 +41,7 @@ attack-tracker:
 # Beachte: IP adressen werden im Klartext gespeichert. Du bist für die Sicherheit der Datenbank verantwortlich
 database:
   # Typ von Datenbank die Sonar verwenden soll, um verifizierte Spielerdaten zu speichern
-  # Mögliche Typen: NONE, MYSQL, MARIADB, H2
+  # Mögliche Typen: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Datei im Plugin-Verzeichnis von Sonar, die für die H2-Datenbank verwendet wird
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # Note: IP addresses are saved in plain text. You are responsible for keeping your database safe!
 database:
   # Type of database Sonar uses to store verified players
-  # Possible types: NONE, MYSQL, MARIADB, H2
+  # Possible types: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # File in Sonar's plugin directory used for the H2 database
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # Remarque : Les adresses IP sont enregistrées en texte brut. Vous êtes responsable de la sécurité de votre base de données !
 database:
   # Type de base de données utilisé par Sonar pour stocker les joueurs vérifiés
-  # Types possibles : NONE, MYSQL, MARIADB, H2
+  # Types possibles : NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Fichier dans le répertoire des plugins de Sonar utilisé pour la base de données H2
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # შენიშვნა: IP მისამართები ინახება უბრალო ტექსტში. თქვენ ხართ პასუხისმგებელი თქვენი მონაცემთა ბაზის უსაფრთხოებაზე!
 database:
   # მონაცემთა ბაზის ტიპები, რომლებიც Sonar-ს შეუძლია გამოიყენოს უკვე შემოწმებული მოთამაშეების შესანახად
-  # შესაძლო ტიპები: NONE, MYSQL, MARIADB, H2
+  # შესაძლო ტიპები: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # ფაილი სონარ_ის ფოლდერში რომელიც ინახავს H2 database_ს
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # Let op: IP-adressen worden opgeslagen in platte tekst. U bent verantwoordelijk voor het veilig houden van uw database!
 database:
   # Type database dat Sonar gebruikt om geverifieerde spelers op te slaan
-  # Mogelijke typen: NONE, MYSQL, MARIADB, H2
+  # Mogelijke typen: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Bestand in de plugin-directory van Sonar dat wordt gebruikt voor de H2-database
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # Uwaga: Adresy IP są zapisywane w postaci zwykłego tekstu. Jesteś odpowiedzialny za bezpieczeństwo swojej bazy danych!
 database:
   # Typ bazy danych używanej przez Sonar.
-  # Dostępne rodzaje: NONE, MYSQL, MARIADB, H2
+  # Dostępne rodzaje: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Plik w folderze pluginu używany dla bazy danych H2
   filename: verified_players

common/src/main/resources/assets/config/pt-br.yml

@@ -42,7 +42,7 @@ attack-tracker:
 # Nota: Endereços IP são salvos em texto simples. Você é responsável por manter seu banco de dados seguro!
 database:
   # Tipo de banco de dados que o Sonar usa para armazenar jogadores verificados
-  # Tipos possíveis: NONE, MYSQL, MARIADB, H2
+  # Tipos possíveis: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Arquivo no diretório de plugins do Sonar usado para o banco de dados H2
   filename: verified_players

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

@@ -43,7 +43,7 @@ attack-tracker:
 # Примечание: IP-адреса сохраняются в виде обычного текста. Вы сами отвечаете за сохранность своей базы данных!
 database:
   # Тип базы данных, которую Sonar использует для хранения проверенных игроков.
-  # Возможные типы: NONE, MYSQL, MARIADB, H2
+  # Возможные типы: NONE, MYSQL, MARIADB, POSTGRESQL, H2
   type: NONE
   # Файл в каталоге плагинов Sonar, используемый для базы данных H2
   filename: verified_players

gradle.properties

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

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-netty = "4.2.5.Final"
+netty = "4.2.7.Final"
 adventure = "4.24.0"
 adventure-platform = "4.4.1"
 bstats = "3.1.0"
@@ -32,8 +32,8 @@ caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.2"
 annotations = "org.jetbrains:annotations:26.0.2"
 simpleyaml = "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 ormlite = "com.j256.ormlite:ormlite-jdbc:6.1"
-lombok = "org.projectlombok:lombok:1.18.40"
+lombok = "org.projectlombok:lombok:1.18.42"
 bungeecord = "net.md-5:bungeecord-proxy:1.21-SNAPSHOT"
 velocity = "io.papermc.velocity:velocity-proxy:3.4.0-SNAPSHOT"
-# We have to use 1.8.8 for backwards compatibility
-spigot = "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT"
+# We have to use 1.16.5 for backwards compatibility
+spigot = "org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT"