diff --git a/patches/server/0026-Gale-Optimize-sun-burn-tick.patch b/patches/server/0025-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0026-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0025-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0025-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0025-Gale-Reduce-acquire-POI-for-stuck-entities.patch deleted file mode 100644 index 50ec344..0000000 --- a/patches/server/0025-Gale-Reduce-acquire-POI-for-stuck-entities.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AltronMaxX -Date: Tue, 6 Aug 2024 15:36:28 +0400 -Subject: [PATCH] Gale-Reduce-acquire-POI-for-stuck-entities - - -diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index 36cf79632b12c67291ccccfda7341ee543e607c6..3dfc4f1b7fd8b0c968ebfec11525a42588a168e2 100644 ---- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -+++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -@@ -39,6 +39,8 @@ public class FoldenorConfig { - - public static boolean appleskinProtocol = false; - -+ public static int acquirePoiForStuckEntity = 60; -+ - public static void init(File configFile) { - init(configFile, true); - } -diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index e1b6fe9ecda25f86431baf414f1bfd3a26a8b2bd..fe26be2f2a6ec2791fb9b86cb0c829a9b687f8a5 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -@@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos; - import net.minecraft.core.GlobalPos; - import net.minecraft.core.Holder; - import net.minecraft.network.protocol.game.DebugPackets; -+import net.minecraft.server.level.ServerLevel; - import net.minecraft.util.RandomSource; - import net.minecraft.world.entity.Mob; - import net.minecraft.world.entity.PathfinderMob; -@@ -26,6 +27,13 @@ import org.apache.commons.lang3.mutable.MutableLong; - public class AcquirePoi { - public static final int SCAN_RANGE = 48; - -+ // Gale start - Airplane - reduce acquire POI for stuck entities -+ public static void addAdditionalTimeToMutableLongIfEntityIsStuck(MutableLong mutableLong, ServerLevel world, PathfinderMob entity) { -+ long stuckEntityAdditionalWaitTime = net.edenor.foldenor.config.FoldenorConfig.acquirePoiForStuckEntity; -+ mutableLong.add(stuckEntityAdditionalWaitTime <= 0L ? 0L : entity.getNavigation().isStuck() ? stuckEntityAdditionalWaitTime : 0L); -+ } -+ // Gale end - Airplane - reduce acquire POI for stuck entities -+ - public static BehaviorControl create( - Predicate> poiPredicate, MemoryModuleType poiPosModule, boolean onlyRunIfChild, Optional entityStatus - ) { -@@ -51,13 +59,13 @@ public class AcquirePoi { - if (onlyRunIfChild && entity.isBaby()) { - return false; - } else if (mutableLong.getValue() == 0L) { -- mutableLong.setValue(world.getGameTime() + (long)world.random.nextInt(20)); -+ addAdditionalTimeToMutableLongIfEntityIsStuck(mutableLong, world, entity); // Gale - Airplane - reduce acquire POI for stuck entities - return false; - } else if (world.getGameTime() < mutableLong.getValue()) { - return false; - } else { - mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20)); -- if (entity.getNavigation().isStuck()) mutableLong.add(200); // Paper - Perf: Wait an additional 10s to check again if they're stuck -+ addAdditionalTimeToMutableLongIfEntityIsStuck(mutableLong, world, entity); // Paper - Perf: Wait an additional 10s to check again if they're stuck // Gale - Airplane - reduce acquire POI for stuck entities - PoiManager poiManager = world.getPoiManager(); - long2ObjectMap.long2ObjectEntrySet().removeIf(entry -> !entry.getValue().isStillValid(time)); - Predicate predicate2 = pos -> { diff --git a/patches/server/0027-Purpur-Alternative-Keepalive-Handling.patch b/patches/server/0026-Purpur-Alternative-Keepalive-Handling.patch similarity index 95% rename from patches/server/0027-Purpur-Alternative-Keepalive-Handling.patch rename to patches/server/0026-Purpur-Alternative-Keepalive-Handling.patch index 9549dfa..fe9223a 100644 --- a/patches/server/0027-Purpur-Alternative-Keepalive-Handling.patch +++ b/patches/server/0026-Purpur-Alternative-Keepalive-Handling.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Purpur-Alternative-Keepalive-Handling diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index 3dfc4f1b7fd8b0c968ebfec11525a42588a168e2..4c305c313db5223378eb5374c2163924edbb3b61 100644 +index 36cf79632b12c67291ccccfda7341ee543e607c6..3252f121394f9dff7025708eb8528809b3abc248 100644 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -@@ -41,6 +41,8 @@ public class FoldenorConfig { +@@ -39,6 +39,8 @@ public class FoldenorConfig { - public static int acquirePoiForStuckEntity = 60; + public static boolean appleskinProtocol = false; + public static boolean useAlternateKeepAlive = false; + public static void init(File configFile) { init(configFile, true); } -@@ -99,6 +101,7 @@ public class FoldenorConfig { +@@ -97,6 +99,7 @@ public class FoldenorConfig { protected static void readNetworkSettings(){ sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets); appleskinProtocol = getBoolean("network.appleskin-protocol", appleskinProtocol); diff --git a/patches/server/0028-Purpur-Remove-timings.patch b/patches/server/0027-Purpur-Remove-timings.patch similarity index 100% rename from patches/server/0028-Purpur-Remove-timings.patch rename to patches/server/0027-Purpur-Remove-timings.patch diff --git a/patches/server/0029-Add-chance-config-for-piglin-spawn-in-nether-portal.patch b/patches/server/0028-Add-chance-config-for-piglin-spawn-in-nether-portal.patch similarity index 92% rename from patches/server/0029-Add-chance-config-for-piglin-spawn-in-nether-portal.patch rename to patches/server/0028-Add-chance-config-for-piglin-spawn-in-nether-portal.patch index ad67118..7e8c8cc 100644 --- a/patches/server/0029-Add-chance-config-for-piglin-spawn-in-nether-portal.patch +++ b/patches/server/0028-Add-chance-config-for-piglin-spawn-in-nether-portal.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add-chance-config-for-piglin-spawn-in-nether-portal diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index 4c305c313db5223378eb5374c2163924edbb3b61..01687fa24c649cfbec58fde93b5af3a32d8222c3 100644 +index 3252f121394f9dff7025708eb8528809b3abc248..9000c8836bbbe9d9931d6e35d303aed71e8d4e6e 100644 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -@@ -43,6 +43,8 @@ public class FoldenorConfig { +@@ -41,6 +41,8 @@ public class FoldenorConfig { public static boolean useAlternateKeepAlive = false; @@ -17,7 +17,7 @@ index 4c305c313db5223378eb5374c2163924edbb3b61..01687fa24c649cfbec58fde93b5af3a3 public static void init(File configFile) { init(configFile, true); } -@@ -85,6 +87,8 @@ public class FoldenorConfig { +@@ -83,6 +85,8 @@ public class FoldenorConfig { static void readConfig() { readNetworkSettings(); @@ -26,7 +26,7 @@ index 4c305c313db5223378eb5374c2163924edbb3b61..01687fa24c649cfbec58fde93b5af3a3 try { readDynamicActivationOfBrains(); } catch (IOException e) { -@@ -104,6 +108,11 @@ public class FoldenorConfig { +@@ -102,6 +106,11 @@ public class FoldenorConfig { useAlternateKeepAlive = getBoolean("network.use-alternate-keepalive", useAlternateKeepAlive); } diff --git a/patches/server/0030-Leaf-Virtual-Thread-for-async-scheduler.patch b/patches/server/0029-Leaf-Virtual-Thread-for-async-scheduler.patch similarity index 94% rename from patches/server/0030-Leaf-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0029-Leaf-Virtual-Thread-for-async-scheduler.patch index 4145781..8f691d2 100644 --- a/patches/server/0030-Leaf-Virtual-Thread-for-async-scheduler.patch +++ b/patches/server/0029-Leaf-Virtual-Thread-for-async-scheduler.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaf-Virtual-Thread-for-async-scheduler diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index 01687fa24c649cfbec58fde93b5af3a32d8222c3..4ac748456e7e243513c194c37c9c63d6a4757e78 100644 +index 9000c8836bbbe9d9931d6e35d303aed71e8d4e6e..dd3d35a8870022d6f260020377c97e0be6970481 100644 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -@@ -45,6 +45,8 @@ public class FoldenorConfig { +@@ -43,6 +43,8 @@ public class FoldenorConfig { public static int piglinSpawnChancePersentInPortal = 100; @@ -17,7 +17,7 @@ index 01687fa24c649cfbec58fde93b5af3a32d8222c3..4ac748456e7e243513c194c37c9c63d6 public static void init(File configFile) { init(configFile, true); } -@@ -89,6 +91,8 @@ public class FoldenorConfig { +@@ -87,6 +89,8 @@ public class FoldenorConfig { readOptimizationSettings(); @@ -26,7 +26,7 @@ index 01687fa24c649cfbec58fde93b5af3a32d8222c3..4ac748456e7e243513c194c37c9c63d6 try { readDynamicActivationOfBrains(); } catch (IOException e) { -@@ -113,6 +117,11 @@ public class FoldenorConfig { +@@ -111,6 +115,11 @@ public class FoldenorConfig { "Reduces piglin spawn in portal, by reducing change to spawn"); } diff --git a/patches/server/0031-Carpet-Fixes-getBiome-Optimize.patch b/patches/server/0030-Carpet-Fixes-getBiome-Optimize.patch similarity index 100% rename from patches/server/0031-Carpet-Fixes-getBiome-Optimize.patch rename to patches/server/0030-Carpet-Fixes-getBiome-Optimize.patch diff --git a/patches/server/0032-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0031-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0032-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0031-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0033-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0032-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 93% rename from patches/server/0033-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0032-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch index e1dc8be..58c6f2c 100644 --- a/patches/server/0033-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch +++ b/patches/server/0032-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch @@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Skip 'MapItem#update()' if the map does not have diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index 4ac748456e7e243513c194c37c9c63d6a4757e78..bf1d94e148b67084b4ea8208eb395e31231c472b 100644 +index dd3d35a8870022d6f260020377c97e0be6970481..f57a71b1182b3b8e03d3f42ecc6e1b55cb93b788 100644 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -@@ -47,6 +47,8 @@ public class FoldenorConfig { +@@ -45,6 +45,8 @@ public class FoldenorConfig { public static boolean useVirtualThreadForAsyncScheduler = false; @@ -17,7 +17,7 @@ index 4ac748456e7e243513c194c37c9c63d6a4757e78..bf1d94e148b67084b4ea8208eb395e31 public static void init(File configFile) { init(configFile, true); } -@@ -115,6 +117,7 @@ public class FoldenorConfig { +@@ -113,6 +115,7 @@ public class FoldenorConfig { private static void readOptimizationSettings() { piglinSpawnChancePersentInPortal = getInt("optimizations.piglin-spawn-chance-persent-in-portal", 100, "Reduces piglin spawn in portal, by reducing change to spawn"); diff --git a/patches/server/0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0033-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0033-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0035-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0034-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0035-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0034-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0036-Divine-lithium-ai.raid.patch b/patches/server/0035-Divine-lithium-ai.raid.patch similarity index 100% rename from patches/server/0036-Divine-lithium-ai.raid.patch rename to patches/server/0035-Divine-lithium-ai.raid.patch diff --git a/patches/server/0037-Divine-lithium-entity.fast_elytra_check-entity.fast_.patch b/patches/server/0036-Divine-lithium-entity.fast_elytra_check-entity.fast_.patch similarity index 100% rename from patches/server/0037-Divine-lithium-entity.fast_elytra_check-entity.fast_.patch rename to patches/server/0036-Divine-lithium-entity.fast_elytra_check-entity.fast_.patch diff --git a/patches/server/0038-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch b/patches/server/0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch similarity index 100% rename from patches/server/0038-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch rename to patches/server/0037-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch diff --git a/patches/server/0039-Add-linear-format-from-LinearPurpur.patch b/patches/server/0038-Add-linear-format-from-LinearPurpur.patch similarity index 99% rename from patches/server/0039-Add-linear-format-from-LinearPurpur.patch rename to patches/server/0038-Add-linear-format-from-LinearPurpur.patch index e3609d7..e4dd012 100644 --- a/patches/server/0039-Add-linear-format-from-LinearPurpur.patch +++ b/patches/server/0038-Add-linear-format-from-LinearPurpur.patch @@ -63,7 +63,7 @@ index 3218cbf84f54daf06e84442d5eb1a36d8da6b215..ec9b27177dc526510e86d85f48f167b4 synchronized (cache) { regionFile = ((ChunkSystemRegionFileStorage)(Object)cache).moonrise$getRegionFileIfLoaded(chunkX, chunkZ); diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java -index bf1d94e148b67084b4ea8208eb395e31231c472b..4b7c163b91443fb1013c5233e85705a8e532ab38 100644 +index f57a71b1182b3b8e03d3f42ecc6e1b55cb93b788..d4f616a4580e2fc29f9f34b7bbcbf27eecaa27ab 100644 --- a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java +++ b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java @@ -2,6 +2,7 @@ package net.edenor.foldenor.config; @@ -96,7 +96,7 @@ index bf1d94e148b67084b4ea8208eb395e31231c472b..4b7c163b91443fb1013c5233e85705a8 public static int version; static boolean verbose; -@@ -49,6 +54,12 @@ public class FoldenorConfig { +@@ -47,6 +52,12 @@ public class FoldenorConfig { public static boolean skipMapItemUpdatesIfNoBukkitRender = true; @@ -109,7 +109,7 @@ index bf1d94e148b67084b4ea8208eb395e31231c472b..4b7c163b91443fb1013c5233e85705a8 public static void init(File configFile) { init(configFile, true); } -@@ -95,6 +106,8 @@ public class FoldenorConfig { +@@ -93,6 +104,8 @@ public class FoldenorConfig { readMiscSettings(); @@ -118,7 +118,7 @@ index bf1d94e148b67084b4ea8208eb395e31231c472b..4b7c163b91443fb1013c5233e85705a8 try { readDynamicActivationOfBrains(); } catch (IOException e) { -@@ -125,6 +138,25 @@ public class FoldenorConfig { +@@ -123,6 +136,25 @@ public class FoldenorConfig { "Use the new Virtual Thread introduced in JDK 21 for CraftAsyncScheduler."); } diff --git a/patches/server/0040-Change-profiler-permission.patch b/patches/server/0039-Change-profiler-permission.patch similarity index 100% rename from patches/server/0040-Change-profiler-permission.patch rename to patches/server/0039-Change-profiler-permission.patch