Minecraft 26.2 and Velocity b604+ support

gradle.properties

@@ -5,4 +5,4 @@ manifestUrl=https://launchermeta.mojang.com/mc/game/version_manifest.json
 cacheValidMillis=604800000
 
 # Change to invalidate mappings cache on CI
-gameVersion=26.1
+gameVersion=26.2

plugin/build.gradle

@@ -149,7 +149,8 @@ enum MinecraftVersion {
   MINECRAFT_1_21_7(772),
   MINECRAFT_1_21_9(773),
   MINECRAFT_1_21_11(774),
-  MINECRAFT_26_1(774)
+  MINECRAFT_26_1(775),
+  MINECRAFT_26_2(776)
 
   public static final List<MinecraftVersion> WORLD_VERSIONS = List.of(
     MINECRAFT_1_13,
@@ -172,7 +173,8 @@ enum MinecraftVersion {
     MINECRAFT_1_21_7,
     MINECRAFT_1_21_9,
     MINECRAFT_1_21_11,
-    MINECRAFT_26_1
+    MINECRAFT_26_1,
+    MINECRAFT_26_2
   )
 
   public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2

plugin/mapping/fallbackdata.json

@@ -1,4 +1,34 @@
 {
+  "MINECRAFT_26_1": {
+    "minecraft:sulfur": "minecraft:sandstone",
+    "minecraft:potent_sulfur": "minecraft:end_stone",
+    "minecraft:sulfur_slab": "minecraft:sandstone_slab",
+    "minecraft:sulfur_stairs": "minecraft:sandstone_stairs",
+    "minecraft:sulfur_wall": "minecraft:sandstone_wall",
+    "minecraft:polished_sulfur": "minecraft:smooth_sandstone",
+    "minecraft:polished_sulfur_slab": "minecraft:sandstone_slab",
+    "minecraft:polished_sulfur_stairs": "minecraft:sandstone_stairs",
+    "minecraft:polished_sulfur_wall": "minecraft:sandstone_wall",
+    "minecraft:sulfur_bricks": "minecraft:end_stone_bricks",
+    "minecraft:sulfur_brick_slab": "minecraft:end_stone_brick_slab",
+    "minecraft:sulfur_brick_stairs": "minecraft:end_stone_brick_stairs",
+    "minecraft:sulfur_brick_wall": "minecraft:end_stone_brick_wall",
+    "minecraft:chiseled_sulfur": "minecraft:chiseled_sandstone",
+    "minecraft:cinnabar": "minecraft:granite",
+    "minecraft:cinnabar_slab": "minecraft:granite_slab",
+    "minecraft:cinnabar_stairs": "minecraft:granite_stairs",
+    "minecraft:cinnabar_wall": "minecraft:granite_wall",
+    "minecraft:polished_cinnabar": "minecraft:polished_granite",
+    "minecraft:polished_cinnabar_slab": "minecraft:granite_slab",
+    "minecraft:polished_cinnabar_stairs": "minecraft:granite_stairs",
+    "minecraft:polished_cinnabar_wall": "minecraft:granite_wall",
+    "minecraft:cinnabar_bricks": "minecraft:bricks",
+    "minecraft:cinnabar_brick_slab": "minecraft:brick_slab",
+    "minecraft:cinnabar_brick_stairs": "minecraft:brick_stairs",
+    "minecraft:cinnabar_brick_wall": "minecraft:brick_wall",
+    "minecraft:chiseled_cinnabar": "minecraft:chiseled_copper",
+    "minecraft:sulfur_spike": "minecraft:pointed_dripstone"
+  },
   "MINECRAFT_1_21_11": {
     "minecraft:golden_dandelion": "minecraft:dandelion",
     "minecraft:potted_golden_dandelion": "minecraft:potted_dandelion"

plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java

@@ -130,7 +130,7 @@
 )
 public class LimboAPI implements LimboFactory {
 
-  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 775;
+  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 776;
 
   @MonotonicNonNull
   private static Logger LOGGER;

plugin/src/main/java/net/elytrium/limboapi/Settings.java

@@ -88,7 +88,7 @@ public static class MAIN {
         "1_13, 1_13_1, 1_13_2, 1_14, 1_14_1, 1_14_2, 1_14_3, 1_14_4, 1_15, 1_15_1, 1_15_2,",
         "1_16, 1_16_1, 1_16_2, 1_16_3, 1_16_4, 1_17, 1_17_1, 1_18, 1_18_2, 1_19, 1_19_1, 1_19_3,",
         "1_20, 1_20_2, 1_20_3, 1_20_5, 1_21, 1_21_2, 1_21_4, 1_21_5, 1_21_6, 1_21_7, 1_21_9, 1_21_11,",
-        "26_1, LATEST"
+        "26_1, 26_2, LATEST"
     })
     public String PREPARE_MIN_VERSION = "1_7_2";
     public String PREPARE_MAX_VERSION = "LATEST";

plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java

@@ -232,6 +232,7 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
               success.setUsername(player.getUsername());
               success.setProperties(player.getGameProfileProperties());
               success.setUuid(playerUniqueID);
+              success.setSessionId(this.server.getSessionId());
 
               if (Settings.IMP.MAIN.COMPATIBILITY_MODE) {
                 connection.write(success);
@@ -240,6 +241,7 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
                 successHook.setUsername(player.getUsername());
                 successHook.setProperties(player.getGameProfileProperties());
                 successHook.setUuid(playerUniqueID);
+                successHook.setSessionId(this.server.getSessionId());
                 connection.write(successHook);
 
                 ChannelHandler compressionHandler = pipeline.get(Connections.COMPRESSION_ENCODER);

plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java

@@ -969,6 +969,9 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) {
     joinGame.setPreviousGamemode((short) -1);
     joinGame.setDimension(dimension.getModernID());
     joinGame.setDifficulty((short) 0);
+    // TODO: different JoinGame packets for different login types,
+    //  at the moment (26.2) it tells client to fetch chat signing keypair.
+    joinGame.setOnlineMode(true);
     try {
       PARTIAL_HASHED_SEED_FIELD.invokeExact(joinGame, ThreadLocalRandom.current().nextLong());
     } catch (Throwable e) {
@@ -1266,7 +1269,7 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) {
             Map<String, CompoundBinaryTag> songs = new HashMap<>();
             for (String songName : List.of("11", "13", "5", "blocks", "cat", "chirp", "creator",
                 "creator_music_box", "far", "lava_chicken", "mall", "mellohi", "otherside",
-                "pigstep", "precipice", "relic", "stal", "strad", "tears", "wait", "ward")) {
+                "pigstep", "precipice", "relic", "stal", "strad", "tears", "wait", "ward", "bounce")) {
               songs.put(songName, song);
             }
             registryContainer.put("minecraft:jukebox_song", this.createRegistry("minecraft:jukebox_song", songs));