backport(perf): add cache for replay api

backport(feat): add save-all support
backport: add removed check before all checks start in addEffects
2026-01-28 23:19:55 +08:00 · 2026-01-16 02:58:10 +08:00 · 2026-01-13 21:44:57 +08:00 · 2026-01-04 18:54:26 +08:00 · 2025-12-29 00:56:08 +08:00 · 2025-12-27 20:51:20 +08:00
632 changed files with 7271 additions and 41655 deletions
@@ -11,4 +11,4 @@ issuehunt: # Replace with a single IssueHunt username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 polar: # Replace with a single Polar username
 buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-custom: [https://afdian.com/a/bm0721] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: https://afdian.com/a/Luminol
@@ -74,11 +74,11 @@ body:
        All config files on your server.
        例如以下文件（或者文件夹）：
        Example files (or folders)：
-        - \spigot.yml
-        - \bukkit.yml
-        - \config\\\*
-        - \lophine_config\\\*
-        - \luminol_config\\\*
+         - \spigot.yml
+         - \bukkit.yml
+         - \config\\\*
+         - \lophine_config\\\*
+         - \luminol_config\\\*
  - type: textarea
    id: other
    attributes:
@@ -10,11 +10,11 @@ on:
  workflow_dispatch:
    inputs:
      force-release:
-        description: "Force disable release if you enter false, force release if you enter true, default release if not released else skip release"
+        description: "Force disable release if you enter 2, force release if you enter 1, default release if not released else skip release"
        required: false
        default: ""
      force-push:
-        description: "Force disable push to repo if you enter false, force push to repo if you enter true, default push if not released else skip push repo"
+        description: "Force disable push to repo if you enter 2, force push to repo if you enter 1, default push if not released else skip push repo"
        required: false
        default: ""
      comments:
@@ -28,38 +28,36 @@ jobs:
  build:
    runs-on: ubuntu-latest
    environment: default
-    env:
-      BUILD_NUMBER: ${{ github.run_number }}
    steps:
      - name: Checkout Git Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Set Up JDK
        uses: actions/setup-java@v5
        with:
          distribution: zulu
-          java-version: 25
+          java-version: 21

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v6
+        uses: gradle/actions/setup-gradle@v5

      - name: Grant execute permission for gradlew
        run: chmod +x gradlew

      - name: Configure Git User Details
-        run: git config --global user.email "ci@lophinelabs.com" && git config --global user.name "LophinelabsCI"
+        run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"

      - name: Apply All Patches
        run: ./gradlew --refresh-dependencies applyAllPatches

      - name: Build Paperclip Jar
-        run: ./gradlew --refresh-dependencies createPaperclipJar
+        run: ./gradlew --refresh-dependencies createMojmapPaperclipJar

      - name: Upload Artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: ${{ env.project_id_b }} CI Artifacts
-          path: lophine-server/build/libs/*-paperclip-*.jar
+          path: lophine-server/build/libs/*-paperclip-*-mojmap.jar

      - name: Set Environment
        if: github.event_name != 'pull_request'
@@ -83,12 +81,11 @@ jobs:
            done
            echo "tag=${{ env.tag }}-${counter}" >> $GITHUB_ENV
            echo "release_count= - ${counter}" >> $GITHUB_ENV
-            release_exists=false
          fi
          echo "release_exists=${release_exists}" >> $GITHUB_ENV

      - name: Check If Branch In Expectations
-        if: github.event_name != 'pull_request' && env.flag_release == 'true'
+        if: github.event_name != 'pull_request'
        run: |
          if [[ "$GITHUB_REF_NAME" == ver/* ]] || [[ "$GITHUB_REF_NAME" == exp/* ]] || [[ "$GITHUB_REF_NAME" == dev/* ]]; then
            echo "Branch is in expected prefixes"
@@ -99,7 +96,7 @@ jobs:
          fi

      - name: Publish To Repo
-        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_push_repo == 'true' && !( inputs.force-push == 'false' )) || inputs.force-push == 'true'
+        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !( inputs.force-release == '2' )) || inputs.force-push == '1'
        continue-on-error: true
        run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
        env:
@@ -107,7 +104,7 @@ jobs:
          PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}

      - name: Create Release - Pre Process
-        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !(inputs.force-release == 'false')) || inputs.force-release == 'true'
+        if: ( github.event_name != 'pull_request' && !( env.unexpect == 'true' ) && env.flag_release == 'true' && env.release_exists != 'true' && !(inputs.force-release == '2')) || inputs.force-release == '1'
        run: |
          if [ "${{ inputs.comments }}" == "" ]; then
            echo "No comments provided"
@@ -124,7 +121,7 @@ jobs:
          tag: ${{ env.tag }}
          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }}
          body: |
-            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineLabs/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineLabs/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
+            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
            This release is automatically compiled by GitHub Actions
            ### Branch Info
            > ${{ github.ref_name }}
@@ -143,7 +140,7 @@ jobs:
          tag: ${{ env.tag }}
          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }}
          body: |
-            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineLabs/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineLabs/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
+            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
            This release is automatically compiled by GitHub Actions
            ### Comments
            > ${{ inputs.comments }}
@@ -16,12 +16,12 @@ jobs:
      pull-requests: write
      checks: write
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
          fetch-depth: 0  # a full history is required for pull request analysis
      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@latest
+        uses: JetBrains/qodana-action@v2025.3
        with:
          pr-mode: false
        env:
@@ -6,10 +6,12 @@ build

 /run

-/lophine-server/build.gradle.kts
-/lophine-api/build.gradle.kts
+/lightingluminol-server/build.gradle.kts
+/lightingluminol-api/build.gradle.kts
+/luminol-server/build.gradle.kts
 /luminol-server/src/minecraft
 /paper-server
+/luminol-api/build.gradle.kts
 /paper-api
 /paper-api-generator

@@ -3,11 +3,11 @@ Lophine inherits its licensing from the included upstream projects.
 Lophine从上游继承了许可证。

 As such, Lophine is licensed under the
-[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Folia,
-who in turn inherits it from the original Paper, Spigot, Bukkit and CraftBukkit projects.
+[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Luminol,
+who in turn inherits it from the original Folia, Paper, Spigot, Bukkit and CraftBukkit projects.

 因此，Lophine中应当遵守[GNU通用公共许可证-第3版](licenses/GPL.md)；
-因为Lophine从上游Folia继承了它，而Folia又从其上游的Paper、Spigot、Bukkit和Craftbukkit项目中继承了它。
+因为Lophine从上游Luminol继承了它，而Luminol又从其上游的Folia、Paper、Spigot、Bukkit和Craftbukkit项目中继承了它。

 Any author who is _not_ listed below should be presumed to have released their work
 under the original [GPL](licenses/GPL.md) license.
@@ -3,17 +3,17 @@
  
  # Lophine
  
-  *Lophine 是一个基于Folia的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）*
+  *Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）*
  
-  ![Created At](https://img.shields.io/github/created-at/LophineLabs/Lophine?style=for-the-badge&color=blue)
-  [![License](https://img.shields.io/github/license/LophineLabs/Lophine?style=for-the-badge&color=green)](LICENSE.md)
-  [![Issues](https://img.shields.io/github/issues/LophineLabs/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineLabs/Lophine/issues)
+  ![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=for-the-badge&color=orange)](https://github.com/LuminolMC/Lophine/issues)
  
-  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineLabs/Lophine?style=for-the-badge&color=purple)
-  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineLabs/Lophine?style=for-the-badge&color=yellow)
-  ![GitHub all releases](https://img.shields.io/github/downloads/LophineLabs/Lophine/total?style=for-the-badge&color=red)
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=for-the-badge&color=red)
  
-  ![Repo contributors](https://img.shields.io/github/contributors/LophineLabs/Lophine?style=for-the-badge&color=brightgreen)
+  ![Repo contributors](https://img.shields.io/github/contributors/LuminolMC/Lophine?style=for-the-badge&color=brightgreen)
  
  [English](./README_EN.md) | **中文**
 </div>
@@ -29,16 +29,10 @@
 - 🔬 **生电功能增强** - 在 Folia 上实现更多生电内容（完整生电请使用 Fabric）
 - 🛠️ **更多实用功能** - 持续添加有用的服务器功能

-### 额外启动参数
-
- - morninggloryclip.useMojangSource 强制服务端使用mojang源下载文件
- - morninggloryclip.enable.mixin 启用服务器插件的mixin支持
-
-
 ## 📥 下载

 ### 稳定版本
-所有发布版本都可以在 [Releases](https://github.com/LophineLabs/Lophine/releases) 页面找到。
+所有发布版本都可以在 [Releases](https://github.com/LuminolMC/Lophine/releases) 页面找到。

 ### 开发版本
 如果您想体验最新功能，可以通过以下步骤自行构建。
@@ -47,11 +41,11 @@

 ```bash
 # 克隆项目
-git clone https://github.com/LophineLabs/Lophine.git
+git clone https://github.com/LuminolMC/Lophine.git
 cd Lophine

 # 应用补丁并构建 Paperclip JAR
-./gradlew applyAllPatches && ./gradlew createPaperclipJar
+./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```

 构建完成后，您可以在 `lophine-server/build/libs` 目录中找到生成的 JAR 文件。
@@ -63,16 +57,12 @@ cd Lophine
 ```kotlin
 repositories {
    maven {
-        url = "https://repo.bacteriawa.com/repository/maven-public/"
+        url = "https://repo.menthamc.org/repository/maven-public/"
    }
 }

 dependencies {
-    compileOnly("fun.bm.lophine:lophine-api:26.2.build.+")
-}
-
-java {
-  toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+    compileOnly("fun.bm.lophine:lophine-api:$VERSION")
 }
 ```

@@ -81,16 +71,16 @@ java {
 ```xml
 <repositories>
    <repository>
-        <id>repository</id>
-        <url>https://repo.bacteriawa.com/repository/maven-public/</url>
+        <id>menthamc</id>
+        <url>https://repo.menthamc.org/repository/maven-public/</url>
    </repository>
 </repositories>

 <dependencies>
    <dependency>
        <groupId>fun.bm.lophine</groupId>
-        <artifactId>lophine-api</artifactId>
-        <version>[26.2.build,)</version>
+        <artifactId>luminol-api</artifactId>
+        <version>$VERSION</version>
    </dependency>
 </dependencies>
 ```
@@ -101,13 +91,15 @@ java {

 ### 加入我们的社区

- **QQ群**: [1020403749](https://qm.qq.com/cgi-bin/qm/qr?k=y_MA9UaN7PM9e9J1LIs9Eea3LK8C0h6J&jump_from=webapi&authKey=ap5f8MlbeezXYtnmpnT5ZOFljDuOyV6OAb2PIcViQ+Ilr60Ycq63FDDTsJOZDYtj)
- **Discord**: [点击加入](https://discord.gg/UXSgPZczcy)
+- **QQ群**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)
+- **QQ频道**: [点击加入](https://pd.qq.com/s/eq9krf9j)
+- **Telegram**: [点击加入](https://t.me/LuminolMinecraft)
+- **Discord**: [点击加入](https://discord.gg/Qd7m3V6eDx)

 ### 获取帮助

- 📋 [提交 Issue](https://github.com/LophineLabs/Lophine/issues)
- 💬 [GitHub Discussions](https://github.com/LophineLabs/Lophine/discussions)
+- 📋 [提交 Issue](https://github.com/LuminolMC/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LuminolMC/Lophine/discussions)
 - 📖 [项目文档](./docs/)

 ## 🐛 问题反馈
@@ -132,6 +124,34 @@ java {

 ![bStats](https://bstats.org/signatures/server-implementation/Lophine.svg "bStats")

+## 🎉 特别感谢
+
+### 项目赞助商
+
+<div align="center">
+  <b>感谢 <a href="https://github.com/LegacyLands">LegacyLands</a> 对本项目的赞助</b>
+  <br>
+  <i>如果你想开发跨 Folia/非 Folia 平台的插件，<a href="https://github.com/LegacyLands/legacy-lands-library/">legacy-lands-library</a> 将会是个不错的选择</i>
+  <br><br>
+  <img src="public/image/legacy-lands-logo.png" alt="LegacyLands Logo" width="200">
+</div>
+
+---
+
 ## ⭐ 请给我们一个 Star！

 > 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。
+
+### Star 历史
+
+<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&LuminolMC/Lophine&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
+    <img alt="Star历史表" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
+  </picture>
+</a>
+
+<div align="center">
+  <b>如果这个项目对您有帮助，请不要忘记给我们一个 ⭐Star！</b>
+</div>
@@ -3,17 +3,17 @@
  
  # Lophine
  
-  *Lophine is a Folia fork with many useful optimizations and configurable vanilla features, aims to provide more function for survival-usable circuit on folia (Please note that Fabric should be used for complete survival-usable)*
+  *Lophine is a Luminol fork with many useful optimizations and configurable vanilla features, aims to provide more function for survival-usable circuit on folia (Please note that Fabric should be used for complete survival-usable)*
  
-  ![Created At](https://img.shields.io/github/created-at/LophineLabs/Lophine?style=for-the-badge&color=blue)
-  [![License](https://img.shields.io/github/license/LophineLabs/Lophine?style=for-the-badge&color=green)](LICENSE.md)
-  [![Issues](https://img.shields.io/github/issues/LophineLabs/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineLabs/Lophine/issues)
+  ![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=for-the-badge&color=orange)](https://github.com/LuminolMC/Lophine/issues)
  
-  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineLabs/Lophine?style=for-the-badge&color=purple)
-  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineLabs/Lophine?style=for-the-badge&color=yellow)
-  ![GitHub all releases](https://img.shields.io/github/downloads/LophineLabs/Lophine/total?style=for-the-badge&color=red)
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=for-the-badge&color=red)
  
-  ![Repo contributors](https://img.shields.io/github/contributors/LophineLabs/Lophine?style=for-the-badge&color=brightgreen)
+  ![Repo contributors](https://img.shields.io/github/contributors/LuminolMC/Lophine?style=for-the-badge&color=brightgreen)
  
  **English** | [中文](./README.md)
 </div>
@@ -29,15 +29,10 @@
 - 🔬 **Redstone Enhancement** - More redstone functionality on Folia (use Fabric for complete redstone features)
 - 🛠️ **More Useful Functions** - Continuously adding useful server features

-### Additional Launch Parameters
-
- - morninggloryclip.useMojangSource - Use Mojang's source for Minecraft Server
- - morninggloryclip.enable.mixin - Enable mixin support for Leaves Plugin
-
 ## 📥 Download

 ### Stable Releases
-All release versions can be found on the [Releases](https://github.com/LophineLabs/Lophine/releases) page.
+All release versions can be found on the [Releases](https://github.com/LuminolMC/Lophine/releases) page.

 ### Development Builds
 If you want to experience the latest features, you can build it yourself following the steps below.
@@ -46,11 +41,11 @@ If you want to experience the latest features, you can build it yourself followi

 ```bash
 # Clone the project
-git clone https://github.com/LophineLabs/Lophine.git
+git clone https://github.com/LuminolMC/Lophine.git
 cd Lophine

 # Apply patches and build Paperclip JAR
-./gradlew applyAllPatches && ./gradlew createPaperclipJar
+./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```

 After building, you can find the generated JAR file in the `lophine-server/build/libs` directory.
@@ -62,16 +57,12 @@ After building, you can find the generated JAR file in the `lophine-server/build
 ```kotlin
 repositories {
    maven {
-        url = "https://repo.bacteriawa.com/repository/maven-public/"
+        url = "https://repo.menthamc.org/repository/maven-public/"
    }
 }

 dependencies {
-    compileOnly("fun.bm.lophine:lophine-api:26.2.build.+")
-}
-
-java {
-  toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+    compileOnly("fun.bm.lophine:lophine-api:$VERSION")
 }
 ```

@@ -80,16 +71,16 @@ java {
 ```xml
 <repositories>
    <repository>
-        <id>repository</id>
-        <url>https://repo.bacteriawa.com/repository/maven-public/</url>
+        <id>menthamc</id>
+        <url>https://repo.menthamc.org/repository/maven-public/</url>
    </repository>
 </repositories>

 <dependencies>
    <dependency>
        <groupId>fun.bm.lophine</groupId>
-        <artifactId>lophine-api</artifactId>
-        <version>[26.2.build,)</version>
+        <artifactId>luminol-api</artifactId>
+        <version>$VERSION</version>
        <scope>provided</scope>
    </dependency>
 </dependencies>
@@ -101,13 +92,15 @@ java {

 ### Join Our Community

- **QQ Group**: [1020403749](https://qm.qq.com/cgi-bin/qm/qr?k=y_MA9UaN7PM9e9J1LIs9Eea3LK8C0h6J&jump_from=webapi&authKey=ap5f8MlbeezXYtnmpnT5ZOFljDuOyV6OAb2PIcViQ+Ilr60Ycq63FDDTsJOZDYtj)
- **Discord**: [Join Here](https://discord.gg/UXSgPZczcy)
+- **QQ Group**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)
+- **QQ Channel**: [Join Here](https://pd.qq.com/s/eq9krf9j)
+- **Telegram**: [Join Here](https://t.me/LuminolMinecraft)
+- **Discord**: [Join Here](https://discord.gg/Qd7m3V6eDx)

 ### Get Help

- 📋 [Submit Issues](https://github.com/LophineLabs/Lophine/issues)
- 💬 [GitHub Discussions](https://github.com/LophineLabs/Lophine/discussions)
+- 📋 [Submit Issues](https://github.com/LuminolMC/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LuminolMC/Lophine/discussions)
 - 📖 [Project Documentation](./docs/)

 ## 🐛 Bug Reports
@@ -132,6 +125,34 @@ We welcome community contributions! For detailed contribution guidelines, please

 ![bStats](https://bstats.org/signatures/server-implementation/Lophine.svg "bStats")

+## 🎉 Special Thanks
+
+### Project Sponsors
+
+<div align="center">
+  <b>Thanks to <a href="https://github.com/LegacyLands">LegacyLands</a> for sponsoring this project</b>
+  <br>
+  <i>If you want to develop cross-Folia/non-Folia platform plugins, <a href="https://github.com/LegacyLands/legacy-lands-library/">legacy-lands-library</a> would be a great choice</i>
+  <br><br>
+  <img src="public/image/legacy-lands-logo.png" alt="LegacyLands Logo" width="200">
+</div>
+
+---
+
 ## ⭐ Give Us a Star!

 > Every free ⭐Star you give is the motivation for our every step forward.
+
+### Star History
+
+<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&LuminolMC/Lophine&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
+  </picture>
+</a>
+
+<div align="center">
+  <b>If this project helps you, please don't forget to give us a ⭐Star!</b>
+</div>
@@ -1,27 +1,23 @@
-import groovy.json.JsonSlurper
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent

 plugins {
    java // TODO java launcher tasks
-    id("fun.bm.comfreyweight.patcher")
+    id("moe.luminolmc.hyacinthusweight.patcher") version "+" // Automatically pulls the latest
 }

 paperweight {
-    filterPatches = false
-    upstreams.register("folia") {
-        repo = github("PaperMC", "Folia")
-        ref = providers.gradleProperty("foliaRef")
-
-        println("Upstream commit ref: " + ref.get())
+    upstreams.register("luminol") {
+        repo = github("LuminolMC", "Luminol")
+        ref = providers.gradleProperty("luminolRef")

        patchFile {
-            path = "folia-server/build.gradle.kts"
+            path = "luminol-server/build.gradle.kts"
            outputFile = file("lophine-server/build.gradle.kts")
            patchFile = file("lophine-server/build.gradle.kts.patch")
        }
        patchFile {
-            path = "folia-api/build.gradle.kts"
+            path = "luminol-api/build.gradle.kts"
            outputFile = file("lophine-api/build.gradle.kts")
            patchFile = file("lophine-api/build.gradle.kts.patch")
        }
@@ -30,17 +26,22 @@ paperweight {
            patchesDir = file("lophine-api/paper-patches")
            outputDir = file("paper-api")
        }
-        patchDir("foliaApi") {
+        patchRepo("foliaApi") {
            upstreamPath = "folia-api"
-            excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
            patchesDir = file("lophine-api/folia-patches")
            outputDir = file("folia-api")
        }
+        patchDir("luminolApi") {
+            upstreamPath = "luminol-api"
+            excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
+            patchesDir = file("lophine-api/luminol-patches")
+            outputDir = file("luminol-api")
+        }
    }
 }

 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-val bacteriawaMavenPublicUrl = "https://repo.bacteriawa.com/repository/maven-public/";
+val menthaMavenPublicUrl = "https://repo.menthamc.org/repository/maven-public/";

 subprojects {
    apply(plugin = "java-library")
@@ -48,14 +49,14 @@ subprojects {

    extensions.configure<JavaPluginExtension> {
        toolchain {
-            languageVersion = JavaLanguageVersion.of(25)
+            languageVersion = JavaLanguageVersion.of(21)
        }
    }

    repositories {
        mavenCentral()
        maven(paperMavenPublicUrl)
-        maven(bacteriawaMavenPublicUrl)
+        maven(menthaMavenPublicUrl)
    }

    dependencies {
@@ -68,7 +69,7 @@ subprojects {
    }
    tasks.withType<JavaCompile>().configureEach {
        options.encoding = Charsets.UTF_8.name()
-        options.release = 25
+        options.release = 21
        options.isFork = true
    }
    tasks.withType<Javadoc>().configureEach {
@@ -87,8 +88,8 @@ subprojects {

    extensions.configure<PublishingExtension> {
        repositories {
-            maven("https://repo.bacteriawa.com/repository/maven-releases/") {
-                name = "Bacteriawa"
+            maven("https://repo.menthamc.org/repository/maven-snapshots/") {
+                name = "MenthaMC"
                credentials(PasswordCredentials::class) {
                    username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")
                    password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD")
@@ -105,99 +106,4 @@ subprojects {
            }
        }
    }
-}
-
-// Sort all JSON language files under the lang directory by key in ASCII order
-val langDir = layout.projectDirectory.dir("lophine-server/src/main/resources/assets/lophine/lang")
-tasks.register("sortLangKeys") {
-    group = "lophine"
-    description = "Sort all JSON language files by key in ASCII (ordinal) order"
-    notCompatibleWithConfigurationCache("Inline task action references build script class")
-    inputs.dir(langDir).optional()
-    outputs.dir(langDir)
-    doLast {
-        val dir = langDir.asFile
-        if (!dir.isDirectory) {
-            logger.warn("Lang directory not found: $dir")
-            return@doLast
-        }
-        val jsonFiles = dir.listFiles { f -> f.extension == "json" }?.sortedBy { it.name } ?: emptyList()
-        if (jsonFiles.isEmpty()) {
-            logger.lifecycle("No .json files found in: $dir")
-            return@doLast
-        }
-        val slurper = JsonSlurper()
-        for (file in jsonFiles) {
-            @Suppress("UNCHECKED_CAST")
-            val data = slurper.parse(file) as Map<String, Any?>
-            val sorted = data.toSortedMap()
-            val pretty = formatJson(sorted)
-            file.writeText(pretty + "\n", charset = Charsets.UTF_8)
-            logger.lifecycle("Processed: ${file.name}  (${sorted.size} keys)")
-        }
-        logger.lifecycle("Done.")
-    }
-}
-
-// --- Pure-Kotlin JSON serializer that preserves non-ASCII characters (e.g. CJK) ---
-fun formatJson(value: Any?, indent: Int = 2): String {
-    val sb = StringBuilder()
-    appendJson(sb, value, indent, 0)
-    return sb.toString()
-}
-
-private fun appendJson(sb: StringBuilder, value: Any?, indent: Int, level: Int) {
-    when (value) {
-        null -> sb.append("null")
-        is Boolean -> sb.append(value)
-        is Number -> sb.append(value)
-        is String -> sb.append('"').append(escapeJsonString(value)).append('"')
-        is List<*> -> {
-            if (value.isEmpty()) { sb.append("[]"); return }
-            sb.append("[\n")
-            value.forEachIndexed { i, v ->
-                sb.append(" ".repeat(indent * (level + 1)))
-                appendJson(sb, v, indent, level + 1)
-                if (i < value.size - 1) sb.append(',')
-                sb.append('\n')
-            }
-            sb.append(" ".repeat(indent * level)).append(']')
-        }
-        is Map<*, *> -> {
-            if (value.isEmpty()) { sb.append("{}"); return }
-            sb.append("{\n")
-            val entries = value.entries.toList()
-            entries.forEachIndexed { i, (k, v) ->
-                sb.append(" ".repeat(indent * (level + 1)))
-                sb.append('"').append(escapeJsonString(k.toString())).append('"')
-                sb.append(": ")
-                appendJson(sb, v, indent, level + 1)
-                if (i < entries.size - 1) sb.append(',')
-                sb.append('\n')
-            }
-            sb.append(" ".repeat(indent * level)).append('}')
-        }
-        else -> sb.append('"').append(escapeJsonString(value.toString())).append('"')
-    }
-}
-
-private fun escapeJsonString(s: String): String {
-    val sb = StringBuilder(s.length)
-    for (c in s) {
-        when (c) {
-            '"' -> sb.append("\\\"")
-            '\\' -> sb.append("\\\\")
-            '\b' -> sb.append("\\b")
-            '\u000C' -> sb.append("\\f")
-            '\n' -> sb.append("\\n")
-            '\r' -> sb.append("\\r")
-            '\t' -> sb.append("\\t")
-            else -> if (c.code < 0x20) {
-                sb.append("\\u").append(String.format("%04x", c.code))
-            } else {
-                sb.append(c) // preserve CJK and all other printable chars as-is
-            }
-        }
-    }
-    return sb.toString()
-}
+}
@@ -21,7 +21,7 @@
 在开始开发之前，您首先需要拥有以下软件作为开发环境：

 - `git`
- `JDK 25 或更高版本`
+- `JDK 21 或更高版本`

 特别提醒：在操作前，您需要启用系统和Git的长路径支持，以下为部分平台的相关描述。

@@ -41,7 +41,7 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的

 1. 将你的仓库 clone 到本地；
 2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyAllPatches` 任务，如果是在终端内，你可以执行 `./gradlew applyAllPatches`；
-3. 在执行操作后，仓库根目录下应该存在以下目录对： `lophine-api` 和 `lophine-server` , `folia-api` 和 `folia-server` ， 以及 `paper-api` 和 `paper-server`（下文称作 `*-api` 和 `*-server` ）；
+3. 在执行操作后，仓库根目录下应该存在以下目录对： `lophine-api` 和 `lophine-server` ， `luminol-api` 和 `luminol-server` ， `folia-api` 和 `folia-server` ， 以及 `paper-api` 和 `paper-server`（下文称作 `*-api` 和 `*-server` ）；
 4. 进入 仓库根目录下的 `*-api` 和 `*-server` 文件夹进行修改。

 以下为对上述各个文件夹的简单描述，详细描述可以参考[这里](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md)：
@@ -49,12 +49,14 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的
 1. API部分

 - `lophine-api` ：对新增API的修改
+- `luminol-api` ：对luminol-API的修改应当在此文件夹下进行
 - `folia-api` ：对folia-API的修改应当在此文件夹下进行
 - `paper-api` ：对paper-API/spigot-API/bukkit-API的修改应该在此文件夹下进行

 2. Server部分

 - `lophine-server` ：对Minecraft原版服务器的修改和新增文件应当在此文件夹下进行
+- `luminol-server` ：对luminol-server的修改应当在此文件夹下进行
 - `folia-server` ：对folia-Server的修改应当在此文件夹下进行
 - `paper-server` ：对于paper对服务器逻辑的修改应当在此文件夹下进行

@@ -62,7 +64,7 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的

 - 在应用补丁前，基点将会指向未被更改的源码
 - 在基点后的每一个提交都是一个补丁
- 只有在 Folia 最后一个提交后的提交才会被视为 lophine 补丁
+- 只有在 Luminol 最后一个提交后的提交才会被视为 lophine 补丁

 ## 增加补丁

@@ -88,13 +90,3 @@ Lophine 使用和 Folia 一样的补丁系统，并为了针对不同部分的
 4. 运行 Gradle 任务 `fixupPaperApiFilePatches` 来修改已被修改的在lophine新建文件的补丁（注意不要提交）；
 5. 运行 Gradle 任务 `rebuildAllServerPatches` 来修改已被修改的补丁；
 6. 将修改后的补丁 PR 发回储存库。
-
-## 为配置项提供本地化的注释支持
-
-1. 在 `lophine-server/src/main/resources/assets/lophine/lang` 目录下创建或修改相应的语言文件，添加本地化的注释；
-    - 文件的名字应当符合 `https://minecraft.wiki/w/Language` 页面下的格式，如 `en_us` `zh_cn` `zh_hk` `zh_tw`，文件以 `json` 为格式类型；
-2. 运行 Gradle 任务 `sortLangKeys` 来对你的语言文件内容进行重排序；
-3. 使用 `git commit -m <提交信息>` 进行提交；
-4. 将你修改的文件进行推送。
-
-这样做以后，你就可以将你的修改进行 PR 提交。
@@ -23,7 +23,7 @@ See also [This issue](https://github.com/isaacs/github/issues/1681), and then yo
 Before coding, you need these pieces of software / tools as Dev Environment.

 - `git`
- `JDK 25 or higher`
+- `JDK 21 or higher`

 PS: You need to enable long path support in your System and Git before start, some of the platform's resolution here.

@@ -44,7 +44,7 @@ If you have forked the main repository, then you should follow the steps below:

 1. Clone your repository to local
 2. Run Gradle's `applyAllPatches` task in your IDE or terminal (You can run `./gradlew applyAllPatches` directly in terminal.)
-3. After performing the operation, the following directory pairs should exist in the root directory of the warehouse: `lophine-api` and `lophine-server` , `folia-api` and `folia-server` , `paper-api` and `paper-server` (Referred to `*-api` and `*-server` as below)
+3. After performing the operation, the following directory pairs should exist in the root directory of the warehouse: `lophine-api` and `lophine-server` , `luminol-api` and `luminol-server` , `folia-api` and `folia-server` , `paper-api` and `paper-server` (Referred to `*-api` and `*-server` as below)
 4. Enter `*-api` and `*-server` directory to carry out modifications.

 The following is the simple description of the aforementioned folders, detailed description can be referred to [here](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md):
@@ -52,12 +52,14 @@ The following is the simple description of the aforementioned folders, detailed
 1. API part

 - `lophine-api` : Modifications to the new API
+- `luminol-api` : Modifications to Luminol API should be carried out in this folder
 - `folia-api` : Modifications to Folia API should be carried out in this folder
 - `paper-api` : Modifications to Paper API/Spigot API/Bukkit API should be carried out in this folder

 2. Server part

 - `lophine-server` : Changes and new files to the Minecraft vanilla server should be made in this folder
+- `luminol-server` : Changes to luminol-server should be made in this folder
 - `folia-server` : Changes to folia-server should be made in this folder
 - `paper-server` : Modifications to the server logic for paper should be made in this folder

@@ -65,7 +67,7 @@ BTW, `*-api` and `*-server` and are not normal git repositories.

 - Before applying patches, the base will point to unmodified source code.
 - Every commit after the base is a patch.
- Only commits after the last commit of Folia will be considered as Lophine patches.
+- Only commits after the last commit of Luminol will be considered as Lophine patches.

 ## Adding new patches

@@ -91,13 +93,3 @@ You can modify an existing patch by following the steps below:
 4. Run Gradle's task `fixupPaperApiFilePatches` to regenerate lophine-created files to patches (PS: do not commit again before you run this task)
 5. Run Gradle's task `rebuildAllServerPatches` to modify existing patches
 6. Push and PR again
-
-## Providing localized comment support for configuration entries
-
-1. Create or modify the corresponding language file under the `lophine-server/src/main/resources/assets/lophine/lang` directory to add localized comments;
-    - The file name should follow the format listed on the `https://minecraft.wiki/w/Language` page, such as `en_us`, `zh_cn`, `zh_hk`, `zh_tw`. The file format is `json`;
-2. Run the Gradle task `sortLangKeys` to re-sort the keys in your language file;
-3. Commit your changes using `git commit -m <Commit Message>`;
-4. Push your modified files to your repository.
-
-After pushing, you can open a PR to submit your changes.
@@ -1,89 +0,0 @@
-### Carpet 原版
-
-| 规则 | 状态 | 说明 |
-| --- | --- | --- |
-| `language` | 已映射 | 转发到 `lophine.function.language.lang` |
-| `commandTick` | 已映射 | 转发到现有的 tick 指令补丁 |
-| `creativeNoClip` | 已映射 | 转发到 Lophine 的创造飞行穿墙实现 |
-| `ctrlQCraftingFix` | 结构等价 | 当前的合成与切石机菜单已经自带修复后的 Ctrl+Q 结果槽丢弃行为 |
-| `placementRotationFix` | 已移植 | 放置朝向判断可使用玩家身体朝向而不是头部旋转 |
-| `tntDoNotUpdate` | 已移植 | 新放置的 TNT 不会再因放置时更新而自动点燃 |
-| `explosionNoBlockDamage` | 已移植 | 爆炸仍会伤害实体，但不会破坏方块 |
-| `interactionUpdates` | 已移植 | 玩家交互和破坏方块时可以在不触发邻居更新与形状更新的情况下运行 |
-| `xpNoCooldown` | 已移植 | 经验球可以在同一 tick 内被连续吸收，不再有拾取冷却 |
-| `viewDistance` | 已移植 | 专用服务器启动视距会被兼容配置覆盖 |
-| `fastRedstoneDust` | 已移植 | 规则启用时，红石粉更新会统一走 Alternate Current 快速更新后端 |
-| `lagFreeSpawning` | 已移植 | 自然生成会使用轻量碰撞检查与预构造实体路径 |
-| `defaultLoggers` | 已移植 | 按 Carpet 默认订阅语义为玩家启用 HUD logger，当前支持 `tps`、`mobcaps`、`counter` |
-| `commandPlayer` | 已映射 | 当前由同一套 `/bot` 假人能力承接 |
-| `hopperCounters` | 已映射 | 转发到 Lophine 的羊毛漏斗计数器 |
-
-### Carpet TIS Addition
-
-| 规则 | 状态 | 说明 |
-| --- | --- | --- |
-| `yeetUpdateSuppressionCrash` | 已映射 | 转发到同一套 Lophine 崩溃修复逻辑 |
-| `dustTrapdoorReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.redstone-ignore-upwards-update` |
-| `shulkerBoxCCEReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.cce-update-suppression` |
-| `instantBlockUpdaterReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.instant-block-updater` |
-| `optimizedDragonRespawn` | 已映射 | 转发到 Luminol 的末影龙重生优化 |
-| `antiSpamDisabled` | 已移植 | 在 `ServerGamePacketListenerImpl` 中关闭聊天和创造丢物防刷屏限制 |
-| `blockPlacementIgnoreEntity` | 已移植 | 创造模式放置方块时忽略实体碰撞检查 |
-| `creativeOpenContainerForcibly` | 已移植 | 创造玩家可以强制打开被阻挡的箱子、末影箱和潜影盒 |
-| `observerNoDetection` | 已移植 | 观察者的检测触发会在发出脉冲前被取消 |
-| `creativeNoItemCooldown` | 已移植 | 创造玩家不会应用物品冷却 |
-| `totallyNoBlockUpdate` | 已移植 | 邻居更新和形状更新会在 `NeighborUpdater` 中被统一短路 |
-| `tiscmNetworkProtocol` | 已移植 | 原生 `tiscm:network/v1` 握手与数据包协商已经通过专用 Leaves 协议接入 |
-| `optimizedTNTHighPriority` | 结构等价 | 当前 `ServerExplosion` 路径已经运行在优化过的服务端爆炸实现上 |
-| `tntIgnoreRedstoneSignal` | 已移植 | TNT 在自动点燃判断时忽略红石信号 |
-| `tntDupingFix` | 已移植 | 活塞复制 TNT 的路径现在由 `PistonBaseBlock` 中的兼容规则直接控制 |
-| `clientSettingsLostOnRespawnFix` | 已移植 | 玩家上一次的客户端设置会在 `ServerPlayer.restoreFrom` 中恢复 |
-| `entityInstantDeathRemoval` | 已移植 | 已死亡生物不会再保留原版的 20gt 延迟，而是立即移除 |
-| `farmlandTrampledDisabled` | 已移植 | 耕地不会再因实体踩踏而变回泥土 |
-| `yeetOutOfOrderChatKick` | 已移植 | 乱序的签名聊天不会再破坏安全聊天链 |
-| `tickCommandPermission` | 已移植 | `/tick` 的权限等级可通过兼容配置调整 |
-| `tickFreezeCommandToggleable` | 已移植 | 已冻结时再次执行 `/tick freeze` 会切换回运行状态 |
-| `syncServerMsptMetricsData` | 已移植 | 实时 MSPT 样本会通过原生 TISCM 协议通道广播 |
-| `microTiming` | 结构等价 | 当前 Folia 的区块级性能分析与计时钩子已经提供对应的服务端观测能力 |
-| `optimizedFastEntityMovement` | 结构等价 | Moonrise/Paper 的快速实体移动碰撞优化已经是基础运行时的一部分 |
-| `optimizedHardHitBoxEntityCollision` | 结构等价 | Moonrise/Paper 的硬碰撞箱实体碰撞优化已经是基础运行时的一部分 |
-| `tntFuseDuration` | 已移植 | 可配置的 TNT 引信时长已接入 NMS TNT 逻辑 |
-| `fakePlayerTicksLikeRealPlayer` | 已映射 | 转发到 Leaves 的假人网络阶段 tick 行为 |
-| `hopperCountersUnlimitedSpeed` | 已映射 | 转发到不限速计数器模式 |
-
-### Carpet Org Addition
-
-| 规则 | 状态 | 说明 |
-| --- | --- | --- |
-| `hopperNoItemCost` | 已移植 | 漏斗上方放置羊毛时，可在传输后恢复被推出的物品堆，实现零消耗供给线 |
-| `simpleInGameCalculator` | 已移植 | 以 `=` 开头的聊天内容会作为简单计算表达式私聊回复 |
-
-### Carpet AMS Addition
-
-| 规则 | 状态 | 说明 |
-| --- | --- | --- |
-| `amsUpdateSuppressionCrashFix` | 已映射 | 转发到 Lophine 现有的更新抑制崩溃修复 |
-| `creativeOneHitKill` | 已移植 | 创造玩家可通过 `Player.attack` 瞬间击杀附近符合条件的目标 |
-| `bambooModelNoOffset` | 已移植 | 竹子和竹笋始终返回零模型偏移 |
-| `carpetAlwaysSetDefault` | 结构等价 | 兼容配置默认值已经会在 `ConfigsInstance.preLoadConfig` 中被写入 |
-| `powerfulExpMending` | 已移植 | 经验拾取会修复玩家整个背包内所有受损的经验修补物品 |
-| `sensibleEnderman` | 已移植 | 末影人仅会在规则开启时拾取南瓜和西瓜 |
-| `shulkerGolem` | 已移植 | 潜影盒上方放置雕刻南瓜时可以召唤潜影贝 |
-| `preventEndSpikeRespawn` | 已移植 | 末影龙重生时会跳过黑曜石柱重建和柱顶水晶重建 |
-| `betterCraftableBoneBlock` | 已移植 | 向配方管理器注入 AMS 的替代骨块配方 |
-| `betterCraftableDispenser` | 已移植 | 向配方管理器注入 AMS 的替代发射器配方 |
-| `fakePlayerDefaultSurvivalMode` | 已移植 | 新创建的假人可以被强制设为生存模式，而不是沿用服务器默认游戏模式 |
-| `fakePlayerInteractLikeClient` | 已移植 | 假人与盔甲架交互时会先按真实客户端方式回退，再进入普通实体交互 |
-| `fakePlayerAutoReplenishmentFormShulkerBox` | 已移植 | 假人自动补货现在可以从背包里的潜影盒中抽取匹配物品 |
-
-### Lophine 扩展承接
-
-| 规则 | 状态 | 说明                               |
-| --- | --- |----------------------------------|
-| `commandBot` | 已映射 | 启用 Lophine `/bot`                |
-| `fakePlayerResident` | 已映射 | 转发到 Lophine 的假人常驻模式              |
-| `openFakePlayerInventory` | 已映射 | 转发到 Lophine 的假人背包打开功能            |
-| `fakePlayerAutoReplaceTool` | 已映射 | 为现有自动换工具逻辑增加了新开关                 |
-| `fakePlayerAutoReplenishment` | 已映射 | 为现有自动补货逻辑增加了新开关                  |
-| `fakePlayerReloadAction` | 已映射 | 为假人动作持久化增加了新开关                   |
-| `fakePlayerAutoFish` | 已移植 | 手持鱼竿的假人会自动抛竿和收杆，除非显式执行 `fish` 动作 |
@@ -1,15 +1,10 @@
 group=fun.bm.lophine
-mcVersion=26.2
-apiVersion=26.2
-channel=STABLE
-clipVersion=1.0.1
-weightVersion=1.0.0
-# true for release, false for skip release, pre for pre-release
-release=true
-# true for push to repo, false for skip push repo, auto for detect by release value
-pushRepo=auto
+version=1.21.8-R0.1-SNAPSHOT
+mcVersion=1.21.8
+release=2
+# 0 for skip release, 1 for pre-release, 2 for release

-foliaRef=e48800d446d2bdeb24a8d31d671554440687e846
+luminolRef=e324edacf6651633674a0abce91ffbd290943dd5

 org.gradle.configuration-cache=true
 org.gradle.caching=true
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,52 +1,27 @@
--- a/folia-api/build.gradle.kts
-+++ b/folia-api/build.gradle.kts
-@@ -53,6 +_,7 @@
-     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
-     api("org.slf4j:slf4j-api:$slf4jVersion")
-     api("com.mojang:brigadier:1.3.10")
-+    api("io.sentry:sentry:8.0.0-rc.2") // Pufferfish
- 
-     // Deprecate bungeecord-chat in favor of adventure
-     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
-@@ -105,17 +_,21 @@
-         java {
+--- a/luminol-api/build.gradle.kts
+++ b/luminol-api/build.gradle.kts
+@@ -103,20 +_,24 @@
             srcDir(generatedDir)
             srcDir(file("../paper-api/src/main/java"))
-+            srcDir(file("../folia-api/src/main/java"))
+             srcDir(file("../folia-api/src/main/java"))
+            srcDir(file("../luminol-api/src/main/java"))
         }
         resources {
             srcDir(file("../paper-api/src/main/resources"))
-+            srcDir(file("../folia-api/src/main/resources"))
+             srcDir(file("../folia-api/src/main/resources"))
+            srcDir(file("../luminol-api/src/main/resources"))
         }
     }
     test {
         java {
             srcDir(file("../paper-api/src/test/java"))
-+            srcDir(file("../folia-api/src/test/java"))
+             srcDir(file("../folia-api/src/test/java"))
+            srcDir(file("../luminol-api/src/test/java"))
         }
         resources {
             srcDir(file("../paper-api/src/test/resources"))
-+            srcDir(file("../folia-api/src/test/resources"))
+             srcDir(file("../folia-api/src/test/resources"))
+            srcDir(file("../luminol-api/src/test/resources"))
         }
     }
 }
-@@ -259,3 +_,19 @@
- tasks.check {
-     dependsOn(scanJarForBadCalls)
- }
-+
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+
-+// Lophine start - Hide unnecessary warnings
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("-Xlint:-module")
-+    compilerArgs.add("-Xlint:-removal")
-+    compilerArgs.add("-Xlint:-dep-ann")
-+}
-+// Lophine end
@@ -5,24 +5,14 @@ Subject: [PATCH] Rebrand to Lophine


 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 652ff54e7c50412503725d628bfe72ed03059790..1727ea0b873ee4f9a86cca62eac6dc3a5063b4e6 100644
+index db5e2f10278c20286779362cfdfadb2f42c724e0..c18c0cb45a193883aa12b5d1abe690e95d289f82 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
+@@ -29,6 +29,7 @@ public interface ServerBuildInfo {
      */
-     Key BRAND_PAPER_ID = Key.key("papermc", "paper");
+     Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
+     // Luminol end
+    Key BRAND_LOPHINE_ID = Key.key("luminolmc", "lophine"); // Lophine
 
-+    // Lophine start
-+    /**
-+     * The brand id for folia
-+     */
-+    Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
-+    /**
-+     * The brand id for Lophine.
-+     */
-+    Key BRAND_LOPHINE_ID = Key.key("lophinelabs", "lophine");
-+    // Lophine end
-+
     /**
      * Gets the {@code ServerBuildInfo}.
-      *
@@ -8,13 +8,13 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0ac1e049fad85de8365380b03e60d915ee643f16..a747fbe107dcc134558ca8ecfbe30e81245a5742 100644
+index 85b778980e762835ac278528087e91b2e3effb43..89f00f4b6ff64305fa44ebb71f22a113c1296d26 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3052,4 +3052,15 @@ public final class Bukkit {
-         return server.getFeatureManager();
+     public static void restart() {
+         server.restart();
     }
-     // Leaves end - Feature API
 +
 +    // Leaves start - Bot API
 +    /**
@@ -28,10 +28,10 @@ index 0ac1e049fad85de8365380b03e60d915ee643f16..a747fbe107dcc134558ca8ecfbe30e81
 +    // Leaves end - Bot API
 }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3c92440fbef6e6970cd800e0038a625a775eda9a..c8fc95a85b162cc71aa8dada8f87f4fe6f5dad12 100644
+index a0540d7de5c2536aed5231f9e67b73345817921d..c7ae463fb166750bbd0638a2ccf81753b293a381 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2827,4 +2827,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2753,4 +2753,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     double @Nullable [] getRegionTPS(@NotNull World world, int chunkX, int chunkZ);
     // Folia end - region TPS API
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 14 Jun 2026 18:10:20 +0800
-Subject: [PATCH] Luminol Config System
-
-
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fb5ca3ab0ddba433a39e65572beeb955b50d6f72..a139182704a5f147661816d08907be8a7f8f7dde 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -2776,6 +2776,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      */
-     void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
-     // Paper end - API to check if the server is sleeping
-+
-+    // Luminol start - Luminol Config API
-+    me.earthme.luminol.api.config.LuminolConfigsInstance getLuminolConfigs(String name);
-+    me.earthme.luminol.api.config.LuminolConfigBuilder getLuminolConfigBuilder();
-+    // Luminol end - Luminol Config API
-+
-     // Folia start - region TPS API
-     /**
-      * Gets the TPS from the region which owns the specified location, or {@code null} if no region owns
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 16:40:49 +0800
-Subject: [PATCH] KioCG Chunk API
-
-
-diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index d873b78f6935a23ff8f6092b80968267b182cc0f..b4323370859dd4d9e86614484cdb9d2e35c45b40 100644
--- a/src/main/java/org/bukkit/Chunk.java
-+++ b/src/main/java/org/bukkit/Chunk.java
-@@ -392,4 +392,6 @@ public interface Chunk extends PersistentDataHolder {
-          */
-         UNLOADED;
-     }
-+
-+    long getChunkHotAvg(); // KioCG
- }
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7a719d31fbc7633a9bb87ea97338190ee3a6047a..b79b9a2ad108c0488d3cc3862f72985059bb4988 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -4020,4 +4020,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     default ObjectContents asObjectContents() {
-         return this.getPlayerProfile().asObjectContents();
-     }
-+
-+    long getNearbyChunkHot(); // KioCG
- }
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a747fbe107dcc134558ca8ecfbe30e81245a5742..b09a90f8187a15ddaa15f231f46f51f2b1d2c1ed 100644
+index 89f00f4b6ff64305fa44ebb71f22a113c1296d26..e9d20fe8b88aa63fb62effd430b5e22c8dbe1307 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3063,4 +3063,10 @@ public final class Bukkit {
@@ -23,10 +23,10 @@ index a747fbe107dcc134558ca8ecfbe30e81245a5742..b09a90f8187a15ddaa15f231f46f51f2
 +    // Leaves end - Photographer API
 }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c8fc95a85b162cc71aa8dada8f87f4fe6f5dad12..5e4da280f7bed1084ebc2814d23901ad072e116d 100644
