diff --git a/patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0031-Pufferfish-Entity-TTL.patch b/patches/server/0032-Pufferfish-Entity-TTL.patch similarity index 97% rename from patches/server/0031-Pufferfish-Entity-TTL.patch rename to patches/server/0032-Pufferfish-Entity-TTL.patch index 947e7f8..562f4bc 100644 --- a/patches/server/0031-Pufferfish-Entity-TTL.patch +++ b/patches/server/0032-Pufferfish-Entity-TTL.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3958bc6d5172698af88555352a5321083c2367d3..1aaa53cc5baf31298db1c839641ceff30031f5c3 100644 +index 44a08cc2e94d52747ba6a66e4b57543dfa5f66c2..d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch index a91080d..4dd13ff 100644 --- a/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44 if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed entity.discard(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1aaa53cc5baf31298db1c839641ceff30031f5c3..05b72a949821f9fdac227e09343e1dd98d4a810a 100644 +index d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b..577a194e9d9828520560e3546dba8532ca18782a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0034-Pufferfish-Optimize-suffocation.patch b/patches/server/0035-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0034-Pufferfish-Optimize-suffocation.patch rename to patches/server/0035-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0037-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0038-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch deleted file mode 100644 index b6bdf41..0000000 --- a/patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Wed, 31 Jul 2024 13:32:24 +0800 -Subject: [PATCH] Gale Don't load chunks to activate climbing entities - - -diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/LoadChunksToActiveClimbingEntitiesConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/LoadChunksToActiveClimbingEntitiesConfig.java -new file mode 100644 -index 0000000000000000000000000000000000000000..ed62d25d6cd6dfcf8c5db20ced36eb3d3c79dafd ---- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/LoadChunksToActiveClimbingEntitiesConfig.java -@@ -0,0 +1,20 @@ -+package me.earthme.luminol.config.modules.optimizations; -+ -+import me.earthme.luminol.config.ConfigInfo; -+import me.earthme.luminol.config.EnumConfigCategory; -+import me.earthme.luminol.config.IConfigModule; -+ -+public class LoadChunksToActiveClimbingEntitiesConfig implements IConfigModule { -+ @ConfigInfo(baseName = "allow") -+ public static boolean allow = false; -+ -+ @Override -+ public EnumConfigCategory getCategory() { -+ return EnumConfigCategory.OPTIMIZATIONS; -+ } -+ -+ @Override -+ public String getBaseName() { -+ return "load_chunks_to_active_climbing_entities"; -+ } -+} -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ab60afc23f8caa7603efe5e7eb26cf6e27801786..03a9e5879ef8d579816b6ff70037fb00007bc824 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -5427,6 +5427,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess - return this.inBlockState; - } - -+ // Gale start - don't load chunks to activate climbing entities -+ public @Nullable BlockState getFeetBlockStateIfLoaded() { -+ if (this.inBlockState == null) { -+ this.inBlockState = this.level.getBlockStateIfLoaded(this.blockPosition()); -+ } -+ -+ return this.inBlockState; -+ } -+ // Gale end - don't load chunks to activate climbing entities -+ - public ChunkPos chunkPosition() { - return this.chunkPosition; - } -diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f39842df9abb752f43a5b98030a276baf71f7067..6a19b65162fbc6104050a072c5e8ac9608aae5a4 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2103,19 +2103,43 @@ public abstract class LivingEntity extends Entity implements Attackable { - - public boolean onClimableCached() { - if (!this.blockPosition().equals(this.lastClimbingPosition)) { -- this.cachedOnClimable = this.onClimbable(); -- this.lastClimbingPosition = this.blockPosition(); -+ // Gale start - don't load chunks to activate climbing entities -+ Boolean onClimbableIfLoaded = this.onClimbable(me.earthme.luminol.config.modules.optimizations.LoadChunksToActiveClimbingEntitiesConfig.allow); -+ if (onClimbableIfLoaded != null) { -+ this.cachedOnClimable = onClimbableIfLoaded; -+ this.lastClimbingPosition = this.blockPosition(); -+ } else { -+ this.cachedOnClimable = false; -+ this.lastClimbingPosition = null; -+ } -+ // Gale end - don't load chunks to activate climbing entities - } - return this.cachedOnClimable; - } - // Pufferfish end - - public boolean onClimbable() { -+ // Gale start - don't load chunks to activate climbing entities -+ return onClimbable(true); -+ } -+ -+ public Boolean onClimbable(boolean loadChunk) { -+ // Gale end - don't load chunks to activate climbing entities - if (this.isSpectator()) { - return false; - } else { - BlockPos blockposition = this.blockPosition(); -- BlockState iblockdata = this.getInBlockState(); -+ // Gale start - don't load chunks to activate climbing entities -+ BlockState iblockdata; -+ if (loadChunk) { -+ iblockdata = this.getInBlockState(); -+ } else { -+ iblockdata = this.getFeetBlockStateIfLoaded(); -+ if (iblockdata == null) { -+ return null; -+ } -+ } -+ // Gale end - don't load chunks to activate climbing entities - - if (iblockdata.is(BlockTags.CLIMBABLE)) { - this.lastClimbablePos = Optional.of(blockposition); diff --git a/patches/server/0038-Gale-Optimize-sun-burn-tick.patch b/patches/server/0039-Gale-Optimize-sun-burn-tick.patch similarity index 97% rename from patches/server/0038-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0039-Gale-Optimize-sun-burn-tick.patch index 799a859..bc246bc 100644 --- a/patches/server/0038-Gale-Optimize-sun-burn-tick.patch +++ b/patches/server/0039-Gale-Optimize-sun-burn-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 05b72a949821f9fdac227e09343e1dd98d4a810a..ab60afc23f8caa7603efe5e7eb26cf6e27801786 100644 +index 577a194e9d9828520560e3546dba8532ca18782a..6870db1f03e44e8023e173a0d7a6a7f09f41e989 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0040-Gale-Use-platform-math-functions.patch b/patches/server/0041-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0040-Gale-Use-platform-math-functions.patch rename to patches/server/0041-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch index 23396d3..2de8335 100644 --- a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 03a9e5879ef8d579816b6ff70037fb00007bc824..548d95943ef25b6895f0f48b2861eb9996277d79 100644 +index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487c2c02c4c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0042-Gale-Optimize-noise-generation.patch b/patches/server/0043-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0042-Gale-Optimize-noise-generation.patch rename to patches/server/0043-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0043-Gale-Faster-chunk-serialization.patch b/patches/server/0044-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0043-Gale-Faster-chunk-serialization.patch rename to patches/server/0044-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0044-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 99% rename from patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 090d584..66bb7b8 100644 --- a/patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47 + // KioCG end } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 548d95943ef25b6895f0f48b2861eb9996277d79..06beb2c8dbdc070083a3e10c500ed537da9b4a2d 100644 +index ceb0bf3071865c85dfa5a270150ff487c2c02c4c..ae39e58170085f83303d53eb6b7eb72f0a961be3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -5867,4 +5867,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5999,4 +5999,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end - Expose entity id counter diff --git a/patches/server/0050-Purpur-use-alternative-keep-alive.patch b/patches/server/0051-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0050-Purpur-use-alternative-keep-alive.patch rename to patches/server/0051-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0051-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0052-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0051-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0052-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0053-Fix-MC-2025.patch b/patches/server/0054-Fix-MC-2025.patch similarity index 95% rename from patches/server/0053-Fix-MC-2025.patch rename to patches/server/0054-Fix-MC-2025.patch index 34394bf..ac9df28 100644 --- a/patches/server/0053-Fix-MC-2025.patch +++ b/patches/server/0054-Fix-MC-2025.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 06beb2c8dbdc070083a3e10c500ed537da9b4a2d..d5d05c947d7dea9a31b59aca1956aeecd2395c0c 100644 +index ae39e58170085f83303d53eb6b7eb72f0a961be3..133fd4c50df80420015d0c32f487f0176ad07393 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0054-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0055-FoliaPR-Add-TPS-From-Region.patch