From c8ba5fedc8f00fd7995deee41b3ecb265352c1c0 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 31 Mar 2025 09:53:16 -0400 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9b1798d6 Simplify custom payload handling (#12347) PaperMC/Paper@2552abf0 fix message mutation in PlayerSetSpawnEvent PaperMC/Paper@ae99e24f fix deprecated bungee chat api methods PaperMC/Paper@dca4aab8 add util methods to CraftChatMessage PaperMC/Paper@87c9d9b0 be more lenient on url parsing for legacy format PaperMC/Paper@4a9bd2e3 Correctly clear items in PlayerDeathEvent PaperMC/Paper@a70f7745 fix unsaveable launched trident PaperMC/Paper@41a094cf move block data/state impl PaperMC/Paper@6b26b219 remove hardcoded durability from material PaperMC/Paper@db8c646d Merge remote-tracking branch 'origin/main' into update/1.21.5 --- gradle.properties | 2 +- leaf-api/build.gradle.kts.patch | 4 +-- .../features/0002-Gale-configuration.patch | 10 +++--- .../0005-Remove-vanilla-profiler.patch | 34 +++++++++---------- ...019-Remove-lambda-from-ticking-guard.patch | 6 ++-- ...073-Send-multiple-keep-alive-packets.patch | 6 ++-- ...nimations-as-the-entity-being-critte.patch | 4 +-- .../paper-patches/features/0001-Rebrand.patch | 4 +-- ...h => 0005-Set-Gale-permissions-root.patch} | 0 ...tstrap.patch => 0006-Leaf-Bootstrap.patch} | 0 ...ommands.patch => 0007-Leaf-Commands.patch} | 0 ...pelessRecipe-comparison-for-vanilla.patch} | 0 ...-for-plugins-not-shutting-down-task.patch} | 4 +-- ...-support.patch => 0010-SIMD-support.patch} | 0 ...0011-Make-book-writing-configurable.patch} | 0 ...0012-Optimize-entity-coordinate-key.patch} | 0 ...-log-legacy-Material-initialization.patch} | 0 ...> 0014-Do-not-log-Not-Secure-marker.patch} | 0 ...ch => 0015-Reduce-array-allocations.patch} | 0 ... 0016-CraftBukkit-UUID-to-world-map.patch} | 8 ++--- ...h => 0017-Specific-interval-TPS-API.patch} | 4 +-- ....patch => 0018-5-second-TPS-average.patch} | 4 +-- ...PI.patch => 0019-Last-tick-time-API.patch} | 4 +-- ...-Show-last-tick-time-in-tps-command.patch} | 0 ...h => 0021-Pre-compute-VarLong-sizes.patch} | 0 ...mize-VarInt-write-and-VarLong-write.patch} | 0 ...atch => 0023-Virtual-thread-support.patch} | 0 27 files changed, 47 insertions(+), 47 deletions(-) rename leaf-server/paper-patches/features/{0006-Set-Gale-permissions-root.patch => 0005-Set-Gale-permissions-root.patch} (100%) rename leaf-server/paper-patches/features/{0007-Leaf-Bootstrap.patch => 0006-Leaf-Bootstrap.patch} (100%) rename leaf-server/paper-patches/features/{0008-Leaf-Commands.patch => 0007-Leaf-Commands.patch} (100%) rename leaf-server/paper-patches/features/{0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0008-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%) rename leaf-server/paper-patches/features/{0010-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0009-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (93%) rename leaf-server/paper-patches/features/{0011-SIMD-support.patch => 0010-SIMD-support.patch} (100%) rename leaf-server/paper-patches/features/{0012-Make-book-writing-configurable.patch => 0011-Make-book-writing-configurable.patch} (100%) rename leaf-server/paper-patches/features/{0013-Optimize-entity-coordinate-key.patch => 0012-Optimize-entity-coordinate-key.patch} (100%) rename leaf-server/paper-patches/features/{0014-Do-not-log-legacy-Material-initialization.patch => 0013-Do-not-log-legacy-Material-initialization.patch} (100%) rename leaf-server/paper-patches/features/{0015-Do-not-log-Not-Secure-marker.patch => 0014-Do-not-log-Not-Secure-marker.patch} (100%) rename leaf-server/paper-patches/features/{0016-Reduce-array-allocations.patch => 0015-Reduce-array-allocations.patch} (100%) rename leaf-server/paper-patches/features/{0017-CraftBukkit-UUID-to-world-map.patch => 0016-CraftBukkit-UUID-to-world-map.patch} (90%) rename leaf-server/paper-patches/features/{0018-Specific-interval-TPS-API.patch => 0017-Specific-interval-TPS-API.patch} (89%) rename leaf-server/paper-patches/features/{0019-5-second-TPS-average.patch => 0018-5-second-TPS-average.patch} (97%) rename leaf-server/paper-patches/features/{0020-Last-tick-time-API.patch => 0019-Last-tick-time-API.patch} (93%) rename leaf-server/paper-patches/features/{0021-Show-last-tick-time-in-tps-command.patch => 0020-Show-last-tick-time-in-tps-command.patch} (100%) rename leaf-server/paper-patches/features/{0022-Pre-compute-VarLong-sizes.patch => 0021-Pre-compute-VarLong-sizes.patch} (100%) rename leaf-server/paper-patches/features/{0023-Optimize-VarInt-write-and-VarLong-write.patch => 0022-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename leaf-server/paper-patches/features/{0024-Virtual-thread-support.patch => 0023-Virtual-thread-support.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 6f1653ab..f479e30d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.5 version=1.21.5-R0.1-SNAPSHOT -paperCommit=ce91a8ca123f4e853629d08705e4ece3a09a5a4d +paperCommit=db8c646d00d3ede50650ae27c89fd66be3be89e6 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-api/build.gradle.kts.patch b/leaf-api/build.gradle.kts.patch index f133dcca..f8fb0c73 100644 --- a/leaf-api/build.gradle.kts.patch +++ b/leaf-api/build.gradle.kts.patch @@ -6,8 +6,8 @@ -val annotationsVersion = "26.0.1" +val annotationsVersion = "26.0.2" // Leaf - Bump Dependencies - val bungeeCordChatVersion = "1.20-R0.2" val adventureVersion = "4.18.0" + val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21" -val slf4jVersion = "2.0.9" -val log4jVersion = "2.17.1" +// Leaf start - Bump Dependencies @@ -39,7 +39,7 @@ + api("io.sentry:sentry:8.4.0") // Pufferfish // Deprecate bungeecord-chat in favor of adventure - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { + api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") { @@ -68,32 +_,42 @@ apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") diff --git a/leaf-server/minecraft-patches/features/0002-Gale-configuration.patch b/leaf-server/minecraft-patches/features/0002-Gale-configuration.patch index f12f6bc0..e965528e 100644 --- a/leaf-server/minecraft-patches/features/0002-Gale-configuration.patch +++ b/leaf-server/minecraft-patches/features/0002-Gale-configuration.patch @@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 6a20bc3c7f141b259fd915ba4bd34948eed5bebd..5bb1b96390671fb4eb59a8d795a97e8fb061cc0d 100644 +index 7e880b68e6d071d555381af05a3e964fb68904ed..240722d96e8122269efb12c706e39bba54243872 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -299,6 +299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, AutoCl +@@ -157,6 +157,12 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl return this.paperConfig; } // Paper end - add paper world config @@ -122,7 +122,7 @@ index 63f8b0c47e3321b74f4b6bcbc1e28cd751911198..695973abeba2475ed5e163c987eb7fee public static @Nullable BlockPos lastPhysicsProblem; // Spigot private int tileTickPosition; -@@ -203,10 +209,13 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -202,10 +208,13 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl org.bukkit.World.Environment env, // CraftBukkit java.util.function.Function paperWorldConfigCreator, // Paper - create paper world config diff --git a/leaf-server/minecraft-patches/features/0005-Remove-vanilla-profiler.patch b/leaf-server/minecraft-patches/features/0005-Remove-vanilla-profiler.patch index ed4eba4c..c6aa151f 100644 --- a/leaf-server/minecraft-patches/features/0005-Remove-vanilla-profiler.patch +++ b/leaf-server/minecraft-patches/features/0005-Remove-vanilla-profiler.patch @@ -169,7 +169,7 @@ index 18071dcc69cc28471dddb7de94e803ec1e5fc2e4..e30bb9c4046200c1a6e4e917d15b205f } } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index ba5962b04a61e21ae81c2c212de6945585981ddd..5ba734fc868a9658ac39d9b22e91e48abc6b3ddb 100644 +index bd31615651fb5918d278de9799529b6c28190a03..f77aa7a8a8bdd73abe60f44a41264c242d6780ca 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -113,19 +113,8 @@ import net.minecraft.util.TimeUtil; @@ -377,7 +377,7 @@ index ba5962b04a61e21ae81c2c212de6945585981ddd..5ba734fc868a9658ac39d9b22e91e48a } public boolean isLevelEnabled(Level level) { -@@ -2485,55 +2424,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, AutoCl +@@ -817,8 +815,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl } protected void tickBlockEntities() { @@ -2131,7 +2131,7 @@ index 695973abeba2475ed5e163c987eb7fee3893ab02..e813588e03234e4b12b531cd77f725f7 this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { this.blockEntityTickers.addAll(this.pendingBlockEntityTickers); -@@ -843,7 +839,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -842,7 +838,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 this.tickingBlockEntities = false; @@ -2139,7 +2139,7 @@ index 695973abeba2475ed5e163c987eb7fee3893ab02..e813588e03234e4b12b531cd77f725f7 this.spigotConfig.currentPrimedTnt = 0; // Spigot } -@@ -1094,7 +1089,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -1093,7 +1088,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl @Override public List getEntities(@Nullable Entity entity, AABB boundingBox, Predicate predicate) { @@ -2147,7 +2147,7 @@ index 695973abeba2475ed5e163c987eb7fee3893ab02..e813588e03234e4b12b531cd77f725f7 List list = Lists.newArrayList(); this.getEntities().get(boundingBox, entity1 -> { if (entity1 != entity && predicate.test(entity1)) { -@@ -1128,7 +1122,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -1127,7 +1121,6 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl public void getEntities( EntityTypeTest entityTypeTest, AABB bounds, Predicate predicate, List output, int maxResults ) { diff --git a/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch b/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch index 9e0215a3..6202b335 100644 --- a/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch +++ b/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch @@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index db5327dfcaaa4ac767466f6abeec30c50d32db73..679c94142eac06ec0bc6f3b819ee4f7e831c4626 100644 +index 47cd1b3b5f7a74dcff147a744420c622ec750e7a..39cf21effb3ffd1230c5874c5a95771d8e6a42c9 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -545,7 +545,19 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -56,10 +56,10 @@ index db5327dfcaaa4ac767466f6abeec30c50d32db73..679c94142eac06ec0bc6f3b819ee4f7e } } diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index e813588e03234e4b12b531cd77f725f7d7f9c50c..b20e92a6232b96521f8d5dd7a289007e98863b9e 100644 +index 800e12ac2ca850fbd4e2a7df84295ceff758fdac..270720ac00b0dc4ccbe08b789728dd09d0a9f1e3 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -850,8 +850,9 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -849,8 +849,9 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); MinecraftServer.LOGGER.error(msg, var6); getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, var6))); // Paper - ServerExceptionEvent diff --git a/leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch index 32a8cfd6..e9ee5113 100644 --- a/leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch +++ b/leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 40c96dbcc88d796eff3d4f50d6ab17cd2d290515..d4970da01b03f72f3e5331ef090e4dc672f698d5 100644 +index 976525a885cf6422f8a40e92d594eef312c159bd..8c3255661221f8afbccb661bec3afb47e4059403 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -40,6 +40,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -85,7 +85,7 @@ index 40c96dbcc88d796eff3d4f50d6ab17cd2d290515..d4970da01b03f72f3e5331ef090e4dc6 } @Override -@@ -236,6 +251,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -240,6 +255,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings // This should effectively place the keepalive handling back to "as it was" before 1.12.2 final long elapsedTime = millis - this.keepAliveTime; @@ -107,7 +107,7 @@ index 40c96dbcc88d796eff3d4f50d6ab17cd2d290515..d4970da01b03f72f3e5331ef090e4dc6 if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // use vanilla's 15000L between keep alive packets if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected -@@ -249,6 +279,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -253,6 +283,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge)); } } diff --git a/leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch b/leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch index 6efff1de..7b804e6c 100644 --- a/leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4973de0813f07d657a1e7b1930af7ab583a39f65..f86ed0bb010459b65ac616af2cec0b09b2596521 100644 +index 44ba108f99aa983d869ff87f95bb48867a83d392..7bb5d545155c2ffa7828488bc8b61c395fc17461 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -2040,12 +2040,18 @@ public class ServerPlayer extends Player { +@@ -2044,12 +2044,18 @@ public class ServerPlayer extends Player { @Override public void crit(Entity entityHit) { diff --git a/leaf-server/paper-patches/features/0001-Rebrand.patch b/leaf-server/paper-patches/features/0001-Rebrand.patch index 6ecaf4af..046c14ff 100644 --- a/leaf-server/paper-patches/features/0001-Rebrand.patch +++ b/leaf-server/paper-patches/features/0001-Rebrand.patch @@ -429,10 +429,10 @@ index 1354ccfbf525e5e64483ac5f443cc2325ba63850..f6f787db016f4d1ac14648ebf2b8e162 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 41b2026c87dea247d39c73b0e3eae892fb729cd5..498a642d243925eefa11d5997dc999bb9aa2fcda 100644 +index d8b138d03d20a1ff5af902bc977f900fb2a43a71..e90a8069c71725e4501cf407e7520064ecdfe5d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -479,7 +479,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/leaf-server/paper-patches/features/0006-Set-Gale-permissions-root.patch b/leaf-server/paper-patches/features/0005-Set-Gale-permissions-root.patch similarity index 100% rename from leaf-server/paper-patches/features/0006-Set-Gale-permissions-root.patch rename to leaf-server/paper-patches/features/0005-Set-Gale-permissions-root.patch diff --git a/leaf-server/paper-patches/features/0007-Leaf-Bootstrap.patch b/leaf-server/paper-patches/features/0006-Leaf-Bootstrap.patch similarity index 100% rename from leaf-server/paper-patches/features/0007-Leaf-Bootstrap.patch rename to leaf-server/paper-patches/features/0006-Leaf-Bootstrap.patch diff --git a/leaf-server/paper-patches/features/0008-Leaf-Commands.patch b/leaf-server/paper-patches/features/0007-Leaf-Commands.patch similarity index 100% rename from leaf-server/paper-patches/features/0008-Leaf-Commands.patch rename to leaf-server/paper-patches/features/0007-Leaf-Commands.patch diff --git a/leaf-server/paper-patches/features/0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/leaf-server/paper-patches/features/0008-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from leaf-server/paper-patches/features/0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to leaf-server/paper-patches/features/0008-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/leaf-server/paper-patches/features/0010-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/leaf-server/paper-patches/features/0009-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 93% rename from leaf-server/paper-patches/features/0010-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to leaf-server/paper-patches/features/0009-Print-stack-trace-for-plugins-not-shutting-down-task.patch index 2a48f919..af7a221b 100644 --- a/leaf-server/paper-patches/features/0010-Print-stack-trace-for-plugins-not-shutting-down-task.patch +++ b/leaf-server/paper-patches/features/0009-Print-stack-trace-for-plugins-not-shutting-down-task.patch @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2675f1a11a8a7f27a1b7151d88e2fb1e45fc659d..e2e7e09ca154ca1ccf38bb97c03caadef5048541 100644 +index 63dd549a4560febb44d5b5dd7aed29a1f962403a..0a84d8cbdcd3513a83487a22ba81dc9e0535fc1b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1159,6 +1159,13 @@ public final class CraftServer implements Server { +@@ -1158,6 +1158,13 @@ public final class CraftServer implements Server { plugin.getPluginMeta().getDisplayName(), "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies." )); diff --git a/leaf-server/paper-patches/features/0011-SIMD-support.patch b/leaf-server/paper-patches/features/0010-SIMD-support.patch similarity index 100% rename from leaf-server/paper-patches/features/0011-SIMD-support.patch rename to leaf-server/paper-patches/features/0010-SIMD-support.patch diff --git a/leaf-server/paper-patches/features/0012-Make-book-writing-configurable.patch b/leaf-server/paper-patches/features/0011-Make-book-writing-configurable.patch similarity index 100% rename from leaf-server/paper-patches/features/0012-Make-book-writing-configurable.patch rename to leaf-server/paper-patches/features/0011-Make-book-writing-configurable.patch diff --git a/leaf-server/paper-patches/features/0013-Optimize-entity-coordinate-key.patch b/leaf-server/paper-patches/features/0012-Optimize-entity-coordinate-key.patch similarity index 100% rename from leaf-server/paper-patches/features/0013-Optimize-entity-coordinate-key.patch rename to leaf-server/paper-patches/features/0012-Optimize-entity-coordinate-key.patch diff --git a/leaf-server/paper-patches/features/0014-Do-not-log-legacy-Material-initialization.patch b/leaf-server/paper-patches/features/0013-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from leaf-server/paper-patches/features/0014-Do-not-log-legacy-Material-initialization.patch rename to leaf-server/paper-patches/features/0013-Do-not-log-legacy-Material-initialization.patch diff --git a/leaf-server/paper-patches/features/0015-Do-not-log-Not-Secure-marker.patch b/leaf-server/paper-patches/features/0014-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from leaf-server/paper-patches/features/0015-Do-not-log-Not-Secure-marker.patch rename to leaf-server/paper-patches/features/0014-Do-not-log-Not-Secure-marker.patch diff --git a/leaf-server/paper-patches/features/0016-Reduce-array-allocations.patch b/leaf-server/paper-patches/features/0015-Reduce-array-allocations.patch similarity index 100% rename from leaf-server/paper-patches/features/0016-Reduce-array-allocations.patch rename to leaf-server/paper-patches/features/0015-Reduce-array-allocations.patch diff --git a/leaf-server/paper-patches/features/0017-CraftBukkit-UUID-to-world-map.patch b/leaf-server/paper-patches/features/0016-CraftBukkit-UUID-to-world-map.patch similarity index 90% rename from leaf-server/paper-patches/features/0017-CraftBukkit-UUID-to-world-map.patch rename to leaf-server/paper-patches/features/0016-CraftBukkit-UUID-to-world-map.patch index 87fe7e6a..0e4094bd 100644 --- a/leaf-server/paper-patches/features/0017-CraftBukkit-UUID-to-world-map.patch +++ b/leaf-server/paper-patches/features/0016-CraftBukkit-UUID-to-world-map.patch @@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e2e7e09ca154ca1ccf38bb97c03caadef5048541..5b210cbcc8f889ecfe8e6b9dc924876855c2feb9 100644 +index 0a84d8cbdcd3513a83487a22ba81dc9e0535fc1b..45296a3d27ecd70375ea17c1375d05c70f10f9d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -282,6 +282,7 @@ public final class CraftServer implements Server { @@ -24,7 +24,7 @@ index e2e7e09ca154ca1ccf38bb97c03caadef5048541..5b210cbcc8f889ecfe8e6b9dc9248768 private YamlConfiguration configuration; private YamlConfiguration commandsConfiguration; private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions())); -@@ -1487,6 +1488,7 @@ public final class CraftServer implements Server { +@@ -1486,6 +1487,7 @@ public final class CraftServer implements Server { this.getLogger().log(Level.SEVERE, null, ex); } @@ -32,7 +32,7 @@ index e2e7e09ca154ca1ccf38bb97c03caadef5048541..5b210cbcc8f889ecfe8e6b9dc9248768 this.worlds.remove(world.getName().toLowerCase(Locale.ROOT)); this.console.removeLevel(handle); return true; -@@ -1505,12 +1507,7 @@ public final class CraftServer implements Server { +@@ -1504,12 +1506,7 @@ public final class CraftServer implements Server { @Override public World getWorld(UUID uid) { @@ -46,7 +46,7 @@ index e2e7e09ca154ca1ccf38bb97c03caadef5048541..5b210cbcc8f889ecfe8e6b9dc9248768 } @Override -@@ -1526,6 +1523,7 @@ public final class CraftServer implements Server { +@@ -1525,6 +1522,7 @@ public final class CraftServer implements Server { System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world."); return; } diff --git a/leaf-server/paper-patches/features/0018-Specific-interval-TPS-API.patch b/leaf-server/paper-patches/features/0017-Specific-interval-TPS-API.patch similarity index 89% rename from leaf-server/paper-patches/features/0018-Specific-interval-TPS-API.patch rename to leaf-server/paper-patches/features/0017-Specific-interval-TPS-API.patch index f715dd1a..6d2c51e7 100644 --- a/leaf-server/paper-patches/features/0018-Specific-interval-TPS-API.patch +++ b/leaf-server/paper-patches/features/0017-Specific-interval-TPS-API.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5b210cbcc8f889ecfe8e6b9dc924876855c2feb9..a913beb575cf9bb9c614bae48432f16d33a891bd 100644 +index 45296a3d27ecd70375ea17c1375d05c70f10f9d2..e10e540e5a24552167ab066146cbd0eaead6dc9e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2995,6 +2995,23 @@ public final class CraftServer implements Server { +@@ -2994,6 +2994,23 @@ public final class CraftServer implements Server { }; } diff --git a/leaf-server/paper-patches/features/0019-5-second-TPS-average.patch b/leaf-server/paper-patches/features/0018-5-second-TPS-average.patch similarity index 97% rename from leaf-server/paper-patches/features/0019-5-second-TPS-average.patch rename to leaf-server/paper-patches/features/0018-5-second-TPS-average.patch index c9531579..b089721a 100644 --- a/leaf-server/paper-patches/features/0019-5-second-TPS-average.patch +++ b/leaf-server/paper-patches/features/0018-5-second-TPS-average.patch @@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a913beb575cf9bb9c614bae48432f16d33a891bd..b7175131c81036a244b9274252d11b009e4d31bb 100644 +index e10e540e5a24552167ab066146cbd0eaead6dc9e..aa7bc955f53cea93d9409653ad1263c3c0a0888d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2995,7 +2995,26 @@ public final class CraftServer implements Server { +@@ -2994,7 +2994,26 @@ public final class CraftServer implements Server { }; } diff --git a/leaf-server/paper-patches/features/0020-Last-tick-time-API.patch b/leaf-server/paper-patches/features/0019-Last-tick-time-API.patch similarity index 93% rename from leaf-server/paper-patches/features/0020-Last-tick-time-API.patch rename to leaf-server/paper-patches/features/0019-Last-tick-time-API.patch index 74e31506..dd626769 100644 --- a/leaf-server/paper-patches/features/0020-Last-tick-time-API.patch +++ b/leaf-server/paper-patches/features/0019-Last-tick-time-API.patch @@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b7175131c81036a244b9274252d11b009e4d31bb..d8cfddc1641868692e045bc13bac61a21c64ffcc 100644 +index aa7bc955f53cea93d9409653ad1263c3c0a0888d..704b5fd8c10cdc5363f59fbd878d9453926d91c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3232,4 +3232,21 @@ public final class CraftServer implements Server { +@@ -3231,4 +3231,21 @@ public final class CraftServer implements Server { public void allowPausing(final Plugin plugin, final boolean value) { this.console.addPluginAllowingSleep(plugin.getName(), value); } diff --git a/leaf-server/paper-patches/features/0021-Show-last-tick-time-in-tps-command.patch b/leaf-server/paper-patches/features/0020-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from leaf-server/paper-patches/features/0021-Show-last-tick-time-in-tps-command.patch rename to leaf-server/paper-patches/features/0020-Show-last-tick-time-in-tps-command.patch diff --git a/leaf-server/paper-patches/features/0022-Pre-compute-VarLong-sizes.patch b/leaf-server/paper-patches/features/0021-Pre-compute-VarLong-sizes.patch similarity index 100% rename from leaf-server/paper-patches/features/0022-Pre-compute-VarLong-sizes.patch rename to leaf-server/paper-patches/features/0021-Pre-compute-VarLong-sizes.patch diff --git a/leaf-server/paper-patches/features/0023-Optimize-VarInt-write-and-VarLong-write.patch b/leaf-server/paper-patches/features/0022-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from leaf-server/paper-patches/features/0023-Optimize-VarInt-write-and-VarLong-write.patch rename to leaf-server/paper-patches/features/0022-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/leaf-server/paper-patches/features/0024-Virtual-thread-support.patch b/leaf-server/paper-patches/features/0023-Virtual-thread-support.patch similarity index 100% rename from leaf-server/paper-patches/features/0024-Virtual-thread-support.patch rename to leaf-server/paper-patches/features/0023-Virtual-thread-support.patch