更新 26.1.2

.github/workflows/test.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - name: Get repository
         uses: actions/checkout@v4
-      - name: Get JDK 21
+      - name: Get JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: "21"
+          java-version: "25"
           distribution: "zulu"
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -29,15 +29,15 @@ jobs:
       - name: Apply Patches
         run: ./gradlew applyAllPatches
       - name: Create Leavesclip Jar
-        run: ./gradlew createMojmapLeavesclipJar
+        run: ./gradlew createLeavesclipJar
       - name: Move Jar
         run: |
           prop() {
             awk -F= -v key="$1" '$1 == key { val = $2; sub(/[[:space:]]*#.*$/, "", val); gsub(/^[[:space:]]+|[[:space:]]+$/, "", val); print val }' gradle.properties
           }
 
           jarName="leaves-$(prop mcVersion).jar"
-          mv leaves-server/build/libs/leaves-leavesclip-"$(prop version)"-mojmap.jar "$jarName"
+          mv leaves-server/build/libs/leaves-leavesclip-"$(prop version)".jar "$jarName"
           echo "jar=$jarName" >> "$GITHUB_ENV"
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

build.gradle.kts

@@ -4,7 +4,7 @@ import java.util.Locale
 
 plugins {
     java
-    id("org.leavesmc.leavesweight.patcher") version "2.1.0-SNAPSHOT"
+    id("org.leavesmc.leavesweight.patcher") version "2.2.0-SNAPSHOT" // Leaves - 26.1 line uses leavesweight 2.2.0
 }
 
 subprojects {
@@ -13,8 +13,7 @@ subprojects {
 
     extensions.configure<JavaPluginExtension> {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-            vendor = JvmVendorSpec.ADOPTIUM
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 
@@ -32,9 +31,10 @@ subprojects {
     }
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release = 21
+        options.release = 25
         options.isFork = true
         options.forkOptions.memoryMaximumSize = "6g"
+        options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal", "-Xmaxerrs", "500"))
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()

gradle.properties

@@ -1,13 +1,14 @@
 group=org.leavesmc.leaves
-version=1.21.11-R0.1-SNAPSHOT
-mcVersion=1.21.11
-paperRef=c5a2736aaa33a6447badd2ed294fbf5940cb014b
+version=26.1.2-R0.1-SNAPSHOT
+mcVersion=26.1.2
+paperRef=10a73fe40f39d51e6a35e55154229bc9508a16d1
+channel=STABLE
 preVersion=true
 paper.runDisableWatchdog=true
 
 # This is the current API version for use in (paper-/leaves-)plugin.yml files
 # During snapshot cycles this should be the anticipated version of the release target
-apiVersion=1.21.11
+apiVersion=26.1.2
 
 org.gradle.configuration-cache=false
 org.gradle.caching=true

leaves-api/build.gradle.kts.patch

@@ -1,7 +1,7 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
 @@ -91,19 +_,33 @@
-     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
  }
 
 -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
@@ -17,41 +17,42 @@
          java {
              srcDir(generatedDir)
 +            srcDir(file("../paper-api/src/main/java"))
-+        }
+         }
 +        resources {
 +            srcDir(file("../paper-api/src/main/resources"))
 +        }
-+    }
+     }
 +    test {
 +        java {
 +            srcDir(file("../paper-api/src/test/java"))
 +        }
 +        resources {
 +            srcDir(file("../paper-api/src/test/resources"))
-         }
-     }
++        }
++    }
  }
 +// Leaves end - build change
 
  val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
  val mainCapability = "${project.group}:${project.name}:${project.version}"
-@@ -138,6 +_,16 @@
-     }
- }
-
+@@ -164,7 +_,17 @@
+     outputFile.set(layout.buildDirectory.file("apiVersioning.json"))
+     projectVersion.set(project.version.toString())
+     apiVersion.set(rootProject.providers.gradleProperty("apiVersion"))
++}
++
 +// Leaves start - hide irrelevant compilation warnings
 +tasks.withType<JavaCompile> {
 +    val compilerArgs = options.compilerArgs
 +    compilerArgs.add("-Xlint:-module")
 +    compilerArgs.add("-Xlint:-removal")
 +    compilerArgs.add("-Xlint:-dep-ann")
 +    compilerArgs.add("--add-modules=jdk.incubator.vector") // Leaves - SIMD support
-+}
+ }
 +// Leaves end - hide irrelevant compilation warnings
