diff --git a/leaf-server/minecraft-patches/features/0158-Reduce-PlayerChunk-Updates.patch b/leaf-archived-patches/removed/hardfork/server/0158-Reduce-PlayerChunk-Updates.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0158-Reduce-PlayerChunk-Updates.patch rename to leaf-archived-patches/removed/hardfork/server/0158-Reduce-PlayerChunk-Updates.patch diff --git a/leaf-server/minecraft-patches/features/0159-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0158-Async-switch-connection-state.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0159-Async-switch-connection-state.patch rename to leaf-server/minecraft-patches/features/0158-Async-switch-connection-state.patch diff --git a/leaf-server/minecraft-patches/features/0160-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0159-Optimize-BlockEntities-tickersInLevel.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0160-Optimize-BlockEntities-tickersInLevel.patch rename to leaf-server/minecraft-patches/features/0159-Optimize-BlockEntities-tickersInLevel.patch diff --git a/leaf-server/minecraft-patches/features/0161-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0160-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0161-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch rename to leaf-server/minecraft-patches/features/0160-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch diff --git a/leaf-server/minecraft-patches/features/0162-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0161-Flush-location-while-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0162-Flush-location-while-knockback.patch rename to leaf-server/minecraft-patches/features/0161-Flush-location-while-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0163-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0162-Only-tick-items-at-hand.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0163-Only-tick-items-at-hand.patch rename to leaf-server/minecraft-patches/features/0162-Only-tick-items-at-hand.patch diff --git a/leaf-server/minecraft-patches/features/0164-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0163-Smart-sort-items-in-NearestItemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0164-Smart-sort-items-in-NearestItemSensor.patch rename to leaf-server/minecraft-patches/features/0163-Smart-sort-items-in-NearestItemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0165-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0164-Optimise-player-movement-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0165-Optimise-player-movement-checks.patch rename to leaf-server/minecraft-patches/features/0164-Optimise-player-movement-checks.patch diff --git a/leaf-server/minecraft-patches/features/0166-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0165-Remove-streams-in-MobSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0166-Remove-streams-in-MobSensor.patch rename to leaf-server/minecraft-patches/features/0165-Remove-streams-in-MobSensor.patch diff --git a/leaf-server/minecraft-patches/features/0167-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0166-Remove-streams-in-TemptingSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0167-Remove-streams-in-TemptingSensor.patch rename to leaf-server/minecraft-patches/features/0166-Remove-streams-in-TemptingSensor.patch diff --git a/leaf-server/minecraft-patches/features/0168-Use-HashedList-on-WeightedRandomList.patch b/leaf-server/minecraft-patches/features/0167-Use-HashedList-on-WeightedRandomList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0168-Use-HashedList-on-WeightedRandomList.patch rename to leaf-server/minecraft-patches/features/0167-Use-HashedList-on-WeightedRandomList.patch diff --git a/leaf-server/minecraft-patches/features/0169-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0168-Add-configurable-death-item-drop-knockback-settings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0169-Add-configurable-death-item-drop-knockback-settings.patch rename to leaf-server/minecraft-patches/features/0168-Add-configurable-death-item-drop-knockback-settings.patch diff --git a/leaf-server/minecraft-patches/features/0170-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0169-Optimize-getScaledTrackingDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0170-Optimize-getScaledTrackingDistance.patch rename to leaf-server/minecraft-patches/features/0169-Optimize-getScaledTrackingDistance.patch diff --git a/leaf-server/minecraft-patches/features/0171-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0170-Optimize-SynchedEntityData-packDirty.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0171-Optimize-SynchedEntityData-packDirty.patch rename to leaf-server/minecraft-patches/features/0170-Optimize-SynchedEntityData-packDirty.patch diff --git a/leaf-server/minecraft-patches/features/0172-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0171-Optimize-isEyeInFluid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0172-Optimize-isEyeInFluid.patch rename to leaf-server/minecraft-patches/features/0171-Optimize-isEyeInFluid.patch diff --git a/leaf-server/minecraft-patches/features/0173-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0172-Cache-block-path-type.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0173-Cache-block-path-type.patch rename to leaf-server/minecraft-patches/features/0172-Cache-block-path-type.patch diff --git a/leaf-server/minecraft-patches/features/0174-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0173-optimize-getEntityStatus.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0174-optimize-getEntityStatus.patch rename to leaf-server/minecraft-patches/features/0173-optimize-getEntityStatus.patch diff --git a/leaf-server/minecraft-patches/features/0175-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0174-Rail-Optimization-optimized-PoweredRailBlock-logic.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0175-Rail-Optimization-optimized-PoweredRailBlock-logic.patch rename to leaf-server/minecraft-patches/features/0174-Rail-Optimization-optimized-PoweredRailBlock-logic.patch diff --git a/leaf-server/minecraft-patches/features/0176-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0175-optimise-ChunkGenerator-getMobsAt.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0176-optimise-ChunkGenerator-getMobsAt.patch rename to leaf-server/minecraft-patches/features/0175-optimise-ChunkGenerator-getMobsAt.patch diff --git a/leaf-server/minecraft-patches/features/0177-optimise-getBiome.patch b/leaf-server/minecraft-patches/features/0176-optimise-getBiome.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0177-optimise-getBiome.patch rename to leaf-server/minecraft-patches/features/0176-optimise-getBiome.patch diff --git a/leaf-server/minecraft-patches/features/0178-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0177-optimize-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0178-optimize-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0177-optimize-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0179-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0178-optimize-structure-map.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0179-optimize-structure-map.patch rename to leaf-server/minecraft-patches/features/0178-optimize-structure-map.patch diff --git a/leaf-server/minecraft-patches/features/0180-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0179-throttle-mob-spawning.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0180-throttle-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0179-throttle-mob-spawning.patch index 3f0377fd..4eb97e17 100644 --- a/leaf-server/minecraft-patches/features/0180-throttle-mob-spawning.patch +++ b/leaf-server/minecraft-patches/features/0179-throttle-mob-spawning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] throttle mob spawning diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java -index bde7008e14a3b4c0a37a94a4890e2f7fa1ce2466..458b17dca84c87591b030679c5aac6259c0f8308 100644 +index 8f999b425bce52352a04ee3ca11b6854194dd665..48ab439560c6ba83d34163cc7402146e69e7c277 100644 --- a/net/minecraft/world/level/NaturalSpawner.java +++ b/net/minecraft/world/level/NaturalSpawner.java @@ -166,6 +166,17 @@ public final class NaturalSpawner { diff --git a/leaf-server/minecraft-patches/features/0181-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0180-Add-BlockExplosionHitEvent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0181-Add-BlockExplosionHitEvent.patch rename to leaf-server/minecraft-patches/features/0180-Add-BlockExplosionHitEvent.patch diff --git a/leaf-server/minecraft-patches/features/0182-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0181-Old-Blast-Protection-explosion-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0182-Old-Blast-Protection-explosion-knockback.patch rename to leaf-server/minecraft-patches/features/0181-Old-Blast-Protection-explosion-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0183-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0182-Use-UUID-for-cure-reputation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0183-Use-UUID-for-cure-reputation.patch rename to leaf-server/minecraft-patches/features/0182-Use-UUID-for-cure-reputation.patch diff --git a/leaf-server/minecraft-patches/features/0184-Cache-potential-behaviors-in-Brain.patch b/leaf-server/minecraft-patches/features/0183-Cache-potential-behaviors-in-Brain.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0184-Cache-potential-behaviors-in-Brain.patch rename to leaf-server/minecraft-patches/features/0183-Cache-potential-behaviors-in-Brain.patch diff --git a/leaf-server/minecraft-patches/features/0185-Use-ActivationList-on-runningBehaviors.patch b/leaf-server/minecraft-patches/features/0184-Use-ActivationList-on-runningBehaviors.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0185-Use-ActivationList-on-runningBehaviors.patch rename to leaf-server/minecraft-patches/features/0184-Use-ActivationList-on-runningBehaviors.patch diff --git a/leaf-server/minecraft-patches/features/0186-Paper-Fix-infinite-loop-in-RegionFile-IO.patch b/leaf-server/minecraft-patches/features/0185-Paper-Fix-infinite-loop-in-RegionFile-IO.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0186-Paper-Fix-infinite-loop-in-RegionFile-IO.patch rename to leaf-server/minecraft-patches/features/0185-Paper-Fix-infinite-loop-in-RegionFile-IO.patch diff --git a/leaf-server/minecraft-patches/features/0187-Paper-Fix-excess-slot-updates.patch b/leaf-server/minecraft-patches/features/0186-Paper-Fix-excess-slot-updates.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0187-Paper-Fix-excess-slot-updates.patch rename to leaf-server/minecraft-patches/features/0186-Paper-Fix-excess-slot-updates.patch diff --git a/leaf-server/minecraft-patches/features/0188-Paper-Fix-incorrect-createPath-overload-arguments.patch b/leaf-server/minecraft-patches/features/0187-Paper-Fix-incorrect-createPath-overload-arguments.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0188-Paper-Fix-incorrect-createPath-overload-arguments.patch rename to leaf-server/minecraft-patches/features/0187-Paper-Fix-incorrect-createPath-overload-arguments.patch diff --git a/leaf-server/minecraft-patches/features/0189-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0188-Fix-crash-during-parsing-unknown-command-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0189-Fix-crash-during-parsing-unknown-command-message.patch rename to leaf-server/minecraft-patches/features/0188-Fix-crash-during-parsing-unknown-command-message.patch diff --git a/leaf-server/minecraft-patches/features/0190-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0189-Paw-optimization.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0190-Paw-optimization.patch rename to leaf-server/minecraft-patches/features/0189-Paw-optimization.patch diff --git a/leaf-server/minecraft-patches/features/0191-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0190-optimize-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0191-optimize-random-tick.patch rename to leaf-server/minecraft-patches/features/0190-optimize-random-tick.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 f04aa9db..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); - - if (config.getBoolean(getBasePath() + ".enabled", enabled)) { - LOGGER.warn("The 'reduce-chunk-source-updates' feature is experimental and has been enabled."); - } - } -}