Updated Upstream (Folia)

2025-03-07 13:17:09 +08:00 · 2025-02-28 04:36:57 -05:00 · 2025-02-25 18:30:10 +08:00 · 2025-02-24 06:07:29 -08:00 · 2025-02-23 10:29:01 +08:00 · 2025-02-23 02:17:42 +08:00
19 changed files with 162 additions and 35 deletions
--- a/48
+++ b/48
@@ -0,0 +1,48 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('Configure git') {
+            steps {
+                script {
+                    sh 'git config user.name "luminolmc"'
+                    sh 'git config user.email "luminolmc@noreply.github.com"'
+                }
+            }
+        }
+
+        stage('Apply patches') {
+            steps {
+                script {
+                    sh 'chmod +x gradlew'
+                    sh './gradlew applyAllPatches'
+                }
+            }
+        }
+
+        stage('Build paperclip jar') {
+            steps {
+                script {
+                    sh './gradlew createMojmapPaperclipJar'
+                }
+            }
+        }
+
+        stage('Upload artifacts') {
+            steps {
+               script {
+                   archiveArtifacts(
+                       artifacts: "luminol-server/build/libs/*.jar",
+                       allowEmptyArchive: false
+                   )
+               }
+            }
+        }
+    }
+
+    post {
+        always {
+            cleanWs()
+        }
+    }
+}
--- 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=c2e3759112b527d71b129170bd7713058d3b38b6
+foliaRef=6265eb60e755171f5c35accf9bad6b7955eb9c7c

 org.gradle.configuration-cache=true
 org.gradle.caching=true
--- a/luminol-server/build.gradle.kts.patch
+++ b/luminol-server/build.gradle.kts.patch
@@ -67,8 +67,8 @@
     implementation("ca.spottedleaf:concurrentutil:0.0.3")
     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -200,26 +_,33 @@
-     implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
+@@ -201,26 +_,33 @@
+     implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1")
 }
 
 +// Pufferfish Start
@@ -84,7 +84,7 @@
         val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
         val build = System.getenv("BUILD_NUMBER") ?: null
 -        val buildTime = if (build != null) Instant.now() else Instant.EPOCH
-+        val buildTime = Instant.now() // We don't have ci yet
+        val buildTime = Instant.now() // Always use current as build time
         val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim()
         val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
         val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim()
@@ -107,10 +107,11 @@
             "Build-Number" to (build ?: ""),
             "Build-Time" to buildTime.toString(),
             "Git-Branch" to gitBranch,
-@@ -350,3 +_,9 @@
+@@ -351,3 +_,10 @@
     classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
     mainClass.set(null as String?)
 }