+index c7ae463fb166750bbd0638a2ccf81753b293a381..4caadc8f9b328d978ece84c1480e32f24868531f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2836,4 +2836,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2762,4 +2762,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     @NotNull org.leavesmc.leaves.entity.bot.BotManager getBotManager();
     // Leaves end - Bot API
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 12:22:53 +0800
-Subject: [PATCH] Disable timings warn msg and commands
-
-
-diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
-index 89017af09ce32e7a66014fc3aeb50155921252a5..b862779b48176dd7e67a2f1a3e7f24bc8c84e993 100644
--- a/src/main/java/co/aikar/timings/Timings.java
-+++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -147,7 +147,7 @@ public final class Timings {
-     public static void setTimingsEnabled(boolean enabled) {
-         enabled = false; // Folia - region threading - disable timings
-         if (enabled && !warnedAboutDeprecationOnEnable) {
-            Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
-+            // Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));  // Luminol - Disable timings warn msg and commands
-             warnedAboutDeprecationOnEnable = true;
-         }
-     }
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index ad1330d87223dfcf3c9da40aa5ece8c21141f0d6..22edf161ba1ca8c31140e25e8c4fe1503c44dba8 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -34,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
-         final ReloadCommand reload = new ReloadCommand("reload");
-         this.knownCommands.put("bukkit:reload", reload);
-         this.knownCommands.put("bukkit:rl", reload);
-        register("bukkit", new co.aikar.timings.TimingsCommand("timings"));
-+        //register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Luminol - Disable timings warn msg and commands
-     }
- 
-     public void setFallbackCommands() {
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 457e75bbecb70ac3da4c21382f97d68de5a00547..cf22ea227f6dcc13702fb5f6f94bba5b6e326b97 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -960,7 +960,7 @@ public final class SimplePluginManager implements PluginManager {
-      */
-     @Deprecated(forRemoval = true)
-     public void useTimings(boolean use) {
-        co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
-+        // co.aikar.timings.Timings.setTimingsEnabled(use); // Paper // Luminol - Disable timings warn msg and commands
-     }
- 
-     // Paper start
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Thu, 23 Jan 2025 12:04:04 +0800
-Subject: [PATCH] Force disable reload command
-
-
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 22edf161ba1ca8c31140e25e8c4fe1503c44dba8..50384eb221ad96e766b91335ff57b082410885e9 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -31,9 +31,9 @@ public class SimpleCommandMap implements CommandMap {
-     }
- 
-     private void setDefaultCommands() {
-        final ReloadCommand reload = new ReloadCommand("reload");
-        this.knownCommands.put("bukkit:reload", reload);
-        this.knownCommands.put("bukkit:rl", reload);
-+        //final ReloadCommand reload = new ReloadCommand("reload"); // Luminol - Force disable reload command
-+        //this.knownCommands.put("bukkit:reload", reload); // Luminol - Force disable reload command
-+        //this.knownCommands.put("bukkit:rl", reload); // Luminol - Force disable reload command
-         //register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Luminol - Disable timings warn msg and commands
-     }
- 
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 13:27:38 +0800
-Subject: [PATCH] Pufferfish: Sentry
-
-As part of: Pufferfish
-Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE)
-
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index cf22ea227f6dcc13702fb5f6f94bba5b6e326b97..71ef6055df30506bb0d6648a2300d1cab7b0d026 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -596,7 +596,9 @@ public final class SimplePluginManager implements PluginManager {
- 
-     // Paper start
-     private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
-+        gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-         server.getLogger().log(Level.SEVERE, msg, ex);
-+        gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-         callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
-     }
-     // Paper end
-@@ -666,9 +668,11 @@ public final class SimplePluginManager implements PluginManager {
-                             ));
-                 }
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
-                 // Paper start - error reporting
-                 String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
-                 server.getLogger().log(Level.SEVERE, msg, ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
-                 if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
-                     callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
-                 }
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 9023a39c6481710478747482f0b16c21274afd15..0755065f86aba3ef5ecdf045620878eb045f4999 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -329,7 +329,13 @@ public final class JavaPluginLoader implements PluginLoader {
-             try {
-                 jPlugin.setEnabled(true);
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-                 server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-+                // Paper start - Disable plugins that fail to load
-+                this.server.getPluginManager().disablePlugin(jPlugin);
-+                return;
-+                // Paper end
-             }
- 
-             // Perhaps abort here, rather than continue going, but as it stands,
-@@ -354,7 +360,9 @@ public final class JavaPluginLoader implements PluginLoader {
-             try {
-                 jPlugin.setEnabled(false);
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-                 server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-             }
- 
-             if (cloader instanceof PluginClassLoader) {
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 14:00:28 +0800
-Subject: [PATCH] Pufferfish: SIMD Utilities
-
-As part of: Pufferfish
-Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE)
-
-diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 76ae2750ff7b04a281d4b794dc1f48dd832db2b6..fc9cd106b1ed2e92aced783e9cb0bc8867828df3 100644
--- a/src/main/java/org/bukkit/map/MapPalette.java
-+++ b/src/main/java/org/bukkit/map/MapPalette.java
-@@ -35,7 +35,7 @@ public final class MapPalette {
-     }
- 
-     @NotNull
-    static final Color[] colors = {
-+    public static final Color[] colors = { // Luminol - package-private -> public
-         // Start generate - MapPalette#colors
-         new Color(0x00000000, true),
-         new Color(0x00000000, true),
-@@ -394,9 +394,11 @@ public final class MapPalette {
-         temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
- 
-         byte[] result = new byte[temp.getWidth() * temp.getHeight()];
-+        if ((mapColorCache != null && mapColorCache.isCached()) || !gg.pufferfish.pufferfish.simd.SIMDDetection.isEnabled) { // Luminol - Pufferfish - vectorized map color conversion
-         for (int i = 0; i < pixels.length; i++) {
-             result[i] = matchColor(new Color(pixels[i], true));
-         }
-+        } else gg.pufferfish.pufferfish.simd.VectorMapPalette.matchColorVectorized(pixels, result); // Luminol - Pufferfish - vectorized map color conversion
-         return result;
-     }
- 
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Mon, 27 Jan 2025 13:01:59 +0800
-Subject: [PATCH] Tick regions api
-
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c66cd17fd037b73d8ff04dd2ed328ca25e8b0f1a..b86cd3b37ec3fd63f34acd6bf17f6a91c24b5038 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -4708,4 +4708,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-             }
-         }
-     }
-+
-+    // Luminol start - Tick regions api
-+    me.earthme.luminol.api.ThreadedRegionizer getThreadedRegionizer();
-+    // Luminol end - Tick regions api
- }
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Wed, 22 Apr 2026 12:59:08 +0800
-Subject: [PATCH] Leaves: Leaves plugin
-
-Co-authored by: MC_XiaoHei <xiaohei.xor7@outlook.com>
-As part of: Leaves (https://github.com/HyacinthHaru/Leaves/blob/90080d238e2fcfc14a9293150dc351a4f0f696e6/leaves-api/paper-patches/features/0009-Leaves-Plugin.patch)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8a24b84db656da4cec59e9bccac306467c8155b0..0ac1e049fad85de8365380b03e60d915ee643f16 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -3046,4 +3046,10 @@ public final class Bukkit {
-     public static void restart() {
-         server.restart();
-     }
-+
-+    // Leaves start - Feature API
-+    public static org.leavesmc.leaves.plugin.FeatureManager getFeatureManager() {
-+        return server.getFeatureManager();
-+    }
-+    // Leaves end - Feature API
- }
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a139182704a5f147661816d08907be8a7f8f7dde..a8c262064e4058f786c62c333130c4cac0ce4b66 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -2782,6 +2782,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     me.earthme.luminol.api.config.LuminolConfigBuilder getLuminolConfigBuilder();
-     // Luminol end - Luminol Config API
- 
-+    // Leaves start - Feature API
-+    org.leavesmc.leaves.plugin.FeatureManager getFeatureManager();
-+    // Leaves End - Feature API
-+
-     // Folia start - region TPS API
-     /**
-      * Gets the TPS from the region which owns the specified location, or {@code null} if no region owns
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Thu, 12 Jun 2025 08:00:15 +0800
-Subject: [PATCH] Purpur: Lobotomize stuck villagers
-
-Co-authored by: William Blake Galbreath <Blake.Galbreath@GMail.com>
-As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0001-Ridables.patch)
-Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)
-
-diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index a2024b5dda030a7724c13b2446224903ae837339..71f34a40b136f7f08a4820056c00692b986f63bd 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
-+++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -405,4 +405,13 @@ public interface Villager extends AbstractVillager {
-      * Demand is still updated even if all events are canceled.
-      */
-     public void restock();
-+    // Purpur start
-+
-+    /**
-+     * Check if villager is currently lobotomized
-+     *
-+     * @return True if lobotomized
-+     */
-+    boolean isLobotomized();
-+    // Purpur end
- }
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 5 Jun 2026 09:12:20 +0800
-Subject: [PATCH] World load/unload APIs
-
-
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a8c262064e4058f786c62c333130c4cac0ce4b66..3c92440fbef6e6970cd800e0038a625a775eda9a 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -775,6 +775,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      * @throws IllegalStateException when {@link #isTickingWorlds() isTickingWorlds} is true
-      */
-     public boolean unloadWorld(@NotNull World world, boolean save);
-+    // Luminol start - Async world unloading api
-+
-+    /**
-+     * Unloads the given world asynchronously
-+     *
-+     * @param world the world to unload
-+     * @param save whether to save the chunks before unloading
-+     * @param callback the callback to accept the result, true if successful, false otherwise
-+     */
-+    public void unloadWorld(World world, boolean save, java.util.concurrent.CompletableFuture<Boolean> callback);
-+    // Luminol end
- 
-     /**
-      * Gets the world that players respawn in.
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 11 May 2026 10:47:42 +0800
-Subject: [PATCH] Add cancel task by task id in FoliaGlobalRegionScheduler
-
-
-diff --git a/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
-index 57455aca80ecc458b96b44c086cea94ddcecae47..763d27d303b9a588526445c453e07f5886534e82 100644
--- a/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
-+++ b/src/main/java/io/papermc/paper/threadedregions/scheduler/GlobalRegionScheduler.java
-@@ -55,4 +55,10 @@ public interface GlobalRegionScheduler {
-      * @param plugin Specified plugin.
-      */
-      void cancelTasks(@NotNull Plugin plugin);
-+
-+     /**
-+     * Attempts to cancel the specified task.
-+     * @param taskId The task id.
-+     */
-+     void cancelTask(final int taskId);
- }
@@ -1,181 +0,0 @@
-/*
- * This file is part of Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
- *
- * Pufferfish is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pufferfish is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Pufferfish. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package gg.pufferfish.pufferfish.sentry;
-
-import com.google.gson.Gson;
-import org.apache.logging.log4j.ThreadContext;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredListener;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Map;
-import java.util.TreeMap;
-
-public class SentryContext {
-
-    private static final Gson GSON = new Gson();
-
-    public static void setPluginContext(@Nullable Plugin plugin) {
-        if (plugin != null) {
-            ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
-            ThreadContext.put("pufferfishsentry_pluginversion", plugin.getPluginMeta().getVersion());
-        }
-    }
-
-    public static void removePluginContext() {
-        ThreadContext.remove("pufferfishsentry_pluginname");
-        ThreadContext.remove("pufferfishsentry_pluginversion");
-    }
-
-    public static void setSenderContext(@Nullable CommandSender sender) {
-        if (sender != null) {
-            ThreadContext.put("pufferfishsentry_playername", sender.getName());
-            if (sender instanceof Player player) {
-                ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
-            }
-        }
-    }
-
-    public static void removeSenderContext() {
-        ThreadContext.remove("pufferfishsentry_playername");
-        ThreadContext.remove("pufferfishsentry_playerid");
-    }
-
-    public static void setEventContext(Event event, RegisteredListener registration) {
-        setPluginContext(registration.getPlugin());
-
-        try {
-            // Find the player that was involved with this event
-            Player player = null;
-            if (event instanceof PlayerEvent) {
-                player = ((PlayerEvent) event).getPlayer();
-            } else {
-                Class<? extends Event> eventClass = event.getClass();
-
-                Field playerField = null;
-
-                for (Field field : eventClass.getDeclaredFields()) {
-                    if (field.getType().equals(Player.class)) {
-                        playerField = field;
-                        break;
-                    }
-                }
-
-                if (playerField != null) {
-                    playerField.setAccessible(true);
-                    player = (Player) playerField.get(event);
-                }
-            }
-
-            if (player != null) {
-                setSenderContext(player);
-            }
-        } catch (Exception ignored) {
-        } // We can't really safely log exceptions.
-
-        ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
-    }
-
-    public static void removeEventContext() {
-        removePluginContext();
-        removeSenderContext();
-        ThreadContext.remove("pufferfishsentry_eventdata");
-    }
-
-    private static Map<String, String> serializeFields(Object object) {
-        Map<String, String> fields = new TreeMap<>();
-        fields.put("_class", object.getClass().getName());
-        for (Field declaredField : object.getClass().getDeclaredFields()) {
-            try {
-                if (Modifier.isStatic(declaredField.getModifiers())) {
-                    continue;
-                }
-
-                String fieldName = declaredField.getName();
-                if (fieldName.equals("handlers")) {
-                    continue;
-                }
-                declaredField.setAccessible(true);
-                Object value = declaredField.get(object);
-                if (value != null) {
-                    fields.put(fieldName, value.toString());
-                } else {
-                    fields.put(fieldName, "<null>");
-                }
-            } catch (Exception ignored) {
-            } // We can't really safely log exceptions.
-        }
-        return fields;
-    }
-
-    public static class State {
-
-        private Plugin plugin;
-        private Command command;
-        private String commandLine;
-        private Event event;
-        private RegisteredListener registeredListener;
-
-        public Plugin getPlugin() {
-            return plugin;
-        }
-
-        public void setPlugin(Plugin plugin) {
-            this.plugin = plugin;
-        }
-
-        public Command getCommand() {
-            return command;
-        }
-
-        public void setCommand(Command command) {
-            this.command = command;
-        }
-
-        public String getCommandLine() {
-            return commandLine;
-        }
-
-        public void setCommandLine(String commandLine) {
-            this.commandLine = commandLine;
-        }
-
-        public Event getEvent() {
-            return event;
-        }
-
-        public void setEvent(Event event) {
-            this.event = event;
-        }
-
-        public RegisteredListener getRegisteredListener() {
-            return registeredListener;
-        }
-
-        public void setRegisteredListener(RegisteredListener registeredListener) {
-            this.registeredListener = registeredListener;
-        }
-    }
-}
@@ -1,53 +0,0 @@
-/*
- * This file is part of Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
- *
- * Pufferfish is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pufferfish is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Pufferfish. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package gg.pufferfish.pufferfish.simd;
-
-import jdk.incubator.vector.FloatVector;
-import jdk.incubator.vector.IntVector;
-import jdk.incubator.vector.VectorSpecies;
-import org.slf4j.Logger;
-
-/**
- * Basically, java is annoying, and we have to push this out to its own class.
- */
-@Deprecated
-public class SIMDChecker {
-
-    @Deprecated
-    public static boolean canEnable(Logger logger) {
-        try {
-            SIMDDetection.testRun = true;
-
-            VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED;
-            VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED;
-
-            logger.info("Max SIMD vector size on this system is {} bits (int)", ISPEC.vectorBitSize());
-            logger.info("Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
-
-            if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
-                logger.warn("SIMD is not properly supported on this system!");
-                return false;
-            }
-
-            return true;
-        } catch (NoClassDefFoundError | Exception ignored) {
-        } // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
-        return false;
-    }
-
-}
@@ -1,53 +0,0 @@
-/*
- * This file is part of Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
- *
- * Pufferfish is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pufferfish is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Pufferfish. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package gg.pufferfish.pufferfish.simd;
-
-import org.slf4j.Logger;
-
-@Deprecated
-public class SIMDDetection {
-
-    public static boolean isEnabled = false;
-    public static boolean testRun = false;
-
-    @Deprecated
-    public static boolean canEnable(Logger logger) {
-        try {
-            return SIMDChecker.canEnable(logger);
-        } catch (NoClassDefFoundError | Exception ignored) {
-            return false;
-        }
-    }
-
-    @Deprecated
-    public static int getJavaVersion() {
-        // https://stackoverflow.com/a/2591122
-        String version = System.getProperty("java.version");
-        if (version.startsWith("1.")) {
-            version = version.substring(2, 3);
-        } else {
-            int dot = version.indexOf(".");
-            if (dot != -1) {
-                version = version.substring(0, dot);
-            }
-        }
-        version = version.split("-")[0]; // Azul is stupid
-        return Integer.parseInt(version);
-    }
-
-}
@@ -1,101 +0,0 @@
-/*
- * This file is part of Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
- *
- * Pufferfish is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pufferfish is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Pufferfish. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package gg.pufferfish.pufferfish.simd;
-
-import jdk.incubator.vector.FloatVector;
-import jdk.incubator.vector.IntVector;
-import jdk.incubator.vector.VectorMask;
-import jdk.incubator.vector.VectorSpecies;
-import org.bukkit.map.MapPalette;
-
-import java.awt.*;
-
-@Deprecated
-public class VectorMapPalette {
-
-    private static final VectorSpecies<Integer> I_SPEC = IntVector.SPECIES_PREFERRED;
-    private static final VectorSpecies<Float> F_SPEC = FloatVector.SPECIES_PREFERRED;
-
-    @Deprecated
-    public static void matchColorVectorized(int[] in, byte[] out) {
-        int speciesLength = I_SPEC.length();
-        int i;
-        for (i = 0; i < in.length - speciesLength; i += speciesLength) {
-            float[] redsArr = new float[speciesLength];
-            float[] bluesArr = new float[speciesLength];
-            float[] greensArr = new float[speciesLength];
-            int[] alphasArr = new int[speciesLength];
-
-            for (int j = 0; j < speciesLength; j++) {
-                alphasArr[j] = (in[i + j] >> 24) & 0xFF;
-                redsArr[j] = (in[i + j] >> 16) & 0xFF;
-                greensArr[j] = (in[i + j] >> 8) & 0xFF;
-                bluesArr[j] = (in[i + j] >> 0) & 0xFF;
-            }
-
-            IntVector alphas = IntVector.fromArray(I_SPEC, alphasArr, 0);
-            FloatVector reds = FloatVector.fromArray(F_SPEC, redsArr, 0);
-            FloatVector greens = FloatVector.fromArray(F_SPEC, greensArr, 0);
-            FloatVector blues = FloatVector.fromArray(F_SPEC, bluesArr, 0);
-            IntVector resultIndex = IntVector.zero(I_SPEC);
-            VectorMask<Integer> modificationMask = VectorMask.fromLong(I_SPEC, 0xffffffff);
-
-            modificationMask = modificationMask.and(alphas.lt(128).not());
-            FloatVector bestDistances = FloatVector.broadcast(F_SPEC, Float.MAX_VALUE);
-
-            for (int c = 4; c < MapPalette.colors.length; c++) {
-                // We're using 32-bit floats here because it's 2x faster and nobody will know the difference.
-                // For correctness, the original algorithm uses 64-bit floats instead. Completely unnecessary.
-                FloatVector compReds = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getRed());
-                FloatVector compGreens = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getGreen());
-                FloatVector compBlues = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getBlue());
-
-                FloatVector rMean = reds.add(compReds).div(2.0f);
-                FloatVector rDiff = reds.sub(compReds);
-                FloatVector gDiff = greens.sub(compGreens);
-                FloatVector bDiff = blues.sub(compBlues);
-
-                FloatVector weightR = rMean.div(256.0f).add(2);
-                FloatVector weightG = FloatVector.broadcast(F_SPEC, 4.0f);
-                FloatVector weightB = FloatVector.broadcast(F_SPEC, 255.0f).sub(rMean).div(256.0f).add(2.0f);
-
-                FloatVector distance = weightR.mul(rDiff).mul(rDiff).add(weightG.mul(gDiff).mul(gDiff)).add(weightB.mul(bDiff).mul(bDiff));
-
-                // Now we compare to the best distance we've found.
-                // This mask contains a "1" if better, and a "0" otherwise.
-                VectorMask<Float> bestDistanceMask = distance.lt(bestDistances);
-                bestDistances = bestDistances.blend(distance, bestDistanceMask); // Update the best distances
-
-                // Update the result array
-                // We also AND with the modification mask because we don't want to interfere if the alpha value isn't large enough.
-                resultIndex = resultIndex.blend(c, bestDistanceMask.cast(I_SPEC).and(modificationMask)); // Update the results
-            }
-
-            for (int j = 0; j < speciesLength; j++) {
-                int index = resultIndex.lane(j);
-                out[i + j] = (byte) (index < 128 ? index : -129 + (index - 127));
-            }
-        }
-
-        // For the final ones, fall back to the regular method
-        for (; i < in.length; i++) {
-            out[i] = MapPalette.matchColor(new Color(in[i], true));
-        }
-    }
-
-}
@@ -1,28 +0,0 @@
-package me.earthme.luminol.api;
-
-/**
- * A simple package of folia's tick region state.It linked to the RegionStats of the nms part so that</br>
- * You could call these methods to get the status of this tick region</br>
- */
-public interface RegionStats {
-    /**
-     * Get the entity count in this tick region
-     *
-     * @return the entity count
-     */
-    int getEntityCount();
-
-    /**
-     * Get the player count in this tick region
-     *
-     * @return the player count
-     */
-    int getPlayerCount();
-
-    /**
-     * Get the chunk count in this tick region
-     *
-     * @return the chunk count
-     */
-    int getChunkCount();
-}
@@ -1,61 +0,0 @@
-package me.earthme.luminol.api;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A mirror of folia's ThreadedRegion</br>
- * Including some handy methods to get the information of the tick region</br>
- * Note: You should call these methods inside this tick region's thread context
- */
-public interface ThreadedRegion {
-    /**
-     * Get the center chunk pos of this tick region</br>
-     * Note:</br>
-     * 1.Global region will return a null value(But we don't finish the global region yet()</br>
-     * 2.You should call these methods inside this tick region's thread context
-     *
-     * @return The center chunk pos
-     */
-    @Nullable
-    Location getCenterChunkPos();
-
-    /**
-     * Get the dead section percent of this tick region
-     * Note: </br>
-     * 1.Dead percent is mean the percent of the unloaded chunk count of this tick region, which is also used for determine
-     * that the tick region should or not check for splitting</br>
-     * 2.You should call these methods inside this tick region's thread context
-     *
-     * @return The dead section percent
-     */
-    double getDeadSectionPercent();
-
-    /**
-     * Get the tick region data of this tick region</br>
-     * Note:</br>
-     * 1.You should call this method inside this tick region's thread context</br>
-     * 2.You should call these methods inside this tick region's thread context
-     *
-     * @return The tick region data
-     */
-    TickRegionData getTickRegionData();
-
-    /**
-     * Get the world of this tick region</br>
-     * Note: Global region will return a null value too
-     *
-     * @return The world of this tick region
-     */
-    @Nullable
-    World getWorld();
-
-    /**
-     * Get the id of the tick region</br>
-     *
-     * @return The id of the tick region
-     */
-    long getId();
-}
@@ -1,61 +0,0 @@
-package me.earthme.luminol.api;
-
-import org.bukkit.Location;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-
-/**
- * A mirror of folia's ThreadedRegionizer
- */
-public interface ThreadedRegionizer {
-    /**
-     * Get all the tick regions
-     *
-     * @return Temporary copied collection of all tick regions
-     */
-    Collection<ThreadedRegion> getAllRegions();
-
-    /**
-     * Get the tick region at the given chunk coordinates
-     *
-     * @param chunkX Chunk X
-     * @param chunkZ Chunk Z
-     * @return The tick region at the given chunk coordinates
-     */
-    @Nullable
-    ThreadedRegion getAtSynchronized(int chunkX, int chunkZ);
-
-    /**
-     * Get the tick region at the given chunk coordinates
-     *
-     * @param chunkX Chunk X
-     * @param chunkZ Chunk Z
-     * @return The tick region at the given chunk coordinates
-     */
-    @Nullable
-    ThreadedRegion getAtUnSynchronized(int chunkX, int chunkZ);
-
-    /**
-     * Get the tick region at the given location
-     *
-     * @param pos The location
-     * @return The tick region at the given location
-     */
-    @Nullable
-    default ThreadedRegion getAtSynchronized(@NotNull Location pos) {
-        return this.getAtSynchronized(pos.getBlockX() >> 4, pos.getBlockZ() >> 4);
-    }
-
-    /**
-     * Get the tick region at the given location
-     *
-     * @param pos The location
-     * @return The tick region at the given location
-     */
-    @Nullable
-    default ThreadedRegion getAtUnSynchronized(@NotNull Location pos) {
-        return this.getAtUnSynchronized(pos.getBlockX() >> 4, pos.getBlockZ() >> 4);
-    }
-}
@@ -1,29 +0,0 @@
-package me.earthme.luminol.api;
-
-import org.bukkit.World;
-
-/**
- * A mirror of folia's tick region data
- */
-public interface TickRegionData {
-    /**
-     * Get the world it's currently holding
-     *
-     * @return the world
-     */
-    World getWorld();
-
-    /**
-     * Get the current tick count
-     *
-     * @return the current tick count
-     */
-    long getCurrentTickCount();
-
-    /**
-     * Get the region stats
-     *
-     * @return the region stats
-     */
-    RegionStats getRegionStats();
-}
@@ -1,11 +0,0 @@
-package me.earthme.luminol.api.config;
-
-import org.jspecify.annotations.Nullable;
-
-public record ConfigDataPair(
-        String key,
-        Object value,
-        @Nullable String comment,
-        @Nullable String[] suggestions
-) {
-}
@@ -1,82 +0,0 @@
-package me.earthme.luminol.api.config;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-
-/**
- * Builder interface for creating {@link LuminolConfigsInstance} instances.
- * <p>
- * Provides multiple overloaded factory methods to construct configuration instances
- * with varying levels of customization, including custom base directories,
- * file names, and command names.
- */
-public interface LuminolConfigBuilder {
-    /**
-     * Creates a configuration instance using the default base directory and file name.
-     *
-     * @param loader the class loader used to load configuration resources
-     * @param name   the configuration name identifier
-     * @param pack   the package path where configuration classes are located
-     * @return a new {@link LuminolConfigsInstance}
-     */
-    LuminolConfigsInstance of(
-            @NotNull ClassLoader loader,
-            @NotNull String name,
-            @NotNull String pack
-    );
-
-    /**
-     * Creates a configuration instance with a custom base directory.
-     *
-     * @param loader the class loader used to load configuration resources
-     * @param base   the base directory where the configuration file is stored
-     * @param name   the configuration name identifier
-     * @param pack   the package path where configuration classes are located
-     * @return a new {@link LuminolConfigsInstance}
-     */
-    LuminolConfigsInstance of(
-            @NotNull ClassLoader loader,
-            @NotNull File base,
-            @NotNull String name,
-            @NotNull String pack
-    );
-
-    /**
-     * Creates a configuration instance with a custom base directory and file name.
-     *
-     * @param loader    the class loader used to load configuration resources
-     * @param base      the base directory where the configuration file is stored
-     * @param name      the configuration name identifier
-     * @param file_name the configuration file name (without extension)
-     * @param pack      the package path where configuration classes are located
-     * @return a new {@link LuminolConfigsInstance}
-     */
-    LuminolConfigsInstance of(
-            @NotNull ClassLoader loader,
-            @NotNull File base,
-            @NotNull String name,
-            @NotNull String file_name,
-            @NotNull String pack
-    );
-
-    /**
-     * Creates a configuration instance with full customization options.
-     *
-     * @param loader       the class loader used to load configuration resources
-     * @param base         the base directory where the configuration file is stored
-     * @param name         the configuration name identifier
-     * @param file_name    the configuration file name (without extension)
-     * @param command_name the command name associated with this configuration
-     * @param pack         the package path where configuration classes are located
-     * @return a new {@link LuminolConfigsInstance}
-     */
-    LuminolConfigsInstance of(
-            @NotNull ClassLoader loader,
-            @NotNull File base,
-            @NotNull String name,
-            @NotNull String file_name,
-            @NotNull String command_name,
-            @NotNull String pack
-    );
-}
@@ -1,203 +0,0 @@
-package me.earthme.luminol.api.config;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Interface for managing configuration instances and operations.
- * Provides methods for loading, saving, modifying, and querying configuration values.
- */
-public interface LuminolConfigsInstance {
-    /**
-     * Initialize the configuration subsystem for this instance.
-     * Implementations should load configuration files, apply defaults and
-     * prepare any internal caches or state needed for subsequent operations.
-     * This method may perform I/O and therefore can throw an {@link IOException}
-     * if initialization fails.
-     *
-     * @throws IOException if an I/O error occurs while initializing
-     */
-    void initialize() throws IOException;
-
-    /**
-     * Reloads all configurations asynchronously
-     *
-     * @param keepComments whether to preserve existing comments in the config file
-     * @return CompletableFuture that completes when reload is finished
-     */
-    @NotNull CompletableFuture<Void> reloadAsync(boolean keepComments);
-
-    /**
-     * Sets a configuration value by key
-     *
-     * @param key   the configuration key (dot-separated path)
-     * @param value the value to set
-     * @return true if the key exists and value was set, false otherwise
-     */
-    boolean setConfig(String key, Object value);
-
-    /**
-     * Saves all pending configuration changes to disk
-     */
-    void saveConfigs();
-
-    /**
-     * Resets a configuration value to its default
-     *
-     * @param key the configuration key to reset
-     */
-    void resetConfig(String key);
-
-    /**
-     * Gets the default value of a configuration as string
-     *
-     * @param key the configuration key
-     * @return the default value as string
-     */
-    String getDefaultConfig(String key);
-
-    /**
-     * Gets the current value of a configuration as string
-     *
-     * @param key the configuration key
-     * @return the current value as string
-     */
-    String getConfig(String key);
-
-    /**
-     * Gets the original (untransformed) value of a configuration
-     *
-     * @param key the configuration key
-     * @param <T> the expected type of the value
-     * @return the original configuration value
-     */
-    <T> T getConfigOrigin(String key);
-
-    /**
-     * Gets available suggestions for a configuration key
-     *
-     * @param key the configuration key
-     * @return array of suggestion strings, or null if no suggestions available
-     */
-    String[] getConfigSuggestions(String key);
-
-    /**
-     * Completes a partial configuration path by finding matching keys
-     *
-     * @param partialPath the partial path to complete
-     * @return list of possible completions
-     */
-    List<String> completeConfigPath(String partialPath);
-
-    /**
-     * Completes a partial configuration path with specific depth
-     *
-     * @param partialPath the partial path to complete
-     * @param dotIndex    the maximum number of dots (depth) in the result
-     * @return list of possible completions
-     */
-    List<String> completeConfigPath(String partialPath, int dotIndex);
-
-    /**
-     * Gets all configuration paths that start with the given prefix
-     *
-     * @param currentPath the prefix to search for
-     * @return list of matching configuration paths
-     */
-    List<String> getAllConfigPaths(String currentPath);
-
-    /**
-     * Gets all configuration data pairs without prefix filter
-     *
-     * @return set of all configuration data
-     */
-    Set<ConfigDataPair> getAllData();
-
-    /**
-     * Gets configuration data pairs filtered by prefix
-     *
-     * @param prefix the prefix to filter by
-     * @return set of matching configuration data
-     */
-    Set<ConfigDataPair> getData(String prefix);
-
-    /**
-     * Gets all configuration data pairs with full information (comments and suggestions)
-     *
-     * @return set of all configuration data with full details
-     */
-    Set<ConfigDataPair> getAllDataFull();
-
-    /**
-     * Gets configuration data pairs with full information filtered by prefix
-     *
-     * @param prefix the prefix to filter by
-     * @return set of matching configuration data with full details
-     */
-    Set<ConfigDataPair> getDataFull(String prefix);
-
-    /**
-     * Gets configuration data pairs with optional comments and suggestions
-     *
-     * @param prefix           the prefix to filter by
-     * @param _comment         whether to include comments
-     * @param _withSuggestions whether to include suggestions
-     * @return set of matching configuration data
-     */
-    Set<ConfigDataPair> getData(String prefix, boolean _comment, boolean _withSuggestions);
-
-    /**
-     * Gets configuration data pairs for specified keys
-     *
-     * @param list list of configuration keys
-     * @return set of configuration data for the specified keys
-     */
-    Set<ConfigDataPair> getData(List<String> list);
-
-    /**
-     * Gets configuration data pairs with comments for specified keys
-     *
-     * @param list list of configuration keys
-     * @return set of configuration data with comments
-     */
-    Set<ConfigDataPair> getDataWithComment(List<String> list);
-
-    /**
-     * Gets configuration data pairs with full information for specified keys
-     *
-     * @param list list of configuration keys
-     * @return set of configuration data with full details
-     */
-    Set<ConfigDataPair> getDataFull(List<String> list);
-
-    /**
-     * Gets configuration data pairs for specified keys with optional features
-     *
-     * @param list             list of configuration keys
-     * @param _comment         whether to include comments
-     * @param _withSuggestions whether to include suggestions
-     * @return set of configuration data
-     */
-    Set<ConfigDataPair> getData(List<String> list, boolean _comment, boolean _withSuggestions);
-
-    /**
-     * Remove a configuration entry by its key.
-     * If the key does not exist this should be a no-op.
-     *
-     * @param key the configuration key to remove
-     */
-    void removeConfig(String key);
-
-    /**
-     * Remove multiple configuration entries by their keys.
-     * Implementations should attempt to remove each key provided. If some
-     * keys do not exist they may be ignored.
-     *
-     * @param keys an array of configuration keys to remove
-     */
-    void removeConfig(String[] keys);
-}
@@ -1,71 +0,0 @@
-package me.earthme.luminol.api.entity;
-
-import org.apache.commons.lang3.Validate;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A simple event fired when a teleportAsync was called
- *
- * @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause)
- * @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location)
- * (Also fired when teleportAsync called from nms)
- */
-public class EntityTeleportAsyncEvent extends Event {
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private final Entity entity;
-    private final PlayerTeleportEvent.TeleportCause teleportCause;
-    private final Location destination;
-
-    public EntityTeleportAsyncEvent(Entity entity, PlayerTeleportEvent.TeleportCause teleportCause, Location destination) {
-        Validate.notNull(entity, "entity cannot be a null value!");
-        Validate.notNull(teleportCause, "teleportCause cannot be a null value!");
-        Validate.notNull(destination, "destination cannot be a null value!");
-
-        this.entity = entity;
-        this.teleportCause = teleportCause;
-        this.destination = destination;
-    }
-
-    /**
-     * Get the entity is about to be teleported
-     *
-     * @return that entity
-     */
-    public @NotNull Entity getEntity() {
-        return this.entity;
-    }
-
-    /**
-     * Get the cause of the teleport
-     *
-     * @return the cause
-     */
-    public @NotNull PlayerTeleportEvent.TeleportCause getTeleportCause() {
-        return this.teleportCause;
-    }
-
-    /**
-     * Get the destination of the teleport
-     *
-     * @return the destination
-     */
-    public @NotNull Location getDestination() {
-        return this.destination;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}
@@ -1,42 +0,0 @@
-package me.earthme.luminol.api.entity;
-
-import org.apache.commons.lang3.Validate;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A simple event created for missing teleport events api of folia
- * This event is fired when the entity portal process has been done
- */
-public class PostEntityPortalEvent extends Event {
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final Entity teleportedEntity;
-
-    public PostEntityPortalEvent(Entity teleportedEntity) {
-        Validate.notNull(teleportedEntity, "teleportedEntity cannot be null!");
-
-        this.teleportedEntity = teleportedEntity;
-    }
-
-    /**
-     * Get the entity which was teleported
-     *
-     * @return the entity which was teleported
-     */
-    public Entity getTeleportedEntity() {
-        return this.teleportedEntity;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-}
@@ -1,81 +0,0 @@
-package me.earthme.luminol.api.entity;
-
-import org.apache.commons.lang3.Validate;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A simple event created for missing teleport events api of folia
- * This event will be fired when a portal teleportation is about to happen
- */
-public class PreEntityPortalEvent extends Event implements Cancellable {
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private final Entity entity;
-    private final Location portalPos;
-    private final World destination;
-
-    private boolean cancelled = false;
-
-    public PreEntityPortalEvent(Entity entity, Location portalPos, World destination) {
-        Validate.notNull(entity, "entity cannot be null!");
-        Validate.notNull(portalPos, "portalPos cannot be null!");
-        Validate.notNull(destination, "destination cannot be null!");
-
-        this.entity = entity;
-        this.portalPos = portalPos;
-        this.destination = destination;
-    }
-
-    /**
-     * Get the entity that is about to teleport
-     *
-     * @return the entity
-     */
-    public @NotNull Entity getEntity() {
-        return this.entity;
-    }
-
-    /**
-     * Get the location of the portal
-     *
-     * @return the portal location
-     */
-    public @NotNull Location getPortalPos() {
-        return this.portalPos;
-    }
-
-    /**
-     * Get the destination world
-     *
-     * @return the destination world
-     */
-    public @NotNull World getDestination() {
-        return this.destination;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}
@@ -1,41 +0,0 @@
-package me.earthme.luminol.api.entity.player;
-
-import org.apache.commons.lang3.Validate;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A simple event fired when the respawn process of player is done
- */
-public class PostPlayerRespawnEvent extends Event {
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private final Player player;
-
-    public PostPlayerRespawnEvent(Player player) {
-        Validate.notNull(player, "Player cannot be a null value!");
-
-        this.player = player;
-    }
-
-    /**
-     * Get the respawned player
-     *
-     * @return the player
-     */
-    public @NotNull Player getPlayer() {
-        return this.player;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}
@@ -1,35 +0,0 @@
-package me.earthme.luminol.api.portal;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A event fired when an end platform is created.
- */
-public class EndPlatformCreateEvent extends Event implements Cancellable {
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private boolean cancelled = false;
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}
@@ -1,55 +0,0 @@
-package me.earthme.luminol.api.portal;
-
-import org.apache.commons.lang3.Validate;
-import org.bukkit.Location;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A event fired when the portal process started locating the destination position
- * Notice: If you changed the destination to an another position in end teleportation.The end platform won't create under the entity and won't create
- * if the position is out of current tick region
- */
-public class PortalLocateEvent extends Event {
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private final Location original;
-    private final Location destination;
-
-    public PortalLocateEvent(Location original, Location destination) {
-        Validate.notNull(original, "original couldn't be null!");
-        Validate.notNull(destination, "destination couldn't be null!");
-
-        this.original = original;
-        this.destination = destination;
-    }
-
-    /**
-     * Get the destination position of this teleportation
-     *
-     * @return the destination position
-     */
-    public Location getDestination() {
-        return this.destination;
-    }
-
-    /**
-     * Get the original portal position of this teleportation
-     *
-     * @return the original portal position
-     */
-    public Location getOriginal() {
-        return this.original;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}
@@ -39,9 +39,9 @@ public interface Bot extends Player {
    /**
     * Gets the fakeplayer name without prefix and suffix
     *
-     * @return fakeplayer raw name
+     * @return fakeplayer real name
     */
-    @NotNull String getRawName();
+    @NotNull String getRealName();

    /**
     * Gets the creator's UUID of the fakeplayer
@@ -91,13 +91,4 @@ public interface Bot extends Player {
     * @return success
     */
    boolean remove(boolean save);
-
-    /**
-     * Remove the fakeplayer
-     *
-     * @param save   should save
-     * @param resume should resume at next server start
-     * @return success
-     */
-    boolean remove(boolean save, boolean resume);
 }
@@ -27,8 +27,8 @@ import java.util.function.Consumer;

 public interface BotCreator {

-    static BotCreator of(String rawName, Location location) {
-        return Bukkit.getBotManager().botCreator(rawName, location);
+    static BotCreator of(String realName, Location location) {
+        return Bukkit.getBotManager().botCreator(realName, location);
    }

    BotCreator name(String name);
@@ -61,5 +61,5 @@ public interface BotManager {
     */
    <T extends BotAction<T>> T newAction(@NotNull Class<T> type);

-    BotCreator botCreator(@NotNull String rawName, @NotNull Location location);
+    BotCreator botCreator(@NotNull String realName, @NotNull Location location);
 }
@@ -1,46 +0,0 @@
-package org.leavesmc.leaves.event.bot;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.leavesmc.leaves.entity.bot.Bot;
-
-public class BotActionGuiOpenEvent extends BotEvent implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-
-    private final Player player;
-    private boolean cancel = false;
-
-    public BotActionGuiOpenEvent(@NotNull Bot who, @Nullable Player player) {
-        super(who);
-        this.player = player;
-    }
-
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    @Override
-    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
-    }
-
-    @Nullable
-    public Player getOpenPlayer() {
-        return player;
-    }
-
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return handlers;
-    }
-}
@@ -1,14 +0,0 @@
-/*
- * This file is licensed under the MIT license.
- * Origin : Leaves (https://github.com/LeavesMC/Leaves)
- */
-
-package org.leavesmc.leaves.plugin;
-
-import java.util.Set;
-
-public interface FeatureManager {
-    Set<String> getAvailableFeatures();
-
-    boolean isFeatureAvailable(String feature);
-}
@@ -1,15 +0,0 @@
-/*
- * This file is licensed under the MIT license.
- * Origin : Leaves (https://github.com/LeavesMC/Leaves)
- */
-
-package org.leavesmc.leaves.plugin;
-
-public class Features {
-    public static final String MIXIN = "mixin";
-    public static final String FAKEPLAYER = "fakeplayer";
-    public static final String PHOTOGRAPHER = "photographer";
-    public static final String RECORDER = "recorder";
-    public static final String BYTEBUF = "bytebuf";
-    public static final String UPDATE_SUPPRESSION_EVENT = "update_suppression_event";
-}
@@ -1,151 +1,81 @@
--- a/folia-server/build.gradle.kts
-+++ b/folia-server/build.gradle.kts
-@@ -7,15 +_,16 @@
-     `java-library`
-     `maven-publish`
-     idea
-    id("io.papermc.paperweight.core")
-+    id("fun.bm.comfreyweight.core")
-     id("io.papermc.fill.gradle") version "1.0.12"
- }
- 
- val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-+val bacteriawaMavenPublicUrl = "https://repo.bacteriawa.com/repository/maven-public/"
- 
- dependencies {
-     mache("io.papermc:mache:26.2+build.1")
-    paperclip("io.papermc:paperclip:3.0.4")
-+    morninggloryclip("fun.bm:morninggloryclip:${providers.gradleProperty("clipVersion").get()}")
- }
- 
- paperweight {
-@@ -23,7 +_,8 @@
-     filterPatches = false
-     gitFilePatches = false
- 
-    val fork = forks.register("folia") {
-+    val folia = forks.register("folia") {
-+        rootDirectory = upstreamsDirectory().map { it.dir("folia") }
-         upstream.patchDir("paperServer") {
-             upstreamPath = "paper-server"
-             excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
-@@ -32,7 +_,23 @@
+--- a/luminol-server/build.gradle.kts
+++ b/luminol-server/build.gradle.kts
+@@ -52,7 +_,23 @@
         }
     }
 
-    activeFork = fork
+-    activeFork = luminol
 +    val lophine = forks.register("lophine") {
-+        forks = folia
+        forks = luminol
 +        upstream.patchRepo("paperServer") {
-+            upstreamRepo = folia.patchedRepo("paperServer")
+            upstreamRepo = luminol.patchedRepo("paperServer")
 +            patchesDir = rootDirectory.dir("lophine-server/paper-patches")
 +            outputDir = rootDirectory.dir("paper-server")
 +        }
 +
-+        upstream.patchDir("foliaServer") {
-+            upstreamPath = "folia-server"
+        upstream.patchDir("luminolServer") {
+            upstreamPath = "luminol-server"
 +            excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch")
-+            patchesDir = rootDirectory.dir("lophine-server/folia-patches")
-+            outputDir = rootDirectory.dir("folia-server")
+            patchesDir = rootDirectory.dir("lophine-server/luminol-patches")
+            outputDir = rootDirectory.dir("luminol-server")
 +        }
 +    }
 +
 +    activeFork = lophine
 
 
-     updatingMinecraft {
-@@ -44,6 +_,7 @@
-     libraryRepositories.addAll(
-         "https://repo.maven.apache.org/maven2/",
-         paperMavenPublicUrl,
-+        bacteriawaMavenPublicUrl
-     )
- }
- 
-@@ -103,10 +_,14 @@
-     main {
-         java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") }
+     spigot {
+@@ -142,12 +_,16 @@
         resources { srcDir("../paper-server/src/main/resources") }
-+        java { srcDir("../folia-server/src/main/java") }
-+        resources { srcDir("../folia-server/src/main/resources") }
+         java { srcDir("../folia-server/src/main/java") }
+         resources { srcDir("../folia-server/src/main/resources") }
+        java { srcDir("../luminol-server/src/main/java") }
+        resources { srcDir("../luminol-server/src/main/resources") }
     }
     test {
         java { srcDir("../paper-server/src/test/java") }
         resources { srcDir("../paper-server/src/test/resources") }
-+        java { srcDir("../folia-server/src/test/java") }
-+        resources { srcDir("../folia-server/src/test/resources") }
+         java { srcDir("../folia-server/src/test/java") }
+         resources { srcDir("../folia-server/src/test/resources") }
+        java { srcDir("../luminol-server/src/main/java") }
+        resources { srcDir("../luminol-server/src/main/resources") }
     }
 }
 val log4jPlugins = sourceSets.create("log4jPlugins") {
-@@ -134,7 +_,21 @@
+@@ -174,7 +_,7 @@
 }
 
 dependencies {
-    implementation(project(":folia-api"))
-+    implementation(project(":lophine-api")) // Lophine - api update
-+    // Lophine start - Dependenices insert
-+    implementation("net.objecthunter:exp4j:0.4.8")
-+    implementation("com.electronwill.night-config:toml:3.8.4") // Night config
-+    implementation("com.github.luben:zstd-jni:1.5.4-1")
-+    implementation("net.openhft:zero-allocation-hashing:0.16")
-+    implementation("io.github.classgraph:classgraph:4.8.158")
-+    implementation("net.openhft:affinity:3.23.3")
-+    // Leaves start - leaves plugin
-+    implementation("org.spongepowered:configurate-gson:4.2.0-SNAPSHOT") {
-+        exclude(group = "com.google.code.gson", module = "gson")
-+        exclude(group = "com.google.guava", module = "guava")
-+    }
-+    // Leaves end - leaves plugin
-+    // Lophine end
-     implementation("ca.spottedleaf:leafpile:1.0.0")
-     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
-@@ -189,21 +_,21 @@
-         val git = Git(rootProject.layout.projectDirectory.path)
-         val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
-         val build = System.getenv("BUILD_NUMBER") ?: null
-        val buildTime = providers.environmentVariable("BUILD_STARTED_AT").map(Instant::parse).orElse(Instant.EPOCH).get()
-+        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()
+-    implementation(project(":luminol-api")) // Luminol
+    implementation(project(":lophine-api")) // Lophine
+     // Luminol start - Dependenices insert
+     implementation("com.electronwill.night-config:toml:3.8.2") // Night config
+     implementation("com.github.luben:zstd-jni:1.5.4-1")
+@@ -275,14 +_,14 @@
         val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
-            "Implementation-Title" to "Folia",
-+            "Implementation-Title" to "Lophine", // Lophine - Rebrand
+-            "Implementation-Title" to "Luminol",
+            "Implementation-Title" to "Lophine",
             "Implementation-Version" to implementationVersion,
             "Implementation-Vendor" to date,
-            "Specification-Title" to "Folia",
-+            "Specification-Title" to "Lophine", // Lophine - Rebrand
+-            "Specification-Title" to "Luminol",
+            "Specification-Title" to "Lophine",
             "Specification-Version" to project.version,
-            "Specification-Vendor" to "Paper Team",
-            "Brand-Id" to "papermc:folia",
-            "Brand-Name" to "Folia",
-+            "Specification-Vendor" to "LophineLabs", // Lophine - Rebrand
-+            "Brand-Id" to "lophinelabs:lophine", // Lophine - Rebrand
-+            "Brand-Name" to "Lophine", // Lophine - Rebrand
+             "Specification-Vendor" to "LuminolMC org",
+-            "Brand-Id" to "luminolmc:luminol",
+-            "Brand-Name" to "Luminol",
+            "Brand-Id" to "luminolmc:lophine",
+            "Brand-Name" to "Lophine",
             "Build-Number" to (build ?: ""),
             "Build-Time" to buildTime.toString(),
             "Git-Branch" to gitBranch,
-@@ -214,6 +_,20 @@
-         }
-     }
+@@ -446,7 +_,7 @@
 }
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+// Lophine start - Hide unnecessary warnings
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("-Xlint:-module")
-+    compilerArgs.add("-Xlint:-removal")
-+    compilerArgs.add("-Xlint:-dep-ann")
-+}
-+// Lophine end
 
- // Compile tests with -parameters for better junit parameterized test names
- tasks.compileTestJava {
+ fill {
+-    project("luminol")
+    project("lophine")
+     versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
+     version(paperweight.minecraftVersion)
+ 
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 8 Jun 2025 00:58:13 +0800
+Subject: [PATCH] Rebrand to Lophine
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+index 0bebc2cc87fb9c1c526e4de4f3bc157552307a72..cb1657939b86c039fcfe6403d3f202c2c5879e88 100644
+--- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
+++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+@@ -23,6 +23,7 @@ public class ConfigManager {
+ 
+     public static void initConfigs() {
+         configfiles.put("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules"));
+        configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
+         preLoad();
+     }
+ 
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
+index df5d926fb4401dd93d658fe14ae4d9d58cff68f9..b6d84fea596cfa78032151ab2f206b6b3d5dd197 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
+@@ -8,7 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
+ @ConfigClassInfo(category = EnumConfigCategory.MISC, name = "server_mod_name")
+ public class ServerModNameConfig implements IConfigModule {
+     @ConfigInfo(name = "name")
+-    public static String serverModName = "Luminol";
+    public static String serverModName = "Lophine";
+ 
+     @ConfigInfo(name = "vanilla_spoof")
+     public static boolean fakeVanilla = false;
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 26 Aug 2025 22:08:54 +0800
+Subject: [PATCH] Transformed Configs
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
+index 4051384e82dba0416838c3c9889a6e368367b601..a5535b479cdcca870d0c8be6ed6fbcb32f266ac2 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
+@@ -11,6 +11,7 @@ public class CommandConfig implements IConfigModule {
+     @TransformedConfig(name = "enable", directory = {"experiment", "force_the_data_command_to_be_enabled"})
+     @ConfigInfo(name = "enable_data_command")
+     public static boolean data = false;
+    @TransformedConfig(name = "command_block_enabled", directory = {"experiment", "command"}, originInstance = "lophine")
+     @TransformedConfig(name = "enabled", directory = {"experiment", "force_enable_command_block_command_execution"})
+     @ConfigInfo(name = "enable_command_block", comments = """
+             Force to enable command blocks.
+diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
+index 35e6014f04093050a9a62b895b43e5c5d8c6a28e..11abfb884f972fd73ca4c13a6e309de1bcd23fd5 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
+++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
+@@ -8,6 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
+ 
+ @ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "force_disable_packet_limiter_of_paper")
+ public class PaperPacketLimiterConfig implements IConfigModule {
+    @TransformedConfig(name = "unlimit-packet", directory = {"misc", "network"}, originInstance = "lophine")
+     @TransformedConfig(name = "force_disable", directory = {"misc", "force_disable_packet_limiter_of_paper"})
+     @ConfigInfo(name = "force_disable")
+     public static boolean forceDisable = false;
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 13 Aug 2025 22:23:46 +0800
+Subject: [PATCH] Leaves: Item overstack util
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/d93e9766d3797d130f66179e70a1b374c546fef7/leaves-server/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
+index 112dc08eb62c4c50fb4859f51a366cedf027ca00..b5f661fd20b382725ad117c56ce2c94ded32b1b7 100644
+--- a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
+++ b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
+@@ -17,6 +17,7 @@
+ 
+ package org.leavesmc.leaves.util;
+ 
+import fun.bm.lophine.config.modules.function.ContainerExpansionConfig;
+ import io.papermc.paper.datacomponent.DataComponentTypes;
+ import io.papermc.paper.datacomponent.item.ItemEnchantments;
+ import net.minecraft.core.component.DataComponents;
+@@ -135,9 +136,9 @@ public class ItemOverstackUtils {
+ 
+     private static class ShulkerBox implements ItemUtil {
+         public static boolean shulkerBoxCheck(@NotNull ItemStack stack1, @NotNull ItemStack stack2) {
+-            /*if (LeavesConfig.modify.shulkerBox.sameNbtStackable) {
+            if (ContainerExpansionConfig.nbtShulkerStackable) {
+                 return Objects.equals(stack1.getComponents(), stack2.getComponents());
+-            }*/  // Luminol
+            }
+             return shulkerBoxNoItem(stack1) && shulkerBoxNoItem(stack2) && Objects.equals(stack1.getComponents(), stack2.getComponents());
+         }
+ 
+@@ -147,16 +148,15 @@ public class ItemOverstackUtils {
+ 
+         @Override
+         public boolean isEnabled() {
+-            // return LeavesConfig.modify.shulkerBox.stackableShulkerBoxes > 1;  // Luminol
+-            return false;  // Luminol
+            return ContainerExpansionConfig.shulkerCount > 1;
+         }
+ 
+         @Override
+         public boolean tryStackItems(ItemEntity self, ItemEntity other) {
+             ItemStack selfStack = self.getItem();
+             if (!isEnabled() ||
+-                    !(selfStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem) ||
+-                    !(blockItem.getBlock() instanceof net.minecraft.world.level.block.ShulkerBoxBlock)
+                    !(selfStack.getItem() instanceof BlockItem blockItem) ||
+                    !(blockItem.getBlock() instanceof ShulkerBoxBlock)
+             ) {
+                 return false;
+             }
+@@ -164,8 +164,8 @@ public class ItemOverstackUtils {
+             ItemStack otherStack = other.getItem();
+             if (selfStack.getItem() == otherStack.getItem()
+                     && shulkerBoxCheck(selfStack, otherStack)
+-                    && selfStack.getCount() != /*org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.stackableShulkerBoxes*/ 1) {  // Luminol
+-                int amount = Math.min(otherStack.getCount(), /*org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.stackableShulkerBoxes*/1 - selfStack.getCount()); // Luminol
+                    && selfStack.getCount() != ContainerExpansionConfig.shulkerCount) {
+                int amount = Math.min(otherStack.getCount(), ContainerExpansionConfig.shulkerCount - selfStack.getCount());
+ 
+                 selfStack.grow(amount);
+                 self.setItem(selfStack);
+@@ -187,9 +187,8 @@ public class ItemOverstackUtils {
+         @Override
+         public int getMaxServerStackCount(ItemStack stack) {
+             if (isEnabled() && stack.getItem() instanceof BlockItem bi &&
+-                    bi.getBlock() instanceof ShulkerBoxBlock && (/*LeavesConfig.modify.shulkerBox.sameNbtStackable ||*/ shulkerBoxNoItem(stack))) {  // Luminol
+-                // return LeavesConfig.modify.shulkerBox.stackableShulkerBoxes;  // Luminol
+-                return 1; // Luminol
+                    bi.getBlock() instanceof ShulkerBoxBlock && (ContainerExpansionConfig.nbtShulkerStackable || shulkerBoxNoItem(stack))) {
+                return ContainerExpansionConfig.shulkerCount;
+             }
+             return -1;
+         }
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 26 Aug 2025 02:55:23 +0800
+Subject: [PATCH] Add config to allow generation of end void rings
+
+
+diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java
+index 04527a5c65ad630f794fed9071d485aedd02257a..57e4c6c60f7d012a9de411b07d000f3504c27e6b 100644
+--- a/net/minecraft/world/level/levelgen/DensityFunctions.java
+++ b/net/minecraft/world/level/levelgen/DensityFunctions.java
+@@ -528,7 +528,7 @@ public final class DensityFunctions {
+             int i1 = z / 2;
+             int i2 = x % 2;
+             int i3 = z % 2;
+-            float f = 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
+            float f = fun.bm.lophine.config.modules.fixes.EndVoidRingsConfig.enabled ? 100.0F - Mth.sqrt(x * x + z * z) * 8.0F : 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow // Lophine - customize end void rings generation
+             f = Mth.clamp(f, -100.0F, 80.0F);
+ 
+             NoiseCache cache = noiseCache.get().computeIfAbsent(noise, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 14 Jun 2026 18:10:20 +0800
-Subject: [PATCH] Luminol Config System
-
-
-diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
-index e2939cc39a8c103e4c4d7b01d39b5546486e4fbc..a557d488e4e289a61aeb9aed0cc133a0a7ce8f8c 100644
--- a/net/minecraft/server/Main.java
-+++ b/net/minecraft/server/Main.java
-@@ -110,6 +110,7 @@ public class Main {
-                 JvmProfiler.INSTANCE.start(Environment.SERVER);
-             }
- 
-+            me.earthme.luminol.config.ConfigManager.initConfigs(); // Luminol - Luminol config
-             io.papermc.paper.plugin.PluginInitializerManager.load(options); // Paper
-             Bootstrap.bootStrap();
-             Bootstrap.validate();
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 6f13870a1b463049dd37cf1c65d0bdecfc35b5c4..a49c46eb7df50fc3c5587a2c3668ab6edc887107 100644
--- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -1169,6 +1169,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             ca.spottedleaf.moonrise.common.util.MoonriseCommon.haltExecutors();
-         }
-         // Paper end - rewrite chunk system
-+        // Luminol start - Config Systems
-+        me.earthme.luminol.config.ConfigManager.saveConfigs(false);
-+        // Luminol end
-         // Paper start - Improved watchdog support - move final shutdown items here
-         Util.shutdownExecutors();
-         this.onServerExit();
-diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index cd5551c0221ad2a7b5c7d452d8d91ffc9711c3ee..1ad4704523a3d90414ac514488207b1b5def9afd 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -238,6 +238,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-+        me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
-         this.server.spark.enableEarlyIfRequested(); // Paper - spark
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {
@@ -5,28 +5,28 @@ Subject: [PATCH] Add config to enable cross region damage trace


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 42e09148519596f95fc9c9c63df9c87e6ece3102..444753590d3bc96ce68e25a3834d7abb86e20f94 100644
+index 11e6197dec541b28733715f0d7eaa4c7b834d632..de1263404395c28209234a556347284fa557f81c 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1448,6 +1448,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-             this.awardStat(Stats.ENTITY_KILLED_BY.get(killer.getType()));
-             killer.awardKillScore(this, source);
-             this.createWitherRose(killer);
-+        // Lophine Start - Cross Region Damage trace
+@@ -1345,6 +1345,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+             this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
+             killCredit.awardKillScore(this, cause);
+             this.createWitherRose(killCredit);
+        // Luminol Start - Cross Region Damage trace
 +        } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
 +            final LivingEntity entitylivingnew = this.getKillCreditOrigin();
 +            if (entitylivingnew != null) {
-+                this.damageTransferToAsync(entitylivingnew, source);
+                this.damageTransferToAsync(entitylivingnew, cause);
 +            }
-+        // Lophine End - Cross Region Damage trace
+        // Luminol End - Cross Region Damage trace
         }
 
-         this.level().broadcastEntityEvent(this, EntityEvent.DEATH);
-@@ -1462,6 +1469,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         this.connection.markClientUnloadedAfterDeath();
+         this.level().broadcastEntityEvent(this, (byte)3);
+@@ -1368,6 +1375,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
     }
+     // Leaves end - exp fix
 
-+    // Lophine Start - Cross Region Damage trace
+    // Luminol Start - Cross Region Damage trace
 +    private void damageTransferToAsync(LivingEntity entity, DamageSource cause) {
 +        // Operations running on current entity
 +        this.awardStat(Stats.ENTITY_KILLED_BY.get(entity.getType()));
@@ -42,54 +42,53 @@ index 42e09148519596f95fc9c9c63df9c87e6ece3102..444753590d3bc96ce68e25a3834d7abb
 +            }
 +        }, null, 1L);
 +    }
-+    // Lophine End - Cross Region Damage trace
+    // Luminol End - Cross Region Damage trace
 +
     private void tellNeutralMobsThatIDied() {
         AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
         this.level()
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index fcaeb471dada57e9ba4d224693cefbff2fa631be..5762eed9e99d918bee02d77c0ddd70be0aa0e2ec 100644
+index 0c6d48363cd65cd22b4cc0ab97be977e133b64be..e94687b3aa960f9c630f459fedc17bc01846eaf7 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1855,6 +1855,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-             Runnable afterEvent = () -> { // Paper
+@@ -1948,6 +1948,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+             final LivingEntity killer = this.getKillCredit();
             if (killer != null) {
-                 killer.awardKillScore(this, source);
-+            // Lophine Start - Cross Region Damage trace
+                 killer.awardKillScore(this, damageSource);
+            // Luminol Start - Cross Region Damage trace
 +            } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
 +                final LivingEntity killernew = this.getKillCreditOrigin();
 +                if (killernew != null) {
-+                    this.damageTransferToAsync(killernew, source);
+                    this.damageTransferToAsync(killernew, damageSource);
 +                }
-+            // Lophine End - Cross Region Damage trace
+            // Luminol End - Cross Region Damage trace
             }
- 
-             if (this.isSleeping()) {
-@@ -1943,6 +1950,19 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-         this.postDeathEventTasks.add(() -> this.dropExperience(level, source.getEntity())); // Paper
+         }); // Paper end
+         this.postDeathDropItems(deathEvent); // Paper
+@@ -1958,6 +1965,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+         return deathEvent; // Paper
     }
 
-+    // Lophine Start - Cross Region Damage trace
+    // Luminol Start - Cross Region Damage trace
 +    private void damageTransferToAsync(LivingEntity entity, DamageSource damageSource) {
 +        entity.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
 +            try {
-+                if (nmsEntity.isRemoved()) return;
 +                nmsEntity.awardKillScore(this, damageSource);
 +            } catch (Throwable ex) {
 +                LOGGER.error(ex.getMessage(), ex);
 +            }
 +        }, null, 1L );
 +    }
-+    // Lophine End - Cross Region Damage trace
+    // Luminol End - Cross Region Damage trace
 +
-     protected void dropEquipment(final ServerLevel level) {
+     protected void dropEquipment(ServerLevel level) {
     }
- 
-@@ -2609,6 +2629,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+     protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
+@@ -2556,6 +2575,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         }
     }
 
-+    // Lophine Start - Cross Region Damage trace
+    // Luminol Start - Cross Region Damage trace
 +    @Nullable
 +    public LivingEntity getKillCreditOrigin() {
 +        if (this.lastHurtByPlayer != null) {
@@ -99,7 +98,7 @@ index fcaeb471dada57e9ba4d224693cefbff2fa631be..5762eed9e99d918bee02d77c0ddd70be
 +        }
 +        return null;
 +    }
-+    // Lophine End - Cross Region Damage trace
+    // Luminol End - Cross Region Damage trace
 +
     public final float getMaxHealth() {
         return (float)this.getAttributeValue(Attributes.MAX_HEALTH);
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 17:56:30 +0800
-Subject: [PATCH] Correct player respawn place
-
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..924d5f3236d9ba9836f39fc844392099df9cd25c 100644
--- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -511,8 +511,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         double amountX = selectMaxX - selectMinX;
-         double amountZ = selectMaxZ - selectMinZ;
- 
-        int selectX = amountX < 1.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor((amountX + 1.0) * random.nextDouble() + selectMinX);
-        int selectZ = amountZ < 1.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor((amountZ + 1.0) * random.nextDouble() + selectMinZ);
-+        // Luminol start - Correct player respawn place
-+        int selectX = amountX < 0.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor(amountX * random.nextDouble() + selectMinX);
-+        int selectZ = amountZ < 0.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor(amountZ * random.nextDouble() + selectMinZ);
-+        // Luminol end - Correct player respawn place
- 
-         return new BlockPos(selectX, 0, selectZ);
-     }
-@@ -523,10 +525,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-     }
- 
-     private static BlockPos findSpawnAround(ServerLevel world, BlockPos selected) {
-+        // Luminol start - Correct player respawn place
-+        BlockPos inChunk = PlayerSpawnFinder.getLevelRespawnPos(world, selected.getX(), selected.getZ());
-+        if (inChunk != null) {
-+            AABB checkVolume = PlayerSpawnFinder.PLAYER_DIMENSIONS.makeBoundingBox((double)inChunk.getX() + 0.5, (double)inChunk.getY(), (double)inChunk.getZ() + 0.5);
-+
-+            if (world.noCollision(null, checkVolume, true)) {
-+                return inChunk;
-+            }
-+        }
-+        // Luminol end - Correct player respawn place
-         // try hard to find, so that we don't attempt another chunk load
-         for (int dz = -SPAWN_RADIUS_SELECTION_SEARCH; dz <= SPAWN_RADIUS_SELECTION_SEARCH; ++dz) {
-             for (int dx = -SPAWN_RADIUS_SELECTION_SEARCH; dx <= SPAWN_RADIUS_SELECTION_SEARCH; ++dx) {
-                BlockPos inChunk = PlayerSpawnFinder.getLevelRespawnPos(world, selected.getX() + dx, selected.getZ() + dz);
-+                inChunk = PlayerSpawnFinder.getLevelRespawnPos(world, selected.getX() + dx, selected.getZ() + dz); // Luminol - Correct player respawn place
-                 if (inChunk == null) {
-                     continue;
-                 }
-@@ -1997,7 +2009,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         }
- 
-         if (newLevel.dimension() == lastDimension) {
-            this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit  
-+            this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit // Luminol - Correct player respawn place
-             this.connection.resetPosition();
-             transition.postTeleportTransition().onTransition(this);
-             return this;
@@ -5,36 +5,35 @@ Subject: [PATCH] Add config to enable raytracing tracker


 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 163999d50213e0167eb09f0eae883388849f28fa..5196431f52e81608a5575f8a262cd5c855b06182 100644
+index 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd16792507f 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
-@@ -1351,7 +1351,7 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
-                 double distanceSquared = deltaToPlayerX * deltaToPlayerX + deltaToPlayerZ * deltaToPlayerZ; // Paper
-                 double rangeSquared = visibleRange * visibleRange;
+@@ -1278,7 +1278,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                 double d1 = vec3_dx * vec3_dx + vec3_dz * vec3_dz; // Paper
+                 double d2 = d * d;
                 // Paper start - Configurable entity tracking range by Y
-                boolean visibleToPlayer = distanceSquared <= rangeSquared;
-+                boolean visibleToPlayer = distanceSquared <= rangeSquared && !entity.isCulled(); // Luminol - Ray tracing entity tracker
-                 if (visibleToPlayer && level.paperConfig().entities.trackingRangeY.enabled) {
+-                boolean flag = d1 <= d2;
+                boolean flag = d1 <= d2 && !entity.isCulled(); // Luminol - Ray tracing entity tracker
+                 if (flag && level.paperConfig().entities.trackingRangeY.enabled) {
                     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 43e07a3c98e80f874f55411beac39e215ffdc3cf..cddf44f5da5cba5603dcff4913b4658dcfcc48db 100644
+index 38092dcc3dedc6c855e5598126be47f892223547..a8b6e89035579557b59a20ddbe9b32943e6b7164 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -164,7 +164,7 @@ public abstract class Entity
-     ItemOwner,
-     SlotProvider,
-     DebugValueSource,
-    TypedInstance<EntityType<?>>, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker
-+    TypedInstance<EntityType<?>>, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity, dev.tr7zw.entityculling.versionless.access.Cullable { // Paper - rewrite chunk system // Paper - optimise entity tracker // Luminol - Ray tracing entity tracker
+@@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
+ import org.jetbrains.annotations.Contract;
+ import org.slf4j.Logger;
+ 
+-public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker
+public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity, dev.tr7zw.entityculling.versionless.access.Cullable { // Paper - rewrite chunk system // Paper - optimise entity tracker // Luminol - Ray tracing entity tracker
     // CraftBukkit start
     private static final int CURRENT_LEVEL = 2;
-     static boolean isLevelAtLeast(ValueInput input, int level) {
-@@ -6590,4 +6590,48 @@ public abstract class Entity
-     // Paper end
+     public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
+@@ -6463,4 +6463,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
-+    // Lophine start - Add config to enable raytracing tracker
 +
 +    private long lasttime = 0;
 +    private boolean culled = false;
@@ -77,29 +76,26 @@ index 43e07a3c98e80f874f55411beac39e215ffdc3cf..cddf44f5da5cba5603dcff4913b4658d
 +        return this.outOfCamera;
 +    }
 +
-+    // Lophine end - Add config to enable raytracing tracker
 }
 diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
-index 6efaa78faca15c7a48bdffb24480d1bac29f3ba8..8a328a41673a3d720f0b1a5de8ce049e360fac1b 100644
+index 6f00ffa05d9597917574357e0069c9b056aa5ce2..5cc7a91e32f17d8d9585ae4844a4ed3b706e3273 100644
 --- a/net/minecraft/world/entity/EntityType.java
 +++ b/net/minecraft/world/entity/EntityType.java
-@@ -84,6 +84,11 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T>,
+@@ -1119,6 +1119,9 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
     public final int passengerTickTimerId;
     public final int passengerInactiveTickTimerId;
     // Folia end - profiler
-+    // Lophine start - Add config to enable raytracing tracker
 +    // Luminol - Raytracing entity tracker
 +    public boolean skipRaytracningCheck = false;
 +    // Luminol end
-+    // Lophine end - Add config to enable raytracing tracker
 
     public EntityType(
-         final EntityType.EntityFactory<T> factory,
+         EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 9fdc8134fdde2cdd7724a459a29e51f4ad943403..c6fa9dff800b1491b1e0fc5d7e1dc16b99b8c7db 100644
+index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a6268fdaa46 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -186,6 +186,25 @@ public abstract class Player extends Avatar implements ContainerUser {
+@@ -229,6 +229,25 @@ public abstract class Player extends LivingEntity {
         return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
     }
     // CraftBukkit end
@@ -123,9 +119,9 @@ index 9fdc8134fdde2cdd7724a459a29e51f4ad943403..c6fa9dff800b1491b1e0fc5d7e1dc16b
 +    }
 +    // Luminol end
 
-     public Player(final Level level, final GameProfile gameProfile) {
-         super(EntityTypes.PLAYER, level);
-@@ -245,6 +264,26 @@ public abstract class Player extends Avatar implements ContainerUser {
+     public Player(Level level, GameProfile gameProfile) {
+         super(EntityType.PLAYER, level);
+@@ -287,6 +306,26 @@ public abstract class Player extends LivingEntity {
 
     @Override
     public void tick() {
@@ -152,8 +148,8 @@ index 9fdc8134fdde2cdd7724a459a29e51f4ad943403..c6fa9dff800b1491b1e0fc5d7e1dc16b
         this.noPhysics = this.isSpectator();
         if (this.isSpectator() || this.isPassenger()) {
             this.setOnGround(false);
-@@ -1378,6 +1417,7 @@ public abstract class Player extends Avatar implements ContainerUser {
-         if (this.hasContainerOpen()) {
+@@ -1426,6 +1465,7 @@ public abstract class Player extends LivingEntity {
+         if (this.containerMenu != null && this.hasContainerOpen()) {
             this.doCloseContainer();
         }
 +        if (this.cullTask != null) this.cullTask.signalStop(); // Luminol - Ray tracing entity tracker
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:01:59 +0800
-Subject: [PATCH] Correct volatile reference get in RegionizedTaskQueue
-
-
-diff --git a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-index d1a045d47dcd12f246d95ecdfc202da357897cbf..b264dbd13a392cde3f24ff75c0034985fda68ccc 100644
--- a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-+++ b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-@@ -533,7 +533,7 @@ public final class RegionizedTaskQueue {
-             }
- 
-             private ReferenceCountData getReferenceCounterVolatile() {
-                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.get(this);
-+                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.getVolatile(this); // Luminol - Correct volatile reference get in RegionizedTaskQueue
-             }
- 
-             private ReferenceCountData compareAndExchangeReferenceCounter(final ReferenceCountData expect, final ReferenceCountData update) {
@@ -5,19 +5,17 @@ Subject: [PATCH] Add config to enable function command


 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 946094713bdb294d7d8beb03967b2a2488f5359b..3d9e8c5ba567efd363e0ed54059f67fbfe25e361 100644
+index 11697e65a7f7871920ca7bad37de07f78a3da1f8..25ccbfa12d57d540195ecc16aa54a144f8ecc0e8 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -217,7 +217,11 @@ public class Commands {
+@@ -204,7 +204,9 @@ public class Commands {
         FillCommand.register(this.dispatcher, context);
         FillBiomeCommand.register(this.dispatcher, context);
         ForceLoadCommand.register(this.dispatcher);
 -        //FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
-+        // Lophine start - Add config to enable function command
 +        if (fun.bm.lophine.config.modules.experiment.CommandConfig.function) {
 +            FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
 +        }
-+        // Lophine end - Add config to enable function command
         GameModeCommand.register(this.dispatcher);
         GameRuleCommand.register(this.dispatcher, context);
         GiveCommand.register(this.dispatcher, context);
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Tue, 30 Jun 2026 22:34:00 +0800
-Subject: [PATCH] Correct thread unsafe random sources
-
-
-diff --git a/net/minecraft/world/entity/npc/wanderingtrader/WanderingTraderSpawner.java b/net/minecraft/world/entity/npc/wanderingtrader/WanderingTraderSpawner.java
-index 01b3cda3da79abd30860eb33491ac00f9e958767..dd35e72757b1be1a73e67b272c138bb4e3b6336a 100644
--- a/net/minecraft/world/entity/npc/wanderingtrader/WanderingTraderSpawner.java
-+++ b/net/minecraft/world/entity/npc/wanderingtrader/WanderingTraderSpawner.java
-@@ -30,7 +30,7 @@ public class WanderingTraderSpawner implements CustomSpawner {
-     private static final int SPAWN_CHANCE_INCREASE = 25;
-     private static final int SPAWN_ONE_IN_X_CHANCE = 10;
-     private static final int NUMBER_OF_SPAWN_ATTEMPTS = 10;
-    private final RandomSource random = RandomSource.create();
-+    private final RandomSource random = io.papermc.paper.threadedregions.util.ThreadLocalRandomSource.INSTANCE; // Luminol - Correct thread unsafe random sources
-     private final SavedDataStorage savedDataStorage;
-     // Folia - moved to global data
- 
-diff --git a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-index 22b9f70f76ff8f592359e958fa439e9806a29fcc..818598ed4e498bf3f177faac03336097b41915ee 100644
--- a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-+++ b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-@@ -28,7 +28,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
-     public float rot;
-     public float oRot;
-     public float tRot;
-    private static final RandomSource RANDOM = RandomSource.create();
-+    private static final RandomSource RANDOM = io.papermc.paper.threadedregions.util.ThreadLocalRandomSource.INSTANCE; // Luminol - Correct thread unsafe random sources
-     private @Nullable Component name;
- 
-     public EnchantingTableBlockEntity(final BlockPos worldPosition, final BlockState blockState) {
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to enable save-all command


 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index a2db29aa47a4b7213d4956f02f6e83122ccfdbd1..6fb3c88463ff69bddb7d8dcde0e5339567d3e1c6 100644
+index e1842ab8f20271a8b20ab8462b09a4745a612a9a..6deaeaf95a43e217f65d3e0764b844ff4573d4ca 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -265,6 +265,8 @@ public final class RegionizedServer {
+@@ -317,6 +317,8 @@ public final class RegionizedServer {
         // tick player ping sample
         this.tickPlayerSample();
 
@@ -18,10 +18,10 @@ index a2db29aa47a4b7213d4956f02f6e83122ccfdbd1..6fb3c88463ff69bddb7d8dcde0e53395
         for (final ServerLevel world : this.worlds) {
             this.globalTick(world, tickCount);
 diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java
-index 97c514673a454b752ab86b944fd143725ca8090d..ba91d40d6d91588a4b39abfefcb17a362bfc5490 100644
+index bfb39cbf1ba58d02da7e35300eb95872747506e8..25e8f26f708b68bd90f57863e7833e6502d981e2 100644
 --- a/io/papermc/paper/threadedregions/TickRegions.java
 +++ b/io/papermc/paper/threadedregions/TickRegions.java
-@@ -190,6 +190,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -168,6 +168,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
         public final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region;
         public final ServerLevel world;
 
@@ -31,10 +31,10 @@ index 97c514673a454b752ab86b944fd143725ca8090d..ba91d40d6d91588a4b39abfefcb17a36
         private final Reference2ReferenceOpenHashMap<RegionizedData<?>, Object> regionizedData = new Reference2ReferenceOpenHashMap<>();
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index c67ea715f02086e5a39cc5832ccdc0b32199db93..946094713bdb294d7d8beb03967b2a2488f5359b 100644
+index 25ccbfa12d57d540195ecc16aa54a144f8ecc0e8..c00e0e74cb4c820a5c8b3722ebc1ff56318dae02 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -299,7 +299,11 @@ public class Commands {
+@@ -277,7 +277,11 @@ public class Commands {
             PardonCommand.register(this.dispatcher);
             PardonIpCommand.register(this.dispatcher);
             //PerfCommand.register(this.dispatcher); // Folia - region threading - TODO later
@@ -48,13 +48,13 @@ index c67ea715f02086e5a39cc5832ccdc0b32199db93..946094713bdb294d7d8beb03967b2a24
             SaveOnCommand.register(this.dispatcher);
             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 1736816e26c255645d62696814cd539ee1ffed8d..a0c285d2cb666d0f9bd0e859e0dac414254325c3 100644
+index 75027e73859c955a54034640f905cb5d91a6a2f4..1fa4110b61e49ee9527b65ecafb96b0dcd2c8ce2 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1652,6 +1652,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1581,6 +1581,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     // Folia start - region threading
-     public void tickServer(final long startTime, final long scheduledEnd, final long targetBuffer,
-                            final io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
+     public void tickServer(long startTime, long scheduledEnd, long targetBuffer,
+                            io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
 +        // Lophine start - save-all fix
 +        if (fun.bm.lophine.utils.SaveAllUtil.isSaving()) {
 +            fun.bm.lophine.utils.SaveAllUtil.postRegionSave(region);
@@ -64,26 +64,27 @@ index 1736816e26c255645d62696814cd539ee1ffed8d..a0c285d2cb666d0f9bd0e859e0dac414
         // Folia end - region threading
         org.spigotmc.WatchdogThread.tick(); // Spigot
 diff --git a/net/minecraft/server/commands/SaveAllCommand.java b/net/minecraft/server/commands/SaveAllCommand.java
-index 299991905c24a7018f8ac60d0c16e56fa43cd710..39c1b67e457c26a7e8d87be21658bbe6e802440c 100644
+index 15e0fce7500dc2dc2a712bf61d1d5506fd8f317a..71f53f057527192f8f830c7d21bd72233479fe55 100644
 --- a/net/minecraft/server/commands/SaveAllCommand.java
 +++ b/net/minecraft/server/commands/SaveAllCommand.java
-@@ -22,14 +22,21 @@ public class SaveAllCommand {
+@@ -21,7 +21,9 @@ public class SaveAllCommand {
     }
 
-     private static int saveAll(final CommandSourceStack source, final boolean flush) throws CommandSyntaxException {
+     private static int saveAll(CommandSourceStack source, boolean flush) throws CommandSyntaxException {
 -        source.sendSuccess(() -> Component.translatable("commands.save.saving"), false);
 +        // Lophine start - save all
 +        fun.bm.lophine.utils.SaveAllUtil.preSaveAll(source, flush);
 +/*        source.sendSuccess(() -> Component.translatable("commands.save.saving"), false);
         MinecraftServer server = source.getServer();
-         boolean success = server.saveEverything(true, flush, true);
-         if (!success) {
-             throw ERROR_FAILED.create();
-         }
- 
-        source.sendSuccess(() -> Component.translatable("commands.save.success"), true);
-+        source.sendSuccess(() -> Component.translatable("commands.save.success"), true);*/
-         return Command.SINGLE_SUCCESS;
+         boolean flag = server.saveEverything(true, flush, true);
+         if (!flag) {
+@@ -29,6 +31,12 @@ public class SaveAllCommand {
+         } else {
+             source.sendSuccess(() -> Component.translatable("commands.save.success"), true);
+             return 1;
+-        }
+        }*/
+        return 1;
     }
 +
 +    public static SimpleCommandExceptionType getErrorFailed() {
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Thu, 2 Jul 2026 22:31:15 +0800
-Subject: [PATCH] Correct portal logic of some projectile entities
-
-
-diff --git a/net/minecraft/world/entity/projectile/ShulkerBullet.java b/net/minecraft/world/entity/projectile/ShulkerBullet.java
-index d5506bfc84912ec50cd5391225b9b5291435d3aa..6339a770526324bdc1bcc0c0e3bacc0a10f359ab 100644
--- a/net/minecraft/world/entity/projectile/ShulkerBullet.java
-+++ b/net/minecraft/world/entity/projectile/ShulkerBullet.java
-@@ -229,7 +229,7 @@ public class ShulkerBullet extends Projectile {
-         this.setPos(this.position().add(movement));
-         this.applyEffectsFromBlocks();
-         if (this.portalProcess != null && this.portalProcess.isInsidePortalThisTick()) {
-            this.handlePortal();
-+            if (this.handlePortal()) return; // Luminol - Correct portal logic of some projectile entities (Should not be ticking anymore after portal logics)
-         }
- 
-         if (hitResult != null && this.isAlive() && hitResult.getType() != HitResult.Type.MISS) {
-diff --git a/net/minecraft/world/entity/projectile/arrow/AbstractArrow.java b/net/minecraft/world/entity/projectile/arrow/AbstractArrow.java
-index 88c2f0f927bd8376522eb9aed184abd6f09230f6..d66a4826400eca835645e1115c4fefc61715f336 100644
--- a/net/minecraft/world/entity/projectile/arrow/AbstractArrow.java
-+++ b/net/minecraft/world/entity/projectile/arrow/AbstractArrow.java
-@@ -276,7 +276,7 @@ public abstract class AbstractArrow extends Projectile {
-                     .clipIncludingBorder(
-                         new ClipContext(originalPosition, originalPosition.add(movement), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)
-                     );
-                this.stepMoveAndHit(blockHitResult);
-+                if (this.stepMoveAndHit(blockHitResult)) return; // Luminol - Correct portal logic of some projectile entities (Should not be ticking anymore after portal logics)
-             } else {
-                 this.setPos(originalPosition.add(movement));
-                 this.applyEffectsFromBlocks();
-@@ -299,7 +299,7 @@ public abstract class AbstractArrow extends Projectile {
-         return 0.99F;
-     }
- 
-    private void stepMoveAndHit(final BlockHitResult blockHitResult) {
-+    private boolean stepMoveAndHit(final BlockHitResult blockHitResult) { // Luminol - Correct portal logic of some projectile entities
-         while (this.isAlive()) {
-             Vec3 initialPosition = this.position();
-             ArrayList<EntityHitResult> entitiesHit = new ArrayList<>(this.findHitEntities(initialPosition, blockHitResult.getLocation()));
-@@ -309,7 +309,7 @@ public abstract class AbstractArrow extends Projectile {
-             this.setPos(nextLocation);
-             this.applyEffectsFromBlocks(initialPosition, nextLocation);
-             if (this.portalProcess != null && this.portalProcess.isInsidePortalThisTick()) {
-                this.handlePortal();
-+                if (this.handlePortal()) return true; // Luminol - Correct portal logic of some projectile entities (Should not be ticking anymore after portal logics)
-             }
- 
-             if (entitiesHit.isEmpty()) {
-@@ -327,6 +327,7 @@ public abstract class AbstractArrow extends Projectile {
-                 break;
-             }
-         }
-+        return false; // Luminol - Correct portal logic of some projectile entities
-     }
- 
-     private ProjectileDeflection hitTargetsOrDeflectSelf(final Collection<EntityHitResult> entityHitResults) {
@@ -5,11 +5,11 @@ Subject: [PATCH] Add config to enable scoreboard command


 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 3d9e8c5ba567efd363e0ed54059f67fbfe25e361..6642288dde528899d9bce7ccd8d92a199e8975c8 100644
+index c00e0e74cb4c820a5c8b3722ebc1ff56318dae02..2be7e5de57f474a3600ea4990899c1955faa512e 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -246,7 +246,11 @@ public class Commands {
-         RotateCommand.register(this.dispatcher);
+@@ -229,7 +229,11 @@ public class Commands {
+         //RotateCommand.register(this.dispatcher); // Folia - region threading - TODO later
         SayCommand.register(this.dispatcher);
         //ScheduleCommand.register(this.dispatcher); // Folia - region threading
 -        //ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading
@@ -17,7 +17,7 @@ index 3d9e8c5ba567efd363e0ed54059f67fbfe25e361..6642288dde528899d9bce7ccd8d92a19
 +        if (fun.bm.lophine.config.modules.experiment.CommandConfig.scoreboard) {
 +            ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading
 +        }
-+        // Lophine end - Add a config to enable scoreboard command
-         SeedCommand.register(this.dispatcher, commandSelection != Commands.CommandSelection.INTEGRATED);
-         VersionCommand.register(this.dispatcher, commandSelection != Commands.CommandSelection.INTEGRATED);
+        // Lophine start - Add a config to enable scoreboard command
+         SeedCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
+         VersionCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
         SetBlockCommand.register(this.dispatcher, context);
@@ -1,391 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 18:54:50 +0800
-Subject: [PATCH] Anonymous Object: Configurable region format framework
-
-As requested by the original author, this patch will be anonymous and hide the original commit address.
-This patch is used with permission from the original author.
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
-index a814512fcfb85312474ae2c2c21443843bf57831..9d69a022872e06b320bee46329cd8889f74fbbaa 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
-+++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
-@@ -8,9 +8,9 @@ public interface ChunkSystemRegionFileStorage {
- 
-     public boolean moonrise$doesRegionFileNotExistNoIO(final int chunkX, final int chunkZ);
- 
-    public RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ);
-+    public io.anonymous.anonymous.data.RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ); // Anonymous - Configurable region file format
- 
-    public RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException;
-+    public io.anonymous.anonymous.data.RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException; // Anonymous - Configurable region file format
- 
-     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 3bb9b58ee97464687e348e23b99159226415c267..4c3ad63f17bb4a04f982b36ad3f53d3c0f58bdb5 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
-+++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
-@@ -1273,7 +1273,7 @@ public final class MoonriseRegionFileIO {
-                 this.regionDataController.finishWrite(this.chunkX, this.chunkZ, writeData);
-                 // Paper start - flush regionfiles on save
-                 if (this.world.paperConfig().chunks.flushRegionsOnSave) {
-                    final RegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ);
-+                    final io.anonymous.anonymous.data.RegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ); // Anonymous - Configurable region file format
-                     if (regionFile != null) {
-                         regionFile.flush();
-                     } // else: evicted from cache, which should have called flush
-@@ -1489,7 +1489,7 @@ public final class MoonriseRegionFileIO {
- 
-         public static interface IORunnable {
- 
-            public void run(final RegionFile regionFile) throws IOException;
-+            public void run(final io.anonymous.anonymous.data.RegionFile regionFile) throws IOException; // Anonymous - Configurable region file format
- 
-         }
-     }
-diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java b/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
-index 51c126735ace8fdde89ad97b5cab62f244212db0..ea2f45964fb8c617f90938597c230b50d83744aa 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
-+++ b/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
-@@ -8,5 +8,5 @@ public interface ChunkSystemChunkBuffer {
- 
-     public void moonrise$setWriteOnClose(final boolean value);
- 
-    public void moonrise$write(final RegionFile regionFile) throws IOException;
-+    public void moonrise$write(final io.anonymous.anonymous.data.RegionFile regionFile) throws IOException; // Anonymous - Configurable region file format
- }
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index a49c46eb7df50fc3c5587a2c3668ab6edc887107..c74f76b46259204b33b69ad08bb03c81b8b36961 100644
--- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -986,10 +986,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         if (flush) {
-             for (ServerLevel level : this.getAllLevels()) {
-                 String storageName = level.getChunkSource().chunkMap.getStorageName();
-                LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", LEGACY_WORLD_NAMES_FOR_REALMS_LOG.getOrDefault(storageName, storageName));
-+                LOGGER.info("ThreadedChunkStorage ({}): All chunks are saved", LEGACY_WORLD_NAMES_FOR_REALMS_LOG.getOrDefault(storageName, storageName)); // Anonymous - Configurable region format
-             }
- 
-            LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
-+            LOGGER.info("ThreadedChunkStorage: All dimensions are saved"); // Anonymous - configurable region format
-         }
- 
-         return result;
-diff --git a/net/minecraft/util/worldupdate/FileToUpgrade.java b/net/minecraft/util/worldupdate/FileToUpgrade.java
-index a7f2cfa9277c898038f6b9e0a3401db51012b64c..7b96f3ec2738875a3ed7aa34347c0f174b6579c5 100644
--- a/net/minecraft/util/worldupdate/FileToUpgrade.java
-+++ b/net/minecraft/util/worldupdate/FileToUpgrade.java
-@@ -4,5 +4,5 @@ import java.util.List;
- import net.minecraft.world.level.ChunkPos;
- import net.minecraft.world.level.chunk.storage.RegionFile;
- 
-public record FileToUpgrade(RegionFile file, List<ChunkPos> chunksToUpgrade) {
-+public record FileToUpgrade(io.anonymous.anonymous.data.RegionFile file, List<ChunkPos> chunksToUpgrade) { // Anonymous - Configurable region file format
- }
-diff --git a/net/minecraft/util/worldupdate/RegionStorageUpgrader.java b/net/minecraft/util/worldupdate/RegionStorageUpgrader.java
-index b228cd6c54e8c8998923ab332882d99092769c67..2dd3d0afd8f58e5e68a361dd38c95da06b4d133b 100644
--- a/net/minecraft/util/worldupdate/RegionStorageUpgrader.java
-+++ b/net/minecraft/util/worldupdate/RegionStorageUpgrader.java
-@@ -36,7 +36,7 @@ import org.slf4j.Logger;
- public class RegionStorageUpgrader {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     private static final String NEW_DIRECTORY_PREFIX = "new_";
-    private static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
-+    private static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\." + me.earthme.luminol.config.modules.function.RegionFormatConfig.regionFormat.getArgument() + "$"); // Anonymous - Configurable region file format
-     private final DataFixer dataFixer;
-     private final UpgradeProgress upgradeProgress;
-     private final String type;
-@@ -176,7 +176,8 @@ public class RegionStorageUpgrader {
-                 int zOffset = Integer.parseInt(regex.group(2)) << 5;
-                 List<ChunkPos> chunkPositions = Lists.newArrayList();
- 
-                try (RegionFile regionSource = new RegionFile(info, regionFile.toPath(), regionFolder, true)) {
-+                var regionFileInfo = new io.anonymous.anonymous.utils.RegionCreatorInfo(info, regionFile.toPath(), regionFolder, true); // Anonymous - Configurable region file format
-+                try (io.anonymous.anonymous.data.RegionFile regionSource = me.earthme.luminol.config.modules.function.RegionFormatConfig.regionFormat.getCreator().newFile(regionFileInfo)) { // Anonymous - Configurable region file format
-                     for (int x = 0; x < 32; x++) {
-                         for (int z = 0; z < 32; z++) {
-                             ChunkPos pos = new ChunkPos(x + xOffset, z + zOffset);
-@@ -253,7 +254,7 @@ public class RegionStorageUpgrader {
-         return storage.upgradeChunkTag(chunkTag, this.defaultVersion, this.dataFixContextTag, targetVersion);
-     }
- 
-    private void onFileFinished(final RegionFile regionFile) {
-+    private void onFileFinished(final io.anonymous.anonymous.data.RegionFile regionFile) { // Anonymous - Configurable region file format
-         if (this.recreateRegionFiles) {
-             if (this.previousWriteFuture != null) {
-                 this.previousWriteFuture.join();
-diff --git a/net/minecraft/world/level/chunk/storage/RegionFile.java b/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 3de7fd2b084c38e72d7a6bc416880a881f514ad3..821924f85a507589a039832be8657e1dc3c0ce0c 100644
--- a/net/minecraft/world/level/chunk/storage/RegionFile.java
-+++ b/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -22,7 +22,7 @@ import net.minecraft.world.level.ChunkPos;
- import org.jspecify.annotations.Nullable;
- import org.slf4j.Logger;
- 
-public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemRegionFile { // Paper - rewrite chunk system
-+public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemRegionFile , io.anonymous.anonymous.data.RegionFile{ // Paper - rewrite chunk system // Anonymous - Configurable region file format
-     private static final Logger LOGGER = LogUtils.getLogger();
-     public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
-     private static final int SECTOR_BYTES = 4096;
-@@ -130,7 +130,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
-         return this.recalculateCount.get();
-     }
- 
-    boolean recalculateHeader() throws IOException {
-+    public boolean recalculateHeader() throws IOException { // Anonymous - Configurable region file format
-         if (!this.canRecalcHeader) {
-             return false;
-         }
-@@ -789,7 +789,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
-         }
-     }
- 
-    protected synchronized void write(final ChunkPos pos, final ByteBuffer data) throws IOException {
-+    public synchronized void write(final ChunkPos pos, final ByteBuffer data) throws IOException { // Anonymous - Configurable region file format
-         int offsetIndex = getOffsetIndex(pos);
-         int offset = this.offsets.get(offsetIndex);
-         int sectorNumber = getSectorNumber(offset);
-@@ -907,7 +907,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
-         }
- 
-         @Override
-        public final void moonrise$write(final RegionFile regionFile) throws IOException {
-+        public final void moonrise$write(final io.anonymous.anonymous.data.RegionFile regionFile) throws IOException { // Anonymous - Configurable region file format
-             regionFile.write(this.pos, ByteBuffer.wrap(this.buf, 0, this.count));
-         }
-         // Paper end - rewrite chunk system
-@@ -973,11 +973,11 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
-         return (x & 31) + (z & 31) * 32;
-     }
- 
-    synchronized boolean isOversized(int x, int z) {
-+    public synchronized boolean isOversized(int x, int z) { // Anonymous - Configurable region file format
-         return this.oversized[getChunkIndex(x, z)] == 1;
-     }
- 
-    synchronized void setOversized(int x, int z, boolean oversized) throws IOException {
-+    public synchronized void setOversized(int x, int z, boolean oversized) throws IOException { // Anonymous - Configurable region file format
-         final int offset = getChunkIndex(x, z);
-         boolean previous = this.oversized[offset] == 1;
-         this.oversized[offset] = (byte) (oversized ? 1 : 0);
-@@ -1016,7 +1016,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
-         return this.path.getParent().resolve(this.path.getFileName().toString().replaceAll("\\.mca$", "") + "_oversized_" + x + "_" + z + ".nbt");
-     }
- 
-    synchronized net.minecraft.nbt.CompoundTag getOversizedData(int x, int z) throws IOException {
-+    public synchronized net.minecraft.nbt.CompoundTag getOversizedData(int x, int z) throws IOException { // Anonymous - Configurable region file format
-         Path file = getOversizedFile(x, z);
-         try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new java.util.zip.InflaterInputStream(Files.newInputStream(file))))) {
-             return net.minecraft.nbt.NbtIo.read((java.io.DataInput) out);
-diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 63b40c420030d935bb81a219fb33defe0946e21f..e0e19f091f6b85d7788259cfcc53cc3db848b68e 100644
--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -19,7 +19,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper
-     public static final String ANVIL_EXTENSION = ".mca";
-     private static final int MAX_CACHE_SIZE = 256;
-    private final Long2ObjectLinkedOpenHashMap<RegionFile> regionCache = new Long2ObjectLinkedOpenHashMap<>();
-+    private final Long2ObjectLinkedOpenHashMap<io.anonymous.anonymous.data.RegionFile> regionCache = new Long2ObjectLinkedOpenHashMap<>();  // Anonymous - Configurable region file format
-     private final RegionStorageInfo info;
-     private final Path folder;
-     private final boolean sync;
-@@ -30,7 +30,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     @Nullable
-     public static ChunkPos getRegionFileCoordinates(Path file) {
-         String fileName = file.getFileName().toString();
-        if (!fileName.startsWith("r.") || !fileName.endsWith(".mca")) {
-+        if (!fileName.startsWith("r.") || !fileName.endsWith(getExtensionName())) { // Anonymous - Configurable region file format
-             return null;
-         }
- 
-@@ -55,8 +55,32 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     private static final int MAX_NON_EXISTING_CACHE = 1024 * 4;
-     private final it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet nonExistingRegionFiles = new it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet();
-     private static String getRegionFileName(final int chunkX, final int chunkZ) {
-        return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + ".mca";
-+        return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + getExtensionName(); // Anonymous - Configurable region file format
-     }
-+    // Anonymous start - Configurable region file format
-+    public static io.anonymous.anonymous.data.RegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
-+        final io.anonymous.anonymous.enums.EnumRegionFormat regionFormat = me.earthme.luminol.config.modules.function.RegionFormatConfig.regionFormat;
-+        final String fullFileName = filePath.getFileName().toString();
-+        final String[] fullNameSplit = fullFileName.split("\\.");
-+        final String extensionName = fullNameSplit[fullNameSplit.length - 1];
-+
-+        if (!regionFormat.getArgument().equalsIgnoreCase(extensionName)) {
-+            // raise a delayed crash
-+            io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
-+                throw new RuntimeException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument());
-+            });
-+
-+
-+            throw new IOException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument());
-+        }
-+
-+        return regionFormat.getCreator().newFile(new io.anonymous.anonymous.utils.RegionCreatorInfo(info, filePath, folder, sync));
-+    }
-+
-+    public static String getExtensionName() {
-+        return "." + me.earthme.luminol.config.modules.function.RegionFormatConfig.regionFormat.getArgument();
-+    }
-+    // Anonymous end
- 
-     private boolean doesRegionFilePossiblyExist(final long position) {
-         synchronized (this.nonExistingRegionFiles) {
-@@ -90,15 +114,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     }
- 
-     @Override
-    public synchronized final RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ) {
-+    public synchronized final io.anonymous.anonymous.data.RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ) { // Anonymous - Configurable region file format
-         return this.regionCache.getAndMoveToFirst(ChunkPos.pack(chunkX >> REGION_SHIFT, chunkZ >> REGION_SHIFT));
-     }
- 
-     @Override
-    public synchronized final RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException {
-+    public synchronized final io.anonymous.anonymous.data.RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException {  // Anonymous - Configurable region file format
-         final long key = ChunkPos.pack(chunkX >> REGION_SHIFT, chunkZ >> REGION_SHIFT);
- 
-        RegionFile ret = this.regionCache.getAndMoveToFirst(key);
-+        io.anonymous.anonymous.data.RegionFile ret = this.regionCache.getAndMoveToFirst(key);  // Anonymous - Configurable region file format
-         if (ret != null) {
-             return ret;
-         }
-@@ -124,7 +148,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-         FileUtil.createDirectoriesSafe(this.folder);
- 
-        ret = new RegionFile(this.info, regionPath, this.folder, this.sync);
-+        ret = this.createNew(this.info, regionPath, this.folder, this.sync);  // Anonymous - Configurable region file format
- 
-         this.regionCache.putAndMoveToFirst(key, ret);
- 
-@@ -143,7 +167,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         }
- 
-         final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
-        final RegionFile regionFile = this.getRegionFile(pos);
-+        final io.anonymous.anonymous.data.RegionFile regionFile = this.getRegionFile(pos);  // Anonymous - Configurable region file format
- 
-         // note: not required to keep regionfile loaded after this call, as the write param takes a regionfile as input
-         // (and, the regionfile parameter is unused for writing until the write call)
-@@ -177,7 +201,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     ) throws IOException {
-         final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
-         if (writeData.result() == ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE) {
-            final RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);
-+            final io.anonymous.anonymous.data.RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);  // Anonymous - Configurable region file format
-             if (regionFile != null) {
-                 regionFile.clear(pos);
-             } // else: didn't exist
-@@ -192,7 +216,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     public final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.ReadData moonrise$readData(
-         final int chunkX, final int chunkZ
-     ) throws IOException {
-        final RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);
-+        final io.anonymous.anonymous.data.RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);  // Anonymous - Configurable region file format
- 
-         final DataInputStream input = regionFile == null ? null : regionFile.getChunkDataInputStream(new ChunkPos(chunkX, chunkZ));
- 
-@@ -237,7 +261,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-             final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
-             final ChunkPos headerChunkPos = SerializableChunkData.getChunkCoordinate(ret);
-            final RegionFile regionFile = this.getRegionFile(pos);
-+            final io.anonymous.anonymous.data.RegionFile regionFile = this.getRegionFile(pos);  // Anonymous - Configurable region file format
- 
-             if (regionFile.getRecalculateCount() != readData.recalculateCount()) {
-                 return null;
-@@ -261,7 +285,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-     }
-     // Paper end - rewrite chunk system
-     // Paper start - rewrite chunk system
-    public RegionFile getRegionFile(ChunkPos pos) throws IOException {
-+    public io.anonymous.anonymous.data.RegionFile getRegionFile(ChunkPos pos) throws IOException {  // Anonymous - Configurable region file format
-         return this.getRegionFile(pos, false);
-     }
-     // Paper end - rewrite chunk system
-@@ -273,7 +297,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         this.isChunkData = info.dfuType()[0] == net.minecraft.util.datafix.DataFixTypes.CHUNK; // Paper - recalculate region file headers
-     }
- 
-    @org.jetbrains.annotations.Contract("_, false -> !null") private @Nullable RegionFile getRegionFile(final ChunkPos pos, boolean existingOnly) throws IOException { // CraftBukkit
-+    @org.jetbrains.annotations.Contract("_, false -> !null") private io.anonymous.anonymous.data.RegionFile getRegionFile(final ChunkPos pos, boolean existingOnly) throws IOException { // CraftBukkit // Anonymous - Configurable region file format
-         // Paper start - rewrite chunk system
-         if (existingOnly) {
-             return this.moonrise$getRegionFileIfExists(pos.x(), pos.z());
-@@ -281,7 +305,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         synchronized (this) {
-             final long key = ChunkPos.pack(pos.x() >> REGION_SHIFT, pos.z() >> REGION_SHIFT);
- 
-            RegionFile ret = this.regionCache.getAndMoveToFirst(key);
-+            io.anonymous.anonymous.data.RegionFile ret = this.regionCache.getAndMoveToFirst(key);  // Anonymous - Configurable region file format
-             if (ret != null) {
-                 return ret;
-             }
-@@ -298,7 +322,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-             FileUtil.createDirectoriesSafe(this.folder);
- 
-            ret = new RegionFile(this.info, regionPath, this.folder, this.sync);
-+            ret = this.createNew(this.info, regionPath, this.folder, this.sync); // Anonymous - Configurable region file format
- 
-             this.regionCache.putAndMoveToFirst(key, ret);
- 
-@@ -312,7 +336,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         LOGGER.error("{} ({} - {},{}) Go clean it up to remove this message. /minecraft:tp {} 128 {} - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.", msg, file.toString().replaceAll(".+[\\\\/]", ""), x, z, x << 4, z << 4);
-     }
- 
-    private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
-+    private static CompoundTag readOversizedChunk(io.anonymous.anonymous.data.RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {  // Anonymous - Configurable region file format
-         synchronized (regionfile) {
-             try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
-                 CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x(), chunkCoordinate.z());
-@@ -346,7 +370,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-     public @Nullable CompoundTag read(final ChunkPos pos) throws IOException {
-         // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
-        RegionFile region = this.getRegionFile(pos, true);
-+        io.anonymous.anonymous.data.RegionFile region = this.getRegionFile(pos, true); // Anonymous - Configurable region file format
-         if (region == null) {
-             return null;
-         }
-@@ -383,7 +407,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-     public void scanChunk(final ChunkPos pos, final StreamTagVisitor scanner) throws IOException {
-         // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
-        RegionFile region = this.getRegionFile(pos, true);
-+        io.anonymous.anonymous.data.RegionFile region = this.getRegionFile(pos, true); // Anonymous - Configurable region file format
-         if (region == null) {
-             return;
-         }
-@@ -398,7 +422,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-     public void write(final ChunkPos pos, final @Nullable CompoundTag value) throws IOException {
-         if (!SharedConstants.DEBUG_DONT_SAVE_WORLD) {
-            RegionFile region = this.getRegionFile(pos, value == null); // CraftBukkit // Paper - rewrite chunk system
-+            io.anonymous.anonymous.data.RegionFile region = this.getRegionFile(pos, value == null); // CraftBukkit // Paper - rewrite chunk system // Anonymous - Configurable region file format
-             // Paper start - rewrite chunk system
-             if (region == null) {
-                 // if the RegionFile doesn't exist, no point in deleting from it
-@@ -430,7 +454,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         // Paper start - rewrite chunk system
-         synchronized (this) {
-             final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
-            for (final RegionFile regionFile : this.regionCache.values()) {
-+            for (final io.anonymous.anonymous.data.RegionFile regionFile : this.regionCache.values()) { // Anonymous - Configurable region file format
-                 try {
-                     regionFile.close();
-                 } catch (final IOException ex) {
-@@ -446,7 +470,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
-         // Paper start - rewrite chunk system
-         synchronized (this) {
-             final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
-            for (final RegionFile regionFile : this.regionCache.values()) {
-+            for (final io.anonymous.anonymous.data.RegionFile regionFile : this.regionCache.values()) { // Anonymous - Configurable region file format
-                 try {
-                     regionFile.flush();
-                 } catch (final IOException ex) {
@@ -1,126 +1,136 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Fri, 5 Jun 2026 15:09:29 +0800
+Date: Thu, 1 May 2025 22:43:08 +0800
 Subject: [PATCH] Add config to enable tick command

-only freeze/unfreeze/step/query/rate can run when enabled

 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index ff90abb47203c03636d3175f2b3efcf43517b3b0..a2db29aa47a4b7213d4956f02f6e83122ccfdbd1 100644
+index 6deaeaf95a43e217f65d3e0764b844ff4573d4ca..1cefe9d83788dafc293aeb6d1b5e635211094b2a 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -239,6 +239,11 @@ public final class RegionizedServer {
- 
-     private void globalTick(final long tickCount) {
+@@ -299,6 +299,11 @@ public final class RegionizedServer {
+         this.randomWalk();
+          */
         ++this.tickCount;
 +        // Luminol start - Add a config to enable tick command
-+        if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
-+            MinecraftServer.getServer().tickRateManager().tick();
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
+            MinecraftServer.tickRateManager.tick();
 +        }
 +        // Luminol end - Add a config to enable tick command
         // expire invalid click command callbacks
         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.ADVENTURE_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick
         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick
-@@ -265,6 +270,14 @@ public final class RegionizedServer {
+@@ -324,6 +329,13 @@ public final class RegionizedServer {
             this.globalTick(world, tickCount);
         }
 
-+        // Lophine start - Add a config to enable tick command
-+        if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) {
-+            net.minecraft.server.ServerTickRateManager rateManager = MinecraftServer.getServer().tickRateManager();
-+            rateManager.reduceSprintTicks();
-+            rateManager.endTickWork();
+        // Luminol start - Add a config to enable tick command
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
+            MinecraftServer.tickRateManager.reduceSprintTicks();
+            MinecraftServer.tickRateManager.endTickWork();
 +        }
-+        // Lophine end - Add a config to enable tick command
+        // Luminol end - Add a config to enable tick command
 +
         // tick connections
         this.tickConnections();
 
-@@ -415,7 +428,7 @@ public final class RegionizedServer {
+@@ -457,7 +469,7 @@ public final class RegionizedServer {
     }
 
-     private void tickTime(final ServerLevel world, final long tickCount) {
+     private void tickTime(final ServerLevel world, final int tickCount) {
 -        if (world.tickTime) {
-+        if ((!me.earthme.luminol.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
-             world.serverLevelData.setGameTime(world.serverLevelData.getGameTime() + tickCount);
-         }
-     }
+        if ((!fun.bm.lophine.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
+             if (world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
+                 world.setDayTime(world.levelData.getDayTime() + (long)tickCount);
+             }
 diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..57a35d7a801621fc461e896eb2bba533d9d5bc1b 100644
+index c485d5b3ba95f2a969bdf0dab9654ac284976f8d..b957585cf7cf7f845e20f59c7b355722880f3b4e 100644
 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -40,8 +40,8 @@ public final class TickRegionScheduler {
+@@ -31,8 +31,8 @@ public final class TickRegionScheduler {
         }
     }
 
 -    public static final int TICK_RATE = 20;
 -    public static final long TIME_BETWEEN_TICKS = 1_000_000_000L / TICK_RATE; // ns
-+    public static float TICK_RATE = 20; // Lophine - Add tick command support
-+    public static long TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE); // ns // Lophine - Add tick command support
+    public static float TICK_RATE = 20; // Luminol - Add tick command support
+    public static long TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE); // ns // Luminol - Add tick command support
+ 
     // Folia start - watchdog
     public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
-     static {
-@@ -509,8 +509,24 @@ public final class TickRegionScheduler {
+@@ -394,8 +394,23 @@ public final class TickRegionScheduler {
             final long cpuStart = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
             final long tickStart = System.nanoTime();
 
 -            // use max(), don't assume that tickStart >= scheduledStart
-            final long tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+            // Lophine start - Add a config to enable tick command
-+            final long tickCount;
-+            if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) {
-+                net.minecraft.server.ServerTickRateManager rateManager = MinecraftServer.getServer().tickRateManager();
-+                if (rateManager.isSprinting() && rateManager.checkShouldSprintThisTick()) {
+-            final int tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+            // Luminol start - Add a config to enable tick command
+            final int tickCount;
+            if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
+                if (MinecraftServer.tickRateManager.isSprinting() && MinecraftServer.tickRateManager.checkShouldSprintThisTick()) {
 +                    TICK_RATE = net.minecraft.server.commands.TickCommand.MAX_TICKRATE;
 +                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
 +                    tickCount = 1;
 +                } else {
-+                    TICK_RATE = rateManager.tickrate();
+                    TICK_RATE = MinecraftServer.tickRateManager.tickrate();
 +                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
-+                    tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+                    tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
 +                }
 +            } else {
 +                // use max(), don't assume that tickStart >= scheduledStart
-+                tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+                tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
 +            }
-+            // Lophine end - Add a config to enable tick command
+            // Luminol end - Add tick command support
 
             if (!this.tryMarkTicking()) {
                 if (!this.cancelled.get()) {
-@@ -559,6 +575,11 @@ public final class TickRegionScheduler {
+@@ -435,6 +450,11 @@ public final class TickRegionScheduler {
             try {
                 // next start isn't updated until the end of this tick
                 this.tickRegion(tickCount, tickStart, scheduledEnd);
 +                // Luminol start - Add a config to enable tick command
-+                if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
-+                    MinecraftServer.getServer().tickRateManager().endTickWork();
+                if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
+                    MinecraftServer.tickRateManager.endTickWork();
 +                }
 +                // Luminol end - Add a config to enable tick command
             } catch (final Throwable thr) {
                 this.scheduler.regionFailed(this, false, thr);
                 // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 21f2b9866e1cf36421e10a945fb6fbaa251009ed..aa7931c9b6dc3bba2c8dfecff8df2db302ad905b 100644
+index 2be7e5de57f474a3600ea4990899c1955faa512e..8d332f8e99ceb5a20b3b54bc327b024968719017 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -259,7 +259,11 @@ public class Commands {
+@@ -249,7 +249,11 @@ public class Commands {
         TeleportCommand.register(this.dispatcher);
         TellRawCommand.register(this.dispatcher, context);
         //TestCommand.register(this.dispatcher, context); // Folia - region threading
 -        //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
 +        // Luminol start - Add a config to enable tick command
-+        if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) {
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
 +            TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
 +        }
 +        // Luminol end - Add a config to enable tick command
-         TimeCommand.register(this.dispatcher, context);
+         TimeCommand.register(this.dispatcher);
         TitleCommand.register(this.dispatcher, context);
         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 1fa4110b61e49ee9527b65ecafb96b0dcd2c8ce2..df5ff1cc7b289c3f52723d4e7b418e79ae6c3082 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private String serverId;
+     public MinecraftServer.ReloadableResources resources;
+     private final StructureTemplateManager structureTemplateManager;
+-    private final ServerTickRateManager tickRateManager;
+    public static ServerTickRateManager tickRateManager; // Luminol - Add tick command support
+     protected WorldData worldData;
+     public PotionBrewing potionBrewing;
+     private FuelValues fuelValues;
 diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
-index eeb2f88723b37bb3cada04bf3098dd46f0ed7316..8432d0ce22ddc9c9bfa98901e403697f40e53c99 100644
+index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c60d14fd87 100644
 --- a/net/minecraft/server/ServerTickRateManager.java
 +++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -110,7 +110,7 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -105,7 +105,7 @@ public class ServerTickRateManager extends TickRateManager {
             return false;
         } else if (this.remainingSprintTicks > 0L) {
             this.sprintTickStartTime = System.nanoTime();
@@ -129,56 +139,29 @@ index eeb2f88723b37bb3cada04bf3098dd46f0ed7316..8432d0ce22ddc9c9bfa98901e403697f
             return true;
         } else {
             this.finishTickSprint();
-@@ -118,6 +118,12 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -113,6 +113,12 @@ public class ServerTickRateManager extends TickRateManager {
         }
     }
 
-+    // Lophine start - Add tick command support
+    // Luminol start - Add tick command support
 +    public void reduceSprintTicks() {
 +        this.remainingSprintTicks--;
 +    }
-+    // Lophine end - Add tick command support
+    // Luminol end - Add tick command support
 +
     public void endTickWork() {
         this.sprintTimeSpend = this.sprintTimeSpend + (System.nanoTime() - this.sprintTickStartTime);
     }
 diff --git a/net/minecraft/server/commands/TickCommand.java b/net/minecraft/server/commands/TickCommand.java
-index e8d6a67143f3f0b4813e51bb273498bc404899b9..4421658e4061299dea2ff72a77506214cc9045d8 100644
+index 126685fb266692082b432ed297a499149e921dfb..9d8f6025c420e651611da17e77a362c738228b72 100644
 --- a/net/minecraft/server/commands/TickCommand.java
 +++ b/net/minecraft/server/commands/TickCommand.java
-@@ -15,7 +15,7 @@ import net.minecraft.server.ServerTickRateManager;
+@@ -14,7 +14,7 @@ import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.util.TimeUtil;
 
 public class TickCommand {
 -    private static final float MAX_TICKRATE = 10000.0F;
-+    public static final float MAX_TICKRATE = 10000.0F; // Lophine - Add tick command support
+    public static final float MAX_TICKRATE = 10000.0F; // Luminol - Add tick command support
     private static final String DEFAULT_TICKRATE = String.valueOf(20);
 
-     public static void register(final CommandDispatcher<CommandSourceStack> dispatcher) {
-@@ -23,7 +23,7 @@ public class TickCommand {
-             Commands.literal("tick")
-                 .requires(Commands.hasPermission(Commands.LEVEL_ADMINS))
-                 .then(Commands.literal("query").executes(c -> tickQuery(c.getSource())))
-                .then(
-+                .then( // Lophine - Add tick rate support
-                     Commands.literal("rate")
-                         .then(
-                             Commands.argument("rate", FloatArgumentType.floatArg(1.0F, 10000.0F))
-@@ -41,7 +41,7 @@ public class TickCommand {
-                                 .executes(c -> step(c.getSource(), IntegerArgumentType.getInteger(c, "time")))
-                         )
-                 )
-                .then(
-+/*                .then(
-                     Commands.literal("sprint")
-                         .then(Commands.literal("stop").executes(c -> stopSprinting(c.getSource())))
-                         .then(
-@@ -49,7 +49,7 @@ public class TickCommand {
-                                 .suggests((c, b) -> SharedSuggestionProvider.suggest(new String[]{"60s", "1d", "3d"}, b))
-                                 .executes(c -> sprint(c.getSource(), IntegerArgumentType.getInteger(c, "time")))
-                         )
-                )
-+                )*/
-                 .then(Commands.literal("unfreeze").executes(c -> setFreeze(c.getSource(), false)))
-                 .then(Commands.literal("freeze").executes(c -> setFreeze(c.getSource(), true)))
-         );
+     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:00:48 +0800
-Subject: [PATCH] Do not enable any debug subscriptions
-
-Really this would really crash the server by accident when the operators used F3 + J or toggled the debug synchronizer
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 924d5f3236d9ba9836f39fc844392099df9cd25c..fe34f2e648df9fd1174522baa5913976104b8d04 100644
--- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -3483,7 +3483,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-     }
- 
-     public Set<DebugSubscription<?>> debugSubscriptions() {
-        return !this.server.debugSubscribers().hasRequiredPermissions(this) ? Set.of() : this.requestedDebugSubscriptions;
-+        // return !this.server.debugSubscribers().hasRequiredPermissions(this) ? Set.of() : this.requestedDebugSubscriptions; // Luminol - Do not enable any debug subscriptions
-+        return Set.of(); // Luminol - Do not enable any debug subscriptions
-     }
- 
-     public record RespawnConfig(LevelData.RespawnData respawnData, boolean forced) {
@@ -0,0 +1,177 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 7 Jul 2025 18:19:00 +0800
+Subject: [PATCH] Add config to enable waypoint command & bar
+
+use concurrent method to fix it (now, they are thread safe)
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 8d332f8e99ceb5a20b3b54bc327b024968719017..d4357499cbfd0474dae3c66b4473b81367f284d1 100644
+--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
+@@ -257,7 +257,11 @@ public class Commands {
+         TimeCommand.register(this.dispatcher);
+         TitleCommand.register(this.dispatcher, context);
+         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+-        //WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
+        // Lophine start - unsafe waypoint bar
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) {
+            WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
+        }
+        // Lophine end - unsafe waypoint bar
+         WeatherCommand.register(this.dispatcher);
+         WorldBorderCommand.register(this.dispatcher);
+         if (JvmProfiler.INSTANCE.isAvailable()) {
+diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
+index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..65a4956ba2f0e38da7ae4f8cd7ed6e4b02c015a9 100644
+--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
+++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
+@@ -16,22 +16,31 @@ import net.minecraft.world.waypoints.WaypointManager;
+ import net.minecraft.world.waypoints.WaypointTransmitter;
+ 
+ public class ServerWaypointManager implements WaypointManager<WaypointTransmitter> {
+-    private final Set<WaypointTransmitter> waypoints = new HashSet<>();
+-    private final Set<ServerPlayer> players = new HashSet<>();
+-    private final Table<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = HashBasedTable.create();
+    private final Set<WaypointTransmitter> waypoints = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
+    private final Set<ServerPlayer> players = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
+    private final fun.bm.lophine.utils.concurrent.AbstractConcurrentTable<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = fun.bm.lophine.config.modules.optimizations.WayPointOptimizedTableConfig.optimizedTable ? new fun.bm.lophine.utils.concurrent.OptimizedConcurrentTable<>() : new fun.bm.lophine.utils.concurrent.ConcurrentTable<>(); // Lophine - concurrent
+ 
+     @Override
+     public void trackWaypoint(WaypointTransmitter waypoint) {
+-        // Folia - region threading
+        // Lophine start - unsafe waypoint bar
+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
+        this.waypoints.add(waypoint);
+
+        for (ServerPlayer serverPlayer : this.players) {
+            this.createConnection(serverPlayer, waypoint);
+        }
+        // Lophine end - unsafe waypoint bar
+     }
+ 
+     @Override
+     public void updateWaypoint(WaypointTransmitter waypoint) {
+         if (this.waypoints.contains(waypoint)) {
+-            Map<ServerPlayer, WaypointTransmitter.Connection> map = Tables.transpose(this.connections).row(waypoint);
+-            SetView<ServerPlayer> set = Sets.difference(this.players, map.keySet());
+            java.util.List<Entry<ServerPlayer, WaypointTransmitter.Connection>> map = this.connections.getXZ(waypoint); // Lophine - concurrent
+            Set<ServerPlayer> players1 = new HashSet<>(); // Lophine - concurrent
+            if (!map.isEmpty()) map.forEach((entry) -> players1.add(entry.getKey())); // Lophine - concurrent
+            SetView<ServerPlayer> set = Sets.difference(this.players, players1); // Lophine - concurrent
+ 
+-            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : ImmutableSet.copyOf(map.entrySet())) {
+            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
+                 this.updateConnection(entry.getKey(), waypoint, entry.getValue());
+             }
+ 
+@@ -43,26 +52,65 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+ 
+     @Override
+     public void untrackWaypoint(WaypointTransmitter waypoint) {
+-        this.connections.column(waypoint).forEach((serverPlayer, connection) -> connection.disconnect());
+-        Tables.transpose(this.connections).row(waypoint).clear();
+        this.connections.getXZ(waypoint).forEach((entry) -> {
+            entry.getValue().disconnect();
+            this.connections.remove(entry.getKey(), waypoint, entry.getValue());
+        }); // Lophine - concurrent
+         this.waypoints.remove(waypoint);
+     }
+ 
+     public void addPlayer(ServerPlayer player) {
+         // Folia - region threading
+        // Lophine start - unsafe waypoint bar
+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
+        this.players.add(player);
+
+        for (WaypointTransmitter waypointTransmitter : this.waypoints) {
+            this.createConnection(player, waypointTransmitter);
+        }
+
+        if (player.isTransmittingWaypoint()) {
+            this.trackWaypoint((WaypointTransmitter)player);
+        }
+        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void updatePlayer(ServerPlayer player) {
+         // Folia - region threading
+        // Lophine start - unsafe waypoint bar
+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
+        java.util.List<Entry<WaypointTransmitter, WaypointTransmitter.Connection>> map = this.connections.getYZ(player); // Lophine - concurrent
+        Set<WaypointTransmitter> waypoints1 = new HashSet<>();// Lophine - concurrent
+        if (!map.isEmpty()) map.forEach((entry) -> waypoints1.add(entry.getKey()));// Lophine - concurrent
+        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, waypoints1); // Lophine - concurrent
+
+        for (Entry<WaypointTransmitter, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
+            this.updateConnection(player, entry.getKey(), entry.getValue());
+        }
+
+        for (WaypointTransmitter waypointTransmitter : set) {
+            this.createConnection(player, waypointTransmitter);
+        }
+        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void removePlayer(ServerPlayer player) {
+         // Folia - region threading
+        // Lophine start - unsafe waypoint bar
+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
+        this.connections.getYZ(player).forEach((entry) -> {
+            entry.getValue().disconnect();
+            this.connections.remove(player, entry.getKey(), entry.getValue());
+        }); // Lophine - concurrent
+        this.untrackWaypoint((WaypointTransmitter)player);
+        this.players.remove(player);
+        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void breakAllConnections() {
+-        this.connections.values().forEach(WaypointTransmitter.Connection::disconnect);
+-        this.connections.clear();
+        java.util.List<WaypointTransmitter.Connection> map = this.connections.getAllZ(); // Lophine - concurrent
+        if (!map.isEmpty()) map.forEach(WaypointTransmitter.Connection::disconnect); // Lophine - concurrent
+        this.connections.clearAll(); // Lophine - concurrent
+     }
+ 
+     public void remakeConnections(WaypointTransmitter waypoint) {
+@@ -83,13 +131,19 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+         if (player != waypoint) {
+             if (isLocatorBarEnabledFor(player)) {
+                 waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection -> {
+-                    this.connections.put(player, waypoint, connection);
+                    this.connections.putOrUpdate(player, waypoint, connection);
+                     connection.connect();
+                 }, () -> {
+-                    WaypointTransmitter.Connection connection = this.connections.remove(player, waypoint);
+-                    if (connection != null) {
+-                        connection.disconnect();
+-                    }
+                    // Lophine start - concurrent
+                    java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint);
+                    if (c.isEmpty()) return; // Lophine - concurrent
+                    c.forEach((connection) -> {
+                        this.connections.remove(player, waypoint, connection);
+                        if (connection != null) {
+                            connection.disconnect();
+                        }
+                    });
+                    // Lophine end - concurrent
+                 });
+             }
+         }
+@@ -103,10 +157,12 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+                 } else {
+                     waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection1 -> {
+                         connection1.connect();
+-                        this.connections.put(player, waypoint, connection1);
+                        this.connections.putOrUpdate(player, waypoint, connection1);
+                     }, () -> {
+                         connection.disconnect();
+-                        this.connections.remove(player, waypoint);
+                        java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint); // Lophine - concurrent
+                        if (c.isEmpty()) return; // Lophine - concurrent
+                        c.forEach((connection1) -> this.connections.remove(player, waypoint, connection1)); // Lophine - concurrent
+                     });
+                 }
+             }
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:25:45 +0800
-Subject: [PATCH] Do not load too far poi chunk in poi compete scan
-
-Beeeeeeeeeeeeeeee
-
-diff --git a/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java b/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java
-index 53131c1b8d5562f9a1b45dfab4fdbdd37b655139..0e9c19a820aefa802d6df134b21f5128a5e8d656 100644
--- a/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java
-+++ b/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java
-@@ -24,8 +24,18 @@ public class PoiCompetitorScan {
-                             return true;
-                         }
-                         // Folia end - region threading
-                        level.getPoiManager()
-                            .getType(pos.pos())
-+                        // Luminol start - POI fixes
-+                        var blockPosOfJobSite = pos.pos();
-+                        var sectionPosOfJobSite = net.minecraft.core.SectionPos.asLong(blockPosOfJobSite);
-+                        var poiManager = level.getPoiManager();
-+                        // we don't care if we should clear the memory of JOB_SITE
-+                        // as it will be automatically removed in SetWalkTargetFromBlockMemory
-+                        // so simply break down if it's not loaded
-+                        var poiChunk = me.earthme.luminol.config.modules.fixes.POIRangeFixes.doNotCompetePOIIfUnloaded ? poiManager.get(sectionPosOfJobSite) : poiManager.getOrLoad(sectionPosOfJobSite);
-+                        poiChunk.flatMap(poiSection -> poiSection.getType(blockPosOfJobSite))
-+                        // Luminol end - POI fixes
-+                        /*level.getPoiManager() // Luminol - POI fixes
-+                            .getType(pos.pos())*/ // Luminol - POI fixes
-                             .ifPresent(
-                                 // Paper start - Improve performance of PoiCompetitorScan by unrolling stream
-                                 // The previous logic used Stream#reduce to simulate a form of single-iteration bubble sort
@@ -0,0 +1,94 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 2 Jul 2025 23:36:25 +0800
+Subject: [PATCH] Fix datapack command save function
+
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index df5ff1cc7b289c3f52723d4e7b418e79ae6c3082..8f74af03cf0af0960b1016c8304ca0e440969215 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -2358,6 +2358,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return this.reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
+     }
+ 
+    // Lophine start - region thread skip reload // TODO - add reload support
+    public void saveDatapacks(Collection<String> selectedIds) {
+        this.packRepository.setSelected(selectedIds, false); // Paper - add pendingReload flag to determine required pack loading - false as this is *after* a reload (see above)
+        WorldDataConfiguration worldDataConfiguration = new WorldDataConfiguration(
+                getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures()
+        );
+        this.worldData.setDataConfiguration(worldDataConfiguration);
+    }
+    // Lophine end - region thread skip reload // TODO - add reload support
+
+     public CompletableFuture<Void> reloadResources(Collection<String> selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
+         // Paper end - Add ServerResourcesReloadedEvent
+         CompletableFuture<Void> completableFuture = CompletableFuture.<ImmutableList>supplyAsync(
+diff --git a/net/minecraft/server/commands/DataPackCommand.java b/net/minecraft/server/commands/DataPackCommand.java
+index a5032b34752061d61fd9ddb4db828d35e403f5e7..3eaa9c85d06f6ecc8ed639d8befa861439390eb7 100644
+--- a/net/minecraft/server/commands/DataPackCommand.java
+++ b/net/minecraft/server/commands/DataPackCommand.java
+@@ -98,7 +98,7 @@ public class DataPackCommand {
+         dispatcher.register(
+             Commands.literal("datapack")
+                 .requires(Commands.hasPermission(2))
+-                /*.then( // Luminol - Add back read-only datapack command
+                .then(
+                     Commands.literal("enable")
+                         .then(
+                             Commands.argument("name", StringArgumentType.string())
+@@ -160,11 +160,11 @@ public class DataPackCommand {
+                                 .suggests(SELECTED_PACKS)
+                                 .executes(commandContext -> disablePack(commandContext.getSource(), getPack(commandContext, "name", false)))
+                         )
+-                )*/ // Luminol - Add back read-only datapack command
+                )
+                 .then(
+                     Commands.literal("list")
+                         .executes(commandContext -> listPacks(commandContext.getSource()))
+-                        // .then(Commands.literal("available").executes(commandContext -> listAvailablePacks(commandContext.getSource()))) // Luminol - Add back read-only datapack command
+                        .then(Commands.literal("available").executes(commandContext -> listAvailablePacks(commandContext.getSource())))
+                         .then(Commands.literal("enabled").executes(commandContext -> listEnabledPacks(commandContext.getSource())))
+                 )
+                 .then(
+@@ -252,7 +252,7 @@ public class DataPackCommand {
+     }
+ 
+     private static int listPacks(CommandSourceStack source) {
+-        return listEnabledPacks(source) ;// + listAvailablePacks(source); // Luminol - Add back read-only datapack command
+        return listEnabledPacks(source) + listAvailablePacks(source);
+     }
+ 
+     private static int listAvailablePacks(CommandSourceStack source) {
+@@ -280,7 +280,7 @@ public class DataPackCommand {
+ 
+     private static int listEnabledPacks(CommandSourceStack source) {
+         PackRepository packRepository = source.getServer().getPackRepository();
+-        // packRepository.reload(); // Luminol - Add back read-only datapack command
+        packRepository.reload();
+         Collection<? extends Pack> selectedPacks = packRepository.getSelectedPacks();
+         if (selectedPacks.isEmpty()) {
+             source.sendSuccess(() -> Component.translatable("commands.datapack.list.enabled.none"), false);
+diff --git a/net/minecraft/server/commands/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java
+index b540a3c3a02f7242578a63477e34b9063e86f1d2..bc999de32931558d0d8dc26264653dd63c1cad19 100644
+--- a/net/minecraft/server/commands/ReloadCommand.java
+++ b/net/minecraft/server/commands/ReloadCommand.java
+@@ -16,11 +16,17 @@ public class ReloadCommand {
+     private static final Logger LOGGER = LogUtils.getLogger();
+ 
+     public static void reloadPacks(Collection<String> selectedIds, CommandSourceStack source) {
+        // Lophine start - region thread skip reload // TODO - add reload support
+        source.getServer().saveDatapacks(selectedIds);
+        source.getSender().sendMessage("You need to restart server to load datapacks update.");
+        if (false) {
+         source.getServer().reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally(throwable -> { // Paper - Add ServerResourcesReloadedEvent
+             LOGGER.warn("Failed to execute reload", throwable);
+             source.sendFailure(Component.translatable("commands.reload.failure"));
+             return null;
+         });
+        }
+        // Lophine end - region thread skip reload // TODO - add reload support
+     }
+ 
+     private static Collection<String> discoverNewPacks(PackRepository packRepository, WorldData worldData, Collection<String> selectedIds) {
@@ -1,287 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 19:02:01 +0800
-Subject: [PATCH] Fixes around entity brain and memories
-
-
-diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 3b1c3e84ab24b6e3a0e4d129b3617b393b6d6651..9c8e8de53cbbd87ac7cb8483bd3c1af3fcf66b6e 100644
--- a/net/minecraft/world/entity/Mob.java
-+++ b/net/minecraft/world/entity/Mob.java
-@@ -299,6 +299,11 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
-         if (Objects.equals(currentTarget, target)) {
-             return false;
-         }
-+        // Luminol start - Fix off-region targeting
-+        if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(target)) {
-+            return false;
-+        }
-+        // Luminol end
-         LivingEntity originalTarget = target;
-         target = asValidTarget(target);
-         if (reason != null) {
-diff --git a/net/minecraft/world/entity/ai/Brain.java b/net/minecraft/world/entity/ai/Brain.java
-index e097bc1268b4050e3948413c52dea69950858458..27894e2935e2afee8190708def4be3b00f922f64 100644
--- a/net/minecraft/world/entity/ai/Brain.java
-+++ b/net/minecraft/world/entity/ai/Brain.java
-@@ -383,7 +383,7 @@ public class Brain<E extends LivingEntity> {
-     }
- 
-     public void tick(final ServerLevel level, final E body) {
-        this.forgetOutdatedMemories();
-+        this.forgetOutdatedMemories(body); // Luminol - Add config to force clean entity memory that don't belong to current tick region
-         this.tickSensors(level, body);
-         this.startEachNonRunningBehavior(level, body);
-         this.tickEachRunningBehavior(level, body);
-@@ -395,8 +395,8 @@ public class Brain<E extends LivingEntity> {
-         }
-     }
- 
-    private void forgetOutdatedMemories() {
-        this.memories.values().forEach(MemorySlot::tick);
-+    private void forgetOutdatedMemories(E body) { // Luminol - Add config to force clean entity memory that don't belong to current tick region
-+        this.memories.values().forEach(slot -> slot.tick(body)); // Luminol - Add config to force clean entity memory that don't belong to current tick region
-     }
- 
-     public void stopAll(final ServerLevel level, final E body) {
-diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index f744ecd20dc70786311a7162b52aa4ceca0717db..aa60fbfbe7283f1ed9cf5343d59d1222380857dd 100644
--- a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-+++ b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -81,6 +81,11 @@ public class BehaviorUtils {
-     public static void setWalkAndLookTargetMemories(
-         final LivingEntity walker, final PositionTracker target, final float speedModifier, final int closeEnoughDistance
-     ) {
-+        // Luminol - Do not set walk target if target position is out of current tick region
-+        if (!target.checkThread(walker.level())) {
-+            return;
-+        }
-+        // Luminol end
-         WalkTarget walkTarget = new WalkTarget(target, speedModifier, closeEnoughDistance);
-         walker.getBrain().setMemory(MemoryModuleType.LOOK_TARGET, target);
-         walker.getBrain().setMemory(MemoryModuleType.WALK_TARGET, walkTarget);
-diff --git a/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java b/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java
-index 68251875edfa47ac34c64f99510998ad4bbb14b4..d83b353395bad7c6c41dfaa24018fd207904d995 100644
--- a/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java
-+++ b/net/minecraft/world/entity/ai/behavior/BlockPosTracker.java
-@@ -37,4 +37,11 @@ public class BlockPosTracker implements PositionTracker {
-     public String toString() {
-         return "BlockPosTracker{blockPos=" + this.blockPos + ", centerPosition=" + this.centerPosition + "}";
-     }
-+
-+    // Luminol start - Fix a series issue around entity memory typed GlobalPos and WalkTarget
-+    @Override
-+    public boolean checkThread(net.minecraft.world.level.Level currOwnedByLevel) {
-+        return ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(currOwnedByLevel, this.blockPos);
-+    }
-+    // Luminol end
- }
-diff --git a/net/minecraft/world/entity/ai/behavior/EntityTracker.java b/net/minecraft/world/entity/ai/behavior/EntityTracker.java
-index 3ac52b025ac3e1a3f9135b8e593a385a847afe0f..29c13f18cff52e9950e8932c75cb12fb02f952cb 100644
--- a/net/minecraft/world/entity/ai/behavior/EntityTracker.java
-+++ b/net/minecraft/world/entity/ai/behavior/EntityTracker.java
-@@ -55,4 +55,11 @@ public class EntityTracker implements PositionTracker {
-     public String toString() {
-         return "EntityTracker for " + this.entity;
-     }
-+
-+    // Luminol start - Fix a series issue around entity memory typed GlobalPos and WalkTarget
-+    @Override
-+    public boolean checkThread(net.minecraft.world.level.Level currOwnedByLevel) {
-+        return ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.entity);
-+    }
-+    // Luminol end
- }
-diff --git a/net/minecraft/world/entity/ai/behavior/PositionTracker.java b/net/minecraft/world/entity/ai/behavior/PositionTracker.java
-index ce6cf5ecfb190428e3ef9b7dd39c98e3d27a7b9d..3334da2236fbe90cbdc3e67884f9c6ed80ac0f56 100644
--- a/net/minecraft/world/entity/ai/behavior/PositionTracker.java
-+++ b/net/minecraft/world/entity/ai/behavior/PositionTracker.java
-@@ -10,4 +10,7 @@ public interface PositionTracker {
-     BlockPos currentBlockPosition();
- 
-     boolean isVisibleBy(final LivingEntity body);
-+
-+
-+    boolean checkThread(net.minecraft.world.level.Level currOwnedByLevel); // Luminol - Fix a series issue around entity memory typed GlobalPos and WalkTarget
- }
-diff --git a/net/minecraft/world/entity/ai/behavior/SleepInBed.java b/net/minecraft/world/entity/ai/behavior/SleepInBed.java
-index 16017d819c28b077f732e2ef571eac179d24e323..7a598aa1a0963fda3302946a30d0330c341da74f 100644
--- a/net/minecraft/world/entity/ai/behavior/SleepInBed.java
-+++ b/net/minecraft/world/entity/ai/behavior/SleepInBed.java
-@@ -57,6 +57,11 @@ public class SleepInBed extends Behavior<LivingEntity> {
-             }
-         }
- 
-+        // Luminol Start - Prevent off-tick-region chunk operations
-+        if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, target.pos())) {
-+            return false;
-+        }
-+        // Luminol End
-         BlockState blockState = level.getBlockStateIfLoaded(target.pos()); // Paper - Prevent sync chunk loads when villagers try to find beds
-         if (blockState == null) return false; // Paper - Prevent sync chunk loads when villagers try to find beds
-         return target.pos().closerToCenterThan(body.position(), 2.0) && blockState.is(BlockTags.BEDS) && !blockState.getValue(BedBlock.OCCUPIED);
-diff --git a/net/minecraft/world/entity/ai/memory/MemorySlot.java b/net/minecraft/world/entity/ai/memory/MemorySlot.java
-index 88a89b4c72cc99dc89d3f3cc928b2dfda4125759..3b51a44ab700740047c9e725547ceec65c0c80b1 100644
--- a/net/minecraft/world/entity/ai/memory/MemorySlot.java
-+++ b/net/minecraft/world/entity/ai/memory/MemorySlot.java
-@@ -13,7 +13,7 @@ public class MemorySlot<T> {
-         this.timeToLive = timeToLive;
-     }
- 
-    public void tick() {
-+    public void tick(net.minecraft.world.entity.Entity owner) { // Luminol - Add config to force clean entity memory that don't belong to current tick region
-         if (this.hasValue() && this.canExpire()) {
-             if (this.hasExpired()) {
-                 this.clear();
-@@ -21,6 +21,41 @@ public class MemorySlot<T> {
-                 this.timeToLive--;
-             }
-         }
-+        // Luminol start - Add config to force clean entity memory that don't belong to current tick region
-+        final net.minecraft.world.level.Level ownerLevel = owner.level();
-+
-+        // type: entity
-+        if (me.earthme.luminol.config.modules.fixes.ForceCleanupEntityBrainMemoryConfig.enabledForEntity && this.value instanceof net.minecraft.world.entity.Entity entity) {
-+            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
-+                this.clear();
-+            }
-+        }
-+
-+        // type: block_pos
-+        if (me.earthme.luminol.config.modules.fixes.ForceCleanupEntityBrainMemoryConfig.enabledForBlockPos && this.value instanceof net.minecraft.core.BlockPos blockPos) {
-+            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(ownerLevel, blockPos)) {
-+                this.clear();
-+            }
-+        }
-+
-+
-+        //type: position_tracker and walk_target
-+        if (me.earthme.luminol.config.modules.fixes.ForceCleanupEntityBrainMemoryConfig.enabledForPositionTracker) {
-+            net.minecraft.world.entity.ai.behavior.PositionTracker tracker = null;
-+
-+            if (value instanceof net.minecraft.world.entity.ai.behavior.PositionTracker positionTracker) {
-+                tracker = positionTracker;
-+            }
-+
-+            if (value instanceof net.minecraft.world.entity.ai.memory.WalkTarget walkTarget) {
-+                tracker = walkTarget.getTarget();
-+            }
-+
-+            if (tracker != null && !tracker.checkThread(owner.level())) {
-+                this.clear();
-+            }
-+        }
-+        // Luminol end
-     }
- 
-     public static <T> MemorySlot<T> create() {
-diff --git a/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-index e44814cfb6afb594456b8215bd13a92e93de2c85..c18e2071c699d9c5f4d46b7a58191df4f4d8ab5d 100644
--- a/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-@@ -60,6 +60,17 @@ public class FlyingPathNavigation extends PathNavigation {
- 
-             if (!this.isDone()) {
-                 Vec3 target = this.path.getNextEntityPos(this.mob);
-+                // Luminol - Recompute path when path finding out of current tick region
-+                if (me.earthme.luminol.config.modules.fixes.PathfindingFixesConfig.breakDownPathfindingWhenOutOfRegion) {
-+                    // we assume that:
-+                    // 1. The code above doesn't touch the 'main thread context' with the position from 'this.path'
-+                    // 2. The pathfinder could correctly recompute or discard the incorrect target position and this situation is happening rarely
-+                    if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.mob.level(), target)) {
-+                        this.hasDelayedRecomputation = true;
-+                        return;
-+                    }
-+                }
-+                // Luminol end
-                 this.mob.getMoveControl().setWantedPosition(target.x, target.y, target.z, this.speedModifier);
-             }
-         }
-diff --git a/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index 2ea1ec39a37899ae1510d0036aa670e758077537..4c727e4f224f6a31a4cd9d024bdcfaf0fa1bc0e5 100644
--- a/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -188,6 +188,18 @@ public abstract class PathNavigation {
-             }
-         }
-         // Paper end - EntityPathfindEvent
-+        // Luminol start - Do not path find for targets out of current region
-+        if (me.earthme.luminol.config.modules.fixes.PathfindingFixesConfig.doNotPathfindToNotOwnedTargets) {
-+            // filter the targets not owned by current region
-+            targets = new java.util.HashSet<>(targets); // well no idea about how to determine if this should be copied to a modifiable one
-+            targets.removeIf(pos -> !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.mob.level(), pos));
-+
-+            // return if no available (observe the logic in the first if block)
-+            if (targets.isEmpty()) {
-+                return null;
-+            }
-+        }
-+        // Luminol end
-         ProfilerFiller profiler = Profiler.get();
-         profiler.push("pathfind");
-         BlockPos fromPos = above ? this.mob.blockPosition().above() : this.mob.blockPosition();
-@@ -286,6 +298,17 @@ public abstract class PathNavigation {
- 
-             if (!this.isDone()) {
-                 Vec3 target = this.path.getNextEntityPos(this.mob);
-+                // Luminol - Recompute path when path finding out of current tick region
-+                if (me.earthme.luminol.config.modules.fixes.PathfindingFixesConfig.breakDownPathfindingWhenOutOfRegion) {
-+                    // we assume that:
-+                    // 1. The code above doesn't touch the 'main thread context' with the position from 'this.path'
-+                    // 2. The pathfinder could correctly recompute or discard the incorrect target position and this situation is happening rarely
-+                    if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.mob.level(), target)) {
-+                        this.hasDelayedRecomputation = true;
-+                        return;
-+                    }
-+                }
-+                // Luminol end
-                 this.mob.getMoveControl().setWantedPosition(target.x, this.getGroundY(target), target.z, this.speedModifier);
-             }
-         }
-diff --git a/net/minecraft/world/entity/animal/allay/AllayAi.java b/net/minecraft/world/entity/animal/allay/AllayAi.java
-index c3667e7997551e0f5ce63bc6ee890082d1431400..2e2458535a8ec542d6371ceba2fff1260773c7f5 100644
--- a/net/minecraft/world/entity/animal/allay/AllayAi.java
-+++ b/net/minecraft/world/entity/animal/allay/AllayAi.java
-@@ -112,6 +112,17 @@ public class AllayAi {
-         Optional<GlobalPos> likedNoteblockPos = brain.getMemory(MemoryModuleType.LIKED_NOTEBLOCK_POSITION);
-         if (likedNoteblockPos.isPresent()) {
-             GlobalPos position = likedNoteblockPos.get();
-+            // Luminol start - Do not like item if they were out of current tickregion
-+            final Level targetLevel = allay.level().getServer().getLevel(position.dimension());
-+            final BlockPos targetPos = position.pos();
-+
-+            // thread checks
-+            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, targetPos)) {
-+                brain.eraseMemory(MemoryModuleType.LIKED_NOTEBLOCK_POSITION); // The memory value is not being belong to current tick region anymore
-+                return Optional.empty();
-+            }
-+            // Luminol end
-+
-             if (shouldDepositItemsAtLikedNoteblock(allay, brain, position)) {
-                 return Optional.of(new BlockPosTracker(position.pos().above()));
-             }
-diff --git a/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index d5394ae7ce56555ad21aeafb2d78c291c62e2988..a2873d8bbfa3e04678bc31637222b3a10cd6fedd 100644
--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -279,8 +279,18 @@ public class Sniffer extends Animal {
- 
-     private boolean canDig(final BlockPos position) {
-         return this.level().getBlockState(position).is(BlockTags.SNIFFER_DIGGABLE_BLOCK)
-            && this.getExploredPositions().noneMatch(explored -> GlobalPos.of(this.level().dimension(), position).equals(explored))
-            && Optional.ofNullable(this.getNavigation().createPath(position, 1)).map(Path::canReach).orElse(false);
-+            && this.getExploredPositions().noneMatch(explored -> { // Luminol start - Do not pathfind out of tickregion
-+            // thread checks
-+            final Level targetLevel = net.minecraft.server.MinecraftServer.getServer().getLevel(explored.dimension());
-+            final BlockPos targetPos = explored.pos();
-+
-+            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, targetPos)) {
-+                return false;
-+            }
-+
-+            return GlobalPos.of(this.level().dimension(), position).equals(explored); // Original logic
-+        }) // Luminol end
-+        && Optional.ofNullable(this.getNavigation().createPath(position, 1)).map(Path::canReach).orElse(false); // Luminol - Do not pathfind out of tickregion - diff on change
-     }
- 
-     private void dropSeed() {
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:16:45 +0800
-Subject: [PATCH] Fix off region leashing
-
-PS: My friend reported me this bug and I still need to check the details of how the bug was caused
-
-XD
-
-diff --git a/net/minecraft/world/entity/Leashable.java b/net/minecraft/world/entity/Leashable.java
-index 98034a4c96bf2972316078d3b3a49140921aab50..284ba0c3742d5d5ab0b344a84a9c8e2c2a98a74a 100644
--- a/net/minecraft/world/entity/Leashable.java
-+++ b/net/minecraft/world/entity/Leashable.java
-@@ -95,10 +95,24 @@ public interface Leashable {
-             if (leashUuid.isPresent()) {
-                 Entity leasher = serverLevel.getEntity(leashUuid.get());
-                 if (leasher != null) {
-+                    // Luminol start - Fix off region leashing
-+                    if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(leasher)) {
-+                        entity.spawnAtLocation(serverLevel, Items.LEAD);
-+                        entity.setLeashData(null);
-+                        return;
-+                    }
-+                    // Luminol end
-                     setLeashedTo(entity, leasher, true);
-                     return;
-                 }
-             } else if (pos.isPresent()) {
-+                // Luminol start - Fix off region leashing
-+                if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(serverLevel, pos.get())) {
-+                    entity.spawnAtLocation(serverLevel, Items.LEAD);
-+                    entity.setLeashData(null);
-+                    return;
-+                }
-+                // Luminol end
-                 setLeashedTo(entity, LeashFenceKnotEntity.getOrCreateKnot(serverLevel, pos.get()), true);
-                 return;
-             }
@@ -0,0 +1,159 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 3 Aug 2025 15:24:01 +0800
+Subject: [PATCH] Leaves: Base Protocol Core
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc14e2e0225009cf9919072f7f/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
+index 1cefe9d83788dafc293aeb6d1b5e635211094b2a..e423d5c0614823ce9a8fbd32b672232e5758e3c1 100644
+--- a/io/papermc/paper/threadedregions/RegionizedServer.java
+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -336,6 +336,8 @@ public final class RegionizedServer {
+         }
+         // Luminol end - Add a config to enable tick command
+ 
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
+
+         // tick connections
+         this.tickConnections();
+ 
+diff --git a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f934939d563 100644
+--- a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+++ b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+@@ -40,13 +40,22 @@ public interface CustomPacketPayload {
+ 
+             @Override
+             public void encode(B buffer, CustomPacketPayload value) {
+                // Leaves start - protocol core
+                if (value instanceof org.leavesmc.leaves.protocol.core.LeavesCustomPayload payload) {
+                    org.leavesmc.leaves.protocol.core.LeavesProtocolManager.encode(buffer, payload);
+                    return;
+                }
+                // Leaves end - protocol core
+                 this.writeCap(buffer, value.type(), value);
+             }
+ 
+             @Override
+             public CustomPacketPayload decode(B buffer) {
+                 ResourceLocation resourceLocation = buffer.readResourceLocation();
+-                return (CustomPacketPayload)this.findCodec(resourceLocation).decode(buffer);
+                // Leaves start - protocol core
+                var payload = org.leavesmc.leaves.protocol.core.LeavesProtocolManager.decode(resourceLocation, buffer);
+                return java.util.Objects.requireNonNullElseGet(payload, () -> this.findCodec(resourceLocation).decode(buffer));
+                // Leaves end - protocol core
+             }
+         };
+     }
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index 8150b16c196edcb226be9268ea6e0012e44517fa..c54bf0429c0ca3a35a730658c7b1b3ddc776bf9e 100644
+--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+@@ -57,6 +57,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     public @Nullable String playerBrand;
+     public final java.util.Set<String> pluginMessagerChannels;
+     // Paper end - retain certain values
+    public final GameProfile profile; // Leaves - protocol core
+ 
+     public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) {
+         this.server = server;
+@@ -70,6 +71,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+         this.pluginMessagerChannels = cookie.channels();
+         this.keepAlive = cookie.keepAlive();
+         // Paper end
+        this.profile = cookie.gameProfile(); // Leaves - protocol core
+     }
+ 
+     // Paper start - configuration phase API
+@@ -160,6 +162,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ 
+     @Override
+     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
+        // Leaves start - protocol
+        if (packet.payload() instanceof org.leavesmc.leaves.protocol.core.LeavesCustomPayload leavesPayload) {
+            org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePayload(org.leavesmc.leaves.protocol.core.ProtocolUtils.createSelector(this), leavesPayload);
+            return;
+        }
+        if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.DiscardedPayload(net.minecraft.resources.ResourceLocation id, byte[] data)) {
+            if (org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleBytebuf(org.leavesmc.leaves.protocol.core.ProtocolUtils.createSelector(this), id, io.netty.buffer.Unpooled.wrappedBuffer(data))) {
+                return;
+            }
+        }
+        // Leaves end - protocol
+
+         // Paper start
+         if (!(packet.payload() instanceof final net.minecraft.network.protocol.common.custom.DiscardedPayload discardedPayload)) {
+             return;
+@@ -219,10 +233,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+         final String channel = new String(data, from, length, java.nio.charset.StandardCharsets.US_ASCII);
+         if (register) {
+             bridge.addChannel(channel);
+            org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleMinecraftRegister(channel, org.leavesmc.leaves.protocol.core.ProtocolUtils.createSelector(this)); // Leaves - protocol
+         } else {
+             bridge.removeChannel(channel);
+         }
+-    // Paper end
+        // Paper end
+     }
+ 
+     @Override
+@@ -385,9 +400,9 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+             net.minecraft.server.level.ServerPlayer player = serverGamePacketListener.player;
+             org.bukkit.event.player.PlayerKickEvent.Cause cause = disconnectionDetails.disconnectionReason().orElseThrow().game().orElse(org.bukkit.event.player.PlayerKickEvent.Cause.UNKNOWN);
+             org.bukkit.event.player.PlayerKickEvent event = new org.bukkit.event.player.PlayerKickEvent(
+-                    player.getBukkitEntity(),
+-                    io.papermc.paper.adventure.PaperAdventure.asAdventure(disconnectionDetails.reason()),
+-                    rawLeaveMessage, cause
+                player.getBukkitEntity(),
+                io.papermc.paper.adventure.PaperAdventure.asAdventure(disconnectionDetails.reason()),
+                rawLeaveMessage, cause
+ 
+             );
+ 
+@@ -420,10 +435,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ 
+     private void disconnect0(DisconnectionDetails disconnectionDetails) {
+         this.connection
+-                .send(
+-                        new ClientboundDisconnectPacket(disconnectionDetails.reason()),
+-                        PacketSendListener.thenRun(() -> this.connection.disconnect(disconnectionDetails))
+-                );
+            .send(
+                new ClientboundDisconnectPacket(disconnectionDetails.reason()),
+                PacketSendListener.thenRun(() -> this.connection.disconnect(disconnectionDetails))
+            );
+         this.onDisconnect(disconnectionDetails);
+         this.connection.setReadOnly();
+         // CraftBukkit - Don't wait
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 4ef2816210f06082f2209c51d04aad6bb188232b..593dbcda4b497291eb1ecdc64b947a8d279f8be6 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -423,6 +423,8 @@ public abstract class PlayerList {
+                 //return; // Folia - region threading - must still allow the player to connect, as we must add to chunk map before handling disconnect
+             }
+ 
+            org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player);
+
+             final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+ 
+             if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -605,6 +607,7 @@ public abstract class PlayerList {
+         return this.remove(player, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? player.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(player.getDisplayName())));
+     }
+     public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerLeave(player); // Leaves - protocol
+         // Paper end - Fix kick event leave message not being sent
+         ServerLevel serverLevel = player.level();
+         player.awardStat(Stats.LEAVE_GAME);
+@@ -1520,6 +1523,7 @@ public abstract class PlayerList {
+             serverPlayer.connection.send(clientboundUpdateRecipesPacket);
+             serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
+         }
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleDataPackReload(); // Leaves - protocol core
+     }
+ 
+     public boolean isAllowCommandsForAllPlayers() {
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:21:30 +0800
-Subject: [PATCH] Fix unpatched task returning of
- ServerConfigurationPacketListenerImpl#disconnectAsync
-
-Inspired by https://github.com/CraftCanvasMC/Canvas/blob/ver/1.21.8/canvas-server/minecraft-patches/sources/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java.patch
-but Canvas loses its main thread checks so fixed that btw
-
-diff --git a/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index 40b4eeb561a91264b9ab6ddc49cb8a93daae84a4..97f4c546663fb19558246366a3d8d77f2b9327ef 100644
--- a/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -290,13 +290,14 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
-     // Paper start
-     @Override
-     public void disconnectAsync(final net.minecraft.network.DisconnectionDetails disconnectionInfo) {
-        if (this.cserver.isPrimaryThread()) {
-+        if (io.papermc.paper.threadedregions.RegionizedServer.isGlobalTickThread()) { // Luminol - Fix unpatched task returning of ServerConfigurationPacketListenerImpl#disconnectAsync
-             this.disconnect(disconnectionInfo);
-             return;
-         }
- 
-         this.connection.setReadOnly();
-        this.server.scheduleOnMain(() -> {
-+        // this.server.scheduleOnMain(() -> { // Luminol - Fix unpatched task returning of ServerConfigurationPacketListenerImpl#disconnectAsync
-+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> { // Luminol - Fix unpatched task returning of ServerConfigurationPacketListenerImpl#disconnectAsync
-             this.disconnect(disconnectionInfo); // Currently you cannot cancel disconnect during the config stage
-         });
-     }
@@ -4,14 +4,14 @@ Date: Wed, 29 Oct 2025 00:09:09 +0800
 Subject: [PATCH] Leaves: Configurable trading with the void

 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
-As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/9d2bd3f7b0a48f00df7bc8c74292338ed9c3a458/leaves-server/minecraft-patches/features/0088-Configurable-trading-with-the-void.patch)
+As a part of : Leaves (https://github.com/LeavesMC/Leaves)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 3fda5043937af3d66ab44c41b7e76822a3ddf53b..7e362b71c629c75475016973a0181fce75a5156a 100644
+index 7584ba257d61bf650d83a2316ff012df928d54f3..4d71cc3b643f6f594c90f2f8f9e5b820ebdff080 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -3136,7 +3136,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
+@@ -2901,7 +2901,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             // 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 - Fix merchant inventory not closing on entity removal
@@ -21,26 +21,26 @@ index 3fda5043937af3d66ab44c41b7e76822a3ddf53b..7e362b71c629c75475016973a0181fce
                 }
                 // Paper end - Fix merchant inventory not closing on entity removal
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 5bfc986f3d8dc81444be857c857bd91ada8c409d..ebcd7ce794ca696b44ab75dbb177beb5f929adf0 100644
+index 593dbcda4b497291eb1ecdc64b947a8d279f8be6..6c1f4f943a5be5f2e43a82cca52ca76a98226915 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -557,7 +557,7 @@ public abstract class PlayerList {
+@@ -649,7 +649,7 @@ public abstract class PlayerList {
                 player.stopRiding();
-                 vehicle.getPassengersAndSelf().forEach(e -> {
+                 rootVehicle.getPassengersAndSelf().forEach(entity -> {
                     // Paper start - Fix villager boat exploit
-                    if (e instanceof net.minecraft.world.entity.npc.villager.AbstractVillager villager) {
-+                    if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade && e instanceof net.minecraft.world.entity.npc.villager.AbstractVillager villager) { // Leaves - Configurable trading with the void
+-                    if (entity instanceof net.minecraft.world.entity.npc.AbstractVillager villager) {
+                    if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade && entity instanceof net.minecraft.world.entity.npc.AbstractVillager villager) { // Leaves - Configurable trading with the void
                         final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
                         if (human != null) {
                             villager.setTradingPlayer(null);
 diff --git a/net/minecraft/world/inventory/MerchantMenu.java b/net/minecraft/world/inventory/MerchantMenu.java
-index 5979e3856da1287f4513c984c0414952bfeb3ea2..d12db44b0fb165280642d2f6016869ce54f3a1db 100644
+index d59f67ffe34201c63e3d9706a4434f33b6732edb..c635c7211bff9d190b7035b284dda162334fd5c2 100644
 --- a/net/minecraft/world/inventory/MerchantMenu.java
 +++ b/net/minecraft/world/inventory/MerchantMenu.java
@@ -74,6 +74,7 @@ public class MerchantMenu extends AbstractContainerMenu {
 
     @Override
-     public boolean stillValid(final Player player) {
+     public boolean stillValid(Player player) {
 +        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade) return this.trader.getTradingPlayer() == player; // Leaves - Configurable trading with the void
         if (!checkReachable) return true; // Paper - checkReachable
         return this.trader.stillValid(player);
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 17 Apr 2026 23:24:07 +0800
-Subject: [PATCH] Fix riding statistics desync
-
-Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index fe34f2e648df9fd1174522baa5913976104b8d04..fee4749c7938779f63155297bf9c7aeb0ca21709 100644
--- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         }
-     }
- 
-    private void checkRidingStatistics(final double dx, final double dy, final double dz) {
-+    public void checkRidingStatistics(final double dx, final double dy, final double dz) { // Luminol - Fix riding statics desync (make public)
-         if (this.isPassenger() && !didNotMove(dx, dy, dz)) {
-             int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F);
-             Entity vehicle = this.getVehicle();
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 07310ae30817fc88227355739074615969b48184..47eef926f57053ace7ea140261570c4970822062 100644
--- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -4198,7 +4198,13 @@ public abstract class Entity
-             }
-         }
- 
-+        // Luminol start  - Fix riding statics desync
-         public void adjustRiders(boolean teleport) {
-+            this.adjustRiders(teleport, false);
-+        }
-+
-+        public void adjustRiders(boolean teleport, boolean syncStatics) {
-+        // Luminol end - Fix riding statics desync
-             java.util.ArrayDeque<EntityTreeNode> queue = new java.util.ArrayDeque<>();
-             queue.add(this);
- 
-@@ -4211,14 +4217,24 @@ public abstract class Entity
- 
-                 for (EntityTreeNode passenger : passengers) {
-                     queue.add(passenger);
-+                    // Luminol start  - Fix riding statics desync
-+                    final double oldX = passenger.root.getX();
-+                    final double oldY = passenger.root.getY();
-+                    final double oldZ = passenger.root.getZ();
-+                    // Luminol end - Fix riding statics desync
-                     curr.root.positionRider(passenger.root, teleport ? Entity::snapTo : Entity::setPos);
-+                    // Luminol start  - Fix riding statics desync
-+                    if (syncStatics && passenger.root instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
-+                        serverPlayer.checkRidingStatistics(serverPlayer.getX() - oldX, serverPlayer.getY() - oldY, serverPlayer.getZ() - oldZ);
-+                    }
-+                    // Luminol end - Fix riding statics desync
-                 }
-             }
-         }
-     }
- 
-     public void repositionAllPassengers(boolean teleport) {
-        this.makePassengerTree().adjustRiders(teleport);
-+        this.makePassengerTree().adjustRiders(teleport, true); // Luminol - Fix riding statics desync
-     }
- 
-     protected EntityTreeNode makePassengerTree() {
@@ -0,0 +1,472 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sat, 26 Jul 2025 01:11:54 +0800
+Subject: [PATCH] Leaves: Item overstack util
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/46cccfc39cafbca1681620d03947bc3ad558327f/leaves-server/minecraft-patches/features/0034-Item-overstack-util.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/commands/arguments/item/ItemInput.java b/net/minecraft/commands/arguments/item/ItemInput.java
+index 643797124fe5a4489d0b7419b7e600c04f283ef2..04b4100da96aad50f08e8c59200eec934e7e873d 100644
+--- a/net/minecraft/commands/arguments/item/ItemInput.java
+++ b/net/minecraft/commands/arguments/item/ItemInput.java
+@@ -39,11 +39,13 @@ public class ItemInput {
+     public ItemStack createItemStack(int count, boolean allowOversizedStacks) throws CommandSyntaxException {
+         ItemStack itemStack = new ItemStack(this.item, count);
+         itemStack.applyComponents(this.components);
+-        if (allowOversizedStacks && count > itemStack.getMaxStackSize()) {
+-            throw ERROR_STACK_TOO_BIG.create(this.getItemName(), itemStack.getMaxStackSize());
+        // Leaves start - item over-stack util
+        if (allowOversizedStacks && count > org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack)) {
+            throw ERROR_STACK_TOO_BIG.create(this.getItemName(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack));
+         } else {
+             return itemStack;
+         }
+        // Leaves end - item over-stack util
+     }
+ 
+     public String serialize(HolderLookup.Provider levelRegistry) {
+diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
+index 7ef109cb9921c25987905149616eddbd0b2f9b9c..70fc9d6c5b226211ff5964464c37e11695d5f745 100644
+--- a/net/minecraft/server/commands/GiveCommand.java
+++ b/net/minecraft/server/commands/GiveCommand.java
+@@ -55,7 +55,7 @@ public class GiveCommand {
+     private static int giveItem(CommandSourceStack source, ItemInput item, Collection<ServerPlayer> targets, int count) throws CommandSyntaxException {
+         ItemStack itemStack = item.createItemStack(1, false);
+         final Component displayName = itemStack.getDisplayName(); // Paper - get display name early
+-        int maxStackSize = itemStack.getMaxStackSize();
+        int maxStackSize = org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); // Leaves - item over-stack util
+         int i = maxStackSize * 100;
+         if (count > i) {
+             source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 74ec003486f9362d2bafbad8392b9bbdf0c15882..f06b9d8ad9512d35f3f460eb77c869690321c67f 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3079,7 +3079,7 @@ public class ServerGamePacketListenerImpl
+                                             } else if (slot.mayPlace(cursor)) {
+                                                 if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
+                                                     int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1;
+-                                                    toPlace = Math.min(toPlace, clickedItem.getMaxStackSize() - clickedItem.getCount());
+                                                    toPlace = Math.min(toPlace, org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(clickedItem) - clickedItem.getCount()); // Leaves - item over-stack util
+                                                     toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
+                                                     if (toPlace == 1) {
+                                                         action = InventoryAction.PLACE_ONE;
+@@ -3115,7 +3115,7 @@ public class ServerGamePacketListenerImpl
+                                                 }
+                                             } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
+                                                 if (clickedItem.getCount() >= 0) {
+-                                                    if (clickedItem.getCount() + cursor.getCount() <= cursor.getMaxStackSize()) {
+                                                    if (clickedItem.getCount() + cursor.getCount() <= org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(cursor)) { // Leaves - item over-stack util
+                                                         // As of 1.5, this is result slots only
+                                                         action = InventoryAction.PICKUP_ALL;
+                                                     }
+@@ -3326,6 +3326,7 @@ public class ServerGamePacketListenerImpl
+                         this.player.containerMenu.broadcastFullState();
+                     } else {
+                         this.player.containerMenu.broadcastChanges();
+                        if (org.leavesmc.leaves.util.ItemOverstackUtils.hasOverstackingItem()) this.player.containerMenu.broadcastCarriedItem(); // Leaves - item over-stack util - force send carried item
+                     }
+                     if (packet.buttonNum() == Inventory.SLOT_OFFHAND && this.player.containerMenu != this.player.inventoryMenu) this.player.containerSynchronizer.sendOffHandSlotChange(); // Paper - update offhand data when the player is clicking in an inventory not their own as the sychronizer does not include offhand slots
+                     if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
+@@ -3437,7 +3438,7 @@ public class ServerGamePacketListenerImpl
+             }
+ 
+             boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
+-            boolean flag2 = itemStack.isEmpty() || itemStack.getCount() <= itemStack.getMaxStackSize();
+            boolean flag2 = itemStack.isEmpty() || itemStack.getCount() <= org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); // Leaves - item over-stack util
+             if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot
+                 // CraftBukkit start - Call click event
+                 org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView();
+@@ -3479,6 +3480,7 @@ public class ServerGamePacketListenerImpl
+                 this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack);
+                 this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack);
+                 this.player.inventoryMenu.broadcastChanges();
+                if (org.leavesmc.leaves.util.ItemOverstackUtils.hasOverstackingItem()) this.player.containerMenu.sendSingleSlot(packet.slotNum(), itemStack); // Leaves - item over-stack util - force send carried item
+                 if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
+             } else if (flag && flag2) {
+                 if (this.dropSpamThrottler.isUnderThreshold()) {
+diff --git a/net/minecraft/world/Container.java b/net/minecraft/world/Container.java
+index 2afaf6a3f18af7889f4f3b35cee9bbb5e4ec01f2..da99b4bc7fe8460945070915073be141f9bd6778 100644
+--- a/net/minecraft/world/Container.java
+++ b/net/minecraft/world/Container.java
+@@ -32,6 +32,12 @@ public interface Container extends Clearable, Iterable<ItemStack>, org.leavesmc.
+         return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
+     }
+ 
+    // Leaves start - item over-stack util
+    default int getMaxStackLeaves(ItemStack stack) {
+        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack));
+    }
+    // Leaves end - item over-stack util
+
+     void setChanged();
+ 
+     boolean stillValid(Player player);
+diff --git a/net/minecraft/world/SimpleContainer.java b/net/minecraft/world/SimpleContainer.java
+index d907e24d563e27acab2f2bf9711b1755ea9afd19..75170c8d3be477a6ea2a1d62018a6ab630b0e54e 100644
+--- a/net/minecraft/world/SimpleContainer.java
+++ b/net/minecraft/world/SimpleContainer.java
+@@ -211,7 +211,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     @Override
+     public void setItem(int index, ItemStack stack) {
+         this.items.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+         this.setChanged();
+     }
+ 
+@@ -286,7 +286,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     }
+ 
+     private void moveItemsBetweenStacks(ItemStack stack, ItemStack other) {
+-        int maxStackSize = this.getMaxStackSize(other);
+        int maxStackSize = this.getMaxStackLeaves(other); // Leaves - item over-stack util
+         int min = Math.min(stack.getCount(), maxStackSize - other.getCount());
+         if (min > 0) {
+             other.grow(min);
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index fd4f1e63f980b6959fc80084651991f8f8bc6c34..e5e8c752129a6ebb0dd1315c9b8ec459be11ef07 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
+++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -283,10 +283,15 @@ public class ItemEntity extends Entity implements TraceableEntity, ChangePublish
+ 
+     private boolean isMergable() {
+         ItemStack item = this.getItem();
+-        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && item.getCount() < item.getMaxStackSize(); // Paper - Alternative item-despawn-rate
+        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && item.getCount() < org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(item); // Paper - Alternative item-despawn-rate // Leaves - item over-stack util
+     }
+ 
+     private void tryToMerge(ItemEntity itemEntity) {
+        // Leaves start - item over-stack util
+        if (org.leavesmc.leaves.util.ItemOverstackUtils.tryStackItems(this, itemEntity)) {
+            return;
+        }
+        // Leaves end - item over-stack util
+         ItemStack item = this.getItem();
+         ItemStack item1 = itemEntity.getItem();
+         if (Objects.equals(this.target, itemEntity.target) && areMergable(item, item1)) {
+diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java
+index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0c59f7654 100644
+--- a/net/minecraft/world/entity/player/Inventory.java
+++ b/net/minecraft/world/entity/player/Inventory.java
+@@ -165,10 +165,12 @@ public class Inventory implements Container, Nameable {
+     }
+ 
+     private boolean hasRemainingSpaceForItem(ItemStack destination, ItemStack origin) {
+        // Leaves start - item over-stack util
+         return !destination.isEmpty()
+-            && destination.isStackable()
+-            && destination.getCount() < this.getMaxStackSize(destination)
+            && org.leavesmc.leaves.util.ItemOverstackUtils.isStackable(destination)
+            && destination.getCount() < org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(destination)
+             && ItemStack.isSameItemSameComponents(destination, origin); // Paper - check if itemstack is stackable first
+        // Leaves end - item over-stack util
+     }
+ 
+     // CraftBukkit start - Watch method above! :D
+@@ -181,7 +183,7 @@ public class Inventory implements Container, Nameable {
+             }
+ 
+             if (this.hasRemainingSpaceForItem(itemInSlot, itemStack)) {
+-                remains -= (itemInSlot.getMaxStackSize() < this.getMaxStackSize() ? itemInSlot.getMaxStackSize() : this.getMaxStackSize()) - itemInSlot.getCount();
+                remains -= (org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemInSlot) < this.getMaxStackSize() ? org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemInSlot) : this.getMaxStackSize()) - itemInSlot.getCount(); // Leaves - item over-stack util
+             }
+             if (remains <= 0) {
+                 return itemStack.getCount();
+@@ -190,7 +192,7 @@ public class Inventory implements Container, Nameable {
+ 
+         ItemStack itemInOffhand = this.equipment.get(EquipmentSlot.OFFHAND);
+         if (this.hasRemainingSpaceForItem(itemInOffhand, itemStack)) {
+-            remains -= (itemInOffhand.getMaxStackSize() < this.getMaxStackSize() ? itemInOffhand.getMaxStackSize() : this.getMaxStackSize()) - itemInOffhand.getCount();
+            remains -= (org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemInOffhand) < this.getMaxStackSize() ? org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemInOffhand) : this.getMaxStackSize()) - itemInOffhand.getCount(); // Leaves - item over-stack util
+         }
+         if (remains <= 0) {
+             return itemStack.getCount();
+@@ -314,7 +316,7 @@ public class Inventory implements Container, Nameable {
+             this.setItem(slot, item);
+         }
+ 
+-        int i = this.getMaxStackSize(item) - item.getCount();
+        int i = this.getMaxStackLeaves(item) - item.getCount(); // Leaves - item over-stack util
+         int min = Math.min(count, i);
+         if (min == 0) {
+             return count;
+@@ -420,7 +422,7 @@ public class Inventory implements Container, Nameable {
+                 break;
+             }
+ 
+-            int i = stack.getMaxStackSize() - this.getItem(slotWithRemainingSpace).getCount();
+            int i = org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack) - this.getItem(slotWithRemainingSpace).getCount(); // Leaves - item over-stack util
+             if (this.add(slotWithRemainingSpace, stack.split(i)) && sendPacket && this.player instanceof ServerPlayer serverPlayer) {
+                 serverPlayer.connection.send(this.createInventoryUpdatePacket(slotWithRemainingSpace));
+             }
+diff --git a/net/minecraft/world/entity/player/StackedItemContents.java b/net/minecraft/world/entity/player/StackedItemContents.java
+index 83ccde54c625d40dc595e000c533f60aa929bd5a..6779503888e6d311758cffde582b0efbd66a33de 100644
+--- a/net/minecraft/world/entity/player/StackedItemContents.java
+++ b/net/minecraft/world/entity/player/StackedItemContents.java
+@@ -23,7 +23,7 @@ public class StackedItemContents {
+     }
+ 
+     public void accountStack(ItemStack stack) {
+-        this.accountStack(stack, stack.getMaxStackSize());
+        this.accountStack(stack, org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack)); // Leaves - item over-stack util
+     }
+ 
+     public void accountStack(ItemStack stack, int maxStackSize) {
+diff --git a/net/minecraft/world/entity/vehicle/ContainerEntity.java b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+index 02d2efef2dc0f0e12eac0c71fa290af706f7694d..99f109e2653eff10c011f380694bd77a76381cee 100644
+--- a/net/minecraft/world/entity/vehicle/ContainerEntity.java
+++ b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+@@ -163,7 +163,7 @@ public interface ContainerEntity extends Container, MenuProvider {
+     default void setChestVehicleItem(int slot, ItemStack stack) {
+         this.unpackChestVehicleLootTable(null);
+         this.getItemStacks().set(slot, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+     }
+ 
+     default SlotAccess getChestVehicleSlot(final int index) {
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index 2d6acceffb2cb7e55dd504018a70b05afccd9c11..bdc0ca1f625dc264bef6e5722ec66121ba48625a 100644
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -295,6 +295,13 @@ public abstract class AbstractContainerMenu {
+         this.sendAllDataToRemote();
+     }
+ 
+    // Leaves start - item over-stack util
+    public void sendSingleSlot(int slotIndex, ItemStack item) {
+        if (this.synchronizer != null) {
+            this.synchronizer.sendSlotChange(this, slotIndex, item);
+        }
+    }
+    // Leaves end - item over-stack util
+     private void updateDataSlotListeners(int slotIndex, int value) {
+         for (ContainerListener containerListener : this.containerListeners) {
+             containerListener.dataChanged(this, slotIndex, value);
+@@ -451,7 +458,7 @@ public abstract class AbstractContainerMenu {
+                             && (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size())
+                             && this.canDragTo(slot1)) {
+                             int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0;
+-                            int min = Math.min(itemStack.getMaxStackSize(), slot1.getMaxStackSize(itemStack));
+                            int min = Math.min(org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack), slot1.getMaxStackSize(itemStack)); // Leaves - item over-stack util
+                             int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min);
+                             count -= min1 - i2;
+                             // slot1.setByPlayer(itemStack.copyWithCount(min1));
+@@ -563,7 +570,7 @@ public abstract class AbstractContainerMenu {
+                                 slot.setByPlayer(carried2);
+                             }
+                         } else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
+-                            Optional<ItemStack> optional1 = slot.tryRemove(carried.getCount(), carried2.getMaxStackSize() - carried2.getCount(), player);
+                            Optional<ItemStack> optional1 = slot.tryRemove(carried.getCount(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(carried2) - carried2.getCount(), player); // Leaves - item over-stack util
+                             optional1.ifPresent(itemStack2 -> {
+                                 carried2.grow(itemStack2.getCount());
+                                 slot.onTake(player, itemStack2);
+@@ -625,7 +632,7 @@ public abstract class AbstractContainerMenu {
+             Slot slot2 = this.slots.get(slotId);
+             if (slot2.hasItem()) {
+                 ItemStack itemStack = slot2.getItem();
+-                this.setCarried(itemStack.copyWithCount(itemStack.getMaxStackSize()));
+                this.setCarried(itemStack.copyWithCount(org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack))); // Leaves - item over-stack util
+             }
+         } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotId >= 0) {
+             Slot slot2 = this.slots.get(slotId);
+@@ -660,15 +667,15 @@ public abstract class AbstractContainerMenu {
+                 int maxStackSize = button == 0 ? 1 : -1;
+ 
+                 for (int i3 = 0; i3 < 2; i3++) {
+-                    for (int i4 = count; i4 >= 0 && i4 < this.slots.size() && itemStack.getCount() < itemStack.getMaxStackSize(); i4 += maxStackSize) {
+                    for (int i4 = count; i4 >= 0 && i4 < this.slots.size() && itemStack.getCount() < org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); i4 += maxStackSize) { // Leaves - item over-stack util
+                         Slot slot3 = this.slots.get(i4);
+                         if (slot3.hasItem()
+                             && canItemQuickReplace(slot3, itemStack, true)
+                             && slot3.mayPickup(player)
+                             && this.canTakeItemForPickAll(itemStack, slot3)) {
+                             ItemStack item1 = slot3.getItem();
+-                            if (i3 != 0 || item1.getCount() != item1.getMaxStackSize()) {
+-                                ItemStack itemStack1 = slot3.safeTake(item1.getCount(), itemStack.getMaxStackSize() - itemStack.getCount(), player);
+                            if (i3 != 0 || item1.getCount() != org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(item1)) { // Leaves - item over-stack util
+                                ItemStack itemStack1 = slot3.safeTake(item1.getCount(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack) - itemStack.getCount(), player); // Leaves - item over-stack util
+                                 itemStack.grow(itemStack1.getCount());
+                             }
+                         }
+@@ -770,7 +777,7 @@ public abstract class AbstractContainerMenu {
+             i = endIndex - 1;
+         }
+ 
+-        if (stack.isStackable()) {
+        if (org.leavesmc.leaves.util.ItemOverstackUtils.isStackable(stack)) { // Leaves - item over-stack util
+             while (!stack.isEmpty() && (reverseDirection ? i >= startIndex : i < endIndex)) {
+                 Slot slot = this.slots.get(i);
+                 ItemStack item = slot.getItem();
+@@ -871,7 +878,7 @@ public abstract class AbstractContainerMenu {
+     public static boolean canItemQuickReplace(@Nullable Slot slot, ItemStack stack, boolean stackSizeMatters) {
+         boolean flag = slot == null || !slot.hasItem();
+         return !flag && ItemStack.isSameItemSameComponents(stack, slot.getItem())
+-            ? slot.getItem().getCount() + (stackSizeMatters ? 0 : stack.getCount()) <= stack.getMaxStackSize()
+            ? slot.getItem().getCount() + (stackSizeMatters ? 0 : stack.getCount()) <= org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack) // Leaves - item over-stack util
+             : flag;
+     }
+ 
+@@ -879,7 +886,7 @@ public abstract class AbstractContainerMenu {
+         return switch (type) {
+             case 0 -> Mth.floor((float)stack.getCount() / slots.size());
+             case 1 -> 1;
+-            case 2 -> stack.getMaxStackSize();
+            case 2 -> org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack); // Leaves - item over-stack util
+             default -> stack.getCount();
+         };
+     }
+@@ -902,7 +909,7 @@ public abstract class AbstractContainerMenu {
+             for (int i = 0; i < container.getContainerSize(); i++) {
+                 ItemStack item = container.getItem(i);
+                 if (!item.isEmpty()) {
+-                    f += (float)item.getCount() / container.getMaxStackSize(item);
+                    f += Math.clamp((float) item.getCount() / container.getMaxStackSize(item), 0f, 1f); // Leaves - item over-stack util
+                 }
+             }
+ 
+diff --git a/net/minecraft/world/inventory/MerchantContainer.java b/net/minecraft/world/inventory/MerchantContainer.java
+index 1e5dfb1f9e371fa23cdfa9280797aa0e183d4cd2..1a593d5bfc4574fd071604105422cd1d395648b8 100644
+--- a/net/minecraft/world/inventory/MerchantContainer.java
+++ b/net/minecraft/world/inventory/MerchantContainer.java
+@@ -109,7 +109,7 @@ public class MerchantContainer implements Container {
+     @Override
+     public void setItem(int index, ItemStack stack) {
+         this.itemStacks.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+         if (this.isPaymentSlot(index)) {
+             this.updateSellItem();
+         }
+diff --git a/net/minecraft/world/inventory/Slot.java b/net/minecraft/world/inventory/Slot.java
+index 5ceb8964476b40db4511bec91ff13c4f522a1357..f416d7976e41a06b5a8be93485eaa233ffceda5c 100644
+--- a/net/minecraft/world/inventory/Slot.java
+++ b/net/minecraft/world/inventory/Slot.java
+@@ -75,7 +75,7 @@ public class Slot {
+     }
+ 
+     public int getMaxStackSize(ItemStack stack) {
+-        return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
+        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack)); // Leaves - item over-stack util
+     }
+ 
+     @Nullable
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index 33c3a5e39e8e1aa023baab76ef94f8aed481480e..a27e1d53abc2d8b8912226add33510067e10ed52 100644
+--- a/net/minecraft/world/item/ItemStack.java
+++ b/net/minecraft/world/item/ItemStack.java
+@@ -166,7 +166,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+     @Deprecated
+     @Nullable
+     private Item item;
+-    PatchedDataComponentMap components;
+    public PatchedDataComponentMap components; // Leaves - item over-stack util
+     @Nullable
+     private Entity entityRepresentation;
+ 
+@@ -193,7 +193,8 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+                 } else {
+                     Holder<Item> holder = Item.STREAM_CODEC.decode(buffer);
+                     DataComponentPatch dataComponentPatch = codec.decode(buffer);
+-                    return new ItemStack(holder, varInt, dataComponentPatch);
+                    ItemStack itemStack = new ItemStack(holder, varInt, dataComponentPatch);
+                    return org.leavesmc.leaves.util.ItemOverstackUtils.decodeMaxStackSize(itemStack);
+                 }
+             }
+ 
+@@ -202,13 +203,15 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+                 if (value.isEmpty() || value.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem()
+                     buffer.writeVarInt(0);
+                 } else {
+-                    buffer.writeVarInt(io.papermc.paper.util.sanitizer.ItemComponentSanitizer.sanitizeCount(io.papermc.paper.util.sanitizer.ItemObfuscationSession.currentSession(), value, value.getCount())); // Paper - potentially sanitize count
+-                    Item.STREAM_CODEC.encode(buffer, value.getItemHolder());
+                    // Leaves start - item over-stack util
+                    final ItemStack itemStack = org.leavesmc.leaves.util.ItemOverstackUtils.encodeMaxStackSize(value.copy());
+                    buffer.writeVarInt(io.papermc.paper.util.sanitizer.ItemComponentSanitizer.sanitizeCount(io.papermc.paper.util.sanitizer.ItemObfuscationSession.currentSession(), itemStack, itemStack.getCount())); // Paper - potentially sanitize count
+                    Item.STREAM_CODEC.encode(buffer, itemStack.getItemHolder());
+                     // Paper start - adventure; conditionally render translatable components
+                     boolean prev = net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.get();
+-                    try (final io.papermc.paper.util.SafeAutoClosable ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.withContext(c -> c.itemStack(value))) { // pass the itemstack as context to the obfuscation session
+                    try (final io.papermc.paper.util.SafeAutoClosable ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.withContext(c -> c.itemStack(itemStack))) { // pass the itemstack as context to the obfuscation session
+                         net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(true);
+-                    codec.encode(buffer, value.components.asPatch());
+                    codec.encode(buffer, itemStack.components.asPatch());
+                     } finally {
+                         net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(prev);
+                     }
+@@ -303,7 +306,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+ 
+             for (ItemStack itemStack : itemContainerContents.nonEmptyItems()) {
+                 int count = itemStack.getCount();
+-                int maxStackSize = itemStack.getMaxStackSize();
+                int maxStackSize = org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); // Leaves - item over-stack util
+                 if (count > maxStackSize) {
+                     return DataResult.error(() -> "Item stack with count of " + count + " was larger than maximum: " + maxStackSize);
+                 }
+diff --git a/net/minecraft/world/level/block/CrafterBlock.java b/net/minecraft/world/level/block/CrafterBlock.java
+index 38b03c7b02bdfc579e5e126c12de3d878e26d188..caf31218a1aff84367da126ee1dc46b8c8a1e5d1 100644
+--- a/net/minecraft/world/level/block/CrafterBlock.java
+++ b/net/minecraft/world/level/block/CrafterBlock.java
+@@ -192,7 +192,7 @@ public class CrafterBlock extends BaseEntityBlock {
+         Direction direction = state.getValue(ORIENTATION).front();
+         Container containerAt = HopperBlockEntity.getContainerAt(level, pos.relative(direction));
+         ItemStack itemStack = stack.copy();
+-        if (containerAt != null && (containerAt instanceof CrafterBlockEntity || stack.getCount() > containerAt.getMaxStackSize(stack))) {
+        if (containerAt != null && (containerAt instanceof CrafterBlockEntity || stack.getCount() > containerAt.getMaxStackLeaves(stack))) { // Leaves - item over-stack util
+             // CraftBukkit start - InventoryMoveItemEvent
+             org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack);
+ 
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index d7a211220d5eba7e34b9083f06f39e9527962599..cef2d6d9a42ae36d6e2a0b31685a7738d2a400cf 100644
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+@@ -411,7 +411,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         ItemStack itemStack = this.items.get(index);
+         boolean flag = !stack.isEmpty() && ItemStack.isSameItemSameComponents(itemStack, stack);
+         this.items.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+         if (index == 0 && !flag && this.level instanceof ServerLevel serverLevel) {
+             this.cookingTotalTime = getTotalCookTime(serverLevel, this, this.recipeType, this.cookSpeedMultiplier); // Paper - cook speed multiplier API
+             this.cookingTimer = 0;
+diff --git a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b8f75c253 100644
+--- a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+@@ -155,7 +155,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
+     @Override
+     public void setItem(int slot, ItemStack stack) {
+         this.getItems().set(slot, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+         this.setChanged();
+     }
+ 
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 3fd172f82216fa35c36e5f563819a6f01ffd4ea4..419bc939e19a306b33d4d387007c6acbae73fba3 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -144,7 +144,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     public void setItem(int index, ItemStack stack) {
+         this.unpackLootTable(null);
+         this.getItems().set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
+     }
+ 
+     @Override
+@@ -740,9 +740,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+             if (item.isEmpty()) {
+                 // Spigot start - SPIGOT-6693, SimpleContainer#setItem
+                 ItemStack leftover = ItemStack.EMPTY; // Paper - Make hoppers respect inventory max stack size
+-                if (!stack.isEmpty() && stack.getCount() > destination.getMaxStackSize()) {
+                if (!stack.isEmpty() && (stack.getCount() > destination.getMaxStackSize() || stack.getCount() > stack.getMaxStackSize())) { // Leaves - item over-stack util
+                     leftover = stack; // Paper - Make hoppers respect inventory max stack size
+-                    stack = stack.split(destination.getMaxStackSize());
+                    stack = stack.split(Math.min(destination.getMaxStackSize(), stack.getMaxStackSize())); // Leaves - item over-stack util
+                 }
+                 // Spigot end
+                 //IGNORE_TILE_UPDATES.set(Boolean.TRUE); // Paper - Perf: Optimize Hoppers // Folia - region threading // Luminol - vanilla hopper
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Sat, 18 Apr 2026 10:45:19 +0800
-Subject: [PATCH] Fix misbehaved ender pearls when player switched dimension
-
-A fix of https://github.com/PaperMC/Folia/issues/421
-
-Almost the same bug as:
-https://github.com/PaperMC/Folia/pull/418 and https://github.com/PaperMC/Folia/issues/393
-
-diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-index d0dba5cc351903fb762e231a95f302479794185f..fb00f70505a6c548cd1311d7ea55c6a501e814e3 100644
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-+++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-@@ -264,7 +264,8 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-             int previousChunkZ = SectionPos.blockToSectionCoord(this.position().z());
-             Entity owner = this.owner != null ? findOwnerIncludingDeadPlayer(serverLevel, this.owner.getUUID()) : null;
-             if (owner instanceof ServerPlayer serverPlayer
-                && !owner.isAlive()
-+                // && !owner.isAlive() // Luminol - Fix misbehaved ender pearls when player switched dimension
-+                && (owner.getBukkitEntity().taskScheduler.isRetired() || serverPlayer.getHealth() <= 0.0D) // Luminol - Fix misbehaved ender pearls when player switched dimension
-                 && !serverPlayer.wonGame
-                 && serverPlayer.level().getGameRules().get(GameRules.ENDER_PEARLS_VANISH_ON_DEATH)) {
-                 this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
@@ -8,14 +8,14 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e96b237749a960f2
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index b712d7babed4941d11cf716133c8a07c5bcd51a3..b90077b44ce81d5d60f9d0ad2414f0b7c6b1e720 100644
+index b3e897a4afee742b5055d652ad7047a660d8ea04..33471f3d0e2cbd54eaf095c19555f8fdaeb55878 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
-@@ -708,6 +708,7 @@ public class ServerExplosion implements Explosion {
+@@ -729,6 +729,7 @@ public class ServerExplosion implements Explosion {
     public boolean shouldAffectBlocklikeEntities() {
-         boolean mobGriefingEnabled = this.level.getGameRules().get(GameRules.MOB_GRIEFING);
-         boolean isNotWindCharge = this.source == null || !this.source.is(EntityTypes.BREEZE_WIND_CHARGE) && !this.source.is(EntityTypes.WIND_CHARGE);
-+        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldExplosionDamageCalculator) isNotWindCharge = isNotWindCharge && (this.source == null || !this.source.isInWater()); // Leaves - Old MC TNT wet explosion no item damage
-         return mobGriefingEnabled ? isNotWindCharge : this.blockInteraction.shouldAffectBlocklikeEntities() && isNotWindCharge;
+         boolean _boolean = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
+         boolean flag = this.source == null || this.source.getType() != EntityType.BREEZE_WIND_CHARGE && this.source.getType() != EntityType.WIND_CHARGE;
+        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldExplosionDamageCalculator) flag = flag && (this.source == null || !this.source.isInWater()); // Leaves - Old MC TNT wet explosion no item damage
+         return _boolean ? flag : this.blockInteraction.shouldAffectBlocklikeEntities() && flag;
     }
 
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Thu, 2 Apr 2026 12:26:24 +0800
-Subject: [PATCH] Fix long commands support
-
-Some long commands can be run through the dialog command, but paper has prohibited it.
-Revert to vanilla to fix it.
-
-diff --git a/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java b/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-index 491af2413a4e793a121fec368259ff8211ed031e..042cb4792b0084f143608f05dd08da133a31e435 100644
--- a/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-+++ b/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-@@ -12,7 +12,7 @@ public record ServerboundChatCommandPacket(String command) implements Packet<Ser
-     );
- 
-     private ServerboundChatCommandPacket(final FriendlyByteBuf input) {
-        this(input.readUtf(MAX_CHAT_PACKET_INPUT_SIZE)); // Paper - limit chat command inputs
-+        this(me.earthme.luminol.config.modules.fixes.LongCommandSupportConfig.enabled ? input.readUtf() : input.readUtf(MAX_CHAT_PACKET_INPUT_SIZE)); // Paper - limit chat command inputs // Luminol - add support for long command inputs
-     }
- 
-     private void write(final FriendlyByteBuf output) {
@@ -0,0 +1,216 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 11 Apr 2025 16:53:57 +0800
+Subject: [PATCH] Leaves: Old raid behavior
+
+Co-authored by: huanli233 <392352840@qq.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49060f07e1ab31c827326c9a5/leaves-server/minecraft-patches/features/0106-Old-raid-behavior.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
+index 80f17f33f670018240c854df589cf90cdeab6e70..c9af615ff9120c07787f436dbb6024e54e3a498b 100644
+--- a/net/minecraft/world/effect/BadOmenMobEffect.java
+++ b/net/minecraft/world/effect/BadOmenMobEffect.java
+@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
+             && !serverPlayer.isSpectator()
+             && level.getDifficulty() != Difficulty.PEACEFUL
+             && level.isVillage(serverPlayer.blockPosition())) {
+            // Leaves start - Revert raid changes
+            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
+                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) == null;
+            }
+            // Leaves end - Revert raid changes
+             Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
+             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
+                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
+diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
+index 1910bff3f08147bfd63703097e30b9f88c84e337..f45aa44a7a17946aeb406a447f18de34320a4fa2 100644
+--- a/net/minecraft/world/entity/raid/Raid.java
+++ b/net/minecraft/world/entity/raid/Raid.java
+@@ -263,7 +263,7 @@ public class Raid {
+     }
+ 
+     public boolean absorbRaidOmen(ServerPlayer player) {
+-        MobEffectInstance effect = player.getEffect(MobEffects.RAID_OMEN);
+        MobEffectInstance effect = player.getEffect(fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior ? MobEffects.BAD_OMEN : MobEffects.RAID_OMEN); // Leaves - old Raid Behavior
+         if (effect == null) {
+             return false;
+         } else {
+@@ -340,7 +340,13 @@ public class Raid {
+                         }
+ 
+                         if (flag1) {
+-                            this.waveSpawnPos = this.getValidSpawnPos(level);
+                            // Leaves Start - old FindSpawnPosition
+                            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
+                                this.waveSpawnPos = this.preCalcRavagerSpawnLocation(level, this.raidCooldownTicks < 100 ? 1 : 0);
+                            } else {
+                                this.waveSpawnPos = this.getValidSpawnPos(level);
+                            }
+                            // Leaves End - old FindSpawnPosition
+                         }
+ 
+                         if (this.raidCooldownTicks == 300 || this.raidCooldownTicks % 20 == 0) {
+@@ -375,7 +381,14 @@ public class Raid {
+                 int i = 0;
+ 
+                 while (this.shouldSpawnGroup()) {
+-                    BlockPos blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
+                    // Leaves Start - old FindSpawnPosition
+                    BlockPos blockPos;
+                    if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
+                        blockPos = this.getRavagerSpawnLocation(level, i, 20);
+                    } else {
+                        blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
+                    }
+                    // Leaves End - old FindSpawnPosition
+                     if (blockPos != null) {
+                         this.started = true;
+                         this.spawnGroup(level, blockPos);
+@@ -387,7 +400,7 @@ public class Raid {
+                         i++;
+                     }
+ 
+-                    if (i > 5) {
+                    if (i > (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior ? 3 : 5)) { // Leaves - old FindSpawnPosition
+                         org.bukkit.craftbukkit.event.CraftEventFactory.callRaidStopEvent(level, this, org.bukkit.event.raid.RaidStopEvent.Reason.UNSPAWNABLE); // CraftBukkit
+                         this.stop();
+                         break;
+@@ -683,7 +696,7 @@ public class Raid {
+             int i2 = this.center.getX() + Mth.floor(Mth.cos(f2) * 32.0F * f) + level.random.nextInt(3) * Mth.floor(f);
+             int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + level.random.nextInt(3) * Mth.floor(f);
+             int height = level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3);
+-            if (Mth.abs(height - this.center.getY()) <= 96) {
+            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - skippable
+                 mutableBlockPos.set(i2, height, i3);
+                 if (!level.isVillage(mutableBlockPos) || i <= 7) {
+                     int i4 = 10;
+@@ -702,6 +715,36 @@ public class Raid {
+         return null;
+     }
+ 
+    // Leaves Start - old FindSpawnPosition
+    @Nullable
+    private BlockPos findRandomSpawnPos(ServerLevel level, int n, int n2) {
+        int n3 = 2 - n;
+        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+        SpawnPlacementType spawnPlacementType = SpawnPlacements.getPlacementType(EntityType.RAVAGER);
+        for (int i = 0; i < n2; ++i) {
+            float f = level.random.nextFloat() * ((float)Math.PI * 2);
+            int n4 = this.center.getX() + Mth.floor(Mth.cos(f) * 32.0f * (float)n3) + level.random.nextInt(5);
+            int n5 = this.center.getZ() + Mth.floor(Mth.sin(f) * 32.0f * (float)n3) + level.random.nextInt(5);
+            int n6 = level.getHeight(Heightmap.Types.WORLD_SURFACE, n4, n5);
+            mutableBlockPos.set(n4, n6, n5);
+            if (level.isVillage(mutableBlockPos) && n < 2) continue;
+            if (!level.hasChunksAt(mutableBlockPos.getX() - 10, mutableBlockPos.getZ() - 10, mutableBlockPos.getX() + 10, mutableBlockPos.getZ() + 10) || !level.isPositionEntityTicking(mutableBlockPos) || !spawnPlacementType.isSpawnPositionOk(level, mutableBlockPos, EntityType.RAVAGER) && (!level.getBlockState((BlockPos)mutableBlockPos.below()).is(Blocks.SNOW) || !level.getBlockState(mutableBlockPos).isAir())) continue;
+            return mutableBlockPos;
+        }
+        return null;
+    }
+
+    private Optional<BlockPos> getValidSpawnPos(ServerLevel level, int n) {
+        for (int i = 0; i < 3; ++i) {
+            BlockPos blockPos = this.findRandomSpawnPos(level, n, 1);
+            if (blockPos == null) continue;
+            return Optional.of(blockPos);
+        }
+        return Optional.empty();
+    }
+    // Leaves End - old FindSpawnPosition
+
+
+     private boolean addWaveMob(ServerLevel level, int wave, Raider raider) {
+         // Folia start - make raids thread-safe
+         if (!this.ownsRaid(level)) {
+@@ -864,4 +907,43 @@ public class Raid {
+             this.spawnsPerWaveBeforeBonus = spawnsPerWaveBeforeBonus;
+         }
+     }
+
+    // Leaves start - old FindSpawnPosition
+    private BlockPos getRavagerSpawnLocation(ServerLevel serverWorld, int proximity, int tries) {
+        int i = proximity == 0 ? 2 : 2 - proximity;
+        BlockPos.MutableBlockPos mutable = new BlockPos.MutableBlockPos();
+        SpawnPlacementType spawnLocation = SpawnPlacements.getPlacementType(EntityType.RAVAGER);
+
+        for (int j = 0; j < tries; j++) {
+            float f = serverWorld.random.nextFloat() * (float) (Math.PI * 2);
+            int k = this.center.getX() + Mth.floor(Mth.cos(f) * 32.0F * (float) i + serverWorld.random.nextInt(5));
+            int l = this.center.getZ() + Mth.floor(Mth.sin(f) * 32.0F * (float) i + serverWorld.random.nextInt(5));
+            int m = serverWorld.getHeight(Heightmap.Types.WORLD_SURFACE, k, l);
+            mutable.set(k, m, l);
+
+            if (serverWorld.isVillage(mutable) && proximity < 2) {
+                continue;
+            }
+            if (serverWorld.hasChunksAt(mutable.getX() - 10, mutable.getZ() - 10, mutable.getX() + 10, mutable.getZ() + 10)
+                && serverWorld.isPositionEntityTicking(mutable)
+                && (spawnLocation.isSpawnPositionOk(serverWorld, mutable, EntityType.RAVAGER)
+                    || serverWorld.getBlockState(mutable.below()).is(Blocks.SNOW)
+                    && serverWorld.getBlockState(mutable).isAir())
+            ) {
+                return mutable;
+            }
+        }
+        return null;
+    }
+
+    private Optional<BlockPos> preCalcRavagerSpawnLocation(ServerLevel serverWorld, int proximity) {
+        for (int i = 0; i < 3; i++) {
+            BlockPos blockPos = this.getRavagerSpawnLocation(serverWorld, proximity, 1);
+            if (blockPos != null) {
+                return Optional.of(blockPos);
+            }
+        }
+        return Optional.empty();
+    }
+    // Leaves end - old FindSpawnPosition
+ }
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 3e30989c99cd11c8c94d6fd194d2969e3a7efda6..2d163f3d5eb1af4d539d24c0256855bbec960de4 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
+++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -128,6 +128,43 @@ public abstract class Raider extends PatrollingMonster {
+ 
+                 currentRaid.removeFromRaid(serverLevel, this, false);
+             }
+
+            // Leaves start - Revert raid changes
+            if (this.level() instanceof ServerLevel) {
+                if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior && !this.hasRaid()) {
+                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
+                    net.minecraft.world.entity.player.Player entityhuman = null;
+                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
+                        entityhuman = player;
+                    } else if (entity instanceof net.minecraft.world.entity.animal.wolf.Wolf wolf) {
+                        LivingEntity entityliving = wolf.getOwner();
+                        if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) {
+                            entityhuman = player;
+                        }
+                    }
+
+                    if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) {
+                        net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
+                        int i = 1;
+
+                        if (mobeffect != null) {
+                            i += mobeffect.getAmplifier();
+                            entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
+                        } else {
+                            --i;
+                        }
+
+                        i = net.minecraft.util.Mth.clamp(i, 0, 4);
+                        net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, 120000, i, false, false, true);
+
+                        if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
+                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
+                        }
+                        this.setPatrolLeader(false);
+                    }
+                }
+            }
+            // Leaves end - Revert raid changes
+         }
+ 
+         super.die(cause);
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 20 Apr 2026 01:02:43 +0800
-Subject: [PATCH] Fix creative player item pick
-
-
-diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
-index 223793bea54a483fefc66caa7e07b29ab351c339..303b9befb30d7156a9a71900ac1a6ea8f7e8d876 100644
--- a/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/net/minecraft/world/entity/item/ItemEntity.java
-@@ -420,7 +420,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
-             Item item = itemStack.getItem();
-             int orgCount = itemStack.getCount();
-             // CraftBukkit start - fire PlayerPickupItemEvent
-            int canHold = player.getInventory().canHold(itemStack);
-+            int canHold = player.hasInfiniteMaterials() ? orgCount : player.getInventory().canHold(itemStack); // Luminol - Fix creative item picking
-             int remaining = orgCount - canHold;
-             boolean flyAtPlayer = false; // Paper
- 
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
-index 9750a2a7f6d13f93119d0c6fba0bf11064d46e55..1913b30f1bfe013261b340fdf9917db90c98c695 100644
+index 8cf3e51e12f9cf98836657e722edb23943f9e866..5fd5e9fd4e1a79dd1a9d62a5cf0c308805979420 100644
 --- a/net/minecraft/world/item/ShearsItem.java
 +++ b/net/minecraft/world/item/ShearsItem.java
@@ -80,7 +80,10 @@ public class ShearsItem extends Item {
@@ -17,7 +17,7 @@ index 9750a2a7f6d13f93119d0c6fba0bf11064d46e55..1913b30f1bfe013261b340fdf9917db9
         } else {
 -            return super.useOn(context);
 +            // Leaves start - shears wrench
-+            InteractionResult result = org.leavesmc.leaves.util.ShearsWrenchUtil.tryApplyRotate(context, state);
+            InteractionResult result = org.leavesmc.leaves.util.ShearsWrenchUtil.tryApplyRotate(context, blockState);
 +            return result == null ? super.useOn(context) : result;
 +            // Leaves end - shears wrench
         }
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 20 Apr 2026 01:10:30 +0800
-Subject: [PATCH] Fix entity portal-teleport speed
-
-
-diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index c6434ff2e5c211887c2e98c8462a49e0e1cb5b21..534f103234eb92571c664cbcfea4ce4e990d3ea8 100644
--- a/net/minecraft/server/level/ServerLevel.java
-+++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1492,7 +1492,27 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
-         foliaProfiler.startTimer(timerId);
-         try {
-         // Folia end - profiler
-+        // Luminol start - Entity portal-teleport speed fix
-         if (isActive) { // Paper - EAR 2
-+            if (!(entity instanceof Player) && entity.teleportTickType == 2) { // Luminol - after portal compensate tick
-+                entity.tick();
-+                entity.tick();
-+                entity.teleportTickType = 0;
-+                if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
-+                    return;
-+                }
-+                if (entity.handlePortal()) {
-+                    return;
-+                }
-+            } else if (!(entity instanceof Player) && entity.teleportTickType == 1) { // Luminol - portal teleport only
-+                entity.teleportTickType++;
-+                if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
-+                    return;
-+                }
-+                if (entity.handlePortal()) {
-+                    return;
-+                }
-+            } else {
-         entity.tick();
-         // Folia start - region threading
-         if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
-@@ -1503,6 +1523,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
-             // portalled
-             return;
-         }
-+        }
-+        // Luminol end - Entity portal-teleport speed fix
-         // Folia end - region threading
-         } else {entity.inactiveTick();} // Paper - EAR 2
-         profiler.pop();
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 47eef926f57053ace7ea140261570c4970822062..7953b7ece0b5e3f41e85252cdfd8e400fab212ae 100644
--- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -387,6 +387,7 @@ public abstract class Entity
-     public long activatedTick = Integer.MIN_VALUE;
-     public boolean isTemporarilyActive;
-     public long activatedImmunityTick = Integer.MIN_VALUE;
-+    public int teleportTickType = 0;// Luminol - Entity portal-teleport speed fix
- 
-     public void inactiveTick() {
-     }
-@@ -3595,6 +3596,7 @@ public abstract class Entity
-         } else {
-             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
-                 this.portalProcess = new PortalProcessor(portal, pos.immutable());
-+                this.teleportTickType = 1; // Luminol - Entity portal-teleport speed fix
-             } else if (!this.portalProcess.isInsidePortalThisTick()) {
-                 this.portalProcess.updateEntryPosition(pos.immutable());
-                 this.portalProcess.setAsInsidePortalThisTick(true);
@@ -8,10 +8,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
-index 8432d0ce22ddc9c9bfa98901e403697f40e53c99..9ec141359c4422c1574dac71a88b7f5043350901 100644
+index d0d90a25a10bbecfffceee1992af88c60d14fd87..187e48e78e69c80b25710f193813335ec643957f 100644
 --- a/net/minecraft/server/ServerTickRateManager.java
 +++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -139,4 +139,10 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -134,4 +134,10 @@ public class ServerTickRateManager extends TickRateManager {
         player.connection.send(ClientboundTickingStatePacket.from(this));
         player.connection.send(ClientboundTickingStepPacket.from(this));
     }
@@ -23,15 +23,14 @@ index 8432d0ce22ddc9c9bfa98901e403697f40e53c99..9ec141359c4422c1574dac71a88b7f50
 +    // Leaves end - servux
 }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 7e362b71c629c75475016973a0181fce75a5156a..cb11830c2f399c9706b20f8104686dc0d9b686f9 100644
+index 4d71cc3b643f6f594c90f2f8f9e5b820ebdff080..7fb095c544294796768ce19c4409416e2848e296 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2569,6 +2569,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
-             this.server.updateEffectiveRespawnData();
+@@ -2368,6 +2368,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
         }
-         // Paper end
-+
+ 
+         this.lastSpawnChunkRadius = i;
 +        org.leavesmc.leaves.protocol.servux.ServuxHudDataProtocol.refreshSpawnMetadata = true; // Leaves - servux
     }
 
-     @Override
+     public LongSet getForceLoadedChunks() {
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Wed, 24 Jun 2026 22:52:13 +0800
-Subject: [PATCH] Fix player auto saving ignores interval
-
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index fee4749c7938779f63155297bf9c7aeb0ca21709..5668906866917f7bb6088ae16146d917d2b840b0 100644
--- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -208,7 +208,7 @@ import org.slf4j.Logger;
- 
- public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer { // Paper - rewrite chunk system
-     private static final Logger LOGGER = LogUtils.getLogger();
-    public static final long LAST_SAVE_ABSENT = Long.MIN_VALUE; public long lastSave = LAST_SAVE_ABSENT; // Paper // Folia - threaded regions - changed to nanoTime
-+    public static final long LAST_SAVE_ABSENT = Long.MIN_VALUE; public long lastSave = System.nanoTime(); // Paper // Folia - threaded regions - changed to nanoTime // Luminol - Fix player auto saving ignores interval
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-     private static final int FLY_STAT_RECORDING_SPEED = 25;
@@ -5,7 +5,7 @@ Subject: [PATCH] LeavesHooks


 diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
-index 08e3c75672e95248140eb0e0907cae5fbe54da34..dd17339fe2f9d7660b20eed05b61d6231302aa82 100644
+index d9fd093f59987f471627ff20cfd2eb1a3c0dea64..78c6d425589b8147c33583ac46d6f21ec5dbefaa 100644
 --- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
 +++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
@@ -29,7 +29,7 @@ import net.minecraft.world.phys.AABB;
@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 21 Apr 2026 01:15:09 +0800
-Subject: [PATCH] Force disable builtin spark plugin
-
-The spark passed down from paper has some memory leaking issue, so we fully removed it from the code to prevent that memory leaking issue.
-
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c74f76b46259204b33b69ad08bb03c81b8b36961..cc8364891a5d2196e8809479db984b67b5bcb079 100644
--- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -672,8 +672,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         }
-         // Paper end - Configurable player collision; Handle collideRule team for player collision toggle
-         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
-        this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
-        this.server.spark.enableAfterPlugins(this.server); // Paper - spark
-+        if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
-+        if (false) this.server.spark.enableAfterPlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
-         io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
-         io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.INITIAL); // Paper - call commands event for regular plugins
-         this.server.getCommandMap().registerServerAliases(); // Paper - relocate initial CommandMap#registerServerAliases() call
-@@ -1087,7 +1087,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
-         // CraftBukkit start
-         if (this.server != null) {
-            this.server.spark.disable(); // Paper - spark
-+            if (false) this.server.spark.disable(); // Paper - spark // Luminol - Force disable builtin spark
-             this.server.disablePlugins();
-             this.server.waitForAsyncTasksShutdown(); // Paper - Wait for Async Tasks during shutdown
-         }
-@@ -1352,7 +1352,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.statusIcon = this.loadStatusIcon().orElse(null);
-             this.status = this.buildServerStatus();
- 
-            this.server.spark.enableBeforePlugins(); // Paper - spark
-+            if (false) this.server.spark.enableBeforePlugins(); // Paper - spark // Luminol - Force disable builtin spark
-             // Folia start - region threading
-             if (true) {
-                 io.papermc.paper.threadedregions.RegionizedServer.getInstance().init(); // Folia - region threading - only after loading worlds
-@@ -1666,7 +1666,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             }
- 
-             if (this.emptyTicks >= emptyTickThreshold) {
-                this.server.spark.tickStart(); // Paper - spark
-+                if (false) this.server.spark.tickStart(); // Paper - spark // Luminol - Force disable builtin spark
-                 if (this.emptyTicks == emptyTickThreshold) {
-                     LOGGER.info("Server empty for {} seconds, pausing", this.pauseWhenEmptySeconds());
-                     this.autoSave();
-@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 // Paper end - avoid issues with certain tasks not processing during sleep
-                 //this.server.spark.executeMainThreadTasks(); // Paper - spark // Folia - region threading
-                 this.tickConnection();
-                this.server.spark.tickEnd(((double)(System.nanoTime() - this.currentTickStart) / 1000000D)); // Paper - spark
-+                if (false) this.server.spark.tickEnd(((double)(System.nanoTime() - this.currentTickStart) / 1000000D)); // Paper - spark // Luminol - Force disable builtin spark
-                 return;
-             }
-         }
-@@ -1698,7 +1698,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         };
-         // Folia end - region threading
- 
-        this.server.spark.tickStart(); // Paper - spark
-+        if (false) this.server.spark.tickStart(); // Paper - spark // Luminol - Force disable builtin spark
-         new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper - Server Tick Events // Folia - region threading
-         // Folia start - region threading
-         if (region != null) {
-@@ -1785,7 +1785,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         long remaining = scheduledEnd - endTime; // Folia - region ticking
-         new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
-         // Paper end - Server Tick Events
-        this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region threading
-+        if (false) this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region threading // Luminol - Force disable builtin spark
-         // Folia - region threading
-     }
- 
-diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ad4704523a3d90414ac514488207b1b5def9afd..1145d5839e621a02b7972c2ff1142f51db2237de 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -239,7 +239,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-         me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
-        this.server.spark.enableEarlyIfRequested(); // Paper - spark
-+        if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {
-             this.services().nameToIdCache().save(false); // Paper
-@@ -249,7 +249,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
-         consoleThread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
-        this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
-+        if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
- 
@@ -3,15 +3,15 @@ From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Thu, 20 Feb 2025 01:00:28 +0800
 Subject: [PATCH] Purpur: Barrels and enderchests 6 rows

-Co-authored by: William Blake Galbreath <blake.galbreath@gmail.com>
-As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/dc46f46d28dcdcaf33bb533f9571a107db98c1d7/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch)
-Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/dc46f46d28dcdcaf33bb533f9571a107db98c1d7/LICENSE)
+Co-authored by: William Blake Galbreath <Blake.Galbreath@GMail.com>
+As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch)
+Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)

 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 2939aa1ecd68504424198dd7c90c71c6c1aa4c80..8b7e4814b00d6f6c9f25cce5186905f165b97c2f 100644
+index 6c1f4f943a5be5f2e43a82cca52ca76a98226915..8e2775e873c92beed6a0e4e8ce1304ab8ca6e8d1 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -961,6 +961,10 @@ public abstract class PlayerList {
+@@ -1087,6 +1087,10 @@ public abstract class PlayerList {
         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
         this.server.getCommands().sendCommands(player);
         } // Paper - Add sendOpLevel API
@@ -23,11 +23,11 @@ index 2939aa1ecd68504424198dd7c90c71c6c1aa4c80..8b7e4814b00d6f6c9f25cce5186905f1
 
     // Paper start - whitelist verify event / login event
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index a447b9fbb579591c62b3d8f8e2527796feefc4a0..9fdc8134fdde2cdd7724a459a29e51f4ad943403 100644
+index 09b549fa9568aa1ae13b1b975db14a6268fdaa46..6c933c27ce155eb516a9ede96fb2c3bd19251bfa 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -175,6 +175,7 @@ public abstract class Player extends Avatar implements ContainerUser {
-     public float hurtDir;
+@@ -219,6 +219,7 @@ public abstract class Player extends LivingEntity {
+     private int currentImpulseContextResetGraceTime = 0;
     public boolean affectsSpawning = true; // Paper - Affects Spawning API
     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
 +    public int enderChestSlotCount = -1; // Purpur - Barrels and enderchests 6 rows
@@ -35,42 +35,42 @@ index a447b9fbb579591c62b3d8f8e2527796feefc4a0..9fdc8134fdde2cdd7724a459a29e51f4
     // CraftBukkit start
     public boolean fauxSleeping;
 diff --git a/net/minecraft/world/inventory/ChestMenu.java b/net/minecraft/world/inventory/ChestMenu.java
-index e77bfcd31cdcfd5836dc5db561e3fe2bc552a4b1..297657f38ce4c4bfa58cca27d440595246200d94 100644
+index 0fffa384f928ab84451331380968fb4650eafe26..d84a10396395939149da88bcb01be59e220c340e 100644
 --- a/net/minecraft/world/inventory/ChestMenu.java
 +++ b/net/minecraft/world/inventory/ChestMenu.java
@@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
-         return new ChestMenu(MenuType.GENERIC_9x6, containerId, inventory, 6);
+         return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, 6);
     }
 
 +    // Purpur start - Barrels and enderchests 6 rows
-+    public static ChestMenu oneRow(final int containerId, final Inventory inventory, final Container container) {
-+        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 1);
+    public static ChestMenu oneRow(int syncId, Inventory playerInventory, Container inventory) {
+        return new ChestMenu(MenuType.GENERIC_9x1, syncId, playerInventory, inventory, 1);
 +        }
 +
-+    public static ChestMenu twoRows(final int containerId, final Inventory inventory, final Container container) {
-+        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 2);
+    public static ChestMenu twoRows(int syncId, Inventory playerInventory, Container inventory) {
+        return new ChestMenu(MenuType.GENERIC_9x2, syncId, playerInventory, inventory, 2);
 +        }
 +    // Purpur end - Barrels and enderchests 6 rows
 +
-     public static ChestMenu threeRows(final int containerId, final Inventory inventory, final Container container) {
-         return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 3);
+     public static ChestMenu threeRows(int containerId, Inventory playerInventory, Container container) {
+         return new ChestMenu(MenuType.GENERIC_9x3, containerId, playerInventory, container, 3);
     }
 
 +    // Purpur start - Barrels and enderchests 6 rows
-+    public static ChestMenu fourRows(final int containerId, final Inventory inventory, final Container container) {
-+        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 4);
+    public static ChestMenu fourRows(int syncId, Inventory playerInventory, Container inventory) {
+        return new ChestMenu(MenuType.GENERIC_9x4, syncId, playerInventory, inventory, 4);
 +    }
 +
-+    public static ChestMenu fiveRows(final int containerId, final Inventory inventory, final Container container) {
-+        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 5);
+    public static ChestMenu fiveRows(int syncId, Inventory playerInventory, Container inventory) {
+        return new ChestMenu(MenuType.GENERIC_9x5, syncId, playerInventory, inventory, 5);
 +    }
 +    // Purpur end - Barrels and enderchests 6 rows
 +
-     public static ChestMenu sixRows(final int containerId, final Inventory inventory, final Container container) {
-         return new ChestMenu(MenuType.GENERIC_9x6, containerId, inventory, container, 6);
+     public static ChestMenu sixRows(int containerId, Inventory playerInventory, Container container) {
+         return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, container, 6);
     }
 diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index 4df3a32faf85595372f4b250482d852c985ea3ab..101b3711bfb98888837ebed323561cac6efb274d 100644
+index 51148b7b95c93a9e25da70ac9275c63f1458d84c..dba8acfcacfe9a7b7e0fb9943fba49468214616e 100644
 --- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 +++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
@@ -26,11 +26,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
@@ -90,38 +90,38 @@ index 4df3a32faf85595372f4b250482d852c985ea3ab..101b3711bfb98888837ebed323561cac
 +    }
 +    // Purpur end - Barrels and enderchests 6 rows
 +
-     public void setActiveChest(final EnderChestBlockEntity activeChest) {
-         this.activeChest = activeChest;
+     public void setActiveChest(EnderChestBlockEntity enderChestBlockEntity) {
+         this.activeChest = enderChestBlockEntity;
     }
 diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
-index f1a5b9670dd04b800a8d755f32364458a16d924a..bfc34508937befc0f7610176ebe625563f7a4fe0 100644
+index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..cef29289b7bc7fdf9613c0cd52f2bf4f715f288d 100644
 --- a/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -90,7 +90,15 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
-             // Paper start - Fix InventoryOpenEvent cancellation - moved up;
-             container.setActiveChest(enderChest); // Needs to happen before ChestMenu.threeRows as it is required for opening animations
-             if (level instanceof ServerLevel serverLevel && player.openMenu(
-                new SimpleMenuProvider((containerId, inventory, p) -> ChestMenu.threeRows(containerId, inventory, container), CONTAINER_TITLE)
-+                new SimpleMenuProvider(
-+                            (containerId, inventory, p) -> switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows) {
-+                    case 6 -> ChestMenu.sixRows(containerId, inventory, container);
-+                    case 5 -> ChestMenu.fiveRows(containerId, inventory, container);
-+                    case 4 -> ChestMenu.fourRows(containerId, inventory, container);
-+                    case 2 -> ChestMenu.twoRows(containerId, inventory, container);
-+                    case 1 -> ChestMenu.oneRow(containerId, inventory, container);
-+                    default -> ChestMenu.threeRows(containerId, inventory, container);
+@@ -85,8 +85,14 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+                 enderChestInventory.setActiveChest(enderChestBlockEntity); // Needs to happen before ChestMenu.threeRows as it is required for opening animations
+                 if (level instanceof ServerLevel serverLevel && player.openMenu(
+                     new SimpleMenuProvider(
+-                        (containerId, playerInventory, player1) -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
+-                    )
+                            (containerId, playerInventory, player1) -> switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows) {
+                    case 6 -> ChestMenu.sixRows(containerId, playerInventory, enderChestInventory);
+                    case 5 -> ChestMenu.fiveRows(containerId, playerInventory, enderChestInventory);
+                    case 4 -> ChestMenu.fourRows(containerId, playerInventory, enderChestInventory);
+                    case 2 -> ChestMenu.twoRows(containerId, playerInventory, enderChestInventory);
+                    case 1 -> ChestMenu.oneRow(containerId, playerInventory, enderChestInventory);
+                    default -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory);
 +                }, CONTAINER_TITLE) // Purpur - Barrels and enderchests 6 rows
-             ).isPresent()) {
-             // Paper end - Fix InventoryOpenEvent cancellation - moved up;
-                 player.awardStat(Stats.OPEN_ENDERCHEST);
+                 ).isPresent()) {
+                 // Paper end - Fix InventoryOpenEvent cancellation - moved up;
+                     player.awardStat(Stats.OPEN_ENDERCHEST);
 diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 00aa2d0269f636f6e4c12c1be98cf901e9be8558..e8c83037700a179a43b0dc3882a67622a2e95640 100644
+index de99652629c7301a4bc0e9ec48bed9a26a338f0d..b43445d8313c330a0376aaa4eb872495ebd87b5f 100644
 --- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -59,7 +59,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -56,7 +56,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
     }
     // CraftBukkit end
-     private static final Component DEFAULT_NAME = Component.translatable("container.barrel");
+ 
 -    private NonNullList<ItemStack> items = NonNullList.withSize(27, ItemStack.EMPTY);
 +    // Purpur start - Barrels and enderchests 6 rows
 +    private NonNullList<ItemStack> items = NonNullList.withSize(switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
@@ -135,9 +135,9 @@ index 00aa2d0269f636f6e4c12c1be98cf901e9be8558..e8c83037700a179a43b0dc3882a67622
 +    // Purpur end - Barrels and enderchests 6 rows
 +
     public final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() {
-         // Paper start - delay open/close callbacks
         @Override
-@@ -118,7 +128,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
+         protected void onOpen(Level level, BlockPos pos, BlockState state) {
+@@ -108,7 +118,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
 
     @Override
     public int getContainerSize() {
@@ -155,19 +155,19 @@ index 00aa2d0269f636f6e4c12c1be98cf901e9be8558..e8c83037700a179a43b0dc3882a67622
     }
 
     @Override
-@@ -139,7 +158,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -129,7 +148,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
 
     @Override
-     protected AbstractContainerMenu createMenu(final int containerId, final Inventory inventory) {
-        return ChestMenu.threeRows(containerId, inventory, this);
+     protected AbstractContainerMenu createMenu(int id, Inventory player) {
+-        return ChestMenu.threeRows(id, player, this);
 +        // Purpur start - Barrels and enderchests 6 rows
 +        return switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
-+            case 6 -> ChestMenu.sixRows(containerId, inventory, this);
-+            case 5 -> ChestMenu.fiveRows(containerId, inventory, this);
-+            case 4 -> ChestMenu.fourRows(containerId, inventory, this);
-+            case 2 -> ChestMenu.twoRows(containerId, inventory, this);
-+            case 1 -> ChestMenu.oneRow(containerId, inventory, this);
-+            default -> ChestMenu.threeRows(containerId, inventory, this);
+            case 6 -> ChestMenu.sixRows(id, player, this);
+            case 5 -> ChestMenu.fiveRows(id, player, this);
+            case 4 -> ChestMenu.fourRows(id, player, this);
+            case 2 -> ChestMenu.twoRows(id, player, this);
+            case 1 -> ChestMenu.oneRow(id, player, this);
+            default -> ChestMenu.threeRows(id, player, this);
 +        };
 +        // Purpur end - Barrels and enderchests 6 rows
     }
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 15 Aug 2025 02:29:30 +0800
+Subject: [PATCH] Compatibility fix for Raid Revert and Cross Region Damage
+ Trace
+
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index e94687b3aa960f9c630f459fedc17bc01846eaf7..f4f4f886b6558d39d292a45665953f497f84be53 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -1216,6 +1216,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+         }
+     }
+ 
+    // Lophine Start - raid revert adapt Cross Region Damage trace
+    public boolean addEffect(MobEffectInstance effectInstance, EntityPotionEffectEvent.Cause cause, boolean fireEvent, boolean async) {
+        if (!async || ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this)) {
+            return addEffect(effectInstance, this, cause, fireEvent);
+        } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
+            postToAddEffect(effectInstance, this, cause, fireEvent);
+            return true;
+        }
+        return false;
+    }
+
+    private void postToAddEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
+        if (entity != null)
+            entity.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> {
+                try {
+                    addEffect(effectInstance, nmsEntity, cause, fireEvent);
+                } catch (Throwable ex) {
+                    LOGGER.error(ex.getMessage(), ex);
+                }
+            }, null, 1L );
+    }
+    // Lophine End - raid revert adapt Cross Region Damage trace
+
+     public boolean canBeAffected(MobEffectInstance effectInstance) {
+         if (this.getType().is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
+             return !effectInstance.is(MobEffects.INFESTED);
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 2d163f3d5eb1af4d539d24c0256855bbec960de4..2cc0a7b5f088c29d9343b369b6e71c8a3ebdef75 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
+++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -158,7 +158,7 @@ public abstract class Raider extends PatrollingMonster {
+                         net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, 120000, i, false, false, true);
+ 
+                         if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
+-                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
+                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true, fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled); // Lophine - raid revert adapt Cross Region Damage trace
+                         }
+                         this.setPatrolLeader(false);
+                     }
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 19:10:30 +0800
-Subject: [PATCH] Prevent tamable animals check can teleport in an unloaded
- chunk
-
-Based on the implementation of Canvas(https://github.com/CraftCanvasMC/Canvas/commit/af2aacb12cbccfd328dda4961167786f5d9dad53)
-
-We need to check canTeleport for TamableAnimal but this logic could do the check in another tick region itself, so we need to prevent that. But it needs to push off this check to schedule to the correct tickregion, which needs costly rewriting of this logic, so we could simply allow the read when the owner's position is loaded
-
-diff --git a/net/minecraft/world/entity/TamableAnimal.java b/net/minecraft/world/entity/TamableAnimal.java
-index 95ba821a895c7ea8fffcbf1df2e7b3c174463d9e..b0a01673224522552672b7c8c9aa219108e8010f 100644
--- a/net/minecraft/world/entity/TamableAnimal.java
-+++ b/net/minecraft/world/entity/TamableAnimal.java
-@@ -318,7 +318,8 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-             return false;
-         }
- 
-        BlockState blockStateBelow = this.level().getBlockState(pos.below());
-+        BlockState blockStateBelow = this.level().getBlockStateIfLoaded(pos.below()); // Luminol - Prevent tamable animals check can teleport in an unloaded chunk
-+        if (blockStateBelow == null) return false;  // Luminol - Prevent tamable animals check can teleport in an unloaded chunk
-         if (!this.canFlyToOwner() && blockStateBelow.getBlock() instanceof LeavesBlock) {
-             return false;
-         }
@@ -1,55 +1,55 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Sun, 3 Aug 2025 14:26:37 +0800
-Subject: [PATCH] Add config to disable some check for operators
+Subject: [PATCH] Disable some check for operators


 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2a383eee714b7da08b552c5bfb3988fad3cadb93..6f5d5b123f69b7bdc3960e0ad216ec291aa100c3 100644
+index f06b9d8ad9512d35f3f460eb77c869690321c67f..e17f9629369f8653b484b4cc71de4874b5faa4d6 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -402,7 +402,7 @@ public class ServerGamePacketListenerImpl
+@@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl
         this.tickCount++;
         this.knownMovePacketCount = this.receivedMovePacketCount;
         if (this.clientIsFloating && !this.player.isSleeping() && !this.player.isPassenger() && !this.player.isDeadOrDying()) {
 -            if (++this.aboveGroundTickCount > this.getMaximumFlyingTicks(this.player)) {
-+            if (++this.aboveGroundTickCount > this.getMaximumFlyingTicks(this.player) && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpFlyCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Lophine - disable fly check for operator
-                 // LOGGER.warn("{} was kicked for floating too long!", this.player.getPlainTextName()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
+            if (++this.aboveGroundTickCount > this.getMaximumFlyingTicks(this.player) && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpFlyCheck && this.player.hasPermissions(2))) { // Lophine - disable fly check for operator
+                 // LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
                 this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingPlayer, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_PLAYER); // Paper - use configurable kick message & kick event cause
-                 return true;
-@@ -421,7 +421,7 @@ public class ServerGamePacketListenerImpl
+                 return;
+@@ -386,7 +386,7 @@ public class ServerGamePacketListenerImpl
             this.vehicleLastGoodY = this.lastVehicle.getY();
             this.vehicleLastGoodZ = this.lastVehicle.getZ();
             if (this.clientVehicleIsFloating && this.lastVehicle.getControllingPassenger() == this.player) {
 -                if (++this.aboveGroundVehicleTickCount > this.getMaximumFlyingTicks(this.lastVehicle)) {
-+                if (++this.aboveGroundVehicleTickCount > this.getMaximumFlyingTicks(this.lastVehicle) && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpFlyCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Lophine - disable fly check for operator
-                     // LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getPlainTextName()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
+                if (++this.aboveGroundVehicleTickCount > this.getMaximumFlyingTicks(this.lastVehicle) && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpFlyCheck && this.player.hasPermissions(2))) { // Lophine - disable fly check for operator
+                     // LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
                     this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingVehicle, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_VEHICLE); // Paper - use configurable kick message & kick event cause
-                     return true;
-@@ -674,7 +674,7 @@ public class ServerGamePacketListenerImpl
-                 zDist = targetZ - vehicle.getZ();
-                 movedDist = xDist * xDist + yDist * yDist + zDist * zDist;
-                 boolean fail = false;
-                if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && movedDist > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot // Leaves - disable can
-+                if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && movedDist > org.spigotmc.SpigotConfig.movedWronglyThreshold && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Spigot // Leaves - disable can // Lophine - disable move check for operator
-                     fail = true;
-                     LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", vehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(movedDist));
+                     return;
+@@ -644,7 +644,7 @@ public class ServerGamePacketListenerImpl
+                 d5 = d2 - rootVehicle.getZ();
+                 d7 = d3 * d3 + d4 * d4 + d5 * d5;
+                 boolean flag1 = false;
+-                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
+                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && this.player.hasPermissions(2))) { // Spigot // Lophine - disable move check for operator
+                     flag1 = true; // Paper - diff on change, this should be moved wrongly
+                     LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getName().getString(), this.player.getName().getString(), Math.sqrt(d7));
                 }
-@@ -1619,7 +1619,7 @@ public class ServerGamePacketListenerImpl
+@@ -1540,7 +1540,7 @@ public class ServerGamePacketListenerImpl
                                             // Paper start - Add fail move event
                                             io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
-                                                     targetX, targetY, targetZ, targetYRot, targetXRot, true);
+                                                     toX, toY, toZ, toYaw, toPitch, true);
 -                                            if (!event.isAllowed()) {
-+                                            if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Lophine - disable move check for operator
+                                            if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && this.player.hasPermissions(2))) { // Lophine - disable move check for operator
                                                 if (event.getLogWarning()) {
-                                             LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getPlainTextName(), xDist, yDist, zDist);
+                                                 LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
                                                 }
-@@ -1685,7 +1685,7 @@ public class ServerGamePacketListenerImpl
+@@ -1618,7 +1618,7 @@ public class ServerGamePacketListenerImpl
                                     // Paper start - Add fail move event
                                     io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY,
-                                             targetX, targetY, targetZ, targetYRot, targetXRot, true);
+                                             toX, toY, toZ, toYaw, toPitch, true);
 -                                    if (!event.isAllowed()) {
-+                                    if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Lophine - disable move check for operator
+                                    if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && this.player.hasPermissions(2))) { // Lophine - disable move check for operator
                                         movedWrongly = true;
                                         if (event.getLogWarning())
                                      // Paper end
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Fri, 1 May 2026 21:52:07 +0800
-Subject: [PATCH] Prevent teleprotAsync calls in move events
-
-
-diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1faaf7d514c23d756aa626fa93aabd8bb503463..0c5fb17e7cce18eac68183cc3b5de6fc6451dc50 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -730,7 +730,9 @@ public class ServerGamePacketListenerImpl
- 
-                     Location oldTo = to.clone();
-                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-+                    this.player.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
-                     this.cserver.getPluginManager().callEvent(event);
-+                    this.player.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
- 
-                     // If the event is cancelled we move the player back to their old location.
-                     if (event.isCancelled()) {
-@@ -1740,7 +1742,9 @@ public class ServerGamePacketListenerImpl
- 
-                                         Location oldTo = to.clone();
-                                         PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-+                                        this.player.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
-                                         this.cserver.getPluginManager().callEvent(event);
-+                                        this.player.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
- 
-                                         // If the event is cancelled we move the player back to their old location.
-                                         if (event.isCancelled()) {
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 7953b7ece0b5e3f41e85252cdfd8e400fab212ae..343e4bb41acfab4e50729aa5dbe2a071dac376a3 100644
--- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -4476,12 +4476,25 @@ public abstract class Entity
-             teleportTarget.cause(), teleportFlags, teleportComplete
-         );
-     }
-+    // Luminol start - Prevent teleprotAsync calls in move events
-+    public boolean blockTeleportAsync = false;
-+    // Luminol end
- 
-     public final boolean teleportAsync(ServerLevel destination, Vec3 pos, Float yaw, Float pitch, Vec3 velocity,
-                                        org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, long teleportFlags,
-                                        java.util.function.Consumer<Entity> teleportComplete) {
-         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot teleport entity async");
- 
-+        // Luminol start - Prevent teleprotAsync calls in move events
-+        if (this.blockTeleportAsync && me.earthme.luminol.config.modules.fixes.PreventIncorrectTeleportAsyncConfig.enabled) {
-+            if (me.earthme.luminol.config.modules.fixes.PreventIncorrectTeleportAsyncConfig.throwWhenCaught) {
-+                throw new IllegalStateException("Call teleportAsync during move events!");
-+            }
-+
-+            LOGGER.error("Calling teleportAsync during move events!", new Throwable());
-+            return false;
-+        }
-+        // Luminol end
-         if (!ServerLevel.isInSpawnableBounds(new BlockPos(ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockX(pos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockY(pos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockZ(pos)))) {
-             return false;
-         }
-diff --git a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
-index 3fcd534cee1f605a710ffc43eff4b5106c7dd40c..9b887b40236a212de513e3ceece1abfec5372ae2 100644
--- a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
-+++ b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
-@@ -282,7 +282,9 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
- 
-         if (this.lastLocation != null && !this.lastLocation.equals(to)) {
-             org.bukkit.event.vehicle.VehicleMoveEvent event = new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, this.lastLocation, to);
-+            this.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
-             event.callEvent();
-+            this.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
-         }
-         this.lastLocation = vehicle.getLocation();
-         // CraftBukkit end
-diff --git a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
-index 5ad77636d0681d1f0341cff4482ba6ad52f3583b..0ae8b5222c5f2f608af352cbaa866c493dd065aa 100644
--- a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
-+++ b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
-@@ -318,7 +318,9 @@ public abstract class AbstractMinecart extends VehicleEntity {
-         new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle).callEvent();
- 
-         if (!from.equals(to)) {
-+            this.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
-             new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to).callEvent();
-+            this.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
-         }
-         // CraftBukkit end
-         this.updateFluidInteraction();
@@ -1,35 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Thu, 12 Jun 2025 04:44:24 +0800
-Subject: [PATCH] Server I18n
+Subject: [PATCH] I18n support


 diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
-index 47cd33bce908744e64356b585853d6a8ecf82443..bb4011d3c6a1d2a5aa66e68fe719cd5eea2c0dd2 100644
+index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0a11e145f 100644
 --- a/net/minecraft/locale/Language.java
 +++ b/net/minecraft/locale/Language.java
-@@ -37,6 +37,7 @@ public abstract class Language {
-         Map<String, String> loadedData = new HashMap<>();
-         BiConsumer<String, String> output = loadedData::put;
-         parseTranslations(output, "/assets/minecraft/lang/en_us.json");
-+        fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(output); // Lophine - Server I18n
-         deprecatedInfo.applyToMap(loadedData);
-         final Map<String, String> storage = Map.copyOf(loadedData);
+@@ -36,6 +36,7 @@ public abstract class Language {
+         Map<String, String> map = new HashMap<>();
+         BiConsumer<String, String> biConsumer = map::put;
+         parseTranslations(biConsumer, "/assets/minecraft/lang/en_us.json");
+        fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(biConsumer);
+         deprecatedTranslationsInfo.applyToMap(map);
+         final Map<String, String> map1 = Map.copyOf(map);
         return new Language() {
-@@ -66,7 +67,7 @@ public abstract class Language {
+@@ -65,7 +66,7 @@ public abstract class Language {
         };
     }
 
-    private static void parseTranslations(final BiConsumer<String, String> output, final String path) {
-+    public static void parseTranslations(final BiConsumer<String, String> output, final String path) { // Lophine - private -> public
-         try (InputStream stream = Language.class.getResourceAsStream(path)) {
-             loadFromJson(stream, output);
-         } catch (IOException | JsonParseException e) {
+-    private static void parseTranslations(BiConsumer<String, String> output, String languagePath) {
+    public static void parseTranslations(BiConsumer<String, String> output, String languagePath) { // Lophine - private -> public
+         try (InputStream resourceAsStream = Language.class.getResourceAsStream(languagePath)) {
+             loadFromJson(resourceAsStream, output);
+         } catch (JsonParseException | IOException var7) {
 diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
-index a557d488e4e289a61aeb9aed0cc133a0a7ce8f8c..ca349619bcdd0682c9d66d54fc55cac268fc443b 100644
+index cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442dad2db19b 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -167,6 +167,8 @@ public class Main {
+@@ -155,6 +155,8 @@ public class Main {
                 return;
             }
 
@@ -39,10 +39,10 @@ index a557d488e4e289a61aeb9aed0cc133a0a7ce8f8c..ca349619bcdd0682c9d66d54fc55cac2
             String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
             if (awtException != null) {
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 81934fb56744dbbb3fdd100e8ec83cb634034d04..2dae0f4249eade60ac55c9fa289dd146dc3675e1 100644
+index 392d75548f7eb271a6320ac30eb301a61071d465..0e278f7b9ed85ce8c3cedd9154f817b30ff1e48a 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -239,6 +239,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
         // Paper end - initialize global and world-defaults configuration
         me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 19 May 2025 00:42:17 +0800
+Subject: [PATCH] Old zombie reinforcement
+
+
+diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
+index 14d0758aca54d9a25e369dfa8c89c930f27946c9..1324f2c8c0d6571bac36855f08354a84e0f08b70 100644
+--- a/net/minecraft/world/entity/monster/Zombie.java
+++ b/net/minecraft/world/entity/monster/Zombie.java
+@@ -341,7 +341,7 @@ public class Zombie extends Monster {
+                 int floor = Mth.floor(this.getX());
+                 int floor1 = Mth.floor(this.getY());
+                 int floor2 = Mth.floor(this.getZ());
+-                EntityType<? extends Zombie> type = this.getType();
+                EntityType<? extends Zombie> type = fun.bm.lophine.config.modules.function.OldFeatureConfig.oldZombieReinforcement ? EntityType.ZOMBIE : this.getType(); // Lophine - old zombie reinforcement
+                 Zombie zombie = type.create(level, EntitySpawnReason.REINFORCEMENT);
+                 if (zombie == null) {
+                     return true;
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 28 Jun 2026 19:32:34 +0800
-Subject: [PATCH] Teleport async if entity was moving to another region at once
-
-On folia, entity usually cannot move out of the tickregion, but sometimes it actually does(like some end pearl gun that can shoot an end pearl to the block faraway than 10000 blocks even more). To fix this, we added a temporary fix which teleport these entities to the destination instead running its move logics so that we could ensure anything is under control.But one thing need to consider is that teleportAsync is actually calling halfway of the entity tick and there is still something running when teleportAsync called, which is actually modified the entity in another thread, so there is still need an improvement
-
-Reference from : https://github.com/KaiijuMC/Kaiiju/blob/ver/1.20.1/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch
-
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index c04917f31585d9d670cc98cda8eb36187f4261d7..9270b887448023b6ace2e7fae6b632755ce90600 100644
--- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -1163,6 +1163,19 @@ public abstract class Entity
-             this.moveStartZ = this.getZ();
-             this.moveVector = delta;
-         }
-+        //Luminol start - Fix high position moving
-+        // Filter the threads as it may be called by the chunk system worker thread
-+        if (me.earthme.luminol.config.modules.fixes.FoliaEntityMovingFixConfig.enabled && ca.spottedleaf.moonrise.common.util.TickThread.isTickThread()){
-+            var finalPosition = delta.add(this.position);
-+            // not NaN (Prevent incorrect checks under NaN minecarts)
-+            if (!Double.isNaN(finalPosition.x) && !Double.isNaN(finalPosition.y) && !Double.isNaN(finalPosition.z)) {
-+                // kill tick passively if it's moving out of region and we'll catch this exception
-+                if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.level,finalPosition)) {
-+                    throw new me.earthme.luminol.utils.EntityMoveOutOfRegionException(this, delta, moverType);
-+                }
-+            }
-+        }
-+        //Luminol end
-         try {
-         // Paper end - detailed watchdog information
-         if (this.noPhysics) {
-diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index a0eb1f608a99301e0197ab1d1a6fbbb0a0be4ce0..dc28223684091cd0d8dbf7ff01626b20e4f1b662 100644
--- a/net/minecraft/world/level/Level.java
-+++ b/net/minecraft/world/level/Level.java
-@@ -1571,6 +1571,25 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     public <T extends Entity> void guardEntityTick(final Consumer<T> tick, final T entity) {
-         try {
-             tick.accept(entity);
-+        } catch (me.earthme.luminol.utils.EntityMoveOutOfRegionException moveOutOfRegionException) {  // Luminol - Teleport async if entity was moving to another region at once
-+            // Luminol start - Teleport async if entity was moving to another region at once
-+            final Entity ent = moveOutOfRegionException.getEntity();
-+            var currPosition = ent.position();
-+            var toPosition = moveOutOfRegionException.getMovement().add(currPosition);
-+
-+            if (me.earthme.luminol.config.modules.fixes.FoliaEntityMovingFixConfig.warnOnDetected) {
-+                MinecraftServer.LOGGER.warn("Entity {} with entityId {} has tried moving to another region!",ent, ent.getId());
-+            }
-+
-+            ent.getBukkitEntity().taskScheduler.schedule(entityFresh -> entityFresh.teleportAsync(
-+                    (ServerLevel) entityFresh.level(),
-+                    toPosition,
-+                    entityFresh.getYRot(), entityFresh.getXRot(),
-+                    entityFresh.getDeltaMovement(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.UNKNOWN,
-+                    Entity.TELEPORT_FLAG_LOAD_CHUNK | Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS,
-+                    null
-+            ), null, 1L);
-+            // Luminol end
-         } catch (Throwable t) {
-             // Paper start - Prevent block entity and entity crashes
-             final String msg = String.format("Entity threw exception at %s:%s,%s,%s", io.papermc.paper.util.MCUtil.getLevelName(entity.level()), entity.getX(), entity.getY(), entity.getZ());
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Wed, 8 Jul 2026 21:37:19 +0800
-Subject: [PATCH] Fix teleport missing original rotation and velocity
-
-
-diff --git a/io/papermc/paper/threadedregions/TeleportUtils.java b/io/papermc/paper/threadedregions/TeleportUtils.java
-index 2a64a5b2cf049661fe3f5a22ddfa39979624f5ec..335e9775e0d9a61f0e9641aba691a3bdf3ac7f2b 100644
--- a/io/papermc/paper/threadedregions/TeleportUtils.java
-+++ b/io/papermc/paper/threadedregions/TeleportUtils.java
-@@ -41,7 +41,7 @@ public final class TeleportUtils {
-                             return;
-                         }
-                         (useFromRootVehicle ? realFrom.getRootVehicle() : realFrom).teleportAsync(
-                            ((CraftWorld)loc.getWorld()).getHandle(), pos, null, null, null,
-+                            ((CraftWorld)loc.getWorld()).getHandle(), pos, yaw, pitch, null, // Camellia - Fix teleport missing original rotation and velocity
-                             cause, teleportFlags, onComplete
-                         );
-                     },
-diff --git a/net/minecraft/server/commands/TeleportCommand.java b/net/minecraft/server/commands/TeleportCommand.java
-index 13d7965fd4f99f0848b080349df41f8b1c31a19b..5b83f2edd6afe94c28bf491afab737e92fb89dc0 100644
--- a/net/minecraft/server/commands/TeleportCommand.java
-+++ b/net/minecraft/server/commands/TeleportCommand.java
-@@ -248,8 +248,8 @@ public class TeleportCommand {
-         // Folia start - region threading
-         if (true) {
-             Vec3 posFinal = new Vec3(x, y, z);
-            Float yawFinal = Float.valueOf(newYRot);
-            Float pitchFinal = Float.valueOf(newXRot);
-+            Float yawFinal = Float.valueOf(newYRot + victim.getYRot()); // Camellia - Fix teleport missing original rotation and velocity
-+            Float pitchFinal = Float.valueOf(newXRot + victim.getXRot()); // Camellia - Fix teleport missing original rotation and velocity
-             victim.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> {
-                 nmsEntity.stopRiding();
-                 nmsEntity.teleportAsync(
-diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-index fb00f70505a6c548cd1311d7ea55c6a501e814e3..4df9a3356cfdee52761db47694e59779976840db 100644
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-+++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
-@@ -99,7 +99,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-                 }
- 
-                 entity.teleportAsync(
-                    checkWorld, to, null, null, null,
-+                    checkWorld, to, null, null, entity.getDeltaMovement(), // Camellia - Fix teleport missing original rotation and velocity
-                     org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL,
-                     // chunk could have been unloaded
-                     Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS | Entity.TELEPORT_FLAG_LOAD_CHUNK,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Helvetica Volubi	47bc8042d2	backport(perf): add cache for replay api	2026-01-28 23:19:55 +08:00
Helvetica Volubi	03849ba73c	backport(feat): add save-all support	2026-01-16 02:58:10 +08:00
Helvetica Volubi	ef3d1625b8	backport: add removed check before all checks start in addEffects	2026-01-13 21:44:57 +08:00
Helvetica Volubi	c4acc049d8	fix dragon problem in overworld origin fixed in Luminol 1.21.11	2026-01-04 18:54:26 +08:00
dependabot[bot]	3dc7b1edb7	[ci skip]build(deps): bump JetBrains/qodana-action from 2025.2 to 2025.3 (#114 ) Bumps [JetBrains/qodana-action](https://github.com/jetbrains/qodana-action) from 2025.2 to 2025.3. - [Release notes](https://github.com/jetbrains/qodana-action/releases) - [Commits](https://github.com/jetbrains/qodana-action/compare/v2025.2...v2025.3) --- updated-dependencies: - dependency-name: JetBrains/qodana-action dependency-version: '2025.3' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-29 00:56:08 +08:00
Helvetica Volubi	ab2992a2ef	fix some bug caused by `5622d49d49`	2025-12-27 20:51:20 +08:00
Helvetica Volubi	5622d49d49	backport: refix waypoint related issue: https://github.com/LuminolMC/Lophine/issues/110 origin commit: `bed0bfff06`	2025-12-26 03:49:37 +08:00
Helvetica Volubi	7fdce6aedd	backport: fix waypoint module origin commit: `db772aaf62`	2025-12-23 10:26:39 +08:00