From 41770b069e87834fe211478c2bf4cec22eded019 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 22 Feb 2025 03:48:09 -0500 Subject: [PATCH] Updated Upstream (Folia) --- .gitignore | 3 +-- gradle.properties | 2 +- .../features/0003-Add-config-for-vanilla-random.patch | 2 +- ...04-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch | 4 ++-- .../0022-Kaiiju-Entity-tick-and-removal-limiter.patch | 2 +- .../0035-Leaf-Secure-seed-and-matter-seed-command.patch | 2 +- .../features/0040-Raytracing-tracker-experiment.patch | 2 +- ...4-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch | 8 ++++---- .../0006-Force-disable-builtin-spark-plugin.patch | 2 +- .../0007-SparklyPaper-Optimize-canSee-checks.patch | 2 +- .../0009-Leaf-Secure-seed-and-matter-seed-command.patch | 2 +- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index a798a26..388d15b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,9 +10,8 @@ build /luminol-api/build.gradle.kts /folia-server/build.gradle.kts /folia-server/src/minecraft -/paper-server /folia-api/build.gradle.kts +/paper-server /paper-api -/paper-api-generator .idea/ diff --git a/gradle.properties b/gradle.properties index 8edeb2d..0dc9c8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -foliaRef=e39039dd11b14f3a23cabbdb7ca90508c8c6e509 +foliaRef=c2e3759112b527d71b129170bd7713058d3b38b6 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch b/luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch index fb1de73..11180f2 100644 --- a/luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch +++ b/luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for vanilla random diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 78c7e0f32e48f8060def2541971d3083b41e61b1..aaf047edd0d732601c5bd9f771f51da72913fffa 100644 +index 1e59c21d26baf50fd74bc99c04dbea0faede446a..26637b397b06c14445740a733d378a38a85e1875 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -255,7 +255,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index b4748a0..4e337ec 100644 --- a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -80,7 +80,7 @@ index 8f348d140ab98e23ee0debe4bacac51fee49c35e..c6490516215ad94323174de81771f258 //Util.shutdownExecutors(); // Paper - Improved watchdog support; moved into super SkullBlockEntity.clear(); diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 9cbd692680c66331ae8e1544ee8d2a7317262d01..7f4a4280b47bd87b08bd81cae22e5f6cba175ff3 100644 +index 7fb6cfe0484a4cc1e30fd8e344de307a0c734b68..f2d0d8c7577ea5d798b6a2cf8fd6282cead9de94 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -1339,6 +1339,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -260,7 +260,7 @@ index 6655d06e2011e20e7346dfe57527795269094d8a..48aa6fcb5c16fdbb4ae902cbb72c6b8e + // KioCG end } diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index d15304ec04bf22674ccd0b106f5d9ba7e609f5d0..bb51d52a3d9590e7925c5f08bf5a80e8aefa89e9 100644 +index e70919757dee4b02384ded3551c8f580d289584a..ae049c5c3593525b991d865fec695c00ad408a59 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -1546,6 +1546,13 @@ public abstract class Player extends LivingEntity { diff --git a/luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch index 0bd5602..e717b52 100644 --- a/luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch +++ b/luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch @@ -17,7 +17,7 @@ index c6e487a4c14e6b82533881d01f32349b9ae28728..2c747cb8a724cd25c9d724908f92b320 // block ticking private final ObjectLinkedOpenHashSet blockEvents = new ObjectLinkedOpenHashSet<>(); diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 7f4a4280b47bd87b08bd81cae22e5f6cba175ff3..a2d63f495e87f0f04299bfe07ab3efdd9733e79f 100644 +index f2d0d8c7577ea5d798b6a2cf8fd6282cead9de94..c768279df8551498a61d29630f4374f1054a2d8b 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -808,6 +808,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch index 4558f75..08cea3a 100644 --- a/luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch +++ b/luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch @@ -62,7 +62,7 @@ index ac06b8a4813716a8d136be5731cbd96113976a7e..82d95005fc67336458b50c47d44ec404 } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index a2d63f495e87f0f04299bfe07ab3efdd9733e79f..f899fd3316fbbb2752307d3662e4fcb829a184a1 100644 +index c768279df8551498a61d29630f4374f1054a2d8b..31a1e2d9287654418563f4cb97a17bca42d17e64 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -620,6 +620,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch index e0201a2..3d768e8 100644 --- a/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch +++ b/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch @@ -93,7 +93,7 @@ index d9cc1d7e56c37d5ce92544edc10e89dbc89dd15d..39e7689be243b9c99b507d665f659135 public EntityType( EntityType.EntityFactory factory, diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index bb51d52a3d9590e7925c5f08bf5a80e8aefa89e9..8a04f655e249d5e3bdcf88fbe87f5f986c3c0df2 100644 +index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -210,6 +210,25 @@ public abstract class Player extends LivingEntity { diff --git a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch index a3c306c..dd513ce 100644 --- a/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch +++ b/luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch @@ -22,7 +22,7 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..f42692cd4f0154705c3d5b030d281cfc + // KioCG end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7723b2fbc8a1d1907ded37d7530e34d3cac8bdce..7dd3bcf9395722b3ab21f9bb7e9aa501105b0fd8 100644 +index 2d1b672fc152054d7b6abf47f443b87f5a2ea3de..3e4e0dcdd4e2808aef8dd41f159a358f47450f40 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2404,6 +2404,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -57,9 +57,9 @@ index 7723b2fbc8a1d1907ded37d7530e34d3cac8bdce..7dd3bcf9395722b3ab21f9bb7e9aa501 // Paper start - persist for use in offline save data if (!nbttagcompound.contains("Paper")) { nbttagcompound.put("Paper", new CompoundTag()); -@@ -3595,4 +3613,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - handle.containerMenu.broadcastChanges(); - return new PaperPlayerGiveResult(leftovers.build(), drops.build()); +@@ -3611,4 +3629,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + + return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1; } + + // KioCG start - ChunkHot diff --git a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch b/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch index c9f4e4d..3ab143f 100644 --- a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch +++ b/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch @@ -18,7 +18,7 @@ index a0b84535a9d3833d4df692b85b272f145559dd80..c2ba46408b5ad727d7a17f21d47b2898 return; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index acff6136c321fd1b097c9888bce6195571663d75..d3569ee6b56a401b18068785bfb3df15393edb2c 100644 +index 8eecdc662257edeb67d6823c476c635ba906d4dc..0ab41895a447725e6fa22e49c15e4cf3bf87805d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -314,7 +314,7 @@ public final class CraftServer implements Server { diff --git a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch index bfd6eec..e635ae3 100644 --- a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7dd3bcf9395722b3ab21f9bb7e9aa501105b0fd8..c7c2e7b3b2faddc202edf5f933ed906fdd4d16af 100644 +index 3e4e0dcdd4e2808aef8dd41f159a358f47450f40..450350e66ae42f234bfd3016da1434e3194259e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -214,7 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch index 91ed194..3b951ad 100644 --- a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch +++ b/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch @@ -23,7 +23,7 @@ index f42692cd4f0154705c3d5b030d281cfc333803ed..39cc976f65f826a00e2e637c139f9134 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d3569ee6b56a401b18068785bfb3df15393edb2c..d3c0322ef35e85adfa7398da83e2589a9b9837d7 100644 +index 0ab41895a447725e6fa22e49c15e4cf3bf87805d..33a0ef0bf3338631f61c8a6da5e3ff4209bb0b21 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1423,7 +1423,11 @@ public final class CraftServer implements Server {