From 2054615d1d52fa798ccfce32ad63afdda269dae6 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Tue, 29 Nov 2022 15:18:07 +0100 Subject: [PATCH] Remove text filter executor --- .../0002-Dev-import-deobfuscation-fixes.patch | 73 +++++++++++++++++++ ...ide-irrelevant-compilation-warnings.patch} | 0 ...patch => 0004-Gale-branding-changes.patch} | 0 ...on.patch => 0005-Gale-configuration.patch} | 0 ...h => 0006-Set-Gale-permissions-root.patch} | 0 ...ommands.patch => 0007-Gale-commands.patch} | 0 ...ommend-disabling-timings-on-startup.patch} | 0 ...ing-for-EntityLiving-hasLineOfSight.patch} | 0 ...pelessRecipe-comparison-for-vanilla.patch} | 0 ...011-Reduce-projectile-chunk-loading.patch} | 0 ...=> 0012-Reduce-spooky-season-checks.patch} | 0 ...tch => 0013-Move-random-tick-random.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...duce-acquire-POI-for-stuck-entities.patch} | 0 ...e-iterators-from-Inventory-contains.patch} | 0 ...ing-range-before-getting-visibility.patch} | 0 ...-for-plugins-not-shutting-down-task.patch} | 0 ...020-Improve-fluid-direction-caching.patch} | 0 ...ch => 0021-Cache-on-climbable-check.patch} | 0 ...-Config-to-disable-vanilla-profiler.patch} | 0 ...0023-Use-array-for-gamerule-storage.patch} | 0 ...lisionContext-a-live-representation.patch} | 0 ...ve-container-checking-with-a-bitset.patch} | 0 ...r-checking-for-useless-move-packets.patch} | 0 ...0027-Use-fast-item-merge-raytracing.patch} | 0 ...-aging-cache-for-biome-temperatures.patch} | 0 ...t.patch => 0029-Inline-level-height.patch} | 0 ...ThreadUnsafeRandom-for-mob-spawning.patch} | 0 ...eams-and-iterators-from-range-check.patch} | 0 ...streams-from-getting-nearby-players.patch} | 0 ...> 0033-Skip-cloning-loot-parameters.patch} | 0 ...034-Block-goal-does-not-load-chunks.patch} | 0 ...h => 0035-Reduce-entity-allocations.patch} | 0 ...36-Remove-lambda-from-ticking-guard.patch} | 0 ...e-entity-fluid-lookups-if-no-fluids.patch} | 0 ...-support.patch => 0038-SIMD-support.patch} | 0 ...0039-Optimize-entity-coordinate-key.patch} | 0 ...patch => 0040-Reduce-in-wall-checks.patch} | 0 ...table-refresh-for-non-player-intera.patch} | 0 ...h => 0042-Reduce-hopper-item-checks.patch} | 0 ...0043-Reduce-villager-item-re-pickup.patch} | 0 ... 0044-Do-not-log-invalid-statistics.patch} | 0 ...5-Do-not-log-empty-message-warnings.patch} | 0 ...046-Do-not-log-ignored-advancements.patch} | 0 ...7-Do-not-log-setBlock-in-far-chunks.patch} | 0 ...048-Do-not-log-unrecognized-recipes.patch} | 0 ...-log-legacy-Material-initialization.patch} | 0 ...Do-not-log-expired-message-warnings.patch} | 0 ...> 0051-Do-not-log-Not-Secure-marker.patch} | 0 ...tly-log-invalid-pool-element-errors.patch} | 0 ...ch => 0053-Reduce-array-allocations.patch} | 0 ...-Optional-allocation-in-EntityBased.patch} | 0 ...atch => 0055-Measure-last-tick-time.patch} | 0 ...PI.patch => 0056-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...-physics-check-before-vehicle-check.patch} | 0 ...059-Variable-main-thread-task-delay.patch} | 0 ... 0060-Reduce-RandomSource-instances.patch} | 0 ....patch => 0061-CPU-cores-estimation.patch} | 0 ... 0062-Add-centralized-AsyncExecutor.patch} | 0 ...=> 0063-Remove-Paper-async-executor.patch} | 0 ... 0064-Remove-Paper-cleaner-executor.patch} | 0 ... => 0065-Remove-background-executor.patch} | 0 ...h => 0066-Remove-bootstrap-executor.patch} | 0 ...0067-Remove-world-upgrade-executors.patch} | 0 ...> 0068-Remove-tab-complete-executor.patch} | 0 .../0069-Remove-text-filter-executor.patch | 28 +++++++ 68 files changed, 101 insertions(+) create mode 100644 patches/server/0002-Dev-import-deobfuscation-fixes.patch rename patches/server/{0002-Hide-irrelevant-compilation-warnings.patch => 0003-Hide-irrelevant-compilation-warnings.patch} (100%) rename patches/server/{0003-Gale-branding-changes.patch => 0004-Gale-branding-changes.patch} (100%) rename patches/server/{0004-Gale-configuration.patch => 0005-Gale-configuration.patch} (100%) rename patches/server/{0005-Set-Gale-permissions-root.patch => 0006-Set-Gale-permissions-root.patch} (100%) rename patches/server/{0006-Gale-commands.patch => 0007-Gale-commands.patch} (100%) rename patches/server/{0007-Recommend-disabling-timings-on-startup.patch => 0008-Recommend-disabling-timings-on-startup.patch} (100%) rename patches/server/{0008-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0009-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%) rename patches/server/{0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%) rename patches/server/{0010-Reduce-projectile-chunk-loading.patch => 0011-Reduce-projectile-chunk-loading.patch} (100%) rename patches/server/{0011-Reduce-spooky-season-checks.patch => 0012-Reduce-spooky-season-checks.patch} (100%) rename patches/server/{0012-Move-random-tick-random.patch => 0013-Move-random-tick-random.patch} (100%) rename patches/server/{0013-Optimize-random-calls-in-chunk-ticking.patch => 0014-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename patches/server/{0014-Reduce-enderman-teleport-chunk-lookups.patch => 0015-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename patches/server/{0015-Reduce-acquire-POI-for-stuck-entities.patch => 0016-Reduce-acquire-POI-for-stuck-entities.patch} (100%) rename patches/server/{0016-Remove-iterators-from-Inventory-contains.patch => 0017-Remove-iterators-from-Inventory-contains.patch} (100%) rename patches/server/{0017-Check-targeting-range-before-getting-visibility.patch => 0018-Check-targeting-range-before-getting-visibility.patch} (100%) rename patches/server/{0018-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0019-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (100%) rename patches/server/{0019-Improve-fluid-direction-caching.patch => 0020-Improve-fluid-direction-caching.patch} (100%) rename patches/server/{0020-Cache-on-climbable-check.patch => 0021-Cache-on-climbable-check.patch} (100%) rename patches/server/{0021-Config-to-disable-vanilla-profiler.patch => 0022-Config-to-disable-vanilla-profiler.patch} (100%) rename patches/server/{0022-Use-array-for-gamerule-storage.patch => 0023-Use-array-for-gamerule-storage.patch} (100%) rename patches/server/{0023-Make-EntityCollisionContext-a-live-representation.patch => 0024-Make-EntityCollisionContext-a-live-representation.patch} (100%) rename patches/server/{0024-Improve-container-checking-with-a-bitset.patch => 0025-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0025-Better-checking-for-useless-move-packets.patch => 0026-Better-checking-for-useless-move-packets.patch} (100%) rename patches/server/{0026-Use-fast-item-merge-raytracing.patch => 0027-Use-fast-item-merge-raytracing.patch} (100%) rename patches/server/{0027-Use-aging-cache-for-biome-temperatures.patch => 0028-Use-aging-cache-for-biome-temperatures.patch} (100%) rename patches/server/{0028-Inline-level-height.patch => 0029-Inline-level-height.patch} (100%) rename patches/server/{0029-Use-ThreadUnsafeRandom-for-mob-spawning.patch => 0030-Use-ThreadUnsafeRandom-for-mob-spawning.patch} (100%) rename patches/server/{0030-Remove-streams-and-iterators-from-range-check.patch => 0031-Remove-streams-and-iterators-from-range-check.patch} (100%) rename patches/server/{0031-Remove-streams-from-getting-nearby-players.patch => 0032-Remove-streams-from-getting-nearby-players.patch} (100%) rename patches/server/{0032-Skip-cloning-loot-parameters.patch => 0033-Skip-cloning-loot-parameters.patch} (100%) rename patches/server/{0033-Block-goal-does-not-load-chunks.patch => 0034-Block-goal-does-not-load-chunks.patch} (100%) rename patches/server/{0034-Reduce-entity-allocations.patch => 0035-Reduce-entity-allocations.patch} (100%) rename patches/server/{0035-Remove-lambda-from-ticking-guard.patch => 0036-Remove-lambda-from-ticking-guard.patch} (100%) rename patches/server/{0036-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0037-Reduce-entity-fluid-lookups-if-no-fluids.patch} (100%) rename patches/server/{0037-SIMD-support.patch => 0038-SIMD-support.patch} (100%) rename patches/server/{0038-Optimize-entity-coordinate-key.patch => 0039-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0039-Reduce-in-wall-checks.patch => 0040-Reduce-in-wall-checks.patch} (100%) rename patches/server/{0040-Don-t-trigger-lootable-refresh-for-non-player-intera.patch => 0041-Don-t-trigger-lootable-refresh-for-non-player-intera.patch} (100%) rename patches/server/{0041-Reduce-hopper-item-checks.patch => 0042-Reduce-hopper-item-checks.patch} (100%) rename patches/server/{0042-Reduce-villager-item-re-pickup.patch => 0043-Reduce-villager-item-re-pickup.patch} (100%) rename patches/server/{0043-Do-not-log-invalid-statistics.patch => 0044-Do-not-log-invalid-statistics.patch} (100%) rename patches/server/{0044-Do-not-log-empty-message-warnings.patch => 0045-Do-not-log-empty-message-warnings.patch} (100%) rename patches/server/{0045-Do-not-log-ignored-advancements.patch => 0046-Do-not-log-ignored-advancements.patch} (100%) rename patches/server/{0046-Do-not-log-setBlock-in-far-chunks.patch => 0047-Do-not-log-setBlock-in-far-chunks.patch} (100%) rename patches/server/{0047-Do-not-log-unrecognized-recipes.patch => 0048-Do-not-log-unrecognized-recipes.patch} (100%) rename patches/server/{0048-Do-not-log-legacy-Material-initialization.patch => 0049-Do-not-log-legacy-Material-initialization.patch} (100%) rename patches/server/{0049-Do-not-log-expired-message-warnings.patch => 0050-Do-not-log-expired-message-warnings.patch} (100%) rename patches/server/{0050-Do-not-log-Not-Secure-marker.patch => 0051-Do-not-log-Not-Secure-marker.patch} (100%) rename patches/server/{0051-Softly-log-invalid-pool-element-errors.patch => 0052-Softly-log-invalid-pool-element-errors.patch} (100%) rename patches/server/{0052-Reduce-array-allocations.patch => 0053-Reduce-array-allocations.patch} (100%) rename patches/server/{0053-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0054-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%) rename patches/server/{0054-Measure-last-tick-time.patch => 0055-Measure-last-tick-time.patch} (100%) rename patches/server/{0055-Last-tick-time-API.patch => 0056-Last-tick-time-API.patch} (100%) rename patches/server/{0056-Show-last-tick-time-in-tps-command.patch => 0057-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0057-Collision-physics-check-before-vehicle-check.patch => 0058-Collision-physics-check-before-vehicle-check.patch} (100%) rename patches/server/{0058-Variable-main-thread-task-delay.patch => 0059-Variable-main-thread-task-delay.patch} (100%) rename patches/server/{0059-Reduce-RandomSource-instances.patch => 0060-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0060-CPU-cores-estimation.patch => 0061-CPU-cores-estimation.patch} (100%) rename patches/server/{0061-Add-centralized-AsyncExecutor.patch => 0062-Add-centralized-AsyncExecutor.patch} (100%) rename patches/server/{0062-Remove-Paper-async-executor.patch => 0063-Remove-Paper-async-executor.patch} (100%) rename patches/server/{0063-Remove-Paper-cleaner-executor.patch => 0064-Remove-Paper-cleaner-executor.patch} (100%) rename patches/server/{0064-Remove-background-executor.patch => 0065-Remove-background-executor.patch} (100%) rename patches/server/{0065-Remove-bootstrap-executor.patch => 0066-Remove-bootstrap-executor.patch} (100%) rename patches/server/{0066-Remove-world-upgrade-executors.patch => 0067-Remove-world-upgrade-executors.patch} (100%) rename patches/server/{0067-Remove-tab-complete-executor.patch => 0068-Remove-tab-complete-executor.patch} (100%) create mode 100644 patches/server/0069-Remove-text-filter-executor.patch diff --git a/patches/server/0002-Dev-import-deobfuscation-fixes.patch b/patches/server/0002-Dev-import-deobfuscation-fixes.patch new file mode 100644 index 0000000..7c48b20 --- /dev/null +++ b/patches/server/0002-Dev-import-deobfuscation-fixes.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 15:16:54 +0100 +Subject: [PATCH] Dev import deobfuscation fixes + + +diff --git a/src/main/java/net/minecraft/server/network/TextFilterClient.java b/src/main/java/net/minecraft/server/network/TextFilterClient.java +index 92a60fc35145b7dd5fe17ea9b6823a919f483945..a6941c39802bd1b50e32a7ad00c65cfd59191bcf 100644 +--- a/src/main/java/net/minecraft/server/network/TextFilterClient.java ++++ b/src/main/java/net/minecraft/server/network/TextFilterClient.java +@@ -98,38 +98,38 @@ public class TextFilterClient implements AutoCloseable { + URL uRL2 = getEndpoint(uRI, jsonObject2, "join", "v1/join"); + URL uRL3 = getEndpoint(uRI, jsonObject2, "leave", "v1/leave"); + TextFilterClient.JoinOrLeaveEncoder joinOrLeaveEncoder = (profile) -> { +- JsonObject jsonObject = new JsonObject(); +- jsonObject.addProperty("server", string2); +- jsonObject.addProperty("room", string3); +- jsonObject.addProperty("user_id", profile.getId().toString()); +- jsonObject.addProperty("user_display_name", profile.getName()); +- return jsonObject; ++ JsonObject jsonObject1 = new JsonObject(); ++ jsonObject1.addProperty("server", string2); ++ jsonObject1.addProperty("room", string3); ++ jsonObject1.addProperty("user_id", profile.getId().toString()); ++ jsonObject1.addProperty("user_display_name", profile.getName()); ++ return jsonObject1; + }; + TextFilterClient.MessageEncoder messageEncoder; + if (bl) { + messageEncoder = (profile, message) -> { +- JsonObject jsonObject = new JsonObject(); +- jsonObject.addProperty("rule", i); +- jsonObject.addProperty("server", string2); +- jsonObject.addProperty("room", string3); +- jsonObject.addProperty("player", profile.getId().toString()); +- jsonObject.addProperty("player_display_name", profile.getName()); +- jsonObject.addProperty("text", message); +- jsonObject.addProperty("language", "*"); +- return jsonObject; ++ JsonObject jsonObject1 = new JsonObject(); ++ jsonObject1.addProperty("rule", i); ++ jsonObject1.addProperty("server", string2); ++ jsonObject1.addProperty("room", string3); ++ jsonObject1.addProperty("player", profile.getId().toString()); ++ jsonObject1.addProperty("player_display_name", profile.getName()); ++ jsonObject1.addProperty("text", message); ++ jsonObject1.addProperty("language", "*"); ++ return jsonObject1; + }; + } else { + String string5 = String.valueOf(i); + messageEncoder = (profile, message) -> { +- JsonObject jsonObject = new JsonObject(); +- jsonObject.addProperty("rule_id", string5); +- jsonObject.addProperty("category", string2); +- jsonObject.addProperty("subcategory", string3); +- jsonObject.addProperty("user_id", profile.getId().toString()); +- jsonObject.addProperty("user_display_name", profile.getName()); +- jsonObject.addProperty("text", message); +- jsonObject.addProperty("language", "*"); +- return jsonObject; ++ JsonObject jsonObject1 = new JsonObject(); ++ jsonObject1.addProperty("rule_id", string5); ++ jsonObject1.addProperty("category", string2); ++ jsonObject1.addProperty("subcategory", string3); ++ jsonObject1.addProperty("user_id", profile.getId().toString()); ++ jsonObject1.addProperty("user_display_name", profile.getName()); ++ jsonObject1.addProperty("text", message); ++ jsonObject1.addProperty("language", "*"); ++ return jsonObject1; + }; + } + diff --git a/patches/server/0002-Hide-irrelevant-compilation-warnings.patch b/patches/server/0003-Hide-irrelevant-compilation-warnings.patch similarity index 100% rename from patches/server/0002-Hide-irrelevant-compilation-warnings.patch rename to patches/server/0003-Hide-irrelevant-compilation-warnings.patch diff --git a/patches/server/0003-Gale-branding-changes.patch b/patches/server/0004-Gale-branding-changes.patch similarity index 100% rename from patches/server/0003-Gale-branding-changes.patch rename to patches/server/0004-Gale-branding-changes.patch diff --git a/patches/server/0004-Gale-configuration.patch b/patches/server/0005-Gale-configuration.patch similarity index 100% rename from patches/server/0004-Gale-configuration.patch rename to patches/server/0005-Gale-configuration.patch diff --git a/patches/server/0005-Set-Gale-permissions-root.patch b/patches/server/0006-Set-Gale-permissions-root.patch similarity index 100% rename from patches/server/0005-Set-Gale-permissions-root.patch rename to patches/server/0006-Set-Gale-permissions-root.patch diff --git a/patches/server/0006-Gale-commands.patch b/patches/server/0007-Gale-commands.patch similarity index 100% rename from patches/server/0006-Gale-commands.patch rename to patches/server/0007-Gale-commands.patch diff --git a/patches/server/0007-Recommend-disabling-timings-on-startup.patch b/patches/server/0008-Recommend-disabling-timings-on-startup.patch similarity index 100% rename from patches/server/0007-Recommend-disabling-timings-on-startup.patch rename to patches/server/0008-Recommend-disabling-timings-on-startup.patch diff --git a/patches/server/0008-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0009-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0008-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0009-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0009-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0010-Reduce-projectile-chunk-loading.patch b/patches/server/0011-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0010-Reduce-projectile-chunk-loading.patch rename to patches/server/0011-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0011-Reduce-spooky-season-checks.patch b/patches/server/0012-Reduce-spooky-season-checks.patch similarity index 100% rename from patches/server/0011-Reduce-spooky-season-checks.patch rename to patches/server/0012-Reduce-spooky-season-checks.patch diff --git a/patches/server/0012-Move-random-tick-random.patch b/patches/server/0013-Move-random-tick-random.patch similarity index 100% rename from patches/server/0012-Move-random-tick-random.patch rename to patches/server/0013-Move-random-tick-random.patch diff --git a/patches/server/0013-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0013-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0014-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0015-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0014-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0015-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0015-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0016-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0015-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0016-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0016-Remove-iterators-from-Inventory-contains.patch b/patches/server/0017-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0016-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0017-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0017-Check-targeting-range-before-getting-visibility.patch b/patches/server/0018-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0017-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0018-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0018-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0019-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0018-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0019-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0019-Improve-fluid-direction-caching.patch b/patches/server/0020-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0019-Improve-fluid-direction-caching.patch rename to patches/server/0020-Improve-fluid-direction-caching.patch diff --git a/patches/server/0020-Cache-on-climbable-check.patch b/patches/server/0021-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0020-Cache-on-climbable-check.patch rename to patches/server/0021-Cache-on-climbable-check.patch diff --git a/patches/server/0021-Config-to-disable-vanilla-profiler.patch b/patches/server/0022-Config-to-disable-vanilla-profiler.patch similarity index 100% rename from patches/server/0021-Config-to-disable-vanilla-profiler.patch rename to patches/server/0022-Config-to-disable-vanilla-profiler.patch diff --git a/patches/server/0022-Use-array-for-gamerule-storage.patch b/patches/server/0023-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0022-Use-array-for-gamerule-storage.patch rename to patches/server/0023-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0023-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0023-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0024-Improve-container-checking-with-a-bitset.patch b/patches/server/0025-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0024-Improve-container-checking-with-a-bitset.patch rename to patches/server/0025-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0025-Better-checking-for-useless-move-packets.patch b/patches/server/0026-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0025-Better-checking-for-useless-move-packets.patch rename to patches/server/0026-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0026-Use-fast-item-merge-raytracing.patch b/patches/server/0027-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0026-Use-fast-item-merge-raytracing.patch rename to patches/server/0027-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0027-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0028-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0027-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0028-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0028-Inline-level-height.patch b/patches/server/0029-Inline-level-height.patch similarity index 100% rename from patches/server/0028-Inline-level-height.patch rename to patches/server/0029-Inline-level-height.patch diff --git a/patches/server/0029-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0030-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0029-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0030-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0030-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0031-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0030-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0031-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0031-Remove-streams-from-getting-nearby-players.patch b/patches/server/0032-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0031-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0032-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0032-Skip-cloning-loot-parameters.patch b/patches/server/0033-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0032-Skip-cloning-loot-parameters.patch rename to patches/server/0033-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0033-Block-goal-does-not-load-chunks.patch b/patches/server/0034-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0033-Block-goal-does-not-load-chunks.patch rename to patches/server/0034-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0034-Reduce-entity-allocations.patch b/patches/server/0035-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0034-Reduce-entity-allocations.patch rename to patches/server/0035-Reduce-entity-allocations.patch diff --git a/patches/server/0035-Remove-lambda-from-ticking-guard.patch b/patches/server/0036-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0035-Remove-lambda-from-ticking-guard.patch rename to patches/server/0036-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0036-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0036-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0037-SIMD-support.patch b/patches/server/0038-SIMD-support.patch similarity index 100% rename from patches/server/0037-SIMD-support.patch rename to patches/server/0038-SIMD-support.patch diff --git a/patches/server/0038-Optimize-entity-coordinate-key.patch b/patches/server/0039-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0038-Optimize-entity-coordinate-key.patch rename to patches/server/0039-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0039-Reduce-in-wall-checks.patch b/patches/server/0040-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0039-Reduce-in-wall-checks.patch rename to patches/server/0040-Reduce-in-wall-checks.patch diff --git a/patches/server/0040-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0041-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0040-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0041-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0041-Reduce-hopper-item-checks.patch b/patches/server/0042-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0041-Reduce-hopper-item-checks.patch rename to patches/server/0042-Reduce-hopper-item-checks.patch diff --git a/patches/server/0042-Reduce-villager-item-re-pickup.patch b/patches/server/0043-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0042-Reduce-villager-item-re-pickup.patch rename to patches/server/0043-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0043-Do-not-log-invalid-statistics.patch b/patches/server/0044-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0043-Do-not-log-invalid-statistics.patch rename to patches/server/0044-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0044-Do-not-log-empty-message-warnings.patch b/patches/server/0045-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0044-Do-not-log-empty-message-warnings.patch rename to patches/server/0045-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0045-Do-not-log-ignored-advancements.patch b/patches/server/0046-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0045-Do-not-log-ignored-advancements.patch rename to patches/server/0046-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0046-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0046-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0047-Do-not-log-unrecognized-recipes.patch b/patches/server/0048-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0047-Do-not-log-unrecognized-recipes.patch rename to patches/server/0048-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0048-Do-not-log-legacy-Material-initialization.patch b/patches/server/0049-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0048-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0049-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0049-Do-not-log-expired-message-warnings.patch b/patches/server/0050-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0049-Do-not-log-expired-message-warnings.patch rename to patches/server/0050-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0050-Do-not-log-Not-Secure-marker.patch b/patches/server/0051-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0050-Do-not-log-Not-Secure-marker.patch rename to patches/server/0051-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0051-Softly-log-invalid-pool-element-errors.patch b/patches/server/0052-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0051-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0052-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0052-Reduce-array-allocations.patch b/patches/server/0053-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0052-Reduce-array-allocations.patch rename to patches/server/0053-Reduce-array-allocations.patch diff --git a/patches/server/0053-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0054-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0053-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0054-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0054-Measure-last-tick-time.patch b/patches/server/0055-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0054-Measure-last-tick-time.patch rename to patches/server/0055-Measure-last-tick-time.patch diff --git a/patches/server/0055-Last-tick-time-API.patch b/patches/server/0056-Last-tick-time-API.patch similarity index 100% rename from patches/server/0055-Last-tick-time-API.patch rename to patches/server/0056-Last-tick-time-API.patch diff --git a/patches/server/0056-Show-last-tick-time-in-tps-command.patch b/patches/server/0057-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0056-Show-last-tick-time-in-tps-command.patch rename to patches/server/0057-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0057-Collision-physics-check-before-vehicle-check.patch b/patches/server/0058-Collision-physics-check-before-vehicle-check.patch similarity index 100% rename from patches/server/0057-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0058-Collision-physics-check-before-vehicle-check.patch diff --git a/patches/server/0058-Variable-main-thread-task-delay.patch b/patches/server/0059-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0058-Variable-main-thread-task-delay.patch rename to patches/server/0059-Variable-main-thread-task-delay.patch diff --git a/patches/server/0059-Reduce-RandomSource-instances.patch b/patches/server/0060-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0059-Reduce-RandomSource-instances.patch rename to patches/server/0060-Reduce-RandomSource-instances.patch diff --git a/patches/server/0060-CPU-cores-estimation.patch b/patches/server/0061-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0060-CPU-cores-estimation.patch rename to patches/server/0061-CPU-cores-estimation.patch diff --git a/patches/server/0061-Add-centralized-AsyncExecutor.patch b/patches/server/0062-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0061-Add-centralized-AsyncExecutor.patch rename to patches/server/0062-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0062-Remove-Paper-async-executor.patch b/patches/server/0063-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0062-Remove-Paper-async-executor.patch rename to patches/server/0063-Remove-Paper-async-executor.patch diff --git a/patches/server/0063-Remove-Paper-cleaner-executor.patch b/patches/server/0064-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0063-Remove-Paper-cleaner-executor.patch rename to patches/server/0064-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0064-Remove-background-executor.patch b/patches/server/0065-Remove-background-executor.patch similarity index 100% rename from patches/server/0064-Remove-background-executor.patch rename to patches/server/0065-Remove-background-executor.patch diff --git a/patches/server/0065-Remove-bootstrap-executor.patch b/patches/server/0066-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0065-Remove-bootstrap-executor.patch rename to patches/server/0066-Remove-bootstrap-executor.patch diff --git a/patches/server/0066-Remove-world-upgrade-executors.patch b/patches/server/0067-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0066-Remove-world-upgrade-executors.patch rename to patches/server/0067-Remove-world-upgrade-executors.patch diff --git a/patches/server/0067-Remove-tab-complete-executor.patch b/patches/server/0068-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0067-Remove-tab-complete-executor.patch rename to patches/server/0068-Remove-tab-complete-executor.patch diff --git a/patches/server/0069-Remove-text-filter-executor.patch b/patches/server/0069-Remove-text-filter-executor.patch new file mode 100644 index 0000000..be1aa63 --- /dev/null +++ b/patches/server/0069-Remove-text-filter-executor.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 15:15:10 +0100 +Subject: [PATCH] Remove text filter executor + +License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) + +diff --git a/src/main/java/net/minecraft/server/network/TextFilterClient.java b/src/main/java/net/minecraft/server/network/TextFilterClient.java +index a6941c39802bd1b50e32a7ad00c65cfd59191bcf..4ad2827379ddcb7f3844cb17e39f3af56a6e2dd4 100644 +--- a/src/main/java/net/minecraft/server/network/TextFilterClient.java ++++ b/src/main/java/net/minecraft/server/network/TextFilterClient.java +@@ -32,6 +32,7 @@ import net.minecraft.Util; + import net.minecraft.network.chat.FilterMask; + import net.minecraft.util.GsonHelper; + import net.minecraft.util.thread.ProcessorMailbox; ++import org.galemc.gale.concurrent.AsyncExecutor; + import org.slf4j.Logger; + + public class TextFilterClient implements AutoCloseable { +@@ -62,7 +63,7 @@ public class TextFilterClient implements AutoCloseable { + this.joinEncoder = joinEncoder; + this.leaveEndpoint = leaveEndpoint; + this.leaveEncoder = leaveEncoder; +- this.workerPool = Executors.newFixedThreadPool(parallelism, THREAD_FACTORY); ++ this.workerPool = AsyncExecutor.instance; // Gale - centralized async execution - remove text filter executor + } + + private static URL getEndpoint(URI root, @Nullable JsonObject endpoints, String key, String fallback) throws MalformedURLException {