Updated Upstream(Folia)

2024-01-01 08:16:23 +00:00
parent 30ef290b4f
commit a0bc01a355
15 changed files with 89 additions and 76 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,4 @@ build-data/
 Hearse-API
 Hearse-Server
 *.jar
-/patches/todo/
+/patches2/todo/
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = me.earthme.luminol
 version = 1.20.4-R0.1-SNAPSHOT

-foliaCommit = 9a389a1a5e10b2c990c521f4af9674b9338b0b42
+foliaCommit = 6928284a5652eb66040166c4ce9ea8f87034bc49

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/0
+++ b/0
--- a/patches/server/0001-Fix-build.patch
+++ b/patches/server/0001-Fix-build.patch
@@ -1,23 +1,23 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: M2ke4U <79621885+MrHua269@users.noreply.github.com>
-Date: Sat, 23 Dec 2023 21:46:22 +0800
+From: MrHua269 <novau233@163.com>
+Date: Mon, 1 Jan 2024 07:59:27 +0000
 Subject: [PATCH] Fix build


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 03abea227c555decd559dd58b33913127f3549a4..44b3fc01d8fdce55cffe77b7b02b07b95e182870 100644
+index 38352926640d97449256d50ebdec619ce9e695a0..e8421c841d20855eaa262b55115584f14d0f25cf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -28,7 +28,7 @@ repositories {
+@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
+ 
 dependencies {
-     extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
     // Folia start
 -    implementation(project(":folia-api"))
 +    implementation(project(":luminol-api"))//Luminol
     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
         exclude("io.papermc.paper", "paper-api")
     }
-@@ -88,7 +88,7 @@ tasks.jar {
+@@ -74,7 +74,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
--- a/patches/server/0003-Added-empty-luminol-config.patch
+++ b/patches/server/0003-Added-empty-luminol-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added empty luminol config


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 44b3fc01d8fdce55cffe77b7b02b07b95e182870..76b3ea0c8976a2b12d3e1324c0a39d7a56ec89b1 100644
+index e8421c841d20855eaa262b55115584f14d0f25cf..6adb602bc83c1c4f57a10a4391db901463e565d4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,6 +33,7 @@ dependencies {
+@@ -19,6 +19,7 @@ dependencies {
         exclude("io.papermc.paper", "paper-api")
     }
     // Folia end
@@ -143,7 +143,7 @@ index 12af517a7dd8c0bb2bc55ab3eb0e68a074011bb5..f3c28b5dff487813a61ebf531c2ee77e
         paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
         // Paper start - moved up to right after PlayerList creation but before file load/save
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8cf413e42d560d90dfcbcb1d61ed410e992a8f4c..619429466bec3c1c88c5f2b50254877528ac5a37 100644
+index fdb5237935a13322d8e7332b199308513b9f8e9b..466f7f7d6ae5b0f4d2ce5f61a45e03e2d50fc4ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -38,6 +38,8 @@ import java.util.stream.Collectors;
@@ -155,7 +155,7 @@ index 8cf413e42d560d90dfcbcb1d61ed410e992a8f4c..619429466bec3c1c88c5f2b502548775
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.Util;
-@@ -768,6 +770,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -773,6 +775,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
     }
     // Folia end - region threading
 
@@ -164,7 +164,7 @@ index 8cf413e42d560d90dfcbcb1d61ed410e992a8f4c..619429466bec3c1c88c5f2b502548775
     // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
         // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
-@@ -852,6 +856,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -857,6 +861,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
         this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
         this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
         this.updateTickData(); // Folia - region threading - make sure it is initialised before ticked
--- a/patches/server/0007-Add-config-for-void-trading.patch
+++ b/patches/server/0007-Add-config-for-void-trading.patch
@@ -25,10 +25,10 @@ index 9db3bdd7a7d0b2a110e927ee4781eee489d0da9b..dffa9db569fcef2feec75072fe86c9a6
 
     public static <T> T get(String key,T def){
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 619429466bec3c1c88c5f2b50254877528ac5a37..b0869424cf9d980965d3cb584e4458fee5eac7be 100644
+index 466f7f7d6ae5b0f4d2ce5f61a45e03e2d50fc4ec..47530f4300213b7a2c3fdba003f669709f4fb770 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -3072,7 +3072,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -3077,7 +3077,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
             // Spigot Start
             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                 // Paper start
--- a/patches/server/0009-Add-config-for-chat-sign.patch
+++ b/patches/server/0009-Add-config-for-chat-sign.patch
@@ -1,31 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: M2ke4U <79621885+MrHua269@users.noreply.github.com>
-Date: Sun, 24 Dec 2023 08:55:39 +0800
+From: MrHua269 <novau233@163.com>
+Date: Mon, 1 Jan 2024 08:11:33 +0000
 Subject: [PATCH] Add config for chat sign


-diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 772e3a864e0e70288a1c010d8bbb809d34d16a41..68bd66aad880c81d1f8eaf88525597c878350961 100644
--- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -15,6 +15,8 @@ import java.util.Objects;
- import java.util.Set;
- import java.util.concurrent.ExecutionException;
- import java.util.function.Function;
-+
-+import me.earthme.luminol.LuminolConfig;
- import net.kyori.adventure.audience.Audience;
- import net.kyori.adventure.audience.ForwardingAudience;
- import net.kyori.adventure.key.Key;
-@@ -355,7 +357,7 @@ public final class ChatProcessor {
- 
-         private void sendToServer(final ChatType.Bound chatType, final @Nullable Function<Audience, net.minecraft.network.chat.Component> msgFunction) {
-             final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console));
-            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage) ? null : "Not Secure");
-+            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage) || LuminolConfig.disableChatSign ? null : "Not Secure"); //Luminol - Add config for chat sign
-         }
-     }
- 
 diff --git a/src/main/java/me/earthme/luminol/LuminolConfig.java b/src/main/java/me/earthme/luminol/LuminolConfig.java
 index a49da370c91211d4e2274f72d62c911a1912296a..8d1ce8eae252fcf05b6a62d2dc467d6d503d3df4 100644
 --- a/src/main/java/me/earthme/luminol/LuminolConfig.java
