[ci skip] update information of QQ and DC

fix stop command could stop all the same type of action when a stop action called

fix some typo in command reply

.github/FUNDING.yml

@@ -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/Luminol
+custom: [https://afdian.com/a/bm0721, https://afdian.com/a/Luminol] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,7 +1,7 @@
 name: Bug反馈 Bug report
 description:
   报告Bug，插件不兼容情况，以及其他相关问题。
-  Report issues with plugin incompatbility or other behavior related issues.
+  Report issues with plugin incompatibility or other behavior related issues.
 labels:
   - bug
   - pending
@@ -25,7 +25,7 @@ body:
         LophineMC服务端发行版本 LophineMC server release version (contains the git commit's hash)<br>
         通过执行`/version`命令将获取到的内容复制到这里。 Run `/version` on your server and paste the full, unmodified output here.
       placeholder: >
-        e.g. git-Lophine-"0635a89" (MC: 1.20.4)
+        e.g. git-Lophine-"fa1ab90" (MC: 1.21.8)
     validations:
       required: true
   - type: textarea
@@ -41,7 +41,7 @@ body:
     attributes:
       label: 观测到的实际行为 Observed/Actual behavior
       description: 你实际看到的。 What you actually saw.
-      placeholder: e.g. 使用 /tpsbar [NAME] 命令切换不了TPSBAR
+      placeholder: e.g. 使用 /tpsbar 命令切换不了TPSBAR
     validations:
       required: true
   - type: textarea
@@ -65,6 +65,20 @@ body:
         To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
     validations:
       required: true
+  - type: textarea
+    id: config-file-list
+    attributes:
+      label: 配置文件列表（如果可以）。 Config File List (if possible).
+      description:
+        服务器上的配置文件列表。
+        All config files on your server.
+        例如以下文件（或者文件夹）：
+        Example files (or folders)：
+        - \spigot.yml
+        - \bukkit.yml
+        - \config\\\*
+        - \lophine_config\\\*
+        - \luminol_config\\\*
   - type: textarea
     id: other
     attributes:

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -28,7 +28,7 @@ body:
     validations:
       required: true
   - type: textarea
-    id: othre
+    id: other
     attributes:
       label: 其他 Other
       description: 添加其他的信息。 Add any other context or screenshots about the feature request below.

.github/workflows/build.yml

@@ -7,6 +7,20 @@ on:
   pull_request:
     branches:
       - "**"
+  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"
+        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"
+        required: false
+        default: ""
+      comments:
+        description: "Add comments to release"
+        required: false
+        default: ""
 
 permissions: write-all
 
@@ -14,58 +28,127 @@ jobs:
   build:
     runs-on: ubuntu-latest
     environment: default
+    env:
+      BUILD_NUMBER: ${{ github.run_number }}
     steps:
       - name: Checkout Git Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
-      - name: Set up JDK
-        uses: actions/setup-java@v4
+      - name: Set Up JDK
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 21
+          java-version: 25
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Configure Git User Details
-        run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
+        run: git config --global user.email "ci@lophinecraft.com" && git config --global user.name "LophineCraftCI"
 
       - name: Apply All Patches
         run: ./gradlew --refresh-dependencies applyAllPatches
 
-      - name: CreateMojmapPaperclipJar
-        run: ./gradlew --refresh-dependencies createMojmapPaperclipJar
+      - name: Build Paperclip Jar
+        run: ./gradlew --refresh-dependencies createPaperclipJar
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ env.project_id_b }} CI Artifacts
-          path: lophine-server/build/libs/*-paperclip-*-mojmap.jar
+          path: lophine-server/build/libs/*-paperclip-*.jar
 
-      - name: SetENV
+      - name: Set Environment
         if: github.event_name != 'pull_request'
         run: sh scripts/SetENV.sh
 
-      - name: Publish to repo
-        if: github.event_name != 'pull_request' && env.flag_release == 'true' && false # do not push to any repo
+      - name: Check If Release Exists
+        if: github.event_name != 'pull_request' && env.flag_release == 'true'
+        run: |
+          git fetch --tags
+          if [ -n "$(git tag -l "${{ env.tag }}")" ]; then
+            echo "Release already exists"
+            release_exists=true
+          else
+            echo "Release does not exist"
+            release_exists=false
+          fi
+          if [ "$release_exists" == "true" ]; then
+            counter=1
+            while [ -n "$(git tag -l "${{ env.tag }}-${counter}")" ]; do
+              counter=$((counter + 1))
+            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'
+        run: |
+          if [[ "$GITHUB_REF_NAME" == ver/* ]] || [[ "$GITHUB_REF_NAME" == exp/* ]] || [[ "$GITHUB_REF_NAME" == dev/* ]]; then
+            echo "Branch is in expected prefixes"
+            echo "unexpect=false" >> $GITHUB_ENV
+          else
+            echo "Branch is NOT in expected prefixes"
+            echo "unexpect=true" >> $GITHUB_ENV
+          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'
         continue-on-error: true
         run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
         env:
           PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }}
           PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}
 
-      - name: Create Release
-        if: github.event_name != 'pull_request' && env.flag_release == 'true'
+      - 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'
+        run: |
+          if [ "${{ inputs.comments }}" == "" ]; then
+            echo "No comments provided"
+            echo "flag_comment=false" >> $GITHUB_ENV
+          else
+            echo "Comments provided: ${{ inputs.comments }}"
+            echo "flag_comment=true" >> $GITHUB_ENV
+          fi
+
+      - name: Create Release - No Comment
+        if: env.flag_comment == 'false'
         uses: ncipollo/release-action@v1
         with:
           tag: ${{ env.tag }}
-          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
+          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/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 }})
+            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LophineCraft/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineCraft/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
             This release is automatically compiled by GitHub Actions
+            ### Branch Info
+            > ${{ github.ref_name }}
+            ### Commit Message
+            ${{ env.commit_msg }}
+          artifacts: ${{ env.jar_dir }}
+          generateReleaseNotes: true
+          prerelease: ${{ env.pre }}
+          makeLatest: ${{ env.make_latest }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release - With Comment
+        if: env.flag_comment == 'true'
+        uses: ncipollo/release-action@v1
+        with:
+          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/LophineCraft/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LophineCraft/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
+            This release is automatically compiled by GitHub Actions
+            ### Comments
+            > ${{ inputs.comments }}
+            ### Branch Info
+            > ${{ github.ref_name }}
             ### Commit Message
             ${{ env.commit_msg }}
           artifacts: ${{ env.jar_dir }}

.github/workflows/qodana_code_quality.yml

@@ -0,0 +1,29 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: # Specify your branches here
+      - ver/* # Stable branch
+      - exp/* # Experimental branch
+      - dev/* # Development Branch
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v7
+        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
+        with:
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1658551725 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'

.gitignore

@@ -6,12 +6,10 @@ build
 
 /run
 
-/lightingluminol-server/build.gradle.kts
-/lightingluminol-api/build.gradle.kts
-/luminol-server/build.gradle.kts
+/lophine-server/build.gradle.kts
+/lophine-api/build.gradle.kts
 /luminol-server/src/minecraft
 /paper-server
-/luminol-api/build.gradle.kts
 /paper-api
 /paper-api-generator
 

README.md

@@ -1,108 +1,127 @@
-<img src="public/image/lophine/lophine3.png" alt="Logo" align="right" width="250">
+<div align="center">
+  <img src="./public/image/lophine/lophine3.png" alt="Lophine Logo" width="300">
+  
+  # Lophine
+  
+  *Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的内容（请注意，完整生电请使用Fabric）*
+  
+  ![Created At](https://img.shields.io/github/created-at/LophineCraft/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LophineCraft/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LophineCraft/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineCraft/Lophine/issues)
+  
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineCraft/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineCraft/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LophineCraft/Lophine/total?style=for-the-badge&color=red)
+  
+  ![Repo contributors](https://img.shields.io/github/contributors/LophineCraft/Lophine?style=for-the-badge&color=brightgreen)
+  
+  [English](./README_EN.md) | **中文**
+</div>
 
-# Lophine
+---
 
-<h4>Lophine 是一个基于Luminol的分支，具有许多有用的优化和可配置的原版特性，目标是在Folia上实现更多生电的实现</h4>
+## ✨ 核心特性
 
-![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square)
-[![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md)
-[![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues)
-![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square)
-![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=flat-square)
-![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=flat-square)
+- 🔧 **可配置的原版特性** - 灵活调整游戏机制以适应不同服务器需求
+- 📊 **Tpsbar 支持** - 实时显示服务器 TPS 状态
+- 🐛 **Folia Bug 修复** - 针对 Folia 已知问题的专项修复
+- 💾 **多存档格式支持** - 支持 linear 和 b_linear（linear 重新实现）存档格式
+- 🔬 **生电功能增强** - 在 Folia 上实现更多生电内容（完整生电请使用 Fabric）
+- 🛠️ **更多实用功能** - 持续添加有用的服务器功能
 
-[English](./README_EN.md) | **中文**
+## 📥 下载
 
-## 特性
+### 稳定版本
+所有发布版本都可以在 [Releases](https://github.com/LophineCraft/Lophine/releases) 页面找到。
 
-- 支持部分Bukkit插件
-- 可配置的原版特性
-- Tpsbar 支持
-- 针对folia bug的一些修复
-- linear和b_linear(linear的重新实现)存档格式支持
-- 对单线程区域性能的优化
-- 更多有用的功能
+### 开发版本
+如果您想体验最新功能，可以通过以下步骤自行构建。
 
-## 下载
+### 构建步骤
 
-任何版本都可以在 [Release](https://github.com/LuminolMC/Lophine/releases), 中找到，你也可以通过[以下步骤](./README.md#构建)自己构建。
+```bash
+# 克隆项目
+git clone https://github.com/LophineCraft/Lophine.git
+cd Lophine
 
-## 构建
-
-要构建一个paperclip jar，你需要运行以下命令。你可以在lophine-server/build/libs中找到jar（注意：需要`JDK21`）
-
- ```shell
-./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
+# 应用补丁并构建 Paperclip JAR
+./gradlew applyAllPatches && ./gradlew createPaperclipJar
 ```
 
-## 使用API
+构建完成后，您可以在 `lophine-server/build/libs` 目录中找到生成的 JAR 文件。
 
-使用 Gradle:
+## 🔌 API 使用
+
+### Gradle 配置
 
 ```kotlin
 repositories {
     maven {
-        url = "https://repo.menthamc.com/repository/maven-public/"
+        url = "https://repo.bacteriawa.com/repository/maven-public/"
     }
 }
 
 dependencies {
-    compileOnly("me.earthme.luminol:luminol-api:$VERSION")
+    compileOnly("fun.bm.lophine:lophine-api:$VERSION")
 }
- ```
+```
 
-使用 Maven
+### Maven 配置
 
 ```xml
 <repositories>
     <repository>
-        <id>menthamc</id>
-        <url>https://repo.menthamc.com/repository/maven-public/</url>
+        <id>repository</id>
+        <url>https://repo.bacteriawa.com/repository/maven-public/</url>
     </repository>
 </repositories>
 
 <dependencies>
     <dependency>
-        <groupId>me.earthme.luminol</groupId>
+        <groupId>fun.bm.lophine</groupId>
         <artifactId>luminol-api</artifactId>
         <version>$VERSION</version>
     </dependency>
 </dependencies>
 ```
 
-## 联系方式
+## 💬 社区与支持
 
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。
 
-**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)
+### 加入我们的社区
 
+- **QQ群**: [1020403749](https://qm.qq.com/cgi-bin/qm/qr?k=y_MA9UaN7PM9e9J1LIs9Eea3LK8C0h6J&jump_from=webapi&authKey=ap5f8MlbeezXYtnmpnT5ZOFljDuOyV6OAb2PIcViQ+Ilr60Ycq63FDDTsJOZDYtj)
+- **Discord**: [点击加入](https://discord.gg/UXSgPZczcy)
 
-## 关于 Issue
+### 获取帮助
 
-当您遇到任何问题时，请向我们提问，我们将尽力解决，但请记得清楚地描述您的问题并提供足够的日志等信息。
+- 📋 [提交 Issue](https://github.com/LophineCraft/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LophineCraft/Lophine/discussions)
+- 📖 [项目文档](./docs/)
 
-## 贡献代码
+## 🐛 问题反馈
 
-可查看 [Contributing](./docs/CONTRIBUTING.md)
+当您遇到任何问题时，请向我们提问，我们将尽力解决。请记得：
 
-## BStats
+- 📝 **清楚描述问题** - 详细说明问题的具体表现
+- 📋 **提供完整日志** - 包含错误日志和相关配置信息
+- 🔍 **环境信息** - 说明服务器版本、插件列表等环境详情
+- 🔄 **复现步骤** - 如果可能，请提供问题复现的具体步骤
+
+## 🤝 贡献代码
+
+我们欢迎社区贡献！详细的贡献指南请查看：
+
+- 📖 [贡献指南 (中文)](./docs/CONTRIBUTING.md)
+- 📖 [Contributing Guide (English)](./docs/CONTRIBUTING_EN.md)
+
+## 📊 项目统计
+
+### BStats 数据
 
 ![bStats](https://bstats.org/signatures/server-implementation/Lophine.svg "bStats")
 
-## 特别感谢
-
-<b>感谢[LegacyLands](https://github.com/LegacyLands)对本项目的赞助,如果你想开发一些跨folia/非folia平台的插件,[legacy-lands-library](https://github.com/LegacyLands/legacy-lands-library/)将会是个不错的lib</b>
-
-![legacy-lands-logo](public/image/legacy-lands-logo.png)
-
-## 请给我们一个 ⭐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>

README_EN.md

@@ -1,106 +1,128 @@
-<img src="public/image/lophine/lophine3.png" alt="Logo" align="right" width="250">
+<div align="center">
+  <img src="./public/image/lophine/lophine3.png" alt="Lophine Logo" width="300">
+  
+  # Lophine
+  
+  *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/LophineCraft/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LophineCraft/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LophineCraft/Lophine?style=for-the-badge&color=orange)](https://github.com/LophineCraft/Lophine/issues)
+  
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LophineCraft/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LophineCraft/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LophineCraft/Lophine/total?style=for-the-badge&color=red)
+  
+  ![Repo contributors](https://img.shields.io/github/contributors/LophineCraft/Lophine?style=for-the-badge&color=brightgreen)
+  
+  **English** | [中文](./README.md)
+</div>
 
-# Lophine
+---
 
-<h4>Lophine is a Luminol fork with many useful optimizations and configurable vanilla features, aims to provide
-more function for survival-usable circuit on folia</h4>
+## ✨ Core Features
 
-![Created At](https://img.shields.io/github/created-at/LuminolMC/Lophine?style=flat-square)
-[![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=flat-square)](LICENSE.md)
-[![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=flat-square)](https://github.com/LuminolMC/Lophine/issues)
-![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=flat-square)
-![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=flat-square)
-![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=flat-square)
+- 🔧 **Configurable Vanilla Features** - Flexibly adjust game mechanics to suit different server needs
+- 📊 **Tpsbar Support** - Real-time TPS status display
+- 🐛 **Folia Bug Fixes** - Targeted fixes for known Folia issues
+- 💾 **Multiple World Format Support** - Support for linear and b_linear (linear reimplementation) world formats
+- 🔬 **Redstone Enhancement** - More redstone functionality on Folia (use Fabric for complete redstone features)
+- 🛠️ **More Useful Functions** - Continuously adding useful server features
 
-**English** | [中文](./README.md)
+## 📥 Download
 
-## Features
+### Stable Releases
+All release versions can be found on the [Releases](https://github.com/LophineCraft/Lophine/releases) page.
 
-- Supported some Bukkit plugin
-- Configurable vanilla features
-- Tpsbar support
-- Useful fixes of bugs of folia
-- Linear and BufferedLinear(AKA. b_linear)(a reimplementation of linear) region format support
-- Useful optimizations to improve the performance of single threaded region
-- More functions
+### Development Builds
+If you want to experience the latest features, you can build it yourself following the steps below.
 
-## Download
+### Build Steps
 
-Any versions are available in the [release](https://github.com/LuminolMC/Lophine/releases), also you can build it by yourself through [the following steps](./README_EN.md#Build).
+```bash
+# Clone the project
+git clone https://github.com/LophineCraft/Lophine.git
+cd Lophine
 
-## Build
-
-To build a paperclip jar, you need to run the following command. You can find the jar in lophine-server/build/libs(Note: `JDK21` is needed)
-
- ```shell
- ./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
+# Apply patches and build Paperclip JAR
+./gradlew applyAllPatches && ./gradlew createPaperclipJar
 ```
 
-## Using API
+After building, you can find the generated JAR file in the `lophine-server/build/libs` directory.
 
-For gradle:
+## 🔌 API Usage
+
+### Gradle Configuration
 
 ```kotlin
 repositories {
     maven {
-        url = "https://repo.menthamc.com/repository/maven-public/"
+        url = "https://repo.bacteriawa.com/repository/maven-public/"
     }
 }
 
 dependencies {
-    compileOnly("me.earthme.luminol:luminol-api:$VERSION")
+    compileOnly("fun.bm.lophine:lophine-api:$VERSION")
 }
- ```
+```
 
-For maven
+### Maven Configuration
 
 ```xml
 <repositories>
     <repository>
-        <id>menthamc</id>
-        <url>https://repo.menthamc.com/repository/maven-public/</url>
+        <id>repository</id>
+        <url>https://repo.bacteriawa.com/repository/maven-public/</url>
     </repository>
 </repositories>
 
 <dependencies>
-<dependency>
-    <groupId>me.earthme.luminol</groupId>
-    <artifactId>luminol-api</artifactId>
-    <version>$VERSION</version>
-</dependency>
+    <dependency>
+        <groupId>fun.bm.lophine</groupId>
+        <artifactId>luminol-api</artifactId>
+        <version>$VERSION</version>
+        <scope>provided</scope>
+    </dependency>
 </dependencies>
 ```
 
-## Contact
+## 💬 Community & Support
 
-> If you are interested in this project or have any issue, feel free to ask us.
+> If you're interested in this project or have any questions, feel free to ask us.
 
-**QQ Group: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=hTPlI5j6XB8pgk4sdx6RkjhBPGG1r4IR&authKey=pnu6uCKQP7Sja2CJWC15Qi3BeI%2FAsh8tU4m5muufMBjbB3zz%2BwHBZCTRRdSNKhld&noverify=0&group_code=1015048616)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMinecraft) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)
+### Join Our Community
 
-## About Issue
+- **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)
 
-When you meet any problems, just ask us, we will do our best to solve it, but remember to state your problem clear and provide enough logs etc.</br>
+### Get Help
 
-## Pull Requests
+- 📋 [Submit Issues](https://github.com/LophineCraft/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LophineCraft/Lophine/discussions)
+- 📖 [Project Documentation](./docs/)
 
-See [Contributing](./docs/CONTRIBUTING_EN.md)
+## 🐛 Bug Reports
 
-## BStats
+When you encounter any issues, please ask us and we'll do our best to resolve them. Please remember to:
+
+- 📝 **Describe the problem clearly** - Provide detailed information about the specific issue
+- 📋 **Provide complete logs** - Include error logs and relevant configuration information
+- 🔍 **Environment details** - Specify server version, plugin list, and other environment details
+- 🔄 **Reproduction steps** - If possible, provide specific steps to reproduce the issue
+
+## 🤝 Contributing
+
+We welcome community contributions! For detailed contribution guidelines, please see:
+
+- 📖 [Contributing Guide (English)](./docs/CONTRIBUTING_EN.md)
+- 📖 [贡献指南 (中文)](./docs/CONTRIBUTING.md)
+
+## 📊 Project Statistics
+
+### BStats Data
 
 ![bStats](https://bstats.org/signatures/server-implementation/Lophine.svg "bStats")
 
-## Special Thanks
+## ⭐ Give Us a Star!
 
-Thanks [LegacyLands](https://github.com/LegacyLands) for sponsoring this project.If you want to develop some crossing folia/non-folia platform plugins, [legacy-lands-library](https://github.com/LegacyLands/legacy-lands-library/) will be a nice choice for you
-
-![legacy-lands-logo](public/image/legacy-lands-logo.png)
-
-## Please ⭐star us!
-
-<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>
+> Every free ⭐Star you give is the motivation for our every step forward.

build.gradle.kts

@@ -3,14 +3,17 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java // TODO java launcher tasks
-    id("moe.luminolmc.hyacinthusweight.patcher") version "+" // Automatically pulls the latest
+    id("moe.luminolmc.hyacinthusweight.patcher")
 }
 
 paperweight {
+    filterPatches = false
     upstreams.register("luminol") {
-        repo = github("LuminolMC", "Luminol")
+        repo = github("LuminolCustomArchive", "Luminol")
         ref = providers.gradleProperty("luminolRef")
 
+        println("Upstream commit ref: " + ref.get())
+
         patchFile {
             path = "luminol-server/build.gradle.kts"
             outputFile = file("lophine-server/build.gradle.kts")
@@ -41,7 +44,7 @@ paperweight {
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-val menthaMavenPublicUrl = "https://repo.menthamc.com/repository/maven-public/";
+val bacteriawaMavenPublicUrl = "https://repo.bacteriawa.com/repository/maven-public/";
 
 subprojects {
     apply(plugin = "java-library")
@@ -49,14 +52,14 @@ subprojects {
 
     extensions.configure<JavaPluginExtension> {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
-        maven(menthaMavenPublicUrl)
+        maven(bacteriawaMavenPublicUrl)
     }
 
     dependencies {
@@ -69,7 +72,7 @@ subprojects {
     }
     tasks.withType<JavaCompile>().configureEach {
         options.encoding = Charsets.UTF_8.name()
-        options.release = 21
+        options.release = 25
         options.isFork = true
     }
     tasks.withType<Javadoc>().configureEach {
@@ -88,8 +91,8 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            maven("https://repo.menthamc.com/repository/maven-snapshots/") {
-                name = "MenthaMC"
+            maven("https://repo.bacteriawa.com/repository/maven-releases/") {
+                name = "Bacteriawa"
                 credentials(PasswordCredentials::class) {
                     username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")
                     password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD")
@@ -106,4 +109,4 @@ subprojects {
             }
         }
     }
-}
+}

docs/carpet-compat-status.md

@@ -0,0 +1,89 @@
+### 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` 动作 |

gradle.properties

@@ -1,10 +1,15 @@
 group=fun.bm.lophine
-version=1.21.8-R0.1-SNAPSHOT
-mcVersion=1.21.8
-release=2
-# 0 for skip release, 1 for pre-release, 2 for release
+mcVersion=26.2
+apiVersion=26.2
+channel=STABLE
+clipVersion=3.0.18
+weightVersion=2.0.15
+# true for release, false for skip release, pre for pre-release
+release=pre
+# true for push to repo, false for skip push repo, auto for detect by release value
+pushRepo=auto
 
-luminolRef=725d8a9c545b08b4b9dbeca1b635056fdbacfa28
+luminolRef=bd964477d5dfea9a2349541c1a75c5afbebe48db
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

lophine-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/luminol-api/build.gradle.kts
 +++ b/luminol-api/build.gradle.kts
-@@ -103,20 +_,24 @@
+@@ -107,20 +_,24 @@
              srcDir(generatedDir)
              srcDir(file("../paper-api/src/main/java"))
              srcDir(file("../folia-api/src/main/java"))

lophine-api/paper-patches/features/0002-Add-cancel-task-by-task-id-in-FoliaGlobalRegionSched.patch

@@ -0,0 +1,21 @@
+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);
+ }

lophine-api/paper-patches/features/0003-Leaves-Add-fakeplayer-api.patch

@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sat, 30 Aug 2025 16:51:26 +0800
+Subject: [PATCH] Leaves: Add fakeplayer api
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+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
+--- 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();
+     }
+     // Leaves end - Feature API
++
++    // Leaves start - Bot API
++    /**
++     * Returns a bot manager.
++     *
++     * @return Bot Manager
++     */
++    public static @NotNull org.leavesmc.leaves.entity.bot.BotManager getBotManager() {
++        return server.getBotManager();
++    }
++    // Leaves end - Bot API
+ }
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 48e53223ba7edeca5256244480441a56a6657075..f4f64538d13f3dba5a1cd8f0d24d1fd2e8b75749 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2826,4 +2826,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
++
++    // Leaves start - Bot API
++    /**
++     * Returns a bot manager.
++     *
++     * @return Bot Manager
++     */
++    @NotNull org.leavesmc.leaves.entity.bot.BotManager getBotManager();
++    // Leaves end - Bot API
+ }

