Update Wool Counter & FakePlayer code from Leaves

related issue: https://github.com/LuminolMC/Lophine/issues/110

.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 2, force release if you enter 1, default release if not released else skip release"
+        required: false
+        default: ""
+      force-push:
+        description: "Force disable push to repo if you enter 2, force push to repo if you enter 1, default push if not released else skip push repo"
+        required: false
+        default: ""
+      comments:
+        description: "Add comments to release"
+        required: false
+        default: ""
 
 permissions: write-all
 
@@ -16,16 +30,16 @@ jobs:
     environment: default
     steps:
       - name: Checkout Git Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
-      - name: Set up JDK
-        uses: actions/setup-java@v4
+      - name: Set Up JDK
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -36,36 +50,102 @@ jobs:
       - name: Apply All Patches
         run: ./gradlew --refresh-dependencies applyAllPatches
 
-      - name: CreateMojmapPaperclipJar
+      - name: Build Paperclip Jar
         run: ./gradlew --refresh-dependencies createMojmapPaperclipJar
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ env.project_id_b }} CI Artifacts
           path: lophine-server/build/libs/*-paperclip-*-mojmap.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
+          fi
+          echo "release_exists=${release_exists}" >> $GITHUB_ENV
+
+      - name: Check If Branch In Expectations
+        if: github.event_name != 'pull_request'
+        run: |
+          if [[ "$GITHUB_REF_NAME" == ver/* ]] || [[ "$GITHUB_REF_NAME" == exp/* ]] || [[ "$GITHUB_REF_NAME" == dev/* ]]; then
+            echo "Branch is in expected prefixes"
+            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_release == 'true' && env.release_exists != 'true' && !( inputs.force-release == '2' )) || inputs.force-push == '1'
         continue-on-error: true
         run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
         env:
           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 == '2')) || inputs.force-release == '1'
+        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 }})
             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/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
+            This release is automatically compiled by GitHub Actions
+            ### Comments
+            > ${{ inputs.comments }}
+            ### 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@v6
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.3
+        with:
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1658551725 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'

README.md

@@ -1,104 +1,149 @@
-<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/LuminolMC/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=for-the-badge&color=orange)](https://github.com/LuminolMC/Lophine/issues)
+  
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=for-the-badge&color=red)
+  
+  ![Repo contributors](https://img.shields.io/github/contributors/LuminolMC/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/LuminolMC/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/LuminolMC/Lophine.git
+cd Lophine
 
-## 构建
-
-要构建一个paperclip jar，你需要运行以下命令。你可以在lophine-server/build/libs中找到jar（注意：需要`JDK21`）
-
- ```shell
+# 应用补丁并构建 Paperclip JAR
 ./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
 ```
 
-## 使用API
+构建完成后，您可以在 `lophine-server/build/libs` 目录中找到生成的 JAR 文件。
 
-使用 Gradle:
+## 🔌 API 使用
+
+### Gradle 配置
 
 ```kotlin
 repositories {
     maven {
-        url = "https://repo.menthamc.com/repository/maven-public/"
+        url = "https://repo.menthamc.org/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>
+        <url>https://repo.menthamc.org/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群**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)
+- **QQ频道**: [点击加入](https://pd.qq.com/s/eq9krf9j)
+- **Telegram**: [点击加入](https://t.me/LuminolMinecraft)
+- **Discord**: [点击加入](https://discord.gg/Qd7m3V6eDx)
 
-## 关于 Issue
+### 获取帮助
 
-当您遇到任何问题时，请向我们提问，我们将尽力解决，但请记得清楚地描述您的问题并提供足够的日志等信息。
+- 📋 [提交 Issue](https://github.com/LuminolMC/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LuminolMC/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)
+<div align="center">
+  <b>感谢 <a href="https://github.com/LegacyLands">LegacyLands</a> 对本项目的赞助</b>
+  <br>
+  <i>如果你想开发跨 Folia/非 Folia 平台的插件，<a href="https://github.com/LegacyLands/legacy-lands-library/">legacy-lands-library</a> 将会是个不错的选择</i>
+  <br><br>
+  <img src="public/image/legacy-lands-logo.png" alt="LegacyLands Logo" width="200">
+</div>
 
-## 请给我们一个 ⭐Star！
+---
+
+## ⭐ 请给我们一个 Star！
 
 > 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。
 
+### 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" />
@@ -106,3 +151,7 @@ dependencies {
     <img alt="Star历史表" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
   </picture>
 </a>
+
+<div align="center">
+  <b>如果这个项目对您有帮助，请不要忘记给我们一个 ⭐Star！</b>
+</div>

README_EN.md

@@ -1,101 +1,149 @@
-<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/LuminolMC/Lophine?style=for-the-badge&color=blue)
+  [![License](https://img.shields.io/github/license/LuminolMC/Lophine?style=for-the-badge&color=green)](LICENSE.md)
+  [![Issues](https://img.shields.io/github/issues/LuminolMC/Lophine?style=for-the-badge&color=orange)](https://github.com/LuminolMC/Lophine/issues)
+  
+  ![Commit Activity](https://img.shields.io/github/commit-activity/w/LuminolMC/Lophine?style=for-the-badge&color=purple)
+  ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/LuminolMC/Lophine?style=for-the-badge&color=yellow)
+  ![GitHub all releases](https://img.shields.io/github/downloads/LuminolMC/Lophine/total?style=for-the-badge&color=red)
+  
+  ![Repo contributors](https://img.shields.io/github/contributors/LuminolMC/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/LuminolMC/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/LuminolMC/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 createMojmapPaperclipJar
 ```
 
-## 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.menthamc.org/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>
+        <url>https://repo.menthamc.org/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**: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)
+- **QQ Channel**: [Join Here](https://pd.qq.com/s/eq9krf9j)
+- **Telegram**: [Join Here](https://t.me/LuminolMinecraft)
+- **Discord**: [Join Here](https://discord.gg/Qd7m3V6eDx)
 
-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/LuminolMC/Lophine/issues)
+- 💬 [GitHub Discussions](https://github.com/LuminolMC/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
+## 🎉 Special Thanks
 
-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
+### Project Sponsors
 
-![legacy-lands-logo](public/image/legacy-lands-logo.png)
+<div align="center">
+  <b>Thanks to <a href="https://github.com/LegacyLands">LegacyLands</a> for sponsoring this project</b>
+  <br>
+  <i>If you want to develop cross-Folia/non-Folia platform plugins, <a href="https://github.com/LegacyLands/legacy-lands-library/">legacy-lands-library</a> would be a great choice</i>
+  <br><br>
+  <img src="public/image/legacy-lands-logo.png" alt="LegacyLands Logo" width="200">
+</div>
 
-## Please ⭐star us!
+---
+
+## ⭐ Give Us a Star!
+
+> Every free ⭐Star you give is the motivation for our every step forward.
+
+### Star History
 
 <a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&LuminolMC/Lophine&Date">
   <picture>
@@ -104,3 +152,7 @@ Thanks [LegacyLands](https://github.com/LegacyLands) for sponsoring this project
     <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol%2CLuminolMC/Lophine&type=Date" />
   </picture>
 </a>
+
+<div align="center">
+  <b>If this project helps you, please don't forget to give us a ⭐Star!</b>
+</div>

build.gradle.kts

@@ -41,7 +41,7 @@ paperweight {
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-val menthaMavenPublicUrl = "https://repo.menthamc.com/repository/maven-public/";
+val menthaMavenPublicUrl = "https://repo.menthamc.org/repository/maven-public/";
 
 subprojects {
     apply(plugin = "java-library")
@@ -88,7 +88,7 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            maven("https://repo.menthamc.com/repository/maven-snapshots/") {
+            maven("https://repo.menthamc.org/repository/maven-snapshots/") {
                 name = "MenthaMC"
                 credentials(PasswordCredentials::class) {
                     username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")

gradle.properties

@@ -1,10 +1,13 @@
 group=fun.bm.lophine
-version=1.21.8-R0.1-SNAPSHOT
-mcVersion=1.21.8
-release=2
+version=1.21.11-R0.1-SNAPSHOT
+mcVersion=1.21.11
+# This is the current API version for use in (paper-)plugin.yml files
+# During snapshot cycles this should be the anticipated version of the release target
+apiVersion=1.21.11
+release=1
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=baa7a4f47b93c32527ea671d16193af8def87486
+luminolRef=8e7e4c96d2bf6fae39a508c8753cb4058465788d
 
 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.2.0-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 @@
+@@ -104,20 +_,24 @@
              srcDir(generatedDir)
              srcDir(file("../paper-api/src/main/java"))
              srcDir(file("../folia-api/src/main/java"))

lophine-api/paper-patches/features/0002-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 b9d34c0b80a5d0c26f43e4959c3a8256a854585a..850f65d764030b09d469e33a69409204503d9ca1 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -3039,4 +3039,15 @@ public final class Bukkit {
+     public static void restart() {
+         server.restart();
+     }
++
++    // 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 1dc5d8c96786950fc98cada5bad981c0c716b154..cb8c4e09511f99558eb5af26c08c5cb1f936780d 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2791,4 +2791,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/0003-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 850f65d764030b09d469e33a69409204503d9ca1..78b947352aa32ae0c59101459f420bf8e3497707 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -3050,4 +3050,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 cb8c4e09511f99558eb5af26c08c5cb1f936780d..b770b6f990d46f5325554f5d73c6a2a6ed361158 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2800,4 +2800,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 @@
+@@ -48,7 +_,23 @@
          }
      }
  
@@ -25,7 +25,7 @@
  
  
      spigot {
-@@ -142,12 +_,16 @@
+@@ -139,12 +_,16 @@
          resources { srcDir("../paper-server/src/main/resources") }
          java { srcDir("../folia-server/src/main/java") }
          resources { srcDir("../folia-server/src/main/resources") }
@@ -42,16 +42,16 @@
      }
  }
  val log4jPlugins = sourceSets.create("log4jPlugins") {
-@@ -174,7 +_,7 @@
+@@ -172,7 +_,7 @@
  }
  
  dependencies {
 -    implementation(project(":luminol-api")) // Luminol
 +    implementation(project(":lophine-api")) // Lophine
      // Luminol start - Dependenices insert
-     implementation("com.electronwill.night-config:toml:3.8.2") // Night config
+     implementation("com.electronwill.night-config:toml:3.8.3") // Night config
      implementation("com.github.luben:zstd-jni:1.5.4-1")
-@@ -276,14 +_,14 @@
+@@ -272,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -70,7 +70,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -447,7 +_,7 @@
+@@ -431,7 +_,7 @@
  }
  
  fill {

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 0bebc2cc87fb9c1c526e4de4f3bc157552307a72..cb1657939b86c039fcfe6403d3f202c2c5879e88 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 {
+@@ -23,6 +23,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
+         configfiles.put("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules"));
++        configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
          preLoad();
      }
  
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
-index ded1f0667327a70a923ebda55c41b1c9094d3e37..57ddc0832b919b115b85c81ac30f136e32f1e77e 100644
+index df5d926fb4401dd93d658fe14ae4d9d58cff68f9..b6d84fea596cfa78032151ab2f206b6b3d5dd197 100644
 --- a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
-@@ -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")
 -    public static String serverModName = "Luminol";
 +    public static String serverModName = "Lophine";
  
-     @ConfigInfo(baseName = "vanilla_spoof")
+     @ConfigInfo(name = "vanilla_spoof")
      public static boolean fakeVanilla = false;

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

@@ -1,30 +1,30 @@
 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
+Date: Tue, 26 Aug 2025 22:08:54 +0800
 Subject: [PATCH] Transformed Configs
 
 
-diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/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;
+diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
+index 4051384e82dba0416838c3c9889a6e368367b601..a5535b479cdcca870d0c8be6ed6fbcb32f266ac2 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
+@@ -11,6 +11,7 @@ public class CommandConfig implements IConfigModule {
+     @TransformedConfig(name = "enable", directory = {"experiment", "force_the_data_command_to_be_enabled"})
+     @ConfigInfo(name = "enable_data_command")
+     public static boolean data = false;
++    @TransformedConfig(name = "command_block_enabled", directory = {"experiment", "command"}, originInstance = "lophine")
+     @TransformedConfig(name = "enabled", directory = {"experiment", "force_enable_command_block_command_execution"})
+     @ConfigInfo(name = "enable_command_block", comments = """
+             Force to enable command blocks.
+diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
+index 35e6014f04093050a9a62b895b43e5c5d8c6a28e..11abfb884f972fd73ca4c13a6e309de1bcd23fd5 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
++++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
+@@ -8,6 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
  
+ @ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "force_disable_packet_limiter_of_paper")
  public class PaperPacketLimiterConfig implements IConfigModule {
-+    @me.earthme.luminol.config.flags.TransformedConfig(name = "unlimit-packet", category = {"misc", "network"}, originInstance = "lophine")
-     @ConfigInfo(baseName = "force_disable")
++    @TransformedConfig(name = "unlimit-packet", directory = {"misc", "network"}, originInstance = "lophine")
+     @TransformedConfig(name = "force_disable", directory = {"misc", "force_disable_packet_limiter_of_paper"})
+     @ConfigInfo(name = "force_disable")
      public static boolean forceDisable = false;
- 

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

@@ -8,72 +8,35 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/d93e9766d3797d130
 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 5995c499298454a060433746c64be5fcc8d202e2..3452399de0fa464ce04a7cf1a05b440346bef662 100644
+index 112dc08eb62c4c50fb4859f51a366cedf027ca00..b5f661fd20b382725ad117c56ce2c94ded32b1b7 100644
 --- a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
 +++ b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
-@@ -17,29 +17,30 @@
+@@ -17,6 +17,7 @@
  
  package org.leavesmc.leaves.util;
  
-+import fun.bm.lophine.config.modules.misc.ContainerExpansionConfig;
- //import io.papermc.paper.datacomponent.DataComponentTypes;
- //import io.papermc.paper.datacomponent.item.ItemEnchantments;
++import fun.bm.lophine.config.modules.function.ContainerExpansionConfig;
+ import io.papermc.paper.datacomponent.DataComponentTypes;
+ import io.papermc.paper.datacomponent.item.ItemEnchantments;
  import net.minecraft.core.component.DataComponents;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.world.entity.item.ItemEntity;
--//import net.minecraft.world.item.BlockItem;
-+import net.minecraft.world.item.BlockItem;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.item.component.CustomData;
--//import net.minecraft.world.item.component.ItemContainerContents;
--//import net.minecraft.world.level.block.ShulkerBoxBlock;
-+import net.minecraft.world.item.component.ItemContainerContents;
-+import net.minecraft.world.level.block.ShulkerBoxBlock;
- //import org.bukkit.enchantments.Enchantment;
--//import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.NotNull;
- //import org.leavesmc.leaves.LeavesConfig;
+@@ -135,9 +136,9 @@ public class ItemOverstackUtils {
  
- import java.util.List;
--//import java.util.Objects;
-+import java.util.Objects;
- import java.util.Optional;
- 
- public class ItemOverstackUtils {
- 
-     private static final List<ItemUtil> overstackUtils = List.of(
--/*        new ShulkerBox(),
--        new CurseEnchantedBook()*/
-+            new ShulkerBox()
-+            // new CurseEnchantedBook() // only use shulker box part
-     );
- 
-     public static int getItemStackMaxCount(ItemStack stack) {
-@@ -109,6 +110,7 @@ public class ItemOverstackUtils {
- 
-     public static float getItemStackSignalStrength(int maxStackSize, ItemStack itemStack) {
-         float result = (float) itemStack.getCount() / Math.min(maxStackSize, itemStack.getMaxStackSize());
-+        // only use shulker box part
- /*        if (LeavesConfig.modify.oldMC.allowGrindstoneOverstacking && CurseEnchantedBook.isCursedEnchantedBook(itemStack)) {
-             return result;
-         }*/
-@@ -134,9 +136,9 @@ public class ItemOverstackUtils {
-         }
-     }
- 
--/*    private static class ShulkerBox implements ItemUtil {
-+    private static class ShulkerBox implements ItemUtil {
+     private static class ShulkerBox implements ItemUtil {
          public static boolean shulkerBoxCheck(@NotNull ItemStack stack1, @NotNull ItemStack stack2) {
--            if (LeavesConfig.modify.shulkerBox.sameNbtStackable) {
+-            /*if (LeavesConfig.modify.shulkerBox.sameNbtStackable) {
 +            if (ContainerExpansionConfig.nbtShulkerStackable) {
                  return Objects.equals(stack1.getComponents(), stack2.getComponents());
-             }
+-            }*/  // Luminol
++            }
              return shulkerBoxNoItem(stack1) && shulkerBoxNoItem(stack2) && Objects.equals(stack1.getComponents(), stack2.getComponents());
-@@ -148,24 +150,24 @@ public class ItemOverstackUtils {
+         }
+ 
+@@ -147,16 +148,15 @@ public class ItemOverstackUtils {
  
          @Override
          public boolean isEnabled() {
--            return LeavesConfig.modify.shulkerBox.shulkerBoxStackSize > 1;
+-            // return LeavesConfig.modify.shulkerBox.stackableShulkerBoxes > 1;  // Luminol
+-            return false;  // Luminol
 +            return ContainerExpansionConfig.shulkerCount > 1;
          }
  
@@ -81,41 +44,33 @@ index 5995c499298454a060433746c64be5fcc8d202e2..3452399de0fa464ce04a7cf1a05b4403
          public boolean tryStackItems(ItemEntity self, ItemEntity other) {
              ItemStack selfStack = self.getItem();
              if (!isEnabled() ||
--                !(selfStack.getItem() instanceof BlockItem blockItem) ||
--                !(blockItem.getBlock() instanceof ShulkerBoxBlock)
+-                    !(selfStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem) ||
+-                    !(blockItem.getBlock() instanceof net.minecraft.world.level.block.ShulkerBoxBlock)
 +                    !(selfStack.getItem() instanceof BlockItem blockItem) ||
 +                    !(blockItem.getBlock() instanceof ShulkerBoxBlock)
              ) {
                  return false;
              }
- 
+@@ -164,8 +164,8 @@ public class ItemOverstackUtils {
              ItemStack otherStack = other.getItem();
              if (selfStack.getItem() == otherStack.getItem()
--                && shulkerBoxCheck(selfStack, otherStack)
--                && selfStack.getCount() != org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.shulkerBoxStackSize) {
--                int amount = Math.min(otherStack.getCount(), org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.shulkerBoxStackSize - selfStack.getCount());
-+                    && shulkerBoxCheck(selfStack, otherStack)
+                     && shulkerBoxCheck(selfStack, otherStack)
+-                    && selfStack.getCount() != /*org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.stackableShulkerBoxes*/ 1) {  // Luminol
+-                int amount = Math.min(otherStack.getCount(), /*org.leavesmc.leaves.LeavesConfig.modify.shulkerBox.stackableShulkerBoxes*/1 - selfStack.getCount()); // Luminol
 +                    && selfStack.getCount() != ContainerExpansionConfig.shulkerCount) {
 +                int amount = Math.min(otherStack.getCount(), ContainerExpansionConfig.shulkerCount - selfStack.getCount());
  
                  selfStack.grow(amount);
                  self.setItem(selfStack);
-@@ -187,14 +189,15 @@ public class ItemOverstackUtils {
+@@ -187,9 +187,8 @@ public class ItemOverstackUtils {
          @Override
          public int getMaxServerStackCount(ItemStack stack) {
              if (isEnabled() && stack.getItem() instanceof BlockItem bi &&
--                bi.getBlock() instanceof ShulkerBoxBlock && (LeavesConfig.modify.shulkerBox.sameNbtStackable || shulkerBoxNoItem(stack))) {
--                return LeavesConfig.modify.shulkerBox.shulkerBoxStackSize;
+-                    bi.getBlock() instanceof ShulkerBoxBlock && (/*LeavesConfig.modify.shulkerBox.sameNbtStackable ||*/ shulkerBoxNoItem(stack))) {  // Luminol
+-                // return LeavesConfig.modify.shulkerBox.stackableShulkerBoxes;  // Luminol
+-                return 1; // Luminol
 +                    bi.getBlock() instanceof ShulkerBoxBlock && (ContainerExpansionConfig.nbtShulkerStackable || shulkerBoxNoItem(stack))) {
 +                return ContainerExpansionConfig.shulkerCount;
              }
              return -1;
          }
-     }
- 
--    public static class CurseEnchantedBook implements ItemUtil {
-+// only use shulker box part
-+/*    public static class CurseEnchantedBook implements ItemUtil {
-         public static boolean isCursedEnchantedBook(ItemStack stack) {
-             ItemEnchantments enchantments = stack.getBukkitStack().getData(DataComponentTypes.STORED_ENCHANTMENTS);
-             if (enchantments == null || enchantments.enchantments().size() != 1) {

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-Add-configs-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 configs 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 718a10b442997c8225a7de27ff92c1f36b809a9e..5757832ca91c42b417a95a2536a282a24eef0ef7 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl
+@@ -391,7 +391,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;
+@@ -410,7 +410,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
+                     return true;
+@@ -661,7 +661,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
++                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // 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));
+                     LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(d7));
                  }
-@@ -1540,7 +1540,7 @@ public class ServerGamePacketListenerImpl
+@@ -1563,7 +1563,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);
 -                                            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(), d3, d4, d5);
                                                  }
-@@ -1618,7 +1618,7 @@ public class ServerGamePacketListenerImpl
+@@ -1642,7 +1642,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);
 -                                    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/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-Add-config-to-enable-cross-region-damage-trace.patch

@@ -5,12 +5,12 @@ 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 338ad851814e0d15ac2c20c9f13895f52557e130..93bc76af4d0abbe1c526434991e74c4465764ac6 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
+@@ -1447,6 +1447,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
              this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
-             killCredit.awardKillScore(this, cause);
+             killCredit.awardKillScore(this, damageSource);
              this.createWitherRose(killCredit);
 +        // Luminol Start - Cross Region Damage trace
 +        } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
@@ -21,8 +21,8 @@ index 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02
 +        // Luminol 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);
+@@ -1470,6 +1477,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      }
      // Leaves end - exp fix
  
@@ -40,7 +40,7 @@ index 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02
 +            } catch (Throwable ex) {
 +                LOGGER.error(ex.getMessage(), ex);
 +            }
-+        }, null, 1L );
++        }, null, 1L);
 +    }
 +    // Luminol End - Cross Region Damage trace
 +
@@ -48,10 +48,10 @@ index 11e6197dec541b28733715f0d7eaa4c7b834d632..6b7c92fdf562dfa46eee8e8acbc82b02
          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 372fb8a7f06e87c5694b972e3b726e52903ef1e3..ad497cc5a01662e86d6c3d0a7d51b86cfc764f53 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
+@@ -1960,6 +1960,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
              final LivingEntity killer = this.getKillCredit();
              if (killer != null) {
                  killer.awardKillScore(this, damageSource);
@@ -65,7 +65,7 @@ index 567d63ae589705e13403814b36e35d00c241a69e..3f4b1c54f9207ba1854a8c8da965cbac
              }
          }); // Paper end
          this.postDeathDropItems(deathEvent); // Paper
-@@ -1958,6 +1965,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1970,6 +1977,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          return deathEvent; // Paper
      }
  
@@ -84,7 +84,7 @@ index 567d63ae589705e13403814b36e35d00c241a69e..3f4b1c54f9207ba1854a8c8da965cbac
      protected void dropEquipment(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
+@@ -2597,6 +2616,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          }
      }
  

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

@@ -5,10 +5,10 @@ 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 bca2c5410aa543d2bb421e53893e9163508b3568..fdccb06c918d387e46c29ede7337159db8c5d9ca 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
+@@ -1350,7 +1350,7 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
                  double d1 = vec3_dx * vec3_dx + vec3_dz * vec3_dz; // Paper
                  double d2 = d * d;
                  // Paper start - Configurable entity tracking range by Y
@@ -18,19 +18,19 @@ index 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd1
                      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 4d1de02dbc804a32aaa1d2eef8e8368300412af2..979edd3f4cf17d61cec9edf3ff02192cea354a0d 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;
+@@ -152,7 +152,7 @@ import org.jetbrains.annotations.Contract;
+ import org.jspecify.annotations.Nullable;
  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
+-public abstract class Entity implements SyncedDataHolder, DebugValueSource, Nameable, ItemOwner, SlotProvider, 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, DebugValueSource, Nameable, ItemOwner, SlotProvider, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity, dev.tr7zw.entityculling.versionless.access.Cullable { // Paper - rewrite chunk system // Paper - optimise entity tracker // Luminol - Ray tracing entity tracker
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-     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
+     static boolean isLevelAtLeast(ValueInput input, int level) {
+@@ -6462,4 +6462,46 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      // Paper end - Expose entity id counter
  
      public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
@@ -78,10 +78,10 @@ index 75f327fff68097c1c9f65767552f686421e1e397..ed7421895311d89ad9726804893eff42
 +
  }
 diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
-index 6f00ffa05d9597917574357e0069c9b056aa5ce2..5cc7a91e32f17d8d9585ae4844a4ed3b706e3273 100644
+index 0590d5723854a03a59fe9471710802f4e64e50b8..4f8ff2c024d6f2e67c5fa38fe2e660ba39e35499 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
+@@ -1254,6 +1254,9 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
      public final int passengerTickTimerId;
      public final int passengerInactiveTickTimerId;
      // Folia end - profiler
@@ -92,10 +92,10 @@ index 6f00ffa05d9597917574357e0069c9b056aa5ce2..5cc7a91e32f17d8d9585ae4844a4ed3b
      public EntityType(
          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 5b19dba8c978feafa5d3d956359188e2de2257a5..3a8ac0765b8a988c281a2ded8c40ec044781cda2 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 {
+@@ -189,6 +189,25 @@ public abstract class Player extends Avatar implements ContainerUser {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -121,7 +121,7 @@ index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a62
  
      public Player(Level level, GameProfile gameProfile) {
          super(EntityType.PLAYER, level);
-@@ -287,6 +306,26 @@ public abstract class Player extends LivingEntity {
+@@ -245,6 +264,26 @@ public abstract class Player extends Avatar implements ContainerUser {
  
      @Override
      public void tick() {
@@ -148,8 +148,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()) {
+@@ -1353,6 +1392,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/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/0004-Add-config-to-enable-function-command.patch

@@ -0,0 +1,21 @@
+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 b4976ac6a609c24a43375d6c945e2412b00ab627..ddde2c3e7c8d9105202a7ff32e444f85485cdb7f 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -215,7 +215,9 @@ public class Commands {
+         FillCommand.register(this.dispatcher, context);
+         FillBiomeCommand.register(this.dispatcher, context);
+         ForceLoadCommand.register(this.dispatcher);
+-        //FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
++        if (fun.bm.lophine.config.modules.experiment.CommandConfig.function) {
++            FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
++        }
+         GameModeCommand.register(this.dispatcher);
+         GameRuleCommand.register(this.dispatcher, context);
+         GiveCommand.register(this.dispatcher, context);

lophine-server/minecraft-patches/features/0005-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 b95d144dd479d339cc4b0f92cc4c3bade9af4927..44f469b1fc5169adf3214ac52b8e2647d26e7974 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -241,7 +241,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 start - Add a config to enable scoreboard command
+         SeedCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
+         VersionCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
+         SetBlockCommand.register(this.dispatcher, context);

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

@@ -5,10 +5,10 @@ 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
+index b3bc39ebe8d2f48d976de9cd4fcae46095523514..6df2b8cf3b902bb157ed5fa9eaf9ca062d9e5a39 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -299,6 +299,11 @@ public final class RegionizedServer {
+@@ -332,6 +332,11 @@ public final class RegionizedServer {
          this.randomWalk();
           */
          ++this.tickCount;
@@ -20,7 +20,7 @@ index e1842ab8f20271a8b20ab8462b09a4745a612a9a..8405157ec35a443e238fa6866772c839
          // 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 {
+@@ -355,6 +360,13 @@ public final class RegionizedServer {
              this.globalTick(world, tickCount);
          }
  
@@ -34,20 +34,20 @@ index e1842ab8f20271a8b20ab8462b09a4745a612a9a..8405157ec35a443e238fa6866772c839
          // tick connections
          this.tickConnections();
  
-@@ -455,7 +467,7 @@ public final class RegionizedServer {
+@@ -488,7 +500,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)) {
+             if (world.getGameRules().get(GameRules.ADVANCE_TIME)) {
                  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
+index e3df94bfd26b118cb8a7bdece75d611aaf27c606..bae2385b725c0ce551768f22945393ccf6e1e432 100644
 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -31,8 +31,8 @@ public final class TickRegionScheduler {
+@@ -39,8 +39,8 @@ public final class TickRegionScheduler {
          }
      }
  
@@ -55,10 +55,10 @@ index 0357792de0ed8ec9058d1847c8b45c33ff365af6..4945c11f573a53df2f5be4beb7af6a3f
 -    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 {
+     static {
+@@ -447,8 +447,23 @@ public final class TickRegionScheduler {
              final long cpuStart = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
              final long tickStart = System.nanoTime();
  
@@ -84,7 +84,7 @@ index 0357792de0ed8ec9058d1847c8b45c33ff365af6..4945c11f573a53df2f5be4beb7af6a3f
  
              if (!this.tryMarkTicking()) {
                  if (!this.cancelled.get()) {
-@@ -435,6 +450,11 @@ public final class TickRegionScheduler {
+@@ -497,6 +512,11 @@ public final class TickRegionScheduler {
              try {
                  // next start isn't updated until the end of this tick
                  this.tickRegion(tickCount, tickStart, scheduledEnd);
@@ -97,10 +97,10 @@ index 0357792de0ed8ec9058d1847c8b45c33ff365af6..4945c11f573a53df2f5be4beb7af6a3f
                  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
+index 8d77d6f165a5883e997122d1c2f231287e0caebe..23f047a47cdccc90a96153cc52bdedf91cd15db9 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -245,7 +245,11 @@ public class Commands {
+@@ -262,7 +262,11 @@ public class Commands {
          TeleportCommand.register(this.dispatcher);
          TellRawCommand.register(this.dispatcher, context);
          //TestCommand.register(this.dispatcher, context); // Folia - region threading
@@ -114,23 +114,23 @@ index b6e10157c572dadb1bff18f8431166966eed46d9..e2fc15d84fafde6847ecead23c551694
          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
+index 1627a8f3ebf7bf1a750a62802f1187ad8c1a6a0f..6e18d988104c121d9683eb57e77a78acfdee3907 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;
+@@ -270,7 +270,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private @Nullable String serverId;
      public MinecraftServer.ReloadableResources resources;
      private final StructureTemplateManager structureTemplateManager;
 -    private final ServerTickRateManager tickRateManager;
 +    public static ServerTickRateManager tickRateManager; // Luminol - Add tick command support
+     private final ServerDebugSubscribers debugSubscribers = new ServerDebugSubscribers(this);
      protected WorldData worldData;
-     public PotionBrewing potionBrewing;
-     private FuelValues fuelValues;
+     private LevelData.RespawnData effectiveRespawnData = LevelData.RespawnData.DEFAULT;
 diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
-index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c60d14fd87 100644
+index 4257c47d33e3773fac766817138cc21c55d9ab76..95f6b1cbd5e33151c326689bc72292ff38a48803 100644
 --- a/net/minecraft/server/ServerTickRateManager.java
 +++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -105,7 +105,7 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -106,7 +106,7 @@ public class ServerTickRateManager extends TickRateManager {
              return false;
          } else if (this.remainingSprintTicks > 0L) {
              this.sprintTickStartTime = System.nanoTime();
@@ -139,7 +139,7 @@ index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c6
              return true;
          } else {
              this.finishTickSprint();
-@@ -113,6 +113,12 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -114,6 +114,12 @@ public class ServerTickRateManager extends TickRateManager {
          }
      }
  
@@ -153,7 +153,7 @@ index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c6
          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
+index 14c46d585fc9bfbf9a57340508ea2e5076ac39d6..99096896a4512eed579b234e7fa0c6e9c3e8c246 100644
 --- a/net/minecraft/server/commands/TickCommand.java
 +++ b/net/minecraft/server/commands/TickCommand.java
 @@ -14,7 +14,7 @@ import net.minecraft.server.ServerTickRateManager;

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/0007-Add-config-to-enable-waypoint-command-bar.patch

@@ -0,0 +1,177 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 7 Jul 2025 18:19:00 +0800
+Subject: [PATCH] Add config to enable waypoint command & bar
+
+use concurrent method to fix it (now, they are thread safe)
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 0c31144e1f18fe92065f0c167aaaaa809363cc4c..65d45f7abe95d9492620ea53ab87797a0ebc0ec7 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -270,7 +270,11 @@ public class Commands {
+         TimeCommand.register(this.dispatcher);
+         TitleCommand.register(this.dispatcher, context);
+         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+-        //WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
++        // Lophine start - unsafe waypoint bar
++        if (fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) {
++            WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
++        }
++        // Lophine end - unsafe waypoint bar
+         WeatherCommand.register(this.dispatcher);
+         WorldBorderCommand.register(this.dispatcher);
+         if (JvmProfiler.INSTANCE.isAvailable()) {
+diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
+index 1cbc46e480cc7d109c6128f109a1a9e38bf1a193..bd1d4a832eec4c89a7f8bdd5d066b6074f206d81 100644
+--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
++++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
+@@ -16,22 +16,31 @@ import net.minecraft.world.waypoints.WaypointManager;
+ import net.minecraft.world.waypoints.WaypointTransmitter;
+ 
+ public class ServerWaypointManager implements WaypointManager<WaypointTransmitter> {
+-    private final Set<WaypointTransmitter> waypoints = new HashSet<>();
+-    private final Set<ServerPlayer> players = new HashSet<>();
+-    private final Table<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = HashBasedTable.create();
++    private final Set<WaypointTransmitter> waypoints = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
++    private final Set<ServerPlayer> players = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
++    private final fun.bm.lophine.utils.concurrent.AbstractConcurrentTable<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = fun.bm.lophine.config.modules.optimizations.WayPointOptimizedTableConfig.optimizedTable ? new fun.bm.lophine.utils.concurrent.OptimizedConcurrentTable<>() : new fun.bm.lophine.utils.concurrent.ConcurrentTable<>(); // Lophine - concurrent
+ 
+     @Override
+     public void trackWaypoint(WaypointTransmitter waypoint) {
+-        // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
++        this.waypoints.add(waypoint);
++
++        for (ServerPlayer serverPlayer : this.players) {
++            this.createConnection(serverPlayer, waypoint);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     @Override
+     public void updateWaypoint(WaypointTransmitter waypoint) {
+         if (this.waypoints.contains(waypoint)) {
+-            Map<ServerPlayer, WaypointTransmitter.Connection> map = Tables.transpose(this.connections).row(waypoint);
+-            SetView<ServerPlayer> set = Sets.difference(this.players, map.keySet());
++            java.util.List<Entry<ServerPlayer, WaypointTransmitter.Connection>> map = this.connections.getXZ(waypoint); // Lophine - concurrent
++            Set<ServerPlayer> players1 = new HashSet<>(); // Lophine - concurrent
++            if (!map.isEmpty()) map.forEach((entry) -> players1.add(entry.getKey())); // Lophine - concurrent
++            SetView<ServerPlayer> set = Sets.difference(this.players, players1); // Lophine - concurrent
+ 
+-            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : ImmutableSet.copyOf(map.entrySet())) {
++            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
+                 this.updateConnection(entry.getKey(), waypoint, entry.getValue());
+             }
+ 
+@@ -43,26 +52,65 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+ 
+     @Override
+     public void untrackWaypoint(WaypointTransmitter waypoint) {
+-        this.connections.column(waypoint).forEach((serverPlayer, connection) -> connection.disconnect());
+-        Tables.transpose(this.connections).row(waypoint).clear();
++        this.connections.getXZ(waypoint).forEach((entry) -> {
++            entry.getValue().disconnect();
++            this.connections.remove(entry.getKey(), waypoint, entry.getValue());
++        }); // Lophine - concurrent
+         this.waypoints.remove(waypoint);
+     }
+ 
+     public void addPlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
++        this.players.add(player);
++
++        for (WaypointTransmitter waypointTransmitter : this.waypoints) {
++            this.createConnection(player, waypointTransmitter);
++        }
++
++        if (player.isTransmittingWaypoint()) {
++            this.trackWaypoint((WaypointTransmitter)player);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void updatePlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
++        java.util.List<Entry<WaypointTransmitter, WaypointTransmitter.Connection>> map = this.connections.getYZ(player); // Lophine - concurrent
++        Set<WaypointTransmitter> waypoints1 = new HashSet<>();// Lophine - concurrent
++        if (!map.isEmpty()) map.forEach((entry) -> waypoints1.add(entry.getKey()));// Lophine - concurrent
++        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, waypoints1); // Lophine - concurrent
++
++        for (Entry<WaypointTransmitter, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
++            this.updateConnection(player, entry.getKey(), entry.getValue());
++        }
++
++        for (WaypointTransmitter waypointTransmitter : set) {
++            this.createConnection(player, waypointTransmitter);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void removePlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
++        this.connections.getYZ(player).forEach((entry) -> {
++            entry.getValue().disconnect();
++            this.connections.remove(player, entry.getKey(), entry.getValue());
++        }); // Lophine - concurrent
++        this.untrackWaypoint((WaypointTransmitter)player);
++        this.players.remove(player);
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void breakAllConnections() {
+-        this.connections.values().forEach(WaypointTransmitter.Connection::disconnect);
+-        this.connections.clear();
++        java.util.List<WaypointTransmitter.Connection> map = this.connections.getAllZ(); // Lophine - concurrent
++        if (!map.isEmpty()) map.forEach(WaypointTransmitter.Connection::disconnect); // Lophine - concurrent
++        this.connections.clearAll(); // Lophine - concurrent
+     }
+ 
+     public void remakeConnections(WaypointTransmitter waypoint) {
+@@ -83,13 +131,19 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+         if (player != waypoint) {
+             if (isLocatorBarEnabledFor(player)) {
+                 waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection -> {
+-                    this.connections.put(player, waypoint, connection);
++                    this.connections.putOrUpdate(player, waypoint, connection);
+                     connection.connect();
+                 }, () -> {
+-                    WaypointTransmitter.Connection connection = this.connections.remove(player, waypoint);
+-                    if (connection != null) {
+-                        connection.disconnect();
+-                    }
++                    // Lophine start - concurrent
++                    java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint);
++                    if (c.isEmpty()) return; // Lophine - concurrent
++                    c.forEach((connection) -> {
++                        this.connections.remove(player, waypoint, connection);
++                        if (connection != null) {
++                            connection.disconnect();
++                        }
++                    });
++                    // Lophine end - concurrent
+                 });
+             }
+         }
+@@ -103,10 +157,12 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+                 } else {
+                     waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection1 -> {
+                         connection1.connect();
+-                        this.connections.put(player, waypoint, connection1);
++                        this.connections.putOrUpdate(player, waypoint, connection1);
+                     }, () -> {
+                         connection.disconnect();
+-                        this.connections.remove(player, waypoint);
++                        java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint); // Lophine - concurrent
++                        if (c.isEmpty()) return; // Lophine - concurrent
++                        c.forEach((connection1) -> this.connections.remove(player, waypoint, connection1)); // Lophine - concurrent
+                     });
+                 }
+             }

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

@@ -0,0 +1,94 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 2 Jul 2025 23:36:25 +0800
+Subject: [PATCH] Fix datapack command save function
+
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 2f91e80f8c3df2775a793aa3c648c50007543192..6230c08d001aebc119900906aa557247261985a3 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -2430,6 +2430,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return this.reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
+     }
+ 
++    // Lophine start - region thread skip reload // TODO - add reload support
++    public void saveDatapacks(Collection<String> selectedIds) {
++        this.packRepository.setSelected(selectedIds, false); // Paper - add pendingReload flag to determine required pack loading - false as this is *after* a reload (see above)
++        WorldDataConfiguration worldDataConfiguration = new WorldDataConfiguration(
++                getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures()
++        );
++        this.worldData.setDataConfiguration(worldDataConfiguration);
++    }
++    // Lophine end - region thread skip reload // TODO - add reload support
++
+     public CompletableFuture<Void> reloadResources(Collection<String> selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
+         // Paper end - Add ServerResourcesReloadedEvent
+         CompletableFuture<Void> completableFuture = CompletableFuture.<ImmutableList>supplyAsync(
+diff --git a/net/minecraft/server/commands/DataPackCommand.java b/net/minecraft/server/commands/DataPackCommand.java
+index bb36fa4559cdfe82079af1c39516239119ff06f4..8c530eef0e416d8b96f190ada358d77d34dbc8ac 100644
+--- a/net/minecraft/server/commands/DataPackCommand.java
++++ b/net/minecraft/server/commands/DataPackCommand.java
+@@ -98,7 +98,7 @@ public class DataPackCommand {
+         dispatcher.register(
+             Commands.literal("datapack")
+                 .requires(Commands.hasPermission(Commands.LEVEL_GAMEMASTERS))
+-                /*.then( // Luminol - Add back read-only datapack command
++                .then(
+                     Commands.literal("enable")
+                         .then(
+                             Commands.argument("name", StringArgumentType.string())
+@@ -160,11 +160,11 @@ public class DataPackCommand {
+                                 .suggests(SELECTED_PACKS)
+                                 .executes(commandContext -> disablePack(commandContext.getSource(), getPack(commandContext, "name", false)))
+                         )
+-                )*/ // Luminol - Add back read-only datapack command
++                )
+                 .then(
+                     Commands.literal("list")
+                         .executes(commandContext -> listPacks(commandContext.getSource()))
+-                        // .then(Commands.literal("available").executes(commandContext -> listAvailablePacks(commandContext.getSource()))) // Luminol - Add back read-only datapack command
++                        .then(Commands.literal("available").executes(commandContext -> listAvailablePacks(commandContext.getSource())))
+                         .then(Commands.literal("enabled").executes(commandContext -> listEnabledPacks(commandContext.getSource())))
+                 )
+                 .then(
+@@ -252,7 +252,7 @@ public class DataPackCommand {
+     }
+ 
+     private static int listPacks(CommandSourceStack source) {
+-        return listEnabledPacks(source) ;// + listAvailablePacks(source); // Luminol - Add back read-only datapack command
++        return listEnabledPacks(source) + listAvailablePacks(source);
+     }
+ 
+     private static int listAvailablePacks(CommandSourceStack source) {
+@@ -280,7 +280,7 @@ public class DataPackCommand {
+ 
+     private static int listEnabledPacks(CommandSourceStack source) {
+         PackRepository packRepository = source.getServer().getPackRepository();
+-        // packRepository.reload(); // Luminol - Add back read-only datapack command
++        packRepository.reload();
+         Collection<? extends Pack> selectedPacks = packRepository.getSelectedPacks();
+         if (selectedPacks.isEmpty()) {
+             source.sendSuccess(() -> Component.translatable("commands.datapack.list.enabled.none"), false);
+diff --git a/net/minecraft/server/commands/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java
+index fcca0babb4e7929cc168fc8b9ad47619e6feb1a5..bac5f4e023f8b73eebea0f31fd253e04c8809918 100644
+--- a/net/minecraft/server/commands/ReloadCommand.java
++++ b/net/minecraft/server/commands/ReloadCommand.java
+@@ -16,11 +16,17 @@ public class ReloadCommand {
+     private static final Logger LOGGER = LogUtils.getLogger();
+ 
+     public static void reloadPacks(Collection<String> selectedIds, CommandSourceStack source) {
++        // Lophine start - region thread skip reload // TODO - add reload support
++        source.getServer().saveDatapacks(selectedIds);
++        source.getSender().sendMessage("You need to restart server to load datapacks update.");
++        if (false) {
+         source.getServer().reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally(throwable -> { // Paper - Add ServerResourcesReloadedEvent
+             LOGGER.warn("Failed to execute reload", throwable);
+             source.sendFailure(Component.translatable("commands.reload.failure"));
+             return null;
+         });
++        }
++        // Lophine end - region thread skip reload // TODO - add reload support
+     }
+ 
+     private static Collection<String> discoverNewPacks(PackRepository packRepository, WorldData worldData, Collection<String> selectedIds) {

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

@@ -8,29 +8,20 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index 8405157ec35a443e238fa6866772c839621d73d7..4edb6e6e6287f232f7eef45c747554264ec05319 100644
+index 6df2b8cf3b902bb157ed5fa9eaf9ca062d9e5a39..057f60cd24876bf44cf3efccbc8a61b030a2a381 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -334,6 +334,8 @@ public final class RegionizedServer {
+@@ -367,6 +367,8 @@ public final class RegionizedServer {
          }
          // Luminol end - Add a config to enable tick command
  
-+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // 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
+index 1da034752064312962a4144f91be5265a9a08997..081ca42b6a6644eb8c2b5ac9105fecf8ad39d501 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 {
@@ -48,50 +39,20 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f93
  
              @Override
              public CustomPacketPayload decode(B buffer) {
-                 ResourceLocation resourceLocation = buffer.readResourceLocation();
--                return (CustomPacketPayload)this.findCodec(resourceLocation).decode(buffer);
+                 Identifier identifier = buffer.readIdentifier();
+-                return (CustomPacketPayload)this.findCodec(identifier).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));
++                var payload = org.leavesmc.leaves.protocol.core.LeavesProtocolManager.decode(identifier, buffer);
++                return java.util.Objects.requireNonNullElseGet(payload, () -> this.findCodec(identifier).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
+index 0bf2173c5445de021090c2d0264afc440b005bdc..076bfe7a7b57f8d3b29ef0aaad117707678da7a3 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
+@@ -58,6 +58,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      public @Nullable String playerBrand;
      public final java.util.Set<String> pluginMessagerChannels;
      // Paper end - retain certain values
@@ -99,7 +60,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
  
      public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) {
          this.server = server;
-@@ -70,6 +71,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -71,6 +72,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          this.pluginMessagerChannels = cookie.channels();
          this.keepAlive = cookie.keepAlive();
          // Paper end
@@ -107,7 +68,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
      }
  
      // Paper start - configuration phase API
-@@ -160,6 +162,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -161,6 +163,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -116,7 +77,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
 +            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 (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;
 +            }
@@ -126,7 +87,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
          // 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
+@@ -220,10 +234,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);
@@ -139,7 +100,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
      }
  
      @Override
-@@ -385,9 +400,9 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -386,9 +401,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(
@@ -152,7 +113,7 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
  
              );
  
-@@ -420,10 +435,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -421,10 +436,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      private void disconnect0(DisconnectionDetails disconnectionDetails) {
          this.connection
@@ -168,27 +129,27 @@ index 714813cba67da4a737682fe9276cb0d96fea336d..9677a3d62de11dafc8b9debe7a18ee6d
          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
+index fe58993c3fb98189141120f849c7750ce1e24ebd..d9b20f3b099eea4862774da79929bb71f8dede53 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
-             }
+@@ -315,6 +315,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);
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player);
 +
-             final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+         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 {
+         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -511,6 +513,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) {
+     public net.kyori.adventure.text.@Nullable 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 {
+@@ -1401,6 +1404,7 @@ public abstract class PlayerList {
              serverPlayer.connection.send(clientboundUpdateRecipesPacket);
              serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
          }

lophine-server/minecraft-patches/features/0010-Leaves-Configurable-trading-with-the-void.patch

@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 29 Oct 2025 00:09:09 +0800
+Subject: [PATCH] Leaves: Configurable trading with the void
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index a60c70550c217bccda6695dc7b7165de8e97e5cd..6aad6024dc121eae63b7fde92a89cbea29fcafb3 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -3015,7 +3015,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             // Spigot start
+             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
+                 // Paper start - Fix merchant inventory not closing on entity removal
+-                if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) {
++                if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade && entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { // Leaves - Configurable trading with the void
+                     merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED);
+                 }
+                 // Paper end - Fix merchant inventory not closing on entity removal
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index a8a034ad5895ad1b833754c91c3a370c3b9b3744..35d51c727ce9229a174c45e9ea838fa9e3c3d80a 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -555,7 +555,7 @@ public abstract class PlayerList {
+                 player.stopRiding();
+                 rootVehicle.getPassengersAndSelf().forEach(entity -> {
+                     // Paper start - Fix villager boat exploit
+-                    if (entity instanceof net.minecraft.world.entity.npc.villager.AbstractVillager villager) {
++                    if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade && entity instanceof net.minecraft.world.entity.npc.villager.AbstractVillager villager) { // Leaves - Configurable trading with the void
+                         final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
+                         if (human != null) {
+                             villager.setTradingPlayer(null);
+diff --git a/net/minecraft/world/inventory/MerchantMenu.java b/net/minecraft/world/inventory/MerchantMenu.java
+index 6dfee62a46a5882df7f405e59d762647289d7866..1192a6ab33a9481397b84c9cf0a24fbbcb0ed065 100644
+--- a/net/minecraft/world/inventory/MerchantMenu.java
++++ b/net/minecraft/world/inventory/MerchantMenu.java
+@@ -74,6 +74,7 @@ public class MerchantMenu extends AbstractContainerMenu {
+ 
+     @Override
+     public boolean stillValid(Player player) {
++        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.villagerVoidTrade) return this.trader.getTradingPlayer() == player; // Leaves - Configurable trading with the void
+         if (!checkReachable) return true; // Paper - checkReachable
+         return this.trader.stillValid(player);
+     }

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

@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/46cccfc39cafbca16
 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
+index 8e08cb90dc94171a8da7126fe18c46eaa49a58f2..a7804a0d099c79c81eb45eb20402a001d8734529 100644
 --- a/net/minecraft/commands/arguments/item/ItemInput.java
 +++ b/net/minecraft/commands/arguments/item/ItemInput.java
 @@ -39,11 +39,13 @@ public class ItemInput {
@@ -28,23 +28,23 @@ index 643797124fe5a4489d0b7419b7e600c04f283ef2..04b4100da96aad50f08e8c59200eec93
  
      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
+index 1281eadb2d0c5b4ce5e3afd51d8205f9a4ef011c..b1446dfb4689174ee9f55cec6080622ec34de250 100644
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
-@@ -55,7 +55,7 @@ public class GiveCommand {
+@@ -54,7 +54,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
+index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3cb81c469 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3079,7 +3079,7 @@ public class ServerGamePacketListenerImpl
+@@ -3126,7 +3126,7 @@ public class ServerGamePacketListenerImpl
                                              } else if (slot.mayPlace(cursor)) {
                                                  if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
                                                      int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1;
@@ -53,7 +53,7 @@ index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0
                                                      toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
                                                      if (toPlace == 1) {
                                                          action = InventoryAction.PLACE_ONE;
-@@ -3115,7 +3115,7 @@ public class ServerGamePacketListenerImpl
+@@ -3162,7 +3162,7 @@ public class ServerGamePacketListenerImpl
                                                  }
                                              } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
                                                  if (clickedItem.getCount() >= 0) {
@@ -62,7 +62,7 @@ index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0
                                                          // As of 1.5, this is result slots only
                                                          action = InventoryAction.PICKUP_ALL;
                                                      }
-@@ -3326,6 +3326,7 @@ public class ServerGamePacketListenerImpl
+@@ -3379,6 +3379,7 @@ public class ServerGamePacketListenerImpl
                          this.player.containerMenu.broadcastFullState();
                      } else {
                          this.player.containerMenu.broadcastChanges();
@@ -70,7 +70,7 @@ index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0
                      }
                      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
+@@ -3490,7 +3491,7 @@ public class ServerGamePacketListenerImpl
              }
  
              boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -79,7 +79,7 @@ index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0
              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
+@@ -3532,6 +3533,7 @@ public class ServerGamePacketListenerImpl
                  this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack);
                  this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack);
                  this.player.inventoryMenu.broadcastChanges();
@@ -88,10 +88,10 @@ index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0
              } 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
+index b63cecafd841b97a694f6d2610141dcdb8f30574..392678778dc2a036c1e3db4b6bb2800e452d3cd0 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.
+@@ -37,6 +37,12 @@ public interface Container extends Clearable, SlotProvider, Iterable<ItemStack>,
          return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
      }
  
@@ -105,10 +105,10 @@ index 2afaf6a3f18af7889f4f3b35cee9bbb5e4ec01f2..da99b4bc7fe8460945070915073be141
  
      boolean stillValid(Player player);
 diff --git a/net/minecraft/world/SimpleContainer.java b/net/minecraft/world/SimpleContainer.java
-index d907e24d563e27acab2f2bf9711b1755ea9afd19..75170c8d3be477a6ea2a1d62018a6ab630b0e54e 100644
+index 0233c2b5e40c33330870e598431897a2ff98c2a3..3cf1819a9c82da2d2e0c43187e204353e3643369 100644
 --- a/net/minecraft/world/SimpleContainer.java
 +++ b/net/minecraft/world/SimpleContainer.java
-@@ -211,7 +211,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+@@ -210,7 +210,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
      @Override
      public void setItem(int index, ItemStack stack) {
          this.items.set(index, stack);
@@ -117,7 +117,7 @@ index d907e24d563e27acab2f2bf9711b1755ea9afd19..75170c8d3be477a6ea2a1d62018a6ab6
          this.setChanged();
      }
  
-@@ -286,7 +286,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+@@ -285,7 +285,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
      }
  
      private void moveItemsBetweenStacks(ItemStack stack, ItemStack other) {
@@ -127,10 +127,10 @@ index d907e24d563e27acab2f2bf9711b1755ea9afd19..75170c8d3be477a6ea2a1d62018a6ab6
          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
+index 16c42a5e35c6ee1df640e5831818099fab6338f1..f3f067c62dc024a747d059608ae7a2e8740dbff2 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
+@@ -271,10 +271,15 @@ public class ItemEntity extends Entity implements TraceableEntity, ChangePublish
  
      private boolean isMergable() {
          ItemStack item = this.getItem();
@@ -148,10 +148,10 @@ index fd4f1e63f980b6959fc80084651991f8f8bc6c34..e5e8c752129a6ebb0dd1315c9b8ec459
          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
+index 41e59f3739945ca7f6ab710c993b5c0f15fcd529..b849b04f227b43d036f4f6b3ae7accfafc389d9f 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 {
+@@ -166,10 +166,12 @@ public class Inventory implements Container, Nameable {
      }
  
      private boolean hasRemainingSpaceForItem(ItemStack destination, ItemStack origin) {
@@ -166,7 +166,7 @@ index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0
      }
  
      // CraftBukkit start - Watch method above! :D
-@@ -181,7 +183,7 @@ public class Inventory implements Container, Nameable {
+@@ -182,7 +184,7 @@ public class Inventory implements Container, Nameable {
              }
  
              if (this.hasRemainingSpaceForItem(itemInSlot, itemStack)) {
@@ -175,7 +175,7 @@ index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0
              }
              if (remains <= 0) {
                  return itemStack.getCount();
-@@ -190,7 +192,7 @@ public class Inventory implements Container, Nameable {
+@@ -191,7 +193,7 @@ public class Inventory implements Container, Nameable {
  
          ItemStack itemInOffhand = this.equipment.get(EquipmentSlot.OFFHAND);
          if (this.hasRemainingSpaceForItem(itemInOffhand, itemStack)) {
@@ -184,7 +184,7 @@ index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0
          }
          if (remains <= 0) {
              return itemStack.getCount();
-@@ -314,7 +316,7 @@ public class Inventory implements Container, Nameable {
+@@ -315,7 +317,7 @@ public class Inventory implements Container, Nameable {
              this.setItem(slot, item);
          }
  
@@ -193,7 +193,7 @@ index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0
          int min = Math.min(count, i);
          if (min == 0) {
              return count;
-@@ -420,7 +422,7 @@ public class Inventory implements Container, Nameable {
+@@ -421,7 +423,7 @@ public class Inventory implements Container, Nameable {
                  break;
              }
  
@@ -203,10 +203,10 @@ index a6bb436dc80daf6901dc027a6011ead4b3ed27e2..71df58ae26325a2d28b6679733c474c0
                  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
+index 00dbc0d125b2c8c208ffa46f9084c6317efaba90..1f57b3c60fd0cbfdd65e06f8994525ade6dc6bd9 100644
 --- a/net/minecraft/world/entity/player/StackedItemContents.java
 +++ b/net/minecraft/world/entity/player/StackedItemContents.java
-@@ -23,7 +23,7 @@ public class StackedItemContents {
+@@ -36,7 +36,7 @@ public class StackedItemContents {
      }
  
      public void accountStack(ItemStack stack) {
@@ -216,10 +216,10 @@ index 83ccde54c625d40dc595e000c533f60aa929bd5a..6779503888e6d311758cffde582b0efb
  
      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
+index 44276ba9c7aab306cfd12833a834ebe61cf64e7c..0a19a7782f3fa27c41e02393e887ba7cc727012b 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 {
+@@ -162,7 +162,7 @@ public interface ContainerEntity extends Container, MenuProvider {
      default void setChestVehicleItem(int slot, ItemStack stack) {
          this.unpackChestVehicleLootTable(null);
          this.getItemStacks().set(slot, stack);
@@ -227,12 +227,12 @@ index 02d2efef2dc0f0e12eac0c71fa290af706f7694d..99f109e2653eff10c011f380694bd77a
 +        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - item over-stack util
      }
  
-     default SlotAccess getChestVehicleSlot(final int index) {
+     default @Nullable SlotAccess getChestVehicleSlot(final int slot) {
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d96c1f4fa9 100644
+index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6fd57a4574 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -295,6 +295,13 @@ public abstract class AbstractContainerMenu {
+@@ -292,6 +292,13 @@ public abstract class AbstractContainerMenu {
          this.sendAllDataToRemote();
      }
  
@@ -246,7 +246,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
      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 {
+@@ -448,7 +455,7 @@ public abstract class AbstractContainerMenu {
                              && (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size())
                              && this.canDragTo(slot1)) {
                              int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0;
@@ -255,7 +255,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
                              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 {
+@@ -560,7 +567,7 @@ public abstract class AbstractContainerMenu {
                                  slot.setByPlayer(carried2);
                              }
                          } else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
@@ -264,16 +264,16 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
                              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);
+@@ -622,7 +629,7 @@ public abstract class AbstractContainerMenu {
+             Slot slot2 = this.slots.get(slotIndex);
              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 {
+         } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotIndex >= 0) {
+             Slot slot2 = this.slots.get(slotIndex);
+@@ -657,15 +664,15 @@ public abstract class AbstractContainerMenu {
                  int maxStackSize = button == 0 ? 1 : -1;
  
                  for (int i3 = 0; i3 < 2; i3++) {
@@ -292,7 +292,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
                                  itemStack.grow(itemStack1.getCount());
                              }
                          }
-@@ -766,7 +773,7 @@ public abstract class AbstractContainerMenu {
+@@ -767,7 +774,7 @@ public abstract class AbstractContainerMenu {
              i = endIndex - 1;
          }
  
@@ -301,7 +301,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
              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 {
+@@ -868,7 +875,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())
@@ -310,7 +310,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
              : flag;
      }
  
-@@ -875,7 +882,7 @@ public abstract class AbstractContainerMenu {
+@@ -876,7 +883,7 @@ public abstract class AbstractContainerMenu {
          return switch (type) {
              case 0 -> Mth.floor((float)stack.getCount() / slots.size());
              case 1 -> 1;
@@ -319,7 +319,7 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
              default -> stack.getCount();
          };
      }
-@@ -898,7 +905,7 @@ public abstract class AbstractContainerMenu {
+@@ -899,7 +906,7 @@ public abstract class AbstractContainerMenu {
              for (int i = 0; i < container.getContainerSize(); i++) {
                  ItemStack item = container.getItem(i);
                  if (!item.isEmpty()) {
@@ -329,10 +329,10 @@ index fcb2e0a722ed94acf08da06f06b20f42652896bc..9489a50df2de3d641235153c5a0217d9
              }
  
 diff --git a/net/minecraft/world/inventory/MerchantContainer.java b/net/minecraft/world/inventory/MerchantContainer.java
-index 1e5dfb1f9e371fa23cdfa9280797aa0e183d4cd2..1a593d5bfc4574fd071604105422cd1d395648b8 100644
+index a4203c416c7a83557055099a9ea8f43ac2b18b21..46c8026876e851ec4a31fd34c9b64623469ffb8d 100644
 --- a/net/minecraft/world/inventory/MerchantContainer.java
 +++ b/net/minecraft/world/inventory/MerchantContainer.java
-@@ -109,7 +109,7 @@ public class MerchantContainer implements Container {
+@@ -108,7 +108,7 @@ public class MerchantContainer implements Container {
      @Override
      public void setItem(int index, ItemStack stack) {
          this.itemStacks.set(index, stack);
@@ -342,7 +342,7 @@ index 1e5dfb1f9e371fa23cdfa9280797aa0e183d4cd2..1a593d5bfc4574fd071604105422cd1d
              this.updateSellItem();
          }
 diff --git a/net/minecraft/world/inventory/Slot.java b/net/minecraft/world/inventory/Slot.java
-index 5ceb8964476b40db4511bec91ff13c4f522a1357..f416d7976e41a06b5a8be93485eaa233ffceda5c 100644
+index 2b7e245ebf3bb471a1d817c4b5d56a64790cbab7..00083df87439ff0fa56e09853931b60579520d0e 100644
 --- a/net/minecraft/world/inventory/Slot.java
 +++ b/net/minecraft/world/inventory/Slot.java
 @@ -75,7 +75,7 @@ public class Slot {
@@ -353,21 +353,21 @@ index 5ceb8964476b40db4511bec91ff13c4f522a1357..f416d7976e41a06b5a8be93485eaa233
 +        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ItemOverstackUtils.getItemStackMaxCount(stack)); // Leaves - item over-stack util
      }
  
-     @Nullable
+     public @Nullable Identifier getNoItemIcon() {
 diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
-index 33c3a5e39e8e1aa023baab76ef94f8aed481480e..a27e1d53abc2d8b8912226add33510067e10ed52 100644
+index 5489302acb5bceac2cae71079a8356b455cf1304..a688da5bc71799c13548d390ab58645da9128229 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
+@@ -174,7 +174,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+     private int popTime;
      @Deprecated
-     @Nullable
-     private Item item;
+     private @Nullable Item item;
 -    PatchedDataComponentMap components;
 +    public PatchedDataComponentMap components; // Leaves - item over-stack util
-     @Nullable
-     private Entity entityRepresentation;
+     private @Nullable Entity entityRepresentation;
  
-@@ -193,7 +193,8 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+     public static DataResult<ItemStack> validateStrict(ItemStack stack) {
+@@ -200,7 +200,8 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
                  } else {
                      Holder<Item> holder = Item.STREAM_CODEC.decode(buffer);
                      DataComponentPatch dataComponentPatch = codec.decode(buffer);
@@ -377,7 +377,7 @@ index 33c3a5e39e8e1aa023baab76ef94f8aed481480e..a27e1d53abc2d8b8912226add3351006
                  }
              }
  
-@@ -202,13 +203,15 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+@@ -209,13 +210,15 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
                  if (value.isEmpty() || value.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem()
                      buffer.writeVarInt(0);
                  } else {
@@ -397,7 +397,7 @@ index 33c3a5e39e8e1aa023baab76ef94f8aed481480e..a27e1d53abc2d8b8912226add3351006
                      } finally {
                          net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(prev);
                      }
-@@ -303,7 +306,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+@@ -309,7 +312,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
  
              for (ItemStack itemStack : itemContainerContents.nonEmptyItems()) {
                  int count = itemStack.getCount();
@@ -407,10 +407,10 @@ index 33c3a5e39e8e1aa023baab76ef94f8aed481480e..a27e1d53abc2d8b8912226add3351006
                      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
+index c5fe15844d405a27cdae18c903dd481c25b437de..3faa541c4a4623e915269d6241e1a3a3c6e374ff 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 {
+@@ -191,7 +191,7 @@ public class CrafterBlock extends BaseEntityBlock {
          Direction direction = state.getValue(ORIENTATION).front();
          Container containerAt = HopperBlockEntity.getContainerAt(level, pos.relative(direction));
          ItemStack itemStack = stack.copy();
@@ -420,10 +420,10 @@ index 38b03c7b02bdfc579e5e126c12de3d878e26d188..caf31218a1aff84367da126ee1dc46b8
              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
+index 8176c0b35852fb0753339a92f1bbae41a5ae6782..9ada04588b8d30d307a91d93c48e6dca25b8d484 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
+@@ -412,7 +412,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);
@@ -433,10 +433,10 @@ index d7a211220d5eba7e34b9083f06f39e9527962599..cef2d6d9a42ae36d6e2a0b31685a7738
              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
+index 8f80c469c309bf61328c4f98037495f47a38c3c1..b4127d4b4386b98205275a9a0ef8067ccf287e67 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
+@@ -134,7 +134,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
      @Override
      public void setItem(int slot, ItemStack stack) {
          this.getItems().set(slot, stack);
@@ -446,7 +446,7 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b
      }
  
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 2f8128a11e316a6ee6b283f9a411096e582c03b7..5b93eeba6c03738011551ce18332cebe9e278a8e 100644
+index f851e0f7d727cb9dca70c578777d871af424388c..6a51bace3151646afae9de820d9c8977a0221df4 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
@@ -458,7 +458,7 @@ index 2f8128a11e316a6ee6b283f9a411096e582c03b7..5b93eeba6c03738011551ce18332cebe
      }
  
      @Override
-@@ -742,9 +742,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -741,9 +741,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
@@ -469,4 +469,4 @@ index 2f8128a11e316a6ee6b283f9a411096e582c03b7..5b93eeba6c03738011551ce18332cebe
 +                    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
+                 //IGNORE_TILE_UPDATES.set(Boolean.TRUE); // Paper - Perf: Optimize Hoppers // Folia - region threading // Luminol - vanilla hopper

lophine-server/minecraft-patches/features/0012-Leaves-Old-Explosion-Damage-Calculator.patch

@@ -8,14 +8,14 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e96b237749a960f2
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index b3e897a4afee742b5055d652ad7047a660d8ea04..cf8869fac003c73024634078b2f7b36cddda640e 100644
+index c8fa9a9ae29ecf9b2d6234e7efee61d05c8bc0ae..336daa3f7e2c957286d245746af47603a98438bc 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
-@@ -729,6 +729,7 @@ public class ServerExplosion implements Explosion {
+@@ -717,6 +717,7 @@ public class ServerExplosion implements Explosion {
      public boolean shouldAffectBlocklikeEntities() {
-         boolean _boolean = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
-         boolean flag = this.source == null || this.source.getType() != EntityType.BREEZE_WIND_CHARGE && this.source.getType() != EntityType.WIND_CHARGE;
-+        if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldExplosionDamageCalculator) flag = flag && (this.source == null || !this.source.isInWater()); // Leaves - Old MC TNT wet explosion no item damage
-         return _boolean ? flag : this.blockInteraction.shouldAffectBlocklikeEntities() && flag;
+         boolean flag = this.level.getGameRules().get(GameRules.MOB_GRIEFING);
+         boolean flag1 = this.source == null || this.source.getType() != EntityType.BREEZE_WIND_CHARGE && this.source.getType() != EntityType.WIND_CHARGE;
++        if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldExplosionDamageCalculator) flag1 = flag1 && (this.source == null || !this.source.isInWater()); // Leaves - Old MC TNT wet explosion no item damage
+         return flag ? flag1 : this.blockInteraction.shouldAffectBlocklikeEntities() && flag1;
      }
  

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

@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
-index 80f17f33f670018240c854df589cf90cdeab6e70..cbfb4ae2dc30c2ee98ef37f44a95434a7968e320 100644
+index 80f17f33f670018240c854df589cf90cdeab6e70..c9af615ff9120c07787f436dbb6024e54e3a498b 100644
 --- a/net/minecraft/world/effect/BadOmenMobEffect.java
 +++ b/net/minecraft/world/effect/BadOmenMobEffect.java
 @@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
@@ -16,7 +16,7 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..cbfb4ae2dc30c2ee98ef37f44a95434a
              && level.getDifficulty() != Difficulty.PEACEFUL
              && level.isVillage(serverPlayer.blockPosition())) {
 +            // Leaves start - Revert raid changes
-+            if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldRaidBehavior) {
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
 +                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) == null;
 +            }
 +            // Leaves end - Revert raid changes
@@ -24,25 +24,25 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..cbfb4ae2dc30c2ee98ef37f44a95434a
              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
+index 4deb9e4688a04b25e862572b70bf91e3ace9841e..2f31fae204dbeeeec1d188b6908aec5ad937e62e 100644
 --- a/net/minecraft/world/entity/raid/Raid.java
 +++ b/net/minecraft/world/entity/raid/Raid.java
-@@ -263,7 +263,7 @@ public class Raid {
+@@ -264,7 +264,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
++        MobEffectInstance effect = player.getEffect(fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior ? MobEffects.BAD_OMEN : MobEffects.RAID_OMEN); // Leaves - old Raid Behavior
          if (effect == null) {
              return false;
          } else {
-@@ -340,7 +340,13 @@ public class Raid {
+@@ -341,7 +341,13 @@ public class Raid {
                          }
  
                          if (flag1) {
 -                            this.waveSpawnPos = this.getValidSpawnPos(level);
 +                            // Leaves Start - old FindSpawnPosition
-+                            if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldRaidBehavior) {
++                            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);
@@ -51,14 +51,14 @@ index 1910bff3f08147bfd63703097e30b9f88c84e337..5188ae86aff3051d45fe5e7d2fcc5123
                          }
  
                          if (this.raidCooldownTicks == 300 || this.raidCooldownTicks % 20 == 0) {
-@@ -375,7 +381,14 @@ public class Raid {
+@@ -396,7 +402,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) {
++                    if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior) {
 +                        blockPos = this.getRavagerSpawnLocation(level, i, 20);
 +                    } else {
 +                        blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
@@ -67,25 +67,25 @@ index 1910bff3f08147bfd63703097e30b9f88c84e337..5188ae86aff3051d45fe5e7d2fcc5123
                      if (blockPos != null) {
                          this.started = true;
                          this.spawnGroup(level, blockPos);
-@@ -387,7 +400,7 @@ public class Raid {
+@@ -408,7 +421,7 @@ public class Raid {
                          i++;
                      }
  
 -                    if (i > 5) {
-+                    if (i > (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldRaidBehavior ? 3 : 5)) { // Leaves - old FindSpawnPosition
++                    if (i > (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior ? 3 : 5)) { // Leaves - old FindSpawnPosition
                          org.bukkit.craftbukkit.event.CraftEventFactory.callRaidStopEvent(level, this, org.bukkit.event.raid.RaidStopEvent.Reason.UNSPAWNABLE); // CraftBukkit
                          this.stop();
                          break;
-@@ -683,7 +696,7 @@ public class Raid {
+@@ -702,7 +715,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
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - skippable
                  mutableBlockPos.set(i2, height, i3);
                  if (!level.isVillage(mutableBlockPos) || i <= 7) {
                      int i4 = 10;
-@@ -702,6 +715,36 @@ public class Raid {
+@@ -721,6 +734,36 @@ public class Raid {
          return null;
      }
  
@@ -122,7 +122,7 @@ index 1910bff3f08147bfd63703097e30b9f88c84e337..5188ae86aff3051d45fe5e7d2fcc5123
      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 {
+@@ -883,4 +926,43 @@ public class Raid {
              this.spawnsPerWaveBeforeBonus = spawnsPerWaveBeforeBonus;
          }
      }
@@ -167,17 +167,17 @@ index 1910bff3f08147bfd63703097e30b9f88c84e337..5188ae86aff3051d45fe5e7d2fcc5123
 +    // 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
+index 29ddff87216069cdf423f96f3fe835e0802d9ab5..18c4dffb5942b17dc1f2e9d9124c4f3ba3271360 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 {
+@@ -127,6 +127,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()) {
++                if (fun.bm.lophine.config.modules.function.OldFeatureConfig.oldRaidBehavior && !this.hasRaid()) {
 +                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
 +                    net.minecraft.world.entity.player.Player entityhuman = null;
 +                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
@@ -203,7 +203,7 @@ index 3e30989c99cd11c8c94d6fd194d2969e3a7efda6..b1f1bcf7f5ac002550077d5e1d4efd5c
 +                        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)) {
++                        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);
@@ -213,4 +213,4 @@ index 3e30989c99cd11c8c94d6fd194d2969e3a7efda6..b1f1bcf7f5ac002550077d5e1d4efd5c
 +            // Leaves end - Revert raid changes
          }
  
-         super.die(cause);
+         super.die(damageSource);

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

@@ -7,25 +7,6 @@ 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

lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch

@@ -8,10 +8,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
-index d0d90a25a10bbecfffceee1992af88c60d14fd87..187e48e78e69c80b25710f193813335ec643957f 100644
+index 95f6b1cbd5e33151c326689bc72292ff38a48803..e1974bbebbd10b75ea02955d9ced198d54c8a6f1 100644
 --- a/net/minecraft/server/ServerTickRateManager.java
 +++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -134,4 +134,10 @@ public class ServerTickRateManager extends TickRateManager {
+@@ -135,4 +135,10 @@ public class ServerTickRateManager extends TickRateManager {
          player.connection.send(ClientboundTickingStatePacket.from(this));
          player.connection.send(ClientboundTickingStepPacket.from(this));
      }
@@ -23,14 +23,15 @@ index d0d90a25a10bbecfffceee1992af88c60d14fd87..187e48e78e69c80b25710f193813335e
 +    // Leaves end - servux
  }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index eb3aef1f5198592eda5dafe84b91271e861b4135..576dde41a4b48aac9079cca902f4371a31470af3 100644
+index 6aad6024dc121eae63b7fde92a89cbea29fcafb3..90e363a310936830788aee6484a63a989aa316e7 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2368,6 +2368,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2442,6 +2442,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             this.server.updateEffectiveRespawnData();
          }
- 
-         this.lastSpawnChunkRadius = i;
+         // Paper end
++
 +        org.leavesmc.leaves.protocol.servux.ServuxHudDataProtocol.refreshSpawnMetadata = true; // Leaves - servux
      }
  
-     public LongSet getForceLoadedChunks() {
+     @Override

lophine-server/minecraft-patches/features/0016-LeavesHooks.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 16 Nov 2025 17:47:48 +0800
+Subject: [PATCH] LeavesHooks
+
+
+diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
+index d9fd093f59987f471627ff20cfd2eb1a3c0dea64..78c6d425589b8147c33583ac46d6f21ec5dbefaa 100644
+--- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
++++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
+@@ -29,7 +29,7 @@ import net.minecraft.world.phys.AABB;
+ import java.util.List;
+ import java.util.function.Predicate;
+ 
+-public final class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks {
++public class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks {
+ 
+     private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
+ 

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Compatibility fix for Raid Revert and Cross Region Damage
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 3f4b1c54f9207ba1854a8c8da965cbaca5ea517d..a8348a073682eec31990e9ab963b11ad32cf8bf8 100644
+index ad497cc5a01662e86d6c3d0a7d51b86cfc764f53..67faf1ed52806ee2c1e2ea080b39959ad9ae986d 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
+@@ -1225,6 +1225,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          }
      }
  
@@ -40,13 +40,13 @@ index 3f4b1c54f9207ba1854a8c8da965cbaca5ea517d..a8348a073682eec31990e9ab963b11ad
          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
+index 18c4dffb5942b17dc1f2e9d9124c4f3ba3271360..2a2078ff7e353f5c94145ae700d58771a602a7ff 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 {
+@@ -157,7 +157,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)) {
+                         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); // Lophine - raid revert adapt Cross Region Damage trace
                          }

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

@@ -8,25 +8,25 @@ As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18
 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
+index 3c27af5cf768eaa0591846923590a88606dee589..66e7b62a57eada0f0db7d9cc1be6362ac1e3ee85 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1087,6 +1087,10 @@ public abstract class PlayerList {
+@@ -963,6 +963,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;
++        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 09b549fa9568aa1ae13b1b975db14a6268fdaa46..6c933c27ce155eb516a9ede96fb2c3bd19251bfa 100644
+index 3a8ac0765b8a988c281a2ded8c40ec044781cda2..1e3ac806c3f111ee0a4f8ef47134941ec85fbe6e 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 {
+@@ -179,6 +179,7 @@ public abstract class Player extends Avatar implements ContainerUser {
      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
@@ -35,7 +35,7 @@ index 09b549fa9568aa1ae13b1b975db14a6268fdaa46..6c933c27ce155eb516a9ede96fb2c3bd
      // 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
+index 1fb3a34ea872dec73658fac59743e46ef8db5151..41ebe774edfe3c37afecda514a6eb7db978d5aa8 100644
 --- a/net/minecraft/world/inventory/ChestMenu.java
 +++ b/net/minecraft/world/inventory/ChestMenu.java
 @@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
@@ -70,15 +70,15 @@ index 0fffa384f928ab84451331380968fb4650eafe26..d84a10396395939149da88bcb01be59e
          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
+index 9749909b8253b432bb2f7fba2cd8ff17a8579b30..42df617d7b62af45bd56e9594689974f790f6c19 100644
 --- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 +++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
+@@ -26,11 +26,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);
++        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
      }
@@ -94,7 +94,7 @@ index beb74bc8398de8b48f41af7daef14d624826310e..5dd6e89931d397b8afdb84024ed46b0d
          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
+index 383e8285d366c7f594b0b4ff55b367970c9b69e4..202a986762794da9440365953fcb950c6eefa774 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
@@ -103,7 +103,7 @@ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..fe374f08b7829b846b2a1c2ac3ca500c
                      new SimpleMenuProvider(
 -                        (containerId, playerInventory, player1) -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
 -                    )
-+                            (containerId, playerInventory, player1) -> switch (fun.bm.lophine.config.modules.misc.ContainerExpansionConfig.enderchestRows) {
++                            (containerId, playerInventory, player1) -> switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.enderchestRows) {
 +                    case 6 -> ChestMenu.sixRows(containerId, playerInventory, enderChestInventory);
 +                    case 5 -> ChestMenu.fiveRows(containerId, playerInventory, enderChestInventory);
 +                    case 4 -> ChestMenu.fourRows(containerId, playerInventory, enderChestInventory);
@@ -115,16 +115,16 @@ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..fe374f08b7829b846b2a1c2ac3ca500c
                  // 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
+index dcec63c1c2634a3e83ee3cac26f6e51441c37f6d..e5cfbf41525b0d454bb83691354afb4513723571 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
+@@ -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.misc.ContainerExpansionConfig.barrelRows) {
++    private NonNullList<ItemStack> items = NonNullList.withSize(switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
 +        case 6 -> 54;
 +        case 5 -> 45;
 +        case 4 -> 36;
@@ -137,13 +137,13 @@ index de99652629c7301a4bc0e9ec48bed9a26a338f0d..4383e87560bb05acf9c50758f38a3cb6
      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
+@@ -111,7 +121,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) {
++        return switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
 +            case 6 -> 54;
 +            case 5 -> 45;
 +            case 4 -> 36;
@@ -155,13 +155,13 @@ index de99652629c7301a4bc0e9ec48bed9a26a338f0d..4383e87560bb05acf9c50758f38a3cb6
      }
  
      @Override
-@@ -129,7 +148,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -132,7 +151,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) {
++        return switch (fun.bm.lophine.config.modules.function.ContainerExpansionConfig.barrelRows) {
 +            case 6 -> ChestMenu.sixRows(id, player, this);
 +            case 5 -> ChestMenu.fiveRows(id, player, this);
 +            case 4 -> ChestMenu.fourRows(id, player, this);

lophine-server/minecraft-patches/features/0019-I18n-support.patch

@@ -5,10 +5,18 @@ Subject: [PATCH] I18n support
 
 
 diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
-index 7b9e2a1a208b46a69c16e6afd8b502259893574f..db46a31ea8a36562e548eb07f0c4cf9b9e8c3360 100644
+index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0a11e145f 100644
 --- a/net/minecraft/locale/Language.java
 +++ b/net/minecraft/locale/Language.java
-@@ -65,7 +65,7 @@ public abstract class Language {
+@@ -36,6 +36,7 @@ public abstract class Language {
+         Map<String, String> map = new HashMap<>();
+         BiConsumer<String, String> biConsumer = map::put;
+         parseTranslations(biConsumer, "/assets/minecraft/lang/en_us.json");
++        fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(biConsumer);
+         deprecatedTranslationsInfo.applyToMap(map);
+         final Map<String, String> map1 = Map.copyOf(map);
+         return new Language() {
+@@ -65,7 +66,7 @@ public abstract class Language {
          };
      }
  
@@ -18,10 +26,10 @@ index 7b9e2a1a208b46a69c16e6afd8b502259893574f..db46a31ea8a36562e548eb07f0c4cf9b
              loadFromJson(resourceAsStream, output);
          } catch (JsonParseException | IOException var7) {
 diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
-index cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442dad2db19b 100644
+index 2d5309cc9386ef1bddf0bd4e153269fea1e75d60..ffa479f3743571bd198b1e3694301d73953a4eaa 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -155,6 +155,8 @@ public class Main {
+@@ -151,6 +151,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 4abfcaae4fe024296961987704e2a11a03ee518b..5fbcb5eac1d5449247da77b6120edbe2f2dd1d58 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
+@@ -262,6 +262,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/0020-Old-zombie-reinforcement.patch

@@ -4,16 +4,16 @@ 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 {
+diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
+index 1f359cf31dfd1a7bb9e1a9c8c830a4a4aa88ed00..206b725c9d1dffb185a466746544324135b14f23 100644
+--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
++++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
+@@ -314,7 +314,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
++                EntityType<? extends Zombie> type = fun.bm.lophine.config.modules.function.OldFeatureConfig.oldZombieReinforcement ? EntityType.ZOMBIE : this.getType(); // Lophine - old zombie reinforcement
                  Zombie zombie = type.create(level, EntitySpawnReason.REINFORCEMENT);
                  if (zombie == null) {
                      return true;

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

@@ -5,31 +5,31 @@ 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 93bc76af4d0abbe1c526434991e74c4465764ac6..7b8dc8db175d905790462bbf6d0802ca416d7b36 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
+@@ -240,6 +240,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();
+@@ -898,6 +899,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
+@@ -1538,6 +1540,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          if (this.isInvulnerableTo(level, damageSource)) {
              return false;
          } else {
 +            // Lophine start - spawn invulnerable time
-+            if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.spawnInvulnerableTime) {
++            if (fun.bm.lophine.config.modules.function.OldFeatureConfig.spawnInvulnerableTime) {
 +                if (this.spawnInvulnerableTime > 0 && !damageSource.is(net.minecraft.tags.DamageTypeTags.BYPASSES_INVULNERABILITY)) {
 +                    return false;
 +                }

lophine-server/minecraft-patches/features/0022-Leaves-Fakeplayer.patch

@@ -0,0 +1,801 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sat, 30 Aug 2025 17:16:32 +0800
+Subject: [PATCH] Leaves: Fakeplayer
+
+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/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java b/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java
+index 368a9d33f93c2e85abe4cf10df5a85c09fb03dd6..2b78040daeb3b09c08494cbc1d4a9d36080895f9 100644
+--- a/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java
++++ b/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java
+@@ -39,6 +39,7 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
+     }
+ 
+     protected void trigger(ServerPlayer player, Predicate<T> testTrigger) {
++        if (player instanceof org.leavesmc.leaves.bot.ServerBot) return; // Leaves - bot skip
+         PlayerAdvancements advancements = player.getAdvancements();
+         Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak
+         if (set != null && !set.isEmpty()) {
+diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
+index d5e604bf18a223aa434bc9f78274e1f3ff7f203d..715976a49ca621ba40d9353b18d41d342315afd4 100644
+--- a/net/minecraft/network/Connection.java
++++ b/net/minecraft/network/Connection.java
+@@ -74,7 +74,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     public boolean preparing = true;
+     // Spigot end
+     private volatile @Nullable PacketListener disconnectListener;
+-    private volatile @Nullable PacketListener packetListener;
++    public volatile @Nullable PacketListener packetListener; // Leaves - private -> protected // Lophine protected -> public
+     private @Nullable DisconnectionDetails disconnectionDetails;
+     private boolean encrypted;
+     private final java.util.concurrent.atomic.AtomicBoolean disconnectionHandled = new java.util.concurrent.atomic.AtomicBoolean(false); // Folia - region threading - may be called concurrently during configuration stage
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index f04352738e4f703d28f3c06ff884aee7d980542c..744b780075bf76fa0fa5e27699a146701289e0d8 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -425,6 +425,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+     // Folia end - regionised ticking
+ 
++    private org.leavesmc.leaves.bot.BotList botList; // Leaves - fakeplayer
++
+     public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
+         ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system
+         AtomicReference<S> atomicReference = new AtomicReference<>();
+@@ -1052,6 +1054,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Folia end - region threading
+ 
+     public void stopServer() {
++        // Leaves end - save or remove bot
++        if (!this.getBotList().forceShutdown && !this.getBotList().removeAll()) {
++            return;
++        }
++        // Leaves end - save or remove bot
+         // Folia start - region threading
+         // halt scheduler
+         // don't wait, we may be on a scheduler thread
+@@ -1665,7 +1672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         int i = this.pauseWhenEmptySeconds() * 20;
+         this.removeDisabledPluginsBlockingSleep(); // Paper - API to allow/disallow tick sleeping
+         if (false && i > 0) { // Folia - region threading - this is complicated to implement, and even if done correctly is messy
+-            if (this.playerList.getPlayerCount() == 0 && !this.tickRateManager.isSprinting() && this.pluginsBlockingSleep.isEmpty()) { // Paper - API to allow/disallow tick sleeping
++            if (this.playerList.getPlayerCount() == 0 && this.botList.bots.isEmpty() && !this.tickRateManager.isSprinting() && this.pluginsBlockingSleep.isEmpty()) { // Paper - API to allow/disallow tick sleeping // Leaves - fakeplayer
+                 this.emptyTicks++;
+             } else {
+                 this.emptyTicks = 0;
+@@ -1800,6 +1807,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             this.isSaving = true;
+             if (playerSaveInterval > 0) {
+                 this.playerList.saveAll(playerSaveInterval);
++                org.leavesmc.leaves.bot.BotList.INSTANCE.saveAllResumeBots(playerSaveInterval); // Leaves - resident fakeplayer
+             }
+             for (final ServerLevel level : (region == null ? this.getAllLevels() : Arrays.asList(region.world))) { // Folia - region threading
+                 if (level.paperConfig().chunks.autoSaveInterval.value() > 0) {
+@@ -2020,6 +2028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     public void tickConnection() {
+         this.getConnection().tick();
++        this.botList.networkTick(); // Leaves - fakeplayer
+     }
+ 
+     private void synchronizeTime(ServerLevel level) {
+@@ -3154,6 +3163,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return this.debugSubscribers;
+     }
+ 
++    // Leaves start - fakeplayer
++    protected void setBotList(org.leavesmc.leaves.bot.BotList botList) {
++        this.botList = botList;
++    }
++
++    public org.leavesmc.leaves.bot.BotList getBotList() {
++        return botList;
++    }
++    // Leaves end - fakeplayer
++
+     public record ReloadableResources(CloseableResourceManager resourceManager, ReloadableServerResources managers) implements AutoCloseable {
+         @Override
+         public void close() {
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index 98004b77b7f40d315f41be82105df6d4b9000e33..cd968c6971d054d9b66a0eaea4753a51ebb75b02 100644
+--- a/net/minecraft/server/PlayerAdvancements.java
++++ b/net/minecraft/server/PlayerAdvancements.java
+@@ -166,6 +166,11 @@ public class PlayerAdvancements {
+     }
+ 
+     public boolean award(AdvancementHolder advancement, String criterionKey) {
++        // Leaves start - bot can't get advancement
++        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
++            return false;
++        }
++        // Leaves end - bot can't get advancement
+         boolean flag = false;
+         AdvancementProgress orStartProgress = this.getOrStartProgress(advancement);
+         boolean isDone = orStartProgress.isDone();
+diff --git a/net/minecraft/server/commands/BanIpCommands.java b/net/minecraft/server/commands/BanIpCommands.java
+index d92492bca62fb02fe7a9e4e220cb8651c4d1e16d..7d0752f9a6a90cf389a9cb5829ab02606266f204 100644
+--- a/net/minecraft/server/commands/BanIpCommands.java
++++ b/net/minecraft/server/commands/BanIpCommands.java
+@@ -44,6 +44,12 @@ public class BanIpCommands {
+             return banIp(source, username, reason);
+         } else {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(username);
++            // Leaves start - disable ban
++            if (playerByName instanceof org.leavesmc.leaves.bot.ServerBot) {
++                source.sendFailure(Component.literal("Permission denied"));
++                return 0;
++            }
++            // Leaves end - disable ban
+             if (playerByName != null) {
+                 return banIp(source, playerByName.getIpAddress(), reason);
+             } else {
+diff --git a/net/minecraft/server/commands/BanPlayerCommands.java b/net/minecraft/server/commands/BanPlayerCommands.java
+index 978ef2e996a78e907f959bfe99d47de832427011..9644e68ba2c295fcda2d4a3034277520ade91bca 100644
+--- a/net/minecraft/server/commands/BanPlayerCommands.java
++++ b/net/minecraft/server/commands/BanPlayerCommands.java
+@@ -45,7 +45,15 @@ public class BanPlayerCommands {
+         UserBanList bans = source.getServer().getPlayerList().getBans();
+         int i = 0;
+ 
++        boolean hasBot = false; // Leaves - disable kick
+         for (NameAndId nameAndId : players) {
++            // Leaves start - disable ban
++            if (nameAndId.isBot()) {
++                source.sendFailure(Component.literal("Permission denied"));
++                hasBot = true;
++                continue;
++            }
++            // Leaves end - disable ban
+             if (!bans.isBanned(nameAndId)) {
+                 UserBanListEntry userBanListEntry = new UserBanListEntry(
+                     nameAndId, null, source.getTextName(), null, reason == null ? null : reason.getString()
+@@ -63,7 +71,13 @@ public class BanPlayerCommands {
+         }
+ 
+         if (i == 0) {
+-            throw ERROR_ALREADY_BANNED.create();
++            // Leaves start - disable kick
++            if (hasBot) {
++                return i;
++            } else {
++                throw ERROR_ALREADY_BANNED.create();
++            }
++            // Leaves end - disable kick
+         } else {
+             return i;
+         }
+diff --git a/net/minecraft/server/commands/KickCommand.java b/net/minecraft/server/commands/KickCommand.java
+index 5f78d629bab84acb2fa43a9fcc1cec52b4e91ae3..1c6059bd23afdd555d2dc8c533a5b027957c7b3a 100644
+--- a/net/minecraft/server/commands/KickCommand.java
++++ b/net/minecraft/server/commands/KickCommand.java
+@@ -46,9 +46,17 @@ public class KickCommand {
+         if (!source.getServer().isPublished()) {
+             throw ERROR_SINGLEPLAYER.create();
+         } else {
++            boolean hasBot = false; // Leaves - disable kick
+             int i = 0;
+ 
+             for (ServerPlayer serverPlayer : players) {
++                // Leaves start - disable kick
++                if (serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot) {
++                    source.sendFailure(Component.literal("Permission denied"));
++                    hasBot = true;
++                    continue;
++                }
++                // Leaves end - disable kick
+                 if (!source.getServer().isSingleplayerOwner(serverPlayer.nameAndId())) {
+                     serverPlayer.connection.disconnect(reason, org.bukkit.event.player.PlayerKickEvent.Cause.KICK_COMMAND); // Paper - kick event cause
+                     source.sendSuccess(() -> Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason), true);
+@@ -57,7 +65,13 @@ public class KickCommand {
+             }
+ 
+             if (i == 0) {
+-                throw ERROR_KICKING_OWNER.create();
++                // Leaves start - disable kick
++                if (hasBot) {
++                    return i;
++                } else {
++                    throw ERROR_KICKING_OWNER.create();
++                }
++                // Leaves end - disable kick
+             } else {
+                 return i;
+             }
+diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
+index 07332a86e6e0441bafacb020f27ec36a277f1486..590891d70a71ab30ceae3a3cf1923745e7c20b26 100644
+--- a/net/minecraft/server/commands/OpCommand.java
++++ b/net/minecraft/server/commands/OpCommand.java
+@@ -43,6 +43,7 @@ public class OpCommand {
+         int i = 0;
+ 
+         for (NameAndId nameAndId : players) {
++            if (nameAndId.isBot()) continue; // Leaves - disable op
+             if (!playerList.isOp(nameAndId)) {
+                 playerList.op(nameAndId);
+                 i++;
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 5fbcb5eac1d5449247da77b6120edbe2f2dd1d58..69cc67b7618d38e65ccb1f4c58013ef116886ad2 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -252,6 +252,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         }
+ 
+         // Spigot start
++        this.setBotList(new org.leavesmc.leaves.bot.BotList(this)); // Leaves - fakeplayer
+         this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage));
+         org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings"));
+         org.spigotmc.SpigotConfig.registerCommands();
+@@ -263,6 +264,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         // Paper end - initialize global and world-defaults configuration
+         me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
+         fun.bm.lophine.utils.ServerI18nUtil.init(); // Lophine - I18n support
++        this.getBotList().loadResumeBotInfo(); // Leaves - load resident bot info
+         if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
+         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
+         if (this.convertOldUsers()) {
+diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
+index fdccb06c918d387e46c29ede7337159db8c5d9ca..4cd5c5659ac098c3b7ff95efb94b1987e2dd40d0 100644
+--- a/net/minecraft/server/level/ChunkMap.java
++++ b/net/minecraft/server/level/ChunkMap.java
+@@ -1386,6 +1386,13 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP
+                     }
+                 } else {
+                     this.removePlayer(player);
++                    // Leaves start - render bot
++                    if (entity instanceof org.leavesmc.leaves.bot.ServerBot bot) {
++                        if (bot.needSendFakeData(player)) {
++                            bot.sendFakeData(player.connection, false);
++                        }
++                    }
++                    // Leaves end - render bot
+                 }
+             }
+         }
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2e39af1a3 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+     public final boolean tickTime; // Folia - region threading
+     private final RandomSequences randomSequences;
+     final LevelDebugSynchronizers debugSynchronizers = new LevelDebugSynchronizers(this);
++    final List<ServerPlayer> realPlayers; // Leaves - skip
+ 
+     // CraftBukkit start
+     public final LevelStorageSource.LevelStorageAccess levelStorageAccess;
+@@ -669,6 +670,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         // Paper end - rewrite chunk system
+         this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
+         this.updateTickData(); // Folia - region threading - make sure it is initialised before ticked
++        this.realPlayers = Lists.newArrayList(); // Leaves - skip
+     }
+ 
+     // Folia start - region threading
+@@ -2469,6 +2471,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         return this.players;
+     }
+ 
++    // Leaves start - fakeplayer skip
++    public List<ServerPlayer> realPlayers() {
++        return this.realPlayers;
++    }
++    // Leaves end - fakeplayer skip
++
+     @Override
+     public void updatePOIOnBlockStateChange(BlockPos pos, BlockState oldState, BlockState newState) {
+         Optional<Holder<PoiType>> optional = PoiTypes.forState(oldState);
+@@ -2942,6 +2950,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.add(serverPlayer);
++                // Leaves start - skip
++                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
++                    ServerLevel.this.realPlayers.add(serverPlayer);
++                }
++                // Leaves end - skip
+                 if (serverPlayer.isReceivingWaypoints()) {
+                     ServerLevel.this.getWaypointManager().addPlayer(serverPlayer);
+                 }
+@@ -3029,6 +3042,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             ServerLevel.this.getChunkSource().removeEntity(entity);
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.remove(serverPlayer);
++                // Leaves start - skip
++                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
++                    ServerLevel.this.realPlayers.remove(serverPlayer);
++                }
++                // Leaves end - skip
+                 ServerLevel.this.getWaypointManager().removePlayer(serverPlayer);
+                 ServerLevel.this.updateSleepingPlayerList();
+             }
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 7b8dc8db175d905790462bbf6d0802ca416d7b36..b644a786d6b4596109efa6e951d46e5d0b808f00 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -227,7 +227,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     private static final boolean DEFAULT_SPAWN_EXTRA_PARTICLES_ON_FALL = false;
+     public ServerGamePacketListenerImpl connection;
+     private final MinecraftServer server;
+-    public final ServerPlayerGameMode gameMode;
++    public ServerPlayerGameMode gameMode; // Leaves - not final
+     private final PlayerAdvancements advancements;
+     private final ServerStatsCounter stats;
+     private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
+@@ -248,7 +248,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     private @Nullable Entity camera;
+     public boolean isChangingDimension;
+     public boolean seenCredits = false;
+-    private final ServerRecipeBook recipeBook;
++    protected ServerRecipeBook recipeBook; // Leaves - not final and private -> protected
+     private @Nullable Vec3 levitationStartPos;
+     private int levitationStartTime;
+     private boolean disconnected;
+@@ -1497,7 +1497,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     }
+     // Luminol End - Cross Region Damage trace
+ 
+-    private void tellNeutralMobsThatIDied() {
++    protected void tellNeutralMobsThatIDied() { // Leaves private -> protected
+         AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
+         this.level()
+             .getEntitiesOfClass(Mob.class, aabb, EntitySelector.NO_SPECTATORS)
+@@ -2134,6 +2134,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+                 this.lastSentHealth = -1.0F;
+                 this.lastSentFood = -1;
+                 this.teleportSpectators(teleportTransition, serverLevel);
++                // Leaves start - bot support
++                if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
++                    this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(this, true)); // Leaves - render bot
++                }
++                // Leaves end - bot support
+                 // CraftBukkit start
+                 org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
+                 this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
+diff --git a/net/minecraft/server/players/CachedUserNameToIdResolver.java b/net/minecraft/server/players/CachedUserNameToIdResolver.java
+index 345bdb0ff82b8cd8c63e5ff1f2dabb68a1e54b77..c9a7c1c37155e0d339b880179a5988c9a6cb3797 100644
+--- a/net/minecraft/server/players/CachedUserNameToIdResolver.java
++++ b/net/minecraft/server/players/CachedUserNameToIdResolver.java
+@@ -122,6 +122,12 @@ public class CachedUserNameToIdResolver implements UserNameToIdResolver {
+ 
+     @Override
+     public Optional<NameAndId> get(String name) {
++        // Leaves start - fix bot
++        org.leavesmc.leaves.bot.ServerBot bot = org.leavesmc.leaves.bot.BotList.INSTANCE.getBotByName(name);
++        if (bot != null) {
++            return Optional.of(bot.nameAndId());
++        }
++        // Leaves end - fix bot
+         String string = name.toLowerCase(Locale.ROOT);
+         boolean stateLocked = true; try { this.stateLock.lock(); // Paper - Fix GameProfileCache concurrency
+         CachedUserNameToIdResolver.GameProfileInfo gameProfileInfo = this.profilesByName.get(string);
+diff --git a/net/minecraft/server/players/NameAndId.java b/net/minecraft/server/players/NameAndId.java
+index 05b4a75f6597e8613c91344d100bb7f005d169a7..9a5006362c12e972d031c48be4d30362d88d1c00 100644
+--- a/net/minecraft/server/players/NameAndId.java
++++ b/net/minecraft/server/players/NameAndId.java
+@@ -8,18 +8,22 @@ import java.util.UUID;
+ import net.minecraft.core.UUIDUtil;
+ import org.jspecify.annotations.Nullable;
+ 
+-public record NameAndId(UUID id, String name) {
++public record NameAndId(UUID id, String name, boolean isBot) { // Leaves - fakeplayer
+     public static final Codec<NameAndId> CODEC = RecordCodecBuilder.create(
+         instance -> instance.group(UUIDUtil.STRING_CODEC.fieldOf("id").forGetter(NameAndId::id), Codec.STRING.fieldOf("name").forGetter(NameAndId::name))
+             .apply(instance, NameAndId::new)
+     );
+ 
+     public NameAndId(GameProfile profile) {
+-        this(profile.id(), profile.name());
++        this(profile.id(), profile.name(), com.google.common.collect.Iterables.getFirst(profile.properties().get("is_bot"), "false").equals("true")); // Leaves - fakeplayer
+     }
+ 
+     public NameAndId(com.mojang.authlib.yggdrasil.response.NameAndId nameAndId) {
+-        this(nameAndId.id(), nameAndId.name());
++        this(nameAndId.id(), nameAndId.name(), false); // Leaves - fakeplayer
++    }
++
++    public NameAndId(UUID uuid, String name) {
++        this(uuid, name, false); // Leaves - fakeplayer
+     }
+ 
+     public static @Nullable NameAndId fromJson(JsonObject json) {
+@@ -33,7 +37,7 @@ public record NameAndId(UUID id, String name) {
+                 return null;
+             }
+ 
+-            return new NameAndId(uuid, json.get("name").getAsString());
++            return new NameAndId(uuid, json.get("name").getAsString(), false); // Leaves - fakeplayer
+         } else {
+             return null;
+         }
+@@ -46,7 +50,7 @@ public record NameAndId(UUID id, String name) {
+ 
+     public static NameAndId createOffline(String name) {
+         UUID uuid = UUIDUtil.createOfflinePlayerUUID(name);
+-        return new NameAndId(uuid, name);
++        return new NameAndId(uuid, name, false); // Leaves - fakeplayer
+     }
+ 
+     // Paper start - utility method for common conversion back to the game profile
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..3a5319739f0687fc6f09b2ac8ee31716593fe0de 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -317,6 +317,19 @@ public abstract class PlayerList {
+ 
+         org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player);
+ 
++        // Leaves start - bot support
++        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
++            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
++            if (bot != null) {
++                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, false);
++            }
++            this.server.getBotList().bots.forEach(bot1 -> {
++                bot1.sendPlayerInfo(player);
++                bot1.sendFakeDataIfNeed(player, true);
++            }); // Leaves - render bot
++        }
++        // Leaves end - bot support
++
+         final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+ 
+         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -791,6 +804,12 @@ public abstract class PlayerList {
+         ).callEvent();
+         // Paper end
+ 
++        // Leaves start - bot support
++        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
++            this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(serverPlayer, true)); // Leaves - render bot
++        }
++        // Leaves end - bot support
++
+         return serverPlayer;
+     }
+ 
+@@ -892,11 +911,16 @@ public abstract class PlayerList {
+ 
+     public String[] getPlayerNamesArray() {
+         List<ServerPlayer> players = new java.util.ArrayList<>(this.players); // Folia - region threading
+-        String[] strings = new String[this.players.size()];
++        String[] strings = new String[this.players.size() + this.server.getBotList().bots.size()]; // Leaves - fakeplayer support
+ 
+         for (int i = 0; i < players.size(); i++) { // Folia - region threading
+             strings[i] = players.get(i).getGameProfile().name(); // Folia - region threading
+         }
++        // Leaves start - fakeplayer support
++        for (int i = this.players.size(); i < strings.length; ++i) {
++            strings[i] = this.server.getBotList().bots.get(i - this.players.size()).getGameProfile().name();
++        }
++        // Leaves end - fakeplayer support
+ 
+         return strings;
+     }
+@@ -1016,7 +1040,14 @@ public abstract class PlayerList {
+     }
+ 
+     public @Nullable ServerPlayer getPlayerByName(String username) {
+-        return this.playersByName.get(username.toLowerCase(java.util.Locale.ROOT)); // Spigot
++        // Leaves start - fakeplayer support
++        username = username.toLowerCase(java.util.Locale.ROOT);
++        ServerPlayer player = this.playersByName.get(username);
++        if (player == null) {
++            player = this.server.getBotList().getBotByName(username);
++        }
++        return player; // Spigot
++        // Leaves end - fakeplayer support
+     }
+ 
+     public void broadcast(@Nullable Player except, double x, double y, double z, double radius, ResourceKey<Level> dimension, Packet<?> packet) {
+@@ -1353,7 +1384,13 @@ public abstract class PlayerList {
+     }
+ 
+     public @Nullable ServerPlayer getPlayer(UUID playerUUID) {
+-        return this.playersByUUID.get(playerUUID);
++        // Leaves start - fakeplayer support
++        ServerPlayer player = this.playersByUUID.get(playerUUID);
++        if (player == null) {
++            player = this.server.getBotList().getBot(playerUUID);
++        }
++        return player;
++        // Leaves start - fakeplayer support
+     }
+ 
+     public @Nullable ServerPlayer getPlayer(String name) {
+diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
+index bd1d4a832eec4c89a7f8bdd5d066b6074f206d81..d7224c2297eb5d580349da3b2770895fba6c3e08 100644
+--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
++++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
+@@ -24,6 +24,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+     public void trackWaypoint(WaypointTransmitter waypoint) {
+         // Lophine start - unsafe waypoint bar
+         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) 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 serverPlayer : this.players) {
+@@ -63,6 +68,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+         // Folia - region threading
+         // Lophine start - unsafe waypoint bar
+         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
++        // Leaves start - fakeplayer
++        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
++            return;
++        }
++        // Leaves end - fakeplayer
+         this.players.add(player);
+ 
+         for (WaypointTransmitter waypointTransmitter : this.waypoints) {
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 979edd3f4cf17d61cec9edf3ff02192cea354a0d..6a20033fbe8c6a9a4eaf3f819fffae04fee6aaeb 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -1252,7 +1252,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+ 
+             BlockPos onPosLegacy = this.getOnPosLegacy();
+             BlockState blockState = this.level().getBlockState(onPosLegacy);
+-            if (this.isLocalInstanceAuthoritative()) {
++            if (this.isLocalInstanceAuthoritative() || this instanceof org.leavesmc.leaves.bot.ServerBot) {  // Leaves - ServerBot needs check fall damage
+                 this.checkFallDamage(vec3.y, this.onGround(), blockState, onPosLegacy);
+             }
+ 
+@@ -1577,7 +1577,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+     }
+ 
+     // Paper start - optimise collisions
+-    private Vec3 collide(Vec3 movement) {
++    public Vec3 collide(Vec3 movement) { // Leaves - private -> public
+         final boolean xZero = movement.x == 0.0;
+         final boolean yZero = movement.y == 0.0;
+         final boolean zZero = movement.z == 0.0;
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 67faf1ed52806ee2c1e2ea080b39959ad9ae986d..c89a2de1e1959c1275d39003c1b6b49f165df60f 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -3304,7 +3304,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+     private void travelRidden(Player player, Vec3 travelVector) {
+         Vec3 riddenInput = this.getRiddenInput(player, travelVector);
+         this.tickRidden(player, riddenInput);
+-        if (this.canSimulateMovement()) {
++        if (this.canSimulateMovement() || this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot) { // Leaves - Fakeplayer
+             this.setSpeed(this.getRiddenSpeed(player));
+             this.travel(riddenInput);
+         } else {
+@@ -4213,7 +4213,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+         // Paper start - lag compensate eating
+         // we add 1 to the expected time to avoid lag compensating when we should not
+         final boolean shouldLagCompensate = this.useItem.has(DataComponents.FOOD) && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1L + this.totalEatTimeTicks) * 50L * (1000L * 1000L));
+-        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level().isClientSide() && !usingItem.useOnRelease()) {
++        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !(this instanceof org.leavesmc.leaves.bot.ServerBot) && !this.level().isClientSide() && !usingItem.useOnRelease()) {
+             this.useItemRemaining = 0;
+             // Paper end - lag compensate eating
+             this.completeUsingItem();
+@@ -4397,6 +4397,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+         this.stopUsingItem();
+     }
+ 
++    // Leaves start - Fakeplayer
++    public boolean releaseUsingItemWithResult() {
++        ItemStack itemInHand = this.getItemInHand(this.getUsedItemHand());
++        boolean result = false;
++        if (!this.useItem.isEmpty() && ItemStack.isSameItem(itemInHand, this.useItem)) {
++            this.useItem = itemInHand;
++            result = this.useItem.releaseUsingWithResult(this.level(), this, this.getUseItemRemainingTicks());
++            if (this.useItem.useOnRelease()) {
++                this.updatingUsingItem();
++            }
++        }
++
++        this.stopUsingItem();
++        return result;
++    }
++    // Leaves end - Fakeplayer
++
+     public void stopUsingItem() {
+         if (!this.level().isClientSide()) {
+             boolean isUsingItem = this.isUsingItem();
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index 1e3ac806c3f111ee0a4f8ef47134941ec85fbe6e..52c41d1e526dc0d42dde3773ab20ee7252737e5d 100644
+--- a/net/minecraft/world/entity/player/Player.java
++++ b/net/minecraft/world/entity/player/Player.java
+@@ -168,7 +168,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+     private int lastLevelUpTime;
+     public GameProfile gameProfile;
+     private boolean reducedDebugInfo;
+-    private ItemStack lastItemInMainHand = ItemStack.EMPTY;
++    protected ItemStack lastItemInMainHand = ItemStack.EMPTY;
+     private final ItemCooldowns cooldowns = this.createItemCooldowns();
+     private Optional<GlobalPos> lastDeathLocation = Optional.empty();
+     public @Nullable FishingHook fishing;
+@@ -349,6 +349,12 @@ public abstract class Player extends Avatar implements ContainerUser {
+         }
+     }
+ 
++    // Leaves start - fakeplayer
++    protected void livingEntityTick() {
++        super.tick();
++    }
++    // Leaves end - fakeplayer
++
+     @Override
+     protected float getMaxHeadRotationRelativeToBody() {
+         return this.isBlocking() ? 15.0F : super.getMaxHeadRotationRelativeToBody();
+@@ -574,7 +580,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+     public void removeEntitiesOnShoulder() {
+     }
+ 
+-    private void touch(Entity entity) {
++    public void touch(Entity entity) { // Leaves - private -> public
+         entity.playerTouch(this);
+     }
+ 
+@@ -1251,7 +1257,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+             // Paper end - Configurable sprint interruption on attack
+         }
+ 
+-        if (target instanceof ServerPlayer && target.hurtMarked) {
++        if ((target instanceof ServerPlayer && !(target instanceof org.leavesmc.leaves.bot.ServerBot)) && target.hurtMarked) { // Leaves - bot knockback
+             // CraftBukkit start - Add Velocity Event
+             boolean cancelled = false;
+             org.bukkit.entity.Player player = (org.bukkit.entity.Player) target.getBukkitEntity();
+diff --git a/net/minecraft/world/entity/projectile/FishingHook.java b/net/minecraft/world/entity/projectile/FishingHook.java
+index 71f6acc07d222fe512bf8d9fbaad35cb36bcf2d6..a9f5d503fbe50e54f2f44be2ca6d414430f4481e 100644
+--- a/net/minecraft/world/entity/projectile/FishingHook.java
++++ b/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -58,7 +58,7 @@ public class FishingHook extends Projectile {
+     public static final EntityDataAccessor<Integer> DATA_HOOKED_ENTITY = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.INT);
+     private static final EntityDataAccessor<Boolean> DATA_BITING = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.BOOLEAN);
+     private int life;
+-    private int nibble;
++    public int nibble; // Leaves - private -> public
+     public int timeUntilLured;
+     public int timeUntilHooked;
+     public float fishAngle;
+diff --git a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
+index fc1b3501114108d0166256c514a225337955e461..56bc87fefc82c77077bfed50accbde778c0059ea 100644
+--- a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
++++ b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
+@@ -270,6 +270,11 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
+             }
+ 
+             this.move(MoverType.SELF, this.getDeltaMovement());
++        } else if (this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot) { // Leaves start - Fakeplayer
++            this.floatBoat();
++            this.controlBoat();
++            this.move(MoverType.SELF, this.getDeltaMovement());
++            // Leaves end - Fakeplayer
+         } else {
+             this.setDeltaMovement(Vec3.ZERO);
+         }
+@@ -380,6 +385,13 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
+         }
+     }
+ 
++    // Leaves start - Fakeplayer
++    @Override
++    public boolean canSimulateMovement() {
++        return super.canSimulateMovement() || this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot;
++    }
++    // Leaves end - Fakeplayer
++
+     protected @Nullable SoundEvent getPaddleSound() {
+         return switch (this.getStatus()) {
+             case IN_WATER, UNDER_WATER, UNDER_FLOWING_WATER -> SoundEvents.BOAT_PADDLE_WATER;
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index a67901ed3bcb67fb2cab05894bc386db2f0f90f8..3456712f837f91101cc1d38c953af1d7237603b9 100644
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -404,6 +404,7 @@ public abstract class AbstractContainerMenu {
+ 
+     private void doClick(int slotIndex, int button, ClickType clickType, Player player) {
+         Inventory inventory = player.getInventory();
++        if (!doClickCheck(slotIndex, button, clickType, player)) return; // Leaves - doClick check
+         if (clickType == ClickType.QUICK_CRAFT) {
+             int i = this.quickcraftStatus;
+             this.quickcraftStatus = getQuickcraftHeader(button);
+@@ -682,6 +683,22 @@ public abstract class AbstractContainerMenu {
+         }
+     }
+ 
++    // Leaves start - doClick check
++    private boolean doClickCheck(int slotIndex, int button, ClickType actionType, Player player) {
++        if (slotIndex < 0) {
++            return true;
++        }
++
++        Slot slot = getSlot(slotIndex);
++        ItemStack itemStack = slot.getItem();
++        net.minecraft.world.item.component.CustomData customData = itemStack.get(net.minecraft.core.component.DataComponents.CUSTOM_DATA);
++        if (customData != null && customData.contains("Leaves.Gui.Placeholder")) {
++            return !customData.copyTag().getBoolean("Leaves.Gui.Placeholder").orElse(false);
++        }
++        return true;
++    }
++    // Leaves end - doClick check
++
+     private boolean tryItemClickBehaviourOverride(Player player, ClickAction action, Slot slot, ItemStack clickedItem, ItemStack carriedItem) {
+         FeatureFlagSet featureFlagSet = player.level().enabledFeatures();
+         return carriedItem.isItemEnabled(featureFlagSet) && carriedItem.overrideStackedOnOther(slot, action, player)
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index a688da5bc71799c13548d390ab58645da9128229..e63cca6f7f63a2b5f249ae01033167186e710fdb 100644
+--- a/net/minecraft/world/item/ItemStack.java
++++ b/net/minecraft/world/item/ItemStack.java
+@@ -456,7 +456,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+                     placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(serverLevel, player, hand, blocks.getFirst(), clickedPos);
+                 }
+ 
+-                if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) {
++                if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild()) && (!(player instanceof org.leavesmc.leaves.bot.ServerBot))) { // Leaves - Fakeplayer skip this check
+                     interactionResult = InteractionResult.FAIL; // cancel placement
+                     // PAIL: Remove this when MC-99075 fixed
+                     player.containerMenu.forceHeldSlot(hand);
+@@ -987,6 +987,20 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
+         }
+     }
+ 
++    // Leaves start - Fakeplayer
++    public boolean releaseUsingWithResult(Level level, LivingEntity livingEntity, int timeLeft) {
++        ItemStack itemStack = this.copy();
++        if (this.getItem().releaseUsing(this, level, livingEntity, timeLeft)) {
++            ItemStack itemStack1 = this.applyAfterUseComponentSideEffects(livingEntity, itemStack);
++            if (itemStack1 != this) {
++                livingEntity.setItemInHand(livingEntity.getUsedItemHand(), itemStack1);
++            }
++            return true;
++        }
++        return false;
++    }
++    // Leaves end - Fakeplayer
++
+     public boolean useOnRelease() {
+         return this.getItem().useOnRelease(this);
+     }
+diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+index adc8c8a7b8a02cf395e919eb51aefc47ff6ed9ab..225fedb32b100a0f24e001e442c0bae44acb0284 100644
+--- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
++++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+@@ -145,7 +145,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+                                 break;
+                             }
+ 
+-                            if (!(entity instanceof ServerPlayer)) {
++                            if (!(entity instanceof ServerPlayer) || (entity instanceof org.leavesmc.leaves.bot.ServerBot)) { // Leaves - bot slime block
+                                 Vec3 deltaMovement = entity.getDeltaMovement();
+                                 double d1 = deltaMovement.x;
+                                 double d2 = deltaMovement.y;
+diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java
+index e9c40ecb2309d386a2214593181f2d4f289eb28b..17dff8aed5015bfd22d021e2fcf536265d179139 100644
+--- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
++++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
+@@ -49,6 +49,11 @@ public class PhantomSpawner implements CustomSpawner {
+                                         ServerStatsCounter stats = serverPlayer.getStats();
+                                         int i = Mth.clamp(stats.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
+                                         int i1 = 24000;
++                                        // Leaves start - fakeplayer spawn
++                                        if (serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot bot && bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.SPAWN_PHANTOM)) {
++                                            i1 = Math.max(bot.notSleepTicks, 1);
++                                        }
++                                        // Leaves end - fakeplayer spawn
+                                         if (randomSource.nextInt(i) >= 72000) {
+                                             BlockPos blockPos1 = blockPos.above(20 + randomSource.nextInt(15))
+                                                 .east(-10 + randomSource.nextInt(21))
+diff --git a/net/minecraft/world/level/storage/LevelResource.java b/net/minecraft/world/level/storage/LevelResource.java
+index bef794c3f58c41d910aa0bcc63fbdeea7225fddf..a601da588e6973cc5b87d3e3eeba49b53f6d9a6d 100644
+--- a/net/minecraft/world/level/storage/LevelResource.java
++++ b/net/minecraft/world/level/storage/LevelResource.java
+@@ -15,7 +15,7 @@ public class LevelResource {
+     public static final LevelResource ROOT = new LevelResource(".");
+     private final String id;
+ 
+-    private LevelResource(String id) {
++    public LevelResource(String id) { // Leaves - private -> public
+         this.id = id;
+     }
+ 

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

@@ -0,0 +1,20 @@
+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 f3f067c62dc024a747d059608ae7a2e8740dbff2..1b8a963726ee2b2244d429f1e7e3a08034bfbd70 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
++++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -283,7 +283,7 @@ public class ItemEntity extends Entity implements TraceableEntity, ChangePublish
+         ItemStack item = this.getItem();
+         ItemStack item1 = itemEntity.getItem();
+         if (Objects.equals(this.target, itemEntity.target) && areMergable(item, item1)) {
+-            if (item1.getCount() < item.getCount()) {
++            if (fun.bm.lophine.config.modules.misc.ItemEntityConfig.followTickSequenceMerge || item1.getCount() < item.getCount()) { // Lophine - add follow Tick Sequence Merge, see Paper#13073
+                 merge(this, item, itemEntity, item1);
+             } else {
+                 merge(itemEntity, item1, this, item);

lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 16:51:01 +0800
+Subject: [PATCH] Leaves: Syncmatica Protocol
+
+This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
+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/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index df6ad5831f83fcc869b0b4ed844a73b3cb81c469..5c81be29f7ecc3389b5b578f85774035def96e26 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -338,9 +338,12 @@ public class ServerGamePacketListenerImpl
+         this.signedMessageDecoder = SignedMessageChain.Decoder.unsigned(player.getUUID(), server::enforceSecureProfile);
+         this.chatMessageChain = new FutureChain(server.chatExecutor); // CraftBukkit - async chat
+         this.tickEndEvent = new io.papermc.paper.event.packet.ClientTickEndEvent(player.getBukkitEntity()); // Paper - add client tick end event
++        this.exchangeTarget = new org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget(this); // Leaves - Syncmatica Protocol
+         this.playerGameConnection =  new io.papermc.paper.connection.PaperPlayerGameConnection(this); // Paper
+     }
+ 
++    public final org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget exchangeTarget; // Leaves - Syncmatica Protocol
++
+     // Paper start - configuration phase API
+     @Override
+     public io.papermc.paper.connection.PlayerCommonConnection getApiConnection() {

lophine-server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:03:42 +0800
+Subject: [PATCH] Leaves: BBOR Protocol
+
+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/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
+index 173a55715b9c459eeb93cdc065c69e64fc704b43..b2694cb60505766877398fa526b9bfe60e6b6404 100644
+--- a/net/minecraft/world/level/chunk/LevelChunk.java
++++ b/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -758,6 +758,11 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
+ 
+     public void setLoaded(boolean loaded) {
+         this.loaded = loaded;
++        // Leaves start - bbor
++        if (loaded) {
++            org.leavesmc.leaves.protocol.BBORProtocol.onChunkLoaded(this);
++        }
++        // Leaves end - bbor
+     }
+ 
+     public Level getLevel() {

lophine-server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch

@@ -0,0 +1,140 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:33:19 +0800
+Subject: [PATCH] Leaves: Jade Protocol
+
+This patch is Powered by Jade(https://github.com/Snownee/Jade)
+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/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index b644a786d6b4596109efa6e951d46e5d0b808f00..4ca7cf022f4e213bcd5a310dfd8b2db293c441b8 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1453,7 +1453,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         } 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, damageSource);
+             }
+         // Luminol End - Cross Region Damage trace
+         }
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 12862190a59af38e3cf828e4ac9e66a64d2d2215..8f554cb8cb79fa669f3ee9254c87cde1de674fb3 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3798,7 +3798,7 @@ public class ServerGamePacketListenerImpl
+         } else if (this.clientLoadedTimeoutTimer == 1) markClientLoaded(); // Paper - Add PlayerLoadedWorldEvent - decrement by calling #markClientLoaded which will set the value to 0 *and* call the event.
+     }
+ 
+-    private void markClientLoaded() {
++    public void markClientLoaded() { // Lophine - private -> public
+         // Paper start - Add PlayerLoadedWorldEvent
+         if (!hasClientLoaded()) {
+             final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), true);
+diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index 901e4e9897e76cd4158d7f8bb8ec829df8ff8196..59b9373c7a14e42d9e5f691354a7616d16856215 100644
+--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -64,7 +64,7 @@ public class Armadillo extends Animal {
+     public final AnimationState rollOutAnimationState = new AnimationState();
+     public final AnimationState rollUpAnimationState = new AnimationState();
+     public final AnimationState peekAnimationState = new AnimationState();
+-    private int scuteTime;
++    public int scuteTime; // Leaves - private -> public
+     private boolean peekReceivedClient = false;
+ 
+     public Armadillo(EntityType<? extends Animal> type, Level level) {
+diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java
+index f65cfb908aac16e6df4d209c6b5c3ee5065289d3..9afada8ca16775752468e1b14cd97daf26325fc4 100644
+--- a/net/minecraft/world/entity/animal/frog/Tadpole.java
++++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
+@@ -244,7 +244,7 @@ public class Tadpole extends AbstractFish {
+         }
+     }
+ 
+-    private int getTicksLeftUntilAdult() {
++    public int getTicksLeftUntilAdult() { // Leaves - private -> public
+         return Math.max(0, ticksToBeFrog - this.age);
+     }
+ 
+diff --git a/net/minecraft/world/level/storage/loot/LootPool.java b/net/minecraft/world/level/storage/loot/LootPool.java
+index 43b8f4674602532f0273ebc5a0233476d10f6735..2ed995e68cf7812c74c3ba15b49450b2b5f3f0f8 100644
+--- a/net/minecraft/world/level/storage/loot/LootPool.java
++++ b/net/minecraft/world/level/storage/loot/LootPool.java
+@@ -37,7 +37,7 @@ public class LootPool {
+             )
+             .apply(instance, LootPool::new)
+     );
+-    private final List<LootPoolEntryContainer> entries;
++    public final List<LootPoolEntryContainer> entries; // Leaves - private -> public
+     private final List<LootItemCondition> conditions;
+     private final Predicate<LootContext> compositeCondition;
+     private final List<LootItemFunction> functions;
+diff --git a/net/minecraft/world/level/storage/loot/LootTable.java b/net/minecraft/world/level/storage/loot/LootTable.java
+index 35b5154473a3021dcae1f2ad016a77bcfb058c58..3d338b354c3d558a1c4ec20c149e8f26ed27da1e 100644
+--- a/net/minecraft/world/level/storage/loot/LootTable.java
++++ b/net/minecraft/world/level/storage/loot/LootTable.java
+@@ -50,7 +50,7 @@ public class LootTable {
+     public static final LootTable EMPTY = new LootTable(LootContextParamSets.EMPTY, Optional.empty(), List.of(), List.of());
+     private final ContextKeySet paramSet;
+     private final Optional<Identifier> randomSequence;
+-    private final List<LootPool> pools;
++    public final List<LootPool> pools; // Leaves - private -> public
+     private final List<LootItemFunction> functions;
+     private final BiFunction<ItemStack, LootContext, ItemStack> compositeFunction;
+     public org.bukkit.craftbukkit.CraftLootTable craftLootTable; // CraftBukkit
+diff --git a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+index eeaa49e9f70a18b5d39493aeff73f31b05ac2faa..8cd0403d7873c4c37caef75935b06b056c3d951d 100644
+--- a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
++++ b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+@@ -16,7 +16,7 @@ public abstract class CompositeEntryBase extends LootPoolEntryContainer {
+             return "Empty children list";
+         }
+     };
+-    protected final List<LootPoolEntryContainer> children;
++    public final List<LootPoolEntryContainer> children; // Leaves - private -> public
+     private final ComposableEntryContainer composedChildren;
+ 
+     protected CompositeEntryBase(List<LootPoolEntryContainer> children, List<LootItemCondition> conditions) {
+diff --git a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+index cfa05e882d2987cfab4c9d555a2de065b29fdf7e..4bacc9e2fb94d1b24887e7f0e9ce628814393209 100644
+--- a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
++++ b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+@@ -14,7 +14,7 @@ import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder;
+ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+ 
+ public abstract class LootPoolEntryContainer implements ComposableEntryContainer {
+-    protected final List<LootItemCondition> conditions;
++    public final List<LootItemCondition> conditions; // Leaves - private -> public
+     private final Predicate<LootContext> compositeCondition;
+ 
+     protected LootPoolEntryContainer(List<LootItemCondition> conditions) {
+diff --git a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
+index 141026601cd9a4561426b85fd1f8e7dc0544fbd7..a5d7ebb93c147bf0f806ac3c9b2dc4b878573944 100644
+--- a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
++++ b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
+@@ -29,7 +29,7 @@ public class NestedLootTable extends LootPoolSingletonContainer {
+             return "->{inline}";
+         }
+     };
+-    private final Either<ResourceKey<LootTable>, LootTable> contents;
++    public final Either<ResourceKey<LootTable>, LootTable> contents; // Leaves - private -> public
+ 
+     private NestedLootTable(
+         Either<ResourceKey<LootTable>, LootTable> contents, int weight, int quality, List<LootItemCondition> conditions, List<LootItemFunction> functions
+diff --git a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
+index bae72197acc929c7ed3e964f156115d728eb2176..8f3094f42f3366a1313d70c0b27fbe5632b2082a 100644
+--- a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
++++ b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
+@@ -12,7 +12,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
+ import net.minecraft.world.level.storage.loot.ValidationContext;
+ 
+ public abstract class CompositeLootItemCondition implements LootItemCondition {
+-    protected final List<LootItemCondition> terms;
++    public final List<LootItemCondition> terms; // Leaves - private -> public
+     private final Predicate<LootContext> composedPredicate;
+ 
+     protected CompositeLootItemCondition(List<LootItemCondition> terms, Predicate<LootContext> composedPredicate) {

lophine-server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Fri, 7 Feb 2025 14:23:43 +0800
+Subject: [PATCH] Leaves: Xaero Map Protocol
+
+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/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 3a5319739f0687fc6f09b2ac8ee31716593fe0de..36cd1a0307ff1a734eb5f4f3cc013781692e7ad8 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -1126,6 +1126,7 @@ public abstract class PlayerList {
+         //player.connection.send(new ClientboundSetChunkCacheRadiusPacket(io.papermc.paper.FeatureHooks.getViewDistance(level))); // Paper - rewrite chunk system
+         //player.connection.send(new ClientboundSetSimulationDistancePacket(io.papermc.paper.FeatureHooks.getSimulationDistance(level))); // Paper - rewrite chunk system
+         // Paper end - view distances
++        org.leavesmc.leaves.protocol.XaeroMapProtocol.onSendWorldInfo(player); // Leaves - xaero map protocol
+         if (level.isRaining()) {
+             // CraftBukkit start - handle player weather
+             // player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.START_RAINING, 0.0F));

lophine-server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 27 Mar 2025 13:04:35 +0800
+Subject: [PATCH] Leaves: Support REI protocol
+
+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/net/minecraft/world/item/crafting/SmithingTransformRecipe.java b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
+index d02609198253b51f632db46c40afd737d686c520..7296e0b73f1c8e32374f39238d1dfac62bc41afb 100644
+--- a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
++++ b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
+@@ -82,6 +82,12 @@ public class SmithingTransformRecipe implements SmithingRecipe {
+         );
+     }
+ 
++    // Leaves start - REI
++    public SlotDisplay getResult() {
++        return this.result.display();
++    }
++    // Leaves end - REI
++
+     // CraftBukkit start
+     @Override
+     public org.bukkit.inventory.Recipe toBukkitRecipe(org.bukkit.NamespacedKey id) {
+diff --git a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
+index 6582370cfa3d58a7ac08d574e26e7a93d243bdaa..07501a27e6032e578b823d9b617166a9e78fcb20 100644
+--- a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
++++ b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
+@@ -84,6 +84,12 @@ public class SmithingTrimRecipe implements SmithingRecipe {
+         return Optional.of(this.addition);
+     }
+ 
++    // Leaves start
++    public Holder<TrimPattern> pattern() {
++        return pattern;
++    }
++    // Leaves end
++
+     @Override
+     public RecipeSerializer<SmithingTrimRecipe> getSerializer() {
+         return RecipeSerializer.SMITHING_TRIM;

lophine-server/minecraft-patches/features/0029-Leaves-Wool-Hopper-Counter.patch

@@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 27 Oct 2025 15:38:29 +0800
+Subject: [PATCH] Leaves: Wool Hopper Counter
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves)
+Licensed under: MIT
+
+This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet)
+
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 6a51bace3151646afae9de820d9c8977a0221df4..474ca0ce0d3095fc586f8f9e9a584ed4f7c91471 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -229,8 +229,30 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                     flag |= validator.getAsBoolean(); // Paper - note: this is not a validator, it's what adds/sucks in items
+                 }
+ 
++                // Leaves start - Wool hopper counter
++                if (fun.bm.lophine.config.modules.function.WoolHopperCounterConfig.unlimitedSpeed && org.leavesmc.leaves.util.HopperCounter.isEnabled()) {
++                    net.minecraft.world.item.DyeColor woolColor = org.leavesmc.leaves.util.WoolUtils.getWoolColorAtPosition(level, blockEntity.getBlockPos().relative(state.getValue(HopperBlock.FACING)));
++                    if (woolColor != null) {
++                        for (int i = 0; i < Short.MAX_VALUE; i++) {
++                            flag |= suckInItems(level, blockEntity);
++                            if (!flag) {
++                                break;
++                            } else {
++                                woolHopperCounter(level, pos, state, HopperBlockEntity.getContainerAt(level, pos));
++                            }
++                        }
++                    }
++                }
++                // Leaves end - Wool hopper counter
++
+                 if (flag) {
+                     blockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Spigot
++                    // Leaves start - Wool hopper counter
++                    if (fun.bm.lophine.config.modules.function.WoolHopperCounterConfig.unlimitedSpeed && org.leavesmc.leaves.util.HopperCounter.isEnabled() && woolHopperCounter(level, pos, state, HopperBlockEntity.getContainerAt(level, pos))) {
++                        blockEntity.setCooldown(0);
++                        return true;
++                    }
++                    // Leaves end - Wool hopper counter
+                     setChanged(level, pos, state);
+                     // Leaves start - Lithium Sleeping Block Entity
+                     if (me.earthme.luminol.config.modules.optimizations.LeavesSleepingBlockEntityConfig.enabled
+@@ -462,6 +484,13 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     // Paper end - Perf: Optimize Hoppers
+ 
+     private static boolean ejectItems(Level level, BlockPos pos, HopperBlockEntity blockEntity) {
++        // Leaves start - hopper counter
++        if (org.leavesmc.leaves.util.HopperCounter.isEnabled()) {
++            if (woolHopperCounter(level, pos, level.getBlockState(pos), HopperBlockEntity.getContainerAt(level, pos))) {
++                return true;
++            }
++        }
++        // Leaves end - hopper counter
+         Container attachedContainer = me.earthme.luminol.config.modules.optimizations.LeavesSleepingBlockEntityConfig.enabled ? blockEntity.getInsertInventory(level) : getAttachedContainer(level, pos, blockEntity); // Leaves - Lithium Sleeping Block Entity
+         if (attachedContainer == null) {
+             return false;
+@@ -537,6 +566,26 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+         }
+     }
+ 
++    // Leaves start - hopper counter
++    private static boolean woolHopperCounter(Level level, BlockPos blockPos, BlockState state, @Nullable Container container) {
++        if (container == null) {
++            return false;
++        }
++        net.minecraft.world.item.DyeColor woolColor = org.leavesmc.leaves.util.WoolUtils.getWoolColorAtPosition(level, blockPos.relative(state.getValue(HopperBlock.FACING)));
++        if (woolColor != null) {
++            for (int i = 0; i < container.getContainerSize(); ++i) {
++                if (!container.getItem(i).isEmpty()) {
++                    ItemStack itemstack = container.getItem(i);
++                    org.leavesmc.leaves.util.HopperCounter.getCounter(woolColor).add(level.getServer(), itemstack);
++                    container.setItem(i, ItemStack.EMPTY);
++                }
++            }
++            return true;
++        }
++        return false;
++    }
++    // Leaves end - hopper counter
++
+     private static int[] getSlots(Container container, Direction direction) {
+         if (container instanceof WorldlyContainer worldlyContainer) {
+             return worldlyContainer.getSlotsForFace(direction);
+@@ -681,6 +730,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     }
+ 
+     public static boolean addItem(Container container, ItemEntity item) {
++        if (fun.bm.lophine.config.modules.function.WoolHopperCounterConfig.unlimitedSpeed && org.leavesmc.leaves.util.HopperCounter.isEnabled() && item.isRemoved()) return false; // Leaves - Wool hopper counter
+         boolean flag = false;
+         // CraftBukkit start
+         if (org.bukkit.event.inventory.InventoryPickupItemEvent.getHandlerList().getRegisteredListeners().length > 0) { // Paper - optimize hoppers

lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch

@@ -0,0 +1,98 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:51:26 +0800
+Subject: [PATCH] Leaves: Alternative block placement Protocol
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves)
+Licensed under: MIT
+
+This patch is Powered by
+carpet-extra(https://github.com/gnembon/carpet-extra)
+MasaGadget(https://github.com/plusls/MasaGadget)
+litematica(https://github.com/maruohon/litematica)
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 98d641b2e8ca340cb10fe0448f8a8b4f8446f616..878f5c5801b68e3a6d01d63caf44737841387600 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2128,7 +2128,7 @@ public class ServerGamePacketListenerImpl
+                 if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.player.level(), blockPos.getX() >> 4, blockPos.getZ() >> 4, 8) && this.player.isWithinBlockInteractionRange(blockPos, 1.0)) { // Folia - do not allow players to interact with blocks outside the current region
+                     Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos));
+                     double d = 1.0000001;
+-                    if (Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) {
++                    if (fun.bm.lophine.config.modules.function.protocol.AlternativeBlockPlacementProtocolConfig.needIgnoreDistance() ||Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) { // Leaves - disableDistanceCheckForUseItem
+                         Direction direction = hitResult.getDirection();
+                         this.player.resetLastActionTime();
+                         int maxY = this.player.level().getMaxY();
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 73ce7c82c0bd28c2e43ca40ba35c4603b21375ad..a5d3caab2072b2c9bf8fdcbdb7c52c2dee16cfaf 100644
+--- a/net/minecraft/world/item/BlockItem.java
++++ b/net/minecraft/world/item/BlockItem.java
+@@ -147,7 +147,7 @@ public class BlockItem extends Item {
+     }
+ 
+     protected @Nullable BlockState getPlacementState(BlockPlaceContext context) {
+-        BlockState stateForPlacement = this.getBlock().getStateForPlacement(context);
++        BlockState stateForPlacement = this.getBlock().getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement
+         return stateForPlacement != null && this.canPlace(context, stateForPlacement) ? stateForPlacement : null;
+     }
+ 
+diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java
+index d75c95d728efc0b4064f562ca80b68b23883feaf..be685383b8e7c8111e976fc560f16d43d6545a34 100644
+--- a/net/minecraft/world/item/StandingAndWallBlockItem.java
++++ b/net/minecraft/world/item/StandingAndWallBlockItem.java
+@@ -26,14 +26,14 @@ public class StandingAndWallBlockItem extends BlockItem {
+ 
+     @Override
+     protected @Nullable BlockState getPlacementState(BlockPlaceContext context) {
+-        BlockState stateForPlacement = this.wallBlock.getStateForPlacement(context);
++        BlockState stateForPlacement = this.wallBlock.getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement
+         BlockState blockState = null;
+         LevelReader level = context.getLevel();
+         BlockPos clickedPos = context.getClickedPos();
+ 
+         for (Direction direction : context.getNearestLookingDirections()) {
+             if (direction != this.attachmentDirection.getOpposite()) {
+-                BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getStateForPlacement(context) : stateForPlacement;
++                BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getRealStateForPlacement(context) : stateForPlacement; // Leaves - alternativeBlockPlacement
+                 if (blockState1 != null && this.canPlace(level, blockState1, clickedPos)) {
+                     blockState = blockState1;
+                     break;
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
+index 13f06f1fbdf77b88493333b481b951d729579f11..e0ab4f7372ed11c9d17b341c8a24a82350c714fa 100644
+--- a/net/minecraft/world/level/block/Block.java
++++ b/net/minecraft/world/level/block/Block.java
+@@ -489,6 +489,32 @@ public class Block extends BlockBehaviour implements ItemLike {
+     public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
+     }
+ 
++    // Leaves start - alternativeBlockPlacement
++    public @Nullable BlockState getRealStateForPlacement(BlockPlaceContext context) {
++        BlockState vanillaState = this.getStateForPlacement(context);
++        switch (fun.bm.lophine.config.modules.function.protocol.AlternativeBlockPlacementProtocolConfig.alternativeBlockPlacement) {
++            case fun.bm.lophine.enums.EnumAlternativePlaceType.CARPET -> {
++                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacement(this, context);
++                if (tryState != null) {
++                    return tryState;
++                }
++            }
++            case fun.bm.lophine.enums.EnumAlternativePlaceType.CARPET_FIX -> {
++                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacementFix(this, context);
++                if (tryState != null) {
++                    return tryState;
++                }
++            }
++            case fun.bm.lophine.enums.EnumAlternativePlaceType.LITEMATICA -> {
++                if (vanillaState != null) {
++                    return org.leavesmc.leaves.protocol.LitematicaEasyPlaceProtocol.applyPlacementProtocol(vanillaState, context);
++                }
++            }
++        }
++        return vanillaState;
++    }
++    // Leaves end - alternativeBlockPlacement
++
+     public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) {
+         return this.defaultBlockState();
+     }

lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch

@@ -0,0 +1,567 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 16 Nov 2025 15:48:12 +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) & ReplayMod (https://github.com/ReplayMod)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+This patch is Powered by ReplayMod (https://github.com/ReplayMod)
+
+diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
+index f046aca874eb3376696baaad3719a6987afbfe22..268b2c6b981c8164fb829eb8a33beb213fe60bcf 100644
+--- a/net/minecraft/commands/CommandSourceStack.java
++++ b/net/minecraft/commands/CommandSourceStack.java
+@@ -562,7 +562,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+ 
+     @Override
+     public Collection<String> getOnlinePlayerNames() {
+-        return this.entity instanceof ServerPlayer sourcePlayer && !sourcePlayer.getBukkitEntity().hasPermission("paper.bypass-visibility.tab-completion") ? this.getServer().getPlayerList().getPlayers().stream().filter(serverPlayer -> sourcePlayer.getBukkitEntity().canSee(serverPlayer.getBukkitEntity())).map(serverPlayer -> serverPlayer.getGameProfile().name()).toList() : Lists.newArrayList(this.server.getPlayerNames()); // Paper - Make CommandSourceStack respect hidden players
++        return this.entity instanceof ServerPlayer sourcePlayer && !(sourcePlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer) && !sourcePlayer.getBukkitEntity().hasPermission("paper.bypass-visibility.tab-completion") ? this.getServer().getPlayerList().getPlayers().stream().filter(serverPlayer -> sourcePlayer.getBukkitEntity().canSee(serverPlayer.getBukkitEntity())).map(serverPlayer -> serverPlayer.getGameProfile().name()).toList() : Lists.newArrayList(this.server.getPlayerNames()); // Paper - Make CommandSourceStack respect hidden players // Leaves - only real player
+     }
+ 
+     @Override
+diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java
+index af71e0e1eb1c93745f3e4954ecc8fbd2ad4808a3..f3829564681faff3ae8971ed90b947b4a082a636 100644
+--- a/net/minecraft/commands/arguments/selector/EntitySelector.java
++++ b/net/minecraft/commands/arguments/selector/EntitySelector.java
+@@ -126,11 +126,12 @@ public class EntitySelector {
+             return this.findPlayers(source);
+         } else if (this.playerName != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
++            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else if (this.entityUUID != null) {
+             for (ServerLevel serverLevel : source.getServer().getAllLevels()) {
+                 Entity entity = serverLevel.getEntity(this.entityUUID);
+-                if (entity != null) {
++                if (entity != null && !(entity instanceof org.leavesmc.leaves.replay.ServerPhotographer)) {
+                     if (entity.getType().isEnabled(source.enabledFeatures())) {
+                         return List.of(entity);
+                     }
+@@ -144,7 +145,7 @@ public class EntitySelector {
+             AABB absoluteAabb = this.getAbsoluteAabb(vec3);
+             if (this.currentEntity) {
+                 Predicate<Entity> predicate = this.getPredicate(vec3, absoluteAabb, null);
+-                return source.getEntity() != null && predicate.test(source.getEntity()) ? List.of(source.getEntity()) : List.of();
++                return source.getEntity() != null && !(source.getEntity() instanceof org.leavesmc.leaves.replay.ServerPhotographer) && predicate.test(source.getEntity()) ? List.of(source.getEntity()) : List.of(); // Leaves - skip photographer
+             } else {
+                 Predicate<Entity> predicate = this.getPredicate(vec3, absoluteAabb, source.enabledFeatures());
+                 List<Entity> list = new ObjectArrayList<>();
+@@ -155,6 +156,7 @@ public class EntitySelector {
+                         this.addEntities(list, serverLevel1, absoluteAabb, predicate);
+                     }
+                 }
++                list.removeIf(entity -> entity instanceof org.leavesmc.leaves.replay.ServerPhotographer); // Leaves - skip photographer
+ 
+                 return this.sortAndLimit(vec3, list);
+             }
+@@ -190,9 +192,11 @@ public class EntitySelector {
+         this.checkPermissions(source);
+         if (this.playerName != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
++            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else if (this.entityUUID != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayer(this.entityUUID);
++            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else {
+             Vec3 vec3 = this.position.apply(source.getPosition());
+@@ -204,11 +208,11 @@ public class EntitySelector {
+                 int resultLimit = this.getResultLimit();
+                 List<ServerPlayer> players;
+                 if (this.isWorldLimited()) {
+-                    players = source.getLevel().getPlayers(predicate, resultLimit);
++                    players = source.getLevel().getPlayers((player -> !(player instanceof org.leavesmc.leaves.replay.ServerPhotographer) && predicate.test(player)), resultLimit); // Leaves - skip photographer
+                 } else {
+                     players = new ObjectArrayList<>();
+ 
+-                    for (ServerPlayer serverPlayer1 : source.getServer().getPlayerList().getPlayers()) {
++                    for (ServerPlayer serverPlayer1 : source.getServer().getPlayerList().realPlayers) { // Leaves - only real players
+                         if (predicate.test(serverPlayer1)) {
+                             players.add(serverPlayer1);
+                             if (players.size() >= resultLimit) {
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 744b780075bf76fa0fa5e27699a146701289e0d8..c8f2f98ebc145063505b73ef7c723f2878d34ea3 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -1895,7 +1895,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+ 
+     private ServerStatus.Players buildPlayerStatus() {
+-        List<ServerPlayer> players = new java.util.ArrayList<>(this.playerList.getPlayers()); // Folia - region threading
++        List<ServerPlayer> players = new java.util.ArrayList<>(this.playerList.realPlayers); // Folia - region threading
+         int maxPlayers = this.getMaxPlayers();
+         if (this.hidesOnlinePlayers()) {
+             return new ServerStatus.Players(maxPlayers, players.size(), List.of());
+@@ -2104,7 +2104,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     @Override
+     public int getPlayerCount() {
+-        return this.playerList.getPlayerCount();
++        return this.playerList.realPlayers.size(); // Leaves - only real player
+     }
+ 
+     public String[] getPlayerNames() {
+@@ -2308,7 +2308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         } else {
+             int i = 0;
+ 
+-            for (ServerPlayer serverPlayer : this.getPlayerList().getPlayers()) {
++            for (ServerPlayer serverPlayer : this.getPlayerList().realPlayers) { // Leaves - only real players
+                 serverPlayer.getBukkitEntity().taskScheduler.schedule((ServerPlayer player) -> { // Folia - region threading
+                 // Paper start - Expand PlayerGameModeChangeEvent
+                 org.bukkit.event.player.PlayerGameModeChangeEvent event = player.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null); // Folia - region threading
+@@ -2493,7 +2493,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     if (Thread.currentThread() != this.serverThread) return; // Paper
+                     // Paper start - we don't need to save everything, just advancements
+                     // this.getPlayerList().saveAll();
+-                    for (final ServerPlayer player : this.getPlayerList().getPlayers()) {
++                    for (final ServerPlayer player : this.getPlayerList().realPlayers) { // Leaves - only real players
+                         player.getAdvancements().save();
+                     }
+                     // Paper end - we don't need to save everything, just advancements
+@@ -2631,7 +2631,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             PlayerList playerList = this.getPlayerList();
+             UserWhiteList whiteList = playerList.getWhiteList();
+ 
+-            for (ServerPlayer serverPlayer : Lists.newArrayList(playerList.getPlayers())) {
++            for (ServerPlayer serverPlayer : Lists.newArrayList(playerList.realPlayers)) { // Leaves - only real player
+                 if (!whiteList.isWhiteListed(serverPlayer.nameAndId()) && !this.getPlayerList().isOp(serverPlayer.nameAndId())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
+                     serverPlayer.connection.disconnect(net.kyori.adventure.text.Component.text(org.spigotmc.SpigotConfig.whitelistMessage), org.bukkit.event.player.PlayerKickEvent.Cause.WHITELIST); // Paper - use configurable message & kick event cause
+                 }
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index cd968c6971d054d9b66a0eaea4753a51ebb75b02..9525d77c379264289db4256e8275378d9cfa9f63 100644
+--- a/net/minecraft/server/PlayerAdvancements.java
++++ b/net/minecraft/server/PlayerAdvancements.java
+@@ -167,7 +167,7 @@ public class PlayerAdvancements {
+ 
+     public boolean award(AdvancementHolder advancement, String criterionKey) {
+         // Leaves start - bot can't get advancement
+-        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
++        if (player instanceof org.leavesmc.leaves.bot.ServerBot || player instanceof org.leavesmc.leaves.replay.ServerPhotographer) { // Leaves - and photographer
+             return false;
+         }
+         // Leaves end - bot can't get advancement
+diff --git a/net/minecraft/server/ServerScoreboard.java b/net/minecraft/server/ServerScoreboard.java
+index a938ae0f340aaece1fdbe3f6d517809563b1b0f5..e9f2c50c0e87b32627ad16910e1f4a816f4efc5f 100644
+--- a/net/minecraft/server/ServerScoreboard.java
++++ b/net/minecraft/server/ServerScoreboard.java
+@@ -249,7 +249,7 @@ public class ServerScoreboard extends Scoreboard {
+     public void startTrackingObjective(Objective objective) {
+         List<Packet<?>> startTrackingPackets = this.getStartTrackingPackets(objective);
+ 
+-        for (ServerPlayer serverPlayer : this.server.getPlayerList().getPlayers()) {
++        for (ServerPlayer serverPlayer : this.server.getPlayerList().realPlayers) { // Leaves - only real players
+             if (serverPlayer.getBukkitEntity().getScoreboard().getHandle() != this) continue; // CraftBukkit - Only players on this board
+             for (Packet<?> packet : startTrackingPackets) {
+                 serverPlayer.connection.send(packet);
+@@ -275,7 +275,7 @@ public class ServerScoreboard extends Scoreboard {
+     public void stopTrackingObjective(Objective objective) {
+         List<Packet<?>> stopTrackingPackets = this.getStopTrackingPackets(objective);
+ 
+-        for (ServerPlayer serverPlayer : this.server.getPlayerList().getPlayers()) {
++        for (ServerPlayer serverPlayer : this.server.getPlayerList().realPlayers) { // Leaves - only real players
+             if (serverPlayer.getBukkitEntity().getScoreboard().getHandle() != this) continue; // CraftBukkit - Only players on this board
+             for (Packet<?> packet : stopTrackingPackets) {
+                 serverPlayer.connection.send(packet);
+diff --git a/net/minecraft/server/commands/ListPlayersCommand.java b/net/minecraft/server/commands/ListPlayersCommand.java
+index e7c778a7f292fd0749cbd5e6586ad1b93ac7f29e..024b56405bb58801b17a6adad7fec7a461d12a5c 100644
+--- a/net/minecraft/server/commands/ListPlayersCommand.java
++++ b/net/minecraft/server/commands/ListPlayersCommand.java
+@@ -33,7 +33,7 @@ public class ListPlayersCommand {
+     private static int format(CommandSourceStack source, Function<ServerPlayer, Component> nameExtractor) {
+         PlayerList playerList = source.getServer().getPlayerList();
+         // CraftBukkit start
+-        List<ServerPlayer> playersTemp = playerList.getPlayers();
++        List<ServerPlayer> playersTemp = playerList.realPlayers;
+         if (source.getBukkitSender() instanceof org.bukkit.entity.Player) {
+             org.bukkit.entity.Player sender = (org.bukkit.entity.Player) source.getBukkitSender();
+             playersTemp = playersTemp.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
+diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
+index 590891d70a71ab30ceae3a3cf1923745e7c20b26..0ede1e5c73a0071e854de70f81ae1fc6a1d6dc59 100644
+--- a/net/minecraft/server/commands/OpCommand.java
++++ b/net/minecraft/server/commands/OpCommand.java
+@@ -25,7 +25,7 @@ public class OpCommand {
+                             (commandContext, suggestionsBuilder) -> {
+                                 PlayerList playerList = commandContext.getSource().getServer().getPlayerList();
+                                 return SharedSuggestionProvider.suggest(
+-                                    playerList.getPlayers()
++                                    playerList.realPlayers // Leaves - only real player
+                                         .stream()
+                                         .filter(serverPlayer -> !playerList.isOp(serverPlayer.nameAndId()))
+                                         .map(serverPlayer -> serverPlayer.getGameProfile().name()),
+diff --git a/net/minecraft/server/commands/ParticleCommand.java b/net/minecraft/server/commands/ParticleCommand.java
+index b5cb0fd45c1e33f40ff38e86772c9e6cc06c10a0..e9ac6ee47fd9c3d73e55a3467bb1c53f931609d0 100644
+--- a/net/minecraft/server/commands/ParticleCommand.java
++++ b/net/minecraft/server/commands/ParticleCommand.java
+@@ -36,7 +36,7 @@ public class ParticleCommand {
+                                 0.0F,
+                                 0,
+                                 false,
+-                                commandContext.getSource().getServer().getPlayerList().getPlayers()
++                                commandContext.getSource().getServer().getPlayerList().realPlayers // Leaves - only real player
+                             )
+                         )
+                         .then(
+@@ -50,7 +50,7 @@ public class ParticleCommand {
+                                         0.0F,
+                                         0,
+                                         false,
+-                                        context1.getSource().getServer().getPlayerList().getPlayers()
++                                        context1.getSource().getServer().getPlayerList().realPlayers // Leaves - only real player
+                                     )
+                                 )
+                                 .then(
+@@ -68,7 +68,7 @@ public class ParticleCommand {
+                                                                 FloatArgumentType.getFloat(context1, "speed"),
+                                                                 IntegerArgumentType.getInteger(context1, "count"),
+                                                                 false,
+-                                                                context1.getSource().getServer().getPlayerList().getPlayers()
++                                                                context1.getSource().getServer().getPlayerList().realPlayers // Leaves - only real player
+                                                             )
+                                                         )
+                                                         .then(
+@@ -82,7 +82,7 @@ public class ParticleCommand {
+                                                                         FloatArgumentType.getFloat(context1, "speed"),
+                                                                         IntegerArgumentType.getInteger(context1, "count"),
+                                                                         true,
+-                                                                        context1.getSource().getServer().getPlayerList().getPlayers()
++                                                                        context1.getSource().getServer().getPlayerList().realPlayers // Leaves - only real player
+                                                                     )
+                                                                 )
+                                                                 .then(
+@@ -112,7 +112,7 @@ public class ParticleCommand {
+                                                                         FloatArgumentType.getFloat(context1, "speed"),
+                                                                         IntegerArgumentType.getInteger(context1, "count"),
+                                                                         false,
+-                                                                        context1.getSource().getServer().getPlayerList().getPlayers()
++                                                                        context1.getSource().getServer().getPlayerList().realPlayers // Leaves - only real player
+                                                                     )
+                                                                 )
+                                                                 .then(
+diff --git a/net/minecraft/server/commands/TeamMsgCommand.java b/net/minecraft/server/commands/TeamMsgCommand.java
+index 0ae4d68dfe42004839a0c5ad457de592f6b4af8b..1d1e396e4b29f33669872fb39e3a7f1d474a49f7 100644
+--- a/net/minecraft/server/commands/TeamMsgCommand.java
++++ b/net/minecraft/server/commands/TeamMsgCommand.java
+@@ -40,7 +40,7 @@ public class TeamMsgCommand {
+                                 } else {
+                                     List<ServerPlayer> list = commandSourceStack.getServer()
+                                         .getPlayerList()
+-                                        .getPlayers()
++                                        .realPlayers // Leaves - only real players
+                                         .stream()
+                                         .filter(player -> player == entityOrException || player.getTeam() == team)
+                                         .toList();
+diff --git a/net/minecraft/server/commands/WhitelistCommand.java b/net/minecraft/server/commands/WhitelistCommand.java
+index 305273583b3d2ad233c6cd67883baad15fe572eb..ce2939eac9c66e0c6eaac1570c4da19d908662ad 100644
+--- a/net/minecraft/server/commands/WhitelistCommand.java
++++ b/net/minecraft/server/commands/WhitelistCommand.java
+@@ -44,7 +44,7 @@ public class WhitelistCommand {
+                                     (commandContext, suggestionsBuilder) -> {
+                                         PlayerList playerList = commandContext.getSource().getServer().getPlayerList();
+                                         return SharedSuggestionProvider.suggest(
+-                                            playerList.getPlayers()
++                                            playerList.realPlayers // Leaves - only real player
+                                                 .stream()
+                                                 .map(Player::nameAndId)
+                                                 .filter(nameAndId -> !playerList.getWhiteList().isWhiteListed(nameAndId))
+diff --git a/net/minecraft/server/gui/PlayerListComponent.java b/net/minecraft/server/gui/PlayerListComponent.java
+index 5a8cd3e6b448a4472092690cf589bca10b142126..158593b1a6384db635a1f224919b24c174944b10 100644
+--- a/net/minecraft/server/gui/PlayerListComponent.java
++++ b/net/minecraft/server/gui/PlayerListComponent.java
+@@ -17,8 +17,8 @@ public class PlayerListComponent extends JList<String> {
+         if (this.tickCount++ % 20 == 0) {
+             Vector<String> list = new Vector<>();
+ 
+-            for (int i = 0; i < this.server.getPlayerList().getPlayers().size(); i++) {
+-                list.add(this.server.getPlayerList().getPlayers().get(i).getGameProfile().name());
++            for (int i = 0; i < this.server.getPlayerList().realPlayers.size(); i++) {
++                list.add(this.server.getPlayerList().realPlayers.get(i).getGameProfile().name());
+             }
+ 
+             this.setListData(list);
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index c09af6b81987df8e681689ecce9932a2e39af1a3..b3c593474e889d254f59813e7f42299b7b77d9ce 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -2951,7 +2951,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.add(serverPlayer);
+                 // Leaves start - skip
+-                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
++                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot) && !(serverPlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer)) { // and photographer
+                     ServerLevel.this.realPlayers.add(serverPlayer);
+                 }
+                 // Leaves end - skip
+@@ -3043,7 +3043,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.remove(serverPlayer);
+                 // Leaves start - skip
+-                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
++                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot) && !(serverPlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer)) { // and photographer
+                     ServerLevel.this.realPlayers.remove(serverPlayer);
+                 }
+                 // Leaves end - skip
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 4ca7cf022f4e213bcd5a310dfd8b2db293c441b8..8ea3c580b506e214664135a2c10722b56ab8e439 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -202,7 +202,7 @@ import org.jspecify.annotations.Nullable;
+ import org.slf4j.Logger;
+ 
+ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer { // Paper - rewrite chunk system
+-    private static final Logger LOGGER = LogUtils.getLogger();
++    protected static final Logger LOGGER = LogUtils.getLogger();
+     public static final long LAST_SAVE_ABSENT = Long.MIN_VALUE; public long lastSave = LAST_SAVE_ABSENT; // Paper // Folia - threaded regions - changed to nanoTime
+     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
+     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
+@@ -669,7 +669,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         // Paper start - Expand PlayerGameModeChangeEvent
+         this.loadGameTypes(input);
+     }
+-    private void loadGameTypes(ValueInput input) {
++    public void loadGameTypes(ValueInput input) { // Lophine - private -> public
+         if (this.server.getForcedGameType() != null && this.server.getForcedGameType() != readPlayerMode(input, "playerGameType")) {
+             if (new org.bukkit.event.player.PlayerGameModeChangeEvent(this.getBukkitEntity(), org.bukkit.GameMode.getByValue(this.server.getDefaultGameType().getId()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null).callEvent()) {
+                 this.gameMode.setGameModeForPlayer(this.server.getForcedGameType(), GameType.DEFAULT_MODE);
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 36cd1a0307ff1a734eb5f4f3cc013781692e7ad8..e38f5ae03f184696a3d68542c0bde3b1091dfd2e 100644
+--- a/net/minecraft/server/players/PlayerList.java
++++ b/net/minecraft/server/players/PlayerList.java
+@@ -130,6 +130,7 @@ public abstract class PlayerList {
+     private int simulationDistance;
+     private boolean allowCommandsForAllPlayers;
+     private int sendAllPlayerInfoIn;
++    public final List<ServerPlayer> realPlayers = new java.util.concurrent.CopyOnWriteArrayList(); // Leaves - replay api
+ 
+     // CraftBukkit start
+     private org.bukkit.craftbukkit.CraftServer cserver;
+@@ -218,6 +219,123 @@ public abstract class PlayerList {
+ 
+     abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor
+ 
++    // Leaves start - replay mod api
++    public void placeNewPhotographer(Connection connection, org.leavesmc.leaves.replay.ServerPhotographer player, ServerLevel worldserver) {
++        player.isRealPlayer = true; // Paper
++        player.loginTime = System.currentTimeMillis(); // Paper
++
++        ServerLevel worldserver1 = worldserver;
++
++        player.setServerLevel(worldserver1);
++        player.spawnIn(worldserver1);
++        player.gameMode.setLevel((ServerLevel) player.level());
++
++        LevelData worlddata = worldserver1.getLevelData();
++
++        player.loadGameTypes(null);
++        ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, CommonListenerCookie.createInitial(player.gameProfile, false));
++        GameRules gamerules = worldserver1.getGameRules();
++        boolean flag = gamerules.get(GameRules.IMMEDIATE_RESPAWN);
++        boolean flag1 = gamerules.get(GameRules.REDUCED_DEBUG_INFO);
++        boolean flag2 = gamerules.get(GameRules.LIMITED_CRAFTING);
++
++        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), worldserver1.getWorld().getSendViewDistance(), worldserver1.getWorld().getSimulationDistance(), flag1, !flag, flag2, player.createCommonSpawnInfo(worldserver1), this.server.enforceSecureProfile())); // Paper - replace old player chunk management
++        player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
++        playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
++        playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
++        playerconnection.send(new ClientboundSetHeldSlotPacket(player.getInventory().getSelectedSlot()));
++        RecipeManager craftingmanager = this.server.getRecipeManager();
++        playerconnection.send(new ClientboundUpdateRecipesPacket(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes()));
++
++        this.sendPlayerPermissionLevel(player);
++        player.getStats().markAllDirty();
++        player.getRecipeBook().sendInitialRecipeBook(player);
++        this.updateEntireScoreboard(worldserver1.getScoreboard(), player);
++        this.server.invalidateStatus();
++
++        playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
++        ServerStatus serverping = this.server.getStatus();
++
++        if (serverping != null) {
++            player.sendServerStatus(serverping);
++        }
++
++        this.players.add(player);
++        this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
++        this.playersByUUID.put(player.getUUID(), player);
++
++        player.suppressTrackerForLogin = true;
++        worldserver1.getCurrentWorldData().connections.add(player.connection.connection);
++        worldserver1.addNewPlayer(player);
++        this.server.getCustomBossEvents().onPlayerConnect(player);
++        org.bukkit.craftbukkit.entity.CraftPlayer bukkitPlayer = player.getBukkitEntity();
++
++        player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
++        if (!player.connection.isAcceptingMessages()) {
++            return;
++        }
++
++        // org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player); // Leaves - protocol
++
++        // Leaves start - bot support
++        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
++            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
++            if (bot != null) {
++                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, false);
++            }
++            this.server.getBotList().bots.forEach(bot1 -> {
++                bot1.sendPlayerInfo(player);
++                bot1.sendFakeDataIfNeed(player, true);
++            }); // Leaves - render bot
++        }
++        // Leaves end - bot support
++
++        final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1);
++        final List<ServerPlayer> playerList = List.copyOf(this.players); // Lophine - copy to avoid ConcurrentModificationException
++        for (ServerPlayer serverPlayer : playerList) {
++            if (serverPlayer == player || !bukkitPlayer.canSee(serverPlayer.getBukkitEntity())) {
++                continue;
++            }
++
++            // Leaves start - skip photographer
++            if (serverPlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer) {
++                continue;
++            }
++            // Leaves end - skip photographer
++
++            onlinePlayers.add(serverPlayer);
++        }
++        if (!onlinePlayers.isEmpty()) {
++            player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player));
++        }
++
++        player.sentListPacket = true;
++        player.suppressTrackerForLogin = false;
++        player.level().getChunkSource().chunkMap.addEntity(player);
++
++        this.sendLevelInfo(player, worldserver1);
++
++        if (player.level() == worldserver1 && !worldserver1.players().contains(player)) {
++            worldserver1.addNewPlayer(player);
++            this.server.getCustomBossEvents().onPlayerConnect(player);
++        }
++
++        worldserver1 = player.level();
++        for (MobEffectInstance mobeffect : player.getActiveEffects()) {
++            playerconnection.send(new ClientboundUpdateMobEffectPacket(player.getId(), mobeffect, false));
++        }
++
++        if (player.isDeadOrDying()) {
++            net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = worldserver1.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BIOME)
++                    .getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
++            player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
++                    new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
++                    worldserver1.getLightEngine(), null, null, false)
++            );
++        }
++    }
++    // Leaves end - replay mod api
++
+     public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie) {
+         player.isRealPlayer = true; // Paper
+         player.loginTime = System.currentTimeMillis(); // Paper - Replace OfflinePlayer#getLastPlayed
+@@ -292,6 +410,7 @@ public abstract class PlayerList {
+ 
+         // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
+         this.players.add(player);
++        this.realPlayers.add(player); // Leaves - replay api
+         this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
+         this.playersByUUID.put(player.getUUID(), player);
+         // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player))); // CraftBukkit - replaced with loop below
+@@ -507,6 +626,7 @@ public abstract class PlayerList {
+     }
+ 
+     protected void save(ServerPlayer player) {
++        if (player instanceof org.leavesmc.leaves.replay.ServerPhotographer) return; // Leaves - skip photographer
+         if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
+         player.lastSave = System.nanoTime(); // Folia - region threading - changed to nanoTime tracking
+         this.playerIo.save(player);
+@@ -521,6 +641,44 @@ public abstract class PlayerList {
+         }
+     }
+ 
++    // Leaves start - replay mod api
++    public void removePhotographer(org.leavesmc.leaves.replay.ServerPhotographer entityplayer) {
++        ServerLevel worldserver = entityplayer.level();
++
++        entityplayer.awardStat(Stats.LEAVE_GAME);
++
++        if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
++            entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT);
++        }
++
++        if (server.isSameThread()) entityplayer.doTick();
++
++        if (this.collideRuleTeamName != null) {
++            final net.minecraft.world.scores.Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
++            final PlayerTeam team = scoreBoard.getPlayersTeam(this.collideRuleTeamName);
++            if (entityplayer.getTeam() == team && team != null) {
++                scoreBoard.removePlayerFromTeam(entityplayer.getScoreboardName(), team);
++            }
++        }
++
++        worldserver.getCurrentWorldData().connections.remove(entityplayer.connection.connection);
++        worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
++        entityplayer.retireScheduler();
++        entityplayer.getAdvancements().stopListening();
++        this.players.remove(entityplayer);
++        this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT));
++        this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
++        UUID uuid = entityplayer.getUUID();
++        ServerPlayer entityplayer1 = this.playersByUUID.get(uuid);
++
++        if (entityplayer1 == entityplayer) {
++            this.playersByUUID.remove(uuid);
++        }
++
++        this.cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
++    }
++    // Leaves stop - replay mod api
++
+     public net.kyori.adventure.text.@Nullable Component remove(ServerPlayer player) { // CraftBukkit - return string // Paper - return Component
+         // Paper start - Fix kick event leave message not being sent
+         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())));
+@@ -595,6 +753,7 @@ public abstract class PlayerList {
+         player.getBukkitEntity().packetProcessor.close(); // Folia - region threading
+         player.getAdvancements().stopListening();
+         this.players.remove(player);
++        this.realPlayers.remove(player); // Leaves - replay api
+         this.playersByName.remove(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
+         this.server.getCustomBossEvents().onPlayerDisconnect(player);
+         UUID uuid = player.getUUID();
+@@ -910,15 +1069,15 @@ public abstract class PlayerList {
+     }
+ 
+     public String[] getPlayerNamesArray() {
+-        List<ServerPlayer> players = new java.util.ArrayList<>(this.players); // Folia - region threading
+-        String[] strings = new String[this.players.size() + this.server.getBotList().bots.size()]; // Leaves - fakeplayer support
++        List<ServerPlayer> players = new java.util.ArrayList<>(this.realPlayers); // Folia - region threading
++        String[] strings = new String[players.size() + this.server.getBotList().bots.size()]; // Leaves - fakeplayer support, and skip photographer
+ 
+         for (int i = 0; i < players.size(); i++) { // Folia - region threading
+             strings[i] = players.get(i).getGameProfile().name(); // Folia - region threading
+         }
+         // Leaves start - fakeplayer support
+-        for (int i = this.players.size(); i < strings.length; ++i) {
+-            strings[i] = this.server.getBotList().bots.get(i - this.players.size()).getGameProfile().name();
++        for (int i = players.size(); i < strings.length; ++i) { // Leaves - only real players
++            strings[i] = this.server.getBotList().bots.get(i - players.size()).getGameProfile().name(); // Leaves - only real players
+         }
+         // Leaves end - fakeplayer support
+ 
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index c89a2de1e1959c1275d39003c1b6b49f165df60f..99915b37331da819fd72c34b25773ab3e63f1775 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -262,7 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+     public int useItemRemaining;
+     protected int fallFlyTicks;
+     private long lastKineticHitFeedbackTime = -2147483648L;
+-    private BlockPos lastPos;
++    protected BlockPos lastPos;
+     private Optional<BlockPos> lastClimbablePos = Optional.empty();
+     private @Nullable DamageSource lastDamageSource;
+     private long lastDamageStamp = Long.MIN_VALUE; // Folia - region threading

lophine-server/minecraft-patches/features/0032-Leaves-Catch-update-suppression-crash.patch

@@ -0,0 +1,230 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sat, 15 Nov 2025 01:06:20 +0800
+Subject: [PATCH] Leaves: Catch update suppression crash
+
+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/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java
+index e07e5eced7e32d1c3a0ac14e8639c1f19b0f641a..fe7483581e5c3f5cb523601b394750a94a178e10 100644
+--- a/net/minecraft/network/PacketProcessor.java
++++ b/net/minecraft/network/PacketProcessor.java
+@@ -107,7 +107,20 @@ public class PacketProcessor implements AutoCloseable {
+                     final int packetTimerId = profiler.getOrCreateTimerAndStart(() -> "Packet Handler: ".concat(io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(ListenerAndPacket.this.packet.getClass().getName()))); try { // Folia - profiler
+                     this.packet.handle(this.listener);
+                     } finally { profiler.stopTimer(packetTimerId); } // Folia - profiler
+-                } catch (Exception var3) {
++                    // Leaves start - update suppression crash fix
++                    } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                        if (this.listener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl gamePacketListener) {
++                            exception.providePlayer(gamePacketListener.player);
++                        }
++                        exception.consume();
++                    } catch (Exception var3) {
++                        if (var3.getCause() instanceof org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                            if (this.listener instanceof net.minecraft.server.network.ServerGamePacketListenerImpl gamePacketListener) {
++                                exception.providePlayer(gamePacketListener.player);
++                            }
++                            exception.consume();
++                        }
++                    // Leaves end - update suppression crash fix
+                     if (var3 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
+                         throw PacketUtils.makeReportedException(var3, this.packet, this.listener);
+                     }
+diff --git a/net/minecraft/network/protocol/PacketUtils.java b/net/minecraft/network/protocol/PacketUtils.java
+index ab80a66646a7ebe2862221ac342b06c14fcfc734..7834f3da4d0ff4a5cdec46b023d7348369a12e96 100644
+--- a/net/minecraft/network/protocol/PacketUtils.java
++++ b/net/minecraft/network/protocol/PacketUtils.java
+@@ -34,6 +34,7 @@ public class PacketUtils {
+     }
+ 
+     public static <T extends PacketListener> ReportedException makeReportedException(Exception exception, Packet<T> packet, T packetListener) {
++
+         if (exception instanceof ReportedException reportedException) {
+             fillCrashReport(reportedException.getReport(), packetListener, packet);
+             return reportedException;
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index c8f2f98ebc145063505b73ef7c723f2878d34ea3..56160853050cd131718d16e21a0bb6c9780e2658 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -1974,8 +1974,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             try {
+                 profiler.startTimer(serverLevel.tickTimerId); try { // Folia - profiler
+                 serverLevel.tick(hasTimeLeft, region); // Folia - region threading
++                    // Leaves start - update suppression crash fix
++                } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                    exception.provideLevel(serverLevel);
++                    exception.consume();
+                 } finally { profiler.stopTimer(serverLevel.tickTimerId); } // Folia - profiler
+             } catch (Throwable var7) {
++                if (var7.getCause() instanceof org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                    exception.provideLevel(serverLevel);
++                    exception.consume();
++                }
++                // Leaves end - update suppression crash fix
+                 CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
+                 serverLevel.fillReportDetails(crashReport);
+                 throw new ReportedException(crashReport);
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index b3c593474e889d254f59813e7f42299b7b77d9ce..b878f5a8316dfee582180a6bbe7122a78581fae2 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -878,7 +878,20 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+                                     // Kaiiju end
+ 
+                                     profilerFiller.push("tick");
+-                                    this.guardEntityTick(this::tickNonPassenger, entity);
++                                    // Lophine start - update suppression crash fix
++                                    if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
++                                        try {
++                                            this.tickNonPassenger(entity); // Lophine changed
++                                            // Leaves start - update suppression crash fix - for dragon dupe
++                                        } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                                            exception.provideLevel(this);
++                                            exception.consume();
++                                            // Leaves end - update suppression crash fix - for dragon dupe
++                                        }
++                                    } else {
++                                        this.guardEntityTick(this::tickNonPassenger, entity);
++                                    }
++                                    // Lophine end - update suppression crash fix
+                                     profilerFiller.pop();
+                                 }
+                             }
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 8ea3c580b506e214664135a2c10722b56ab8e439..2ead230fde7a8d75ebb0036f9087aeee3c204db4 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1110,6 +1110,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+                 ((org.bukkit.craftbukkit.CraftWorldBorder) this.getBukkitEntity().getWorldBorder()).getHandle().tick();
+             }
+             // CraftBukkit end
++        // Leaves start - update suppression crash fix
++        } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++            exception.providePlayer(this);
++            exception.provideLevel(this.level());
++            exception.consume();
++        // Leaves start - update suppression crash fix
+         } catch (Throwable var4) {
+             CrashReport crashReport = CrashReport.forThrowable(var4, "Ticking player");
+             CrashReportCategory crashReportCategory = crashReport.addCategory("Player being ticked");
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 6a20033fbe8c6a9a4eaf3f819fffae04fee6aaeb..f6142276f15f6748027d8007e31f68f87270eb35 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -1434,9 +1434,19 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+                     this.walkingStepSound(pos, state);
+                 }
+ 
++                // Leaves start - update suppression crash fix
+                 if (broadcastGameEvent) {
+-                    this.level().gameEvent(GameEvent.STEP, this.position(), GameEvent.Context.of(this, state));
++                    try {
++                        this.level().gameEvent(net.minecraft.world.level.gameevent.GameEvent.STEP, this.position(), net.minecraft.world.level.gameevent.GameEvent.Context.of(this, state));
++                    } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
++                        exception.provideBlock(level, pos, state.getBlock());
++                        if (this instanceof net.minecraft.server.level.ServerPlayer player) {
++                            exception.providePlayer(player);
++                        }
++                        exception.consume();
++                    }
+                 }
++                // Leaves end - update suppression crash fix
+ 
+                 return true;
+             } else {
+diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+index cb0471b06c33d1f79ba5b7a9b6036ba6b089d2be..46d6c6e3befc70a6878e12a4d75575e6d48d10ca 100644
+--- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
++++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+@@ -181,7 +181,17 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
+ 
+     @Override
+     protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, Direction direction) {
+-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
++        // Leaves start - update suppression crash fix
++        try {
++            return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
++        } catch (ClassCastException ex) {
++            if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
++                throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, null, this, null, ex);
++            } else {
++                throw ex;
++            }
++        }
++        // Leaves end - update suppression crash fix
+     }
+ 
+     public static Block getBlockByColor(@Nullable DyeColor color) {
+diff --git a/net/minecraft/world/level/block/state/StateHolder.java b/net/minecraft/world/level/block/state/StateHolder.java
+index c020d1944a25e2cd247e30a97c35bf93731d694a..74967f20099ea58cea1f9fc0f2387d8c45b54748 100644
+--- a/net/minecraft/world/level/block/state/StateHolder.java
++++ b/net/minecraft/world/level/block/state/StateHolder.java
+@@ -104,7 +104,16 @@ public abstract class StateHolder<O, S> implements ca.spottedleaf.moonrise.patch
+         if (ret != null) {
+             return ret;
+         }
+-        throw new IllegalArgumentException("Cannot get property " + property + " as it does not exist in " + this.owner);
++        // Leaves start - update suppression crash fix
++        IllegalArgumentException iae = new IllegalArgumentException("Cannot get property " + property + " as it does not exist in " + this.owner);
++        if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
++            org.leavesmc.leaves.util.UpdateSuppressionException exception = new org.leavesmc.leaves.util.UpdateSuppressionException(null, null, null, null, iae);
++            if (exception.getStackTrace()[1].getClassName().startsWith("net.minecraft")) {
++                throw exception;
++            }
++        }
++        throw iae;
++        // Leaves end - update suppression crash fix
+         // Paper end - optimise blockstate property access
+     }
+ 
+diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
+index b2694cb60505766877398fa526b9bfe60e6b6404..7c354894f48a5540eb2554d8b1428306e8929066 100644
+--- a/net/minecraft/world/level/chunk/LevelChunk.java
++++ b/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -383,7 +383,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
+             if (blockState == state) {
+                 return null;
+             } else {
+-                Block block = state.getBlock();
++                Block block = state.getBlock(); try { // Leaves start - update suppression crash fix
+                 this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING).update(i, y, i2, state);
+                 this.heightmaps.get(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES).update(i, y, i2, state);
+                 this.heightmaps.get(Heightmap.Types.OCEAN_FLOOR).update(i, y, i2, state);
+@@ -457,6 +457,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
+                     this.markUnsaved();
+                     return blockState;
+                 }
++                } catch (org.leavesmc.leaves.util.UpdateSuppressionException e) { e.provideBlock(level, pos, block); throw e; } // Leaves - update suppression crash fix
+             }
+         }
+     }
+diff --git a/net/minecraft/world/level/redstone/NeighborUpdater.java b/net/minecraft/world/level/redstone/NeighborUpdater.java
+index af21821513f11011e7bf3841d2f79cb99e4cd517..32488203ff074b675f5c8831d157b1d91bae48a9 100644
+--- a/net/minecraft/world/level/redstone/NeighborUpdater.java
++++ b/net/minecraft/world/level/redstone/NeighborUpdater.java
+@@ -63,9 +63,22 @@ public interface NeighborUpdater {
+             } finally { if (levelChunk != null) levelChunk.getChunkHot().stopTickingAndCount(); } // KioCG
+             // Spigot start
+         } catch (StackOverflowError ex) {
++            // Leaves start - update suppression crash fix
++            if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
++                throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, level, neighborBlock, null, ex);
++            }
+             level.lastPhysicsProblem = pos.immutable();
+             // Spigot end
+         } catch (Throwable var9) {
++            if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
++                if (var9 instanceof org.leavesmc.leaves.util.UpdateSuppressionException ue) {
++                    ue.provideBlock(level, pos, neighborBlock);
++                    throw ue;
++                } else {
++                    throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, level, neighborBlock, null, var9);
++                }
++            }
++            // Leaves end - update suppression crash fix
+             CrashReport crashReport = CrashReport.forThrowable(var9, "Exception while updating neighbours");
+             CrashReportCategory crashReportCategory = crashReport.addCategory("Block being updated");
+             crashReportCategory.setDetail(

lophine-server/minecraft-patches/features/0033-Leaves-CCE-update-suppression.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sat, 15 Nov 2025 01:12:39 +0800
+Subject: [PATCH] Leaves: CCE update suppression
+
+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/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+index 46d6c6e3befc70a6878e12a4d75575e6d48d10ca..77840814806c7d07b58cd716cf7ec095e894498a 100644
+--- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
++++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+@@ -183,7 +183,9 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
+     protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, Direction direction) {
+         // Leaves start - update suppression crash fix
+         try {
+-            return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
++            return fun.bm.lophine.config.modules.experiment.RedStoneConfig.cce ?
++                    AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) level.getBlockEntity(pos)) : // Leaves - make cce happy(?)
++                    AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
+         } catch (ClassCastException ex) {
+             if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
+                 throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, null, this, null, ex);

lophine-server/minecraft-patches/features/0034-Leaves-Redstone-ignore-upwards-update.patch

@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 14 Jun 2023 12:07:07 +0800
+Subject: [PATCH] Leaves: Redstone ignore upwards update
+
+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/net/minecraft/world/level/block/ComparatorBlock.java b/net/minecraft/world/level/block/ComparatorBlock.java
+index 578e7c8dc601f53cf2a068685c6901bfaf47e763..0686aa5425c00e10beb381f3c3ff3c554603cd49 100644
+--- a/net/minecraft/world/level/block/ComparatorBlock.java
++++ b/net/minecraft/world/level/block/ComparatorBlock.java
+@@ -58,6 +58,7 @@ public class ComparatorBlock extends DiodeBlock implements EntityBlock {
+         BlockState neighborState,
+         RandomSource random
+     ) {
++        if (fun.bm.lophine.config.modules.experiment.RedStoneConfig.redstoneIgnoreUpwardsUpdate && direction == Direction.DOWN) return state; // Leaves - behavior to 1.20.1
+         return direction == Direction.DOWN && !this.canSurviveOn(level, neighborPos, neighborState)
+             ? Blocks.AIR.defaultBlockState()
+             : super.updateShape(state, level, scheduledTickAccess, pos, direction, neighborPos, neighborState, random);
+diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
+index ba253a9af6141d8ea99c064e3cc0c6486c221098..48f9e234e4025633cbc41d334d88ada36c2e0d7b 100644
+--- a/net/minecraft/world/level/block/RedStoneWireBlock.java
++++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
+@@ -178,7 +178,7 @@ public class RedStoneWireBlock extends Block {
+         RandomSource random
+     ) {
+         if (direction == Direction.DOWN) {
+-            return !this.canSurviveOn(level, neighborPos, neighborState) ? Blocks.AIR.defaultBlockState() : state;
++            return fun.bm.lophine.config.modules.experiment.RedStoneConfig.redstoneIgnoreUpwardsUpdate ? state : !this.canSurviveOn(level, neighborPos, neighborState) ? Blocks.AIR.defaultBlockState() : state; // Leaves - behavior to 1.19
+         } else if (direction == Direction.UP) {
+             return this.getConnectionState(level, state, pos);
+         } else {
+@@ -238,7 +238,7 @@ public class RedStoneWireBlock extends Block {
+         BlockPos blockPos = pos.relative(direction);
+         BlockState blockState = level.getBlockState(blockPos);
+         if (nonNormalCubeAbove) {
+-            boolean flag = blockState.getBlock() instanceof TrapDoorBlock || this.canSurviveOn(level, blockPos, blockState);
++            boolean flag = (!fun.bm.lophine.config.modules.experiment.RedStoneConfig.redstoneIgnoreUpwardsUpdate && blockState.getBlock() instanceof TrapDoorBlock) || this.canSurviveOn(level, blockPos, blockState); // Leaves - behavior to 1.19
+             if (flag && shouldConnectTo(level.getBlockState(blockPos.above()))) {
+                 if (blockState.isFaceSturdy(level, blockPos, direction.getOpposite())) {
+                     return RedstoneSide.UP;
+diff --git a/net/minecraft/world/level/block/RepeaterBlock.java b/net/minecraft/world/level/block/RepeaterBlock.java
+index 87e1a32376adc5a15f035b62bc1f672c507cd230..26c10c1fecb976f3ef0338aa78603d454d1b3fe8 100644
+--- a/net/minecraft/world/level/block/RepeaterBlock.java
++++ b/net/minecraft/world/level/block/RepeaterBlock.java
+@@ -68,6 +68,7 @@ public class RepeaterBlock extends DiodeBlock {
+         BlockState neighborState,
+         RandomSource random
+     ) {
++        if (fun.bm.lophine.config.modules.experiment.RedStoneConfig.redstoneIgnoreUpwardsUpdate && direction == Direction.DOWN) return state; // Leaves - behavior to 1.20.1
+         if (direction == Direction.DOWN && !this.canSurviveOn(level, neighborPos, neighborState)) {
+             return Blocks.AIR.defaultBlockState();
+         } else {

lophine-server/minecraft-patches/features/0035-Instant-Block-Updater.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 17 Nov 2025 18:41:08 +0800
+Subject: [PATCH] Instant Block Updater
+
+
+diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
+index 56e09b99c2901882483c5f2b3216bf0a11406e2e..1480bd04597001cd7c54e53ded46d7f75908a65a 100644
+--- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
++++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
+@@ -468,7 +468,7 @@ public final class RegionizedWorldData {
+     public long lastMidTickExecuteFailure;
+     // From Level
+     public boolean populating;
+-    public final CollectingNeighborUpdater neighborUpdater;
++    public final net.minecraft.world.level.redstone.NeighborUpdater neighborUpdater;
+     public boolean captureBlockStates = false;
+     public boolean captureTreeGeneration = false;
+     public final Map<BlockPos, CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
+@@ -527,7 +527,7 @@ public final class RegionizedWorldData {
+         this.world = world;
+         this.blockLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, true);
+         this.fluidLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, false);
+-        this.neighborUpdater = new CollectingNeighborUpdater(world, world.neighbourUpdateMax);
++        this.neighborUpdater = fun.bm.lophine.config.modules.experiment.RedStoneConfig.instantBlockUpdater ? new net.minecraft.world.level.redstone.InstantNeighborUpdater(world) : new CollectingNeighborUpdater(world, world.neighbourUpdateMax); // Lophine - Instant Block Updater
+         this.nearbyPlayers = new NearbyPlayers(world);
+         this.wireHandler = new alternate.current.wire.WireHandler(world);
+         this.turbo = new io.papermc.paper.redstone.RedstoneWireTurbo((RedStoneWireBlock)Blocks.REDSTONE_WIRE);
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index b878f5a8316dfee582180a6bbe7122a78581fae2..a906e7a34d048369f9357b0371339b4cccac5f25 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -911,12 +911,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         // Paper - rewrite chunk system
+         profilerFiller.pop();
+         profilerFiller.push("debugSynchronizers");
++        // Lophine start - instant neighbor updates
++        if (regionizedWorldData.neighborUpdater instanceof net.minecraft.world.level.redstone.CollectingNeighborUpdater neighborUpdater) {
+         if (this.debugSynchronizers.hasAnySubscriberFor(DebugSubscriptions.NEIGHBOR_UPDATES)) {
+-            regionizedWorldData.neighborUpdater // Folia - region threading
+-                .setDebugListener(blockPos -> this.debugSynchronizers.broadcastEventToTracking(blockPos, DebugSubscriptions.NEIGHBOR_UPDATES, blockPos));
++            neighborUpdater // Folia - region threading
++                    .setDebugListener(blockPos -> this.debugSynchronizers.broadcastEventToTracking(blockPos, DebugSubscriptions.NEIGHBOR_UPDATES, blockPos));
+         } else {
+-            regionizedWorldData.neighborUpdater.setDebugListener(null); // Folia - region threading
++            neighborUpdater.setDebugListener(null); // Folia - region threading
+         }
++        }
++        // Lophine end - instant neighbor updates
+ 
+         this.debugSynchronizers.tick(this.server.debugSubscribers());
+         profilerFiller.pop();

lophine-server/minecraft-patches/features/0036-Revert-TrapDoorBlock-changes-form-Paper.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 18 Nov 2025 00:24:32 +0800
+Subject: [PATCH] Revert TrapDoorBlock changes form Paper
+
+
+diff --git a/net/minecraft/world/level/block/TrapDoorBlock.java b/net/minecraft/world/level/block/TrapDoorBlock.java
+index b45ae50db32c4156b8f8008335673d20c570c72d..af78831441f362b0129aa864854ce5a64d544640 100644
+--- a/net/minecraft/world/level/block/TrapDoorBlock.java
++++ b/net/minecraft/world/level/block/TrapDoorBlock.java
+@@ -128,37 +128,7 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
+         if (!level.isClientSide()) {
+             boolean hasNeighborSignal = level.hasNeighborSignal(pos);
+             if (hasNeighborSignal != state.getValue(POWERED)) {
+-                // CraftBukkit start
+-                org.bukkit.block.Block bblock = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
+-                int power = bblock.getBlockPower();
+-                int oldPower = state.getValue(TrapDoorBlock.OPEN) ? 15 : 0;
+-
+-                if (oldPower == 0 ^ power == 0 || neighborBlock.defaultBlockState().isSignalSource()) {
+-                    org.bukkit.event.block.BlockRedstoneEvent eventRedstone = new org.bukkit.event.block.BlockRedstoneEvent(bblock, oldPower, power);
+-                    level.getCraftServer().getPluginManager().callEvent(eventRedstone);
+-                    hasNeighborSignal = eventRedstone.getNewCurrent() > 0;
+-                }
+-                // CraftBukkit end
+-                // Paper start - break redstone on trapdoors early
+-                boolean open = state.getValue(TrapDoorBlock.OPEN) != hasNeighborSignal;
+-                // note: this must run before any state for this block/its neighbours are written to the world
+-                // we allow the redstone event to fire so that plugins can block
+-                if (hasNeighborSignal && open) { // if we are now powered and it caused the trap door to open
+-                    // in this case, first check for the redstone on top first
+-                    BlockPos abovePos = pos.above();
+-                    BlockState above = level.getBlockState(abovePos);
+-                    if (above.getBlock() instanceof RedStoneWireBlock) {
+-                        level.setBlock(abovePos, Blocks.AIR.defaultBlockState(), Block.UPDATE_CLIENTS | Block.UPDATE_NEIGHBORS);
+-                        Block.popResource(level, abovePos, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.REDSTONE));
+-                        // now check that this didn't change our state
+-                        if (level.getBlockState(pos) != state) {
+-                            // our state was changed, so we cannot propagate this update
+-                            return;
+-                        }
+-                    }
+-                }
+-                if (open) {
+-                    // Paper end - break redstone on trapdoors early
++                if (state.getValue(OPEN) != hasNeighborSignal) {
+                     state = state.setValue(OPEN, hasNeighborSignal);
+                     this.playSound(null, level, pos, hasNeighborSignal);
+                 }

lophine-server/minecraft-patches/features/0037-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 18 Nov 2025 00:35:13 +0800
+Subject: [PATCH] Leaves: Prevent loss of item drops due to update suppression
+ when breaking blocks
+
+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/0090-Servux-Protocol.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
+index 8d28b29348c255c901375af161210a2041de1985..86f7cfd5816917bd03aca0a796f1eaca938d65aa 100644
+--- a/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -386,7 +386,18 @@ public class ServerPlayerGameMode {
+                 this.level.getCurrentWorldData().captureDrops = new java.util.ArrayList<>(); // Folia - region threading
+                 // CraftBukkit end
+                 BlockState blockState1 = block.playerWillDestroy(this.level, pos, blockState, this.player);
+-                boolean flag = this.level.removeBlock(pos, false);
++                // Leaves start - Prevent loss of item drops due to update suppression when breaking blocks
++                boolean flag;
++                org.leavesmc.leaves.util.UpdateSuppressionException ex = null;
++                try {
++                    flag = this.level.removeBlock(pos, false);
++                } catch (org.leavesmc.leaves.util.UpdateSuppressionException e) {
++                    ex = e;
++                    ex.provideBlock(level, pos, block);
++                    ex.providePlayer(this.player);
++                    flag = false;
++                }
++                // Leaves end - Prevent loss of item drops due to update suppression when breaking blocks
+                 if (SharedConstants.DEBUG_BLOCK_BREAK) {
+                     LOGGER.info("server broke {} {} -> {}", pos, blockState1, this.level.getBlockState(pos));
+                 }
+@@ -418,6 +429,7 @@ public class ServerPlayerGameMode {
+                 if (event.isDropItems()) {
+                     org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - capture all item additions to the world
+                 }
++                if (ex != null) throw ex; // Leaves - Prevent loss of item drops due to update suppression when breaking blocks
+ 
+                 // Drop event experience
+                 if (flag) {