@@ -78,7 +56,7 @@ index 72a8aa676836fcb3b4578689d16af65e18f55bbe..04653d58f2493d796e61bc97f0481cb6
     @Nullable
     public MessageSignature get(String argumentName) {
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..a14bb05e75ce9e10141854ebe3d7f1ed5045a3b1 100644
+index a5bcad412fb1ac3b6a3eee3f4618dc6c1ca66936..dcf5dae7d31a3e2271ba576d7e95817210bc7fd6 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
@@ -48,6 +48,8 @@ import java.util.function.Function;
@@ -99,8 +77,8 @@ index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..a14bb05e75ce9e10141854ebe3d7f1ed
 public class FriendlyByteBuf extends ByteBuf {
 
     public static final int DEFAULT_NBT_QUOTA = 2097152;
-@@ -138,6 +142,17 @@ public class FriendlyByteBuf extends ByteBuf {
-     public <T> void writeJsonWithCodec(Codec<T> codec, T value) {
+@@ -143,6 +147,17 @@ public class FriendlyByteBuf extends ByteBuf {
+         // Paper end - Adventure
         DataResult<JsonElement> dataresult = codec.encodeStart(JsonOps.INSTANCE, value);
 
 +
@@ -116,4 +94,4 @@ index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..a14bb05e75ce9e10141854ebe3d7f1ed
 +
         this.writeUtf(FriendlyByteBuf.GSON.toJson((JsonElement) Util.getOrThrow(dataresult, (s) -> {
             return new EncoderException("Failed to encode: " + s + " " + value);
-         })));
+         })), maxLength); // Paper - Adventure
--- a/patches/server/0014-Kaiiju-Add-linear-region-format.patch
+++ b/patches/server/0014-Kaiiju-Add-linear-region-format.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Add linear region format


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 76b3ea0c8976a2b12d3e1324c0a39d7a56ec89b1..5c0f87b6e2244ee6446bfac9438f3f2320d5a964 100644
+index 6adb602bc83c1c4f57a10a4391db901463e565d4..d42e234ebbfa397db8f51c2d5deca718a31b9db9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,6 +33,10 @@ dependencies {
+@@ -19,6 +19,10 @@ dependencies {
         exclude("io.papermc.paper", "paper-api")
     }
     // Folia end
@@ -592,10 +592,10 @@ index 3d526d7cfb313e419de89be1b275651982be42c7..90a6cfd011aaefe66fda79f887380ab2
 
     public static <T> T get(String key,T def){
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 50597a8b45bbd7dcc40b361da78358d9d01f5484..4709782f3e858edfa6ce25696462eb45909885ee 100644
+index c0aaa5ff3839698e262270f2bc315d39c31620ea..0b1502f7a7691570eeffa37eaa146d504ff88243 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -212,7 +212,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -211,7 +211,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
     // Paper end - optimise chunk tick iteration
 
     public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
@@ -604,7 +604,7 @@ index 50597a8b45bbd7dcc40b361da78358d9d01f5484..4709782f3e858edfa6ce25696462eb45
         // Paper - rewrite chunk system
         this.tickingGenerated = new AtomicInteger();
         //this.playerMap = new PlayerMap(); // Folia - region threading
-@@ -257,7 +257,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -256,7 +256,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
         this.lightEngine = new ThreadedLevelLightEngine(chunkProvider, this, this.level.dimensionType().hasSkyLight(), null, null); // Paper - rewrite chunk system
         this.distanceManager = new ChunkMap.ChunkDistanceManager(executor, mainThreadExecutor);
         this.overworldDataStorage = persistentStateManagerFactory;
@@ -613,7 +613,7 @@ index 50597a8b45bbd7dcc40b361da78358d9d01f5484..4709782f3e858edfa6ce25696462eb45
         this.setServerViewDistance(viewDistance);
         // Paper start
         this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
-@@ -823,13 +823,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -822,13 +822,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
 
     // Paper start - chunk status cache "api"
     public ChunkStatus getChunkStatusOnDiskIfCached(ChunkPos chunkPos) {
@@ -629,7 +629,7 @@ index 50597a8b45bbd7dcc40b361da78358d9d01f5484..4709782f3e858edfa6ce25696462eb45
 
         if (regionFile == null || !regionFileCache.chunkExists(chunkPos)) {
             return null;
-@@ -847,7 +847,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -846,7 +846,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
     }
 
     public void updateChunkStatusOnDisk(ChunkPos chunkPos, @Nullable CompoundTag compound) throws IOException {
@@ -639,7 +639,7 @@ index 50597a8b45bbd7dcc40b361da78358d9d01f5484..4709782f3e858edfa6ce25696462eb45
         regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b0869424cf9d980965d3cb584e4458fee5eac7be..1c39d01d46522d7120653c0437e6b0d3fc76ce3e 100644
+index 47530f4300213b7a2c3fdba003f669709f4fb770..211ad42151b9c3949b1c2f2d306ac1d9f88d2c9c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -455,8 +455,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -653,7 +653,7 @@ index b0869424cf9d980965d3cb584e4458fee5eac7be..1c39d01d46522d7120653c0437e6b0d3
         }
 
         protected void write(ChunkPos pos, net.minecraft.nbt.CompoundTag nbt) throws IOException {
-@@ -814,7 +814,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -819,7 +819,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
         // CraftBukkit end
         boolean flag2 = minecraftserver.forceSynchronousWrites();
         DataFixer datafixer = minecraftserver.getFixerUpper();
@@ -1060,10 +1060,10 @@ index 4aac1979cf57300825a999c876fcf24d3170e68e..3b96582f15d0985b670b5b5a1548800d
         this.factory = factory;
         this.fixerUpper = dataFixer;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a0eeba6f3b55e5fc0f5f92a1b7bee4f721910f63..b71e0e0845143362e4a78440217c63e3847ea002 100644
+index 085eebd879bc514dc9f785ea31fc6c0f7a066953..2aa03157d4272233db762bf4d1c716ea6cb3085d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -570,7 +570,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -569,7 +569,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                 return true;
             }
 
--- a/patches/server/0015-Add-a-simple-tpsbar.patch
+++ b/patches/server/0015-Add-a-simple-tpsbar.patch
@@ -353,7 +353,7 @@ index f3c28b5dff487813a61ebf531c2ee77e4d2071cc..0f265202b18d28a22f0ace6381482b60
         //Util.shutdownExecutors(); // Paper - moved into super
         SkullBlockEntity.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a22173984c418e648ae5308de26fbd5f9cbe6973..1ab8b0ff1981682c38f6cfe29091f2e335392c44 100644
+index 3d2b059254fdc08d1e4f9281946028a46884d7c8..fa3643090a3ae166944ef70de742120892570fb4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -285,6 +285,7 @@ public class ServerPlayer extends Player {
@@ -365,10 +365,10 @@ index a22173984c418e648ae5308de26fbd5f9cbe6973..1ab8b0ff1981682c38f6cfe29091f2e3
     public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances getViewDistances() {
         return this.viewDistances.get();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fca4f9a50e57a2b40c7bca92d975b72da1075fa3..9fe9611159bb6c63536168559ecc816dc091d037 100644
+index a288ed0640bfe852677294398474510ab578577a..22547ccd340df69f705d699c19d73c5a72f34339 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2237,6 +2237,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2278,6 +2278,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                 handle.expToDrop = data.getInt("expToDrop");
                 handle.keepLevel = data.getBoolean("keepLevel");
             }
@@ -379,7 +379,7 @@ index fca4f9a50e57a2b40c7bca92d975b72da1075fa3..9fe9611159bb6c63536168559ecc816d
         }
     }
 
-@@ -2258,6 +2262,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2299,6 +2303,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         data.putLong("lastPlayed", System.currentTimeMillis());
         data.putString("lastKnownName", handle.getScoreboardName());
 
--- a/patches/server/0030-Pufferfish-Dynamic-Activation-of-Brain.patch
+++ b/patches/server/0030-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -84,10 +84,10 @@ index 11c1a367fbc25cb63738a00ad93fb0b0b3500e7d..4f6af1fa55047e7be9e57c1dd1c60e9d
 
     public static <T> T get(String key,T def){
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1c39d01d46522d7120653c0437e6b0d3fc76ce3e..d4fbc4537f614c803fa9c4c13077a7870c3c692f 100644
+index 211ad42151b9c3949b1c2f2d306ac1d9f88d2c9c..c98c9d6b73973304d3a75b4bc1f6fc2518319619 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -999,6 +999,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1004,6 +1004,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
             this.timings.entityTick.startTiming(); // Spigot
             profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ENTITY_TICK); try { // Folia - profiler
             regionizedWorldData.forEachTickingEntity((entity) -> { // Folia - regionised ticking
@@ -124,7 +124,7 @@ index 09923fb6424754e98a91e9ee75bc0d49daa3092c..133fbfd57b8c2bbf4b4abeff96b42d6a
     private String descriptionId;
     @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b53435bc8303924cbfef0453dc2cc71a7168b2d8..e891477f946265b40cbfbbb7b66049837ad03105 100644
+index 08445ce85630d9716baec9f806b1bc031ea5c5c1..db5977b819ec1bc0eb5c24f4dfc3a6cc135e4b68 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -235,10 +235,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
--- a/patches/server/0033-Gale-Optimize-sun-burn-tick.patch
+++ b/patches/server/0033-Gale-Optimize-sun-burn-tick.patch
@@ -37,10 +37,10 @@ index fd9255334881ff59ad2da70e77b6860a032a7c62..37ddd6a21ce5a88ae39e498bb8663ff3
         this.absMoveTo(x, y, z);
         this.setYRot(yaw % 360.0F);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e891477f946265b40cbfbbb7b66049837ad03105..88c93fb45769d85a77f3ae1bfe6ffa0bbf9cdfdf 100644
+index db5977b819ec1bc0eb5c24f4dfc3a6cc135e4b68..e7e0a9d3d18454ff42c84bffd0d532a90abe869f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1737,13 +1737,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1741,13 +1741,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
 
     }
 
--- a/patches/server/0042-Purpur-use-alternative-keep-alive.patch
+++ b/patches/server/0042-Purpur-use-alternative-keep-alive.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: M2ke4U <79621885+MrHua269@users.noreply.github.com>
-Date: Sun, 24 Dec 2023 11:51:17 +0800
+From: MrHua269 <novau233@163.com>
+Date: Mon, 1 Jan 2024 08:13:11 +0000
 Subject: [PATCH] Purpur use alternative keep alive


@@ -25,7 +25,7 @@ index 6edafcdbc188cd6c78e4c4237363e41d927a665e..a62680768068b611fe723fedeb617d42
 
     public static <T> T get(String key,T def){
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index ce200192b4dddfc9b2d3c355838596b7deef1c69..070caa71212642b8811586fc2ec720b629d365f5 100644
+index caa60d7ec56fa5da67f756297295296c2ff7c6d9..f2ea3bf616b0f4ea8712fc492698dd3ac2020f61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -51,6 +51,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -35,8 +35,8 @@ index ce200192b4dddfc9b2d3c355838596b7deef1c69..070caa71212642b8811586fc2ec720b6
 +    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur
     private int latency;
     private volatile boolean suspendFlushingOnServerThread = false;
-     private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
-@@ -91,6 +92,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
+@@ -92,6 +93,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
 
     @Override
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -53,7 +53,7 @@ index ce200192b4dddfc9b2d3c355838596b7deef1c69..070caa71212642b8811586fc2ec720b6
         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
             int i = (int) (Util.getMillis() - this.keepAliveTime);
-@@ -197,6 +208,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -210,6 +221,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         long currentTime = Util.getMillis();
         long elapsedTime = currentTime - this.keepAliveTime;
 
--- a/patches/server/0043-Leaves-Protocol-Core.patch
+++ b/patches/server/0043-Leaves-Protocol-Core.patch
@@ -36,10 +36,10 @@ index af86f752c33a2990405fea058b7c41c437ba9d46..bada9fae1e7178162429e1f5a1608b9c
     }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 070caa71212642b8811586fc2ec720b629d365f5..721327535cbfb90c92921aea6b08cf3452ca7507 100644
+index f2ea3bf616b0f4ea8712fc492698dd3ac2020f61..7febbf3f8518ec6e598afb2beb6329f76c2d3506 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -127,6 +127,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -128,6 +128,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
 
     @Override
     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -47,7 +47,7 @@ index 070caa71212642b8811586fc2ec720b629d365f5..721327535cbfb90c92921aea6b08cf34
         // Paper start - handle brand payload packet
         if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) {
             this.player.clientBrandName = brandPayload.brand();
-@@ -144,6 +145,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -145,6 +146,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                 String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
                 for (String channel : channels.split("\0")) {
                     this.getCraftPlayer().addChannel(channel);
@@ -56,7 +56,7 @@ index 070caa71212642b8811586fc2ec720b629d365f5..721327535cbfb90c92921aea6b08cf34
             } catch (Exception ex) {
                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dfc0e3ce3ba88c3dbff909524de348fbe76de3a9..8dba9b265495156085e609c043c20df40dd8a77a 100644
+index ded539dd20a2d037fa5d175be06d59dd76660ffe..a7b75e8dca72be03153fcd59e25e10238bb65560 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -433,6 +433,8 @@ public abstract class PlayerList {
@@ -77,7 +77,7 @@ index dfc0e3ce3ba88c3dbff909524de348fbe76de3a9..8dba9b265495156085e609c043c20df4
         ServerLevel worldserver = entityplayer.serverLevel();
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 46496032f2f6535d2af2c39af49ae8d168452951..295eb10028784bee708a86f046c7b71b1b34c05a 100644
+index 75adb89ba0726781fc80bc244a5bf75dbf6b2a24..d090d3e7240091b18afb9f56fb1318bc10ec25cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -469,6 +469,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0047-Leaves-Syncmatica-Protocol.patch
+++ b/patches/server/0047-Leaves-Syncmatica-Protocol.patch
@@ -29,7 +29,7 @@ index d19f423debbeaedf955977c02aaf5f8e0016bea3..875afb57c7f0c4e3d0bc752d86a83081
 
     public static <T> T get(String key,T def){
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 645ab5d149a207bed00357fe0aaf070d4b27d15a..43d671adfe996b18e75e1672d1b0196ec9861238 100644
+index de25bf4893ac741fe687ab9bb0aa975db8686400..e82f4fa9a56840f4698865f41ada62fb3d5444dc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -307,6 +307,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -40,7 +40,7 @@ index 645ab5d149a207bed00357fe0aaf070d4b27d15a..43d671adfe996b18e75e1672d1b0196e
     }
 
     // CraftBukkit start - add fields
-@@ -333,6 +334,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -332,6 +333,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
     public final Long disconnectTicketId = Long.valueOf(DISCONNECT_TICKET_ID_GENERATOR.getAndIncrement());
     // Folia end - region threading
 
--- a/patches2/api/0001-Added-maven-publish.patch
+++ b/patches2/api/0001-Added-maven-publish.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: M2ke4U <79621885+MrHua269@users.noreply.github.com>
+Date: Sun, 24 Dec 2023 12:11:45 +0800
+Subject: [PATCH] Added maven publish
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 3e3ea0e4e4ceb3283ad2b99957e3795d66a9a716..0f1846c506cbe25cdd37b8f4b7fd9f7aef2bf0b9 100644
+--- a/build.gradle.kts
+++ b/build.gradle.kts
+@@ -199,3 +199,23 @@ tasks.check {
+     dependsOn(scanJarForOldGeneratedCode)
+ }
+ // Paper end
+
+// Luminol start
+publishing {
+    repositories {
+        maven {
+            name = "githubPackage"
+            url = uri("https://maven.pkg.github.com/LuminolMC/Luminol")
+
+            credentials.username = System.getenv("GITHUB_USERNAME")
+            credentials.password = System.getenv("GITHUB_TOKEN")
+        }
+
+        publications {
+            register<MavenPublication>("gpr") {
+                from(components["java"])
+            }
+        }
+    }
+}
+// Luminol end
+\ No newline at end of file