From 6e29fe7b7dfc3a7a03ac706c55755098b367e9c2 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Thu, 23 Jan 2025 07:25:43 +0800 Subject: [PATCH] Updated Upstream(Folia) --- gradle.properties | 2 +- ...d-configurable-region-format-framework-linear-v2-r.patch | 4 ++-- .../paper-patches/features/0006-Add-a-simple-tpsbar.patch | 6 +++--- .../paper-patches/features/0007-Add-a-simple-membar.patch | 6 +++--- ...-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch | 4 ++-- .../features/0031-SparklyPaper-Optimize-canSee-checks.patch | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 80627de..a0967b0 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=290f78994a0c15f69b0d719a9d005ef2e1c51b9e +foliaRef=4e7607dce4d7cae278ba5a726019c571ff021f85 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch b/luminol-server/minecraft-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch index d1da7f4..d7ede8c 100644 --- a/luminol-server/minecraft-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch +++ b/luminol-server/minecraft-patches/features/0014-Add-configurable-region-format-framework-linear-v2-r.patch @@ -22,10 +22,10 @@ index a814512fcfb85312474ae2c2c21443843bf57831..2e084a5b28cbe4737f48c25e10af5892 public MoonriseRegionFileIO.RegionDataController.WriteData moonrise$startWrite( final int chunkX, final int chunkZ, final CompoundTag compound diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java -index 1acea58838f057ab87efd103cbecb6f5aeaef393..224538fc0a009db341588ff7ebe32b58aa003ed0 100644 +index 98fbc5c8044bd945d64569f13412a6e7e49a4e7f..ec3d71a85ea5c24f7f808bc2feaeee4d64784c23 100644 --- a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java +++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java -@@ -1462,7 +1462,7 @@ public final class MoonriseRegionFileIO { +@@ -1470,7 +1470,7 @@ public final class MoonriseRegionFileIO { public static interface IORunnable { diff --git a/luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch b/luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch index ed90288..4277e3e 100644 --- a/luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch +++ b/luminol-server/paper-patches/features/0006-Add-a-simple-tpsbar.patch @@ -336,10 +336,10 @@ index 0000000000000000000000000000000000000000..de2f03d6e771c09e8da2da454b7ec4a1 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5aa9fcb697a758da10a9e1f839dd5502a446c076..3a243a0c33fe402d0337541a7ca7d0f6c53efe76 100644 +index 87c3a06a31a5dcd760c0ca7f0b181662566ae35c..0b2c520dd035150186487adbabaffede59ca2f6b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2396,6 +2396,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2397,6 +2397,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.expToDrop = data.getInt("expToDrop"); handle.keepLevel = data.getBoolean("keepLevel"); } @@ -349,7 +349,7 @@ index 5aa9fcb697a758da10a9e1f839dd5502a446c076..3a243a0c33fe402d0337541a7ca7d0f6 } } -@@ -2417,6 +2420,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2418,6 +2421,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { data.putLong("lastPlayed", System.currentTimeMillis()); data.putString("lastKnownName", handle.getScoreboardName()); diff --git a/luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch b/luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch index 0e96346..abad8bb 100644 --- a/luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch +++ b/luminol-server/paper-patches/features/0007-Add-a-simple-membar.patch @@ -291,10 +291,10 @@ index 0000000000000000000000000000000000000000..3535cf03e7855b4d8b312ccf3a7b0564 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3a243a0c33fe402d0337541a7ca7d0f6c53efe76..39ac96a61e48750a420ea612e37e3f8195569f10 100644 +index 0b2c520dd035150186487adbabaffede59ca2f6b..8bc4fab8728860278e4d49a7830f41ef31b7ba15 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2399,6 +2399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2400,6 +2400,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { //Luminol start - Tpsbar getHandle().isTpsBarVisible = data.getBoolean("tpsbarVisible"); //Luminol end @@ -304,7 +304,7 @@ index 3a243a0c33fe402d0337541a7ca7d0f6c53efe76..39ac96a61e48750a420ea612e37e3f81 } } -@@ -2423,6 +2426,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2424,6 +2427,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { //Luminol start - Tpsbar data.putBoolean("tpsbarVisible",handle.isTpsBarVisible); //Luminol end diff --git a/luminol-server/paper-patches/features/0022-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/luminol-server/paper-patches/features/0022-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 3a56735..ebe3c69 100644 --- a/luminol-server/paper-patches/features/0022-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/luminol-server/paper-patches/features/0022-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -184,10 +184,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 39ac96a61e48750a420ea612e37e3f8195569f10..f6da4c065e362db093a882edbb3238ec48cb7999 100644 +index 8bc4fab8728860278e4d49a7830f41ef31b7ba15..df32d0ffcd055ecc33b2de62b96ea87701229ec6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3565,4 +3565,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3568,4 +3568,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(((CraftEntity) target).getHandle(), effect.getData())); } // Paper end - entity effect API diff --git a/luminol-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch index 1ab884c..653d8ad 100644 --- a/luminol-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/paper-patches/features/0031-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 f6da4c065e362db093a882edbb3238ec48cb7999..0a4d27e11f0a9514012cb90112e397bf73180bd6 100644 +index df32d0ffcd055ecc33b2de62b96ea87701229ec6..3b8bbb91926a76498be8920395df4fcc1fb75d61 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -207,7 +207,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -208,7 +208,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 f6da4c065e362db093a882edbb3238ec48cb7999..0a4d27e11f0a9514012cb90112e397bf private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2260,9 +2260,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2261,9 +2261,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) {