diff --git a/leaf-server/minecraft-patches/features/0241-Reduce-PlayerChunk-Updates.patch b/leaf-archived-patches/removed/1.21.7/0241-Reduce-PlayerChunk-Updates.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0241-Reduce-PlayerChunk-Updates.patch rename to leaf-archived-patches/removed/1.21.7/0241-Reduce-PlayerChunk-Updates.patch diff --git a/leaf-server/minecraft-patches/features/0242-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0241-Async-switch-connection-state.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0242-Async-switch-connection-state.patch rename to leaf-server/minecraft-patches/features/0241-Async-switch-connection-state.patch diff --git a/leaf-server/minecraft-patches/features/0243-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0242-Optimize-BlockEntities-tickersInLevel.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0243-Optimize-BlockEntities-tickersInLevel.patch rename to leaf-server/minecraft-patches/features/0242-Optimize-BlockEntities-tickersInLevel.patch diff --git a/leaf-server/minecraft-patches/features/0244-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0243-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0244-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch rename to leaf-server/minecraft-patches/features/0243-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch diff --git a/leaf-server/minecraft-patches/features/0245-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0244-Flush-location-while-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0245-Flush-location-while-knockback.patch rename to leaf-server/minecraft-patches/features/0244-Flush-location-while-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0246-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0245-Only-tick-items-at-hand.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0246-Only-tick-items-at-hand.patch rename to leaf-server/minecraft-patches/features/0245-Only-tick-items-at-hand.patch index b097fe73..e44a4176 100644 --- a/leaf-server/minecraft-patches/features/0246-Only-tick-items-at-hand.patch +++ b/leaf-server/minecraft-patches/features/0245-Only-tick-items-at-hand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Only tick items at hand diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b2776aa49319a6ed46a8770091f8d8225f393eaa..905a532f22b1155641c5a7c66f8cd18ab6447e99 100644 +index 7eb59771ac977aeeca33abd8d359b180a22215c5..4a39b4ee1ea860a8a47bdad67ac79c74157b6d07 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -846,12 +846,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/leaf-server/minecraft-patches/features/0247-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0246-Smart-sort-items-in-NearestItemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0247-Smart-sort-items-in-NearestItemSensor.patch rename to leaf-server/minecraft-patches/features/0246-Smart-sort-items-in-NearestItemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0248-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0247-Optimise-player-movement-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0248-Optimise-player-movement-checks.patch rename to leaf-server/minecraft-patches/features/0247-Optimise-player-movement-checks.patch diff --git a/leaf-server/minecraft-patches/features/0249-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0248-Remove-streams-in-MobSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0249-Remove-streams-in-MobSensor.patch rename to leaf-server/minecraft-patches/features/0248-Remove-streams-in-MobSensor.patch diff --git a/leaf-server/minecraft-patches/features/0250-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0249-Remove-streams-in-TemptingSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0250-Remove-streams-in-TemptingSensor.patch rename to leaf-server/minecraft-patches/features/0249-Remove-streams-in-TemptingSensor.patch diff --git a/leaf-server/minecraft-patches/features/0251-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0250-Use-HashedList-on-WeightedList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0251-Use-HashedList-on-WeightedList.patch rename to leaf-server/minecraft-patches/features/0250-Use-HashedList-on-WeightedList.patch diff --git a/leaf-server/minecraft-patches/features/0252-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0251-Add-configurable-death-item-drop-knockback-settings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0252-Add-configurable-death-item-drop-knockback-settings.patch rename to leaf-server/minecraft-patches/features/0251-Add-configurable-death-item-drop-knockback-settings.patch diff --git a/leaf-server/minecraft-patches/features/0253-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0252-Optimize-getScaledTrackingDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0253-Optimize-getScaledTrackingDistance.patch rename to leaf-server/minecraft-patches/features/0252-Optimize-getScaledTrackingDistance.patch diff --git a/leaf-server/minecraft-patches/features/0254-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0253-Optimize-SynchedEntityData-packDirty.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0254-Optimize-SynchedEntityData-packDirty.patch rename to leaf-server/minecraft-patches/features/0253-Optimize-SynchedEntityData-packDirty.patch diff --git a/leaf-server/minecraft-patches/features/0255-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0254-Optimize-isEyeInFluid.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0255-Optimize-isEyeInFluid.patch rename to leaf-server/minecraft-patches/features/0254-Optimize-isEyeInFluid.patch index 788d3f82..8545af40 100644 --- a/leaf-server/minecraft-patches/features/0255-Optimize-isEyeInFluid.patch +++ b/leaf-server/minecraft-patches/features/0254-Optimize-isEyeInFluid.patch @@ -175,7 +175,7 @@ index c8354d46ed909090f7c15f396863bf7d73afcefa..3ee788b172240ccf38cb31385dff1336 } else if (!flag) { this.applyGravity(); diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index f1975e5ab19da6dd1d8b94503924471e3efab921..6f57a8de40a398312e14282ff6764a633a949049 100644 +index 93c1e8f39f8db3cd69959f1528ef80481f74e8b0..f18843e7a13ed5d98086e65e896aa98e5f6af281 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -463,7 +463,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0256-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0255-Cache-block-path-type.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0256-Cache-block-path-type.patch rename to leaf-server/minecraft-patches/features/0255-Cache-block-path-type.patch diff --git a/leaf-server/minecraft-patches/features/0257-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0256-optimize-getEntityStatus.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0257-optimize-getEntityStatus.patch rename to leaf-server/minecraft-patches/features/0256-optimize-getEntityStatus.patch diff --git a/leaf-server/minecraft-patches/features/0258-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0257-Rail-Optimization-optimized-PoweredRailBlock-logic.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0258-Rail-Optimization-optimized-PoweredRailBlock-logic.patch rename to leaf-server/minecraft-patches/features/0257-Rail-Optimization-optimized-PoweredRailBlock-logic.patch diff --git a/leaf-server/minecraft-patches/features/0259-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0258-optimise-ChunkGenerator-getMobsAt.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0259-optimise-ChunkGenerator-getMobsAt.patch rename to leaf-server/minecraft-patches/features/0258-optimise-ChunkGenerator-getMobsAt.patch diff --git a/leaf-server/minecraft-patches/features/0260-cache-getBiome.patch b/leaf-server/minecraft-patches/features/0259-cache-getBiome.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0260-cache-getBiome.patch rename to leaf-server/minecraft-patches/features/0259-cache-getBiome.patch diff --git a/leaf-server/minecraft-patches/features/0261-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0260-optimize-mob-spawning.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0261-optimize-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0260-optimize-mob-spawning.patch index f1c4081c..aa06e894 100644 --- a/leaf-server/minecraft-patches/features/0261-optimize-mob-spawning.patch +++ b/leaf-server/minecraft-patches/features/0260-optimize-mob-spawning.patch @@ -14,7 +14,7 @@ Generally faster than the non-async approach iterate over all entities, get their chunk, and increment the count diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java -index a640cb4d767c6c81ad27bbf0dd8027a80a2fc224..f4d4f39540a25d6772c8078d0ff01af04d90c8e7 100644 +index 79674f4bd7a12c42dec19a4175012d7a2dc88b84..0a97a491737807d59815b75635fa3d8c94901ba8 100644 --- a/net/minecraft/server/level/ChunkMap.java +++ b/net/minecraft/server/level/ChunkMap.java @@ -287,6 +287,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/leaf-server/minecraft-patches/features/0262-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0261-optimize-structure-map.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0262-optimize-structure-map.patch rename to leaf-server/minecraft-patches/features/0261-optimize-structure-map.patch diff --git a/leaf-server/minecraft-patches/features/0263-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0262-throttle-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0263-throttle-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0262-throttle-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0264-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0263-Add-BlockExplosionHitEvent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0264-Add-BlockExplosionHitEvent.patch rename to leaf-server/minecraft-patches/features/0263-Add-BlockExplosionHitEvent.patch diff --git a/leaf-server/minecraft-patches/features/0265-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0264-Old-Blast-Protection-explosion-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0265-Old-Blast-Protection-explosion-knockback.patch rename to leaf-server/minecraft-patches/features/0264-Old-Blast-Protection-explosion-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0266-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0265-Use-UUID-for-cure-reputation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0266-Use-UUID-for-cure-reputation.patch rename to leaf-server/minecraft-patches/features/0265-Use-UUID-for-cure-reputation.patch diff --git a/leaf-server/minecraft-patches/features/0267-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0266-Fix-crash-during-parsing-unknown-command-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0267-Fix-crash-during-parsing-unknown-command-message.patch rename to leaf-server/minecraft-patches/features/0266-Fix-crash-during-parsing-unknown-command-message.patch diff --git a/leaf-server/minecraft-patches/features/0268-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0267-optimize-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0268-optimize-random-tick.patch rename to leaf-server/minecraft-patches/features/0267-optimize-random-tick.patch diff --git a/leaf-server/minecraft-patches/features/0269-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0268-do-not-log-invalid-flatten-text-component-parse.patch similarity index 91% rename from leaf-server/minecraft-patches/features/0269-do-not-log-invalid-flatten-text-component-parse.patch rename to leaf-server/minecraft-patches/features/0268-do-not-log-invalid-flatten-text-component-parse.patch index 68eecd26..d93ebfdb 100644 --- a/leaf-server/minecraft-patches/features/0269-do-not-log-invalid-flatten-text-component-parse.patch +++ b/leaf-server/minecraft-patches/features/0268-do-not-log-invalid-flatten-text-component-parse.patch @@ -5,7 +5,7 @@ Subject: [PATCH] do not log invalid flatten text component parse diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java -index d5dfa9a64e2d3f9a37a5bdde60b92ed93bd89aed..83155bf0befab0207a4b756b19527d071037a870 100644 +index 44e74a97debbb36deb50a1f726ee25cc5272ab09..98311af4cc0256399f0cf782c744b268497b86fc 100644 --- a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java +++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java @@ -254,7 +254,7 @@ public final class V4290 { diff --git a/leaf-server/minecraft-patches/features/0270-Fast-BiomeManager-seed-obfuscation.patch b/leaf-server/minecraft-patches/features/0269-Fast-BiomeManager-seed-obfuscation.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0270-Fast-BiomeManager-seed-obfuscation.patch rename to leaf-server/minecraft-patches/features/0269-Fast-BiomeManager-seed-obfuscation.patch index 01aa376d..9bc49569 100644 --- a/leaf-server/minecraft-patches/features/0270-Fast-BiomeManager-seed-obfuscation.patch +++ b/leaf-server/minecraft-patches/features/0269-Fast-BiomeManager-seed-obfuscation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fast BiomeManager seed obfuscation Pretty tiny optimization, but better than nothing diff --git a/net/minecraft/world/level/biome/BiomeManager.java b/net/minecraft/world/level/biome/BiomeManager.java -index bda44479d1537d9fa2d23f519049aeb96685fbe6..effe0bac502c72d9555509944001e16afa811962 100644 +index b8a0fa20101fa3831e34494fd56690343ff8d57e..74cfd72d756c0b877adc27ad5b2d83e5240d3e75 100644 --- a/net/minecraft/world/level/biome/BiomeManager.java +++ b/net/minecraft/world/level/biome/BiomeManager.java @@ -34,9 +34,18 @@ public class BiomeManager { diff --git a/leaf-server/minecraft-patches/features/0271-Replace-EntitySelectorOptions-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0270-Replace-EntitySelectorOptions-map-with-optimized-col.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0271-Replace-EntitySelectorOptions-map-with-optimized-col.patch rename to leaf-server/minecraft-patches/features/0270-Replace-EntitySelectorOptions-map-with-optimized-col.patch diff --git a/leaf-server/minecraft-patches/features/0272-Cache-function-execution-result.patch b/leaf-server/minecraft-patches/features/0271-Cache-function-execution-result.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0272-Cache-function-execution-result.patch rename to leaf-server/minecraft-patches/features/0271-Cache-function-execution-result.patch diff --git a/leaf-server/minecraft-patches/features/0273-optimize-no-action-time.patch b/leaf-server/minecraft-patches/features/0272-optimize-no-action-time.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0273-optimize-no-action-time.patch rename to leaf-server/minecraft-patches/features/0272-optimize-no-action-time.patch diff --git a/leaf-server/minecraft-patches/features/0274-optimize-waypoint.patch b/leaf-server/minecraft-patches/features/0273-optimize-waypoint.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0274-optimize-waypoint.patch rename to leaf-server/minecraft-patches/features/0273-optimize-waypoint.patch diff --git a/leaf-server/minecraft-patches/features/0275-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0274-Paw-optimization.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0275-Paw-optimization.patch rename to leaf-server/minecraft-patches/features/0274-Paw-optimization.patch index 6248324c..991829eb 100644 --- a/leaf-server/minecraft-patches/features/0275-Paw-optimization.patch +++ b/leaf-server/minecraft-patches/features/0274-Paw-optimization.patch @@ -132,7 +132,7 @@ index 307738d09dc4eb5918cbfb1153feb739fbc1cc68..0fc09b85e9d8e12f8103dcf755afa392 private void tickPassenger(Entity ridingEntity, Entity passengerEntity, final boolean isActive) { // Paper - EAR 2 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 50dd29948e89e3f618722201841429121d7f19e0..502c6afe9ff8cb3d163862920794f15cec2f78a8 100644 +index f408c1f89435b473896249834a081a0b34aa7767..918cb68282ce179c6c3f5455f108501f7e965068 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1170,16 +1170,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0276-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch b/leaf-server/minecraft-patches/features/0275-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0276-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch rename to leaf-server/minecraft-patches/features/0275-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceChunkSourceUpdates.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceChunkSourceUpdates.java deleted file mode 100644 index 3a322b14..00000000 --- a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ReduceChunkSourceUpdates.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dreeam.leaf.config.modules.opt; - -import org.dreeam.leaf.config.ConfigModules; -import org.dreeam.leaf.config.EnumConfigCategory; -import org.dreeam.leaf.config.annotations.Experimental; - -public class ReduceChunkSourceUpdates extends ConfigModules { - - public String getBasePath() { - return EnumConfigCategory.PERF.getBaseKeyName() + ".reduce-chunk-source-updates"; - } - - @Experimental - public static boolean enabled = false; - - @Override - public void onLoaded() { - config.addCommentRegionBased(getBasePath(), """ - *** Experimental Feature *** - Reduces chunk source updates on inter-chunk player moves.""", - """ - *** 实验性功能 *** - 减少玩家跨区块移动时的区块源更新.""" - ); - enabled = config.getBoolean(getBasePath() + ".force-enabled", enabled); - boolean oldEnabled = config.getBoolean(getBasePath() + ".enabled", enabled); - if (!enabled && oldEnabled) { - LOGGER.warn("Disabled reduce-chunk-source-updates due to experimentation"); - } - } -}