+
 +// Pufferfish Start
 +tasks.withType<JavaCompile> {
 +    val compilerArgs = options.compilerArgs
--- 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
@@ -66,10 +66,10 @@ index 46375fa81b36b89b79c22f0a7ac6d610ab1183d4..f2124edb487b1d5f6bdc7fa086814f87
             this.lastServerStatus = nanos;
             this.status = this.buildServerStatus();
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 8f348d140ab98e23ee0debe4bacac51fee49c35e..c6490516215ad94323174de81771f258cecc7742 100644
+index 375f4a59333ee1d75fb1acb8c2cbada7866bd48e..3abe2881e8a80bd6c128e96b976deebe3ada4678 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -764,6 +764,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -766,6 +766,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
 
     @Override
     public void stopServer() {
--- a/luminol-server/minecraft-patches/features/0006-Add-config-for-offline-mode-warning.patch
+++ b/luminol-server/minecraft-patches/features/0006-Add-config-for-offline-mode-warning.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for offline mode warning


 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index c6490516215ad94323174de81771f258cecc7742..ff2de692d397bf658fc7c8af0c6ce7697d1076a7 100644
+index 3abe2881e8a80bd6c128e96b976deebe3ada4678..a0a8b0c7d091f63f023f15a2620b03ae2126782e 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -285,7 +285,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/luminol-server/minecraft-patches/features/0016-Force-disable-builtin-spark-plugin.patch
+++ b/luminol-server/minecraft-patches/features/0016-Force-disable-builtin-spark-plugin.patch
@@ -75,7 +75,7 @@ index ed00a29daccfee1d631bef27c0a3a4ae83140018..330af9f4de1c72387326816065350e71
     }
 
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index ff2de692d397bf658fc7c8af0c6ce7697d1076a7..5973e6f327d3557ca95f504fe7b1a6c227a3e15f 100644
+index a0a8b0c7d091f63f023f15a2620b03ae2126782e..d7c922540b46e289395aeed514c98e43dc298e7b 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -214,7 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/luminol-server/minecraft-patches/features/0021-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/luminol-server/minecraft-patches/features/0021-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -5,19 +5,51 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 477b71c94461ab504b3955437d0f7acb312ed33f..9a97077acc6dd095c294b5b704b7df91eb48ec9d 100644
+index 477b71c94461ab504b3955437d0f7acb312ed33f..35e413b7b2f8465946b2cc8651560c6899898458 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4281,7 +4281,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4281,14 +4281,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         targetPos, 16, // load 16 blocks to be safe from block physics
                         ca.spottedleaf.concurrentutil.util.Priority.HIGH,
                         (chunks) -> {
 -                            net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, targetPos.below(), true, null);
+-
 +                            //net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, targetPos.below(), true, null);  // Kaiiju - Vanilla end teleportation - moved down
- 
+                            // Kaiiju start - Vanilla end teleportation
+                            Vec3 finalPos;
+                            if (this instanceof Player) finalPos = Vec3.atBottomCenterOf(targetPos.below());
+                            else finalPos = Vec3.atBottomCenterOf(targetPos);
+                            // Kaiiju end
                             // the portal obsidian is placed at targetPos.y - 2, so if we want to place the entity
                             // on the obsidian, we need to spawn at targetPos.y - 1
-@@ -4485,6 +4485,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                             portalInfoCompletable.complete(
+                                 new net.minecraft.world.level.portal.TeleportTransition(
+-                                    destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f,
+-                                    Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+                                    destination, finalPos, this.getDeltaMovement(), Direction.WEST.toYRot(), 0.0f, // Kaiiju - Vanilla end teleportation
+                                    //Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)), // Kaiiju - Vanilla end teleportation
+                                     TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
+                                     org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
+                                 )
+@@ -4303,11 +4307,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                         ca.spottedleaf.concurrentutil.util.Priority.HIGH,
+                         (chunks) -> {
+                             BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos);
+-
+                            // Kaiiju start - Vanilla end teleportation
+                            Vec3 finalPos;
+                            if (this instanceof Player) finalPos = Vec3.atBottomCenterOf(adjustedSpawn.below());
+                            else finalPos = Vec3.atBottomCenterOf(adjustedSpawn);
+                            // Kaiiju end
+                             // done
+                             portalInfoCompletable.complete(
+                                 new net.minecraft.world.level.portal.TeleportTransition(
+-                                    destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f,
+                                    destination, finalPos, this.getDeltaMovement(), 0.0f, 0.0f, // Kaiiju - Vanilla end teleportation
+                                     Relative.union(Relative.DELTA, Relative.ROTATION),
+                                     TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
+                                     org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
+@@ -4485,6 +4493,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         if (!this.canPortalAsync(destination, takePassengers)) {
             return false;
         }
@@ -28,7 +60,7 @@ index 477b71c94461ab504b3955437d0f7acb312ed33f..9a97077acc6dd095c294b5b704b7df91
 
         Vec3 initialPosition = this.position();
         ChunkPos initialPositionChunk = new ChunkPos(
-@@ -4549,9 +4553,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4549,9 +4561,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         info.postTeleportTransition().onTransition(teleported);
                     }
 
--- a/luminol-server/minecraft-patches/features/0026-Pufferfish-Cache-climbing-check-for-activation.patch
+++ b/luminol-server/minecraft-patches/features/0026-Pufferfish-Cache-climbing-check-for-activation.patch
@@ -18,7 +18,7 @@ index c260741a87513b89a5cc62c543fb9f990f86491e..beb9b3b3cd5ca60bd2cdada937bff8a1
             }
             if (entity instanceof final Mob mob && mob.getTarget() != null) {
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 3e31fc5fcc15a139bc8d3eb91e89b0f4e28d7eea..4615c052d4ac75e17bfea39fd0b19cdad35c9ecf 100644
+index 6258b008ad3e00d41e9f3014572d6f7a06b1847c..2293c3db45e9ecce4e0d4b2f87b8e90228e44d94 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -2044,6 +2044,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/luminol-server/minecraft-patches/features/0030-Gale-Skip-entity-move-if-movement-is-zero.patch
+++ b/luminol-server/minecraft-patches/features/0030-Gale-Skip-entity-move-if-movement-is-zero.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9a97077acc6dd095c294b5b704b7df91eb48ec9d..d30892195831c456c8d59ad9d1d2aa9331ef0a82 100644
+index 35e413b7b2f8465946b2cc8651560c6899898458..59dd6ecc3b79b1d6c13eda7b71d6dbbf4ffc1dfe 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -1104,7 +1104,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -23,7 +23,7 @@ index 9a97077acc6dd095c294b5b704b7df91eb48ec9d..d30892195831c456c8d59ad9d1d2aa93
         final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
         // Paper start - detailed watchdog information
         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -5043,6 +5050,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5051,6 +5058,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     }
 
     public final void setBoundingBox(AABB bb) {
--- a/luminol-server/minecraft-patches/features/0037-Add-missing-teleportation-apis-for-folia.patch
+++ b/luminol-server/minecraft-patches/features/0037-Add-missing-teleportation-apis-for-folia.patch
@@ -19,7 +19,7 @@ index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f6
             );
         });
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index d30892195831c456c8d59ad9d1d2aa9331ef0a82..59a2ee35a60c833516f59076650c6fd1e86b6be9 100644
+index 59dd6ecc3b79b1d6c13eda7b71d6dbbf4ffc1dfe..f26cdc00180f72bea271877b9ef814daf9850916 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -4166,6 +4166,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -74,7 +74,7 @@ index d30892195831c456c8d59ad9d1d2aa9331ef0a82..59a2ee35a60c833516f59076650c6fd1
                     // need to load chunks so we can create the platform
                     destination.moonrise$loadChunksAsync(
                         targetPos, 16, // load 16 blocks to be safe from block physics
-@@ -4303,7 +4339,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4307,7 +4343,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         }
                     );
                 } else {
@@ -94,7 +94,7 @@ index d30892195831c456c8d59ad9d1d2aa9331ef0a82..59a2ee35a60c833516f59076650c6fd1
                     // need to load chunk for heightmap
                     destination.moonrise$loadChunksAsync(
                         spawnPos, 0,
-@@ -4354,8 +4401,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4362,8 +4409,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
 
                 WorldBorder destinationBorder = destination.getWorldBorder();
                 double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType());
@@ -114,7 +114,7 @@ index d30892195831c456c8d59ad9d1d2aa9331ef0a82..59a2ee35a60c833516f59076650c6fd1
                 ca.spottedleaf.concurrentutil.completable.CallbackCompletable<BlockUtil.FoundRectangle> portalFound
                     = new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>();
 
-@@ -4492,9 +4549,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4500,9 +4557,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         if (!this.canPortalAsync(destination, takePassengers)) {
             return false;
         }
@@ -134,7 +134,7 @@ index d30892195831c456c8d59ad9d1d2aa9331ef0a82..59a2ee35a60c833516f59076650c6fd1
         // Kaiiju end
 
         Vec3 initialPosition = this.position();
-@@ -4568,6 +4634,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4576,6 +4642,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                         tpComplete.accept(teleported);
                     }
                     // Kaiiju end
