diff --git a/patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch b/patches/server/0058-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch similarity index 93% rename from patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch rename to patches/server/0058-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch index 3c67595c..d802d82d 100644 --- a/patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch +++ b/patches/server/0058-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch @@ -1,7 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> -Date: Tue, 9 Nov 2077 00:00:00 +0800 -Subject: [PATCH] SparklyPaper Throttle hopper when full +From: MrPowerGamerBR +Date: Fri, 23 Aug 2024 16:20:45 -0300 +Subject: [PATCH] SparklyPaper: Allow throttling hopper checks if the target + container is full Original project: https://github.com/SparklyPower/SparklyPaper diff --git a/patches/server/0073-Including-5s-in-getTPS.patch b/patches/server/0072-Including-5s-in-getTPS.patch similarity index 100% rename from patches/server/0073-Including-5s-in-getTPS.patch rename to patches/server/0072-Including-5s-in-getTPS.patch diff --git a/patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0073-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to patches/server/0073-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0074-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to patches/server/0074-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/patches/server/0076-Improve-Purpur-AFK-system.patch b/patches/server/0075-Improve-Purpur-AFK-system.patch similarity index 100% rename from patches/server/0076-Improve-Purpur-AFK-system.patch rename to patches/server/0075-Improve-Purpur-AFK-system.patch diff --git a/patches/server/0077-Virtual-Thread-for-async-scheduler.patch b/patches/server/0076-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from patches/server/0077-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0076-Virtual-Thread-for-async-scheduler.patch diff --git a/patches/server/0131-Virtual-thread-for-chat-executor.patch b/patches/server/0077-Virtual-thread-for-chat-executor.patch similarity index 94% rename from patches/server/0131-Virtual-thread-for-chat-executor.patch rename to patches/server/0077-Virtual-thread-for-chat-executor.patch index 1bf8eb0d..bb8dbcee 100644 --- a/patches/server/0131-Virtual-thread-for-chat-executor.patch +++ b/patches/server/0077-Virtual-thread-for-chat-executor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Virtual thread for chat executor diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8607a7d6c270bc8513671f0ecb6b63afa4aaefb0..9dce5c34f67799285ee395a9c5d0db5ee6319536 100644 +index a6d6e3ad434420223178f813953d9c53db26034a..2445d549fbf972620f2cc13860f826562ff3f4d0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2893,7 +2893,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> + diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java index 9ebe1f1797b5be562bc4f6d92b9a4d6022ca2151..dcfcf20ded591cf450b38b9e5ae30ed372afb8db 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java diff --git a/patches/server/0106-Replace-brain-maps-with-optimized-collection.patch b/patches/server/0105-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from patches/server/0106-Replace-brain-maps-with-optimized-collection.patch rename to patches/server/0105-Replace-brain-maps-with-optimized-collection.patch diff --git a/patches/server/0105-Reduce-worldgen-allocations.patch b/patches/server/0106-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0105-Reduce-worldgen-allocations.patch rename to patches/server/0106-Reduce-worldgen-allocations.patch diff --git a/patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 100% rename from patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch diff --git a/patches/server/0109-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0108-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0109-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0108-Do-not-place-player-if-the-server-is-full.patch diff --git a/patches/server/0072-Fix-MC-65198.patch b/patches/server/0109-Fix-MC-65198.patch similarity index 100% rename from patches/server/0072-Fix-MC-65198.patch rename to patches/server/0109-Fix-MC-65198.patch diff --git a/patches/server/0107-Fix-MC-183518.patch b/patches/server/0110-Fix-MC-183518.patch similarity index 96% rename from patches/server/0107-Fix-MC-183518.patch rename to patches/server/0110-Fix-MC-183518.patch index 78f279b6..6645056e 100644 --- a/patches/server/0107-Fix-MC-183518.patch +++ b/patches/server/0110-Fix-MC-183518.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix-MC-183518 Related MC issue: https://bugs.mojang.com/browse/MC-183518 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a6d6e3ad434420223178f813953d9c53db26034a..8607a7d6c270bc8513671f0ecb6b63afa4aaefb0 100644 +index 2445d549fbf972620f2cc13860f826562ff3f4d0..9dce5c34f67799285ee395a9c5d0db5ee6319536 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Co-authored-by: Kevin Raneri +Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> This patch refactored from original multithreaded tracker (Petal version), and is derived from the Airplane fork by Paul Sauve, the tree is like: diff --git a/patches/server/0124-Nitori-Async-playerdata-Save.patch b/patches/server/0126-Nitori-Async-playerdata-Save.patch similarity index 100% rename from patches/server/0124-Nitori-Async-playerdata-Save.patch rename to patches/server/0126-Nitori-Async-playerdata-Save.patch diff --git a/patches/server/0125-Change-max-stack-count.patch b/patches/server/0127-Change-max-stack-count.patch similarity index 100% rename from patches/server/0125-Change-max-stack-count.patch rename to patches/server/0127-Change-max-stack-count.patch diff --git a/patches/server/0126-Reduce-object-complexity-to-make-block-isValid-calls.patch b/patches/server/0128-Reduce-object-complexity-to-make-block-isValid-calls.patch similarity index 100% rename from patches/server/0126-Reduce-object-complexity-to-make-block-isValid-calls.patch rename to patches/server/0128-Reduce-object-complexity-to-make-block-isValid-calls.patch diff --git a/patches/server/0127-Optimize-nearby-alive-players-for-spawning.patch b/patches/server/0129-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from patches/server/0127-Optimize-nearby-alive-players-for-spawning.patch rename to patches/server/0129-Optimize-nearby-alive-players-for-spawning.patch diff --git a/patches/server/0128-Cache-blockstate-cache.patch b/patches/server/0130-Cache-blockstate-cache.patch similarity index 100% rename from patches/server/0128-Cache-blockstate-cache.patch rename to patches/server/0130-Cache-blockstate-cache.patch diff --git a/patches/server/0130-Asynchronous-locator.patch b/patches/server/0131-Asynchronous-locator.patch similarity index 99% rename from patches/server/0130-Asynchronous-locator.patch rename to patches/server/0131-Asynchronous-locator.patch index f1f0f5e7..c6177783 100644 --- a/patches/server/0130-Asynchronous-locator.patch +++ b/patches/server/0131-Asynchronous-locator.patch @@ -3,7 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Wed, 23 Oct 2024 23:54:00 +0800 Subject: [PATCH] Asynchronous locator -This patch was ported from project: https://github.com/thebrightspark/AsyncLocator +Original license: MIT +Original project: https://github.com/thebrightspark/AsyncLocator diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java index 11b7f15755dde766140c29bedca456c80d53293f..749d00449ac3f3c79bfc73a5517ea3a07675e447 100644 diff --git a/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch index 0a4afdc9..a351a66d 100644 --- a/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch +++ b/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch @@ -3,6 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Tue, 9 Nov 2077 00:00:00 +0800 Subject: [PATCH] Smart sort entities in NearestLivingEntitySensor +Co-authored-by: Taiyou06 + This patch optimizes sorting algorithm by dynamically sorting based on entity count, if entity count doesn't reach the Bucket Sort threshold, Quick Sort of Fastutil will be used. diff --git a/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch index 449eb36c..f9486173 100644 --- a/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch +++ b/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch @@ -3,7 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Sat, 26 Oct 2024 22:38:30 +0800 Subject: [PATCH] Further reduce memory footprint of CompoundTag -Ported from project: https://github.com/embeddedt/ModernFix +Original license: GPLv3 +Original project: https://github.com/embeddedt/ModernFix diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java index ea48637234fdb1e5f54342590def30e11b6a5df0..a7a5e1c70d1e4f7df6533d0531a200fe50b38b7a 100644 diff --git a/patches/server/0138-TT20-Lag-compensation.patch b/patches/server/0138-TT20-Lag-compensation.patch index 51c9fe4b..c60f413d 100644 --- a/patches/server/0138-TT20-Lag-compensation.patch +++ b/patches/server/0138-TT20-Lag-compensation.patch @@ -3,8 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Mon, 1 Nov 2077 00:00:00 +0800 Subject: [PATCH] TT20 Lag compensation -This patch was ported from project: https://github.com/snackbag/TT20 -Project license: AGPL-3.0 +Original license: AGPL-3.0 +Original project: https://github.com/snackbag/TT20 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 9dce5c34f67799285ee395a9c5d0db5ee6319536..6b9b3d366343a0bef76036b2b150691787f93db6 100644