lophine-api/paper-patches/features/0004-Leaves-Replay-Mod-API.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 16 Nov 2025 15:50:28 +0800
+Subject: [PATCH] Leaves: Replay Mod API
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+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
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -3063,4 +3063,10 @@ public final class Bukkit {
+         return server.getBotManager();
+     }
+     // Leaves end - Bot API
++
++    // Leaves start - Photographer API
++    public static @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager() {
++        return server.getPhotographerManager();
++    }
++    // Leaves end - Photographer API
+ }
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index f4f64538d13f3dba5a1cd8f0d24d1fd2e8b75749..2f4cc1115170557389f577f995f1bfaed1ec2f71 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2835,4 +2835,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      */
+     @NotNull org.leavesmc.leaves.entity.bot.BotManager getBotManager();
+     // Leaves end - Bot API
++
++    // Leaves start - Photographer API
++    @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();
++    // Leaves end - Photographer API
+ }

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/Bot.java

@@ -0,0 +1,103 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.entity.bot.action.BotAction;
+
+import java.util.UUID;
+
+/**
+ * Represents a fakeplayer
+ */
+public interface Bot extends Player {
+
+    /**
+     * Gets the fakeplayer skin
+     *
+     * @return fakeplayer skin name
+     */
+    @Nullable String getSkinName();
+
+    /**
+     * Gets the fakeplayer name without prefix and suffix
+     *
+     * @return fakeplayer raw name
+     */
+    @NotNull String getRawName();
+
+    /**
+     * Gets the creator's UUID of the fakeplayer
+     *
+     * @return creator's UUID
+     */
+    @Nullable UUID getCreatePlayerUUID();
+
+    /**
+     * Add an action to the fakeplayer
+     *
+     * @param action bot action
+     */
+    <T extends BotAction<T>> void addAction(@NotNull T action);
+
+    /**
+     * Get the copy action in giving index
+     *
+     * @param index index of actions
+     * @return Action of that index
+     */
+    BotAction<?> getAction(int index);
+
+    /**
+     * Get action size
+     *
+     * @return size
+     */
+    int getActionSize();
+
+    /**
+     * Stop the action in giving index
+     *
+     * @param index index of actions
+     */
+    void stopAction(int index);
+
+    /**
+     * Stop all the actions of the fakeplayer
+     */
+    void stopAllActions();
+
+    /**
+     * Remove the fakeplayer
+     *
+     * @param save should save
+     * @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);
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/BotCreator.java

@@ -0,0 +1,69 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+public interface BotCreator {
+
+    static BotCreator of(String rawName, Location location) {
+        return Bukkit.getBotManager().botCreator(rawName, location);
+    }
+
+    BotCreator name(String name);
+
+    BotCreator skinName(String skinName);
+
+    BotCreator skin(String[] skin);
+
+    /**
+     * Sets the skin of the bot using the Mojang API based on the provided skin name.
+     * <p>
+     * Need Async.
+     *
+     * @return BotCreator
+     */
+    BotCreator mojangAPISkin();
+
+    BotCreator location(@NotNull Location location);
+
+    BotCreator creator(@Nullable CommandSender creator);
+
+    /**
+     * Create a bot directly
+     *
+     * @return a bot, null spawn fail
+     */
+    @Nullable Bot spawn();
+
+    /**
+     * Create a bot and apply skin of player names `skinName` from MojangAPI
+     * just like `mojangAPISkin().spawn()`, but async
+     * <p>
+     * you can not get the bot instance instantly because get skin in on async thread
+     *
+     * @param consumer Consumer
+     */
+    void spawnWithSkin(Consumer<Bot> consumer);
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/BotManager.java

@@ -0,0 +1,65 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot;
+
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.entity.bot.action.BotAction;
+
+import java.util.Collection;
+import java.util.UUID;
+
+/**
+ * Simple fakeplayer manager
+ */
+public interface BotManager {
+
+    /**
+     * Gets a fakeplayer object by the given uuid.
+     *
+     * @param uuid the uuid to look up
+     * @return a fakeplayer if one was found, null otherwise
+     */
+    @Nullable Bot getBot(@NotNull UUID uuid);
+
+    /**
+     * Gets a fakeplayer object by the given name.
+     *
+     * @param name the name to look up
+     * @return a fakeplayer if one was found, null otherwise
+     */
+    @Nullable Bot getBot(@NotNull String name);
+
+    /**
+     * Gets a view of all currently logged in fakeplayers. This view is a reused object, making some operations like Collection.size() zero-allocation.
+     *
+     * @return a view of fakeplayers.
+     */
+    Collection<Bot> getBots();
+
+    /**
+     * Create a bot action by class.
+     *
+     * @param type action class
+     * @return a bot action instance if one was found, null otherwise
+     */
+    <T extends BotAction<T>> T newAction(@NotNull Class<T> type);
+
+    BotCreator botCreator(@NotNull String rawName, @NotNull Location location);
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/AttackAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to attack entities.
+ */
+public interface AttackAction extends TimerBotAction<AttackAction> {
+    static AttackAction create() {
+        return Bukkit.getBotManager().newAction(AttackAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/BotAction.java

@@ -0,0 +1,102 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import java.util.UUID;
+import java.util.function.Consumer;
+
+/**
+ * Represents an action that can be performed by a Bot.
+ * <p>
+ * This interface defines the basic properties of an action (such as name and UUID)
+ * and lifecycle event callbacks (success, failure, stop).
+ *
+ * @param <T> the type of the callback parameter, usually a context object related to the action
+ */
+public interface BotAction<T> {
+
+    /**
+     * Gets the name of this action.
+     *
+     * @return the action name
+     */
+    String getName();
+
+    /**
+     * Gets the UUID of this action.
+     *
+     * @return the UUID of the action
+     */
+    UUID getUUID();
+
+    /**
+     * Sets whether this action is cancelled.
+     *
+     * @param cancel true to cancel the action, false otherwise
+     */
+    void setCancelled(boolean cancel);
+
+    /**
+     * Checks whether this action has been cancelled.
+     *
+     * @return true if cancelled, false otherwise
+     */
+    boolean isCancelled();
+
+    /**
+     * Sets the callback to be executed when the action fails.
+     *
+     * @param onFail the callback to execute on failure, with a parameter of type T
+     */
+    void setOnFail(Consumer<T> onFail);
+
+    /**
+     * Gets the callback to be executed when the action fails.
+     *
+     * @return the failure callback
+     */
+    Consumer<T> getOnFail();
+
+    /**
+     * Sets the callback to be executed when the action succeeds.
+     *
+     * @param onSuccess the callback to execute on success, with a parameter of type T
+     */
+    void setOnSuccess(Consumer<T> onSuccess);
+
+    /**
+     * Gets the callback to be executed when the action succeeds.
+     *
+     * @return the success callback
+     */
+    Consumer<T> getOnSuccess();
+
+    /**
+     * Sets the callback to be executed when the action is stopped.
+     *
+     * @param onStop the callback to execute on stop, with a parameter of type T
+     */
+    void setOnStop(Consumer<T> onStop);
+
+    /**
+     * Gets the callback to be executed when the action is stopped.
+     *
+     * @return the stop callback
+     */
+    Consumer<T> getOnStop();
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/BreakBlockAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to break a block.
+ */
+public interface BreakBlockAction extends TimerBotAction<BreakBlockAction> {
+    static BreakBlockAction create() {
+        return Bukkit.getBotManager().newAction(BreakBlockAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/DropAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to drop all items in its inventory.
+ */
+public interface DropAction extends TimerBotAction<DropAction> {
+    static DropAction create() {
+        return Bukkit.getBotManager().newAction(DropAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/FishAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to perform auto fishing.
+ */
+public interface FishAction extends TimerBotAction<FishAction> {
+    static FishAction create() {
+        return Bukkit.getBotManager().newAction(FishAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/JumpAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to perform a jump.
+ */
+public interface JumpAction extends TimerBotAction<JumpAction> {
+    static JumpAction create() {
+        return Bukkit.getBotManager().newAction(JumpAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/LookAction.java

@@ -0,0 +1,71 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+/**
+ * Represents an action for a bot to look at a specific position or player.
+ * <p>
+ * If both a position and a player are set, the player target takes precedence.
+ */
+public interface LookAction extends BotAction<LookAction> {
+
+    /**
+     * Sets the position in the world for the bot to look at.
+     * <p>
+     * If a player target is set via {@link #setTarget(Player)}, the bot will look at the player instead of this position.
+     *
+     * @param pos the {@link Vector} representing the position to look at
+     * @return this {@code LookAction} instance for method chaining
+     */
+    LookAction setPos(Vector pos);
+
+    /**
+     * Gets the position in the world that the bot is set to look at.
+     * <p>
+     * If a player target is set, this value may be ignored.
+     *
+     * @return the {@link Vector} position to look at, or {@code null} if not set
+     */
+    Vector getPos();
+
+    /**
+     * Sets the player for the bot to look at.
+     * <p>
+     * When a player is set as the target, the bot will continuously look at the player's current position,
+     * overriding any position set by {@link #setPos(Vector)}.
+     *
+     * @param player the {@link Player} to look at, or {@code null} to clear the target
+     * @return this {@code LookAction} instance for method chaining
+     */
+    LookAction setTarget(Player player);
+
+    /**
+     * Gets the player that the bot is set to look at.
+     *
+     * @return the {@link Player} target, or {@code null} if not set
+     */
+    Player getTarget();
+
+    static LookAction create() {
+        return Bukkit.getBotManager().newAction(LookAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/MountAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to mount to nearby vehicles.
+ */
+public interface MountAction extends BotAction<MountAction> {
+    static MountAction create() {
+        return Bukkit.getBotManager().newAction(MountAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/MoveAction.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to move to a specific direction.
+ */
+public interface MoveAction extends StateBotAction<MoveAction> {
+
+    /**
+     * Gets the direction of the move action.
+     *
+     * @return the direction of the move action
+     */
+    MoveDirection getDirection();
+
+    /**
+     * Sets the direction of the move action.
+     *
+     * @param direction the direction to set
+     * @return this action instance
+     */
+    MoveAction setDirection(MoveDirection direction);
+
+    /**
+     * Represents possible movement directions for the bot.
+     */
+    enum MoveDirection {
+        FORWARD("forward"),
+        BACKWARD("backward"),
+        LEFT("left"),
+        RIGHT("right");
+
+        public final String name;
+
+        MoveDirection(String name) {
+            this.name = name;
+        }
+    }
+
+    static MoveAction create() {
+        return Bukkit.getBotManager().newAction(MoveAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/RotationAction.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to rotate to a specific yaw and pitch.
+ */
+public interface RotationAction extends BotAction<RotationAction> {
+
+    /**
+     * Sets the yaw of the rotation.
+     *
+     * @param yaw the yaw to set
+     * @return this action instance
+     */
+    RotationAction setYaw(float yaw);
+
+    /**
+     * Sets the pitch of the rotation.
+     *
+     * @param pitch the pitch to set
+     * @return this action instance
+     */
+    RotationAction setPitch(float pitch);
+
+    /**
+     * Gets the yaw of the rotation.
+     *
+     * @return the yaw
+     */
+    float getYaw();
+
+    /**
+     * Gets the pitch of the rotation.
+     *
+     * @return the pitch
+     */
+    float getPitch();
+
+    static RotationAction create() {
+        return Bukkit.getBotManager().newAction(RotationAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/SneakAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to sneak.
+ */
+public interface SneakAction extends StateBotAction<SneakAction> {
+    static SneakAction create() {
+        return Bukkit.getBotManager().newAction(SneakAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/StateBotAction.java

@@ -0,0 +1,27 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+/**
+ * Represents a type of bot action that places the bot in a specific state while the action is active.
+ * When the action is stopped, the associated state is removed from the bot.
+ *
+ * @param <E> The type of entity that this action operates on.
+ */
+public interface StateBotAction<E> extends BotAction<E> {
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/SwapAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to swap items between the main hand and off-hand.
+ */
+public interface SwapAction extends BotAction<SwapAction> {
+    static SwapAction create() {
+        return Bukkit.getBotManager().newAction(SwapAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/SwimAction.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action for a bot to float up in water.
+ */
+public interface SwimAction extends StateBotAction<SwimAction> {
+    static SwimAction create() {
+        return Bukkit.getBotManager().newAction(SwimAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/TimerBotAction.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+/**
+ * Represents a scheduled bot task that runs periodically.
+ * <p>
+ * TimerBotAction allows configuration of start delay, execution interval, and the number of executions.
+ * It is intended for bot actions that need to be triggered at regular intervals.
+ *
+ * @param <E> the type of entity this action operates on
+ */
+public interface TimerBotAction<E> extends BotAction<E> {
+
+    /**
+     * Sets the delay in ticks before the task starts for the first time.
+     *
+     * @param delayTick the number of ticks to delay before the first execution
+     */
+    void setStartDelayTick(int delayTick);
+
+    /**
+     * Gets the delay in ticks before the task starts for the first time.
+     *
+     * @return the number of ticks to delay before the first execution
+     */
+    int getStartDelayTick();
+
+    /**
+     * Sets the interval in ticks between each execution of the task.
+     *
+     * @param intervalTick the number of ticks between executions
+     */
+    void setDoIntervalTick(int intervalTick);
+
+    /**
+     * Gets the interval in ticks between each execution of the task.
+     *
+     * @return the number of ticks between executions
+     */
+    int getDoIntervalTick();
+
+    /**
+     * Sets the total number of times the task should be executed.
+     *
+     * @param doNumber the total number of executions
+     */
+    void setDoNumber(int doNumber);
+
+    /**
+     * Gets the total number of times the task should be executed.
+     *
+     * @return the total number of executions
+     */
+    int getDoNumber();
+
+    /**
+     * Gets the number of ticks remaining until the next execution.
+     *
+     * @return the number of ticks until the next execution
+     */
+    int getTickToNext();
+
+    /**
+     * Gets the number of executions remaining for this task.
+     *
+     * @return the number of executions remaining
+     */
+    int getDoNumberRemaining();
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot only uses an item, without using it on blocks or entities.
+ */
+public interface UseItemAction extends TimerBotAction<UseItemAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemAction setUseTickTimeout(int timeout);
+
+    static UseItemAction create() {
+        return Bukkit.getBotManager().newAction(UseItemAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAutoAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot uses an item, fully simulating the effect of a player right-clicking.
+ */
+public interface UseItemAutoAction extends TimerBotAction<UseItemAutoAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemAutoAction setUseTickTimeout(int timeout);
+
+    static UseItemAutoAction create() {
+        return Bukkit.getBotManager().newAction(UseItemAutoAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOffhandAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot only uses the item in its offhand, without using it on blocks or entities.
+ */
+public interface UseItemOffhandAction extends TimerBotAction<UseItemOffhandAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemOffhandAction setUseTickTimeout(int timeout);
+
+    static UseItemOffhandAction create() {
+        return Bukkit.getBotManager().newAction(UseItemOffhandAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot uses an item on a block.
+ */
+public interface UseItemOnAction extends TimerBotAction<UseItemOnAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemOnAction setUseTickTimeout(int timeout);
+
+    static UseItemOnAction create() {
+        return Bukkit.getBotManager().newAction(UseItemOnAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnOffhandAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot uses an item in its offhand on a block.
+ */
+public interface UseItemOnOffhandAction extends TimerBotAction<UseItemOnOffhandAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemOnOffhandAction setUseTickTimeout(int timeout);
+
+    static UseItemOnOffhandAction create() {
+        return Bukkit.getBotManager().newAction(UseItemOnOffhandAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot uses an item to an entity.
+ */
+public interface UseItemToAction extends TimerBotAction<UseItemToAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemToAction setUseTickTimeout(int timeout);
+
+    static UseItemToAction create() {
+        return Bukkit.getBotManager().newAction(UseItemToAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToOffhandAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.bot.action;
+
+import org.bukkit.Bukkit;
+
+/**
+ * Represents an action where a bot uses an item in its offhand to an entity.
+ */
+public interface UseItemToOffhandAction extends TimerBotAction<UseItemToOffhandAction> {
+
+    /**
+     * Gets the equivalent right-click hold duration timeout in ticks.
+     * Default is -1, which means no timeout.
+     *
+     * @return the equivalent right-click hold duration timeout
+     */
+    int getUseTickTimeout();
+
+    /**
+     * Sets the equivalent right-click hold duration timeout in ticks.
+     *
+     * @param timeout the equivalent right-click hold duration timeout
+     * @return this action instance
+     */
+    UseItemToOffhandAction setUseTickTimeout(int timeout);
+
+    static UseItemToOffhandAction create() {
+        return Bukkit.getBotManager().newAction(UseItemToOffhandAction.class);
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/photographer/Photographer.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.photographer;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+
+public interface Photographer extends Player {
+
+    @NotNull String getId();
+
+    void setRecordFile(@NotNull File file);
+
+    void stopRecording();
+
+    void stopRecording(boolean async);
+
+    void stopRecording(boolean async, boolean save);
+
+    void pauseRecording();
+
+    void resumeRecording();
+
+    void setFollowPlayer(@Nullable Player player);
+}

lophine-api/src/main/java/org/leavesmc/leaves/entity/photographer/PhotographerManager.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.entity.photographer;
+
+import org.bukkit.Location;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.replay.BukkitRecorderOption;
+
+import java.util.Collection;
+import java.util.UUID;
+
+public interface PhotographerManager {
+    @Nullable Photographer getPhotographer(@NotNull UUID uuid);
+
+    @Nullable Photographer getPhotographer(@NotNull String id);
+
+    @Nullable Photographer createPhotographer(@NotNull String id, @NotNull Location location);
+
+    @Nullable Photographer createPhotographer(@NotNull String id, @NotNull Location location, @NotNull BukkitRecorderOption recorderOption);
+
+    void removePhotographer(@NotNull String id);
+
+    void removePhotographer(@NotNull UUID uuid);
+
+    void removeAllPhotographers();
+
+    Collection<Photographer> getPhotographers();
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotActionEvent.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+import java.util.UUID;
+
+public abstract class BotActionEvent extends BotEvent {
+
+    private final String actionName;
+    private final UUID actionUUID;
+
+    public BotActionEvent(@NotNull Bot who, String actionName, UUID actionUUID) {
+        super(who);
+        this.actionName = actionName;
+        this.actionUUID = actionUUID;
+    }
+
+    @NotNull
+    public String getActionName() {
+        return actionName;
+    }
+
+    public UUID getActionUUID() {
+        return actionUUID;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotActionExecuteEvent.java

@@ -0,0 +1,68 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+import java.util.UUID;
+
+public class BotActionExecuteEvent extends BotActionEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private Result result = Result.PASS;
+
+    public BotActionExecuteEvent(@NotNull Bot who, String actionName, UUID actionUUID) {
+        super(who, actionName, actionUUID);
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return result != Result.PASS;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.result = cancel ? Result.SOFT_CANCEL : Result.PASS;
+    }
+
+    public void hardCancel() {
+        this.result = Result.HARD_CANCEL;
+    }
+
+    public Result getResult() {
+        return this.result;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public enum Result {
+        PASS, SOFT_CANCEL, HARD_CANCEL
+
+    }
+}
+

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotActionScheduleEvent.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.command.CommandSender;
+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;
+
+import java.util.UUID;
+
+public class BotActionScheduleEvent extends BotActionEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private final CommandSender sender;
+    private boolean cancel = false;
+
+    public BotActionScheduleEvent(@NotNull Bot who, String actionName, UUID actionUUID, CommandSender sender) {
+        super(who, actionName, actionUUID);
+        this.sender = sender;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @Nullable
+    public CommandSender getSender() {
+        return sender;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotActionStopEvent.java

@@ -0,0 +1,72 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.command.CommandSender;
+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;
+
+import java.util.UUID;
+
+public class BotActionStopEvent extends BotActionEvent implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private final CommandSender sender;
+    private final Reason reason;
+    private boolean cancel = false;
+
+    public BotActionStopEvent(@NotNull Bot who, String actionName, UUID actionUUID, Reason stopReason, CommandSender sender) {
+        super(who, actionName, actionUUID);
+        this.reason = stopReason;
+        this.sender = sender;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    public Reason getReason() {
+        return reason;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @Nullable
+    public CommandSender getSender() {
+        return sender;
+    }
+
+    public enum Reason {
+        DONE, COMMAND, PLUGIN, INTERNAL
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotConfigModifyEvent.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+public class BotConfigModifyEvent extends BotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private final String configName;
+    private final String[] configValue;
+    private final CommandSender sender;
+    private boolean cancel;
+
+    public BotConfigModifyEvent(@NotNull Bot who, String configName, String[] configValue, CommandSender sender) {
+        super(who);
+        this.configName = configName;
+        this.configValue = configValue;
+        this.sender = sender;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @NotNull
+    public String getConfigName() {
+        return configName;
+    }
+
+    @NotNull
+    public String[] getConfigValue() {
+        return configValue;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotCreateEvent.java

@@ -0,0 +1,135 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Call when a fakeplayer created
+ */
+public class BotCreateEvent extends Event implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private final String bot;
+    private final String skin;
+    private final CreateReason reason;
+    private final CommandSender creator;
+    private Location createLocation;
+    private boolean cancel = false;
+
+    public BotCreateEvent(@NotNull final String who, @NotNull final String skin, @NotNull final Location createLocation, @NotNull CreateReason reason, @Nullable CommandSender creator) {
+        this.bot = who;
+        this.skin = skin;
+        this.createLocation = createLocation;
+        this.reason = reason;
+        this.creator = creator;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Gets the fakeplayer name
+     *
+     * @return fakeplayer name
+     */
+    public String getBot() {
+        return bot;
+    }
+
+    /**
+     * Gets the location to create the fakeplayer
+     *
+     * @return Location to create the fakeplayer
+     */
+    @NotNull
+    public Location getCreateLocation() {
+        return createLocation;
+    }
+
+    /**
+     * Sets the location to create the fakeplayer
+     *
+     * @param createLocation location to create the fakeplayer
+     */
+    public void setCreateLocation(@NotNull Location createLocation) {
+        this.createLocation = createLocation;
+    }
+
+    /**
+     * Gets the fakeplayer skin
+     *
+     * @return fakeplayer skin name
+     */
+    @Nullable
+    public String getSkin() {
+        return skin;
+    }
+
+    /**
+     * Gets the create reason of the bot
+     *
+     * @return create reason
+     */
+    @NotNull
+    public CreateReason getReason() {
+        return reason;
+    }
+
+    /**
+     * Gets the creator of the bot
+     * if the create reason is not COMMAND, the creator might be null
+     *
+     * @return An optional of creator
+     */
+    @Nullable
+    public CommandSender getCreator() {
+        return creator;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public enum CreateReason {
+        COMMAND,
+        PLUGIN,
+        INTERNAL,
+        UNKNOWN,
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotDeathEvent.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+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 BotDeathEvent extends BotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private boolean cancel = false;
+    private boolean sendDeathMessage;
+    private Component deathMessage;
+
+    public BotDeathEvent(@NotNull Bot who, @Nullable Component deathMessage, boolean sendDeathMessage) {
+        super(who);
+        this.deathMessage = deathMessage;
+        this.sendDeathMessage = sendDeathMessage;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public Component deathMessage() {
+        return deathMessage;
+    }
+
+    public void deathMessage(Component deathMessage) {
+        this.deathMessage = deathMessage;
+    }
+
+    @Nullable
+    public String getDeathMessage() {
+        return this.deathMessage == null ? null : LegacyComponentSerializer.legacySection().serialize(this.deathMessage);
+    }
+
+    public void setDeathMessage(@Nullable String deathMessage) {
+        this.deathMessage = deathMessage != null ? LegacyComponentSerializer.legacySection().deserialize(deathMessage) : null;
+    }
+
+    public boolean isSendDeathMessage() {
+        return sendDeathMessage;
+    }
+
+    public void setSendDeathMessage(boolean sendDeathMessage) {
+        this.sendDeathMessage = sendDeathMessage;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotEvent.java

@@ -0,0 +1,49 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+/**
+ * Represents a fakeplayer related event
+ */
+public abstract class BotEvent extends Event {
+
+    protected Bot bot;
+
+    public BotEvent(@NotNull final Bot who) {
+        bot = who;
+    }
+
+    public BotEvent(@NotNull final Bot who, boolean async) {
+        super(async);
+        bot = who;
+    }
+
+    /**
+     * Returns the fakeplayer involved in this event
+     *
+     * @return Fakeplayer who is involved in this event
+     */
+    @NotNull
+    public final Bot getBot() {
+        return bot;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotInventoryOpenEvent.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+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 BotInventoryOpenEvent extends BotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private final Player player;
+    private boolean cancel = false;
+
+    public BotInventoryOpenEvent(@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;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotJoinEvent.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+/**
+ * Called when a fakeplayer joins a server
+ */
+public class BotJoinEvent extends BotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private Component joinMessage;
+
+    public BotJoinEvent(@NotNull final Bot who, @Nullable final Component joinMessage) {
+        super(who);
+        this.joinMessage = joinMessage;
+    }
+
+    public BotJoinEvent(@NotNull final Bot who, @Nullable final String joinMessage) {
+        super(who);
+        this.joinMessage = joinMessage != null ? LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    public void joinMessage(@Nullable final Component joinMessage) {
+        this.joinMessage = joinMessage;
+    }
+
+    @Nullable
+    public Component joinMessage() {
+        return joinMessage;
+    }
+
+    /**
+     * Gets the join message to send to all online players
+     *
+     * @return string join message. Can be null
+     */
+    @Nullable
+    public String getJoinMessage() {
+        return this.joinMessage == null ? null : LegacyComponentSerializer.legacySection().serialize(this.joinMessage);
+    }
+
+    /**
+     * Sets the join message to send to all online players
+     *
+     * @param joinMessage join message. If null, no message will be sent
+     */
+    public void setJoinMessage(@Nullable String joinMessage) {
+        this.joinMessage = joinMessage != null ? LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotLoadEvent.java

@@ -0,0 +1,76 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Call when a fakeplayer loaded
+ */
+public class BotLoadEvent extends Event implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private final String bot;
+    private final UUID botUUID;
+    private boolean cancel = false;
+
+    public BotLoadEvent(@NotNull final String who, @NotNull final UUID uuid) {
+        this.bot = who;
+        this.botUUID = uuid;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Gets the fakeplayer name
+     *
+     * @return fakeplayer name
+     */
+    public String getBot() {
+        return bot;
+    }
+
+    public UUID getBotUUID() {
+        return botUUID;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotRemoveEvent.java

@@ -0,0 +1,122 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.command.CommandSender;
+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;
+
+/**
+ * Call when a fakeplayer removed
+ */
+public class BotRemoveEvent extends BotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private final RemoveReason reason;
+    private final CommandSender remover;
+    private Component removeMessage;
+    private boolean save;
+    private boolean cancel = false;
+
+    public BotRemoveEvent(@NotNull final Bot who, @NotNull RemoveReason reason, @Nullable CommandSender remover, @Nullable Component removeMessage, boolean save) {
+        super(who);
+        this.reason = reason;
+        this.remover = remover;
+        this.removeMessage = removeMessage;
+        this.save = save;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Gets the remove reason of the bot
+     *
+     * @return remove reason
+     */
+    @NotNull
+    public RemoveReason getReason() {
+        return reason;
+    }
+
+    /**
+     * Gets the remover of the bot
+     * if the remove reason is not COMMAND, the creator might be null
+     *
+     * @return An optional of remover
+     */
+    @Nullable
+    public CommandSender getRemover() {
+        return remover;
+    }
+
+    public Component removeMessage() {
+        return removeMessage;
+    }
+
+    public void removeMessage(Component removeMessage) {
+        this.removeMessage = removeMessage;
+    }
+
+    @Nullable
+    public String getRemoveMessage() {
+        return this.removeMessage == null ? null : LegacyComponentSerializer.legacySection().serialize(this.removeMessage);
+    }
+
+    public void setRemoveMessage(@Nullable String removeMessage) {
+        this.removeMessage = removeMessage != null ? LegacyComponentSerializer.legacySection().deserialize(removeMessage) : null;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    public boolean shouldSave() {
+        return save;
+    }
+
+    public void setSave(boolean save) {
+        this.save = save;
+    }
+
+    @Override
+    @NotNull
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public enum RemoveReason {
+        COMMAND,
+        PLUGIN,
+        DEATH,
+        INTERNAL
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/bot/BotSpawnLocationEvent.java

@@ -0,0 +1,55 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.bot;
+
+import org.bukkit.Location;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.entity.bot.Bot;
+
+public class BotSpawnLocationEvent extends BotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
+
+    private Location spawnLocation;
+
+    public BotSpawnLocationEvent(@NotNull final Bot who, @NotNull Location spawnLocation) {
+        super(who);
+        this.spawnLocation = spawnLocation;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @NotNull
+    public Location getSpawnLocation() {
+        return spawnLocation;
+    }
+
+    public void setSpawnLocation(@NotNull Location location) {
+        this.spawnLocation = location;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/player/PlayerOperationLimitEvent.java

@@ -0,0 +1,73 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.player;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when a player operation is limited
+ */
+public class PlayerOperationLimitEvent extends PlayerEvent {
+    private static final HandlerList handlers = new HandlerList();
+
+    private final Block block;
+    private final Operation operation;
+
+    public PlayerOperationLimitEvent(@NotNull Player who, Operation operation, Block block) {
+        super(who);
+        this.block = block;
+        this.operation = operation;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Gets the operated block
+     *
+     * @return block
+     */
+    public Block getBlock() {
+        return block;
+    }
+
+    /**
+     * Gets the type of operation
+     *
+     * @return operation type
+     */
+    public Operation getOperation() {
+        return operation;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public enum Operation {
+        MINE, PLACE
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/event/player/UpdateSuppressionEvent.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.event.player;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class UpdateSuppressionEvent extends Event {
+    private static final HandlerList handlers = new HandlerList();
+
+    private final @Nullable Player player;
+    private final @Nullable Location position;
+    private final @Nullable Material material;
+    private final @NotNull Throwable throwable;
+
+    public UpdateSuppressionEvent(@Nullable Player player, @Nullable Location position, @Nullable Material material, @NotNull Throwable throwable) {
+        this.player = player;
+        this.position = position;
+        this.material = material;
+        this.throwable = throwable;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public @Nullable Player getPlayer() {
+        return player;
+    }
+
+    public @NotNull Throwable getThrowable() {
+        return throwable;
+    }
+
+    public @Nullable Location getPosition() {
+        return position;
+    }
+
+    public @Nullable Material getMaterial() {
+        return material;
+    }
+}

lophine-api/src/main/java/org/leavesmc/leaves/replay/BukkitRecorderOption.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
+ *
+ * Leaves 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.
+ *
+ * Leaves 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 Leaves. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.leavesmc.leaves.replay;
+
+public class BukkitRecorderOption {
+
+    // public int recordDistance = -1;
+    public String serverName = "Lophine"; // Lophine - rebrand to Lophine to avoid confusion
+    public BukkitRecordWeather forceWeather = BukkitRecordWeather.NULL;
+    public int forceDayTime = -1;
+    public boolean ignoreChat = false;
+    // public boolean ignoreItem = false;
+
+    public enum BukkitRecordWeather {
+        CLEAR,
+        RAIN,
+        THUNDER,
+        NULL
+    }
+}

lophine-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/luminol-server/build.gradle.kts
 +++ b/luminol-server/build.gradle.kts
-@@ -52,7 +_,23 @@
+@@ -50,7 +_,23 @@
          }
      }
  
@@ -24,8 +24,8 @@
 +    activeFork = lophine
  
  
-     spigot {
-@@ -142,12 +_,16 @@
+ 
+@@ -125,12 +_,16 @@
          resources { srcDir("../paper-server/src/main/resources") }
          java { srcDir("../folia-server/src/main/java") }
          resources { srcDir("../folia-server/src/main/resources") }
@@ -42,40 +42,31 @@
      }
  }
  val log4jPlugins = sourceSets.create("log4jPlugins") {
-@@ -174,7 +_,7 @@
+@@ -158,7 +_,7 @@
  }
  
  dependencies {
--    implementation(project(":luminol-api")) // Luminol
-+    implementation(project(":lophine-api")) // Lophine
+-    implementation(project(":luminol-api"))
++    implementation(project(":lophine-api"))
      // 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")
-@@ -276,14 +_,14 @@
+     implementation("net.objecthunter:exp4j:0.4.8")
+     implementation("com.electronwill.night-config:toml:3.9.0") // Night config
+@@ -234,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 "Luminol",
-+            "Implementation-Title" to "Lophine",
+-            "Implementation-Title" to "Luminol", // Luminol - Rebrand
++            "Implementation-Title" to "Lophine", // Luminol - Rebrand
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date,
--            "Specification-Title" to "Luminol",
-+            "Specification-Title" to "Lophine",
+-            "Specification-Title" to "Luminol", // Luminol - Rebrand
++            "Specification-Title" to "Lophine", // Luminol - Rebrand
              "Specification-Version" to project.version,
-             "Specification-Vendor" to "LuminolMC org",
--            "Brand-Id" to "luminolmc:luminol",
--            "Brand-Name" to "Luminol",
-+            "Brand-Id" to "luminolmc:lophine",
-+            "Brand-Name" to "Lophine",
+             "Specification-Vendor" to "LuminoLMC", // Luminol - Rebrand
+-            "Brand-Id" to "luminolmc:luminol", // Luminol - Rebrand
+-            "Brand-Name" to "Luminol", // Luminol - Rebrand
++            "Brand-Id" to "luminolmc:lophine", // Luminol - Rebrand
++            "Brand-Name" to "Lophine", // Luminol - Rebrand
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -447,7 +_,7 @@
- }
- 
- fill {
--    project("luminol")
-+    project("lophine")
-     versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
-     version(paperweight.minecraftVersion)
- 

lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch

@@ -5,27 +5,27 @@ 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 a67fc80eb3182415557b4bdf7f146aefb43103da..52fec4c88fee3c027c954365538516aaa8335c7f 100644
+index 3b700b214ac6818cd75c34b207aa1436f52231e7..315c137cb9dbac51a8ac0d63f0ae0127e57c6c9f 100644
 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
 +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-@@ -21,6 +21,7 @@ public class ConfigManager {
+@@ -25,6 +25,7 @@ public class ConfigManager {
  
      public static void initConfigs() {
-         configfiles.put("luminol", ConfigsInstance.of(new File("luminol_config"), "luminol", "me.earthme.luminol.config.modules"));
-+        configfiles.put("lophine", ConfigsInstance.of(new File("lophine_config"), "lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
+         registerConfig("luminol", builder.of("luminol", "me.earthme.luminol.config.modules"));
++        registerConfig("lophine", builder.of("lophine", "fun.bm.lophine.config.modules")); // add lophine 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 ded1f0667327a70a923ebda55c41b1c9094d3e37..57ddc0832b919b115b85c81ac30f136e32f1e77e 100644
+index e4022494b050b68d54bac3cde87bdfc9e908859c..a4188ef831825764c0756b826651e2e7a9f99c5b 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
-@@ -6,7 +6,7 @@ import me.earthme.luminol.config.flags.ConfigInfo;
- 
+@@ -8,7 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
+ @ConfigClassInfo(category = EnumConfigCategory.MISC, name = "server_mod_name")
  public class ServerModNameConfig implements IConfigModule {
-     @ConfigInfo(baseName = "name")
+     @ConfigInfo(name = "name", comments = "Decides the server mod name shown in your F3 debug screen.")
 -    public static String serverModName = "Luminol";
 +    public static String serverModName = "Lophine";
  
-     @ConfigInfo(baseName = "vanilla_spoof")
+     @ConfigInfo(name = "vanilla_spoof", comments = "Ignore any plugin's modification and server mod name set in this config block, only force sending brand name of vanilla")
      public static boolean fakeVanilla = false;

lophine-server/luminol-patches/features/0002-Diff-in-auto-update-patch.patch

@@ -0,0 +1,141 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 16 Mar 2026 15:51:40 +0800
+Subject: [PATCH] Diff in auto-update patch
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
+index ce01352b637547c1cf8308d56d4b3f9c48fcca70..9b5623ce1de3d68c949c3c00b966cedab3a4c986 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
+@@ -16,13 +16,13 @@ import java.util.Set;
+         category = EnumConfigCategory.MISC,
+         name = "auto_update",
+         comments = """
+-                Checks GitHub Releases for newer Luminol jars on a schedule.
+-                Downloads are staged under auto_update/luminol and written to auto_update/core.path,
++                Checks GitHub Releases for newer version's jars on a schedule.
++                Downloads are staged under auto_update/lophine and written to auto_update/core.path,
+                 which Hyacinthusclip can consume on the next restart.
+-                If target_jar_path is set, Luminol will also try to replace that launcher jar directly."""
++                If target_jar_path is set, server will also try to replace that launcher jar directly."""
+ )
+ public class AutoUpdateConfig implements IConfigModule {
+-    @ConfigInfo(name = "enabled", comments = "Whether Luminol should check for updates automatically.")
++    @ConfigInfo(name = "enabled", comments = "Whether the server should check for updates automatically.")
+     public static boolean enabled = false;
+ 
+     @ConfigInfo(name = "check_times", comments = "List of daily check times in HH:mm, based on the server's local time zone.")
+@@ -33,7 +33,7 @@ public class AutoUpdateConfig implements IConfigModule {
+ 
+     @ConfigInfo(name = "target_jar_path", comments = """
+             Optional launcher jar path to replace after a successful download.
+-            Leave this blank to keep the downloaded jar staged in auto_update/luminol
++            Leave this blank to keep the downloaded jar staged in auto_update/lophine
+             and let Hyacinthusclip switch to it through auto_update/core.path on restart.""")
+     public static String targetJarPath = "";
+ 
+diff --git a/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java b/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
+index 94a25cd681c9352d6931edafd9ec67fd7ba8a777..d0d0cf5e5ff8d4b8efa4d9778c27267b41cf8cf8 100644
+--- a/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
++++ b/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
+@@ -35,10 +35,10 @@ public final class AutoUpdateHelper {
+     private final Logger LOGGER = LogUtils.getClassLogger();
+     private final Gson GSON = new Gson();
+ 
+-    private final String GITHUB_API_BASE = "https://api.github.com/repos/LuminolMC/Luminol";
++    private final String GITHUB_API_BASE = "https://api.github.com/repos/lophineMC/lophine";
+     private final Path AUTO_UPDATE_DIR = Path.of("auto_update");
+     private final Path CORE_PATH_FILE = AUTO_UPDATE_DIR.resolve("core.path");
+-    private final Path LUMINOL_UPDATE_DIR = AUTO_UPDATE_DIR.resolve("luminol");
++    private final Path LUMINOL_UPDATE_DIR = AUTO_UPDATE_DIR.resolve("lophine");
+     private final Path LATEST_PATH_FILE = LUMINOL_UPDATE_DIR.resolve("latest.path");
+     private final long DAILY_TASK_PERIOD_MILLIS = TimeUnit.DAYS.toMillis(1);
+ 
+@@ -51,13 +51,13 @@ public final class AutoUpdateHelper {
+         ensureWorkingDirectories();
+ 
+         scheduler = Executors.newSingleThreadScheduledExecutor(task -> {
+-            final Thread thread = new Thread(task, "Luminol Auto Update Scheduler");
++            final Thread thread = new Thread(task, "Lophine Auto Update Scheduler");
+             thread.setDaemon(true);
+             return thread;
+         });
+ 
+         if (AutoUpdateConfig.checkTimes.isEmpty()) {
+-            LOGGER.warn("Luminol auto-update is enabled, but misc.auto_update.check_times is empty.");
++            LOGGER.warn("Lophine auto-update is enabled, but misc.auto_update.check_times is empty.");
+             return;
+         }
+ 
+@@ -95,14 +95,14 @@ public final class AutoUpdateHelper {
+ 
+     private void checkForUpdatesSafely() {
+         if (!UPDATE_RUNNING.compareAndSet(false, true)) {
+-            LOGGER.info("A Luminol auto-update check is already running, skipping this schedule.");
++            LOGGER.info("A Lophine auto-update check is already running, skipping this schedule.");
+             return;
+         }
+ 
+         try {
+             checkForUpdates();
+         } catch (Exception e) {
+-            LOGGER.warn("Luminol auto-update failed.", e);
++            LOGGER.warn("Lophine auto-update failed.", e);
+         } finally {
+             UPDATE_RUNNING.set(false);
+         }
+@@ -123,7 +123,7 @@ public final class AutoUpdateHelper {
+ 
+         final ReleaseAssetInfo latestRelease = getLatestCompatibleRelease(mcVersion, gitBranch);
+         if (latestRelease == null) {
+-            LOGGER.warn("No compatible Luminol release was found for Minecraft {}{}.",
++            LOGGER.warn("No compatible Lophine release was found for Minecraft {}{}.",
+                     mcVersion,
+                     gitBranch == null ? "" : " on branch " + gitBranch
+             );
+@@ -132,7 +132,7 @@ public final class AutoUpdateHelper {
+ 
+         final UpdateStatus updateStatus = compareReleaseWithCurrentBuild(latestRelease.releaseCommitHash(), currentGitHash);
+         if (updateStatus == UpdateStatus.UP_TO_DATE) {
+-            LOGGER.info("You are already running the latest compatible Luminol release: {}", latestRelease.tagName());
++            LOGGER.info("You are already running the latest compatible Lophine release: {}", latestRelease.tagName());
+             return;
+         }
+ 
+@@ -154,7 +154,7 @@ public final class AutoUpdateHelper {
+             return;
+         }
+ 
+-        LOGGER.info("Found a newer Luminol release: {}", latestRelease.tagName());
++        LOGGER.info("Found a newer Lophine release: {}", latestRelease.tagName());
+ 
+         final Path stagedJar = downloadAndStageRelease(latestRelease);
+         final Path finalJarPath = tryApplyTargetJar(stagedJar);
+@@ -163,7 +163,7 @@ public final class AutoUpdateHelper {
+ 
+         if (finalJarPath.equals(stagedJar)) {
+             LOGGER.info(
+-                    "Downloaded the latest Luminol jar to {} and refreshed auto_update/core.path for Hyacinthusclip. Please restart your server.",
++                    "Downloaded the latest Lophine jar to {} and refreshed auto_update/core.path for Hyacinthusclip. Please restart your server.",
+                     finalJarPath.toAbsolutePath()
+             );
+         } else {
+@@ -179,7 +179,7 @@ public final class AutoUpdateHelper {
+         try {
+             Files.createDirectories(LUMINOL_UPDATE_DIR);
+         } catch (IOException e) {
+-            throw new RuntimeException("Failed to create Luminol auto update directory", e);
++            throw new RuntimeException("Failed to create Lophine auto update directory", e);
+         }
+     }
+ 
+@@ -440,7 +440,7 @@ public final class AutoUpdateHelper {
+     private @NotNull HttpURLConnection openConnection(String url) throws IOException, URISyntaxException {
+         final HttpURLConnection connection = (HttpURLConnection) new URI(url).toURL().openConnection();
+         connection.setRequestProperty("Accept", "application/vnd.github+json");
+-        connection.setRequestProperty("User-Agent", "Luminol Auto Update");
++        connection.setRequestProperty("User-Agent", "Lophine Auto Update");
+         connection.setConnectTimeout(10000);
+         connection.setReadTimeout(10000);
+         return connection;

lophine-server/luminol-patches/features/0002-Transformed-Configs.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 28 Jul 2025 23:02:47 +0800
-Subject: [PATCH] Transformed Configs
-
-
-diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java
-index 531214d7ab28ece4bf84e82b39d1c9f983f0fb0c..b68fa0427bb975e91e76f73ab4cc089a424937a3 100644
---- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java
-+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java
-@@ -5,6 +5,7 @@ import me.earthme.luminol.config.IConfigModule;
- import me.earthme.luminol.config.flags.ConfigInfo;
- 
- public class CommandBlockExecutionConfig implements IConfigModule {
-+    @me.earthme.luminol.config.flags.TransformedConfig(name = "command_block_enabled", category = {"experiment", "command"}, originInstance = "lophine")
-     @ConfigInfo(baseName = "enabled")
-     public static boolean enabled = false;
- 
-diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
-index c269446dda05cfc848407f80f53820c8fcd0c7b4..e69ffae53aa24496a29a4c4890cdcb366d2bec12 100644
---- a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
-+++ b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
-@@ -5,6 +5,7 @@ import me.earthme.luminol.config.IConfigModule;
- import me.earthme.luminol.config.flags.ConfigInfo;
- 
- public class PaperPacketLimiterConfig implements IConfigModule {
-+    @me.earthme.luminol.config.flags.TransformedConfig(name = "unlimit-packet", category = {"misc", "network"}, originInstance = "lophine")
-     @ConfigInfo(baseName = "force_disable")
-     public static boolean forceDisable = false;
- 

lophine-server/luminol-patches/features/0003-Leaves-Item-overstack-util.patch

@@ -3,19 +3,16 @@ 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 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea87289444586fbc9717 100644
+index a5df7e40369cf2c309f4d37fede6615f34a467e2..84d0e1a7cd687ac4ed9f1bf824ca28940c2fab1e 100644
 --- a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
 +++ b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
-@@ -17,12 +17,173 @@
+@@ -17,10 +17,98 @@
  
  package org.leavesmc.leaves.util;
  
-+import fun.bm.lophine.config.modules.misc.ContainerExpansionConfig;
++import fun.bm.lophine.config.modules.function.ContainerExpansionConfig;
 +import net.minecraft.core.component.DataComponents;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.world.entity.item.ItemEntity;
@@ -30,8 +27,9 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +import java.util.Objects;
 +import java.util.Optional;
  
- // Only the used part is retained
+ // Only used part of the original code was copied
  public class ItemOverstackUtils {
++
 +    private static final List<ItemUtil> overstackUtils = List.of(
 +            new ShulkerBox()
 +    );
@@ -39,7 +37,7 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +    public static int getItemStackMaxCount(ItemStack stack) {
 +        int size;
 +        for (ItemUtil util : overstackUtils) {
-+            if ((size = util.getMaxServerStackCount(stack)) != -1) {
++            if (util.isEnabled() && (size = util.getMaxServerStackCount(stack)) != -1) {
 +                return size;
 +            }
 +        }
@@ -49,7 +47,7 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +    public static int getNetworkMaxCount(ItemStack stack) {
 +        int size;
 +        for (ItemUtil util : overstackUtils) {
-+            if ((size = util.getMaxClientStackCount(stack)) != -1) {
++            if (util.isEnabled() && (size = util.getMaxClientStackCount(stack)) != -1) {
 +                return size;
 +            }
 +        }
@@ -58,7 +56,7 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +
 +    public static boolean tryStackItems(ItemEntity self, ItemEntity other) {
 +        for (ItemUtil util : overstackUtils) {
-+            if (util.tryStackItems(self, other)) {
++            if (util.isEnabled() && util.tryStackItems(self, other)) {
 +                return true;
 +            }
 +        }
@@ -66,7 +64,12 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +    }
 +
 +    public static boolean hasOverstackingItem() {
-+        return overstackUtils.stream().anyMatch(ItemUtil::isEnabled);
++        for (ItemUtil util : overstackUtils) {
++            if (util.isEnabled()) {
++                return true;
++            }
++        }
++        return false;
 +    }
 +
 +    public static int getItemStackMaxCountReal(ItemStack stack) {
@@ -103,6 +106,9 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +
      public static float getItemStackSignalStrength(int maxStackSize, ItemStack itemStack) {
          float result = (float) itemStack.getCount() / Math.min(maxStackSize, itemStack.getMaxStackSize());
+         /*if (LeavesConfig.modify.oldMC.allowGrindstoneOverstacking && CurseEnchantedBook.isCursedEnchantedBook(itemStack)) { // Luminol
+@@ -28,4 +116,80 @@ public class ItemOverstackUtils {
+         }*/ // Luminol
          return Math.clamp(result, 0f, 1f);
      }
 +
@@ -110,7 +116,6 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +        return getItemStackMaxCount(itemStack) > 1 && (!itemStack.isDamageableItem() || !itemStack.isDamaged());
 +    }
 +
-+
 +    private interface ItemUtil {
 +        boolean isEnabled();
 +
@@ -134,7 +139,8 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +        }
 +
 +        public static boolean shulkerBoxNoItem(@NotNull ItemStack stack) {
-+            return stack.getComponents().getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY).stream().findAny().isEmpty();
++            // Leaves - Paper 26.1: ItemContainerContents#stream() removed, use nonEmptyItemCopyStream()
++            return stack.getComponents().getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY).nonEmptyItemCopyStream().findAny().isEmpty();
 +        }
 +
 +        @Override
@@ -145,10 +151,7 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +        @Override
 +        public boolean tryStackItems(ItemEntity self, ItemEntity other) {
 +            ItemStack selfStack = self.getItem();
-+            if (!isEnabled() ||
-+                    !(selfStack.getItem() instanceof BlockItem blockItem) ||
-+                    !(blockItem.getBlock() instanceof ShulkerBoxBlock)
-+            ) {
++            if (!(selfStack.getItem() instanceof BlockItem blockItem) || !(blockItem.getBlock() instanceof ShulkerBoxBlock)) {
 +                return false;
 +            }
 +
@@ -177,7 +180,7 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +
 +        @Override
 +        public int getMaxServerStackCount(ItemStack stack) {
-+            if (isEnabled() && stack.getItem() instanceof BlockItem bi &&
++            if (stack.getItem() instanceof BlockItem bi &&
 +                    bi.getBlock() instanceof ShulkerBoxBlock && (ContainerExpansionConfig.nbtShulkerStackable || shulkerBoxNoItem(stack))) {
 +                return ContainerExpansionConfig.shulkerCount;
 +            }
@@ -185,4 +188,3 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..11891a66fe3232287238ea8728944458
 +        }
 +    }
  }
-\ No newline at end of file

lophine-server/luminol-patches/features/0004-Leaves-Fakeplayer.patch

@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 18 Feb 2026 00:15:08 +0800
+Subject: [PATCH] Leaves: Fakeplayer
+
+
+diff --git a/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java b/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
+index a4c188f71564fc77a9fa22b4cae032e1919d06f2..019266803f1452cb1e76350da8edae10a77020ac 100644
+--- a/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
++++ b/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
+@@ -54,6 +54,12 @@ public class FoliaServerWaypointManager extends ServerWaypointManager {
+             return;
+         }
+ 
++        // Leaves start - fakeplayer
++        if (waypoint instanceof org.leavesmc.leaves.bot.ServerBot bot && !bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.ENABLE_LOCATOR_BAR)) {
++            return;
++        }
++        // Leaves end - fakeplayer
++
+         this.waypoints.add(waypoint);
+ 
+         for (ServerPlayer toCreateFor : this.trackingPlayers) {
+@@ -110,6 +116,11 @@ public class FoliaServerWaypointManager extends ServerWaypointManager {
+         this.trackingPlayers.add(player);
+ 
+         scheduleIfOffTarget(player, () -> {
++            // Leaves start - fakeplayer
++            if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
++                return;
++            }
++            // Leaves end - fakeplayer
+             for (WaypointTransmitter transmitter : this.waypoints) {
+                 this.createConnection(player, transmitter);
+             }
+diff --git a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+index 063cc27df9c8f3ad5c8db5cedcaa3d2bccf6dc24..5ad6aab5e72e27bb402494873770ab5822601939 100644
+--- a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
++++ b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+@@ -11,14 +11,7 @@ public class ServerFeatureManager implements FeatureManager {
+     private final Set<String> availableFeatures = new HashSet<>();
+ 
+     private ServerFeatureManager() {
+-        if (false) { // Luminol not provide this
+-            availableFeatures.addAll(Set.of(
+-                    FAKEPLAYER,
+-                    PHOTOGRAPHER,
+-                    BYTEBUF,
+-                    UPDATE_SUPPRESSION_EVENT
+-            ));
+-        }
++        availableFeatures.add(FAKEPLAYER); // Lophine - fakeplayer support
+         if (Boolean.getBoolean("leavesclip.enable.mixin") || Boolean.getBoolean("hyacinthusclip.enable.mixin")) {
+             availableFeatures.add(MIXIN);
+         }

lophine-server/luminol-patches/features/0005-Leaves-Replay-Mod-API.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 17 May 2026 05:33:21 +0800
+Subject: [PATCH] Leaves: Replay Mod API
+
+
+diff --git a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+index 5ad6aab5e72e27bb402494873770ab5822601939..0ac9edfa36833a7ebe0353c4aff40955ab3ddf8c 100644
+--- a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
++++ b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+@@ -12,6 +12,7 @@ public class ServerFeatureManager implements FeatureManager {
+ 
+     private ServerFeatureManager() {
+         availableFeatures.add(FAKEPLAYER); // Lophine - fakeplayer support
++        availableFeatures.add(PHOTOGRAPHER); // Lophine - Replay Mod API support
+         if (Boolean.getBoolean("leavesclip.enable.mixin") || Boolean.getBoolean("hyacinthusclip.enable.mixin")) {
+             availableFeatures.add(MIXIN);
+         }

lophine-server/luminol-patches/features/0006-Update-suppression-event.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 3 Jun 2026 13:49:39 +0800
+Subject: [PATCH] Update suppression event
+
+
+diff --git a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+index 0ac9edfa36833a7ebe0353c4aff40955ab3ddf8c..c3db6c5281728fa1a2b4d84f9ebff9fcfd696698 100644
+--- a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
++++ b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+@@ -13,6 +13,7 @@ public class ServerFeatureManager implements FeatureManager {
+     private ServerFeatureManager() {
+         availableFeatures.add(FAKEPLAYER); // Lophine - fakeplayer support
+         availableFeatures.add(PHOTOGRAPHER); // Lophine - Replay Mod API support
++        availableFeatures.add(UPDATE_SUPPRESSION_EVENT); // Lophine - update suppression event support
+         if (Boolean.getBoolean("leavesclip.enable.mixin") || Boolean.getBoolean("hyacinthusclip.enable.mixin")) {
+             availableFeatures.add(MIXIN);
+         }

lophine-server/luminol-patches/features/0007-Carpet-features.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sun, 22 Mar 2026 01:39:17 +0800
+Subject: [PATCH] Carpet features
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+index 315c137cb9dbac51a8ac0d63f0ae0127e57c6c9f..2a2d6aff636ad960638b357d224a631c89d23d33 100644
+--- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
++++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+@@ -26,6 +26,15 @@ public class ConfigManager {
+     public static void initConfigs() {
+         registerConfig("luminol", builder.of("luminol", "me.earthme.luminol.config.modules"));
+         registerConfig("lophine", builder.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config
++        // Lophine start - add carpet config
++        registerConfig("lophine_carpet", builder.of(
++                new java.io.File("lophine_config"),
++                "lophine_carpet",
++                "lophine_carpet_config.toml",
++                "lophinecarpetconfig",
++                "fun.bm.lophine.carpet.config.modules"
++        ));
++        // Lophine end - add carpet config
+         preLoad();
+     }
+ 

lophine-server/luminol-patches/features/0008-Carpet-Features-Compatible.patch

@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 5 Jun 2026 16:10:25 +0800
+Subject: [PATCH] Carpet Features Compatible
+
+
+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 f079a1cd99d648dc7ca97fb65406b7a42ad5a74e..30f78cbae7aea3e9fcee6d97f229ddf8e8344299 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
+@@ -23,9 +23,4 @@ public class CommandConfig implements IConfigModule {
+             """)
+     @HotReloadUnsupported
+     public static boolean waypointsAndWaypointCommand = false;
+-    @ConfigInfo(name = "enable_tick_command", comments = """
+-            Only freeze/unfreeze/step/query command is allowed if you enabled it.
+-            WARN: This should disabled in production environment!
+-            """)
+-    public static boolean tick = false;
+ }
+diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/OptimizedDragonRespawnConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/OptimizedDragonRespawnConfig.java
+deleted file mode 100644
+index f791feed92abd750ac10775c05150f122ecbe886..0000000000000000000000000000000000000000
+--- a/src/main/java/me/earthme/luminol/config/modules/optimizations/OptimizedDragonRespawnConfig.java
++++ /dev/null
+@@ -1,12 +0,0 @@
+-package me.earthme.luminol.config.modules.optimizations;
+-
+-import me.earthme.luminol.config.IConfigModule;
+-import me.earthme.luminol.config.flags.ConfigClassInfo;
+-import me.earthme.luminol.config.flags.ConfigInfo;
+-import me.earthme.luminol.enums.EnumConfigCategory;
+-
+-@ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "end_dragon")
+-public class OptimizedDragonRespawnConfig implements IConfigModule {
+-    @ConfigInfo(name = "optimized_dragon_respawn")
+-    public static boolean optimizedRespawn = false;
+-}

lophine-server/minecraft-patches/features/0001-Add-config-to-allow-infinite-trade.patch

@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 7 Jul 2025 16:30:54 +0800
-Subject: [PATCH] Add config to allow infinite trade
-
-
-diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 79242037e868a140513f032e74e8594c0c6ff41c..8570c5089b605125680f8558ae201550df2d0a47 100644
---- a/net/minecraft/world/entity/npc/Villager.java
-+++ b/net/minecraft/world/entity/npc/Villager.java
-@@ -490,8 +490,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-     }
- 
-     private void resendOffersToTradingPlayer() {
--        MerchantOffers offers = this.getOffers();
-+        // Lophine start - infinite trade
-+        MerchantOffers offers = this.getOffers().copy();
-         Player tradingPlayer = this.getTradingPlayer();
-+        if (fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade) {
-+            for (MerchantOffer merchantOffer : offers) {
-+                merchantOffer.maxUses = 524288;
-+            }
-+        }
-+        // Lophine end - infinite trade
-         if (tradingPlayer != null && !offers.isEmpty()) {
-             tradingPlayer.sendMerchantOffers(
-                 tradingPlayer.containerMenu.containerId,
-diff --git a/net/minecraft/world/item/trading/Merchant.java b/net/minecraft/world/item/trading/Merchant.java
-index 6e2fa442ddcd4ef3c4fe789b9ebac9dd409c9de7..28d743cc7beeb92a33683b8eea84096f94d90fb2 100644
---- a/net/minecraft/world/item/trading/Merchant.java
-+++ b/net/minecraft/world/item/trading/Merchant.java
-@@ -42,7 +42,14 @@ public interface Merchant {
-             new SimpleMenuProvider((containerId, inventory, player1) -> new MerchantMenu(containerId, inventory, this), displayName)
-         );
-         if (optionalInt.isPresent()) {
--            MerchantOffers offers = this.getOffers();
-+            // Lophine start - infinite trade
-+            MerchantOffers offers = this.getOffers().copy();
-+            if (fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade) {
-+                for (MerchantOffer merchantOffer : offers) {
-+                    merchantOffer.maxUses = 5242884;
-+                }
-+            }
-+            // Lophine end - infinite trade
-             if (!offers.isEmpty()) {
-                 player.sendMerchantOffers(optionalInt.getAsInt(), offers, level, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
-             }
-diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java
-index 64c99df8ff305fa28c75dc03fc5ef8c61634ad84..21ec77d5167cfdf05043ea474165148fb2b0c2d9 100644
---- a/net/minecraft/world/item/trading/MerchantOffer.java
-+++ b/net/minecraft/world/item/trading/MerchantOffer.java
-@@ -196,7 +196,7 @@ public class MerchantOffer {
-     }
- 
-     public boolean isOutOfStock() {
--        return this.uses >= this.maxUses;
-+        return (this.uses >= this.maxUses && !fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade); // Lophine - infinite trade
-     }
- 
-     public void setToOutOfStock() {

lophine-server/minecraft-patches/features/0001-Server-I18n.patch

@@ -1,27 +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] I18n support
+Subject: [PATCH] Server I18n
 
 
 diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
-index 7b9e2a1a208b46a69c16e6afd8b502259893574f..db46a31ea8a36562e548eb07f0c4cf9b9e8c3360 100644
+index 47cd33bce908744e64356b585853d6a8ecf82443..bb4011d3c6a1d2a5aa66e68fe719cd5eea2c0dd2 100644
 --- a/net/minecraft/locale/Language.java
 +++ b/net/minecraft/locale/Language.java
-@@ -65,7 +65,7 @@ public abstract class Language {
+@@ -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);
+         return new Language() {
+@@ -66,7 +67,7 @@ public abstract class Language {
          };
      }
  
--    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) {
+-    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) {
 diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
-index cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442dad2db19b 100644
+index 2a75f8fbd2e5f41ca138740319d34683915e3b5b..0cc56b19d68f34994c9dbae578609eca7b7343cb 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -155,6 +155,8 @@ public class Main {
+@@ -158,6 +158,8 @@ public class Main {
                  return;
              }
  
@@ -31,10 +39,10 @@ index cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442d
              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 c6c6432c2efeb7b95c2894b188cd966321ae3186..1cd9af71ee66df5f277748c0a5a59a30bd57accc 100644
+index 81934fb56744dbbb3fdd100e8ec83cb634034d04..2dae0f4249eade60ac55c9fa289dd146dc3675e1 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -239,6 +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

lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Wed, 21 May 2025 13:04:00 +0800
-Subject: [PATCH] Add config to disable end crystal check
-
-
-diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 4fa8371c212dcc02b8cf5fd267b736e1cf3f50c1..3f1520bdd5ef708824712ea62974fedb35067f23 100644
---- a/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -547,6 +547,8 @@ public class EndDragonFight {
- 
-                 blockPos = this.portalLocation;
-             }
-+            // Luminol start - Disable end crystal check
-+            if (!fun.bm.lophine.config.modules.fixes.DisableEndCrystalCheckConfig.disableCheck) {
-             // Paper start - Perf: Do crystal-portal proximity check before entity lookup
-             if (placedEndCrystalPos != null) {
-                 // The end crystal must be 0 or 1 higher than the portal origin
-@@ -562,6 +564,7 @@ public class EndDragonFight {
-                 }
-             }
-             // Paper end - Perf: Do crystal-portal proximity check before entity lookup
-+            } // Luminol end - Disable end crystal check
- 
- 
-             List<EndCrystal> list = Lists.newArrayList();

lophine-server/minecraft-patches/features/0002-Fix-datapack-command-save-function.patch

@@ -0,0 +1,85 @@
+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 fb5f9176916931b23ebf4a5b7ecdfc5285ffbc2b..ecdcf0db97341d2cb460f86f451cecd5c40dbfee 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -2450,6 +2450,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return this.reloadResources(packsToEnable, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
+     }
+ 
++    // Lophine start - region thread skip reload // TODO - add reload support
++    public void saveDatapacks(Collection<String> selectedPacks) {
++        this.packRepository.setSelected(selectedPacks, 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(
+         final Collection<String> packsToEnable, final io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause
+     ) {
+diff --git a/net/minecraft/server/commands/DataPackCommand.java b/net/minecraft/server/commands/DataPackCommand.java
+index 80d9bc3d680c30dae15064e0e8c3d1379ccd52e6..2bc9cf924d40d5d11935f73cf6d35442b0b0ba06 100644
+--- a/net/minecraft/server/commands/DataPackCommand.java
++++ b/net/minecraft/server/commands/DataPackCommand.java
+@@ -99,7 +99,7 @@ public class DataPackCommand {
+         dispatcher.register(
+             Commands.literal("datapack")
+                 .requires(Commands.hasPermission(Commands.LEVEL_GAMEMASTERS))
+-                /*.then( // Luminol - Add back read-only datapack command
++                .then( // Lophine - Fix datapack command save function
+                     Commands.literal("enable")
+                         .then(
+                             Commands.argument("name", StringArgumentType.string())
+@@ -146,11 +146,11 @@ public class DataPackCommand {
+                                 .suggests(SELECTED_PACKS)
+                                 .executes(c -> disablePack(c.getSource(), getPack(c, "name", false)))
+                         )
+-                )*/ // Luminol - Add back read-only datapack command
++                )
+                 .then(
+                     Commands.literal("list")
+                         .executes(c -> listPacks(c.getSource()))
+-                        //.then(Commands.literal("available").executes(c -> listAvailablePacks(c.getSource()))) // Luminol - Add back read-only datapack command
++                        .then(Commands.literal("available").executes(c -> listAvailablePacks(c.getSource()))) // Luminol - Add back read-only datapack command
+                         .then(Commands.literal("enabled").executes(c -> listEnabledPacks(c.getSource())))
+                 )
+                 .then(
+@@ -238,7 +238,7 @@ public class DataPackCommand {
+     }
+ 
+     private static int listPacks(final CommandSourceStack source) {
+-        return listEnabledPacks(source) ;// + listAvailablePacks(source); // Luminol - Add back read-only datapack command
++        return listEnabledPacks(source) + listAvailablePacks(source); // Lophine - Fix datapack command save function
+     }
+ 
+     private static int listAvailablePacks(final CommandSourceStack source) {
+diff --git a/net/minecraft/server/commands/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java
+index 80fef4277b9e986c17a4cb895e130726bdb63229..4bed8d0432508cbe5c0d1fc7d68052ec2af7260f 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(final Collection<String> selectedPacks, final CommandSourceStack source) {
++        // Lophine start - region thread skip reload // TODO - add reload support
++        source.getServer().saveDatapacks(selectedPacks);
++        source.getSender().sendMessage("You need to restart server to load datapacks update.");
++        if (false) {
+         source.getServer().reloadResources(selectedPacks, 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(final PackRepository packRepository, final WorldData worldData, final Collection<String> currentPacks) {

lophine-server/minecraft-patches/features/0003-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -0,0 +1,175 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+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)
+
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 2939aa1ecd68504424198dd7c90c71c6c1aa4c80..8b7e4814b00d6f6c9f25cce5186905f165b97c2f 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -961,6 +961,10 @@ public abstract class PlayerList {
+         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
+         this.server.getCommands().sendCommands(player);
+         } // Paper - Add sendOpLevel API
++
++        // Purpur start - Barrels and enderchests 6 rows
++        player.enderChestSlotCount = fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows < 7 && fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows > 0 ? 9 * fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows : 27;
++        // Purpur end - Barrels and enderchests 6 rows
+     }
+ 
+     // 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
+--- 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;
+     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
+ 
+     // 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
+--- 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);
+     }
+ 
++    // 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 twoRows(final int containerId, final Inventory inventory, final Container container) {
++        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 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);
+     }
+ 
++    // 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 fiveRows(final int containerId, final Inventory inventory, final Container container) {
++        return new ChestMenu(MenuType.GENERIC_9x3, containerId, inventory, container, 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);
+     }
+diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+index 4df3a32faf85595372f4b250482d852c985ea3ab..101b3711bfb98888837ebed323561cac6efb274d 100644
+--- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
++++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
+@@ -26,11 +26,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
+     }
+ 
+     public PlayerEnderChestContainer(Player owner) {
+-        super(27);
++        super(fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows < 7 && fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows > 0 ? 9 * fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows : 27);
+         this.owner = owner;
+         // CraftBukkit end
+     }
+ 
++    // Purpur start - Barrels and enderchests 6 rows
++        @Override
++    public int getContainerSize() {
++        return owner.enderChestSlotCount < 0 ? super.getContainerSize() : owner.enderChestSlotCount;
++    }
++    // Purpur end - Barrels and enderchests 6 rows
++
+     public void setActiveChest(final EnderChestBlockEntity activeChest) {
+         this.activeChest = activeChest;
+     }
+diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
+index f1a5b9670dd04b800a8d755f32364458a16d924a..bfc34508937befc0f7610176ebe625563f7a4fe0 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);
++                }, CONTAINER_TITLE) // Purpur - Barrels and enderchests 6 rows
+             ).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
+--- 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
+     }
+     // 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) {
++        case 6 -> 54;
++        case 5 -> 45;
++        case 4 -> 36;
++        case 2 -> 18;
++        case 1 -> 9;
++        default -> 27;
++        }, ItemStack.EMPTY);
++    // 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
+ 
+     @Override
+     public int getContainerSize() {
+-        return 27;
++        // Purpur start - Barrels and enderchests 6 rows
++        return switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
++            case 6 -> 54;
++            case 5 -> 45;
++            case 4 -> 36;
++            case 2 -> 18;
++            case 1 -> 9;
++            default -> 27;
++        };
++    // Purpur end - Barrels and enderchests 6 rows
+     }
+ 
+     @Override
+@@ -139,7 +158,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
+ 
+     @Override
+     protected AbstractContainerMenu createMenu(final int containerId, final Inventory inventory) {
+-        return ChestMenu.threeRows(containerId, inventory, 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);
++        };
++        // Purpur end - Barrels and enderchests 6 rows
+     }
+ 
+     @Override

lophine-server/minecraft-patches/features/0004-Add-config-to-disable-some-check-for-operators.patch

@@ -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] Disable some check for operators
+Subject: [PATCH] Add config to disable some check for operators
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d63d8f7523938088bf9efc1c1b8ad9f0583338bb..b40059553089207ab1c6628beefadc674ec43d4e 100644
+index ebede474ca98c82131215913865b9f7bb4d57313..fe6e1aea364620f82de44b942da0d3846c7d17b5 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl
+@@ -402,7 +402,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 && 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()
++            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()
                  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;
-@@ -386,7 +386,7 @@ public class ServerGamePacketListenerImpl
+                 return true;
+@@ -421,7 +421,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 && 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()
++                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()
                      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;
-@@ -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));
+                     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));
                  }
-@@ -1540,7 +1540,7 @@ public class ServerGamePacketListenerImpl
+@@ -1606,7 +1606,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,
-                                                     toX, toY, toZ, toYaw, toPitch, true);
+                                                     targetX, targetY, targetZ, targetYRot, targetXRot, true);
 -                                            if (!event.isAllowed()) {
-+                                            if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && this.player.hasPermissions(2))) { // Lophine - disable move check for operator
++                                            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.getLogWarning()) {
-                                                 LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
+                                             LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getPlainTextName(), xDist, yDist, zDist);
                                                  }
-@@ -1618,7 +1618,7 @@ public class ServerGamePacketListenerImpl
+@@ -1672,7 +1672,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,
-                                             toX, toY, toZ, toYaw, toPitch, true);
+                                             targetX, targetY, targetZ, targetYRot, targetXRot, true);
 -                                    if (!event.isAllowed()) {
-+                                    if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && this.player.hasPermissions(2))) { // Lophine - disable move check for operator
++                                    if (!event.isAllowed() && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Lophine - disable move check for operator
                                          movedWrongly = true;
                                          if (event.getLogWarning())
                                       // Paper end

lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch

@@ -1,59 +0,0 @@
-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] Add config to enable datapack command
-
-
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 8a90aa5c145f53afbb3f2371f97cb09974f30bbb..b6e10157c572dadb1bff18f8431166966eed46d9 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -192,7 +192,9 @@ public class Commands {
-         if(me.earthme.luminol.config.modules.experiment.CommandDataConfig.enabled) {
-             DataCommands.register(this.dispatcher); // Folia - region threading - TODO
-         }
--        //DataPackCommand.register(this.dispatcher, context); // Folia - region threading - TODO
-+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.datapack) {
-+            DataPackCommand.register(this.dispatcher, context); // Folia - region threading - TODO
-+        }
-         //DebugCommand.register(this.dispatcher); // Folia - region threading - TODO
-         DefaultGameModeCommands.register(this.dispatcher);
-         //DialogCommand.register(this.dispatcher, context); // Folia - region threading - TODO
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 100e8fdc52c201d386e3c779d19f6b5abde39820..d08a5b553f4e5932d960fbcdeb6a43419730e32a 100644
---- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -2352,6 +2352,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/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java
-index b540a3c3a02f7242578a63477e34b9063e86f1d2..9f0adf157872e1c68cd7752a24eacdc636e8d17a 100644
---- a/net/minecraft/server/commands/ReloadCommand.java
-+++ b/net/minecraft/server/commands/ReloadCommand.java
-@@ -16,6 +16,12 @@ 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
-+        if (true) {
-+            source.getServer().saveDatapacks(selectedIds);
-+            return;
-+        }
-+        // Lophine end - region thread skip reload // TODO - add reload support
-         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"));

lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch

@@ -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 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02fc3226c5 100644
+index b4d8cc8b520266abe1921b5e990c34fce3f1d982..93c76c2faf75bf4901ecaba1e04d957d5ddddfca 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -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
+@@ -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
 +        } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
 +            final LivingEntity entitylivingnew = this.getKillCreditOrigin();
 +            if (entitylivingnew != null) {
-+                this.damageTransferToAsync(entitylivingnew, cause);
++                this.damageTransferToAsync(entitylivingnew, source);
 +            }
-+        // Luminol End - Cross Region Damage trace
++        // Lophine End - Cross Region Damage trace
          }
  
-         this.level().broadcastEntityEvent(this, (byte)3);
-@@ -1368,6 +1375,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.level().broadcastEntityEvent(this, EntityEvent.DEATH);
+@@ -1462,6 +1469,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.connection.markClientUnloadedAfterDeath();
      }
-     // Leaves end - exp fix
  
-+    // Luminol Start - Cross Region Damage trace
++    // Lophine 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()));
@@ -40,55 +40,56 @@ index 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02
 +            } catch (Throwable ex) {
 +                LOGGER.error(ex.getMessage(), ex);
 +            }
-+        }, null, 1L );
++        }, null, 1L);
 +    }
-+    // Luminol End - Cross Region Damage trace
++    // Lophine 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 567d63ae589705e13403814b36e35d00c241a69e..3f4b1c54f9207ba1854a8c8da965cbaca5ea517d 100644
+index fcaeb471dada57e9ba4d224693cefbff2fa631be..5762eed9e99d918bee02d77c0ddd70be0aa0e2ec 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1948,6 +1948,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-             final LivingEntity killer = this.getKillCredit();
+@@ -1855,6 +1855,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+             Runnable afterEvent = () -> { // Paper
              if (killer != null) {
-                 killer.awardKillScore(this, damageSource);
-+            // Luminol Start - Cross Region Damage trace
+                 killer.awardKillScore(this, source);
++            // Lophine 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, damageSource);
++                    this.damageTransferToAsync(killernew, source);
 +                }
-+            // Luminol End - Cross Region Damage trace
++            // Lophine End - Cross Region Damage trace
              }
-         }); // Paper end
-         this.postDeathDropItems(deathEvent); // Paper
-@@ -1958,6 +1965,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
-         return deathEvent; // Paper
+ 
+             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
      }
  
-+    // Luminol Start - Cross Region Damage trace
++    // Lophine 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 );
 +    }
-+    // Luminol End - Cross Region Damage trace
++    // Lophine End - Cross Region Damage trace
 +
-     protected void dropEquipment(ServerLevel level) {
+     protected void dropEquipment(final ServerLevel level) {
      }
-     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
+ 
+@@ -2609,6 +2629,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          }
      }
  
-+    // Luminol Start - Cross Region Damage trace
++    // Lophine Start - Cross Region Damage trace
 +    @Nullable
 +    public LivingEntity getKillCreditOrigin() {
 +        if (this.lastHurtByPlayer != null) {
@@ -98,7 +99,7 @@ index 567d63ae589705e13403814b36e35d00c241a69e..3f4b1c54f9207ba1854a8c8da965cbac
 +        }
 +        return null;
 +    }
-+    // Luminol End - Cross Region Damage trace
++    // Lophine End - Cross Region Damage trace
 +
      public final float getMaxHealth() {
          return (float)this.getAttributeValue(Attributes.MAX_HEALTH);

lophine-server/minecraft-patches/features/0006-Add-config-to-enable-save-all-command.patch

@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 16 Jan 2026 02:34:43 +0800
+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 276349d778c2e6f0b1081eec4851bad5d25db237..79ef1e69ec364beec69b37c6850c038cdba73b4c 100644
+--- a/io/papermc/paper/threadedregions/RegionizedServer.java
++++ b/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -265,6 +265,8 @@ public final class RegionizedServer {
+         // tick player ping sample
+         this.tickPlayerSample();
+ 
++        fun.bm.lophine.utils.SaveAllUtil.checkTimeout(); // Lophine - save-all fix
++
+         // tick worlds
+         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
+--- 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
+         public final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region;
+         public final ServerLevel world;
+ 
++        public long lastSavedTime = 0; // Lophine - save-all fix
++
+         // generic regionised data
+         private final Reference2ReferenceOpenHashMap<RegionizedData<?>, Object> regionizedData = new Reference2ReferenceOpenHashMap<>();
+ 
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 9800ae1d3c49800b0c7342d43d696109b5b72cf4..f9a8c79640ed6ca381e4482eaeab6b23db59419f 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -299,7 +299,11 @@ public class Commands {
+             PardonCommand.register(this.dispatcher);
+             PardonIpCommand.register(this.dispatcher);
+             //PerfCommand.register(this.dispatcher); // Folia - region threading - TODO later
+-            //SaveAllCommand.register(this.dispatcher); // Folia - region threading - TODO later
++            // Lophine start - Add a config to enable save all command
++            if (fun.bm.lophine.config.modules.experiment.CommandConfig.saveAll) {
++                SaveAllCommand.register(this.dispatcher); // Folia - region threading - TODO later
++            }
++            // Lophine end - Add a config to enable save all command
+             SaveOffCommand.register(this.dispatcher);
+             SaveOnCommand.register(this.dispatcher);
+             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index ecdcf0db97341d2cb460f86f451cecd5c40dbfee..437abeb7b2d021b38b438d0e046f05809e196930 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -1652,6 +1652,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) {
++        // Lophine start - save-all fix
++        if (fun.bm.lophine.utils.SaveAllUtil.isSaving()) {
++            fun.bm.lophine.utils.SaveAllUtil.postRegionSave(region);
++        }
++        // Lophine end - save-all fix
+         final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle foliaProfiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
+         // 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
+--- a/net/minecraft/server/commands/SaveAllCommand.java
++++ b/net/minecraft/server/commands/SaveAllCommand.java
+@@ -22,14 +22,21 @@ public class SaveAllCommand {
+     }
+ 
+     private static int saveAll(final CommandSourceStack source, final 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;
+     }
++
++    public static SimpleCommandExceptionType getErrorFailed() {
++        return ERROR_FAILED;
++    }
++    // Lophine end - save all
+ }

lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch

@@ -1,167 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Thu, 1 May 2025 22:43:08 +0800
-Subject: [PATCH] Add config to enable tick command
-
-
-diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index e1842ab8f20271a8b20ab8462b09a4745a612a9a..8405157ec35a443e238fa6866772c839621d73d7 100644
---- a/io/papermc/paper/threadedregions/RegionizedServer.java
-+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -299,6 +299,11 @@ public final class RegionizedServer {
-         this.randomWalk();
-          */
-         ++this.tickCount;
-+        // Luminol start - Add a config to enable tick command
-+        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
-@@ -322,6 +327,13 @@ public final class RegionizedServer {
-             this.globalTick(world, tickCount);
-         }
- 
-+        // Luminol start - Add a config to enable tick command
-+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
-+            MinecraftServer.tickRateManager.reduceSprintTicks();
-+            MinecraftServer.tickRateManager.endTickWork();
-+        }
-+        // Luminol end - Add a config to enable tick command
-+
-         // tick connections
-         this.tickConnections();
- 
-@@ -455,7 +467,7 @@ public final class RegionizedServer {
-     }
- 
-     private void tickTime(final ServerLevel world, final int tickCount) {
--        if (world.tickTime) {
-+        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 0357792de0ed8ec9058d1847c8b45c33ff365af6..4945c11f573a53df2f5be4beb7af6a3f4d32f7d4 100644
---- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
-+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -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; // 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();
-@@ -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 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 = MinecraftServer.tickRateManager.tickrate();
-+                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
-+                    tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+                }
-+            } else {
-+                // use max(), don't assume that tickStart >= scheduledStart
-+                tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+            }
-+            // Luminol end - Add tick command support
- 
-             if (!this.tryMarkTicking()) {
-                 if (!this.cancelled.get()) {
-@@ -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 (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 b6e10157c572dadb1bff18f8431166966eed46d9..e2fc15d84fafde6847ecead23c55169449275e1b 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -245,7 +245,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 (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);
-         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 d08a5b553f4e5932d960fbcdeb6a43419730e32a..a0f1db50adf5163a671d3d9e9df7adb7de4250c6 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 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c60d14fd87 100644
---- a/net/minecraft/server/ServerTickRateManager.java
-+++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -105,7 +105,7 @@ public class ServerTickRateManager extends TickRateManager {
-             return false;
-         } else if (this.remainingSprintTicks > 0L) {
-             this.sprintTickStartTime = System.nanoTime();
--            this.remainingSprintTicks--;
-+            // this.remainingSprintTicks--; // Luminol - Add tick command support
-             return true;
-         } else {
-             this.finishTickSprint();
-@@ -113,6 +113,12 @@ public class ServerTickRateManager extends TickRateManager {
-         }
-     }
- 
-+    // Luminol start - Add tick command support
-+    public void reduceSprintTicks() {
-+        this.remainingSprintTicks--;
-+    }
-+    // 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 126685fb266692082b432ed297a499149e921dfb..9d8f6025c420e651611da17e77a362c738228b72 100644
---- a/net/minecraft/server/commands/TickCommand.java
-+++ b/net/minecraft/server/commands/TickCommand.java
-@@ -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; // Luminol - Add tick command support
-     private static final String DEFAULT_TICKRATE = String.valueOf(20);
- 
-     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {

lophine-server/minecraft-patches/features/0007-Add-config-to-enable-function-command.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 4 Sep 2025 02:14:16 +0800
+Subject: [PATCH] Add config to enable function command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index f9a8c79640ed6ca381e4482eaeab6b23db59419f..1b2d3e2c23e8e03ae25e85a60b6ef0528e627f61 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -217,7 +217,11 @@ 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);

lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch

@@ -1,92 +0,0 @@
-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 unsafe waypoint bar
-
-
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index e2fc15d84fafde6847ecead23c55169449275e1b..b0a06cdfaa49237f372ecd131d47289160476b07 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -253,7 +253,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.WaypointConfig.forceEnableWaypointUnsafe) {
-+            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..36e9b027ce5213f8914728293633e78e9905c1b2 100644
---- a/net/minecraft/server/waypoints/ServerWaypointManager.java
-+++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
-@@ -22,7 +22,14 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
- 
-     @Override
-     public void trackWaypoint(WaypointTransmitter waypoint) {
--        // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
-+        this.waypoints.add(waypoint);
-+
-+        for (ServerPlayer serverPlayer : this.players) {
-+            this.createConnection(serverPlayer, waypoint);
-+        }
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     @Override
-@@ -50,14 +57,48 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
- 
-     public void addPlayer(ServerPlayer player) {
-         // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) 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.WaypointConfig.forceEnableWaypointUnsafe) return;
-+        Map<WaypointTransmitter, WaypointTransmitter.Connection> map = this.connections.row(player);
-+        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, map.keySet());
-+
-+        for (Entry<WaypointTransmitter, WaypointTransmitter.Connection> entry : ImmutableSet.copyOf(map.entrySet())) {
-+            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.WaypointConfig.forceEnableWaypointUnsafe) return;
-+        this.connections.row(player).values().removeIf(connection -> {
-+            connection.disconnect();
-+            return true;
-+        });
-+        this.untrackWaypoint((WaypointTransmitter)player);
-+        this.players.remove(player);
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     public void breakAllConnections() {

lophine-server/minecraft-patches/features/0008-Add-config-to-enable-scoreboard-command.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 29 Sep 2025 22:56:03 +0800
+Subject: [PATCH] Add config to enable scoreboard command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 1b2d3e2c23e8e03ae25e85a60b6ef0528e627f61..916b5c8d524ffd7ccb953fe0f1cf020a1ea8dafb 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -246,7 +246,11 @@ public class Commands {
+         RotateCommand.register(this.dispatcher);
+         SayCommand.register(this.dispatcher);
+         //ScheduleCommand.register(this.dispatcher); // Folia - region threading
+-        //ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading
++        // Lophine start - Add a config to enable scoreboard command
++        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);
+         SetBlockCommand.register(this.dispatcher, context);

lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch

@@ -1,198 +0,0 @@
-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 8405157ec35a443e238fa6866772c839621d73d7..4edb6e6e6287f232f7eef45c747554264ec05319 100644
---- a/io/papermc/paper/threadedregions/RegionizedServer.java
-+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -334,6 +334,8 @@ public final class RegionizedServer {
-         }
-         // Luminol end - Add a config to enable tick command
- 
-+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol
-+
-         // tick connections
-         this.tickConnections();
- 
-@@ -443,6 +445,8 @@ public final class RegionizedServer {
- 
-         world.updateTickData();
- 
-+        MinecraftServer.getServer().handleTickCount(tickCount); // Lophine - reuse tick count
-+
-         world.moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates(); // required to eventually process ticket updates
-     }
- 
-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/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index a0f1db50adf5163a671d3d9e9df7adb7de4250c6..af13707933af14171447d5ab6faacb64ddf194a7 100644
---- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -305,6 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     // Folia start - regionised ticking
-     public final io.papermc.paper.threadedregions.RegionizedServer regionizedServer = new io.papermc.paper.threadedregions.RegionizedServer();
-+    private int tickCount;
- 
-     @Override
-     public <V> CompletableFuture<V> submit(java.util.function.Supplier<V> task) {
-@@ -2226,9 +2227,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         return false;
-     }
- 
-+    // Lophine start - reuse tick count
-     public int getTickCount() {
--        throw new UnsupportedOperationException(); // Folia - region threading
-+        if (false) throw new UnsupportedOperationException(); // Folia - region threading
-+        return this.tickCount;
-+    }
-+
-+    public void handleTickCount(int tickCount1) {
-+        tickCount = tickCount1;
-     }
-+    // Lophine end - reuse tick count
- 
-     public int getSpawnProtectionRadius() {
-         return 16;
-diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d14c7a64d 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() {

lophine-server/minecraft-patches/features/0009-Add-config-to-enable-trigger-command.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 4 Jun 2026 00:56:32 +0800
+Subject: [PATCH] Add config to enable trigger command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 916b5c8d524ffd7ccb953fe0f1cf020a1ea8dafb..03f3fe221b14f0317947d74e25049bcce2ebeb66 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -274,7 +274,11 @@ public class Commands {
+         // Luminol end - Add a config to enable tick command
+         TimeCommand.register(this.dispatcher, context);
+         TitleCommand.register(this.dispatcher, context);
+-        //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
++        // Lophine start - Add a config to enable trigger command
++        if (fun.bm.lophine.config.modules.experiment.CommandConfig.trigger) {
++            TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
++        }
++        // Lophine end - Add a config to enable trigger command
+         if (me.earthme.luminol.config.modules.experiment.CommandConfig.waypointsAndWaypointCommand) WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later // Luminol - Restore waypoints
+         WeatherCommand.register(this.dispatcher);
+         WorldBorderCommand.register(this.dispatcher);

lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch

@@ -1,472 +0,0 @@
-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 f7002d6752aa03603eb06e298ba1d7130cf13826..72c87f7c0392d087440db9d267a608598f6feb6d 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 d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0583338bb 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 fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d96c1f4fa9 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);
-@@ -656,15 +663,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());
-                             }
-                         }
-@@ -766,7 +773,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();
-@@ -867,7 +874,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;
-     }
- 
-@@ -875,7 +882,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();
-         };
-     }
-@@ -898,7 +905,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 2f8128a11e316a6ee6b283f9a411096e582c03b7..5b93eeba6c03738011551ce18332cebe9e278a8e 100644
---- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -145,7 +145,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
-@@ -742,9 +742,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 - Use vanilla hopper logic

lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch

@@ -5,35 +5,36 @@ 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 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd16792507f 100644
+index 849ad46b2941ebba91b428846b3b20d11ee5e1c9..6cd549849bd7fb5d72431f729229d1e967cf0d98 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
-@@ -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;
+@@ -1350,7 +1350,7 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
+                 double distanceSquared = deltaToPlayerX * deltaToPlayerX + deltaToPlayerZ * deltaToPlayerZ; // Paper
+                 double rangeSquared = visibleRange * visibleRange;
                  // Paper start - Configurable entity tracking range by Y
--                boolean flag = d1 <= d2;
-+                boolean flag = d1 <= d2 && !entity.isCulled(); // Luminol - Ray tracing entity tracker
-                 if (flag && level.paperConfig().entities.trackingRangeY.enabled) {
+-                boolean visibleToPlayer = distanceSquared <= rangeSquared;
++                boolean visibleToPlayer = distanceSquared <= rangeSquared && !entity.isCulled(); // Luminol - Ray tracing entity tracker
+                 if (visibleToPlayer && 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 75f327fff68097c1c9f65767552f686421e1e397..ed7421895311d89ad9726804893eff423868d375 100644
+index 65e2229f73a6f74c2271c9326aeb46feab51f818..b7cc122d45ecaf922ca1aca8ff5f1632965ad357 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -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
+@@ -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
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-     public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
-@@ -6467,4 +6467,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     // Paper end - Expose entity id counter
+     static boolean isLevelAtLeast(ValueInput input, int level) {
+@@ -6505,4 +6505,48 @@ public abstract class Entity
+     // Paper end
  
      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;
@@ -76,26 +77,29 @@ index 75f327fff68097c1c9f65767552f686421e1e397..ed7421895311d89ad9726804893eff42
 +        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 6f00ffa05d9597917574357e0069c9b056aa5ce2..5cc7a91e32f17d8d9585ae4844a4ed3b706e3273 100644
+index 6efaa78faca15c7a48bdffb24480d1bac29f3ba8..8a328a41673a3d720f0b1a5de8ce049e360fac1b 100644
 --- a/net/minecraft/world/entity/EntityType.java
 +++ b/net/minecraft/world/entity/EntityType.java
-@@ -1119,6 +1119,9 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -84,6 +84,11 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T>,
      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(
-         EntityType.EntityFactory<T> factory,
+         final EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a6268fdaa46 100644
+index 9fdc8134fdde2cdd7724a459a29e51f4ad943403..c6fa9dff800b1491b1e0fc5d7e1dc16b99b8c7db 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -229,6 +229,25 @@ public abstract class Player extends LivingEntity {
+@@ -186,6 +186,25 @@ public abstract class Player extends Avatar implements ContainerUser {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -119,9 +123,9 @@ index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a62
 +    }
 +    // Luminol end
  
-     public Player(Level level, GameProfile gameProfile) {
-         super(EntityType.PLAYER, level);
-@@ -287,6 +306,26 @@ public abstract class Player extends LivingEntity {
+     public Player(final Level level, final GameProfile gameProfile) {
+         super(EntityTypes.PLAYER, level);
+@@ -245,6 +264,26 @@ public abstract class Player extends Avatar implements ContainerUser {
  
      @Override
      public void tick() {
@@ -148,8 +152,8 @@ index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a62
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-@@ -1426,6 +1465,7 @@ public abstract class Player extends LivingEntity {
-         if (this.containerMenu != null && this.hasContainerOpen()) {
+@@ -1378,6 +1417,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+         if (this.hasContainerOpen()) {
              this.doCloseContainer();
          }
 +        if (this.cullTask != null) this.cullTask.signalStop(); // Luminol - Ray tracing entity tracker

lophine-server/minecraft-patches/features/0011-Add-tick-rate-support.patch

@@ -0,0 +1,123 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 21 Jan 2026 21:28:21 +0800
+Subject: [PATCH] Add tick rate support
+
+
+diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
+index 79ef1e69ec364beec69b37c6850c038cdba73b4c..6fb3c88463ff69bddb7d8dcde0e5339567d3e1c6 100644
+--- a/io/papermc/paper/threadedregions/RegionizedServer.java
++++ b/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -272,6 +272,14 @@ 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();
++        }
++        // Lophine end - Add a config to enable tick command
++
+         // tick connections
+         this.tickConnections();
+ 
+diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+index 5f4f80c1d4003254fd840f71d86908603b57bfa2..57a35d7a801621fc461e896eb2bba533d9d5bc1b 100644
+--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
++++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+@@ -40,8 +40,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
+     // Folia start - watchdog
+     public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
+     static {
+@@ -509,8 +509,24 @@ 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()) {
++                    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();
++                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
++                    tickCount = Math.max(1L, 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));
++            }
++            // Lophine end - Add a config to enable tick command
+ 
+             if (!this.tryMarkTicking()) {
+                 if (!this.cancelled.get()) {
+diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
+index eeb2f88723b37bb3cada04bf3098dd46f0ed7316..8432d0ce22ddc9c9bfa98901e403697f40e53c99 100644
+--- a/net/minecraft/server/ServerTickRateManager.java
++++ b/net/minecraft/server/ServerTickRateManager.java
+@@ -110,7 +110,7 @@ public class ServerTickRateManager extends TickRateManager {
+             return false;
+         } else if (this.remainingSprintTicks > 0L) {
+             this.sprintTickStartTime = System.nanoTime();
+-            this.remainingSprintTicks--;
++            // this.remainingSprintTicks--; // Luminol - Add tick command support
+             return true;
+         } else {
+             this.finishTickSprint();
+@@ -118,6 +118,12 @@ public class ServerTickRateManager extends TickRateManager {
+         }
+     }
+ 
++    // Lophine start - Add tick command support
++    public void reduceSprintTicks() {
++        this.remainingSprintTicks--;
++    }
++    // Lophine 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 64b685b219b930a1bb7f85db9947f4d1ca9df093..4421658e4061299dea2ff72a77506214cc9045d8 100644
+--- a/net/minecraft/server/commands/TickCommand.java
++++ b/net/minecraft/server/commands/TickCommand.java
+@@ -15,7 +15,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
+     private static final String DEFAULT_TICKRATE = String.valueOf(20);
+ 
+     public static void register(final CommandDispatcher<CommandSourceStack> dispatcher) {
+@@ -23,14 +23,14 @@ 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))
+                                 .suggests((c, b) -> SharedSuggestionProvider.suggest(new String[]{DEFAULT_TICKRATE}, b))
+                                 .executes(c -> setTickingRate(c.getSource(), FloatArgumentType.getFloat(c, "rate")))
+                         )
+-                )*/
++                )
+                 .then(
+                     Commands.literal("step")
+                         .executes(c -> step(c.getSource(), 1))

lophine-server/minecraft-patches/features/0011-Leaves-Old-raid-behavior.patch

@@ -1,216 +0,0 @@
-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..cbfb4ae2dc30c2ee98ef37f44a95434a7968e320 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.misc.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..5188ae86aff3051d45fe5e7d2fcc51233b7074d4 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.misc.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.misc.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.misc.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.misc.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.misc.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..b1f1bcf7f5ac002550077d5e1d4efd5c67d18063 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.misc.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);

lophine-server/minecraft-patches/features/0012-Leaves-Redstone-Shears-Wrench.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Wed, 23 Jul 2025 20:28:40 +0800
-Subject: [PATCH] Leaves: Redstone Shears Wrench
-
-Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
-As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49060f07e1ab31c827326c9a5/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
-index 6db566adf2d0df1d26221eda04aa01738df6d3d2..24ebfdf98e343a7892af621d032c35819156deec 100644
---- a/net/minecraft/world/item/BlockItem.java
-+++ b/net/minecraft/world/item/BlockItem.java
-@@ -56,6 +56,14 @@ public class BlockItem extends Item {
-             if (blockPlaceContext == null) {
-                 return InteractionResult.FAIL;
-             } else {
-+                // Leaves start - shears wrench
-+                if (org.leavesmc.leaves.util.ShearsWrenchUtil.shouldSkipPlace(context)) {
-+                    if (context.getPlayer() != null) {
-+                        context.getPlayer().containerMenu.forceHeldSlot(blockPlaceContext.getHand());
-+                    }
-+                    return InteractionResult.FAIL;
-+                }
-+                // Leaves end - shears wrench
-                 BlockState placementState = this.getPlacementState(blockPlaceContext);
-                 // CraftBukkit start - special case for handling block placement with water lilies and snow buckets
-                 org.bukkit.block.BlockState bukkitState = null;
-diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
-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 {
- 
-             return InteractionResult.SUCCESS;
-         } else {
--            return super.useOn(context);
-+            // Leaves start - shears wrench
-+            InteractionResult result = org.leavesmc.leaves.util.ShearsWrenchUtil.tryApplyRotate(context, blockState);
-+            return result == null ? super.useOn(context) : result;
-+            // Leaves end - shears wrench
-         }
-     }
- }

lophine-server/minecraft-patches/features/0012-Modify-merge-ItemEntity-logic.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 3 Oct 2025 19:43:36 +0800
+Subject: [PATCH] Modify merge ItemEntity logic
+
+Add followTickSequenceMerge to modify merge items, due to Paper's modification of the merge radius,
+when the merge radius is large and stacks containing many items get stuck in an unexpected position,
+individual items may never reach their destination.
+This configuration option is added to fix this behavior.
+
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index 6f5d3ebb7adc567e5106a3c76fccdbee93f51c27..b1d5d59718e5748b164f0885d4152e795c5d572d 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
++++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -289,7 +289,7 @@ public class ItemEntity extends Entity implements TraceableEntity, ChangePublish
+         ItemStack thisItemStack = this.getItem();
+         ItemStack otherItemStack = other.getItem();
+         if (Objects.equals(this.target, other.target) && areMergable(thisItemStack, otherItemStack)) {
+-            if (otherItemStack.getCount() < thisItemStack.getCount()) {
++            if (fun.bm.lophine.config.modules.misc.ItemEntityConfig.followTickSequenceMerge || otherItemStack.getCount() < thisItemStack.getCount()) { // Lophine - add follow Tick Sequence Merge, see Paper#13073
+                 merge(this, thisItemStack, other, otherItemStack);
+             } else {
+                 merge(other, otherItemStack, this, thisItemStack);

lophine-server/minecraft-patches/features/0013-Old-zombie-reinforcement.patch

@@ -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/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
+index aa0a34e3bae3c0d81bc87577570340d1efc46c2b..c913cd25cf7a0eb625bc02845bf4af4f7c1a96ab 100644
+--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
++++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
+@@ -333,7 +333,7 @@ public class Zombie extends Monster {
+             int x = Mth.floor(this.getX());
+             int y = Mth.floor(this.getY());
+             int z = Mth.floor(this.getZ());
+-            EntityType<? extends Zombie> type = this.getType();
++            EntityType<? extends Zombie> type = fun.bm.lophine.config.modules.function.OldFeatureConfig.oldZombieReinforcement ? EntityTypes.ZOMBIE : this.getType(); // Lophine - old zombie reinforcement
+             Zombie reinforcement = type.create(level, EntitySpawnReason.REINFORCEMENT);
+             if (reinforcement == null) {
+                 return true;

lophine-server/minecraft-patches/features/0014-Old-leader-zombie-health-logic.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 2 Jul 2026 18:49:40 +0800
+Subject: [PATCH] Old leader zombie health logic
+
+
+diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
+index c913cd25cf7a0eb625bc02845bf4af4f7c1a96ab..446559f235df246e7235d2cf507cdbef82349cc4 100644
+--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
++++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
+@@ -596,7 +596,7 @@ public class Zombie extends Monster {
+                 .addOrReplacePermanentModifier(
+                     new AttributeModifier(LEADER_ZOMBIE_BONUS_ID, this.random.nextDouble() * 3.0 + 1.0, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
+                 );
+-            if (spawnReason != EntitySpawnReason.CONVERSION && spawnReason != EntitySpawnReason.LOAD && spawnReason != EntitySpawnReason.DIMENSION_TRAVEL) {
++            if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.oldLeaderZombieHealth && spawnReason != EntitySpawnReason.CONVERSION && spawnReason != EntitySpawnReason.LOAD && spawnReason != EntitySpawnReason.DIMENSION_TRAVEL) { // Lophine - Configurable option to disable health boost for leader zombies
+                 this.setHealth(this.getMaxHealth());
+             }
+ 

lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -1,175 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-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/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 593dbcda4b497291eb1ecdc64b947a8d279f8be6..661f797b39853104b16d75ca7ba0eda156a74af3 100644
---- a/net/minecraft/server/players/PlayerList.java
-+++ b/net/minecraft/server/players/PlayerList.java
-@@ -1087,6 +1087,10 @@ public abstract class PlayerList {
-         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(player);
-         } // Paper - Add sendOpLevel API
-+
-+        // Purpur start - Barrels and enderchests 6 rows
-+        player.enderChestSlotCount = fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows < 7 && fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows > 0 ? 9 * fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows : 27;
-+        // Purpur end - Barrels and enderchests 6 rows
-     }
- 
-     // 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 09b549fa9568aa1ae13b1b975db14a6268fdaa46..6c933c27ce155eb516a9ede96fb2c3bd19251bfa 100644
---- a/net/minecraft/world/entity/player/Player.java
-+++ b/net/minecraft/world/entity/player/Player.java
-@@ -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
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-diff --git a/net/minecraft/world/inventory/ChestMenu.java b/net/minecraft/world/inventory/ChestMenu.java
-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, playerInventory, 6);
-     }
- 
-+    // Purpur start - Barrels and enderchests 6 rows
-+    public static ChestMenu oneRow(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x1, syncId, playerInventory, inventory, 1);
-+        }
-+
-+    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(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(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x4, syncId, playerInventory, inventory, 4);
-+    }
-+
-+    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(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 beb74bc8398de8b48f41af7daef14d624826310e..5dd6e89931d397b8afdb84024ed46b0d06dcf347 100644
---- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-+++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
-     }
- 
-     public PlayerEnderChestContainer(Player owner) {
--        super(27);
-+        super(fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows < 7 && fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows > 0 ? 9 * fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows : 27);
-         this.owner = owner;
-         // CraftBukkit end
-     }
- 
-+    // Purpur start - Barrels and enderchests 6 rows
-+        @Override
-+    public int getContainerSize() {
-+        return owner.enderChestSlotCount < 0 ? super.getContainerSize() : owner.enderChestSlotCount;
-+    }
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     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 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..fe374f08b7829b846b2a1c2ac3ca500ca3e48684 100644
---- a/net/minecraft/world/level/block/EnderChestBlock.java
-+++ b/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -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.misc.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);
-diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index de99652629c7301a4bc0e9ec48bed9a26a338f0d..4383e87560bb05acf9c50758f38a3cb69ee5c5c7 100644
---- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-+++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -56,7 +56,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
-     }
-     // CraftBukkit end
- 
--    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.misc.ContainerExpansionConfig.barrelRows) {
-+        case 6 -> 54;
-+        case 5 -> 45;
-+        case 4 -> 36;
-+        case 2 -> 18;
-+        case 1 -> 9;
-+        default -> 27;
-+        }, ItemStack.EMPTY);
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     public final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() {
-         @Override
-         protected void onOpen(Level level, BlockPos pos, BlockState state) {
-@@ -108,7 +118,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-     @Override
-     public int getContainerSize() {
--        return 27;
-+        // Purpur start - Barrels and enderchests 6 rows
-+        return switch (fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.barrelRows) {
-+            case 6 -> 54;
-+            case 5 -> 45;
-+            case 4 -> 36;
-+            case 2 -> 18;
-+            case 1 -> 9;
-+            default -> 27;
-+        };
-+    // Purpur end - Barrels and enderchests 6 rows
-     }
- 
-     @Override
-@@ -129,7 +148,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-     @Override
-     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.misc.ContainerExpansionConfig.barrelRows) {
-+            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
-     }
- 
-     @Override

lophine-server/minecraft-patches/features/0015-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch

@@ -1,54 +0,0 @@
-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 3f4b1c54f9207ba1854a8c8da965cbaca5ea517d..a8348a073682eec31990e9ab963b11ad32cf8bf8 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 b1f1bcf7f5ac002550077d5e1d4efd5c67d18063..6120f7b970ff05867524ee9f1433d46843d57483 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);
-                     }

lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch

@@ -5,36 +5,36 @@ Subject: [PATCH] Spawn invulnerable time
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 6b7c92fdf562dfa46eee8e8acbc82b02fc3226c5..144b2c9396b8162f9cce8b343d998907bf7fb5aa 100644
+index 93c76c2faf75bf4901ecaba1e04d957d5ddddfca..2985d5e2dde049a999a39f6edbb6696332f6d822 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -245,6 +245,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      private int lastSentFood = -99999999;
      private boolean lastFoodSaturationZero = true;
      public int lastSentExp = -99999999;
-+    private int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
++    protected int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
      private ChatVisiblity chatVisibility = ChatVisiblity.FULL;
      public ParticleStatus particleStatus = ParticleStatus.ALL;
      private boolean canChatColor = true;
-@@ -925,6 +926,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         this.tickClientLoadTimeout();
+@@ -902,6 +903,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.connection.tickClientLoadTimeout();
          this.gameMode.tick();
          this.wardenSpawnTracker.tick();
 +        if (this.spawnInvulnerableTime > 0) --this.spawnInvulnerableTime; // Lophine - spawn invulnerable time
          if (this.invulnerableTime > 0) {
              this.invulnerableTime--;
          }
-@@ -1435,6 +1437,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         if (this.isInvulnerableTo(level, damageSource)) {
+@@ -1532,6 +1534,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              return false;
-         } else {
-+            // Lophine start - spawn invulnerable time
-+            if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.spawnInvulnerableTime) {
-+                if (this.spawnInvulnerableTime > 0 && !damageSource.is(net.minecraft.tags.DamageTypeTags.BYPASSES_INVULNERABILITY)) {
-+                    return false;
-+                }
+         }
+ 
++        // Lophine start - spawn invulnerable time
++        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.spawnInvulnerableTime) {
++            if (this.spawnInvulnerableTime > 0 && !source.is(net.minecraft.tags.DamageTypeTags.BYPASSES_INVULNERABILITY)) {
++                return false;
 +            }
-+            // Lophine end - spawn invulnerable time
-             Entity entity = damageSource.getEntity();
-             if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
-              !(entity instanceof Player player && !this.canHarmPlayer(player))
++        }
++        // Lophine end - spawn invulnerable time
+         Entity entity = source.getEntity();
+         if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
+             !(entity instanceof Player player && !this.canHarmPlayer(player))

lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch

@@ -0,0 +1,467 @@
+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/f3784ec0525069a37e9ab8921b196f5533edbd56/leaves-server/minecraft-patches/features/0118-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 0dce216ae73c85dd69056bec7ef60b5e4364f23b..9ce6305e9fea9edcd3b1b853070d9990e00a667b 100644
+--- a/net/minecraft/commands/arguments/item/ItemInput.java
++++ b/net/minecraft/commands/arguments/item/ItemInput.java
+@@ -20,8 +20,10 @@ public record ItemInput(Holder<Item> item, DataComponentPatch components) {
+ 
+     public ItemStack createItemStack(final int count) throws CommandSyntaxException {
+         ItemStack result = new ItemStack(this.item, count, this.components);
+-        if (count > result.getMaxStackSize()) {
+-            throw ERROR_STACK_TOO_BIG.create(this.item.getRegisteredName(), result.getMaxStackSize());
++        // Leaves start - item over-stack util
++        if (count > org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(result)) {
++            throw ERROR_STACK_TOO_BIG.create(this.item.getRegisteredName(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(result));
++        // Leaves end - item over-stack util
+         }
+ 
+         DataResult<ItemStack> validationResult = ItemStack.validateStrict(result);
+diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
+index be357d315f5c83349a7f7287ff45e92137950a8c..a542e38ea6a1e8fc81466acbca071d89832ba54a 100644
+--- a/net/minecraft/server/commands/GiveCommand.java
++++ b/net/minecraft/server/commands/GiveCommand.java
+@@ -47,7 +47,7 @@ public class GiveCommand {
+ 
+     private static int giveItem(final CommandSourceStack source, final ItemInput input, final Collection<ServerPlayer> players, final int count) throws CommandSyntaxException {
+         ItemStack prototypeItemStack = input.createItemStack(1);
+-        int maxStackSize = prototypeItemStack.getMaxStackSize();
++        int maxStackSize = org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(prototypeItemStack); // Leaves - item over-stack util
+         int maxAllowedCount = maxStackSize * 100;
+         if (count > maxAllowedCount) {
+             source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", maxAllowedCount, prototypeItemStack.getDisplayName()));
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index fe6e1aea364620f82de44b942da0d3846c7d17b5..fd1ceb8c6f20b515e3a054050feeb443de33038c 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3219,7 +3219,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;
+@@ -3255,7 +3255,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;
+                                                     }
+@@ -3472,6 +3472,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.
+@@ -3583,7 +3584,7 @@ public class ServerGamePacketListenerImpl
+             }
+ 
+             boolean validSlot = packet.slotNum() >= 1 && packet.slotNum() <= 45;
+-            boolean validData = itemStack.isEmpty() || itemStack.getCount() <= itemStack.getMaxStackSize();
++            boolean validData = itemStack.isEmpty() || itemStack.getCount() <= org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); // Leaves - item over-stack util
+             if (drop || (validSlot && !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();
+@@ -3625,6 +3626,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 (drop && validData) {
+                 if (this.dropSpamThrottler.isUnderThreshold()) {
+diff --git a/net/minecraft/world/Container.java b/net/minecraft/world/Container.java
+index dd2d0940eece3e85078e574f66f71a4c497d75fd..b3585aee0393142366e583fc2c8fb207f162e92b 100644
+--- a/net/minecraft/world/Container.java
++++ b/net/minecraft/world/Container.java
+@@ -37,6 +37,12 @@ public interface Container extends Clearable, Iterable<ItemStack>, SlotProvider,
+         return Math.min(this.getMaxStackSize(), itemStack.getMaxStackSize());
+     }
+ 
++    // Leaves start - item over-stack util
++    default int getMaxStackLeaves(final 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 073a3bbf1b1db7eac83cf35412543f370fa089ee..0f412551685a8ea76be3b389e0782e57d22bb87c 100644
+--- a/net/minecraft/world/SimpleContainer.java
++++ b/net/minecraft/world/SimpleContainer.java
+@@ -193,7 +193,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     @Override
+     public void setItem(final int slot, final ItemStack itemStack) {
+         this.items.set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // Leaves - item over-stack util
+         this.setChanged();
+     }
+ 
+@@ -263,7 +263,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     }
+ 
+     private void moveItemsBetweenStacks(final ItemStack sourceStack, final ItemStack targetStack) {
+-        int maxCount = this.getMaxStackSize(targetStack);
++        int maxCount = this.getMaxStackLeaves(targetStack); // Leaves - item over-stack util
+         int diff = Math.min(sourceStack.getCount(), maxCount - targetStack.getCount());
+         if (diff > 0) {
+             targetStack.grow(diff);
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index b1d5d59718e5748b164f0885d4152e795c5d572d..44a5be736ba73c065a5b1a5fffcf2ea4a21d89dd 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
++++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -282,10 +282,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(final ItemEntity other) {
++        // Leaves start - item over-stack util
++        if (org.leavesmc.leaves.util.ItemOverstackUtils.tryStackItems(this, other)) {
++            return;
++        }
++        // Leaves end - item over-stack util
+         ItemStack thisItemStack = this.getItem();
+         ItemStack otherItemStack = other.getItem();
+         if (Objects.equals(this.target, other.target) && areMergable(thisItemStack, otherItemStack)) {
+diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java
+index cd7714dffcd7e7b6d96d18a97e65fd0914a739d1..fd38d7c34910ab9a60a9f54968901be3af2a9867 100644
+--- a/net/minecraft/world/entity/player/Inventory.java
++++ b/net/minecraft/world/entity/player/Inventory.java
+@@ -166,10 +166,12 @@ public class Inventory implements Container, Nameable {
+     }
+ 
+     private boolean hasRemainingSpaceForItem(final ItemStack slotItemStack, final ItemStack newItemStack) {
++        // Leaves start - item over-stack util
+         return !slotItemStack.isEmpty()
+-            && slotItemStack.isStackable()
+-            && slotItemStack.getCount() < this.getMaxStackSize(slotItemStack)
++            && org.leavesmc.leaves.util.ItemOverstackUtils.isStackable(slotItemStack)
++            && slotItemStack.getCount() < org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(slotItemStack)
+             && ItemStack.isSameItemSameComponents(slotItemStack, newItemStack); // Paper - check if itemstack is stackable first
++        // Leaves end - item over-stack util
+     }
+ 
+     // CraftBukkit start - Watch method above! :D
+@@ -182,7 +184,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();
+@@ -191,7 +193,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();
+@@ -315,7 +317,7 @@ public class Inventory implements Container, Nameable {
+             this.setItem(slot, itemStackInSlot);
+         }
+ 
+-        int maxToAdd = this.getMaxStackSize(itemStackInSlot) - itemStackInSlot.getCount();
++        int maxToAdd = this.getMaxStackLeaves(itemStackInSlot) - itemStackInSlot.getCount(); // Leaves - item over-stack util
+         int toAdd = Math.min(count, maxToAdd);
+         if (toAdd == 0) {
+             return count;
+@@ -423,7 +425,7 @@ public class Inventory implements Container, Nameable {
+                 break;
+             }
+ 
+-            int slotHasSpaceFor = itemStack.getMaxStackSize() - this.getItem(slot).getCount();
++            int slotHasSpaceFor = org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack) - this.getItem(slot).getCount(); // Leaves - item over-stack util
+             if (this.add(slot, itemStack.split(slotHasSpaceFor)) && shouldSendSetSlotPacket && this.player instanceof ServerPlayer serverPlayer) {
+                 serverPlayer.connection.send(this.createInventoryUpdatePacket(slot));
+             }
+diff --git a/net/minecraft/world/entity/player/StackedItemContents.java b/net/minecraft/world/entity/player/StackedItemContents.java
+index 1ace17d8fc7e7b8b4722a1889d49233c0ec55e20..d146f02338852810679a45bff932d9d68ee86d60 100644
+--- a/net/minecraft/world/entity/player/StackedItemContents.java
++++ b/net/minecraft/world/entity/player/StackedItemContents.java
+@@ -36,7 +36,7 @@ public class StackedItemContents {
+     }
+ 
+     public void accountStack(final ItemStack itemStack) {
+-        this.accountStack(itemStack, itemStack.getMaxStackSize());
++        this.accountStack(itemStack, org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack)); // Leaves - item over-stack util
+     }
+ 
+     public void accountStack(final ItemStack itemStack, final int maxCount) {
+diff --git a/net/minecraft/world/entity/vehicle/ContainerEntity.java b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+index c80a44dbc54e0bf00daa525bef20422b15ce8a85..d9daef9b2ccf0f0bbe61ff3d7a20f25193aabaf8 100644
+--- a/net/minecraft/world/entity/vehicle/ContainerEntity.java
++++ b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+@@ -160,7 +160,7 @@ public interface ContainerEntity extends Container, MenuProvider {
+     default void setChestVehicleItem(final int slot, final ItemStack itemStack) {
+         this.unpackChestVehicleLootTable(null);
+         this.getItemStacks().set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // Leaves - item over-stack util
+     }
+ 
+     default @Nullable SlotAccess getChestVehicleSlot(final int slot) {
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index c063694237c0c98ad370ac7fc170172f9ed3fb37..f6d37cba8ab5688501be9170720a0b6ded810819 100644
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -293,6 +293,14 @@ public abstract class AbstractContainerMenu {
+         this.sendAllDataToRemote();
+     }
+ 
++    // Leaves start - item over-stack util
++    public void sendSingleSlot(final int slotIndex, final ItemStack item) {
++        if (this.synchronizer != null) {
++            this.synchronizer.sendSlotChange(this, slotIndex, item);
++        }
++    }
++    // Leaves end - item over-stack util
++
+     private void updateDataSlotListeners(final int id, final int currentValue) {
+         for (ContainerListener containerListener : this.containerListeners) {
+             containerListener.dataChanged(this, id, currentValue);
+@@ -449,7 +457,7 @@ public abstract class AbstractContainerMenu {
+                             && (this.quickcraftType == QUICKCRAFT_TYPE_CLONE || carriedItemStack.getCount() >= this.quickcraftSlots.size())
+                             && this.canDragTo(slot)) {
+                             int carry = slot.hasItem() ? slot.getItem().getCount() : 0;
+-                            int maxSize = Math.min(source.getMaxStackSize(), slot.getMaxStackSize(source));
++                            int maxSize = Math.min(org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(source), slot.getMaxStackSize(source)); // Leaves - item over-stack util
+                             int newCount = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots.size(), this.quickcraftType, source) + carry, maxSize);
+                             remaining -= newCount - carry;
+                             // slot.setByPlayer(source.copyWithCount(newCount));
+@@ -557,7 +565,7 @@ public abstract class AbstractContainerMenu {
+                                 slot.setByPlayer(carried);
+                             }
+                         } else if (ItemStack.isSameItemSameComponents(clicked, carried)) {
+-                            Optional<ItemStack> newCarried = slot.tryRemove(clicked.getCount(), carried.getMaxStackSize() - carried.getCount(), player);
++                            Optional<ItemStack> newCarried = slot.tryRemove(clicked.getCount(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(carried) - carried.getCount(), player); // Leaves - item over-stack util
+                             newCarried.ifPresent(itemsTaken -> {
+                                 carried.grow(itemsTaken.getCount());
+                                 slot.onTake(player, itemsTaken);
+@@ -618,7 +626,8 @@ public abstract class AbstractContainerMenu {
+         } else if (containerInput == ContainerInput.CLONE && player.hasInfiniteMaterials() && this.getCarried().isEmpty() && slotIndex >= 0) {
+             Slot slot = this.slots.get(slotIndex);
+             if (slot.hasItem()) {
+-                this.setCarried(slot.safeClone(player));
++                ItemStack item = slot.getItem();
++                this.setCarried(item.copyWithCount(org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(item))); // Leaves - item over-stack util
+             }
+         } else if (containerInput == ContainerInput.THROW && this.getCarried().isEmpty() && slotIndex >= 0) {
+             Slot slot = this.slots.get(slotIndex);
+@@ -653,15 +662,15 @@ public abstract class AbstractContainerMenu {
+                 int step = buttonNum == 0 ? 1 : -1;
+ 
+                 for (int pass = 0; pass < 2; pass++) {
+-                    for (int i = start; i >= 0 && i < this.slots.size() && carried.getCount() < carried.getMaxStackSize(); i += step) {
++                    for (int i = start; i >= 0 && i < this.slots.size() && carried.getCount() < org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(carried); i += step) { // Leaves - item over-stack util
+                         Slot target = this.slots.get(i);
+                         if (target.hasItem()
+                             && canItemQuickReplace(target, carried, true)
+                             && target.mayPickup(player)
+                             && this.canTakeItemForPickAll(carried, target)) {
+                             ItemStack itemStack = target.getItem();
+-                            if (pass != 0 || itemStack.getCount() != itemStack.getMaxStackSize()) {
+-                                ItemStack removed = target.safeTake(itemStack.getCount(), carried.getMaxStackSize() - carried.getCount(), player);
++                            if (pass != 0 || itemStack.getCount() != org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack)) { // Leaves - item over-stack util
++                                ItemStack removed = target.safeTake(itemStack.getCount(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(carried) - carried.getCount(), player); // Leaves - item over-stack util
+                                 carried.grow(removed.getCount());
+                             }
+                         }
+@@ -764,7 +773,7 @@ public abstract class AbstractContainerMenu {
+             destSlot = endSlot - 1;
+         }
+ 
+-        if (itemStack.isStackable()) {
++        if (org.leavesmc.leaves.util.ItemOverstackUtils.isStackable(itemStack)) { // Leaves - item over-stack util
+             while (!itemStack.isEmpty() && (backwards ? destSlot >= startSlot : destSlot < endSlot)) {
+                 Slot slot = this.slots.get(destSlot);
+                 ItemStack target = slot.getItem();
+@@ -865,7 +874,7 @@ public abstract class AbstractContainerMenu {
+     public static boolean canItemQuickReplace(final @Nullable Slot slot, final ItemStack itemStack, final boolean ignoreSize) {
+         boolean slotIsEmpty = slot == null || !slot.hasItem();
+         return !slotIsEmpty && ItemStack.isSameItemSameComponents(itemStack, slot.getItem())
+-            ? slot.getItem().getCount() + (ignoreSize ? 0 : itemStack.getCount()) <= itemStack.getMaxStackSize()
++            ? slot.getItem().getCount() + (ignoreSize ? 0 : itemStack.getCount()) <= org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack) // Leaves - item over-stack util
+             : slotIsEmpty;
+     }
+ 
+@@ -873,7 +882,7 @@ public abstract class AbstractContainerMenu {
+         return switch (quickCraftingType) {
+             case 0 -> Mth.floor((float)itemStack.getCount() / quickCraftSlotsSize);
+             case 1 -> 1;
+-            case 2 -> itemStack.getMaxStackSize();
++            case 2 -> org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack); // Leaves - item over-stack util
+             default -> itemStack.getCount();
+         };
+     }
+@@ -897,7 +906,7 @@ public abstract class AbstractContainerMenu {
+         for (int i = 0; i < container.getContainerSize(); i++) {
+             ItemStack itemStack = container.getItem(i);
+             if (!itemStack.isEmpty()) {
+-                totalPercent += (float)itemStack.getCount() / container.getMaxStackSize(itemStack);
++                totalPercent += org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackSignalStrength(container.getMaxStackSize(), itemStack); // Leaves - item over-stack util
+             }
+         }
+ 
+diff --git a/net/minecraft/world/inventory/MerchantContainer.java b/net/minecraft/world/inventory/MerchantContainer.java
+index 7c2ab4868dc5bed6a2e444975ef48c68e9a0b6cf..a3500c25b519d7bcff673212eb88d11cee564f53 100644
+--- a/net/minecraft/world/inventory/MerchantContainer.java
++++ b/net/minecraft/world/inventory/MerchantContainer.java
+@@ -108,7 +108,7 @@ public class MerchantContainer implements Container {
+     @Override
+     public void setItem(final int slot, final ItemStack itemStack) {
+         this.itemStacks.set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // Leaves - item over-stack util
+         if (this.isPaymentSlot(slot)) {
+             this.updateSellItem();
+         }
+diff --git a/net/minecraft/world/inventory/Slot.java b/net/minecraft/world/inventory/Slot.java
+index 0e86b025bad2c336cc360c2ce764dad0a75de1b6..1873b9376df57ff73d2a1583b60a512cfff7b998 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(final ItemStack itemStack) {
+-        return Math.min(this.getMaxStackSize(), itemStack.getMaxStackSize());
++        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(itemStack)); // Leaves - item over-stack util
+     }
+ 
+     public @Nullable Identifier getNoItemIcon() {
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index a6805d436fd3675e385cbf8a3e5b262ae694ed90..f15ee24339b04e4fe395755bf3503c17886f1782 100644
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
+@@ -159,7 +159,7 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang
+     private int popTime;
+     @Deprecated
+     private @Nullable Holder<Item> item;
+-    private PatchedDataComponentMap components;
++    public PatchedDataComponentMap components; // Leaves - item over-stack util
+ 
+     public static DataResult<ItemStack> validateStrict(final ItemStack itemStack) {
+         DataResult<?> result = validateComponents(itemStack.getComponents());
+@@ -185,7 +185,8 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang
+ 
+                 Holder<Item> item = Item.STREAM_CODEC.decode(input);
+                 DataComponentPatch patch = patchCodec.decode(input);
+-                return new ItemStack(item, count, patch);
++                ItemStack stack = new ItemStack(item, count, patch);
++                return org.leavesmc.leaves.util.ItemOverstackUtils.decodeMaxStackSize(stack); // Leaves - item over-stack util
+             }
+ 
+             @Override
+@@ -193,17 +194,20 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang
+                 if (itemStack.isEmpty()) {
+                     output.writeVarInt(0);
+                 } else {
+-                    output.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(output, itemStack.typeHolder());
++                    // Leaves start - item over-stack util
++                    final ItemStack encodedStack = org.leavesmc.leaves.util.ItemOverstackUtils.encodeMaxStackSize(itemStack.copy());
++                    output.writeVarInt(io.papermc.paper.util.sanitizer.ItemComponentSanitizer.sanitizeCount(io.papermc.paper.util.sanitizer.ItemObfuscationSession.currentSession(), encodedStack, encodedStack.getCount())); // Paper - potentially sanitize count
++                    Item.STREAM_CODEC.encode(output, encodedStack.typeHolder());
+                     // 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(itemStack))) { // 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(encodedStack))) { // pass the itemstack as context to the obfuscation session
+                         net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(true);
+-                    patchCodec.encode(output, itemStack.components.asPatch());
++                    patchCodec.encode(output, encodedStack.components.asPatch());
+                     } finally {
+                         net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(prev);
+                     }
+                     // Paper end - adventure; conditionally render translatable components
++                    // Leaves end - item over-stack util
+                 }
+             }
+         };
+diff --git a/net/minecraft/world/level/block/CrafterBlock.java b/net/minecraft/world/level/block/CrafterBlock.java
+index f0756f3d277103f95e4d5213b5ae788025b72f42..08c67084b5347bb1d6e65f17f3365ff33b542ec0 100644
+--- a/net/minecraft/world/level/block/CrafterBlock.java
++++ b/net/minecraft/world/level/block/CrafterBlock.java
+@@ -203,7 +203,7 @@ public class CrafterBlock extends BaseEntityBlock {
+         Direction direction = blockState.getValue(ORIENTATION).front();
+         Container into = HopperBlockEntity.getContainerAt(level, pos.relative(direction));
+         ItemStack remaining = results.copy();
+-        if (into != null && (into instanceof CrafterBlockEntity || results.getCount() > into.getMaxStackSize(results))) {
++        if (into != null && (into instanceof CrafterBlockEntity || results.getCount() > into.getMaxStackLeaves(results))) { // Leaves - item over-stack util
+             // CraftBukkit start - InventoryMoveItemEvent
+             org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(remaining);
+ 
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index ac93d2992fe780133439302ce5b851f9ac0c7353..5c23f48a09a73145ecd2166229b5737c42801db0 100644
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+@@ -395,7 +395,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         ItemStack oldStack = this.items.get(slot);
+         boolean same = !itemStack.isEmpty() && ItemStack.isSameItemSameComponents(oldStack, itemStack);
+         this.items.set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // Leaves - item over-stack util
+         if (slot == 0 && !same && 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 b961ec1532937be513e12e5306a34e6cbff24aee..dbf29f7c085831ce0f62942dc4ea70913fae1b15 100644
+--- a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+@@ -134,7 +134,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
+     @Override
+     public void setItem(final int slot, final ItemStack itemStack) {
+         this.getItems().set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // 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 18e6dd47b0525531bae56e0ab3c3846185470ce4..7d35b299533640338aeea6e5617942e89269d048 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -155,7 +155,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     public void setItem(final int slot, final ItemStack itemStack) {
+         this.unpackLootTable(null);
+         this.getItems().set(slot, itemStack);
+-        itemStack.limitSize(this.getMaxStackSize(itemStack));
++        itemStack.limitSize(this.getMaxStackLeaves(itemStack)); // Leaves - item over-stack util
+     }
+ 
+     @Override
+@@ -670,9 +670,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+             if (current.isEmpty()) {
+                 // Spigot start - SPIGOT-6693, SimpleContainer#setItem
+                 ItemStack leftover = ItemStack.EMPTY; // Paper - Make hoppers respect inventory max stack size
+-                if (!itemStack.isEmpty() && itemStack.getCount() > container.getMaxStackSize()) {
++                if (!itemStack.isEmpty() && (itemStack.getCount() > container.getMaxStackSize() || itemStack.getCount() > itemStack.getMaxStackSize())) { // Leaves - item over-stack util
+                     leftover = itemStack; // Paper - Make hoppers respect inventory max stack size
+-                    itemStack = itemStack.split(container.getMaxStackSize());
++                    itemStack = itemStack.split(Math.min(container.getMaxStackSize(), itemStack.getMaxStackSize())); // Leaves - item over-stack util
+                 }
+                 // Spigot end
+                 IGNORE_TILE_UPDATES.set(Boolean.TRUE); // Paper - Perf: Optimize Hoppers // Folia - region threading

lophine-server/minecraft-patches/features/0017-Leaves-Old-raid-behavior.patch

@@ -0,0 +1,177 @@
+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/bda7e406b995290234e33283a181e33467ceda38/leaves-server/minecraft-patches/features/0114-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 f58b10c7dec0d2b7dc2b3d1198539b74d13038f3..0a838a2015526dde2cb8d9006a71610e0bf5e9dc 100644
+--- a/net/minecraft/world/effect/BadOmenMobEffect.java
++++ b/net/minecraft/world/effect/BadOmenMobEffect.java
+@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
+             && !player.isSpectator()
+             && level.getDifficulty() != Difficulty.PEACEFUL
+             && level.isVillage(player.blockPosition())) {
++            // Leaves start - Revert raid changes
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
++                return level.getRaids().createOrExtendRaid(player, player.blockPosition()) == null;
++            }
++            // Leaves end - Revert raid changes
+             Raid raid = level.getRaidAt(player.blockPosition());
+             if (raid == null || raid.getRaidOmenLevel() < raid.getMaxRaidOmenLevel()) {
+                 player.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplification));
+diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
+index 32e20979b9343efa6b5903c7b6baf351205654a0..4ddc34822e88b011f58c70ca4f14e7a17912b714 100644
+--- a/net/minecraft/world/entity/raid/Raid.java
++++ b/net/minecraft/world/entity/raid/Raid.java
+@@ -269,7 +269,7 @@ public class Raid {
+     }
+ 
+     public boolean absorbRaidOmen(final 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;
+         }
+@@ -346,7 +346,13 @@ public class Raid {
+                         }
+ 
+                         if (shouldTryToFindSpawnPos) {
+-                            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) {
+@@ -401,7 +407,14 @@ public class Raid {
+                 int attempt = 0;
+ 
+                 while (this.shouldSpawnGroup()) {
+-                    BlockPos spawnPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
++                    // Leaves Start - old FindSpawnPosition
++                    BlockPos spawnPos;
++                    if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
++                        spawnPos = this.getRavagerSpawnLocation(level, attempt, 20);
++                    } else {
++                        spawnPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
++                    }
++                    // Leaves End - old FindSpawnPosition
+                     if (spawnPos != null) {
+                         this.started = true;
+                         this.spawnGroup(level, spawnPos);
+@@ -413,7 +426,7 @@ public class Raid {
+                         attempt++;
+                     }
+ 
+-                    if (attempt > 5) {
++                    if (attempt > (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;
+@@ -717,7 +730,7 @@ public class Raid {
+             int spawnX = this.center.getX() + Mth.floor(Mth.cos(angle) * 32.0F * howFar) + this.random.nextInt(3) * Mth.floor(howFar);
+             int spawnZ = this.center.getZ() + Mth.floor(Mth.sin(angle) * 32.0F * howFar) + this.random.nextInt(3) * Mth.floor(howFar);
+             int spawnY = level.getHeight(Heightmap.Types.WORLD_SURFACE, spawnX, spawnZ);
+-            if (Mth.abs(spawnY - this.center.getY()) <= 96) {
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior || Mth.abs(spawnY - this.center.getY()) <= 96) { // Leaves - skippable
+                 spawnPos.set(spawnX, spawnY, spawnZ);
+                 if (!level.isVillage(spawnPos) || secondsRemaining <= 7) {
+                     int delta = 10;
+@@ -900,4 +913,42 @@ public class Raid {
+             this.spawnsPerWaveBeforeBonus = spawnsPerWaveBeforeBonus;
+         }
+     }
++
++    // Leaves start - old FindSpawnPosition
++    @Nullable
++    private BlockPos getRavagerSpawnLocation(final ServerLevel serverWorld, final int proximity, final int tries) {
++        int i = proximity == 0 ? 2 : 2 - proximity;
++        BlockPos.MutableBlockPos mutable = new BlockPos.MutableBlockPos();
++        net.minecraft.world.entity.SpawnPlacementType spawnLocation = net.minecraft.world.entity.SpawnPlacements.getPlacementType(EntityTypes.RAVAGER);
++        for (int j = 0; j < tries; j++) {
++            float f = serverWorld.getRandom().nextFloat() * (float) (Math.PI * 2);
++            int k = this.center.getX() + Mth.floor(Mth.cos(f) * 32.0F * (float) i + serverWorld.getRandom().nextInt(5));
++            int l = this.center.getZ() + Mth.floor(Mth.sin(f) * 32.0F * (float) i + serverWorld.getRandom().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, EntityTypes.RAVAGER)
++                    || serverWorld.getBlockState(mutable.below()).is(net.minecraft.world.level.block.Blocks.SNOW)
++                    && serverWorld.getBlockState(mutable).isAir())
++            ) {
++                return mutable.immutable();
++            }
++        }
++        return null;
++    }
++
++    private Optional<BlockPos> preCalcRavagerSpawnLocation(final ServerLevel serverWorld, final 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 7e969cd81d2ac788515f4d9ad7584ade4c684a42..7555f0c5edf6a5419018203487cf8941e8095cb5 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -129,6 +129,42 @@ public abstract class Raider extends PatrollingMonster {
+ 
+                 raidWhenKilled.removeFromRaid(serverLevel, this, false);
+             }
++
++            // Leaves start - Revert raid changes
++            Entity killerEntity = source.getEntity();
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior && !this.hasActiveRaid()) {
++                ItemStack itemstack = this.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.HEAD);
++                net.minecraft.world.entity.player.Player entityhuman = null;
++                if (killerEntity instanceof net.minecraft.world.entity.player.Player player) {
++                    entityhuman = player;
++                } else if (killerEntity 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.isPatrolLeader()) {
++                    net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                    int amp = 1;
++
++                    if (mobeffect != null) {
++                        amp += mobeffect.getAmplifier();
++                        entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                    } else {
++                        --amp;
++                    }
++
++                    amp = net.minecraft.util.Mth.clamp(amp, 0, 4);
++                    net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, 120000, amp, false, false, true);
++
++                    if (serverLevel.getGameRules().get(net.minecraft.world.level.gamerules.GameRules.RAIDS)) {
++                        entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
++                    }
++                    this.setPatrolLeader(false);
++                }
++            }
++            // Leaves end - Revert raid changes
+         }
+ 
+         super.die(source);

lophine-server/minecraft-patches/features/0018-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch

@@ -0,0 +1,55 @@
+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 5762eed9e99d918bee02d77c0ddd70be0aa0e2ec..cb1589e3aa663ca058fb5c3a24da700d4482cf35 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -1231,6 +1231,30 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+         return changed;
+     }
+ 
++    // Lophine Start - raid revert adapt Cross Region Damage trace
++    public boolean addEffect(final 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(final MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
++        if (entity != null)
++            entity.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> {
++                try {
++                    if (nmsEntity.isRemoved()) return;
++                    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(final MobEffectInstance newEffect) {
+         if (this.is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
+             return !newEffect.is(MobEffects.INFESTED);
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 7555f0c5edf6a5419018203487cf8941e8095cb5..44f8302a8c3fb867f122a97dc29f24a311f0ad91 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -159,7 +159,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, amp, false, false, true);
+ 
+                     if (serverLevel.getGameRules().get(net.minecraft.world.level.gamerules.GameRules.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); // CraftBukkit // Lophine - raid revert adapt Cross Region Damage trace
+                     }
+                     this.setPatrolLeader(false);
+                 }

lophine-server/minecraft-patches/features/0018-Old-zombie-reinforcement.patch

@@ -1,19 +0,0 @@
-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..6f1f26b7f759e56f843e674167470da943785728 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.misc.OldFeatureConfig.oldZombieReinforcement ? EntityType.ZOMBIE : this.getType(); // Lophine - old zombie reinforcement
-                 Zombie zombie = type.create(level, EntitySpawnReason.REINFORCEMENT);
-                 if (zombie == null) {
-                     return true;

lophine-server/minecraft-patches/features/0019-Leaves-Leaves-Base-Protocol-Core.patch

@@ -0,0 +1,126 @@
+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: 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/9d2bd3f7b0a48f00df7bc8c74292338ed9c3a458/leaves-server/minecraft-patches/features/0122-Leaves-Protocol-Core.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+index 08e253662a2c183c0ab53a51cc07485cff33bf2c..1bd678d668a1febc129f4cb4d0d95ea27acc4252 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(final B output, final CustomPacketPayload value) {
++                // Leaves start - protocol core
++                if (value instanceof org.leavesmc.leaves.protocol.core.LeavesCustomPayload payload) {
++                    org.leavesmc.leaves.protocol.core.LeavesProtocolManager.encode(output, payload);
++                    return;
++                }
++                // Leaves end - protocol core
+                 this.writeCap(output, value.type(), value);
+             }
+ 
+             @Override
+             public CustomPacketPayload decode(final B input) {
+                 Identifier identifier = input.readIdentifier();
+-                return (CustomPacketPayload)this.findCodec(identifier).decode(input);
++                // Leaves start - protocol core
++                var payload = org.leavesmc.leaves.protocol.core.LeavesProtocolManager.decode(identifier, input);
++                return java.util.Objects.requireNonNullElseGet(payload, () -> (CustomPacketPayload) this.findCodec(identifier).decode(input));
++                // Leaves end - protocol core
+             }
+         };
+     }
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 437abeb7b2d021b38b438d0e046f05809e196930..2ccf454454582d53aee210917218c0867556181e 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -2006,6 +2006,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+         profiler.popPush("server gui refresh");
+ 
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol // Lophine - we don't have tickCount to use, remove it
++
+         if (false) for (Runnable tickable : this.tickables) { // Folia - region threading - TODO WTF is this?
+             tickable.run();
+         }
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index d25c3f13a051ce6f2fbde30654eb9cdb8914b0ba..8d5a478f76ed98268ceb0ae19a438a3efea880b6 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(final MinecraftServer server, final Connection connection, final 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
+@@ -143,6 +145,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ 
+     @Override
+     public void handleCustomPayload(final 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.Identifier 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;
+@@ -202,6 +216,7 @@ 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);
+         }
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 8b7e4814b00d6f6c9f25cce5186905f165b97c2f..5bfc986f3d8dc81444be857c857bd91ada8c409d 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -318,6 +318,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); // Leaves - protocol
++
+         final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+ 
+         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -514,6 +516,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 net.kyori.adventure.text.@Nullable Component remove(final ServerPlayer player, final 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 level = player.level();
+         player.awardStat(Stats.LEAVE_GAME);
+@@ -1417,6 +1420,7 @@ public abstract class PlayerList {
+             player.connection.send(recipes);
+             player.getRecipeBook().sendInitialRecipeBook(player);
+         }
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleDataPackReload(); // Leaves - protocol core
+     }
+ 
+     public boolean isAllowCommandsForAllPlayers() {