--- a/luminol-server/minecraft-patches/features/0038-Leaves-Disable-moved-wrongly-threshold.patch
+++ b/luminol-server/minecraft-patches/features/0038-Leaves-Disable-moved-wrongly-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Disable moved wrongly threshold


 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1f031366afa973fa3ed027505d149737febd169e..8e98b034f968850c4bbf3c9d6ac468511f3ba06b 100644
+index 4e3cb90558533ea7ca0c838745e91ec5860c11ce..9fc72689b5021d1de2e149c1dfe5fc60048c7231 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -579,7 +579,7 @@ public class ServerGamePacketListenerImpl
--- a/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch
+++ b/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch
@@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff
                     double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
                     if (rangeY != -1) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 59a2ee35a60c833516f59076650c6fd1e86b6be9..dc5651d0fb47a8f43b9c6ff4b5a427d0f095f7a8 100644
+index f26cdc00180f72bea271877b9ef814daf9850916..647510b9fae49b5a4113a35be9909babf54acfcf 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -135,7 +135,7 @@ import net.minecraft.world.scores.ScoreHolder;
@@ -31,7 +31,7 @@ index 59a2ee35a60c833516f59076650c6fd1e86b6be9..dc5651d0fb47a8f43b9c6ff4b5a427d0
 
     // CraftBukkit start
     private static final int CURRENT_LEVEL = 2;
-@@ -6047,4 +6047,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -6055,4 +6055,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     // Paper end - Expose entity id counter
 
     public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
