Start 1.21.3

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("org.leavesmc.leavesweight.patcher") version "1.0.0-SNAPSHOT"
+    id("org.leavesmc.leavesweight.patcher") version "1.0.1-SNAPSHOT"
 }
 
 allprojects {

gradle.properties

@@ -1,9 +1,8 @@
 group=org.leavesmc.leaves
-version=1.21.1-R0.1-SNAPSHOT
-mcVersion=1.21.1
-paperRef=84281ceeefb9d294758a9a292ba6c01da40e8409
-preVersion=false
-updatingMinecraft=false
+version=1.21.3-R0.1-SNAPSHOT
+mcVersion=1.21.3
+paperRef=be886cf4e7ba906a3e79d9d38835d35abf60a0ce
+preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -246,4 +249,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -89,4 +91,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

patches/api/0001-Leaves-Server-Config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6246251caf2c6f025c824b8e7a944b8d48751fa1..80949894308e597676745e312474fe0c9672a23e 100644
+index 0b78564256ebc647ebac402e549d86ab6e307c8d..cbe69a0267981173fe8f7d715764d982bd9dcc8d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2264,6 +2264,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2282,6 +2282,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end

patches/api/0003-Add-fakeplayer-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer api
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e20e4239a5a1f952e1c70e899549989d5e42f73c..5f6078bc80e20c9482a96d2bf1095bb32fbfc28c 100644
+index 391a1e3e07657a404520c1462507a2c731f32b27..2081370003a27abb69f7d5da37d5fb0085c39944 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2917,6 +2917,17 @@ public final class Bukkit {
+@@ -2941,6 +2941,17 @@ public final class Bukkit {
      }
      // Paper end - Folia region threading API
 
@@ -27,7 +27,7 @@ index e20e4239a5a1f952e1c70e899549989d5e42f73c..5f6078bc80e20c9482a96d2bf1095bb3
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80949894308e597676745e312474fe0c9672a23e..133ae299ba12e0da9c5fa252a06bbf4f2b7b9016 100644
+index cbe69a0267981173fe8f7d715764d982bd9dcc8d..c9ded0024dcbf68400a65a12065cdcbb374d3789 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -62,6 +62,7 @@ import org.jetbrains.annotations.ApiStatus;
@@ -38,7 +38,7 @@ index 80949894308e597676745e312474fe0c9672a23e..133ae299ba12e0da9c5fa252a06bbf4f
 
  /**
   * Represents a server implementation.
-@@ -2562,4 +2563,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2580,4 +2581,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API

patches/api/0005-Hide-irrelevant-compilation-warnings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Hide irrelevant compilation warnings
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ab84a1405acc1f0d5f267892243b82b8dab03e21..beee863333fa8ebb31cd83d6a1451b51c770bf2d 100644
+index e29e5024fa693baae469d47fe77b57118f14627c..7a60cd45449950cfb116b1cb29bc3da4ba074e7d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -131,6 +131,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -148,6 +148,15 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 
@@ -24,7 +24,7 @@ index ab84a1405acc1f0d5f267892243b82b8dab03e21..beee863333fa8ebb31cd83d6a1451b51
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -190,6 +199,8 @@ tasks.withType<Javadoc> {
+@@ -207,6 +216,8 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }

patches/api/0006-SIMD-support.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index beee863333fa8ebb31cd83d6a1451b51c770bf2d..1491188671ce741afbbc4006c03510a328e92dbd 100644
+index 7a60cd45449950cfb116b1cb29bc3da4ba074e7d..caaffd1d0a323a2b292fb9c8ceeac271ba9dd635 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -137,6 +137,7 @@ tasks.withType<JavaCompile> {
+@@ -154,6 +154,7 @@ tasks.withType<JavaCompile> {
      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
 
-@@ -201,6 +202,7 @@ tasks.withType<Javadoc> {
+@@ -218,6 +219,7 @@ tasks.withType<Javadoc> {
      }
 
      options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings

patches/api/0007-Delete-Timings.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Delete Timings
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 deleted file mode 100644
-index 3e747abde6fefae90f1c15cb00158bc5303cbe50..0000000000000000000000000000000000000000
+index 73b125979e2f2dfd13cbf689a90b29cc68a36e09..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/FullServerTickHandler.java
 +++ /dev/null
 @@ -1,89 +0,0 @@
@@ -92,7 +92,7 @@ index 3e747abde6fefae90f1c15cb00158bc5303cbe50..00000000000000000000000000000000
 -            TimingsManager.HISTORY.add(new TimingHistory());
 -            TimingsManager.resetTimings();
 -        }
--        Bukkit.getUnsafe().reportTimings();
+-        //Bukkit.getUnsafe().reportTimings();
 -    }
 -
 -    boolean isViolated() {
@@ -1279,10 +1279,10 @@ index df142a89b8c43acb81eb383eac0ef048a1f49a6e..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 deleted file mode 100644
-index e81d0bc309de877ed2b5da6122f55c162e9b5f10..0000000000000000000000000000000000000000
+index 95b7cdf0677ef71e6885fa78aa5c75bb500f5f53..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/Timings.java
 +++ /dev/null
-@@ -1,331 +0,0 @@
+@@ -1,325 +0,0 @@
 -/*
 - * This file is licensed under the MIT License (MIT).
 - *
@@ -1430,22 +1430,16 @@ index e81d0bc309de877ed2b5da6122f55c162e9b5f10..00000000000000000000000000000000
 -     * @param enabled Should timings be reported
 -     */
 -    public static void setTimingsEnabled(boolean enabled) {
--        timingsEnabled = enabled;
--        warnAboutDeprecationOnEnable();
--        reset();
--    }
--
--    private static void warnAboutDeprecationOnEnable() {
--        if (timingsEnabled && !warnedAboutDeprecationOnEnable) {
--            Bukkit.getLogger().warning(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
+-        if (enabled && !warnedAboutDeprecationOnEnable) {
+-            Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
 -            warnedAboutDeprecationOnEnable = true;
 -        }
 -    }
 -
 -    public static Component deprecationMessage() {
 -        return Component.text()
 -            .color(TextColor.color(0xffc93a))
--            .append(Component.text("[!] The timings profiler has been enabled but has been scheduled for removal from Paper in the future."))
+-            .append(Component.text("[!] The timings profiler is in no-op mode and will be fully removed in a later update."))
 -            .append(Component.newline())
 -            .append(Component.text("    We recommend migrating to the spark profiler."))
 -            .append(Component.newline())
@@ -1616,10 +1610,10 @@ index e81d0bc309de877ed2b5da6122f55c162e9b5f10..00000000000000000000000000000000
 -
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 deleted file mode 100644
-index 95d87c9dbf2b237787294dfbe7fed87a36e6dedf..0000000000000000000000000000000000000000
+index b83e5ff7ada8771fdf27ba9807c77ba6a4ce12da..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/TimingsCommand.java
 +++ /dev/null
-@@ -1,126 +0,0 @@
+@@ -1,127 +0,0 @@
 -/*
 - * This file is licensed under the MIT License (MIT).
 - *
@@ -1678,8 +1672,9 @@ index 95d87c9dbf2b237787294dfbe7fed87a36e6dedf..00000000000000000000000000000000
 -        if (!testPermission(sender)) {
 -            return true;
 -        }
--        if (false) {
+-        if (true) {
 -            sender.sendMessage(Timings.deprecationMessage());
+-            return true;
 -        }
 -        if (args.length < 1) {
 -            sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
@@ -2182,7 +2177,7 @@ index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..940565704d0e8914a76cf25daf7d1f5e
              server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
              //target.timings.stopTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 003bece642b682985625db93cad93026352bfc66..308245714a0a830d92568f7bb1f4bb9c45828345 100644
+index b878e7167cfcdea0e224c182b40abeadd339d3b3..fc0239bca93e3dfb740af3239c1276b004607643 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -720,12 +720,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -2209,9 +2204,9 @@ index 003bece642b682985625db93cad93026352bfc66..308245714a0a830d92568f7bb1f4bb9c
      }
 
      /**
-@@ -965,7 +959,6 @@ public final class SimplePluginManager implements PluginManager {
-      * @param use True if per event timing code should be used
+@@ -966,7 +960,6 @@ public final class SimplePluginManager implements PluginManager {
       */
+     @Deprecated(forRemoval = true)
      public void useTimings(boolean use) {
 -        co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
      }

patches/api/0009-Replay-Mod-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Replay Mod API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5f6078bc80e20c9482a96d2bf1095bb32fbfc28c..d0a9b96f4ab200892d589a68b27585a08780f7ac 100644
+index 2081370003a27abb69f7d5da37d5fb0085c39944..00673245db6684e1ad123a4f4767f67a4d3f2d2a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2927,6 +2927,11 @@ public final class Bukkit {
+@@ -2951,6 +2951,11 @@ public final class Bukkit {
          return server.getBotManager();
      }
      // Leaves end - Bot API
@@ -21,7 +21,7 @@ index 5f6078bc80e20c9482a96d2bf1095bb32fbfc28c..d0a9b96f4ab200892d589a68b27585a0
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 133ae299ba12e0da9c5fa252a06bbf4f2b7b9016..f752dbd0ed8a62cb2b7c812925dde645c3ecb85c 100644
+index c9ded0024dcbf68400a65a12065cdcbb374d3789..39af9b6cec72bcc57058779f8dbdbbe704cabdb6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -63,6 +63,7 @@ import org.jetbrains.annotations.Contract;
@@ -32,7 +32,7 @@ index 133ae299ba12e0da9c5fa252a06bbf4f2b7b9016..f752dbd0ed8a62cb2b7c812925dde645
 
  /**
   * Represents a server implementation.
-@@ -2572,4 +2573,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2590,4 +2591,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull BotManager getBotManager();
      // Leaves end - Bot API

patches/api/0010-Bytebuf-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d0a9b96f4ab200892d589a68b27585a08780f7ac..7fbd9d2b533e8791132ba6ac21fad83d704922a0 100644
+index 00673245db6684e1ad123a4f4767f67a4d3f2d2a..4ef7946af0acd999c4225e52d0a4c0e9d0616380 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2933,6 +2933,12 @@ public final class Bukkit {
+@@ -2957,6 +2957,12 @@ public final class Bukkit {
      }
      // Leaves end - Photographer API
 
@@ -22,10 +22,10 @@ index d0a9b96f4ab200892d589a68b27585a08780f7ac..7fbd9d2b533e8791132ba6ac21fad83d
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f752dbd0ed8a62cb2b7c812925dde645c3ecb85c..90fbc5fb7b8936af365e8f4cbbd7bff6d1b4cf68 100644
+index 39af9b6cec72bcc57058779f8dbdbbe704cabdb6..30af8322c3bbd3e189e3fde207416a7eb8552d06 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2576,4 +2576,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2594,4 +2594,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Leaves start - Photographer API
      @NotNull PhotographerManager getPhotographerManager();
      // Leaves end - Photographer API
@@ -35,10 +35,10 @@ index f752dbd0ed8a62cb2b7c812925dde645c3ecb85c..90fbc5fb7b8936af365e8f4cbbd7bff6
 +    // 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 7c56182acaf827f4b1a986a61cea8e9960604c98..45f820485e6f6e3a6a37a30a30c1c6a65b4615bb 100644
+index 95f0b3186e313c7fbd5c8531d52b82a69e525f94..ec2a5f77c135706a544a870808241ea1d6b6e814 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3855,6 +3855,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3895,6 +3895,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      boolean isChunkSent(long chunkKey);
      // Paper end