-+
- abstract class GenerateApiVersioningFile : DefaultTask() {
-     @get:OutputFile
-     abstract val outputFile: RegularFileProperty
+
+ tasks.jar {
+     from(generateApiVersioningFile.flatMap { it.outputFile })
 @@ -183,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {

leaves-api/paper-patches/features/0001-Delete-Timings.patch

@@ -730,7 +730,7 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 deleted file mode 100644
-index 143fb3623a3fcf4be2d30dafb330584cb61ffe50..0000000000000000000000000000000000000000
+index 89bd9555d0c96b7bc1703b522cf4ee8d259131e6..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ /dev/null
 @@ -1,356 +0,0 @@
@@ -870,7 +870,7 @@ index 143fb3623a3fcf4be2d30dafb330584cb61ffe50..00000000000000000000000000000000
 -                    }
 -                }
 -                return pair(
--                    worldMap.get(world.getName()),
+-                    worldMap.get(world.key().asString()),
 -                    toArrayMapper(regions.values(),new Function<RegionData, Object>() {
 -                        @NotNull
 -                        @Override

leaves-api/paper-patches/features/0003-Add-fakeplayer-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add fakeplayer api
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 14d81c7b138ebf999d5812d26fbf869209c100f3..3b0513fbbf46e7cbb1790264eebaed9862d48eb5 100644
+index 77473d9de8283a557ca061b0429dee9312de7d6b..9c5038e5dca41f9e77eba999dbc1dd839162281e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3003,4 +3003,15 @@ public final class Bukkit {
@@ -25,10 +25,10 @@ index 14d81c7b138ebf999d5812d26fbf869209c100f3..3b0513fbbf46e7cbb1790264eebaed98
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0ec885b97d655c03371840d739b47063494ed36f..bc9bdaadf6b6bb7cc7a8cf2d4e9b8e7724f36445 100644
+index dd8ad5976eb413f049245a4f37bd94b3e41829de..1a81b53408cd20af750d507fab8d037de389f450 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2761,4 +2761,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2780,4 +2780,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping

leaves-api/paper-patches/features/0004-Replay-Mod-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Replay Mod API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3b0513fbbf46e7cbb1790264eebaed9862d48eb5..44ee8036e2f813e947c2c166e1876030cabf86ff 100644
+index 9c5038e5dca41f9e77eba999dbc1dd839162281e..4e1c97d828d7d4d3ba42e28dec8aa1ec6e96420d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3014,4 +3014,10 @@ public final class Bukkit {
@@ -20,13 +20,15 @@ index 3b0513fbbf46e7cbb1790264eebaed9862d48eb5..44ee8036e2f813e947c2c166e1876030
 +    // Leaves end - Photographer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bc9bdaadf6b6bb7cc7a8cf2d4e9b8e7724f36445..f2d616b896ac7998c75c9ded8dd28cf2b49dd416 100644
+index 1a81b53408cd20af750d507fab8d037de389f450..e0e6161524fc5ced6704d8effec0a87009241f25 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2770,4 +2770,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2789,4 +2789,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.leavesmc.leaves.entity.bot.BotManager getBotManager();
      // Leaves end - Bot API
 +
-+    @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager(); // Leaves - Photographer API
++    // Leaves start - Photographer API
++    @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();
++    // Leaves end - Photographer API
  }

leaves-api/paper-patches/features/0005-Bytebuf-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 44ee8036e2f813e947c2c166e1876030cabf86ff..29570b8bcf34806af2f8d3dfdd656319176a61e5 100644
+index 4e1c97d828d7d4d3ba42e28dec8aa1ec6e96420d..089d2e862d3683f6749ed7bc1c2f35778fd41e88 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3020,4 +3020,10 @@ public final class Bukkit {
@@ -20,26 +20,28 @@ index 44ee8036e2f813e947c2c166e1876030cabf86ff..29570b8bcf34806af2f8d3dfdd656319
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f2d616b896ac7998c75c9ded8dd28cf2b49dd416..9544b376e457b3b62f6c025bd31f2bb2a5318269 100644
+index e0e6161524fc5ced6704d8effec0a87009241f25..1b11ff184f91eb6923b79e5d6462d945ae8a0f42 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2772,4 +2772,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     // Leaves end - Bot API
-
-     @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager(); // Leaves - Photographer API
+@@ -2793,4 +2793,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     // Leaves start - Photographer API
+     @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();
+     // Leaves end - Photographer API
 +
-+    org.leavesmc.leaves.bytebuf.BytebufAllocator getBytebufAllocator(); // Leaves - Bytebuf API
++    // Leaves start - Bytebuf API
++    org.leavesmc.leaves.bytebuf.BytebufAllocator getBytebufAllocator();
++    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 26d9139886d851824829734228e0bcceabba92d5..3b3a5072fda47ee483e6e7c73263ffc321ea9a6b 100644
+index c5af83a9e4e619d32378a7bf361b5b4f05b6e147..b1edc65eb9b65108caf31fc8efe312c97ea44ed5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -66,7 +66,7 @@ import org.jspecify.annotations.Nullable;
+@@ -69,7 +69,7 @@ import org.jspecify.annotations.Nullable;
   * Represents a player, connected or not
   */
  @NullMarked
 -public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient { // Paper
 +public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient, org.leavesmc.leaves.bytebuf.PacketAudience { // Paper // Leaves - Bytbuf API
- 
+
      // Paper start
      @Override

leaves-api/paper-patches/features/0008-Leaves-Config-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Config API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 29570b8bcf34806af2f8d3dfdd656319176a61e5..786546ba9503a6fc7762589059b998afc62d8e22 100644
+index 089d2e862d3683f6749ed7bc1c2f35778fd41e88..3f5962acf1b7df1b4147e9fd1a91fc2ab5f8d817 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3026,4 +3026,10 @@ public final class Bukkit {
@@ -20,13 +20,15 @@ index 29570b8bcf34806af2f8d3dfdd656319176a61e5..786546ba9503a6fc7762589059b998af
 +    // Leaves end - Config API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9544b376e457b3b62f6c025bd31f2bb2a5318269..bd84c7725effc55b00510d0b7a050343e2ff0361 100644
+index 1b11ff184f91eb6923b79e5d6462d945ae8a0f42..c73d0a80153b3a5206159574dba553975a7daea9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2774,4 +2774,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager(); // Leaves - Photographer API
-
-     org.leavesmc.leaves.bytebuf.BytebufAllocator getBytebufAllocator(); // Leaves - Bytebuf API
+@@ -2797,4 +2797,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     // Leaves start - Bytebuf API
+     org.leavesmc.leaves.bytebuf.BytebufAllocator getBytebufAllocator();
+     // Leaves end - Bytebuf API
 +
-+    org.leavesmc.leaves.config.LeavesConfigProvider getLeavesConfig(); // Leaves - Config API
++    // Leaves start - Config API
++    org.leavesmc.leaves.config.LeavesConfigProvider getLeavesConfig();
++    // Leaves End - Config API
  }

leaves-api/paper-patches/features/0009-Leaves-Plugin.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Leaves Plugin
 This patch is licensed under the MIT license.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5cc913f9e903ea5ef51c2e2b8cc18fdad8838c1e..554b8977c9b358f177e29907bcebaed8ab2100fc 100644
+index 3f5962acf1b7df1b4147e9fd1a91fc2ab5f8d817..3a9c06e71d6a3e429e256e291fdf594c994b419b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3004,6 +3004,12 @@ public final class Bukkit {
@@ -23,10 +23,10 @@ index 5cc913f9e903ea5ef51c2e2b8cc18fdad8838c1e..554b8977c9b358f177e29907bcebaed8
      /**
       * Returns a bot manager.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0a52d9cffa58c922079bf97deb32dd4f057da097..23b878d9cfe4bdc0ddbd1d2d0663efecc7e5e8fb 100644
+index c73d0a80153b3a5206159574dba553975a7daea9..ca445ab0892a9ac4f8ef3228d8b28a9d0d12667e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2762,6 +2762,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2781,6 +2781,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping