diff --git a/gradle.properties b/gradle.properties index f294e7f..156607e 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=a0dc21b3d90aef13aa8c86649f893918d724831e +foliaRef=23ed0843b037dba77262378a7db0ed98cd0ed035 org.gradle.configuration-cache=true org.gradle.caching=true 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 41d79aa..2f95b43 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 @@ -118,10 +118,10 @@ index f2d2ddfd964bff914e41c0b4150fe1aad7866ebf..7defcd15c44601bfd2f7f55046038693 } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940ac4c01167 100644 +index dbf9231b1f01576906b90a3ddf0bf2cbbeb4590a..b17ace9118c94a756fa2901621c6b2b9bd9e5764 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -393,7 +393,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -400,7 +400,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable String clientBrandName = null; // Paper - Brand support public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event @@ -132,7 +132,7 @@ index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940a // Paper start - rewrite chunk system private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder(); -@@ -1006,8 +1008,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1013,8 +1015,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.trackEnteredOrExitedLavaOnVehicle(); this.updatePlayerAttributes(); this.advancements.flushDirty(this); diff --git a/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch index 292d061..87c435a 100644 --- a/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch +++ b/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix uncorrected death check of folia diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java -index 50af953a4698a3c6e16b840fab764dd733b3fbc9..a9c058238819f3631d94ac306185e909821caf35 100644 +index acca8c51d2030c675c157b10d0bbc6af631afe61..d0b688e69979c5e7b8267ac96bd71bcd33444c41 100644 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java -@@ -679,7 +679,7 @@ public abstract class AbstractContainerMenu { +@@ -689,7 +689,7 @@ public abstract class AbstractContainerMenu { } private static void dropOrPlaceInInventory(Player player, ItemStack stack) { diff --git a/luminol-server/minecraft-patches/features/0040-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0040-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch index 7ab5326..46c845b 100644 --- a/luminol-server/minecraft-patches/features/0040-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch +++ b/luminol-server/minecraft-patches/features/0040-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Leaf Remove useless creating stats json bases on player name diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index b977d0b2c754c227b667ce9fdd3ebb934db8e974..79e7fcb7949fbc8e3794d481e41d5164dea0b273 100644 +index e5e946462da9e56344428139768075b7bd228ec0..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -1415,6 +1415,8 @@ public abstract class PlayerList { +@@ -1420,6 +1420,8 @@ public abstract class PlayerList { if (serverStatsCounter == null) { File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile(); File file1 = new File(file, uuid + ".json"); @@ -18,7 +18,7 @@ index b977d0b2c754c227b667ce9fdd3ebb934db8e974..79e7fcb7949fbc8e3794d481e41d5164 if (!file1.exists()) { File file2 = new File(file, displayName + ".json"); // CraftBukkit Path path = file2.toPath(); -@@ -1422,6 +1424,8 @@ public abstract class PlayerList { +@@ -1427,6 +1429,8 @@ public abstract class PlayerList { file2.renameTo(file1); } } diff --git a/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch index 7651c19..1e50fba 100644 --- a/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch +++ b/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing teleportation apis for folia diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f69f19dcec 100644 +index b17ace9118c94a756fa2901621c6b2b9bd9e5764..8a728a3af515da522cd5fab1e731bbc0607f0596 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1653,6 +1653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1660,6 +1660,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (respawnComplete != null) { respawnComplete.accept(ServerPlayer.this); } 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 ddebe92..abf42c1 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 @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Tue, 11 Feb 2025 11:57:22 +0800 +From: MrHua269 +Date: Sat, 22 Mar 2025 09:24:55 +0800 Subject: [PATCH] Add tpsbar with chunkhot membar and region bar @@ -22,10 +22,10 @@ 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 d3832c3cf089ee78f542bcc6f0b9c6a760fae9eb..b8390ed4df7b64af4f1e73ce437829de1feef6f8 100644 +index c53de765b624071cb4cd3fa69b5df4de5b95bf3b..5137f6a68c216ff0daefa8ceec41026669338797 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2445,6 +2445,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2447,6 +2447,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.expToDrop = data.getInt("expToDrop"); handle.keepLevel = data.getBoolean("keepLevel"); } @@ -41,7 +41,7 @@ index d3832c3cf089ee78f542bcc6f0b9c6a760fae9eb..b8390ed4df7b64af4f1e73ce437829de } } -@@ -2466,6 +2475,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2468,6 +2477,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { data.putLong("lastPlayed", System.currentTimeMillis()); data.putString("lastKnownName", handle.getScoreboardName()); @@ -57,9 +57,9 @@ index d3832c3cf089ee78f542bcc6f0b9c6a760fae9eb..b8390ed4df7b64af4f1e73ce437829de // Paper start - persist for use in offline save data if (!nbttagcompound.contains("Paper")) { nbttagcompound.put("Paper", new CompoundTag()); -@@ -3659,4 +3677,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - public void setDeathScreenScore(final int score) { - getHandle().setScore(score); +@@ -3677,4 +3695,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) { + this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck; } + + // KioCG start - ChunkHot diff --git a/luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch index 95175f8..97623a6 100644 --- a/luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch @@ -5,10 +5,10 @@ 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 b8390ed4df7b64af4f1e73ce437829de1feef6f8..f7117d8296e49851e63ba994e062383f12b8e1e7 100644 +index 5137f6a68c216ff0daefa8ceec41026669338797..b8c5943e46d75241836d0a0f69caf1587b799d38 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 { +@@ -215,7 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); private final Set channels = new HashSet(); @@ -17,7 +17,7 @@ index b8390ed4df7b64af4f1e73ce437829de1feef6f8..f7117d8296e49851e63ba994e062383f private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2309,9 +2309,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2311,9 +2311,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) {