--- a/luminol-server/minecraft-patches/features/0042-Configurable-tripwire-dupe.patch
+++ b/luminol-server/minecraft-patches/features/0042-Configurable-tripwire-dupe.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
+Date: Mon, 24 Feb 2025 06:00:00 -0800
+Subject: [PATCH] Configurable tripwire dupe
+
+
+diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
+index 9aace993c6c18f1a50610e4766225485984b8167..07ffe289b9556b45a9ef7db5357d85b14fe23feb 100644
+--- a/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/net/minecraft/world/level/block/TripWireHookBlock.java
+@@ -215,7 +215,7 @@ public class TripWireHookBlock extends Block {
+                     BlockState blockState2 = blockStates[i2];
+                     if (blockState2 != null) {
+                         BlockState blockState3 = level.getBlockState(blockPos1);
+-                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
+                        if (me.earthme.luminol.config.modules.misc.AllowTripwireDupe.enabled || blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
+                             if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
+                         }
+                     }
--- 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 8eecdc662257edeb67d6823c476c635ba906d4dc..0ab41895a447725e6fa22e49c15e4cf3bf87805d 100644
+index 09853a5035a6cb2f9efa20a68644038f11065a9d..00b3db1c0c449e77cd365c70d0ce044c56b2dcf7 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 {
--- 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 0ab41895a447725e6fa22e49c15e4cf3bf87805d..33a0ef0bf3338631f61c8a6da5e3ff4209bb0b21 100644
+index 00b3db1c0c449e77cd365c70d0ce044c56b2dcf7..4e9248980ee7400d856dc30792197468559bfe9b 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 {
--- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaEntityMovingFixConfig.java.patch
+++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaEntityMovingFixConfig.java.patch
@@ -10,11 +10,11 @@
 +public class FoliaEntityMovingFixConfig implements IConfigModule {
 +    @ConfigInfo(baseName = "enabled", comments =
 +            """
-+                    A simple fix of a issue on folia\s
-+                    (Some times the entity would\s
+                    A simple fix of an issue on folia\s
+                    (Sometimes the entity would\s
 +                    have a large moment that cross the\s
-+                    different tick regions and it would\s
-+                    make the server crashed)  but sometimes it might doesn't work""")
+                    different tick regions, and it would\s
+                    make the server crashed) but sometimes it might doesn't work""")
 +    public static boolean enabled = false;
 +    @ConfigInfo(baseName = "warn_on_detected")
 +    public static boolean warnOnDetected = true;
--- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java.patch
+++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java.patch
@@ -11,7 +11,7 @@
 +    @ConfigInfo(baseName = "enabled", comments =
 +            """
 +                    The POIManager of folia has something which has not been patched\s
-+                     for regionized ticking and these would trigger the async catcher\s
+                    for regionized ticking and these would trigger the async catcher\s
 +                    and make the server crash.If you would like to prevent it and didn't\s
 +                    mind the side effect(currently unknown), you can enable this""")
 +    public static boolean enabled = false;
--- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch
+++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java.patch
@@ -0,0 +1,23 @@
+--- /dev/null
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/AllowTripwireDupe.java
+@@ -1,0 +_,20 @@
+package me.earthme.luminol.config.modules.misc;
+
+import me.earthme.luminol.config.ConfigInfo;
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+
+public class AllowTripwireDupe implements IConfigModule {
+    @ConfigInfo(baseName = "enabled")
+    public static boolean enabled = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "tripwire_dupe";
+    }
+}
--- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/ContainerExpansionConfig.java.patch
+++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/ContainerExpansionConfig.java.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/ContainerExpansionConfig.java
-@@ -1,0 +_,23 @@
+@@ -1,0 +_,27 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
@@ -8,10 +8,14 @@
 +import me.earthme.luminol.config.IConfigModule;
 +
 +public class ContainerExpansionConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "barrel_rows")
+    @ConfigInfo(baseName = "barrel_rows", comments =
+            """
+                    range: 1~6\s""")
 +    public static int barrelRows = 3;
 +
-+    @ConfigInfo(baseName = "enderchest_rows")
+    @ConfigInfo(baseName = "enderchest_rows", comments =
+            """
+                    range: 1~6\s""")
 +    public static int enderchestRows = 3;
 +
 +    @Override
Author	SHA1	Message	Date
xiaoxijun	93e956372b	Updated Upstream (Folia)	2025-03-07 13:17:09 +08:00
Dreeam	0bf38e65cf	Updated Upstream (Folia)	2025-02-28 04:36:57 -05:00
Kercute	e5b2276a8d	Updated Upstream (Folia)	2025-02-25 18:30:10 +08:00
HaHaWTH	589c263bac	Configurable tripwire dupe 梦梦辛苦辽	2025-02-24 06:07:29 -08:00
M2ke4U	5d3d2271bc	Merge pull request #55 from Suisuroru/suisuroru/descriptions-fix Fix some syntax errors in configuration file descriptions and submit comments on container extension settings	2025-02-23 10:29:01 +08:00
Suisuroru	3361b9db14	feat(config): corrected words in some configuration descriptions	2025-02-23 02:17:42 +08:00
MrHua269	f6ca4cc24a	[ci skip] Removed useless parts	2025-02-22 19:37:24 +08:00
MrHua269	85ffaa1156	Fix wrong upper-cased file name	2025-02-22 18:43:01 +08:00
MrHua269	6c48c27b7d	Fixed end portal teleportation and added jenkins file	2025-02-22 18:38:44 +08:00