diff --git a/patches/server/0008-Use-timin.gs-by-default.patch b/patches/server/0008-Use-timin.gs-by-default.patch new file mode 100644 index 0000000..ea62343 --- /dev/null +++ b/patches/server/0008-Use-timin.gs-by-default.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Thu, 1 Dec 2022 17:26:18 +0100 +Subject: [PATCH] Use timin.gs by default + + +diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..20bbb6473f7e8574bc52842e72c12ffb29c68d23 100644 +--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java ++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +@@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart { + public class Timings extends ConfigurationPart.Post { + public boolean enabled = true; + public boolean verbose = true; +- public String url = "https://timings.aikar.co/"; ++ public String url = "https://timin.gs/"; // Gale - use timin.gs by default + public boolean serverNamePrivacy = false; + public List hiddenConfigEntries = List.of( + "database", diff --git a/patches/server/0008-Recommend-disabling-timings-on-startup.patch b/patches/server/0009-Recommend-disabling-timings-on-startup.patch similarity index 95% rename from patches/server/0008-Recommend-disabling-timings-on-startup.patch rename to patches/server/0009-Recommend-disabling-timings-on-startup.patch index 98d5ea9..2d4dc57 100644 --- a/patches/server/0008-Recommend-disabling-timings-on-startup.patch +++ b/patches/server/0009-Recommend-disabling-timings-on-startup.patch @@ -30,7 +30,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/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..068ff7593dcf0ca1cd2b01a112dd15a7a43d9613 100644 +index 20bbb6473f7e8574bc52842e72c12ffb29c68d23..81a7e10a0cb30e6c51c985afdc6a11e023b3e3d2 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component; @@ -59,7 +59,7 @@ index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..068ff7593dcf0ca1cd2b01a112dd15a7 + public boolean warnIfEnabled = true; + // Gale end - recommend disabling timings on startup public boolean verbose = true; - public String url = "https://timings.aikar.co/"; + public String url = "https://timin.gs/"; // Gale - use timin.gs by default public boolean serverNamePrivacy = false; @@ -64,6 +69,13 @@ public class GlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0009-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0010-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0009-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0010-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0011-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0011-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0011-Reduce-projectile-chunk-loading.patch b/patches/server/0012-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0011-Reduce-projectile-chunk-loading.patch rename to patches/server/0012-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0012-Reduce-spooky-season-checks.patch b/patches/server/0013-Reduce-spooky-season-checks.patch similarity index 100% rename from patches/server/0012-Reduce-spooky-season-checks.patch rename to patches/server/0013-Reduce-spooky-season-checks.patch diff --git a/patches/server/0013-Move-random-tick-random.patch b/patches/server/0014-Move-random-tick-random.patch similarity index 100% rename from patches/server/0013-Move-random-tick-random.patch rename to patches/server/0014-Move-random-tick-random.patch diff --git a/patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0015-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0014-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0015-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0015-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0016-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0015-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0016-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0016-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0017-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0016-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0017-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0017-Remove-iterators-from-Inventory-contains.patch b/patches/server/0018-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0017-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0018-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0018-Check-targeting-range-before-getting-visibility.patch b/patches/server/0019-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0018-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0019-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0019-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0020-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0019-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0020-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0020-Improve-fluid-direction-caching.patch b/patches/server/0021-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0020-Improve-fluid-direction-caching.patch rename to patches/server/0021-Improve-fluid-direction-caching.patch diff --git a/patches/server/0021-Cache-on-climbable-check.patch b/patches/server/0022-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0021-Cache-on-climbable-check.patch rename to patches/server/0022-Cache-on-climbable-check.patch diff --git a/patches/server/0022-Config-to-disable-vanilla-profiler.patch b/patches/server/0023-Config-to-disable-vanilla-profiler.patch similarity index 100% rename from patches/server/0022-Config-to-disable-vanilla-profiler.patch rename to patches/server/0023-Config-to-disable-vanilla-profiler.patch diff --git a/patches/server/0023-Use-array-for-gamerule-storage.patch b/patches/server/0024-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0023-Use-array-for-gamerule-storage.patch rename to patches/server/0024-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0025-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0025-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0025-Improve-container-checking-with-a-bitset.patch b/patches/server/0026-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0025-Improve-container-checking-with-a-bitset.patch rename to patches/server/0026-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0026-Better-checking-for-useless-move-packets.patch b/patches/server/0027-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0026-Better-checking-for-useless-move-packets.patch rename to patches/server/0027-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0027-Use-fast-item-merge-raytracing.patch b/patches/server/0028-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0027-Use-fast-item-merge-raytracing.patch rename to patches/server/0028-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0028-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0029-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0028-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0029-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0029-Inline-level-height.patch b/patches/server/0030-Inline-level-height.patch similarity index 100% rename from patches/server/0029-Inline-level-height.patch rename to patches/server/0030-Inline-level-height.patch diff --git a/patches/server/0030-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0031-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0030-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0031-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0031-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0032-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0031-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0032-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0032-Remove-streams-from-getting-nearby-players.patch b/patches/server/0033-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0032-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0033-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0033-Skip-cloning-loot-parameters.patch b/patches/server/0034-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0033-Skip-cloning-loot-parameters.patch rename to patches/server/0034-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0034-Block-goal-does-not-load-chunks.patch b/patches/server/0035-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0034-Block-goal-does-not-load-chunks.patch rename to patches/server/0035-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0035-Reduce-entity-allocations.patch b/patches/server/0036-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0035-Reduce-entity-allocations.patch rename to patches/server/0036-Reduce-entity-allocations.patch diff --git a/patches/server/0036-Remove-lambda-from-ticking-guard.patch b/patches/server/0037-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0036-Remove-lambda-from-ticking-guard.patch rename to patches/server/0037-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0038-SIMD-support.patch b/patches/server/0039-SIMD-support.patch similarity index 100% rename from patches/server/0038-SIMD-support.patch rename to patches/server/0039-SIMD-support.patch diff --git a/patches/server/0039-Optimize-entity-coordinate-key.patch b/patches/server/0040-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0039-Optimize-entity-coordinate-key.patch rename to patches/server/0040-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0040-Reduce-in-wall-checks.patch b/patches/server/0041-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0040-Reduce-in-wall-checks.patch rename to patches/server/0041-Reduce-in-wall-checks.patch diff --git a/patches/server/0041-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0042-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0041-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0042-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0042-Reduce-hopper-item-checks.patch b/patches/server/0043-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0042-Reduce-hopper-item-checks.patch rename to patches/server/0043-Reduce-hopper-item-checks.patch diff --git a/patches/server/0043-Reduce-villager-item-re-pickup.patch b/patches/server/0044-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0043-Reduce-villager-item-re-pickup.patch rename to patches/server/0044-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0045-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0045-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0045-Do-not-log-invalid-statistics.patch b/patches/server/0046-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0045-Do-not-log-invalid-statistics.patch rename to patches/server/0046-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0046-Do-not-log-empty-message-warnings.patch b/patches/server/0047-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0046-Do-not-log-empty-message-warnings.patch rename to patches/server/0047-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0047-Do-not-log-ignored-advancements.patch b/patches/server/0048-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0047-Do-not-log-ignored-advancements.patch rename to patches/server/0048-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0048-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0049-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0048-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0049-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0049-Do-not-log-unrecognized-recipes.patch b/patches/server/0050-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0049-Do-not-log-unrecognized-recipes.patch rename to patches/server/0050-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0050-Do-not-log-legacy-Material-initialization.patch b/patches/server/0051-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0050-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0051-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0051-Do-not-log-expired-message-warnings.patch b/patches/server/0052-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0051-Do-not-log-expired-message-warnings.patch rename to patches/server/0052-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0052-Do-not-log-Not-Secure-marker.patch b/patches/server/0053-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0052-Do-not-log-Not-Secure-marker.patch rename to patches/server/0053-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0053-Do-not-log-run-as-root-warning.patch b/patches/server/0054-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0053-Do-not-log-run-as-root-warning.patch rename to patches/server/0054-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0054-Do-not-log-offline-mode-warning.patch b/patches/server/0055-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0054-Do-not-log-offline-mode-warning.patch rename to patches/server/0055-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0055-Softly-log-invalid-pool-element-errors.patch b/patches/server/0056-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0055-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0056-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0056-Fix-legacy-colors-in-console.patch b/patches/server/0057-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0056-Fix-legacy-colors-in-console.patch rename to patches/server/0057-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0058-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0058-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0058-Make-sand-duping-fix-configurable.patch b/patches/server/0059-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0058-Make-sand-duping-fix-configurable.patch rename to patches/server/0059-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0059-Fix-MC-238526.patch b/patches/server/0060-Fix-MC-238526.patch similarity index 100% rename from patches/server/0059-Fix-MC-238526.patch rename to patches/server/0060-Fix-MC-238526.patch diff --git a/patches/server/0060-Fix-MC-123848.patch b/patches/server/0061-Fix-MC-123848.patch similarity index 100% rename from patches/server/0060-Fix-MC-123848.patch rename to patches/server/0061-Fix-MC-123848.patch diff --git a/patches/server/0061-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0062-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0061-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0062-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0062-Fix-MC-121706.patch b/patches/server/0063-Fix-MC-121706.patch similarity index 100% rename from patches/server/0062-Fix-MC-121706.patch rename to patches/server/0063-Fix-MC-121706.patch diff --git a/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0064-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0064-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0064-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0065-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0064-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0065-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0065-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0066-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0065-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0066-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0066-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0066-Reduce-array-allocations.patch rename to patches/server/0067-Reduce-array-allocations.patch diff --git a/patches/server/0067-Optimize-sun-burn-tick.patch b/patches/server/0068-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0067-Optimize-sun-burn-tick.patch rename to patches/server/0068-Optimize-sun-burn-tick.patch diff --git a/patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0069-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0070-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0069-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0070-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0070-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0071-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0070-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0071-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0071-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0072-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0071-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0072-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0072-Replace-class-map-with-optimized-collection.patch b/patches/server/0073-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0072-Replace-class-map-with-optimized-collection.patch rename to patches/server/0073-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0073-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0074-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0073-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0074-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0074-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0074-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0075-Cache-BlockStatePairKey-hash.patch b/patches/server/0076-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0075-Cache-BlockStatePairKey-hash.patch rename to patches/server/0076-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0076-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0077-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0076-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0077-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0077-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0078-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0077-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0078-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0078-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0079-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0078-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0079-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0079-Check-frozen-ticks-before-landing-block.patch b/patches/server/0080-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0079-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0080-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0080-Faster-chunk-serialization.patch b/patches/server/0081-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0080-Faster-chunk-serialization.patch rename to patches/server/0081-Faster-chunk-serialization.patch diff --git a/patches/server/0081-Update-boss-bar-within-tick.patch b/patches/server/0082-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0081-Update-boss-bar-within-tick.patch rename to patches/server/0082-Update-boss-bar-within-tick.patch diff --git a/patches/server/0082-Cache-ominous-banner-item.patch b/patches/server/0083-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0082-Cache-ominous-banner-item.patch rename to patches/server/0083-Cache-ominous-banner-item.patch diff --git a/patches/server/0083-Precompute-piston-shapes.patch b/patches/server/0084-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0083-Precompute-piston-shapes.patch rename to patches/server/0084-Precompute-piston-shapes.patch diff --git a/patches/server/0084-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0084-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0085-Cache-world-generator-sea-level.patch b/patches/server/0086-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0085-Cache-world-generator-sea-level.patch rename to patches/server/0086-Cache-world-generator-sea-level.patch diff --git a/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0086-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0087-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0087-Store-mob-counts-in-an-array.patch b/patches/server/0088-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0087-Store-mob-counts-in-an-array.patch rename to patches/server/0088-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0088-Use-linked-map-for-entity-trackers.patch b/patches/server/0089-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0088-Use-linked-map-for-entity-trackers.patch rename to patches/server/0089-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0089-Optimize-noise-generation.patch b/patches/server/0090-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0089-Optimize-noise-generation.patch rename to patches/server/0090-Optimize-noise-generation.patch diff --git a/patches/server/0090-Ignore-durability-change-equipment-updates.patch b/patches/server/0091-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0090-Ignore-durability-change-equipment-updates.patch rename to patches/server/0091-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0092-Skip-cloning-advancement-criteria.patch b/patches/server/0093-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0092-Skip-cloning-advancement-criteria.patch rename to patches/server/0093-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0093-Player-canSee-by-entity-UUID.patch b/patches/server/0094-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0093-Player-canSee-by-entity-UUID.patch rename to patches/server/0094-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0094-Spread-out-sending-all-player-info.patch b/patches/server/0095-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0094-Spread-out-sending-all-player-info.patch rename to patches/server/0095-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0095-Optimize-player-list-for-sending-player-info.patch b/patches/server/0096-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0095-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0096-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0097-Send-multiple-keep-alive-packets.patch b/patches/server/0098-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0097-Send-multiple-keep-alive-packets.patch rename to patches/server/0098-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0098-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0098-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0099-Specific-interval-TPS-API.patch b/patches/server/0100-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0099-Specific-interval-TPS-API.patch rename to patches/server/0100-Specific-interval-TPS-API.patch diff --git a/patches/server/0100-5-second-TPS-average.patch b/patches/server/0101-5-second-TPS-average.patch similarity index 100% rename from patches/server/0100-5-second-TPS-average.patch rename to patches/server/0101-5-second-TPS-average.patch diff --git a/patches/server/0101-Measure-last-tick-time.patch b/patches/server/0102-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0101-Measure-last-tick-time.patch rename to patches/server/0102-Measure-last-tick-time.patch diff --git a/patches/server/0102-Last-tick-time-API.patch b/patches/server/0103-Last-tick-time-API.patch similarity index 100% rename from patches/server/0102-Last-tick-time-API.patch rename to patches/server/0103-Last-tick-time-API.patch diff --git a/patches/server/0103-Show-last-tick-time-in-tps-command.patch b/patches/server/0104-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0103-Show-last-tick-time-in-tps-command.patch rename to patches/server/0104-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0104-Increase-time-statistics-in-intervals.patch b/patches/server/0105-Increase-time-statistics-in-intervals.patch similarity index 95% rename from patches/server/0104-Increase-time-statistics-in-intervals.patch rename to patches/server/0105-Increase-time-statistics-in-intervals.patch index 01de761..6394a4d 100644 --- a/patches/server/0104-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0105-Increase-time-statistics-in-intervals.patch @@ -64,7 +64,7 @@ index 8818ca46af000926ed9eacb47953f440bdac1342..2bf1663dc1e969ea9e192c9941155eb9 int i = 29999999; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..1a8e57b9891a8f54da6024284ba0ed0cb4562a23 100644 +index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..ef430bc8b0527b919c91361aa9ddefc8eb2386d8 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -43,6 +43,25 @@ public class GaleGlobalConfiguration extends ConfigurationPart { @@ -83,11 +83,11 @@ index e92a4fc4a503a420b09e5373a6c1f5d2d71d32d6..1a8e57b9891a8f54da6024284ba0ed0c + * Given in ticks. + * Any value <= 0 behaves like 1. + *
    -+ *
  • Default: 20 (1 second)
  • ++ *
  • Default: 100 (5 seconds)
  • + *
  • Vanilla: 1
  • + *
+ */ -+ public int increaseTimeStatistics = 20; ++ public int increaseTimeStatistics = 100; + // Gale end - Hydrinity - increase time statistics in intervals + } diff --git a/patches/server/0105-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0106-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0105-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0106-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0106-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0107-Skip-negligible-planar-movement-multiplication.patch similarity index 84% rename from patches/server/0106-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0107-Skip-negligible-planar-movement-multiplication.patch index 6ae65cd..e4b9c5a 100644 --- a/patches/server/0106-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0107-Skip-negligible-planar-movement-multiplication.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..cb4b8628413f019621e07144f02e8d4738b21eff 100644 +index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..dbba8559117287932e7e400f03cd80ac7418c004 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1195,9 +1195,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -15,13 +15,13 @@ index f6b9c9c55effdc169d8226308b3163bc5c54b3ed..cb4b8628413f019621e07144f02e8d47 this.tryCheckInsideBlocks(); + // Gale start - skip negligible planar movement multiplication + Vec3 oldDeltaMovement = this.getDeltaMovement(); -+ if (oldDeltaMovement.x < -1e-7 || oldDeltaMovement.x > 1e-7 || oldDeltaMovement.z < -1e-7 || oldDeltaMovement.z > 1e-7) { ++ if (oldDeltaMovement.x < -1e-6 || oldDeltaMovement.x > 1e-6 || oldDeltaMovement.z < -1e-6 || oldDeltaMovement.z > 1e-6) { + // Gale end - skip negligible planar movement multiplication float f2 = this.getBlockSpeedFactor(); - this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2)); + // Gale start - skip negligible planar movement multiplication -+ if (f2 < 1 - 1e-7 || f2 > 1 + 1e-7) { ++ if (f2 < 1 - 1e-6 || f2 > 1 + 1e-6) { + this.setDeltaMovement(oldDeltaMovement.multiply(f2, 1.0D, f2)); + } + } diff --git a/patches/server/0107-Variable-main-thread-task-delay.patch b/patches/server/0108-Variable-main-thread-task-delay.patch similarity index 99% rename from patches/server/0107-Variable-main-thread-task-delay.patch rename to patches/server/0108-Variable-main-thread-task-delay.patch index d1043bc..e9c4c38 100644 --- a/patches/server/0107-Variable-main-thread-task-delay.patch +++ b/patches/server/0108-Variable-main-thread-task-delay.patch @@ -864,7 +864,7 @@ index 0000000000000000000000000000000000000000..4b82aea23b99180f13c71a1797c4d829 + +} diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 1a8e57b9891a8f54da6024284ba0ed0cb4562a23..9bf34c19b41058108af5bc7be4f8d9fa89f3d8bd 100644 +index ef430bc8b0527b919c91361aa9ddefc8eb2386d8..6717384db82ac8615b8e9c8490fd6f3f3eae1ec9 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -2,11 +2,14 @@ diff --git a/patches/server/0108-Reduce-RandomSource-instances.patch b/patches/server/0109-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0108-Reduce-RandomSource-instances.patch rename to patches/server/0109-Reduce-RandomSource-instances.patch diff --git a/patches/server/0109-CPU-cores-estimation.patch b/patches/server/0110-CPU-cores-estimation.patch similarity index 98% rename from patches/server/0109-CPU-cores-estimation.patch rename to patches/server/0110-CPU-cores-estimation.patch index 57ef626..1b9be6d 100644 --- a/patches/server/0109-CPU-cores-estimation.patch +++ b/patches/server/0110-CPU-cores-estimation.patch @@ -44,7 +44,7 @@ index 947ad1463a973546bdaf68654086291a3414aa9b..69bde99acff7bdae9af7cfe60e222167 import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 9bf34c19b41058108af5bc7be4f8d9fa89f3d8bd..871f8866982b4b1dd1990e522dc9c9447df7652f 100644 +index 6717384db82ac8615b8e9c8490fd6f3f3eae1ec9..f2a9c2a3a0ba42f94182421dcaf7287da3fb09be 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -307,6 +307,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0110-Add-centralized-AsyncExecutor.patch b/patches/server/0111-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0110-Add-centralized-AsyncExecutor.patch rename to patches/server/0111-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0111-Remove-Paper-async-executor.patch b/patches/server/0112-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0111-Remove-Paper-async-executor.patch rename to patches/server/0112-Remove-Paper-async-executor.patch diff --git a/patches/server/0112-Remove-Paper-cleaner-executor.patch b/patches/server/0113-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0112-Remove-Paper-cleaner-executor.patch rename to patches/server/0113-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0113-Remove-background-executor.patch b/patches/server/0114-Remove-background-executor.patch similarity index 100% rename from patches/server/0113-Remove-background-executor.patch rename to patches/server/0114-Remove-background-executor.patch diff --git a/patches/server/0114-Remove-bootstrap-executor.patch b/patches/server/0115-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0114-Remove-bootstrap-executor.patch rename to patches/server/0115-Remove-bootstrap-executor.patch diff --git a/patches/server/0115-Remove-world-upgrade-executors.patch b/patches/server/0116-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0115-Remove-world-upgrade-executors.patch rename to patches/server/0116-Remove-world-upgrade-executors.patch diff --git a/patches/server/0116-Remove-tab-complete-executor.patch b/patches/server/0117-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0116-Remove-tab-complete-executor.patch rename to patches/server/0117-Remove-tab-complete-executor.patch diff --git a/patches/server/0117-Remove-text-filter-executor.patch b/patches/server/0118-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0117-Remove-text-filter-executor.patch rename to patches/server/0118-Remove-text-filter-executor.patch