Minecraft 26.1 and Velocity b584 support (#233)

UserNugget · web-flow · commit 65407283c9bf · 2026-03-25T16:32:48.000+03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,8 +17,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4.7.0
         with:
-          distribution: adopt
-          java-version: 21
+          distribution: temurin
+          java-version: 25
       - name: Build LimboAPI
         run: ./gradlew build
       - name: Upload LimboAPI
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,8 +13,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4.7.0
         with:
-          distribution: adopt
-          java-version: 21
+          distribution: temurin
+          java-version: 25
       - name: Build LimboAPI
         run: ./gradlew build
       - name: Upload LimboAPI
diff --git a/api/build.gradle b/api/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 compileJava() {
-  getOptions().getRelease().set(17)
+  getOptions().getRelease().set(21)
   getOptions().setEncoding("UTF-8")
 }
 
@@ -22,7 +22,7 @@ dependencies() {
 }
 
 license() {
-  matching(includes: ["**/mcprotocollib/**"]) {
+  matching("**/mcprotocollib/**") {
     header = rootProject.file("HEADER_MCPROTOCOLLIB.txt")
   }
 
@@ -31,7 +31,7 @@ license() {
 
 javadoc() {
   options.setEncoding("UTF-8")
-  options.setSource("17")
+  options.setSource("21")
   options.links("https://docs.oracle.com/en/java/javase/11/docs/api/")
   options.addStringOption("Xdoclint:none", "-quiet")
   if (JavaVersion.current() >= JavaVersion.VERSION_1_9 && JavaVersion.current() < JavaVersion.VERSION_12) {
diff --git a/api/src/main/java/net/elytrium/limboapi/api/Limbo.java b/api/src/main/java/net/elytrium/limboapi/api/Limbo.java
@@ -36,6 +36,7 @@ public interface Limbo {
 
   Limbo setShouldRespawn(boolean shouldRespawn);
 
+  @Deprecated
   Limbo setShouldUpdateTags(boolean shouldUpdateTags);
 
   Limbo setReducedDebugInfo(boolean reducedDebugInfo);
diff --git a/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java b/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java
@@ -32,7 +32,8 @@ public enum BlockEntityVersion {
   MINECRAFT_1_21_6(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_6)),
   MINECRAFT_1_21_7(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_7)),
   MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9)),
-  MINECRAFT_1_21_11(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_11));
+  MINECRAFT_1_21_11(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_11)),
+  MINECRAFT_26_1(EnumSet.of(ProtocolVersion.MINECRAFT_26_1));
 
   private static final EnumMap<ProtocolVersion, BlockEntityVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
   private static final Map<String, BlockEntityVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
diff --git a/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java b/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java
@@ -36,7 +36,8 @@ public enum WorldVersion {
   MINECRAFT_1_21_6(ProtocolVersion.MINECRAFT_1_21_6),
   MINECRAFT_1_21_7(ProtocolVersion.MINECRAFT_1_21_7),
   MINECRAFT_1_21_9(ProtocolVersion.MINECRAFT_1_21_9),
-  MINECRAFT_1_21_11(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_11, ProtocolVersion.MAXIMUM_VERSION));
+  MINECRAFT_1_21_11(ProtocolVersion.MINECRAFT_1_21_11),
+  MINECRAFT_26_1(EnumSet.range(ProtocolVersion.MINECRAFT_26_1, ProtocolVersion.MAXIMUM_VERSION));
 
   private static final EnumMap<ProtocolVersion, WorldVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
   private static final Map<String, WorldVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java
@@ -8,7 +8,6 @@
 package net.elytrium.limboapi.api.protocol.packets.data;
 
 import com.velocitypowered.api.network.ProtocolVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.awt.image.BufferedImage;
 import java.io.IOError;
 import java.io.IOException;
@@ -19,7 +18,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-@SuppressFBWarnings("MS_EXPOSE_REP")
 public class MapPalette {
 
   private static final Map<MapVersion, byte[]> REMAP_BUFFERS = new EnumMap<>(MapVersion.class);
diff --git a/build.gradle b/build.gradle
@@ -4,14 +4,14 @@ plugins() {
   id("java")
 
   id("checkstyle")
-  id("com.github.spotbugs").version("6.0.12").apply(false)
-  id("org.cadixdev.licenser").version("0.6.1").apply(false)
+  id("com.github.spotbugs").version("6.4.8").apply(false)
+  id("net.minecraftforge.licenser").version("1.2.0").apply(false)
 }
 
 allprojects() {
   apply(plugin: "checkstyle")
   apply(plugin: "com.github.spotbugs")
-  apply(plugin: "org.cadixdev.licenser")
+  apply(plugin: "net.minecraftforge.licenser")
 
   setGroup("net.elytrium.limboapi")
   setVersion("1.1.27-SNAPSHOT")
@@ -56,16 +56,7 @@ allprojects() {
 }
 
 String getCurrentShortRevision() {
-  OutputStream outputStream = new ByteArrayOutputStream()
-  exec {
-    if (System.getProperty("os.name").toLowerCase().contains("win")) {
-      commandLine("cmd", "/c", "git rev-parse --short HEAD")
-    } else {
-      commandLine("bash", "-c", "git rev-parse --short HEAD")
-    }
-
-    setStandardOutput(outputStream)
-  }
-
-  return outputStream.toString().trim()
+  return System.getProperty("os.name").toLowerCase().contains("win")
+      ? ["cmd", "/c", "git rev-parse --short HEAD"].execute().text.trim()
+      : ["bash", "-c", "git rev-parse --short HEAD"].execute().text.trim()
 }
diff --git a/config/spotbugs/suppressions.xml b/config/spotbugs/suppressions.xml
@@ -16,4 +16,7 @@
     <Match>
         <Bug pattern="CT_CONSTRUCTOR_THROW"/>
     </Match>
+    <Match>
+        <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
+    </Match>
 </FindBugsFilter>
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx4096m
 fastPrepareVersion=1.0.13
-velocityVersion=3.4.0-SNAPSHOT
+velocityVersion=3.5.0-SNAPSHOT
 nettyVersion=4.1.86.Final
 fastutilVersion=8.5.11
 bstatsVersion=3.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -9,11 +9,11 @@ buildscript() {
 
 plugins() {
   id("java")
-  id("com.gradleup.shadow").version("8.3.6")
+  id("com.gradleup.shadow").version("9.4.0")
 }
 
 compileJava() {
-  getOptions().getRelease().set(17)
+  getOptions().getRelease().set(21)
   getOptions().setEncoding("UTF-8")
 }
 
@@ -55,14 +55,27 @@ shadowJar() {
 }
 
 license() {
-  matching(includes: ["**/mcprotocollib/**"]) {
-    setHeader(getRootProject().file("HEADER_MCPROTOCOLLIB.txt"))
+  matching("**/mcprotocollib/**") {
+    header = rootProject.file("HEADER_MCPROTOCOLLIB.txt")
   }
-  matching(includes: ["**/LoginListener.java", "**/KickListener.java", "**/LoginTasksQueue.java", "**/MinecraftLimitedCompressDecoder.java"]) {
-    setHeader(getRootProject().file("HEADER_MIXED.txt"))
+
+  matching("**/LoginListener.java") {
+    header = rootProject.file("HEADER_MIXED.txt")
+  }
+
+  matching("**/KickListener.java") {
+    header = rootProject.file("HEADER_MIXED.txt")
   }
 
-  setHeader(getRootProject().file("HEADER.txt"))
+  matching("**/LoginTasksQueue.java") {
+    header = rootProject.file("HEADER_MIXED.txt")
+  }
+
+  matching("**/MinecraftLimitedCompressDecoder.java") {
+    header = rootProject.file("HEADER_MIXED.txt")
+  }
+
+  header = rootProject.file("HEADER.txt")
 }
 
 tasks.register("finalize") {
@@ -135,7 +148,8 @@ enum MinecraftVersion {
   MINECRAFT_1_21_6(771),
   MINECRAFT_1_21_7(772),
   MINECRAFT_1_21_9(773),
-  MINECRAFT_1_21_11(774)
+  MINECRAFT_1_21_11(774),
+  MINECRAFT_26_1(774)
 
   public static final List<MinecraftVersion> WORLD_VERSIONS = List.of(
     MINECRAFT_1_13,
@@ -157,7 +171,8 @@ enum MinecraftVersion {
     MINECRAFT_1_21_6,
     MINECRAFT_1_21_7,
     MINECRAFT_1_21_9,
-    MINECRAFT_1_21_11
+    MINECRAFT_1_21_11,
+    MINECRAFT_26_1
   )
 
   public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2
@@ -283,18 +298,15 @@ File generateData(MinecraftVersion version) {
     command = "\"%s\" -cp \"${jarFile.getAbsolutePath()}\" net.minecraft.data.Main --reports --server"
   }
 
-  exec {
-    if (System.getProperty("os.name").toLowerCase().contains("win")) {
-      File java = new File(System.getProperty("java.home"), "bin/java.exe")
-      commandLine("cmd", "/c", String.format(command, java))
-    } else {
-      File java = new File(System.getProperty("java.home"), "bin/java")
-      commandLine("bash", "-c", String.format(command, java))
-    }
-
-    workingDir(jarFile.getParentFile())
+  List<String> commandLine;
+  if (System.getProperty("os.name").toLowerCase().contains("win")) {
+    File java = new File(System.getProperty("java.home"), "bin/java.exe")
+    commandLine = ["cmd", "/c", String.format(command, java)]
+  } else {
+    File java = new File(System.getProperty("java.home"), "bin/java")
+    commandLine = ["bash", "-c", String.format(command, java)]
   }
-
+  commandLine.execute([], jarFile.getParentFile()).waitFor()
   return targetDir
 }
 
diff --git a/plugin/mapping/fallbackdata.json b/plugin/mapping/fallbackdata.json
@@ -1,4 +1,8 @@
 {
+  "MINECRAFT_1_21_11": {
+    "minecraft:golden_dandelion": "minecraft:dandelion",
+    "minecraft:potted_golden_dandelion": "minecraft:potted_dandelion"
+  },
   "MINECRAFT_1_21_7": {
     "minecraft:acacia_shelf": "minecraft:acacia_planks",
     "minecraft:bamboo_shelf": "minecraft:bamboo_planks",
diff --git a/plugin/mapping/tag_types.json b/plugin/mapping/tag_types.json
@@ -4,7 +4,9 @@
     "entity_types": "minecraft:entity_type",
     "fluids": "minecraft:fluid",
     "game_events": "minecraft:game_event",
-    "items": "minecraft:item"
+    "items": "minecraft:item",
+    "damage_type": "minecraft:damage_type",
+    "banner_pattern": "minecraft:banner_pattern"
   },
   "supported_tag_types": [
     "minecraft:block",
diff --git a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
@@ -43,7 +43,6 @@
 import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftEncoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftVarintLengthEncoder;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;
@@ -128,10 +127,9 @@
         "Elytrium (https://elytrium.net/)",
     }
 )
-@SuppressFBWarnings("MS_EXPOSE_REP")
 public class LimboAPI implements LimboFactory {
 
-  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 774;
+  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 775;
 
   @MonotonicNonNull
   private static Logger LOGGER;
@@ -281,7 +279,6 @@ public void postProxyInitialization(ProxyInitializeEvent event) throws IllegalAc
     this.eventManagerHook.reloadHandlers();
   }
 
-  @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH", justification = "LEGACY_AMPERSAND can't be null in velocity.")
   public void reload() {
     Settings.IMP.reload(this.configFile, Settings.IMP.PREFIX);
     ComponentSerializer<Component, Component, String> serializer = Settings.IMP.SERIALIZER.getSerializer();
diff --git a/plugin/src/main/java/net/elytrium/limboapi/Settings.java b/plugin/src/main/java/net/elytrium/limboapi/Settings.java
@@ -87,7 +87,8 @@ public static class MAIN {
         "1_7_2, 1_7_6, 1_8, 1_9, 1_9_1, 1_9_2, 1_9_4, 1_10, 1_11, 1_11_1, 1_12, 1_12_1, 1_12_2,",
         "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, LATEST"
+        "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"
     })
     public String PREPARE_MIN_VERSION = "1_7_2";
     public String PREPARE_MAX_VERSION = "LATEST";
@@ -98,6 +99,9 @@ public static class MAIN {
     @Comment("Should reduced debug info be enabled (reduced information in F3) if there is no preference for Limbo")
     public boolean REDUCED_DEBUG_INFO = false;
 
+    @Comment("Used to hide unsigned chat popup")
+    public boolean SEND_ENFORCE_SECURE_CHAT = true;
+
     public int VIEW_DISTANCE = 10;
 
     public int SIMULATION_DISTANCE = 9;
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
@@ -196,7 +196,6 @@ private void finish() {
   }
 
   // From Velocity.
-  @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
   private void initialize(MinecraftConnection connection) throws Throwable {
     connection.setAssociation(this.player);
     if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/LimboProtocol.java
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/TimeUpdatePacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/TimeUpdatePacket.java
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/util/NetworkSection.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/util/NetworkSection.java
diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java b/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java
diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleTagManager.java b/plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleTagManager.java

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`compileJava() {`
`9`		`- getOptions().getRelease().set(17)`
	`9`	`+ getOptions().getRelease().set(21)`
`10`	`10`	`getOptions().setEncoding("UTF-8")`
`11`	`11`	`}`
`12`	`12`
`@@ -22,7 +22,7 @@ dependencies() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`license() {`
`25`		`- matching(includes: ["/mcprotocollib/"]) {`
	`25`	`+ matching("/mcprotocollib/") {`
`26`	`26`	`header = rootProject.file("HEADER_MCPROTOCOLLIB.txt")`
`27`	`27`	`}`
`28`	`28`
`@@ -31,7 +31,7 @@ license() {`
`31`	`31`
`32`	`32`	`javadoc() {`
`33`	`33`	`options.setEncoding("UTF-8")`
`34`		`- options.setSource("17")`
	`34`	`+ options.setSource("21")`
`35`	`35`	`options.links("https://docs.oracle.com/en/java/javase/11/docs/api/")`
`36`	`36`	`options.addStringOption("Xdoclint:none", "-quiet")`
`37`	`37`	`if (JavaVersion.current() >= JavaVersion.VERSION_1_9 && JavaVersion.current() < JavaVersion.VERSION_12) {`