diff --git a/patches/server/0004-Use-default-Java-installation-for-development-runs.patch b/patches/server/0004-Use-default-Java-installation-for-development-runs.patch new file mode 100644 index 0000000..d489756 --- /dev/null +++ b/patches/server/0004-Use-default-Java-installation-for-development-runs.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Mon, 13 Feb 2023 20:59:49 +0100 +Subject: [PATCH] Use default Java installation for development runs + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Gale - https://galemc.org + +diff --git a/build.gradle.kts b/build.gradle.kts +index e8187f4b88f89eee3fd675bbfdfb78534769c63f..9f42ad14bd477a265f0c7f1fda5bc39a69970ed7 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -149,6 +149,15 @@ fun TaskContainer.registerRunTask( + name: String, + block: JavaExec.() -> Unit + ): TaskProvider = register(name) { ++ // Gale start - use default Java installation for development runs ++ java { ++ toolchain { ++ languageVersion.set(JavaLanguageVersion.of(System.getProperty("java.version").run { ++ substring(0, indexOf('.')).toInt().coerceAtLeast(17) ++ })) ++ } ++ } ++ // Gale end - use default Java installation for development runs + group = "paper" + mainClass.set("org.bukkit.craftbukkit.Main") + standardInput = System.`in` diff --git a/patches/server/0005-Enable-virtual-threads-for-development-runs.patch b/patches/server/0005-Enable-virtual-threads-for-development-runs.patch new file mode 100644 index 0000000..73a2c48 --- /dev/null +++ b/patches/server/0005-Enable-virtual-threads-for-development-runs.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Mon, 13 Feb 2023 21:18:44 +0100 +Subject: [PATCH] Enable virtual threads for development runs + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Gale - https://galemc.org + +diff --git a/build.gradle.kts b/build.gradle.kts +index 9f42ad14bd477a265f0c7f1fda5bc39a69970ed7..bfcdae815faa1fc326b80fb317d3046bd05b85f5 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -181,6 +181,10 @@ fun TaskContainer.registerRunTask( + val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2") + val modifiedJvmArgs = jvmArgs ?: arrayListOf() + modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G")) ++ // Gale start - enable virtual threads for development runs ++ modifiedJvmArgs.add("--enable-preview") ++ modifiedJvmArgs.addAll(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED")) ++ // Gale end - enable virtual threads for development runs + jvmArgs = modifiedJvmArgs + + doFirst { diff --git a/patches/server/0004-Gale-branding-changes.patch b/patches/server/0006-Gale-branding-changes.patch similarity index 99% rename from patches/server/0004-Gale-branding-changes.patch rename to patches/server/0006-Gale-branding-changes.patch index c10e608..3615f54 100644 --- a/patches/server/0004-Gale-branding-changes.patch +++ b/patches/server/0006-Gale-branding-changes.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/build.gradle.kts b/build.gradle.kts -index 977edc4adb5414e83d289cca295baa6bfbadaa52..ebe3f85542004002713dd327e8a423f2570695ed 100644 +index bfcdae815faa1fc326b80fb317d3046bd05b85f5..0bdb5eeebde6aa8a7d0b3d8dd29ea93f2db859bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,7 +77,7 @@ tasks.jar { @@ -244,7 +244,7 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..3997a7fec43e05b455644b4d58c68995 // (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 17336102d37a5ab05c3b3c93fcf46961d0ffa7e2..f5a7bbf467ce765ecf8ccc9e157bd51bbed72452 100644 +index daeaa30cdd64f5cb775304e82f2390684c02a9d3..58397008c783c6802f846110ee405bb5f8ba2851 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0005-Gale-metrics.patch b/patches/server/0007-Gale-metrics.patch similarity index 100% rename from patches/server/0005-Gale-metrics.patch rename to patches/server/0007-Gale-metrics.patch diff --git a/patches/server/0006-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch similarity index 99% rename from patches/server/0006-Gale-configuration.patch rename to patches/server/0008-Gale-configuration.patch index bf74abe..73305bb 100644 --- a/patches/server/0006-Gale-configuration.patch +++ b/patches/server/0008-Gale-configuration.patch @@ -323,7 +323,7 @@ index ef6ff78af2ae747e939895b82ee9d11c75012dcd..b445d4562304fec912131ee32c4e0f89 } } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 51b3db0b6c2cede95b584268e035c0fb36d38094..98f00bdc85ade95ccbfaa1999c70ac650192345d 100644 +index a7e133f3495e9132a5fdae2c24f225e7b026295a..b98fb8afdadbda47db5924299d90082edf3ca1b4 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -1,20 +1,15 @@ diff --git a/patches/server/0007-Set-Gale-permissions-root.patch b/patches/server/0009-Set-Gale-permissions-root.patch similarity index 100% rename from patches/server/0007-Set-Gale-permissions-root.patch rename to patches/server/0009-Set-Gale-permissions-root.patch diff --git a/patches/server/0008-Gale-commands.patch b/patches/server/0010-Gale-commands.patch similarity index 99% rename from patches/server/0008-Gale-commands.patch rename to patches/server/0010-Gale-commands.patch index 97f8bf9..45c608e 100644 --- a/patches/server/0008-Gale-commands.patch +++ b/patches/server/0010-Gale-commands.patch @@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 98f00bdc85ade95ccbfaa1999c70ac650192345d..9c3ccbbd657d1605b8fabb6e01c11ff31f39a17e 100644 +index b98fb8afdadbda47db5924299d90082edf3ca1b4..985f1a50438b325e33fba5d07e26519171504aab 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -45,6 +45,7 @@ import net.minecraft.world.level.GameRules; diff --git a/patches/server/0009-Include-time-in-startup-logs.patch b/patches/server/0011-Include-time-in-startup-logs.patch similarity index 100% rename from patches/server/0009-Include-time-in-startup-logs.patch rename to patches/server/0011-Include-time-in-startup-logs.patch diff --git a/patches/server/0010-Include-server.properties-in-timings.patch b/patches/server/0012-Include-server.properties-in-timings.patch similarity index 100% rename from patches/server/0010-Include-server.properties-in-timings.patch rename to patches/server/0012-Include-server.properties-in-timings.patch diff --git a/patches/server/0011-Include-hardware-specs-in-timings.patch b/patches/server/0013-Include-hardware-specs-in-timings.patch similarity index 100% rename from patches/server/0011-Include-hardware-specs-in-timings.patch rename to patches/server/0013-Include-hardware-specs-in-timings.patch diff --git a/patches/server/0012-Use-timin.gs-by-default.patch b/patches/server/0014-Use-timin.gs-by-default.patch similarity index 100% rename from patches/server/0012-Use-timin.gs-by-default.patch rename to patches/server/0014-Use-timin.gs-by-default.patch diff --git a/patches/server/0013-Recommend-disabling-timings-on-startup.patch b/patches/server/0015-Recommend-disabling-timings-on-startup.patch similarity index 100% rename from patches/server/0013-Recommend-disabling-timings-on-startup.patch rename to patches/server/0015-Recommend-disabling-timings-on-startup.patch diff --git a/patches/server/0014-Make-timings-calls-final.patch b/patches/server/0016-Make-timings-calls-final.patch similarity index 100% rename from patches/server/0014-Make-timings-calls-final.patch rename to patches/server/0016-Make-timings-calls-final.patch diff --git a/patches/server/0015-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch similarity index 99% rename from patches/server/0015-Remove-vanilla-profiler.patch rename to patches/server/0017-Remove-vanilla-profiler.patch index c52c82e..981ad8b 100644 --- a/patches/server/0015-Remove-vanilla-profiler.patch +++ b/patches/server/0017-Remove-vanilla-profiler.patch @@ -811,7 +811,7 @@ index 4b1b828b72a8ddef240d005fc514ae0a54b22982..e8658ed3784444991c5a6c8f03d2a5e0 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7d6d3c8556033d289fdadc489e73fba478fce41a..a07da939bb6b2dd0bd75cc74dd79493695035259 100644 +index 9160725f031c9698a00229c3dfa19d39b4a826c1..8a548616885149fe23763b3b2cd46dc8323e5803 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1149,7 +1149,6 @@ public class ServerPlayer extends Player { @@ -840,7 +840,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..a07da939bb6b2dd0bd75cc74dd794936 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3472f7f9b98d6d9c9f6465872803ef17fa67486d..547cc76d2086a658cbf667dcd6e47227a0a26b7b 100644 +index 9b0b42add71172bd154226e51d62cebd8de3542e..c3c048ec2c8be72e0f5494f423bfafbd9b572b88 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -390,7 +390,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0017-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0017-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0018-Reduce-projectile-chunk-loading.patch b/patches/server/0020-Reduce-projectile-chunk-loading.patch similarity index 98% rename from patches/server/0018-Reduce-projectile-chunk-loading.patch rename to patches/server/0020-Reduce-projectile-chunk-loading.patch index 93b3656..1272291 100644 --- a/patches/server/0018-Reduce-projectile-chunk-loading.patch +++ b/patches/server/0020-Reduce-projectile-chunk-loading.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/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 66476b33cede1e44db5ec166a0cea81f82ffe47a..9948cc4c65d5681c171b38cdf7cf3e63a01e4364 100644 +index 893975e8587b9036f622e2088c302e33004496d2..93f722537a6b479561d79ba2e980c50a324f9486 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -43,6 +43,44 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0019-Predict-Halloween.patch b/patches/server/0021-Predict-Halloween.patch similarity index 100% rename from patches/server/0019-Predict-Halloween.patch rename to patches/server/0021-Predict-Halloween.patch diff --git a/patches/server/0020-Move-random-tick-random.patch b/patches/server/0022-Move-random-tick-random.patch similarity index 100% rename from patches/server/0020-Move-random-tick-random.patch rename to patches/server/0022-Move-random-tick-random.patch diff --git a/patches/server/0021-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0021-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0022-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0022-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0023-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0023-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0024-Remove-iterators-from-Inventory-contains.patch b/patches/server/0026-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0024-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0026-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0025-Check-targeting-range-before-getting-visibility.patch b/patches/server/0027-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0025-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0027-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0026-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0026-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0027-Improve-fluid-direction-caching.patch b/patches/server/0029-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0027-Improve-fluid-direction-caching.patch rename to patches/server/0029-Improve-fluid-direction-caching.patch diff --git a/patches/server/0028-Cache-on-climbable-check.patch b/patches/server/0030-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0028-Cache-on-climbable-check.patch rename to patches/server/0030-Cache-on-climbable-check.patch diff --git a/patches/server/0029-Use-array-for-gamerule-storage.patch b/patches/server/0031-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0029-Use-array-for-gamerule-storage.patch rename to patches/server/0031-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0031-Improve-container-checking-with-a-bitset.patch b/patches/server/0033-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0031-Improve-container-checking-with-a-bitset.patch rename to patches/server/0033-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0032-Better-checking-for-useless-move-packets.patch b/patches/server/0034-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0032-Better-checking-for-useless-move-packets.patch rename to patches/server/0034-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0033-Use-fast-item-merge-raytracing.patch b/patches/server/0035-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0033-Use-fast-item-merge-raytracing.patch rename to patches/server/0035-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0034-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0036-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0034-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0036-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0035-Inline-level-height.patch b/patches/server/0037-Inline-level-height.patch similarity index 100% rename from patches/server/0035-Inline-level-height.patch rename to patches/server/0037-Inline-level-height.patch diff --git a/patches/server/0036-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0036-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0037-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0037-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0039-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0038-Remove-streams-from-getting-nearby-players.patch b/patches/server/0040-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0038-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0040-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0039-Skip-cloning-loot-parameters.patch b/patches/server/0041-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0039-Skip-cloning-loot-parameters.patch rename to patches/server/0041-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0040-Block-goal-does-not-load-chunks.patch b/patches/server/0042-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0040-Block-goal-does-not-load-chunks.patch rename to patches/server/0042-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0041-Reduce-entity-allocations.patch b/patches/server/0043-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0041-Reduce-entity-allocations.patch rename to patches/server/0043-Reduce-entity-allocations.patch diff --git a/patches/server/0042-Remove-lambda-from-ticking-guard.patch b/patches/server/0044-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0042-Remove-lambda-from-ticking-guard.patch rename to patches/server/0044-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0045-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0045-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0044-SIMD-support.patch b/patches/server/0046-SIMD-support.patch similarity index 90% rename from patches/server/0044-SIMD-support.patch rename to patches/server/0046-SIMD-support.patch index bbb7022..ea673ab 100644 --- a/patches/server/0044-SIMD-support.patch +++ b/patches/server/0046-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/build.gradle.kts b/build.gradle.kts -index 01780a73ee9cc602951bdf568c17673c4c639f79..00508c2b7a0aa9ecdd0c8709a559f26de17a0004 100644 +index 0bdb5eeebde6aa8a7d0b3d8dd29ea93f2db859bb..22864c8810bacd23b3ebaedce1c87f1441873184 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -62,6 +62,7 @@ tasks.withType { @@ -24,16 +24,16 @@ index 01780a73ee9cc602951bdf568c17673c4c639f79..00508c2b7a0aa9ecdd0c8709a559f26d } // Gale end - hide irrelevant compilation warnings -@@ -172,6 +173,7 @@ fun TaskContainer.registerRunTask( - val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2") - val modifiedJvmArgs = jvmArgs ?: arrayListOf() - modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G")) +@@ -185,6 +186,7 @@ fun TaskContainer.registerRunTask( + modifiedJvmArgs.add("--enable-preview") + modifiedJvmArgs.addAll(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED")) + // Gale end - enable virtual threads for development runs + modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support jvmArgs = modifiedJvmArgs doFirst { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 9c3ccbbd657d1605b8fabb6e01c11ff31f39a17e..20ae254b1cd3d75781d1ea4b9859bf0ef92f173d 100644 +index 985f1a50438b325e33fba5d07e26519171504aab..54458601bbda3a4142c09f717e3b87a079ce096f 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -14,6 +14,8 @@ import java.util.Locale; diff --git a/patches/server/0045-Make-book-writing-configurable.patch b/patches/server/0047-Make-book-writing-configurable.patch similarity index 98% rename from patches/server/0045-Make-book-writing-configurable.patch rename to patches/server/0047-Make-book-writing-configurable.patch index cd30c6d..433f7dd 100644 --- a/patches/server/0045-Make-book-writing-configurable.patch +++ b/patches/server/0047-Make-book-writing-configurable.patch @@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 547cc76d2086a658cbf667dcd6e47227a0a26b7b..92fc01fb38130fc9c77e47e4b1db99f892d5459f 100644 +index c3c048ec2c8be72e0f5494f423bfafbd9b572b88..d3ada447bc1e83627b112886ed229bb2b50bd1f1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3; diff --git a/patches/server/0046-Optimize-entity-coordinate-key.patch b/patches/server/0048-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0046-Optimize-entity-coordinate-key.patch rename to patches/server/0048-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0047-Reduce-in-wall-checks.patch b/patches/server/0049-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0047-Reduce-in-wall-checks.patch rename to patches/server/0049-Reduce-in-wall-checks.patch diff --git a/patches/server/0048-Make-chat-order-verification-configurable.patch b/patches/server/0050-Make-chat-order-verification-configurable.patch similarity index 96% rename from patches/server/0048-Make-chat-order-verification-configurable.patch rename to patches/server/0050-Make-chat-order-verification-configurable.patch index e3d594d..e10c101 100644 --- a/patches/server/0048-Make-chat-order-verification-configurable.patch +++ b/patches/server/0050-Make-chat-order-verification-configurable.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 92fc01fb38130fc9c77e47e4b1db99f892d5459f..dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6 100644 +index d3ada447bc1e83627b112886ed229bb2b50bd1f1..619b5572b06e663824e38eaf29b477e8f9f86dda 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2357,6 +2357,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0049-Make-saving-fireworks-configurable.patch b/patches/server/0051-Make-saving-fireworks-configurable.patch similarity index 100% rename from patches/server/0049-Make-saving-fireworks-configurable.patch rename to patches/server/0051-Make-saving-fireworks-configurable.patch diff --git a/patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0051-Reduce-hopper-item-checks.patch b/patches/server/0053-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0051-Reduce-hopper-item-checks.patch rename to patches/server/0053-Reduce-hopper-item-checks.patch diff --git a/patches/server/0052-Reduce-villager-item-re-pickup.patch b/patches/server/0054-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0052-Reduce-villager-item-re-pickup.patch rename to patches/server/0054-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0055-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 94% rename from patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0055-Do-not-process-chat-commands-before-player-has-joine.patch index 3276530..530d88d 100644 --- a/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/patches/server/0055-Do-not-process-chat-commands-before-player-has-joine.patch @@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d746a97f5 100644 +index 8a548616885149fe23763b3b2cd46dc8323e5803..c5984ad4d12fec9310156a7b7c7beddd3dc0ba57 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -261,6 +261,7 @@ public class ServerPlayer extends Player { @@ -25,7 +25,7 @@ index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d // CraftBukkit end public boolean isRealPlayer; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6..16a8e3819258e3e42ade5f237e473765b3f8b3c7 100644 +index 619b5572b06e663824e38eaf29b477e8f9f86dda..8d14c710dbae635f0bf2c359ba1b2c144c95f536 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2333,6 +2333,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0054-Do-not-log-invalid-statistics.patch b/patches/server/0056-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0054-Do-not-log-invalid-statistics.patch rename to patches/server/0056-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0055-Do-not-log-empty-message-warnings.patch b/patches/server/0057-Do-not-log-empty-message-warnings.patch similarity index 96% rename from patches/server/0055-Do-not-log-empty-message-warnings.patch rename to patches/server/0057-Do-not-log-empty-message-warnings.patch index 5bca05c..7b622b3 100644 --- a/patches/server/0055-Do-not-log-empty-message-warnings.patch +++ b/patches/server/0057-Do-not-log-empty-message-warnings.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 16a8e3819258e3e42ade5f237e473765b3f8b3c7..d2a09822104c954f06f64ad2a63012e433088169 100644 +index 8d14c710dbae635f0bf2c359ba1b2c144c95f536..ffaebc09f523d9400ed13eded9f0c39ac650ba22 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -183,6 +183,7 @@ import net.minecraft.world.phys.shapes.BooleanOp; diff --git a/patches/server/0056-Do-not-log-ignored-advancements.patch b/patches/server/0058-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0056-Do-not-log-ignored-advancements.patch rename to patches/server/0058-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0059-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0059-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0058-Do-not-log-unrecognized-recipes.patch b/patches/server/0060-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0058-Do-not-log-unrecognized-recipes.patch rename to patches/server/0060-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0059-Do-not-log-legacy-Material-initialization.patch b/patches/server/0061-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0059-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0061-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0060-Do-not-log-expired-message-warnings.patch b/patches/server/0062-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0060-Do-not-log-expired-message-warnings.patch rename to patches/server/0062-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0061-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0063-Do-not-log-out-of-order-message-warnings.patch similarity index 96% rename from patches/server/0061-Do-not-log-out-of-order-message-warnings.patch rename to patches/server/0063-Do-not-log-out-of-order-message-warnings.patch index 216cdf6..a1c84b8 100644 --- a/patches/server/0061-Do-not-log-out-of-order-message-warnings.patch +++ b/patches/server/0063-Do-not-log-out-of-order-message-warnings.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d2a09822104c954f06f64ad2a63012e433088169..8d9e2573c6d9597699e74f19989dcde600a5fb61 100644 +index ffaebc09f523d9400ed13eded9f0c39ac650ba22..8d537d9822fd88ec92acf57cf76e903678a12301 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2326,7 +2326,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0062-Do-not-log-Not-Secure-marker.patch b/patches/server/0064-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0062-Do-not-log-Not-Secure-marker.patch rename to patches/server/0064-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0063-Do-not-log-run-as-root-warning.patch b/patches/server/0065-Do-not-log-run-as-root-warning.patch similarity index 96% rename from patches/server/0063-Do-not-log-run-as-root-warning.patch rename to patches/server/0065-Do-not-log-run-as-root-warning.patch index d3de337..e6af218 100644 --- a/patches/server/0063-Do-not-log-run-as-root-warning.patch +++ b/patches/server/0065-Do-not-log-run-as-root-warning.patch @@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 1d1db89362b78ac34d46cdd71b9ab27404b98e48..9302502f59243fa254c88a7a8d513a2a65c17979 100644 +index 54458601bbda3a4142c09f717e3b87a079ce096f..afdd597c63703cca87b277f0b66786cd8f3bf9aa 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -179,7 +179,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0064-Do-not-log-offline-mode-warning.patch b/patches/server/0066-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0064-Do-not-log-offline-mode-warning.patch rename to patches/server/0066-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0065-Softly-log-invalid-pool-element-errors.patch b/patches/server/0067-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0065-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0067-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0066-Fix-legacy-colors-in-console.patch b/patches/server/0068-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0066-Fix-legacy-colors-in-console.patch rename to patches/server/0068-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0069-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0069-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0068-Make-sand-duping-fix-configurable.patch b/patches/server/0070-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0068-Make-sand-duping-fix-configurable.patch rename to patches/server/0070-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0069-Fix-MC-238526.patch b/patches/server/0071-Fix-MC-238526.patch similarity index 100% rename from patches/server/0069-Fix-MC-238526.patch rename to patches/server/0071-Fix-MC-238526.patch diff --git a/patches/server/0070-Fix-MC-123848.patch b/patches/server/0072-Fix-MC-123848.patch similarity index 100% rename from patches/server/0070-Fix-MC-123848.patch rename to patches/server/0072-Fix-MC-123848.patch diff --git a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0073-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0073-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0072-Fix-MC-121706.patch b/patches/server/0074-Fix-MC-121706.patch similarity index 100% rename from patches/server/0072-Fix-MC-121706.patch rename to patches/server/0074-Fix-MC-121706.patch diff --git a/patches/server/0073-Fix-MC-110386.patch b/patches/server/0075-Fix-MC-110386.patch similarity index 100% rename from patches/server/0073-Fix-MC-110386.patch rename to patches/server/0075-Fix-MC-110386.patch diff --git a/patches/server/0074-Fix-MC-31819.patch b/patches/server/0076-Fix-MC-31819.patch similarity index 96% rename from patches/server/0074-Fix-MC-31819.patch rename to patches/server/0076-Fix-MC-31819.patch index 85ec2ba..7dc66ad 100644 --- a/patches/server/0074-Fix-MC-31819.patch +++ b/patches/server/0076-Fix-MC-31819.patch @@ -19,7 +19,7 @@ the displayed hunger bar never goes down. Hunger (or any related value, includin should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 61597ebe2f9faff43994c475074b87d11905e582..e561886cb78f9455cee3607354e3c72401aba0dc 100644 +index f6e4194856d4a2710a169b5823e74da1ba2c9130..685b69df4c63ef64d62476eb90bf82ee5f87814d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1901,6 +1901,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0075-Fix-MC-26304.patch b/patches/server/0077-Fix-MC-26304.patch similarity index 100% rename from patches/server/0075-Fix-MC-26304.patch rename to patches/server/0077-Fix-MC-26304.patch diff --git a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0078-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0078-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0079-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0079-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 97% rename from patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch index d46fe7a..0ab469d 100644 --- a/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -42,7 +42,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 9788e477ff1446ad2ea3669922cc7dfc09900ce8..e615762a78dbf93584df5146939efa01a1e3bd7c 100644 +index c56bc341ebb1592af9285d5e044951e7ae2ae0b2..66ea67129bf814d1b43b7dd0f221ab3c522a9587 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0079-Make-logging-login-locations-configurable.patch b/patches/server/0081-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0079-Make-logging-login-locations-configurable.patch rename to patches/server/0081-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0080-Reduce-array-allocations.patch b/patches/server/0082-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0080-Reduce-array-allocations.patch rename to patches/server/0082-Reduce-array-allocations.patch diff --git a/patches/server/0081-Optimize-sun-burn-tick.patch b/patches/server/0083-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0081-Optimize-sun-burn-tick.patch rename to patches/server/0083-Optimize-sun-burn-tick.patch diff --git a/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0086-Replace-class-map-with-optimized-collection.patch b/patches/server/0088-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0086-Replace-class-map-with-optimized-collection.patch rename to patches/server/0088-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0090-Cache-BlockStatePairKey-hash.patch b/patches/server/0092-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0090-Cache-BlockStatePairKey-hash.patch rename to patches/server/0092-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0091-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0093-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0091-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0093-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0094-Check-frozen-ticks-before-landing-block.patch b/patches/server/0096-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0094-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0096-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0095-Faster-chunk-serialization.patch b/patches/server/0097-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0095-Faster-chunk-serialization.patch rename to patches/server/0097-Faster-chunk-serialization.patch diff --git a/patches/server/0096-Update-boss-bar-within-tick.patch b/patches/server/0098-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0096-Update-boss-bar-within-tick.patch rename to patches/server/0098-Update-boss-bar-within-tick.patch diff --git a/patches/server/0097-Cache-ominous-banner-item.patch b/patches/server/0099-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0097-Cache-ominous-banner-item.patch rename to patches/server/0099-Cache-ominous-banner-item.patch diff --git a/patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0099-Cache-world-generator-sea-level.patch b/patches/server/0101-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0099-Cache-world-generator-sea-level.patch rename to patches/server/0101-Cache-world-generator-sea-level.patch diff --git a/patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0101-Optimize-villager-data-storage.patch b/patches/server/0103-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0101-Optimize-villager-data-storage.patch rename to patches/server/0103-Optimize-villager-data-storage.patch diff --git a/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0104-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0102-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0104-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0103-Store-mob-counts-in-an-array.patch b/patches/server/0105-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0103-Store-mob-counts-in-an-array.patch rename to patches/server/0105-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0104-Use-linked-map-for-entity-trackers.patch b/patches/server/0106-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0104-Use-linked-map-for-entity-trackers.patch rename to patches/server/0106-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0105-Optimize-noise-generation.patch b/patches/server/0107-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0105-Optimize-noise-generation.patch rename to patches/server/0107-Optimize-noise-generation.patch diff --git a/patches/server/0106-Optimize-sheep-offspring-color.patch b/patches/server/0108-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0106-Optimize-sheep-offspring-color.patch rename to patches/server/0108-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0107-Ignore-durability-change-equipment-updates.patch b/patches/server/0109-Ignore-durability-change-equipment-updates.patch similarity index 97% rename from patches/server/0107-Ignore-durability-change-equipment-updates.patch rename to patches/server/0109-Ignore-durability-change-equipment-updates.patch index 4bdad95..208837a 100644 --- a/patches/server/0107-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0109-Ignore-durability-change-equipment-updates.patch @@ -26,7 +26,7 @@ index 25829f5b2675e1eafef5f5a0e40db8a4bbc80ba4..0cc1008b3db93487c8e0801895264683 private void handleHandSwap(Map equipmentChanges) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7626dfea095023343f041e0c5b6d0117873c1236..3cc1096880deea3eb5f50e38f4757455606e28c8 100644 +index 561e0b938cbd52e4f4bacb2c903465efd8c0eadf..2255eaf65338443f0ec99227df0a1e64608ea525 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -721,10 +721,22 @@ public final class ItemStack { diff --git a/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0109-Skip-cloning-advancement-criteria.patch b/patches/server/0111-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0109-Skip-cloning-advancement-criteria.patch rename to patches/server/0111-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0110-Reduce-block-destruction-packet-allocations.patch b/patches/server/0112-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0110-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0112-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0113-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 100% rename from patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0113-Send-set-head-rotation-packets-only-for-living-entit.patch diff --git a/patches/server/0112-Spread-out-sending-all-player-info.patch b/patches/server/0114-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0112-Spread-out-sending-all-player-info.patch rename to patches/server/0114-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch b/patches/server/0115-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0113-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0115-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0116-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0116-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0115-Send-multiple-keep-alive-packets.patch b/patches/server/0117-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0115-Send-multiple-keep-alive-packets.patch rename to patches/server/0117-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0116-Make-slow-login-timeout-configurable.patch b/patches/server/0118-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0116-Make-slow-login-timeout-configurable.patch rename to patches/server/0118-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0117-Make-max-interaction-distance-configurable.patch b/patches/server/0119-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0117-Make-max-interaction-distance-configurable.patch rename to patches/server/0119-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0120-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0120-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0121-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0121-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0122-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0122-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0123-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0123-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0122-Ignore-null-legacy-structure-data.patch b/patches/server/0124-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0122-Ignore-null-legacy-structure-data.patch rename to patches/server/0124-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0123-Don-t-double-save-stored-user-lists.patch b/patches/server/0125-Don-t-double-save-stored-user-lists.patch similarity index 100% rename from patches/server/0123-Don-t-double-save-stored-user-lists.patch rename to patches/server/0125-Don-t-double-save-stored-user-lists.patch diff --git a/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0127-CraftBukkit-UUID-to-world-map.patch b/patches/server/0129-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0127-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0129-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0128-Global-EULA-file.patch b/patches/server/0130-Global-EULA-file.patch similarity index 100% rename from patches/server/0128-Global-EULA-file.patch rename to patches/server/0130-Global-EULA-file.patch diff --git a/patches/server/0129-Specific-interval-TPS-API.patch b/patches/server/0131-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0129-Specific-interval-TPS-API.patch rename to patches/server/0131-Specific-interval-TPS-API.patch diff --git a/patches/server/0130-5-second-TPS-average.patch b/patches/server/0132-5-second-TPS-average.patch similarity index 100% rename from patches/server/0130-5-second-TPS-average.patch rename to patches/server/0132-5-second-TPS-average.patch diff --git a/patches/server/0131-Measure-last-tick-time.patch b/patches/server/0133-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0131-Measure-last-tick-time.patch rename to patches/server/0133-Measure-last-tick-time.patch diff --git a/patches/server/0132-Last-tick-time-API.patch b/patches/server/0134-Last-tick-time-API.patch similarity index 100% rename from patches/server/0132-Last-tick-time-API.patch rename to patches/server/0134-Last-tick-time-API.patch diff --git a/patches/server/0133-Show-last-tick-time-in-tps-command.patch b/patches/server/0135-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0133-Show-last-tick-time-in-tps-command.patch rename to patches/server/0135-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0134-Increase-time-statistics-in-intervals.patch b/patches/server/0136-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0134-Increase-time-statistics-in-intervals.patch rename to patches/server/0136-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0137-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0137-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0138-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0136-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0138-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0137-Optimize-identical-item-checks.patch b/patches/server/0139-Optimize-identical-item-checks.patch similarity index 100% rename from patches/server/0137-Optimize-identical-item-checks.patch rename to patches/server/0139-Optimize-identical-item-checks.patch diff --git a/patches/server/0138-Reduce-RandomSource-instances.patch b/patches/server/0140-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0138-Reduce-RandomSource-instances.patch rename to patches/server/0140-Reduce-RandomSource-instances.patch diff --git a/patches/server/0139-Server-thread-priority-environment-variable.patch b/patches/server/0141-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0139-Server-thread-priority-environment-variable.patch rename to patches/server/0141-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0140-Thread-safety-annotations.patch b/patches/server/0142-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0140-Thread-safety-annotations.patch rename to patches/server/0142-Thread-safety-annotations.patch diff --git a/patches/server/0141-CPU-cores-estimation.patch b/patches/server/0143-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0141-CPU-cores-estimation.patch rename to patches/server/0143-CPU-cores-estimation.patch diff --git a/patches/server/0144-Virtual-threads-utility.patch b/patches/server/0144-Virtual-threads-utility.patch new file mode 100644 index 0000000..55e589a --- /dev/null +++ b/patches/server/0144-Virtual-threads-utility.patch @@ -0,0 +1,153 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Mon, 13 Feb 2023 21:40:20 +0100 +Subject: [PATCH] Virtual threads utility + +License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) +Gale - https://galemc.org + +diff --git a/src/main/java/org/galemc/gale/util/VirtualThreads.java b/src/main/java/org/galemc/gale/util/VirtualThreads.java +new file mode 100644 +index 0000000000000000000000000000000000000000..9f5a194ffcdce678212ccc0e800ff1fe6aa208c8 +--- /dev/null ++++ b/src/main/java/org/galemc/gale/util/VirtualThreads.java +@@ -0,0 +1,139 @@ ++// Gale - virtual threads utility ++ ++package org.galemc.gale.util; ++ ++import org.galemc.gale.executor.annotation.YieldFree; ++import org.galemc.gale.executor.annotation.thread.AnyThreadSafe; ++import org.jetbrains.annotations.Nullable; ++ ++import java.lang.reflect.Method; ++import java.util.concurrent.ThreadFactory; ++ ++/** ++ * A utility class to detect and provide the ability to use virtual threads. ++ * ++ * @author Martijn Muijsers under AGPL-3.0 ++ */ ++@SuppressWarnings({"JavadocReference", "Since15"}) ++@AnyThreadSafe ++@YieldFree ++public final class VirtualThreads { ++ ++ private VirtualThreads() {} ++ ++ /** ++ * The {@link Thread#ofVirtual()} method, obtained via Reflection, ++ * or null if it could not be obtained. ++ */ ++ public static final @Nullable Method Thread_ofVirtual_method; ++ ++ /** ++ * The {@link Thread.Builder} class, obtained via Reflection, ++ * or null if it could not be obtained. ++ */ ++ public static final @Nullable Class Thread_Builder_class; ++ ++ /** ++ * The {@link Thread.Builder#factory()} method, obtained via Reflection, ++ * or null if it could not be obtained. ++ */ ++ public static final @Nullable Method Thread_Builder_factory_method; ++ ++ /** ++ * The {@link Thread.Builder#start(Runnable)} method, obtained via Reflection, ++ * or null if it could not be obtained. ++ */ ++ public static final @Nullable Method Thread_Builder_start_method; ++ ++ /** ++ * Whether virtual threads are enabled. ++ */ ++ public static final boolean areVirtualThreadsEnabled; ++ ++ /** ++ * @return A {@link ThreadFactory} that produces {@link java.lang.VirtualThread}s, ++ * or null if {@link #areVirtualThreadsEnabled} is false. ++ */ ++ public static @Nullable ThreadFactory createVirtualThreadFactory() { ++ if (!areVirtualThreadsEnabled) { ++ return null; ++ } ++ try { ++ //noinspection DataFlowIssue ++ return (ThreadFactory) Thread_Builder_factory_method.invoke(Thread_ofVirtual_method.invoke(null)); ++ } catch (Exception e) { ++ // We assume this does not happen when areVirtualThreadsEnabled has been set to true ++ throw new RuntimeException(e); ++ } ++ } ++ ++ /** ++ * @param task The runnable for the thread to execute. ++ * @return A {@link java.lang.VirtualThread} that has been started with the given task, ++ * or null if {@link #areVirtualThreadsEnabled} is false. ++ */ ++ public static @Nullable Thread startVirtualThread(Runnable task) { ++ if (!areVirtualThreadsEnabled) { ++ return null; ++ } ++ try { ++ //noinspection DataFlowIssue ++ return (Thread) Thread_Builder_start_method.invoke(Thread_ofVirtual_method.invoke(null), task); ++ } catch (Exception e) { ++ // We assume this does not happen when areVirtualThreadsEnabled has been set to true ++ throw new RuntimeException(e); ++ } ++ } ++ ++ static { ++ { ++ Method method; ++ try { ++ method = Thread.class.getMethod("ofVirtual"); ++ } catch (Throwable ignored) { ++ method = null; ++ } ++ Thread_ofVirtual_method = method; ++ if (Thread_ofVirtual_method != null) { ++ Thread_ofVirtual_method.setAccessible(true); ++ } ++ } ++ { ++ Class clazz; ++ try { ++ //noinspection DataFlowIssue ++ clazz = Thread_ofVirtual_method.invoke(null).getClass(); ++ } catch (Throwable ignored) { ++ clazz = null; ++ } ++ Thread_Builder_class = clazz; ++ } ++ { ++ Method method; ++ try { ++ //noinspection DataFlowIssue ++ method = Thread_Builder_class.getMethod("factory"); ++ } catch (Throwable ignored) { ++ method = null; ++ } ++ Thread_Builder_factory_method = method; ++ if (Thread_Builder_factory_method != null) { ++ Thread_Builder_factory_method.setAccessible(true); ++ } ++ } ++ { ++ Method method; ++ try { ++ method = Thread_Builder_class.getMethod("start"); ++ } catch (Throwable ignored) { ++ method = null; ++ } ++ Thread_Builder_start_method = method; ++ if (Thread_Builder_start_method != null) { ++ Thread_Builder_start_method.setAccessible(true); ++ } ++ } ++ areVirtualThreadsEnabled = Thread_ofVirtual_method != null && Thread_Builder_class != null && Thread_Builder_factory_method != null && Thread_Builder_start_method != null; ++ } ++ ++} diff --git a/patches/server/0142-CheckableLock-utility.patch b/patches/server/0145-CheckableLock-utility.patch similarity index 100% rename from patches/server/0142-CheckableLock-utility.patch rename to patches/server/0145-CheckableLock-utility.patch diff --git a/patches/server/0143-Mutex-utility.patch b/patches/server/0146-Mutex-utility.patch similarity index 100% rename from patches/server/0143-Mutex-utility.patch rename to patches/server/0146-Mutex-utility.patch diff --git a/patches/server/0144-Thread-aware-lock-utility.patch b/patches/server/0147-Thread-aware-lock-utility.patch similarity index 100% rename from patches/server/0144-Thread-aware-lock-utility.patch rename to patches/server/0147-Thread-aware-lock-utility.patch diff --git a/patches/server/0145-Unterminable-executor-utility.patch b/patches/server/0148-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0145-Unterminable-executor-utility.patch rename to patches/server/0148-Unterminable-executor-utility.patch diff --git a/patches/server/0146-FIFO-concurrent-queue-utility.patch b/patches/server/0149-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0146-FIFO-concurrent-queue-utility.patch rename to patches/server/0149-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0147-Base-thread-pool.patch b/patches/server/0150-Base-thread-pool.patch similarity index 100% rename from patches/server/0147-Base-thread-pool.patch rename to patches/server/0150-Base-thread-pool.patch diff --git a/patches/server/0148-Watch-for-blocking-base-threads.patch b/patches/server/0151-Watch-for-blocking-base-threads.patch similarity index 94% rename from patches/server/0148-Watch-for-blocking-base-threads.patch rename to patches/server/0151-Watch-for-blocking-base-threads.patch index 3e4fb0b..5d614bd 100644 --- a/patches/server/0148-Watch-for-blocking-base-threads.patch +++ b/patches/server/0151-Watch-for-blocking-base-threads.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/build.gradle.kts b/build.gradle.kts -index 00508c2b7a0aa9ecdd0c8709a559f26de17a0004..e01986477360b1dbe991af6667e726e8ac656246 100644 +index 22864c8810bacd23b3ebaedce1c87f1441873184..b3237ddd0dabce383043947fe17d795901e89735 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { @@ -18,7 +18,7 @@ index 00508c2b7a0aa9ecdd0c8709a559f26de17a0004..e01986477360b1dbe991af6667e726e8 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -169,11 +170,13 @@ fun TaskContainer.registerRunTask( +@@ -178,6 +179,7 @@ fun TaskContainer.registerRunTask( if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") { systemProperty("disable.watchdog", true) } @@ -26,7 +26,9 @@ index 00508c2b7a0aa9ecdd0c8709a559f26de17a0004..e01986477360b1dbe991af6667e726e8 val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2") val modifiedJvmArgs = jvmArgs ?: arrayListOf() - modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G")) +@@ -187,6 +189,7 @@ fun TaskContainer.registerRunTask( + modifiedJvmArgs.addAll(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED")) + // Gale end - enable virtual threads for development runs modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support + modifiedJvmArgs.add("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads jvmArgs = modifiedJvmArgs diff --git a/patches/server/0149-Non-blocking-PooledObjects.patch b/patches/server/0152-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0149-Non-blocking-PooledObjects.patch rename to patches/server/0152-Non-blocking-PooledObjects.patch diff --git a/patches/server/0150-Yielding-memoized-Supplier.patch b/patches/server/0153-Yielding-memoized-Supplier.patch similarity index 100% rename from patches/server/0150-Yielding-memoized-Supplier.patch rename to patches/server/0153-Yielding-memoized-Supplier.patch diff --git a/patches/server/0151-Yielding-ChunkHolderManager.patch b/patches/server/0154-Yielding-ChunkHolderManager.patch similarity index 100% rename from patches/server/0151-Yielding-ChunkHolderManager.patch rename to patches/server/0154-Yielding-ChunkHolderManager.patch diff --git a/patches/server/0152-Run-async-executor-tasks-on-base-thread-pool.patch b/patches/server/0155-Run-async-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0152-Run-async-executor-tasks-on-base-thread-pool.patch rename to patches/server/0155-Run-async-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0153-Run-background-executor-tasks-on-base-thread-pool.patch b/patches/server/0156-Run-background-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0153-Run-background-executor-tasks-on-base-thread-pool.patch rename to patches/server/0156-Run-background-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0154-Run-world-upgrade-tasks-on-base-thread-pool.patch b/patches/server/0157-Run-world-upgrade-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0154-Run-world-upgrade-tasks-on-base-thread-pool.patch rename to patches/server/0157-Run-world-upgrade-tasks-on-base-thread-pool.patch diff --git a/patches/server/0155-Run-tab-completion-tasks-on-base-thread-pool.patch b/patches/server/0158-Run-tab-completion-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0155-Run-tab-completion-tasks-on-base-thread-pool.patch rename to patches/server/0158-Run-tab-completion-tasks-on-base-thread-pool.patch diff --git a/patches/server/0156-Run-text-filter-tasks-on-base-thread-pool.patch b/patches/server/0159-Run-text-filter-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0156-Run-text-filter-tasks-on-base-thread-pool.patch rename to patches/server/0159-Run-text-filter-tasks-on-base-thread-pool.patch diff --git a/patches/server/0157-Run-cleaner-tasks-on-base-thread-pool.patch b/patches/server/0160-Run-cleaner-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0157-Run-cleaner-tasks-on-base-thread-pool.patch rename to patches/server/0160-Run-cleaner-tasks-on-base-thread-pool.patch diff --git a/patches/server/0158-Run-chunk-cache-tasks-on-base-thread-pool.patch b/patches/server/0161-Run-chunk-cache-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0158-Run-chunk-cache-tasks-on-base-thread-pool.patch rename to patches/server/0161-Run-chunk-cache-tasks-on-base-thread-pool.patch diff --git a/patches/server/0159-Run-TickThread-chunk-tasks-on-base-thread-pool.patch b/patches/server/0162-Run-TickThread-chunk-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0159-Run-TickThread-chunk-tasks-on-base-thread-pool.patch rename to patches/server/0162-Run-TickThread-chunk-tasks-on-base-thread-pool.patch diff --git a/patches/server/0160-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch b/patches/server/0163-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch similarity index 100% rename from patches/server/0160-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch rename to patches/server/0163-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch diff --git a/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0164-Run-chunk-worker-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch rename to patches/server/0164-Run-chunk-worker-tasks-on-base-thread-pool.patch diff --git a/patches/server/0162-Split-tick-steps.patch b/patches/server/0165-Split-tick-steps.patch similarity index 100% rename from patches/server/0162-Split-tick-steps.patch rename to patches/server/0165-Split-tick-steps.patch diff --git a/patches/server/0163-Multithreaded-ticking.patch b/patches/server/0166-Multithreaded-ticking.patch similarity index 100% rename from patches/server/0163-Multithreaded-ticking.patch rename to patches/server/0166-Multithreaded-ticking.patch diff --git a/patches/server/0164-Yielding-ChunkTaskScheduler.patch b/patches/server/0167-Yielding-ChunkTaskScheduler.patch similarity index 100% rename from patches/server/0164-Yielding-ChunkTaskScheduler.patch rename to patches/server/0167-Yielding-ChunkTaskScheduler.patch