Compare commits
313 Commits
dev/1.21.3
...
ver/1.21.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0dacad28d | ||
|
|
c82af261e8 | ||
|
|
a328d9d818 | ||
|
|
28d29498df | ||
|
|
d8a01345c6 | ||
|
|
a4124d5cda | ||
|
|
3eedf86153 | ||
|
|
68e8267c24 | ||
|
|
cd8a4e11dc | ||
|
|
c69087ba64 | ||
|
|
784ce10986 | ||
|
|
25b9e3f213 | ||
|
|
4855a4f76f | ||
|
|
818e1132df | ||
|
|
4cb423d24a | ||
|
|
6eebbe4221 | ||
|
|
85f3e2875f | ||
|
|
07f2fcd405 | ||
|
|
9e3360efa0 | ||
|
|
8c0a143ce1 | ||
|
|
785d82c433 | ||
|
|
0a2838607c | ||
|
|
180b64aca2 | ||
|
|
04233ea992 | ||
|
|
d2fc625ce9 | ||
|
|
70efb6748b | ||
|
|
4ea7b2833b | ||
|
|
7bc857b294 | ||
|
|
e963af5628 | ||
|
|
b74abd342b | ||
|
|
63507137a0 | ||
|
|
7b7fe5c62a | ||
|
|
0a00e23143 | ||
|
|
c935e6bdc8 | ||
|
|
31d22035f3 | ||
|
|
064d0b5595 | ||
|
|
aa863608b1 | ||
|
|
f16bbf1c97 | ||
|
|
c8daaf7d24 | ||
|
|
b620644bcb | ||
|
|
c9772c3e88 | ||
|
|
97479a28d9 | ||
|
|
bcd43da904 | ||
|
|
639bf05eb2 | ||
|
|
f4378b54c6 | ||
|
|
2492015b6e | ||
|
|
1a5c505f35 | ||
|
|
f580d94d89 | ||
|
|
b05604da52 | ||
|
|
e2551fa176 | ||
|
|
71ebc63ee2 | ||
|
|
4240ffc3b9 | ||
|
|
8881532a0e | ||
|
|
073c987260 | ||
|
|
7f9a24f6f7 | ||
|
|
318423c783 | ||
|
|
3d882e8793 | ||
|
|
b57a78a708 | ||
|
|
8a31579023 | ||
|
|
ad85413c9e | ||
|
|
2098159155 | ||
|
|
769d0330f6 | ||
|
|
daedaa2315 | ||
|
|
9a6720e5f1 | ||
|
|
1d88056195 | ||
|
|
3a7d1bd81d | ||
|
|
e84a8a5c18 | ||
|
|
92928ee93d | ||
|
|
61c3cc8c74 | ||
|
|
8e697a3dd6 | ||
|
|
c46c70db18 | ||
|
|
4692867da8 | ||
|
|
aacb2cd631 | ||
|
|
897ee50d29 | ||
|
|
72f49cfafe | ||
|
|
5b6d1ee061 | ||
|
|
1eba4e1a05 | ||
|
|
741b00c9be | ||
|
|
3e73f9f9cb | ||
|
|
b1e3a300a2 | ||
|
|
c12bf7b06c | ||
|
|
8673e02ca3 | ||
|
|
dc973293d6 | ||
|
|
e2b129df71 | ||
|
|
533a41b5c9 | ||
|
|
511b4fafd4 | ||
|
|
d5dfcfa253 | ||
|
|
df72ac7a55 | ||
|
|
21440dbbce | ||
|
|
a99b5fd8c6 | ||
|
|
649473678e | ||
|
|
e79afe47dd | ||
|
|
05795e53d7 | ||
|
|
730bc2ea62 | ||
|
|
8d4d923310 | ||
|
|
9b42664025 | ||
|
|
3d5fe06a3c | ||
|
|
982e82de9e | ||
|
|
53e4333bfc | ||
|
|
e042d98762 | ||
|
|
521c2b9cbd | ||
|
|
978e8a10ca | ||
|
|
7b2885fd8d | ||
|
|
3e0571fc52 | ||
|
|
9713a09905 | ||
|
|
9d2d3aff72 | ||
|
|
80e438bf96 | ||
|
|
45ce5b56bd | ||
|
|
cf129162ef | ||
|
|
a3b9c347f7 | ||
|
|
f9d700eca4 | ||
|
|
760da7d7be | ||
|
|
af796c4b03 | ||
|
|
1c27c1ce38 | ||
|
|
7f297a4d20 | ||
|
|
923233be6f | ||
|
|
5d90f68192 | ||
|
|
f835ecf227 | ||
|
|
9cb931e691 | ||
|
|
e7b3a713b1 | ||
|
|
ae32e89dbb | ||
|
|
5af12cd66f | ||
|
|
8611086dfc | ||
|
|
da39a79d17 | ||
|
|
acd1ce5ded | ||
|
|
efb26e7554 | ||
|
|
519f46ab01 | ||
|
|
1f86bd0656 | ||
|
|
97c2703fb4 | ||
|
|
bbb0933042 | ||
|
|
177bb8eed2 | ||
|
|
cce7e23ae1 | ||
|
|
ac008463d3 | ||
|
|
0b48acc022 | ||
|
|
fa59901792 | ||
|
|
ec7f6d1e23 | ||
|
|
db56fca556 | ||
|
|
0a1e7a509f | ||
|
|
6e7d7f9aad | ||
|
|
ef810b9f95 | ||
|
|
7c1818ed78 | ||
|
|
692d40a89c | ||
|
|
c0d4f434ce | ||
|
|
c4d87f3d90 | ||
|
|
54fbeb2e5e | ||
|
|
a81e970785 | ||
|
|
1a8c988db1 | ||
|
|
6673fb02fd | ||
|
|
7bfb5ac414 | ||
|
|
b4acb43e85 | ||
|
|
65516ac3c3 | ||
|
|
12b5752c2d | ||
|
|
cbf59b889c | ||
|
|
58e9f3fd5f | ||
|
|
d0d4292649 | ||
|
|
3d6cc305cd | ||
|
|
e5005425f7 | ||
|
|
35cd2efa8e | ||
|
|
93e956372b | ||
|
|
0bf38e65cf | ||
|
|
e5b2276a8d | ||
|
|
589c263bac | ||
|
|
5d3d2271bc | ||
|
|
3361b9db14 | ||
|
|
f6ca4cc24a | ||
|
|
85ffaa1156 | ||
|
|
6c48c27b7d | ||
|
|
41770b069e | ||
|
|
d4c1790f94 | ||
|
|
4346983b7d | ||
|
|
720e02e944 | ||
|
|
f035a3bd8e | ||
|
|
365a5252a9 | ||
|
|
5746a0e01c | ||
|
|
8bce97d0bb | ||
|
|
8817720b5a | ||
|
|
525b5ccfba | ||
|
|
821c69804d | ||
|
|
cc840886f3 | ||
|
|
70257fa22b | ||
|
|
40242ad8de | ||
|
|
08cf5d6179 | ||
|
|
88eb84f82d | ||
|
|
19745cf033 | ||
|
|
9ba08a6ce6 | ||
|
|
2274af4415 | ||
|
|
1fe23949f0 | ||
|
|
92fb91fb08 | ||
|
|
50a6e68dcc | ||
|
|
4f924a1594 | ||
|
|
711c8534fe | ||
|
|
2260aed532 | ||
|
|
956bc88e58 | ||
|
|
0e93cb6f59 | ||
|
|
1cecb38fee | ||
|
|
78636dc0bd | ||
|
|
cdb8ff1aba | ||
|
|
f8f537423c | ||
|
|
23fc8891ed | ||
|
|
c4c8fd3d62 | ||
|
|
a92a95b296 | ||
|
|
1c3358728a | ||
|
|
c2249e4002 | ||
|
|
23692ba677 | ||
|
|
0e7081c2e5 | ||
|
|
0ac067ae20 | ||
|
|
ebe4b76463 | ||
|
|
01d686b420 | ||
|
|
0cb0a2c8ea | ||
|
|
68cd1a1f2c | ||
|
|
74faeab654 | ||
|
|
4517c9548c | ||
|
|
c7894407ab | ||
|
|
d2926dfe83 | ||
|
|
582149a21f | ||
|
|
4ef9f261f4 | ||
|
|
73e0a0c135 | ||
|
|
c40a7be6cd | ||
|
|
818dfeede1 | ||
|
|
a3b9a862ee | ||
|
|
7a4290580f | ||
|
|
22a263b18c | ||
|
|
cfdf1607df | ||
|
|
16ba8f40f3 | ||
|
|
56b428ddc4 | ||
|
|
9425fd9ec0 | ||
|
|
7604000bec | ||
|
|
81977c7f19 | ||
|
|
37ead10d7b | ||
|
|
cd9dbb24bb | ||
|
|
efd55893c7 | ||
|
|
0ef5ac515b | ||
|
|
6019c70728 | ||
|
|
9553bc97d8 | ||
|
|
9f134a9a1f | ||
|
|
6e29fe7b7d | ||
|
|
9a52936bd1 | ||
|
|
bbcc33f505 | ||
|
|
fb02ab7ae5 | ||
|
|
41c275bce6 | ||
|
|
eb91e07a0e | ||
|
|
11eecfee58 | ||
|
|
1fb706e081 | ||
|
|
762ea4fe63 | ||
|
|
92f33ed7da | ||
|
|
d18e27d447 | ||
|
|
4cff0f834d | ||
|
|
45d40874ec | ||
|
|
8b17257f15 | ||
|
|
7cde9ec70b | ||
|
|
74121bcb29 | ||
|
|
8a8d0fcf7a | ||
|
|
67c4e452d0 | ||
|
|
2ad92983c0 | ||
|
|
90fd4ca205 | ||
|
|
01467c7fcb | ||
|
|
67949a070c | ||
|
|
e4ba4e0497 | ||
|
|
4b43bded79 | ||
|
|
a11e94e56e | ||
|
|
f3e8f024a7 | ||
|
|
85f21d1be1 | ||
|
|
c0f20000cf | ||
|
|
b33e2fc51d | ||
|
|
b2c753bcfd | ||
|
|
677544289b | ||
|
|
87d2047f24 | ||
|
|
217047f7b5 | ||
|
|
2dcdca21b2 | ||
|
|
7afc1b403c | ||
|
|
e6e33b3947 | ||
|
|
bebfe1eda7 | ||
|
|
b9ca4c0c7a | ||
|
|
12cfb7a0ef | ||
|
|
e618370375 | ||
|
|
74aeb4fe5d | ||
|
|
102979a7d8 | ||
|
|
c5f561233f | ||
|
|
0d6b9a051f | ||
|
|
36b617c5be | ||
|
|
487fcdfc10 | ||
|
|
c99f65d958 | ||
|
|
1984558e49 | ||
|
|
ab5b160232 | ||
|
|
16df7dce12 | ||
|
|
8a01b9ad39 | ||
|
|
27a2e2a129 | ||
|
|
3b9b3813b4 | ||
|
|
9b4a6d60ac | ||
|
|
6055cc7367 | ||
|
|
9edeb2a539 | ||
|
|
207f96891a | ||
|
|
9baaa0a236 | ||
|
|
99c167504b | ||
|
|
2b5bedf14b | ||
|
|
38e4a96ab7 | ||
|
|
c7134597cb | ||
|
|
b1c6c29458 | ||
|
|
eeae6bc62c | ||
|
|
852529973b | ||
|
|
43af4d5432 | ||
|
|
b428505e23 | ||
|
|
e4b448c6df | ||
|
|
db4f0f7e1b | ||
|
|
bb144df37b | ||
|
|
21d1ee350a | ||
|
|
4a76009af8 | ||
|
|
1445e4683d | ||
|
|
fa959bf213 | ||
|
|
4a40f56920 | ||
|
|
9360a5adbd | ||
|
|
ea34494c03 | ||
|
|
1526790e77 |
11
.gitattributes
vendored
Normal file
11
.gitattributes
vendored
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#
|
||||||
|
# https://help.github.com/articles/dealing-with-line-endings/
|
||||||
|
#
|
||||||
|
# Linux start script should use lf
|
||||||
|
/gradlew text eol=lf
|
||||||
|
|
||||||
|
# These are Windows script files and should use crlf
|
||||||
|
*.bat text eol=crlf
|
||||||
|
|
||||||
|
# Binary files should be left untouched
|
||||||
|
*.jar binary
|
||||||
2
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
2
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
@@ -15,7 +15,7 @@ body:
|
|||||||
如果此bug被尝试修复,您可以帮助我们测试并回复。若bug的确被修复,您可以关闭issue来让开发者确认。
|
如果此bug被尝试修复,您可以帮助我们测试并回复。若bug的确被修复,您可以关闭issue来让开发者确认。
|
||||||
If this bug is tried to fix, you can help us test and reply. If the bug is fixed, you can close the issue to let the developer confirm.
|
If this bug is tried to fix, you can help us test and reply. If the bug is fixed, you can close the issue to let the developer confirm.
|
||||||
- type: input
|
- type: input
|
||||||
id: leavesMC-version
|
id: luminolMC-version
|
||||||
attributes:
|
attributes:
|
||||||
label: 服务端版本 LuminolMC Version
|
label: 服务端版本 LuminolMC Version
|
||||||
description:
|
description:
|
||||||
|
|||||||
12
.github/dependabot.yml
vendored
Normal file
12
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# To get started with Dependabot version updates, you'll need to specify which
|
||||||
|
# package ecosystems to update and where the package manifests are located.
|
||||||
|
# Please see the documentation for all configuration options:
|
||||||
|
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
# Enable version updates for github actions
|
||||||
|
- package-ecosystem: "github-actions" # See documentation for possible values
|
||||||
|
directory: "/" # Location of package manifests
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
73
.github/workflows/build_1.21.3.yml
vendored
73
.github/workflows/build_1.21.3.yml
vendored
@@ -1,73 +0,0 @@
|
|||||||
name: Luminol CI - dev/1.21.3
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ "dev/1.21.3" ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ "de/1.21.3" ]
|
|
||||||
|
|
||||||
permissions: write-all
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
environment: default
|
|
||||||
steps:
|
|
||||||
- name: Checkout Git Repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Validate Gradle wrapper
|
|
||||||
uses: gradle/actions/wrapper-validation@v3
|
|
||||||
- name: Setup Gradle
|
|
||||||
uses: gradle/actions/setup-gradle@v3
|
|
||||||
with:
|
|
||||||
gradle-version: 8.7
|
|
||||||
- name: Set up JDK
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: 'zulu'
|
|
||||||
java-version: '21'
|
|
||||||
- name: Configure Git User Details
|
|
||||||
run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
|
|
||||||
- name: Apply Patches
|
|
||||||
run: gradle applyPatches
|
|
||||||
- name: CreateJar
|
|
||||||
run: gradle createMojmapBundlerJar createMojmapPaperclipJar
|
|
||||||
- name: Publish to repo
|
|
||||||
continue-on-error: true
|
|
||||||
run: |
|
|
||||||
export MAVEN_REPO_USER=${{ secrets.MAVEN_REPO_USER }}
|
|
||||||
export MAVEN_REPO_PASSWORD=${{ secrets.MAVEN_REPO_PASSWORD }}
|
|
||||||
./gradlew publish -PpublishDevBundle=true
|
|
||||||
- name: SetENV
|
|
||||||
run: sh scripts/SetENV.sh
|
|
||||||
- name: Upload Artifact
|
|
||||||
uses: "actions/upload-artifact@v4"
|
|
||||||
with:
|
|
||||||
name: "${{ env.project_id_b }} CI Artifacts"
|
|
||||||
path: "build/libs/*.jar"
|
|
||||||
- name: Create Release
|
|
||||||
if: "!contains(github.event.commits[0].message, '[release skip]')"
|
|
||||||
uses: ncipollo/release-action@v1.14.0
|
|
||||||
with:
|
|
||||||
tag: ${{ env.tag }}
|
|
||||||
name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
|
|
||||||
body: |
|
|
||||||
📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }})
|
|
||||||
This release is automatically compiled by GitHub Actions
|
|
||||||
### Commit Message
|
|
||||||
${{ env.commit_msg }}
|
|
||||||
artifacts: |
|
|
||||||
${{ env.jar_dir }}
|
|
||||||
${{ env.jar_dir_bundler }}
|
|
||||||
generateReleaseNotes: true
|
|
||||||
prerelease: ${{ env.pre }}
|
|
||||||
makeLatest: ${{ env.make_latest }}
|
|
||||||
token: "${{ secrets.GITHUB_TOKEN }}"
|
|
||||||
- name: Push to API
|
|
||||||
if: "!contains(github.event.commits[0].message, '[release skip]')"
|
|
||||||
continue-on-error: true
|
|
||||||
env:
|
|
||||||
secret_v2: ${{ secrets.API_KEY }}
|
|
||||||
tag: ${{ env.tag }}
|
|
||||||
project_id: ${{ env.project_id }}
|
|
||||||
run: sh scripts/PushToAPI.sh
|
|
||||||
70
.github/workflows/build_1.21.6.yml
vendored
Normal file
70
.github/workflows/build_1.21.6.yml
vendored
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
name: Luminol CI - ver/1.21.6
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "ver/1.21.6" ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ "ver/1.21.6" ]
|
||||||
|
|
||||||
|
permissions: write-all
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
environment: default
|
||||||
|
steps:
|
||||||
|
- name: Checkout Git Repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up JDK
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
distribution: zulu
|
||||||
|
java-version: 22
|
||||||
|
|
||||||
|
- name: Setup Gradle
|
||||||
|
uses: gradle/actions/setup-gradle@v4
|
||||||
|
|
||||||
|
- name: Configure Git User Details
|
||||||
|
run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
|
||||||
|
|
||||||
|
- name: Apply All Patches
|
||||||
|
run: ./gradlew applyAllPatches
|
||||||
|
|
||||||
|
- name: CreateMojmapPaperclipJar
|
||||||
|
run: ./gradlew createMojmapPaperclipJar
|
||||||
|
|
||||||
|
- name: Publish to repo
|
||||||
|
if: github.event_name != 'pull_request' && false # do not push in preview
|
||||||
|
continue-on-error: true
|
||||||
|
run: ./gradlew generateDevelopmentBundle publish -PpublishDevBundle=true
|
||||||
|
env:
|
||||||
|
PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }}
|
||||||
|
PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}
|
||||||
|
|
||||||
|
- name: Upload Artifact
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ${{ env.project_id_b }} CI Artifacts
|
||||||
|
path: luminol-server/build/libs/*-paperclip-*-mojmap.jar
|
||||||
|
|
||||||
|
- name: SetENV
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
run: sh scripts/SetENV.sh
|
||||||
|
|
||||||
|
- name: Create Release
|
||||||
|
if: github.event_name != 'pull_request' && false # do not push in preview
|
||||||
|
uses: ncipollo/release-action@v1
|
||||||
|
with:
|
||||||
|
tag: ${{ env.tag }}
|
||||||
|
name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
|
||||||
|
body: |
|
||||||
|
📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
|
||||||
|
This release is automatically compiled by GitHub Actions
|
||||||
|
### Commit Message
|
||||||
|
${{ env.commit_msg }}
|
||||||
|
artifacts: ${{ env.jar_dir }}
|
||||||
|
generateReleaseNotes: true
|
||||||
|
prerelease: ${{ env.pre }}
|
||||||
|
makeLatest: ${{ env.make_latest }}
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
72
.gitignore
vendored
72
.gitignore
vendored
@@ -1,59 +1,17 @@
|
|||||||
# JVM crash related
|
# Ignore Gradle project-specific cache directory
|
||||||
core.*
|
.gradle
|
||||||
hs_err_pid*
|
|
||||||
|
# Ignore Gradle build output directory
|
||||||
|
build
|
||||||
|
|
||||||
|
/run
|
||||||
|
|
||||||
|
/luminol-server/build.gradle.kts
|
||||||
|
/luminol-api/build.gradle.kts
|
||||||
|
/folia-server/build.gradle.kts
|
||||||
|
/folia-server/src/minecraft
|
||||||
|
/folia-api/build.gradle.kts
|
||||||
|
/paper-server
|
||||||
|
/paper-api
|
||||||
|
|
||||||
# Intellij
|
|
||||||
.idea/
|
.idea/
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
out/
|
|
||||||
|
|
||||||
# Eclipse
|
|
||||||
.classpath
|
|
||||||
.project
|
|
||||||
.settings/
|
|
||||||
|
|
||||||
# netbeans
|
|
||||||
nbproject/
|
|
||||||
nbactions.xml
|
|
||||||
|
|
||||||
# Gradle
|
|
||||||
!gradle-wrapper.jar
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
*/build/
|
|
||||||
|
|
||||||
# we use maven!
|
|
||||||
build.xml
|
|
||||||
|
|
||||||
# Maven
|
|
||||||
log/
|
|
||||||
target/
|
|
||||||
dependency-reduced-pom.xml
|
|
||||||
|
|
||||||
# various other potential build files
|
|
||||||
bin/
|
|
||||||
dist/
|
|
||||||
manifest.mf
|
|
||||||
|
|
||||||
# Mac
|
|
||||||
.DS_Store/
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# vim
|
|
||||||
.*.sw[a-p]
|
|
||||||
|
|
||||||
# Linux temp files
|
|
||||||
*~
|
|
||||||
|
|
||||||
# other stuff
|
|
||||||
run/
|
|
||||||
|
|
||||||
# Luminol
|
|
||||||
build-data/
|
|
||||||
Luminol-API
|
|
||||||
Luminol-Server
|
|
||||||
paper-api-generator
|
|
||||||
*.jar
|
|
||||||
/patches2/todo/
|
|
||||||
48
Jenkinsfile
vendored
Normal file
48
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Configure git') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
sh 'git config --global user.name "luminolmc"'
|
||||||
|
sh 'git config --global user.email "luminolmc@noreply.github.com"'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Apply patches') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
sh 'chmod +x gradlew'
|
||||||
|
sh './gradlew applyAllPatches'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build paperclip jar') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
sh './gradlew createMojmapPaperclipJar'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Upload artifacts') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
archiveArtifacts(
|
||||||
|
artifacts: "luminol-server/build/libs/*.jar",
|
||||||
|
allowEmptyArchive: false
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
cleanWs()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
21
LICENSE
21
LICENSE
@@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2024 LuminolMC
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
31
LICENSE.md
Normal file
31
LICENSE.md
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
Luminol inherits its licensing from the included upstream projects.
|
||||||
|
|
||||||
|
Luminol从上游继承了许可证。
|
||||||
|
|
||||||
|
As such, Luminol is licensed under the
|
||||||
|
[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Folia,
|
||||||
|
who in turn inherits it from the original Paper, Spigot, Bukkit and CraftBukkit projects.
|
||||||
|
|
||||||
|
因此,Luminol中应当遵守[GNU通用公共许可证-第3版](licenses/GPL.md) 的许可;
|
||||||
|
因为Luminol从上游Folia继承了它,而Folia又从其上游的Paper、Spigot、Bukkit和Craftbukkit项目中继承了它。
|
||||||
|
|
||||||
|
Any author who is _not_ listed below should be presumed to have released their work
|
||||||
|
under the original [GPL](licenses/GPL.md) license.
|
||||||
|
|
||||||
|
任何 _未在下面列出_ 的作者都应该被认为他们的修改基于[原始GPL许可证](licenses/GPL.md)。
|
||||||
|
|
||||||
|
In the interest of promoting a better Minecraft platform for everyone, contributors
|
||||||
|
may choose to release their code under the more permissive [MIT License](licenses/MIT.md).
|
||||||
|
|
||||||
|
为了向所有人推广一个更好的Minecraft平台,贡献者可以选择在更宽松的[MIT许可证](licenses/MIT.md)下发布他们的代码。
|
||||||
|
|
||||||
|
The authors listed below have chosen to release their code under that more permissive
|
||||||
|
[MIT License](licenses/MIT.md). Any contributor who wants their name added below
|
||||||
|
should submit a pull request to this project to add their name.
|
||||||
|
|
||||||
|
下面列出的作者选择在更宽松的[MIT许可证](licenses/MIT.md)下发布他们的代码。
|
||||||
|
任何希望使用[MIT许可证](licenses/MIT.md)发布的作者都应该向此项目提交一个拉取请求以在下方添加他们的名字。
|
||||||
|
|
||||||
|
```text
|
||||||
|
Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
```
|
||||||
23
README.md
23
README.md
@@ -3,7 +3,7 @@
|
|||||||
# Luminol
|
# Luminol
|
||||||
<h4>Luminol 是一个基于Folia的分支,具有许多有用的优化、可配置的原版特性和更多的API支持,它专为生存和无政府服务器设计</h4>
|
<h4>Luminol 是一个基于Folia的分支,具有许多有用的优化、可配置的原版特性和更多的API支持,它专为生存和无政府服务器设计</h4>
|
||||||
|
|
||||||
[](LICENSE)
|
[](LICENSE.md)
|
||||||
[](https://github.com/LuminolMC/Luminol/issues)
|
[](https://github.com/LuminolMC/Luminol/issues)
|
||||||

|

|
||||||

|

|
||||||
@@ -24,7 +24,7 @@
|
|||||||
要构建一个paperclip jar,你需要运行以下命令。你可以在build/libs中找到jar(注意:需要`JDK21`)
|
要构建一个paperclip jar,你需要运行以下命令。你可以在build/libs中找到jar(注意:需要`JDK21`)
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
|
./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
|
||||||
```
|
```
|
||||||
|
|
||||||
## 使用API
|
## 使用API
|
||||||
@@ -33,12 +33,12 @@
|
|||||||
```kotlin
|
```kotlin
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = "https://maven.moliatopia.icu/repository/maven-snapshots/"
|
url = "https://repo.menthamc.com/repository/maven-public/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("me.earthme.luminol:luminol-api:1.21.3-R0.1-20241201.004037-1")
|
compileOnly("me.earthme.luminol:luminol-api:$VERSION")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -47,8 +47,8 @@ dependencies {
|
|||||||
```xml
|
```xml
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>moliatopia</id>
|
<id>menthamc</id>
|
||||||
<url>https://maven.moliatopia.icu/repository/maven-snapshots/</url>
|
<url>https://repo.menthamc.com/repository/maven-public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ dependencies {
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.earthme.luminol</groupId>
|
<groupId>me.earthme.luminol</groupId>
|
||||||
<artifactId>luminol-api</artifactId>
|
<artifactId>luminol-api</artifactId>
|
||||||
<version>1.21.3-R0.1-20241201.004037-1</version>
|
<version>$VERSION</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
```
|
```
|
||||||
@@ -64,18 +64,23 @@ dependencies {
|
|||||||
## 联系方式
|
## 联系方式
|
||||||
> 如果您对这个项目感兴趣或有任何问题,请随时向我们提问。
|
> 如果您对这个项目感兴趣或有任何问题,请随时向我们提问。
|
||||||
|
|
||||||
**QQ群: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ频道: [点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram: [点击加入](https://t.me/LuminolMC) | 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
|
||||||
当您遇到任何问题时,请向我们提问,我们将尽力解决,但请记得清楚地描述您的问题并提供足够的日志等信息。
|
当您遇到任何问题时,请向我们提问,我们将尽力解决,但请记得清楚地描述您的问题并提供足够的日志等信息。
|
||||||
|
|
||||||
## 贡献代码
|
## 贡献代码
|
||||||
可[查看 Contributing](./docs/CONTRIBUTING.md)
|
可查看 [Contributing](./docs/CONTRIBUTING.md)
|
||||||
|
|
||||||
## BStats
|
## BStats
|
||||||

|

|
||||||
|
|
||||||
|
## 特别感谢
|
||||||
|
<b>感谢[LegacyLands](https://github.com/LegacyLands)对本项目的赞助,如果你想开发一些跨folia/非folia平台的插件,[legacy-lands-library](https://github.com/LegacyLands/legacy-lands-library/)将会是个不错的lib</b>
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
## 请给我们一个 ⭐Star!
|
## 请给我们一个 ⭐Star!
|
||||||
> 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。
|
> 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。
|
||||||
|
|
||||||
|
|||||||
21
README_EN.md
21
README_EN.md
@@ -3,7 +3,7 @@
|
|||||||
# Luminol
|
# Luminol
|
||||||
<h4>Luminol is a Folia fork with many useful optimizations, configurable vanilla features, and more API supports, and it was designed for survival and anarchy servers</h4>
|
<h4>Luminol is a Folia fork with many useful optimizations, configurable vanilla features, and more API supports, and it was designed for survival and anarchy servers</h4>
|
||||||
|
|
||||||
[](LICENSE)
|
[](LICENSE.md)
|
||||||
[](https://github.com/LuminolMC/Luminol/issues)
|
[](https://github.com/LuminolMC/Luminol/issues)
|
||||||

|

|
||||||

|

|
||||||
@@ -25,7 +25,7 @@ Any versions are available in the [release](https://github.com/LuminolMC/Luminol
|
|||||||
To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK21 is needed)
|
To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK21 is needed)
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
|
./gradlew applyAllPatches && ./gradlew createMojmapPaperclipJar
|
||||||
```
|
```
|
||||||
|
|
||||||
## Using API
|
## Using API
|
||||||
@@ -34,12 +34,12 @@ For gradle:
|
|||||||
```kotlin
|
```kotlin
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url = "https://maven.moliatopia.icu/repository/maven-snapshots/"
|
url = "https://repo.menthamc.com/repository/maven-public/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("me.earthme.luminol:luminol-api:1.21.3-R0.1-20241201.004037-1")
|
compileOnly("me.earthme.luminol:luminol-api:$VERSION")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -48,8 +48,8 @@ For maven
|
|||||||
```xml
|
```xml
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>moliatopia</id>
|
<id>menthamc</id>
|
||||||
<url>https://maven.moliatopia.icu/repository/maven-snapshots/</url>
|
<url>https://repo.menthamc.com/repository/maven-public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ For maven
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.earthme.luminol</groupId>
|
<groupId>me.earthme.luminol</groupId>
|
||||||
<artifactId>luminol-api</artifactId>
|
<artifactId>luminol-api</artifactId>
|
||||||
<version>1.21.3-R0.1-20241201.004037-1</version>
|
<version>$VERSION</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
```
|
```
|
||||||
@@ -65,7 +65,7 @@ For maven
|
|||||||
## Contact
|
## Contact
|
||||||
> If you are interested in this project or have any issue, feel free to ask us.
|
> If you are interested in this project or have any issue, feel free to ask us.
|
||||||
|
|
||||||
**QQ Group: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMC) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)
|
**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)
|
||||||
|
|
||||||
## About Issue
|
## About Issue
|
||||||
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>
|
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>
|
||||||
@@ -76,6 +76,11 @@ See [Contributing](./docs/CONTRIBUTING_EN.md)
|
|||||||
## BStats
|
## BStats
|
||||||

|

|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
## Please ⭐star us!
|
## Please ⭐star us!
|
||||||
<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&Date">
|
<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&Date">
|
||||||
<picture>
|
<picture>
|
||||||
|
|||||||
225
build.gradle.kts
225
build.gradle.kts
@@ -1,122 +1,103 @@
|
|||||||
plugins {
|
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||||
java
|
import org.gradle.api.tasks.testing.logging.TestLogEvent
|
||||||
`maven-publish`
|
|
||||||
id("io.papermc.paperweight.patcher") version "1.7.5"
|
plugins {
|
||||||
}
|
java // TODO java launcher tasks
|
||||||
|
id("io.papermc.paperweight.patcher") version "2.0.0-beta.17"
|
||||||
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
}
|
||||||
|
|
||||||
repositories {
|
paperweight {
|
||||||
mavenCentral()
|
upstreams.register("folia") {
|
||||||
maven(paperMavenPublicUrl) {
|
repo = github("PaperMC", "Folia")
|
||||||
content { onlyForConfigurations(configurations.paperclip.name) }
|
ref = providers.gradleProperty("foliaRef")
|
||||||
}
|
|
||||||
}
|
patchFile {
|
||||||
|
path = "folia-server/build.gradle.kts"
|
||||||
dependencies {
|
outputFile = file("luminol-server/build.gradle.kts")
|
||||||
remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
|
patchFile = file("luminol-server/build.gradle.kts.patch")
|
||||||
decompiler("org.vineflower:vineflower:1.10.1")
|
}
|
||||||
paperclip("io.papermc:paperclip:3.0.3")
|
patchFile {
|
||||||
}
|
path = "folia-api/build.gradle.kts"
|
||||||
|
outputFile = file("luminol-api/build.gradle.kts")
|
||||||
subprojects {
|
patchFile = file("luminol-api/build.gradle.kts.patch")
|
||||||
apply(plugin = "java")
|
}
|
||||||
apply(plugin = "maven-publish")
|
patchRepo("paperApi") {
|
||||||
|
upstreamPath = "paper-api"
|
||||||
java {
|
patchesDir = file("luminol-api/paper-patches")
|
||||||
toolchain {
|
outputDir = file("paper-api")
|
||||||
languageVersion.set(JavaLanguageVersion.of(21))
|
}
|
||||||
}
|
patchDir("foliaApi") {
|
||||||
}
|
upstreamPath = "folia-api"
|
||||||
|
excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
|
||||||
tasks.withType<JavaCompile> {
|
patchesDir = file("luminol-api/folia-patches")
|
||||||
options.encoding = Charsets.UTF_8.name()
|
outputDir = file("folia-api")
|
||||||
options.release.set(21)
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
tasks.withType<Javadoc> {
|
|
||||||
options.encoding = Charsets.UTF_8.name()
|
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
||||||
}
|
|
||||||
|
subprojects {
|
||||||
tasks.withType<ProcessResources> {
|
apply(plugin = "java-library")
|
||||||
filteringCharset = Charsets.UTF_8.name()
|
apply(plugin = "maven-publish")
|
||||||
}
|
|
||||||
|
extensions.configure<JavaPluginExtension> {
|
||||||
repositories {
|
toolchain {
|
||||||
mavenCentral()
|
languageVersion = JavaLanguageVersion.of(21)
|
||||||
maven(paperMavenPublicUrl)
|
}
|
||||||
maven("https://oss.sonatype.org/content/groups/public/")
|
}
|
||||||
maven("https://ci.emc.gs/nexus/content/groups/aikar/")
|
|
||||||
maven("https://repo.aikar.co/content/groups/aikar")
|
repositories {
|
||||||
maven("https://repo.md-5.net/content/repositories/releases/")
|
mavenCentral()
|
||||||
maven("https://hub.spigotmc.org/nexus/content/groups/public/")
|
maven(paperMavenPublicUrl)
|
||||||
maven("https://jitpack.io")
|
}
|
||||||
maven("https://repo.codemc.io/repository/maven-public/")
|
|
||||||
}
|
dependencies {
|
||||||
|
"testRuntimeOnly"("org.junit.platform:junit-platform-launcher")
|
||||||
}
|
}
|
||||||
|
|
||||||
paperweight {
|
tasks.withType<AbstractArchiveTask>().configureEach {
|
||||||
serverProject.set(project(":luminol-server"))
|
isPreserveFileTimestamps = false
|
||||||
|
isReproducibleFileOrder = true
|
||||||
remapRepo.set("https://maven.fabricmc.net/")
|
}
|
||||||
decompileRepo.set("https://maven.quiltmc.org/")
|
tasks.withType<JavaCompile> {
|
||||||
|
options.encoding = Charsets.UTF_8.name()
|
||||||
useStandardUpstream("folia") {
|
options.release = 21
|
||||||
url.set(github("PaperMC", "Folia"))
|
options.isFork = true
|
||||||
ref.set(providers.gradleProperty("foliaCommit"))
|
options.forkOptions.memoryMaximumSize = "6g" // Prevent OOM during building
|
||||||
|
}
|
||||||
withStandardPatcher {
|
tasks.withType<Javadoc> {
|
||||||
apiSourceDirPath.set("Folia-API")
|
options.encoding = Charsets.UTF_8.name()
|
||||||
serverSourceDirPath.set("Folia-Server")
|
}
|
||||||
|
tasks.withType<ProcessResources> {
|
||||||
|
filteringCharset = Charsets.UTF_8.name()
|
||||||
apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
|
}
|
||||||
apiOutputDir.set(layout.projectDirectory.dir("Luminol-API"))
|
tasks.withType<Test> {
|
||||||
|
testLogging {
|
||||||
serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
|
showStackTraces = true
|
||||||
serverOutputDir.set(layout.projectDirectory.dir("Luminol-Server"))
|
exceptionFormat = TestExceptionFormat.FULL
|
||||||
}
|
events(TestLogEvent.STANDARD_OUT)
|
||||||
|
}
|
||||||
patchTasks.register("generatedApi") {
|
}
|
||||||
isBareDirectory = true
|
|
||||||
upstreamDirPath = "paper-api-generator/generated"
|
extensions.configure<PublishingExtension> {
|
||||||
patchDir = layout.projectDirectory.dir("patches/generatedApi")
|
repositories {
|
||||||
outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
|
maven("https://repo.menthamc.com/repository/maven-snapshots/") {
|
||||||
}
|
name = "MenthaMC"
|
||||||
}
|
credentials(PasswordCredentials::class) {
|
||||||
}
|
username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME")
|
||||||
|
password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD")
|
||||||
tasks.generateDevelopmentBundle {
|
}
|
||||||
apiCoordinates.set("me.earthme.luminol:luminol-api")
|
}
|
||||||
libraryRepositories.addAll(
|
}
|
||||||
"https://repo.maven.apache.org/maven2/",
|
}
|
||||||
"https://maven.pkg.github.com/LuminolMC/Luminol",
|
|
||||||
paperMavenPublicUrl,
|
tasks.withType<Javadoc> {
|
||||||
)
|
options {
|
||||||
}
|
(this as StandardJavadocDocletOptions).apply {
|
||||||
|
addStringOption("-add-modules", "jdk.incubator.vector")
|
||||||
allprojects {
|
addStringOption("Xdoclint:none", "-quiet")
|
||||||
publishing {
|
}
|
||||||
repositories {
|
}
|
||||||
maven {
|
}
|
||||||
name = "moliaMavenRepo"
|
}
|
||||||
url = uri("https://maven.moliatopia.icu/repository/maven-snapshots/")
|
|
||||||
|
|
||||||
credentials.username = System.getenv("MAVEN_REPO_USER")
|
|
||||||
credentials.password = System.getenv("MAVEN_REPO_PASSWORD")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
if (project.hasProperty("publishDevBundle")) {
|
|
||||||
publications.create<MavenPublication>("devBundle") {
|
|
||||||
artifact(tasks.generateDevelopmentBundle) {
|
|
||||||
artifactId = "dev-bundle"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -21,23 +21,41 @@
|
|||||||
在开始开发之前,您首先需要拥有以下软件作为开发环境:
|
在开始开发之前,您首先需要拥有以下软件作为开发环境:
|
||||||
|
|
||||||
- `git`
|
- `git`
|
||||||
- `JDK 17 或更高版本`
|
- `JDK 21 或更高版本`
|
||||||
|
|
||||||
|
特别提醒:在操作前,您需要启用系统和Git的长路径支持,以下为部分平台的相关描述。
|
||||||
|
|
||||||
|
[`Windows`](https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation)
|
||||||
|
[`Git for Windows`](https://gitforwindows.org/faq.html#i-get-errors-trying-to-check-out-files-with-long-path-names)
|
||||||
|
|
||||||
## 了解补丁(Patches)
|
## 了解补丁(Patches)
|
||||||
|
|
||||||
Luminol 使用和 Folia 一样的补丁系统,并为了针对不同部分的修改分成了两个目录:
|
Luminol 使用和 Folia 一样的补丁系统,并为了针对不同部分的修改分成了两个目录:
|
||||||
|
|
||||||
- `luminol-api` - 对 `Folia-API` / `Paper-API` / `Spigot-API` / `Bukkit` 进行的修改。
|
- `luminol-api` - 对 `Folia-API` / `Paper-API` / `Spigot-API` / `Bukkit-API` 进行的修改。
|
||||||
|
- `luminol-server` - 对 Minecraft 标准服务器原有逻辑进行的修改。
|
||||||
|
|
||||||
补丁系统是基于 git 的,你可以在这里了解 git 的基本内容: <https://git-scm.com/docs/gittutorial>
|
补丁系统是基于 git 的,你可以在这里了解 git 的基本内容: <https://git-scm.com/docs/gittutorial>
|
||||||
|
|
||||||
如果你已经 Fork 了主储存库,那么下面你应该这么做:
|
如果你已经 Fork 了主储存库,那么下面你应该这么做:
|
||||||
|
|
||||||
1. 将你的仓库 clone 到本地;
|
1. 将你的仓库 clone 到本地;
|
||||||
2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyPatches` 任务,如果是在终端内,你可以执行 `./gradlew applyPatches`;
|
2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyAllPatches` 任务,如果是在终端内,你可以执行 `./gradlew applyAllPatches`;
|
||||||
3. 进入 `luminol-api` 文件夹进行修改。
|
3. 在执行操作后,仓库根目录下应该存在以下目录对: `luminol-api` 和 `luminol-server` , `folia-api` 和 `folia-server` , 以及 `paper-api` 和 `paper-server`(下文称作 `*-api` 和 `*-server` );
|
||||||
|
4. 进入 仓库根目录下的 `*-api` 和 `*-server` 文件夹进行修改。
|
||||||
|
|
||||||
顺便一提,`luminol-api` 并不是正常的 git 仓库:
|
以下为对上述各个文件夹的简单描述,详细描述可以参考[这里](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md):
|
||||||
|
1. API部分
|
||||||
|
- `luminol-api` :暂无有效文件
|
||||||
|
- `folia-api` :对folia-API的修改应当在此文件夹下进行
|
||||||
|
- `paper-api` :对paper-API/spigot-API/bukkit-API的修改应该在此文件夹下进行
|
||||||
|
|
||||||
|
2. Server部分
|
||||||
|
- `luminol-server` :对Minecraft原版服务器的修改应当在此文件夹下进行
|
||||||
|
- `folia-server` :暂无有效文件
|
||||||
|
- `paper-server` :对于非原版的对服务器逻辑的修改应当在此文件夹下进行
|
||||||
|
|
||||||
|
顺便一提,仓库根目录下的 `*-api` 和 `*-server` 并不是正常的 git 仓库:
|
||||||
|
|
||||||
- 在应用补丁前,基点将会指向未被更改的源码
|
- 在应用补丁前,基点将会指向未被更改的源码
|
||||||
- 在基点后的每一个提交都是一个补丁
|
- 在基点后的每一个提交都是一个补丁
|
||||||
@@ -47,11 +65,12 @@ Luminol 使用和 Folia 一样的补丁系统,并为了针对不同部分的
|
|||||||
|
|
||||||
按照以下步骤增加一个补丁是非常简单的:
|
按照以下步骤增加一个补丁是非常简单的:
|
||||||
|
|
||||||
1. 对 `luminol-api` 进行修改;
|
1. 对 `*-api` 和 `*-server` 进行修改;
|
||||||
2. 使用 git 添加你的修改,比如 `git add .`;
|
2. 使用 git 添加你的修改,比如 `git add .`(不要提交新建的文件的修改);
|
||||||
3. 使用 `git commit -m <提交信息>` 进行提交;
|
3. 使用 `git commit -m <提交信息>` 进行提交;
|
||||||
4. 运行 Gradle 任务 `rebuildPatches` 将你的提交转化为一个补丁;
|
4. 运行 Gradle 任务 `fixupPaperApiFilePatches` 生成新建文件的补丁文件(注意不要提交);
|
||||||
5. 将你生成的补丁文件进行推送。
|
5. 运行 Gradle 任务 `rebuildAllServerPatches` 将你的提交转化为一个补丁;
|
||||||
|
6. 将你生成的补丁文件进行推送。
|
||||||
|
|
||||||
这样做以后,你就可以将你的补丁文件进行 PR 提交。
|
这样做以后,你就可以将你的补丁文件进行 PR 提交。
|
||||||
|
|
||||||
@@ -60,8 +79,9 @@ Luminol 使用和 Folia 一样的补丁系统,并为了针对不同部分的
|
|||||||
你可以使用以下方法来修改一个补丁的内容:
|
你可以使用以下方法来修改一个补丁的内容:
|
||||||
|
|
||||||
1. 在 HEAD 上直接进行修改;
|
1. 在 HEAD 上直接进行修改;
|
||||||
2. 使用 `git commit -a --fixup <hash>` 来进行一个更正提交;
|
2. 使用 `git commit -a --fixup <hash>` 来进行一个更正提交;(不要提交对在luminol新建文件的修改)
|
||||||
- 如果你想要更改提交信息,你也可以用 `--squash` 来代替 `--fixup`。
|
- 如果你想要更改提交信息,你也可以用 `--squash` 来代替 `--fixup`。
|
||||||
3. 使用 `git rebase -i --autosquash base` 来进行自动变基,你只需要输入 `:q` 来关闭确认页面即可;
|
3. 使用 `git rebase -i --autosquash base` 来进行自动变基,你只需要输入 `:q` 来关闭确认页面即可;
|
||||||
4. 运行 Gradle 任务 `rebuildPatches` 来修改已被修改的补丁;
|
4. 运行 Gradle 任务 `fixupPaperApiFilePatches` 来修改已被修改的在luminol新建文件的补丁(注意不要提交);
|
||||||
5. 将修改后的补丁 PR 发回储存库。
|
5. 运行 Gradle 任务 `rebuildAllServerPatches` 来修改已被修改的补丁;
|
||||||
|
6. 将修改后的补丁 PR 发回储存库。
|
||||||
|
|||||||
@@ -10,61 +10,82 @@ And if you can follow the rules below, we can complete the review faster.
|
|||||||
## Please fork using your personal account
|
## Please fork using your personal account
|
||||||
|
|
||||||
We regularly merge existing PRs.
|
We regularly merge existing PRs.
|
||||||
If there're some small problems, we'll help you solve them by editing your PR.
|
If there are some small problems, we'll help you solve them by editing your PR.
|
||||||
|
|
||||||
But, if your PR is from a organization, we can NOT edit your PR, so we must merge your PR manually.
|
But, if your PR is from an organization, we can NOT edit your PR, so we must merge your PR manually.
|
||||||
|
|
||||||
So, don't use orgnization accounts for fork!
|
So, don't use organization accounts for fork!
|
||||||
|
|
||||||
See also [This issue](https://github.com/isaacs/github/issues/1681), and then you'll know why we can't edit PRs from organizations.
|
See also [This issue](https://github.com/isaacs/github/issues/1681), and then you'll know why we can't edit PRs from organizations.
|
||||||
|
|
||||||
## Development Environment
|
## Development Environment
|
||||||
|
|
||||||
Before coding, you need these softwares / tools as Dev Environment.
|
Before coding, you need these pieces of software / tools as Dev Environment.
|
||||||
|
|
||||||
- `git`
|
- `git`
|
||||||
- `JDK 17 or higher`
|
- `JDK 21 or higher`
|
||||||
|
|
||||||
|
PS: You need to enable long path support in your System and Git before start, some of the platform's resolution here.
|
||||||
|
|
||||||
|
[`Windows`](https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation)
|
||||||
|
[`Git for Windows`](https://gitforwindows.org/faq.html#i-get-errors-trying-to-check-out-files-with-long-path-names)
|
||||||
|
|
||||||
## Understanding "Patches"
|
## Understanding "Patches"
|
||||||
|
|
||||||
Luminol uses as the same patching system as Paper,
|
Luminol uses as the same patching system as Paper,
|
||||||
and has been divided into two directories for the purpose of modifying different parts of it:
|
and has been divided into two directories for the purpose of modifying different parts of it:
|
||||||
|
|
||||||
- `luminol-api` - Modifications to `Folia-API` / `Paper-API` / `Spigot-API` / `Bukkit`.
|
- `luminol-api` - Modifications to `Folia-API` / `Paper-API` / `Spigot-API` / `Bukkit-API`.
|
||||||
|
- `luminol-server` - Modifications to Minecraft Vanilla Server's source logic.
|
||||||
|
|
||||||
The patching system is based on git, and you can learn about it at here: <https://git-scm.com/docs/gittutorial>
|
The patching system is based on git, and you can learn about it at here: <https://git-scm.com/docs/gittutorial>
|
||||||
|
|
||||||
If you have forked the main repository, then you should follow the steps below:
|
If you have forked the main repository, then you should follow the steps below:
|
||||||
|
|
||||||
1. Clone your repository to local
|
1. Clone your repository to local
|
||||||
2. Run Gradle's `applyPatches` task in your IDE or terminal (You can run `./gradlew applyPatches` directly in terminal.)
|
2. Run Gradle's `applyAllPatches` task in your IDE or terminal (You can run `./gradlew applyAllPatches` directly in terminal.)
|
||||||
3. Enter `luminol-api` directory to carry out modifications.
|
3. After performing the operation, the following directory pairs should exist in the root directory of the warehouse: `luminol-api` and `luminol-server` , `folia-api` and `folia-server` , `paper-api` and `paper-server` (Referred to `*-api` and `*-server` as below)
|
||||||
|
4. Enter `*-api` and `*-server` directory to carry out modifications.
|
||||||
|
|
||||||
BTW, `luminol-api` and are not normal git repositories.
|
The following is the simple description of the aforementioned folders, detailed description can be referred to [here](https://github.com/Toffikk/paperweight-examples/blob/18241979c88068d5b061d95ad69c98ecb201c246/README.md):
|
||||||
|
|
||||||
|
1. API part
|
||||||
|
- `luminol-api` : There is no valid file
|
||||||
|
- `folia-api` : Modifications to Folia API should be carried out in this folder
|
||||||
|
- `paper-api` : Modifications to Paper API/Spigot API/Bukkit API should be carried out in this folder
|
||||||
|
|
||||||
|
2. Server part
|
||||||
|
- `luminol-server` : Modifications to Minecraft Vanilla Server's source logic should be carried out in this folder
|
||||||
|
- `folia-server` : There is no valid file
|
||||||
|
- `paper-server` : Modifications to non-vanilla server logic should be carried out in this folder
|
||||||
|
|
||||||
|
BTW, `*-api` and `*-server` and are not normal git repositories.
|
||||||
|
|
||||||
- Before applying patches, the base will point to unmodified source code.
|
- Before applying patches, the base will point to unmodified source code.
|
||||||
- Every commit after the base is a patch.
|
- Every commit after the base is a patch.
|
||||||
- Only commits after the last commit of Paper will be considered Luminol' patches.
|
- Only commits after the last commit of Folia will be considered as Luminol patches.
|
||||||
|
|
||||||
## Adding new patches
|
## Adding new patches
|
||||||
|
|
||||||
It's very easy to to add patches by following the steps below:
|
It's very easy to add patches by following the steps below:
|
||||||
|
|
||||||
1. Modify the code of `luminol-api`
|
1. Modify the code of `*-api` and `*-server`
|
||||||
2. Add these changes to the local git repository (For example, `git add .`)
|
2. Add these changes to the local git repository (For example, `git add .`)
|
||||||
3. Commit these changes using `git commit -m <Commit Message>`
|
3. Commit these changes using `git commit -m <Commit Message>` (PS: do not commit new-created files)
|
||||||
4. Run Gradle's task `rebuildPatches` to convert your commits to a new patch
|
4. Run Gradle's task `fixupPaperApiFilePatches` to generate newly created files to new patches (PS: do not commit again before you run this task)
|
||||||
5. Push your patches to your repository
|
5. Run Gradle's task `rebuildAllServerPatches` to convert your commits to a new patch
|
||||||
|
6. Push your patches to your repository
|
||||||
|
|
||||||
After pushing, you can open a PR to submit your patches.
|
After pushing, you can open a PR to submit your patches.
|
||||||
|
|
||||||
## Modifying patches
|
## Modifying patches
|
||||||
|
|
||||||
You can modify a existing patch by following the steps below:
|
You can modify an existing patch by following the steps below:
|
||||||
|
|
||||||
1. Modify code at HEAD
|
1. Modify code at HEAD
|
||||||
2. Run `git commit -a --fixup <hash>` in your terminal to make a fix-up commit
|
2. Run `git commit -a --fixup <hash>` in your terminal to make a fix-up commit (PS: do not commit changes of luminol-created files)
|
||||||
- If you want to edit the commit message, replace `--fixup` with `--squash`.
|
- If you want to edit the commit message, replace `--fixup` with `--squash`
|
||||||
3. Run `git rebase -i --autosquash base` to rebase automatically, then just type `:q` to close the confirm page
|
3. Run `git rebase -i --autosquash base` to rebase automatically, then just type `:q` to close the confirm page
|
||||||
4. Run Gradle's task `rebuildPatches` to modify existing patches
|
4. Run Gradle's task `fixupPaperApiFilePatches` to regenerate luminol-created files to patches (PS: do not commit again before you run this task)
|
||||||
5. Push and PR again
|
5. Run Gradle's task `rebuildAllServerPatches` to modify existing patches
|
||||||
|
6. Push and PR again
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
group = me.earthme.luminol
|
group = me.earthme.luminol
|
||||||
version = 1.21.3-R0.1-SNAPSHOT
|
version=1.21.6-R0.1-SNAPSHOT
|
||||||
|
mcVersion=1.21.6
|
||||||
|
|
||||||
foliaCommit = c937c72ef9b6b621c03d82368eaa212c80de3878
|
foliaRef=03cc09fa2601f8ec7f70753e5f0d527997c06618
|
||||||
|
|
||||||
org.gradle.caching = true
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.parallel = true
|
org.gradle.caching=true
|
||||||
org.gradle.vfs.watch = false
|
org.gradle.parallel=true
|
||||||
org.gradle.jvmargs = -Xmx3G
|
org.gradle.vfs.watch=false
|
||||||
|
|
||||||
mcVersion = 1.21.3
|
|
||||||
GroupMCV = 1.21
|
|
||||||
preVersion = true
|
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
12
gradlew
vendored
12
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -112,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -203,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
@@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
6
gradlew.bat
vendored
6
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -68,11 +70,11 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
675
licenses/GPL.md
Normal file
675
licenses/GPL.md
Normal file
@@ -0,0 +1,675 @@
|
|||||||
|
### GNU GENERAL PUBLIC LICENSE
|
||||||
|
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||||
|
<https://fsf.org/>
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies of this
|
||||||
|
license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
### Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom
|
||||||
|
to share and change all versions of a program--to make sure it remains
|
||||||
|
free software for all its users. We, the Free Software Foundation, use
|
||||||
|
the GNU General Public License for most of our software; it applies
|
||||||
|
also to any other work released this way by its authors. You can apply
|
||||||
|
it to your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you
|
||||||
|
have certain responsibilities if you distribute copies of the
|
||||||
|
software, or if you modify it: responsibilities to respect the freedom
|
||||||
|
of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the
|
||||||
|
manufacturer can do so. This is fundamentally incompatible with the
|
||||||
|
aim of protecting users' freedom to change the software. The
|
||||||
|
systematic pattern of such abuse occurs in the area of products for
|
||||||
|
individuals to use, which is precisely where it is most unacceptable.
|
||||||
|
Therefore, we have designed this version of the GPL to prohibit the
|
||||||
|
practice for those products. If such problems arise substantially in
|
||||||
|
other domains, we stand ready to extend this provision to those
|
||||||
|
domains in future versions of the GPL, as needed to protect the
|
||||||
|
freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish
|
||||||
|
to avoid the special danger that patents applied to a free program
|
||||||
|
could make it effectively proprietary. To prevent this, the GPL
|
||||||
|
assures that patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
### TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
#### 0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds
|
||||||
|
of works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of
|
||||||
|
an exact copy. The resulting work is called a "modified version" of
|
||||||
|
the earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user
|
||||||
|
through a computer network, with no transfer of a copy, is not
|
||||||
|
conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices" to
|
||||||
|
the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
#### 1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. "Object code" means any non-source form of
|
||||||
|
a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users can
|
||||||
|
regenerate automatically from other parts of the Corresponding Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that same
|
||||||
|
work.
|
||||||
|
|
||||||
|
#### 2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not convey,
|
||||||
|
without conditions so long as your license otherwise remains in force.
|
||||||
|
You may convey covered works to others for the sole purpose of having
|
||||||
|
them make modifications exclusively for you, or provide you with
|
||||||
|
facilities for running those works, provided that you comply with the
|
||||||
|
terms of this License in conveying all material for which you do not
|
||||||
|
control copyright. Those thus making or running the covered works for
|
||||||
|
you must do so exclusively on your behalf, under your direction and
|
||||||
|
control, on terms that prohibit them from making any copies of your
|
||||||
|
copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under the
|
||||||
|
conditions stated below. Sublicensing is not allowed; section 10 makes
|
||||||
|
it unnecessary.
|
||||||
|
|
||||||
|
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such
|
||||||
|
circumvention is effected by exercising rights under this License with
|
||||||
|
respect to the covered work, and you disclaim any intention to limit
|
||||||
|
operation or modification of the work as a means of enforcing, against
|
||||||
|
the work's users, your or third parties' legal rights to forbid
|
||||||
|
circumvention of technological measures.
|
||||||
|
|
||||||
|
#### 4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
#### 5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
- a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
- b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under
|
||||||
|
section 7. This requirement modifies the requirement in section 4
|
||||||
|
to "keep intact all notices".
|
||||||
|
- c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
- d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
#### 6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms of
|
||||||
|
sections 4 and 5, provided that you also convey the machine-readable
|
||||||
|
Corresponding Source under the terms of this License, in one of these
|
||||||
|
ways:
|
||||||
|
|
||||||
|
- a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
- b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the Corresponding
|
||||||
|
Source from a network server at no charge.
|
||||||
|
- c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
- d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
- e) Convey the object code using peer-to-peer transmission,
|
||||||
|
provided you inform other peers where the object code and
|
||||||
|
Corresponding Source of the work are being offered to the general
|
||||||
|
public at no charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal,
|
||||||
|
family, or household purposes, or (2) anything designed or sold for
|
||||||
|
incorporation into a dwelling. In determining whether a product is a
|
||||||
|
consumer product, doubtful cases shall be resolved in favor of
|
||||||
|
coverage. For a particular product received by a particular user,
|
||||||
|
"normally used" refers to a typical or common use of that class of
|
||||||
|
product, regardless of the status of the particular user or of the way
|
||||||
|
in which the particular user actually uses, or expects or is expected
|
||||||
|
to use, the product. A product is a consumer product regardless of
|
||||||
|
whether the product has substantial commercial, industrial or
|
||||||
|
non-consumer uses, unless such uses represent the only significant
|
||||||
|
mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to
|
||||||
|
install and execute modified versions of a covered work in that User
|
||||||
|
Product from a modified version of its Corresponding Source. The
|
||||||
|
information must suffice to ensure that the continued functioning of
|
||||||
|
the modified object code is in no case prevented or interfered with
|
||||||
|
solely because modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or
|
||||||
|
updates for a work that has been modified or installed by the
|
||||||
|
recipient, or for the User Product in which it has been modified or
|
||||||
|
installed. Access to a network may be denied when the modification
|
||||||
|
itself materially and adversely affects the operation of the network
|
||||||
|
or violates the rules and protocols for communication across the
|
||||||
|
network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
#### 7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders
|
||||||
|
of that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
- a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
- b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
- c) Prohibiting misrepresentation of the origin of that material,
|
||||||
|
or requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
- d) Limiting the use for publicity purposes of names of licensors
|
||||||
|
or authors of the material; or
|
||||||
|
- e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
- f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions
|
||||||
|
of it) with contractual assumptions of liability to the recipient,
|
||||||
|
for any liability that these contractual assumptions directly
|
||||||
|
impose on those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions; the
|
||||||
|
above requirements apply either way.
|
||||||
|
|
||||||
|
#### 8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your license
|
||||||
|
from a particular copyright holder is reinstated (a) provisionally,
|
||||||
|
unless and until the copyright holder explicitly and finally
|
||||||
|
terminates your license, and (b) permanently, if the copyright holder
|
||||||
|
fails to notify you of the violation by some reasonable means prior to
|
||||||
|
60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
#### 9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or run
|
||||||
|
a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
#### 10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
#### 11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims owned
|
||||||
|
or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within the
|
||||||
|
scope of its coverage, prohibits the exercise of, or is conditioned on
|
||||||
|
the non-exercise of one or more of the rights that are specifically
|
||||||
|
granted under this License. You may not convey a covered work if you
|
||||||
|
are a party to an arrangement with a third party that is in the
|
||||||
|
business of distributing software, under which you make payment to the
|
||||||
|
third party based on the extent of your activity of conveying the
|
||||||
|
work, and under which the third party grants, to any of the parties
|
||||||
|
who would receive the covered work from you, a discriminatory patent
|
||||||
|
license (a) in connection with copies of the covered work conveyed by
|
||||||
|
you (or copies made from those copies), or (b) primarily for and in
|
||||||
|
connection with specific products or compilations that contain the
|
||||||
|
covered work, unless you entered into that arrangement, or that patent
|
||||||
|
license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
#### 12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under
|
||||||
|
this License and any other pertinent obligations, then as a
|
||||||
|
consequence you may not convey it at all. For example, if you agree to
|
||||||
|
terms that obligate you to collect a royalty for further conveying
|
||||||
|
from those to whom you convey the Program, the only way you could
|
||||||
|
satisfy both those terms and this License would be to refrain entirely
|
||||||
|
from conveying the Program.
|
||||||
|
|
||||||
|
#### 13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
#### 14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in
|
||||||
|
detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies that a certain numbered version of the GNU General Public
|
||||||
|
License "or any later version" applies to it, you have the option of
|
||||||
|
following the terms and conditions either of that numbered version or
|
||||||
|
of any later version published by the Free Software Foundation. If the
|
||||||
|
Program does not specify a version number of the GNU General Public
|
||||||
|
License, you may choose any version ever published by the Free
|
||||||
|
Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future versions
|
||||||
|
of the GNU General Public License can be used, that proxy's public
|
||||||
|
statement of acceptance of a version permanently authorizes you to
|
||||||
|
choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
#### 15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
||||||
|
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
||||||
|
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
||||||
|
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
||||||
|
CORRECTION.
|
||||||
|
|
||||||
|
#### 16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
||||||
|
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
||||||
|
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
||||||
|
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
||||||
|
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
||||||
|
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
||||||
|
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
#### 17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
### How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these
|
||||||
|
terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest to
|
||||||
|
attach them to the start of each source file to most effectively state
|
||||||
|
the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program 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 General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper
|
||||||
|
mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands \`show w' and \`show c' should show the
|
||||||
|
appropriate parts of the General Public License. Of course, your
|
||||||
|
program's commands might be different; for a GUI interface, you would
|
||||||
|
use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. For more information on this, and how to apply and follow
|
||||||
|
the GNU GPL, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your
|
||||||
|
program into proprietary programs. If your program is a subroutine
|
||||||
|
library, you may consider it more useful to permit linking proprietary
|
||||||
|
applications with the library. If this is what you want to do, use the
|
||||||
|
GNU Lesser General Public License instead of this License. But first,
|
||||||
|
please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
23
licenses/MIT.md
Normal file
23
licenses/MIT.md
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
The MIT License (MIT)
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person
|
||||||
|
obtaining a copy of this software and associated documentation
|
||||||
|
files (the “Software”), to deal in the Software without
|
||||||
|
restriction, including without limitation the rights to use,
|
||||||
|
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the
|
||||||
|
Software is furnished to do so, subject to the following
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be
|
||||||
|
included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
OTHER DEALINGS IN THE SOFTWARE.
|
||||||
43
luminol-api/build.gradle.kts.patch
Normal file
43
luminol-api/build.gradle.kts.patch
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
--- a/folia-api/build.gradle.kts
|
||||||
|
+++ b/folia-api/build.gradle.kts
|
||||||
|
@@ -51,6 +_,7 @@
|
||||||
|
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
|
||||||
|
api("org.slf4j:slf4j-api:$slf4jVersion")
|
||||||
|
api("com.mojang:brigadier:1.3.10")
|
||||||
|
+ api("io.sentry:sentry:8.0.0-rc.2") // Pufferfish
|
||||||
|
|
||||||
|
// Deprecate bungeecord-chat in favor of adventure
|
||||||
|
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
|
||||||
|
@@ -101,17 +_,21 @@
|
||||||
|
java {
|
||||||
|
srcDir(generatedDir)
|
||||||
|
srcDir(file("../paper-api/src/main/java"))
|
||||||
|
+ srcDir(file("../folia-api/src/main/java"))
|
||||||
|
}
|
||||||
|
resources {
|
||||||
|
srcDir(file("../paper-api/src/main/resources"))
|
||||||
|
+ srcDir(file("../folia-api/src/main/resources"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
test {
|
||||||
|
java {
|
||||||
|
srcDir(file("../paper-api/src/test/java"))
|
||||||
|
+ srcDir(file("../folia-api/src/test/java"))
|
||||||
|
}
|
||||||
|
resources {
|
||||||
|
srcDir(file("../paper-api/src/test/resources"))
|
||||||
|
+ srcDir(file("../folia-api/src/test/resources"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -257,3 +_,10 @@
|
||||||
|
dependsOn(scanJarForOldGeneratedCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+// Pufferfish Start
|
||||||
|
+tasks.withType<JavaCompile> {
|
||||||
|
+ val compilerArgs = options.compilerArgs
|
||||||
|
+ compilerArgs.add("--add-modules=jdk.incubator.vector")
|
||||||
|
+}
|
||||||
|
+// Pufferfish End
|
||||||
@@ -1,19 +1,23 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
From: MrHua269 <wangxyper@163.com>
|
||||||
Date: Tue, 21 May 2024 21:31:53 +0800
|
Date: Sun, 12 Jan 2025 10:18:38 +0800
|
||||||
Subject: [PATCH] Rebrand to Luminol
|
Subject: [PATCH] Rebrand to Luminol
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
index 652ff54e7c50412503725d628bfe72ed03059790..ee163b9fa8f441aa4b3e2309f33e8f932dfc02d7 100644
|
index 652ff54e7c50412503725d628bfe72ed03059790..db5e2f10278c20286779362cfdfadb2f42c724e0 100644
|
||||||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
|
@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
|
||||||
*/
|
*/
|
||||||
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
||||||
|
|
||||||
+ // Luminol start
|
+ // Luminol start
|
||||||
+ /**
|
+ /**
|
||||||
|
+ * The brand id for folia
|
||||||
|
+ */
|
||||||
|
+ Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
|
||||||
|
+ /**
|
||||||
+ * The brand id for Luminol.
|
+ * The brand id for Luminol.
|
||||||
+ */
|
+ */
|
||||||
+ Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
|
+ Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: MrHua269 <wangxyper@163.com>
|
From: MrHua269 <wangxyper@163.com>
|
||||||
Date: Fri, 25 Oct 2024 00:07:15 +0800
|
Date: Tue, 11 Feb 2025 09:16:49 +0800
|
||||||
Subject: [PATCH] KioCG Chunk API
|
Subject: [PATCH] KioCG Chunk API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
||||||
index bc8b5bc17706250b8535b1b309134843d2ce2bb1..1cfe84ad1094e3c4fab96487f328be53e035a64c 100644
|
index 9f8414f854646ad7429fe806e35a13e32a07ddaa..9a0995bf82830b45b2d72b2a1cff2bfdd4f7a638 100644
|
||||||
--- a/src/main/java/org/bukkit/Chunk.java
|
--- a/src/main/java/org/bukkit/Chunk.java
|
||||||
+++ b/src/main/java/org/bukkit/Chunk.java
|
+++ b/src/main/java/org/bukkit/Chunk.java
|
||||||
@@ -389,4 +389,6 @@ public interface Chunk extends PersistentDataHolder {
|
@@ -388,4 +388,6 @@ public interface Chunk extends PersistentDataHolder {
|
||||||
*/
|
*/
|
||||||
UNLOADED;
|
UNLOADED;
|
||||||
}
|
}
|
||||||
@@ -16,13 +16,13 @@ index bc8b5bc17706250b8535b1b309134843d2ce2bb1..1cfe84ad1094e3c4fab96487f328be53
|
|||||||
+ long getChunkHotAvg(); // KioCG
|
+ long getChunkHotAvg(); // KioCG
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 95f0b3186e313c7fbd5c8531d52b82a69e525f94..ce98b3de2fe935de4c280f7af9940499d6f09926 100644
|
index d34419693fc78b3f7e8f6bbf115f17f29e5e3377..aefcae5d9b7beff4bb7185cf44b443fc340af179 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -3911,4 +3911,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
@@ -3925,4 +3925,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||||
|
* @param score New death screen score of player
|
||||||
*/
|
*/
|
||||||
void sendEntityEffect(org.bukkit.@NotNull EntityEffect effect, @NotNull Entity target);
|
void setDeathScreenScore(int score);
|
||||||
// Paper end - entity effect API
|
|
||||||
+
|
+
|
||||||
+ long getNearbyChunkHot(); // KioCG
|
+ long getNearbyChunkHot(); // KioCG
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: MrHua269 <wangxyper@163.com>
|
From: MrHua269 <wangxyper@163.com>
|
||||||
Date: Sat, 30 Nov 2024 12:34:50 +0800
|
Date: Sun, 12 Jan 2025 12:22:53 +0800
|
||||||
Subject: [PATCH] Disable timings warn msg and commands
|
Subject: [PATCH] Disable timings warn msg and commands
|
||||||
|
|
||||||
|
|
||||||
@@ -18,20 +18,20 @@ index 89017af09ce32e7a66014fc3aeb50155921252a5..b862779b48176dd7e67a2f1a3e7f24bc
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..baf0cbd2f995ebe2e4382244eff6e15ec125d790 100644
|
index 4acda947b7d69ab4133b4cc94e76d945e4d148d5..8093eff77c80be2c2e97bf6700a69d879d4c62a5 100644
|
||||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
@@ -39,7 +39,7 @@ public class SimpleCommandMap implements CommandMap {
|
@@ -32,7 +32,7 @@ public class SimpleCommandMap implements CommandMap {
|
||||||
register("bukkit", new VersionCommand("version"));
|
|
||||||
|
private void setDefaultCommands() {
|
||||||
register("bukkit", new ReloadCommand("reload"));
|
register("bukkit", new ReloadCommand("reload"));
|
||||||
//register("bukkit", new PluginsCommand("plugins")); // Paper
|
- register("bukkit", new co.aikar.timings.TimingsCommand("timings"));
|
||||||
- register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Paper
|
|
||||||
+ //register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Paper // Luminol - Disable timings warn msg and commands
|
+ //register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Paper // Luminol - Disable timings warn msg and commands
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setFallbackCommands() {
|
public void setFallbackCommands() {
|
||||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
index 9611e8e254b4fa9579dc9ffd5198182c43819c56..170fefdc50605c0c4d742a606c18d871966e6e72 100644
|
index 468f5646da7bc413a6e91e82379e6554cc8b459d..ab36e3aaff57e2f27b5aed06b4bdfe277f86a35e 100644
|
||||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
@@ -966,7 +966,7 @@ public final class SimplePluginManager implements PluginManager {
|
@@ -966,7 +966,7 @@ public final class SimplePluginManager implements PluginManager {
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Thu, 23 Jan 2025 12:04:04 +0800
|
||||||
|
Subject: [PATCH] Force disable reload command
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
|
index 8093eff77c80be2c2e97bf6700a69d879d4c62a5..c51bc888011091925d73945a52b252aef3e2b384 100644
|
||||||
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
|
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||||
|
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setDefaultCommands() {
|
||||||
|
- register("bukkit", new ReloadCommand("reload"));
|
||||||
|
+ //register("bukkit", new ReloadCommand("reload")); // Luminol - Force disable reload command
|
||||||
|
//register("bukkit", new co.aikar.timings.TimingsCommand("timings")); // Paper // Luminol - Disable timings warn msg and commands
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 13:27:38 +0800
|
||||||
|
Subject: [PATCH] Pufferfish Sentry
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
|
index ab36e3aaff57e2f27b5aed06b4bdfe277f86a35e..96da9f1082ab134d197b3a6069f2fcdf38585efe 100644
|
||||||
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||||
|
@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {
|
||||||
|
|
||||||
|
// Paper start
|
||||||
|
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
||||||
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
||||||
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
|
||||||
|
}
|
||||||
|
// Paper end
|
||||||
|
@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
|
||||||
|
));
|
||||||
|
}
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
|
||||||
|
// Paper start - error reporting
|
||||||
|
String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
|
||||||
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
|
||||||
|
if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
|
||||||
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||||
|
index 163e9a0e179dc88be93614ff66ee2be3eccc694f..78cdf669328fc1ec5e9943033a11d2200857a07e 100644
|
||||||
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||||
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||||
|
@@ -329,7 +329,13 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||||
|
try {
|
||||||
|
jPlugin.setEnabled(true);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
||||||
|
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
||||||
|
+ // Paper start - Disable plugins that fail to load
|
||||||
|
+ this.server.getPluginManager().disablePlugin(jPlugin);
|
||||||
|
+ return;
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
|
||||||
|
// Perhaps abort here, rather than continue going, but as it stands,
|
||||||
|
@@ -354,7 +360,9 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||||
|
try {
|
||||||
|
jPlugin.setEnabled(false);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
||||||
|
server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
||||||
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cloader instanceof PluginClassLoader) {
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 14:00:28 +0800
|
||||||
|
Subject: [PATCH] Pufferfish SIMD Utilities
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
|
||||||
|
index fd6f3bce50a66004687b08fd80568543f814747a..bc565037b855f2063bdcbc6c5742b1985e27bff0 100644
|
||||||
|
--- a/src/main/java/org/bukkit/map/MapPalette.java
|
||||||
|
+++ b/src/main/java/org/bukkit/map/MapPalette.java
|
||||||
|
@@ -35,7 +35,7 @@ public final class MapPalette {
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
- static final Color[] colors = {
|
||||||
|
+ public static final Color[] colors = { // Luminol - package-private -> public
|
||||||
|
// Start generate - MapPalette#colors
|
||||||
|
// @GeneratedFrom 1.21.6
|
||||||
|
new Color(0x00000000, true),
|
||||||
|
@@ -395,9 +395,11 @@ public final class MapPalette {
|
||||||
|
temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
|
||||||
|
|
||||||
|
byte[] result = new byte[temp.getWidth() * temp.getHeight()];
|
||||||
|
+ if ((mapColorCache != null && mapColorCache.isCached()) || !gg.pufferfish.pufferfish.simd.SIMDDetection.isEnabled) { // Luminol - Pufferfish - vectorized map color conversion
|
||||||
|
for (int i = 0; i < pixels.length; i++) {
|
||||||
|
result[i] = matchColor(new Color(pixels[i], true));
|
||||||
|
}
|
||||||
|
+ } else gg.pufferfish.pufferfish.simd.VectorMapPalette.matchColorVectorized(pixels, result); // Luminol - Pufferfish - vectorized map color conversion
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Mon, 27 Jan 2025 13:01:59 +0800
|
||||||
|
Subject: [PATCH] Tick regions api
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||||
|
index 04a1379f5fe281ab72610d2f8f18e1355fe3a134..d5116c1014ce123d831ce93c6204284a9642cc56 100644
|
||||||
|
--- a/src/main/java/org/bukkit/World.java
|
||||||
|
+++ b/src/main/java/org/bukkit/World.java
|
||||||
|
@@ -4462,4 +4462,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Luminol start - Tick regions api
|
||||||
|
+ me.earthme.luminol.api.ThreadedRegionizer getThreadedRegionizer();
|
||||||
|
+ // Luminol end - Tick regions api
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sat, 24 May 2025 01:25:10 +0800
|
||||||
|
Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
|
||||||
|
index 76c08499b704a6cb0cb95ce69b9a9248d69cc127..d516595a8675a9f3d9c14658b66160ba4b3c4278 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
|
||||||
|
@@ -27,6 +27,7 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
|
||||||
|
@Nullable private org.bukkit.SoundCategory deathSoundCategory;
|
||||||
|
private float deathSoundVolume;
|
||||||
|
private float deathSoundPitch;
|
||||||
|
+ private int rewardExp; // Leaves - exp fix
|
||||||
|
|
||||||
|
private boolean cancelled;
|
||||||
|
|
||||||
|
@@ -35,13 +36,20 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
|
||||||
|
this(livingEntity, damageSource, drops, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
- @ApiStatus.Internal
|
||||||
|
public EntityDeathEvent(@NotNull final LivingEntity livingEntity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp) {
|
||||||
|
+ // Leaves start - exp fix
|
||||||
|
+ this(livingEntity, damageSource, drops, droppedExp, droppedExp);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @ApiStatus.Internal
|
||||||
|
+ public EntityDeathEvent(@NotNull final LivingEntity livingEntity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp, final int rewardExp) {
|
||||||
|
super(livingEntity);
|
||||||
|
this.damageSource = damageSource;
|
||||||
|
this.drops = drops;
|
||||||
|
this.dropExp = droppedExp;
|
||||||
|
+ this.rewardExp = rewardExp;
|
||||||
|
}
|
||||||
|
+ // Leaves end - exp fix
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
@@ -230,4 +238,14 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLER_LIST;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Leaves start - exp fix
|
||||||
|
+ public int getRewardExp() {
|
||||||
|
+ return rewardExp;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void setRewardExp(int rewardExp) {
|
||||||
|
+ this.rewardExp = rewardExp;
|
||||||
|
+ }
|
||||||
|
+ // Leaves end - exp fix
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
||||||
|
index 6316a2f1d2dc0314397e33e6dbd354fb8bc50541..6e2d1bf0e8eb9fa4917b464324a02b9b5d0dd496 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
|
||||||
|
@@ -25,6 +25,7 @@ public class PlayerDeathEvent extends EntityDeathEvent {
|
||||||
|
private boolean doExpDrop;
|
||||||
|
private boolean keepLevel = false;
|
||||||
|
private boolean keepInventory = false;
|
||||||
|
+ private boolean useApiExpDropStatus = false; // Leaves - exp fix
|
||||||
|
@Deprecated
|
||||||
|
private final List<ItemStack> itemsToKeep = new ArrayList<>();
|
||||||
|
|
||||||
|
@@ -82,8 +83,15 @@ public class PlayerDeathEvent extends EntityDeathEvent {
|
||||||
|
this.showDeathMessages = true;
|
||||||
|
this.deathMessage = LegacyComponentSerializer.legacySection().deserializeOrNull(deathMessage);
|
||||||
|
this.doExpDrop = doExpDrop;
|
||||||
|
+ this.useApiExpDropStatus = true; // Leaves - exp fix
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaves start - exp fix
|
||||||
|
+ public boolean forceUseEventDropStatus() {
|
||||||
|
+ return this.useApiExpDropStatus;
|
||||||
|
+ }
|
||||||
|
+ // Leaves end - exp fix
|
||||||
|
+
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public Player getEntity() {
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Thu, 12 Jun 2025 08:00:15 +0800
|
||||||
|
Subject: [PATCH] Purpur Lobotomize stuck villagers
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
|
||||||
|
index 4d88bb2eaa43709fb6103a6f77d8c01e83bfe743..60b87d52c20cec947b196f47fc333bc643accbd2 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/Villager.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
||||||
|
@@ -408,4 +408,13 @@ public interface Villager extends AbstractVillager {
|
||||||
|
* Demand is still updated even if all events are canceled.
|
||||||
|
*/
|
||||||
|
public void restock();
|
||||||
|
+ // Purpur start
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Check if villager is currently lobotomized
|
||||||
|
+ *
|
||||||
|
+ * @return True if lobotomized
|
||||||
|
+ */
|
||||||
|
+ boolean isLobotomized();
|
||||||
|
+ // Purpur end
|
||||||
|
}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
package gg.pufferfish.pufferfish.sentry;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.Modifier;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.ThreadContext;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.player.PlayerEvent;
|
||||||
|
import org.bukkit.plugin.Plugin;
|
||||||
|
import org.bukkit.plugin.RegisteredListener;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
public class SentryContext {
|
||||||
|
|
||||||
|
private static final Gson GSON = new Gson();
|
||||||
|
|
||||||
|
public static void setPluginContext(@Nullable Plugin plugin) {
|
||||||
|
if (plugin != null) {
|
||||||
|
ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
|
||||||
|
ThreadContext.put("pufferfishsentry_pluginversion", plugin.getPluginMeta().getVersion());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void removePluginContext() {
|
||||||
|
ThreadContext.remove("pufferfishsentry_pluginname");
|
||||||
|
ThreadContext.remove("pufferfishsentry_pluginversion");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setSenderContext(@Nullable CommandSender sender) {
|
||||||
|
if (sender != null) {
|
||||||
|
ThreadContext.put("pufferfishsentry_playername", sender.getName());
|
||||||
|
if (sender instanceof Player player) {
|
||||||
|
ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void removeSenderContext() {
|
||||||
|
ThreadContext.remove("pufferfishsentry_playername");
|
||||||
|
ThreadContext.remove("pufferfishsentry_playerid");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setEventContext(Event event, RegisteredListener registration) {
|
||||||
|
setPluginContext(registration.getPlugin());
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Find the player that was involved with this event
|
||||||
|
Player player = null;
|
||||||
|
if (event instanceof PlayerEvent) {
|
||||||
|
player = ((PlayerEvent) event).getPlayer();
|
||||||
|
} else {
|
||||||
|
Class<? extends Event> eventClass = event.getClass();
|
||||||
|
|
||||||
|
Field playerField = null;
|
||||||
|
|
||||||
|
for (Field field : eventClass.getDeclaredFields()) {
|
||||||
|
if (field.getType().equals(Player.class)) {
|
||||||
|
playerField = field;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (playerField != null) {
|
||||||
|
playerField.setAccessible(true);
|
||||||
|
player = (Player) playerField.get(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player != null) {
|
||||||
|
setSenderContext(player);
|
||||||
|
}
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
} // We can't really safely log exceptions.
|
||||||
|
|
||||||
|
ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void removeEventContext() {
|
||||||
|
removePluginContext();
|
||||||
|
removeSenderContext();
|
||||||
|
ThreadContext.remove("pufferfishsentry_eventdata");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, String> serializeFields(Object object) {
|
||||||
|
Map<String, String> fields = new TreeMap<>();
|
||||||
|
fields.put("_class", object.getClass().getName());
|
||||||
|
for (Field declaredField : object.getClass().getDeclaredFields()) {
|
||||||
|
try {
|
||||||
|
if (Modifier.isStatic(declaredField.getModifiers())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
String fieldName = declaredField.getName();
|
||||||
|
if (fieldName.equals("handlers")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
declaredField.setAccessible(true);
|
||||||
|
Object value = declaredField.get(object);
|
||||||
|
if (value != null) {
|
||||||
|
fields.put(fieldName, value.toString());
|
||||||
|
} else {
|
||||||
|
fields.put(fieldName, "<null>");
|
||||||
|
}
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
} // We can't really safely log exceptions.
|
||||||
|
}
|
||||||
|
return fields;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class State {
|
||||||
|
|
||||||
|
private Plugin plugin;
|
||||||
|
private Command command;
|
||||||
|
private String commandLine;
|
||||||
|
private Event event;
|
||||||
|
private RegisteredListener registeredListener;
|
||||||
|
|
||||||
|
public Plugin getPlugin() {
|
||||||
|
return plugin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPlugin(Plugin plugin) {
|
||||||
|
this.plugin = plugin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Command getCommand() {
|
||||||
|
return command;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommand(Command command) {
|
||||||
|
this.command = command;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCommandLine() {
|
||||||
|
return commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommandLine(String commandLine) {
|
||||||
|
this.commandLine = commandLine;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Event getEvent() {
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEvent(Event event) {
|
||||||
|
this.event = event;
|
||||||
|
}
|
||||||
|
|
||||||
|
public RegisteredListener getRegisteredListener() {
|
||||||
|
return registeredListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRegisteredListener(RegisteredListener registeredListener) {
|
||||||
|
this.registeredListener = registeredListener;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package gg.pufferfish.pufferfish.simd;
|
||||||
|
|
||||||
|
import jdk.incubator.vector.FloatVector;
|
||||||
|
import jdk.incubator.vector.IntVector;
|
||||||
|
import jdk.incubator.vector.VectorSpecies;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Basically, java is annoying and we have to push this out to its own class.
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public class SIMDChecker {
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static boolean canEnable(Logger logger) {
|
||||||
|
try {
|
||||||
|
SIMDDetection.testRun = true;
|
||||||
|
|
||||||
|
VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED;
|
||||||
|
VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED;
|
||||||
|
|
||||||
|
logger.info("Max SIMD vector size on this system is {} bits (int)", ISPEC.vectorBitSize());
|
||||||
|
logger.info("Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
|
||||||
|
|
||||||
|
if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
|
||||||
|
logger.warn("SIMD is not properly supported on this system!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package gg.pufferfish.pufferfish.simd;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public class SIMDDetection {
|
||||||
|
|
||||||
|
public static boolean isEnabled = false;
|
||||||
|
public static boolean testRun = false;
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static boolean canEnable(Logger logger) {
|
||||||
|
try {
|
||||||
|
return SIMDChecker.canEnable(logger);
|
||||||
|
} catch (NoClassDefFoundError | Exception ignored) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static int getJavaVersion() {
|
||||||
|
// https://stackoverflow.com/a/2591122
|
||||||
|
String version = System.getProperty("java.version");
|
||||||
|
if(version.startsWith("1.")) {
|
||||||
|
version = version.substring(2, 3);
|
||||||
|
} else {
|
||||||
|
int dot = version.indexOf(".");
|
||||||
|
if(dot != -1) { version = version.substring(0, dot); }
|
||||||
|
}
|
||||||
|
version = version.split("-")[0]; // Azul is stupid
|
||||||
|
return Integer.parseInt(version);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package gg.pufferfish.pufferfish.simd;
|
||||||
|
|
||||||
|
import jdk.incubator.vector.FloatVector;
|
||||||
|
import jdk.incubator.vector.IntVector;
|
||||||
|
import jdk.incubator.vector.VectorMask;
|
||||||
|
import jdk.incubator.vector.VectorSpecies;
|
||||||
|
import org.bukkit.map.MapPalette;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public class VectorMapPalette {
|
||||||
|
|
||||||
|
private static final VectorSpecies<Integer> I_SPEC = IntVector.SPECIES_PREFERRED;
|
||||||
|
private static final VectorSpecies<Float> F_SPEC = FloatVector.SPECIES_PREFERRED;
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static void matchColorVectorized(int[] in, byte[] out) {
|
||||||
|
int speciesLength = I_SPEC.length();
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < in.length - speciesLength; i += speciesLength) {
|
||||||
|
float[] redsArr = new float[speciesLength];
|
||||||
|
float[] bluesArr = new float[speciesLength];
|
||||||
|
float[] greensArr = new float[speciesLength];
|
||||||
|
int[] alphasArr = new int[speciesLength];
|
||||||
|
|
||||||
|
for (int j = 0; j < speciesLength; j++) {
|
||||||
|
alphasArr[j] = (in[i + j] >> 24) & 0xFF;
|
||||||
|
redsArr[j] = (in[i + j] >> 16) & 0xFF;
|
||||||
|
greensArr[j] = (in[i + j] >> 8) & 0xFF;
|
||||||
|
bluesArr[j] = (in[i + j] >> 0) & 0xFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
IntVector alphas = IntVector.fromArray(I_SPEC, alphasArr, 0);
|
||||||
|
FloatVector reds = FloatVector.fromArray(F_SPEC, redsArr, 0);
|
||||||
|
FloatVector greens = FloatVector.fromArray(F_SPEC, greensArr, 0);
|
||||||
|
FloatVector blues = FloatVector.fromArray(F_SPEC, bluesArr, 0);
|
||||||
|
IntVector resultIndex = IntVector.zero(I_SPEC);
|
||||||
|
VectorMask<Integer> modificationMask = VectorMask.fromLong(I_SPEC, 0xffffffff);
|
||||||
|
|
||||||
|
modificationMask = modificationMask.and(alphas.lt(128).not());
|
||||||
|
FloatVector bestDistances = FloatVector.broadcast(F_SPEC, Float.MAX_VALUE);
|
||||||
|
|
||||||
|
for (int c = 4; c < MapPalette.colors.length; c++) {
|
||||||
|
// We're using 32-bit floats here because it's 2x faster and nobody will know the difference.
|
||||||
|
// For correctness, the original algorithm uses 64-bit floats instead. Completely unnecessary.
|
||||||
|
FloatVector compReds = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getRed());
|
||||||
|
FloatVector compGreens = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getGreen());
|
||||||
|
FloatVector compBlues = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getBlue());
|
||||||
|
|
||||||
|
FloatVector rMean = reds.add(compReds).div(2.0f);
|
||||||
|
FloatVector rDiff = reds.sub(compReds);
|
||||||
|
FloatVector gDiff = greens.sub(compGreens);
|
||||||
|
FloatVector bDiff = blues.sub(compBlues);
|
||||||
|
|
||||||
|
FloatVector weightR = rMean.div(256.0f).add(2);
|
||||||
|
FloatVector weightG = FloatVector.broadcast(F_SPEC, 4.0f);
|
||||||
|
FloatVector weightB = FloatVector.broadcast(F_SPEC, 255.0f).sub(rMean).div(256.0f).add(2.0f);
|
||||||
|
|
||||||
|
FloatVector distance = weightR.mul(rDiff).mul(rDiff).add(weightG.mul(gDiff).mul(gDiff)).add(weightB.mul(bDiff).mul(bDiff));
|
||||||
|
|
||||||
|
// Now we compare to the best distance we've found.
|
||||||
|
// This mask contains a "1" if better, and a "0" otherwise.
|
||||||
|
VectorMask<Float> bestDistanceMask = distance.lt(bestDistances);
|
||||||
|
bestDistances = bestDistances.blend(distance, bestDistanceMask); // Update the best distances
|
||||||
|
|
||||||
|
// Update the result array
|
||||||
|
// We also AND with the modification mask because we don't want to interfere if the alpha value isn't large enough.
|
||||||
|
resultIndex = resultIndex.blend(c, bestDistanceMask.cast(I_SPEC).and(modificationMask)); // Update the results
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int j = 0; j < speciesLength; j++) {
|
||||||
|
int index = resultIndex.lane(j);
|
||||||
|
out[i + j] = (byte) (index < 128 ? index : -129 + (index - 127));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// For the final ones, fall back to the regular method
|
||||||
|
for (; i < in.length; i++) {
|
||||||
|
out[i] = MapPalette.matchColor(new Color(in[i], true));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package me.earthme.luminol.api;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple package of folia's tick region state.It linked to the RegionStats of the nms part so that</br>
|
||||||
|
* You could call these methods to get the status of this tick region</br>
|
||||||
|
*/
|
||||||
|
public interface RegionStats {
|
||||||
|
/**
|
||||||
|
* Get the entity count in this tick region
|
||||||
|
* @return the entity count
|
||||||
|
*/
|
||||||
|
int getEntityCount();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the player count in this tick region
|
||||||
|
* @return the player count
|
||||||
|
*/
|
||||||
|
int getPlayerCount();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the chunk count in this tick region
|
||||||
|
* @return the chunk count
|
||||||
|
*/
|
||||||
|
int getChunkCount();
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package me.earthme.luminol.api;
|
||||||
|
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.World;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A mirror of folia's ThreadedRegion</br>
|
||||||
|
* Including some handy methods to get the information of the tick region</br>
|
||||||
|
* Note: You should call these methods inside this tick region's thread context
|
||||||
|
*/
|
||||||
|
public interface ThreadedRegion {
|
||||||
|
/**
|
||||||
|
* Get the center chunk pos of this tick region</br>
|
||||||
|
* Note:</br>
|
||||||
|
* 1.Global region will return a null value(But we don't finish the global region yet()</br>
|
||||||
|
* 2.You should call these methods inside this tick region's thread context
|
||||||
|
* @return The center chunk pos
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
Location getCenterChunkPos();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the dead section percent of this tick region
|
||||||
|
* Note: </br>
|
||||||
|
* 1.Dead percent is mean the percent of the unloaded chunk count of this tick region, which is also used for determine
|
||||||
|
* that the tick region should or not check for splitting</br>
|
||||||
|
* 2.You should call these methods inside this tick region's thread context
|
||||||
|
* @return The dead section percent
|
||||||
|
*/
|
||||||
|
double getDeadSectionPercent();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the tick region data of this tick region</br>
|
||||||
|
* Note:</br>
|
||||||
|
* 1.You should call this method inside this tick region's thread context</br>
|
||||||
|
* 2.You should call these methods inside this tick region's thread context
|
||||||
|
* @return The tick region data
|
||||||
|
*/
|
||||||
|
TickRegionData getTickRegionData();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the world of this tick region</br>
|
||||||
|
* Note: Global region will return a null value too
|
||||||
|
* @return The world of this tick region
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
World getWorld();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the id of the tick region</br>
|
||||||
|
* @return The id of the tick region
|
||||||
|
*/
|
||||||
|
long getId();
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package me.earthme.luminol.api;
|
||||||
|
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A mirror of folia's ThreadedRegionizer
|
||||||
|
*/
|
||||||
|
public interface ThreadedRegionizer {
|
||||||
|
/**
|
||||||
|
* Get all the tick regions
|
||||||
|
* @return Temporary copied collection of all tick regions
|
||||||
|
*/
|
||||||
|
Collection<ThreadedRegion> getAllRegions();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the tick region at the given chunk coordinates
|
||||||
|
* @param chunkX Chunk X
|
||||||
|
* @param chunkZ Chunk Z
|
||||||
|
* @return The tick region at the given chunk coordinates
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
ThreadedRegion getAtSynchronized(int chunkX, int chunkZ);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the tick region at the given chunk coordinates
|
||||||
|
* @param chunkX Chunk X
|
||||||
|
* @param chunkZ Chunk Z
|
||||||
|
* @return The tick region at the given chunk coordinates
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
ThreadedRegion getAtUnSynchronized(int chunkX, int chunkZ);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the tick region at the given location
|
||||||
|
* @param pos The location
|
||||||
|
* @return The tick region at the given location
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
default ThreadedRegion getAtSynchronized(@NotNull Location pos) {
|
||||||
|
return this.getAtSynchronized(pos.getBlockX() >> 4, pos.getBlockZ() >> 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the tick region at the given location
|
||||||
|
* @param pos The location
|
||||||
|
* @return The tick region at the given location
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
default ThreadedRegion getAtUnSynchronized(@NotNull Location pos) {
|
||||||
|
return this.getAtUnSynchronized(pos.getBlockX() >> 4, pos.getBlockZ() >> 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package me.earthme.luminol.api;
|
||||||
|
|
||||||
|
import org.bukkit.World;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A mirror of folia's tick region data
|
||||||
|
*/
|
||||||
|
public interface TickRegionData {
|
||||||
|
/**
|
||||||
|
* Get the world it's currently holding
|
||||||
|
* @return the world
|
||||||
|
*/
|
||||||
|
World getWorld();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current tick count
|
||||||
|
* @return the current tick count
|
||||||
|
*/
|
||||||
|
long getCurrentTickCount();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the region stats
|
||||||
|
* @return the region stats
|
||||||
|
*/
|
||||||
|
RegionStats getRegionStats();
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package me.earthme.luminol.api.entity;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.Validate;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.event.Cancellable;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple event fired when a teleportAsync was called
|
||||||
|
* @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause)
|
||||||
|
* @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location)
|
||||||
|
* (Also fired when teleportAsync called from nms)
|
||||||
|
*/
|
||||||
|
public class EntityTeleportAsyncEvent extends Event {
|
||||||
|
private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
|
||||||
|
private final Entity entity;
|
||||||
|
private final PlayerTeleportEvent.TeleportCause teleportCause;
|
||||||
|
private final Location destination;
|
||||||
|
|
||||||
|
public EntityTeleportAsyncEvent(Entity entity, PlayerTeleportEvent.TeleportCause teleportCause, Location destination) {
|
||||||
|
Validate.notNull(entity, "entity cannot be a null value!");
|
||||||
|
Validate.notNull(teleportCause, "teleportCause cannot be a null value!");
|
||||||
|
Validate.notNull(destination, "destination cannot be a null value!");
|
||||||
|
|
||||||
|
this.entity = entity;
|
||||||
|
this.teleportCause = teleportCause;
|
||||||
|
this.destination = destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the entity is about to be teleported
|
||||||
|
* @return that entity
|
||||||
|
*/
|
||||||
|
public @NotNull Entity getEntity() {
|
||||||
|
return this.entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the cause of the teleport
|
||||||
|
* @return the cause
|
||||||
|
*/
|
||||||
|
public @NotNull PlayerTeleportEvent.TeleportCause getTeleportCause() {
|
||||||
|
return this.teleportCause;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the destination of the teleport
|
||||||
|
* @return the destination
|
||||||
|
*/
|
||||||
|
public @NotNull Location getDestination() {
|
||||||
|
return this.destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package me.earthme.luminol.api.entity;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.Validate;
|
||||||
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple event created for missing teleport events api of folia
|
||||||
|
* This event is fired when the entity portal process has been done
|
||||||
|
*/
|
||||||
|
public class PostEntityPortalEvent extends Event {
|
||||||
|
private static final HandlerList HANDLER_LIST = new HandlerList();
|
||||||
|
|
||||||
|
private final Entity teleportedEntity;
|
||||||
|
|
||||||
|
public PostEntityPortalEvent(Entity teleportedEntity) {
|
||||||
|
Validate.notNull(teleportedEntity, "teleportedEntity cannot be null!");
|
||||||
|
|
||||||
|
this.teleportedEntity = teleportedEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the entity which was teleported
|
||||||
|
* @return the entity which was teleported
|
||||||
|
*/
|
||||||
|
public Entity getTeleportedEntity() {
|
||||||
|
return this.teleportedEntity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLER_LIST;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLER_LIST;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package me.earthme.luminol.api.entity;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.Validate;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.event.Cancellable;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple event created for missing teleport events api of folia
|
||||||
|
* This event will be fired when a portal teleportation is about to happen
|
||||||
|
*/
|
||||||
|
public class PreEntityPortalEvent extends Event implements Cancellable {
|
||||||
|
private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
|
||||||
|
private final Entity entity;
|
||||||
|
private final Location portalPos;
|
||||||
|
private final World destination;
|
||||||
|
|
||||||
|
private boolean cancelled = false;
|
||||||
|
|
||||||
|
public PreEntityPortalEvent(Entity entity, Location portalPos, World destination) {
|
||||||
|
Validate.notNull(entity, "entity cannot be null!");
|
||||||
|
Validate.notNull(portalPos, "portalPos cannot be null!");
|
||||||
|
Validate.notNull(destination, "destination cannot be null!");
|
||||||
|
|
||||||
|
this.entity = entity;
|
||||||
|
this.portalPos = portalPos;
|
||||||
|
this.destination = destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the entity that is about to teleport
|
||||||
|
* @return the entity
|
||||||
|
*/
|
||||||
|
public @NotNull Entity getEntity() {
|
||||||
|
return this.entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the location of the portal
|
||||||
|
* @return the portal location
|
||||||
|
*/
|
||||||
|
public @NotNull Location getPortalPos() {
|
||||||
|
return this.portalPos;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the destination world
|
||||||
|
* @return the destination world
|
||||||
|
*/
|
||||||
|
public @NotNull World getDestination() {
|
||||||
|
return this.destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return this.cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCancelled(boolean cancel) {
|
||||||
|
this.cancelled = cancel;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package me.earthme.luminol.api.entity.player;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.Validate;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple event fired when the respawn process of player is done
|
||||||
|
*/
|
||||||
|
public class PostPlayerRespawnEvent extends Event {
|
||||||
|
private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
|
||||||
|
private final Player player;
|
||||||
|
|
||||||
|
public PostPlayerRespawnEvent(Player player) {
|
||||||
|
Validate.notNull(player, "Player cannot be a null value!");
|
||||||
|
|
||||||
|
this.player = player;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the respawned player
|
||||||
|
* @return the player
|
||||||
|
*/
|
||||||
|
public @NotNull Player getPlayer() {
|
||||||
|
return this.player;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package me.earthme.luminol.api.portal;
|
||||||
|
|
||||||
|
import org.bukkit.event.Cancellable;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A event fired when an end platform is created.
|
||||||
|
*/
|
||||||
|
public class EndPlatformCreateEvent extends Event implements Cancellable {
|
||||||
|
private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
|
||||||
|
private boolean cancelled = false;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCancelled() {
|
||||||
|
return this.cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCancelled(boolean cancel) {
|
||||||
|
this.cancelled = cancel;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package me.earthme.luminol.api.portal;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.Validate;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A event fired when the portal process started locating the destination position
|
||||||
|
* Notice: If you changed the destination to an another position in end teleportation.The end platform won't create under the entity and won't create
|
||||||
|
* if the position is out of current tick region
|
||||||
|
*/
|
||||||
|
public class PortalLocateEvent extends Event {
|
||||||
|
private static final HandlerList HANDLERS = new HandlerList();
|
||||||
|
|
||||||
|
private final Location original;
|
||||||
|
private final Location destination;
|
||||||
|
|
||||||
|
public PortalLocateEvent(Location original, Location destination) {
|
||||||
|
Validate.notNull(original, "original couldn't be null!");
|
||||||
|
Validate.notNull(destination, "destination couldn't be null!");
|
||||||
|
|
||||||
|
this.original = original;
|
||||||
|
this.destination = destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the destination position of this teleportation
|
||||||
|
* @return the destination position
|
||||||
|
*/
|
||||||
|
public Location getDestination() {
|
||||||
|
return this.destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the original portal position of this teleportation
|
||||||
|
* @return the original portal position
|
||||||
|
*/
|
||||||
|
public Location getOriginal() {
|
||||||
|
return this.original;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull HandlerList getHandlers() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return HANDLERS;
|
||||||
|
}
|
||||||
|
}
|
||||||
121
luminol-server/build.gradle.kts.patch
Normal file
121
luminol-server/build.gradle.kts.patch
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
--- a/folia-server/build.gradle.kts
|
||||||
|
+++ b/folia-server/build.gradle.kts
|
||||||
|
@@ -27,6 +_,7 @@
|
||||||
|
gitFilePatches = false
|
||||||
|
|
||||||
|
val fork = forks.register("folia") {
|
||||||
|
+ rootDirectory = upstreamsDirectory().map { it.dir("folia") }
|
||||||
|
upstream.patchDir("paperServer") {
|
||||||
|
upstreamPath = "paper-server"
|
||||||
|
excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
|
||||||
|
@@ -35,7 +_,23 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- activeFork = fork
|
||||||
|
+ val luminol = forks.register("luminol") {
|
||||||
|
+ forks = fork
|
||||||
|
+ upstream.patchRepo("paperServer") {
|
||||||
|
+ upstreamRepo = fork.patchedRepo("paperServer")
|
||||||
|
+ patchesDir = rootDirectory.dir("luminol-server/paper-patches")
|
||||||
|
+ outputDir = rootDirectory.dir("paper-server")
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ upstream.patchDir("foliaServer") {
|
||||||
|
+ upstreamPath = "folia-server"
|
||||||
|
+ excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch")
|
||||||
|
+ patchesDir = rootDirectory.dir("luminol-server/folia-patches")
|
||||||
|
+ outputDir = rootDirectory.dir("folia-server")
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ activeFork = luminol
|
||||||
|
|
||||||
|
|
||||||
|
spigot {
|
||||||
|
@@ -123,10 +_,14 @@
|
||||||
|
main {
|
||||||
|
java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") }
|
||||||
|
resources { srcDir("../paper-server/src/main/resources") }
|
||||||
|
+ java { srcDir("../folia-server/src/main/java") }
|
||||||
|
+ resources { srcDir("../folia-server/src/main/resources") }
|
||||||
|
}
|
||||||
|
test {
|
||||||
|
java { srcDir("../paper-server/src/test/java") }
|
||||||
|
resources { srcDir("../paper-server/src/test/resources") }
|
||||||
|
+ java { srcDir("../folia-server/src/test/java") }
|
||||||
|
+ resources { srcDir("../folia-server/src/test/resources") }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val log4jPlugins = sourceSets.create("log4jPlugins") {
|
||||||
|
@@ -153,12 +_,20 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
- implementation(project(":folia-api"))
|
||||||
|
+ implementation(project(":luminol-api")) // Luminol
|
||||||
|
+ implementation("com.electronwill.night-config:toml:3.8.2") // Luminol - Night config
|
||||||
|
+ // Abomination start
|
||||||
|
+ implementation("com.github.luben:zstd-jni:1.5.4-1")
|
||||||
|
+ implementation("org.lz4:lz4-java:1.8.0")
|
||||||
|
+ implementation("net.openhft:zero-allocation-hashing:0.16")
|
||||||
|
+ // Abomination end
|
||||||
|
+ implementation("io.github.classgraph:classgraph:4.8.158") // Kaiiju - Entity throttling & Removal
|
||||||
|
implementation("ca.spottedleaf:concurrentutil:0.0.3")
|
||||||
|
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
|
||||||
|
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
|
||||||
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||||
|
implementation("net.kyori:adventure-text-serializer-ansi:4.21.0") // Keep in sync with adventureVersion from Paper-API build file
|
||||||
|
+ implementation("net.openhft:affinity:3.23.3") // Luminol
|
||||||
|
runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath })
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -216,27 +_,33 @@
|
||||||
|
implementation("me.lucko:spark-api:0.1-20240720.200737-2")
|
||||||
|
implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1")
|
||||||
|
}
|
||||||
|
+// Pufferfish Start
|
||||||
|
+tasks.withType<JavaCompile> {
|
||||||
|
+ val compilerArgs = options.compilerArgs
|
||||||
|
+ compilerArgs.add("--add-modules=jdk.incubator.vector")
|
||||||
|
+}
|
||||||
|
+// Pufferfish End
|
||||||
|
|
||||||
|
tasks.jar {
|
||||||
|
manifest {
|
||||||
|
val git = Git(rootProject.layout.projectDirectory.path)
|
||||||
|
val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
|
||||||
|
val build = System.getenv("BUILD_NUMBER") ?: null
|
||||||
|
- val buildTime = if (build != null) Instant.now() else Instant.EPOCH
|
||||||
|
+ val buildTime = Instant.now() // Always use current as build time
|
||||||
|
val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim()
|
||||||
|
val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
|
||||||
|
val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim()
|
||||||
|
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
|
||||||
|
attributes(
|
||||||
|
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||||
|
- "Implementation-Title" to "Folia",
|
||||||
|
+ "Implementation-Title" to "Luminol",
|
||||||
|
"Implementation-Version" to implementationVersion,
|
||||||
|
"Implementation-Vendor" to date,
|
||||||
|
- "Specification-Title" to "Folia",
|
||||||
|
+ "Specification-Title" to "Luminol",
|
||||||
|
"Specification-Version" to project.version,
|
||||||
|
- "Specification-Vendor" to "Paper Team",
|
||||||
|
- "Brand-Id" to "papermc:folia",
|
||||||
|
- "Brand-Name" to "Folia",
|
||||||
|
+ "Specification-Vendor" to "Luminol Team",
|
||||||
|
+ "Brand-Id" to "luminolmc:luminol",
|
||||||
|
+ "Brand-Name" to "Luminol",
|
||||||
|
"Build-Number" to (build ?: ""),
|
||||||
|
"Build-Time" to buildTime.toString(),
|
||||||
|
"Git-Branch" to gitBranch,
|
||||||
|
@@ -400,7 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
fill {
|
||||||
|
- project("folia")
|
||||||
|
+ project("luminol") // Luminol
|
||||||
|
versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
|
||||||
|
version(paperweight.minecraftVersion)
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sun, 22 Jun 2025 23:53:59 +0800
|
||||||
|
Subject: [PATCH] Rebrand to Luminol
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
|
||||||
|
index fd3553bdc1c3cdbf6aa3dc00e0a4987f8eaa4fb8..a75a5ce8477da8d3f7b0ae41bfbd75defe1d2ed4 100644
|
||||||
|
--- a/net/minecraft/server/Main.java
|
||||||
|
+++ b/net/minecraft/server/Main.java
|
||||||
|
@@ -109,6 +109,7 @@ public class Main {
|
||||||
|
JvmProfiler.INSTANCE.start(Environment.SERVER);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ me.earthme.luminol.config.LuminolConfig.preLoadConfig(); // Luminol - Luminol config
|
||||||
|
io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper
|
||||||
|
Bootstrap.bootStrap();
|
||||||
|
Bootstrap.validate();
|
||||||
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
index d8bab0ba6e2374fb74f3fa9f7db802f442240414..f21026ef975864700ad5ef86052acdcb7621e210 100644
|
||||||
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
@@ -171,6 +171,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
|
||||||
|
this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
|
||||||
|
// Paper end - initialize global and world-defaults configuration
|
||||||
|
+ me.earthme.luminol.config.LuminolConfig.finalizeLoadConfig(); // Luminol - load config file
|
||||||
|
+ me.earthme.luminol.config.LuminolConfig.setupLatch(); // Luminol - load config file
|
||||||
|
this.server.spark.enableEarlyIfRequested(); // Paper - spark
|
||||||
|
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
|
||||||
|
if (this.convertOldUsers()) {
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sat, 8 Mar 2025 09:56:15 +0800
|
||||||
|
Subject: [PATCH] Add config for entity to clean memory value which is not
|
||||||
|
belong to current tickregion
|
||||||
|
|
||||||
|
Folia does not fully get the entity AI patched correctly, like some memories in entity's brain is still exists when switched dimension or teleported to the new tickregion, which entity is still accessing in the next tick then it will trigger the async catcher, which lead the entity go disappear and throw an exception in the console.In this patch, if this function is turned on, the server will clean the memory that doesn't belong to the entity's tickregion before ticking any behaviors, which can simply fix that.
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/Brain.java b/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
index 3eb1362e6597faa21b27c9d1611d64a236491f98..c589e18b68e45d5991291db3a0bdd833588ce945 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
@@ -408,7 +408,7 @@ public class Brain<E extends LivingEntity> {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void tick(ServerLevel level, E entity) {
|
||||||
|
- this.forgetOutdatedMemories();
|
||||||
|
+ this.forgetOutdatedMemories(entity); // Luminol - Add config to force clean entity memory that don't belong to current tick region
|
||||||
|
this.tickSensors(level, entity);
|
||||||
|
this.startEachNonRunningBehavior(level, entity);
|
||||||
|
this.tickEachRunningBehavior(level, entity);
|
||||||
|
@@ -420,10 +420,31 @@ public class Brain<E extends LivingEntity> {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- private void forgetOutdatedMemories() {
|
||||||
|
+ private void forgetOutdatedMemories(E owner) { // Luminol - Add config to force clean entity memory that don't belong to current tick region
|
||||||
|
for (Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> entry : this.memories.entrySet()) {
|
||||||
|
if (entry.getValue().isPresent()) {
|
||||||
|
ExpirableValue<?> expirableValue = (ExpirableValue<?>)entry.getValue().get();
|
||||||
|
+ // Luminol start - Add config to force clean entity memory that don't belong to current tick region
|
||||||
|
+ final Object value = expirableValue.getValue();
|
||||||
|
+ final net.minecraft.world.level.Level ownerLevel = owner.level();
|
||||||
|
+
|
||||||
|
+ // type: entity
|
||||||
|
+ if (me.earthme.luminol.config.modules.fixes.ForceCleanupEntityBrainMemoryConfig.enabledForEntity && value instanceof LivingEntity entity) {
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
||||||
|
+ this.eraseMemory(entry.getKey());
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // type: block_pos
|
||||||
|
+ if (me.earthme.luminol.config.modules.fixes.ForceCleanupEntityBrainMemoryConfig.enabledForBlockPos && value instanceof net.minecraft.core.BlockPos blockPos) {
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(ownerLevel, blockPos)) {
|
||||||
|
+ this.eraseMemory(entry.getKey());
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
+
|
||||||
|
if (expirableValue.hasExpired()) {
|
||||||
|
this.eraseMemory(entry.getKey());
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:29:45 +0800
|
||||||
|
Subject: [PATCH] Add config for offline mode warning
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
index f21026ef975864700ad5ef86052acdcb7621e210..61d63e5668e110e9c0b891959bf4cd7c91e54645 100644
|
||||||
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
@@ -243,7 +243,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
|
||||||
|
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
|
||||||
|
// Paper end - Add Velocity IP Forwarding Support
|
||||||
|
- if (!this.usesAuthentication()) {
|
||||||
|
+ if (!this.usesAuthentication() && me.earthme.luminol.config.modules.misc.OfflineModeWarningConfig.enabled) { //Luminol - Add config for offline mod warning
|
||||||
|
LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||||||
|
LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
|
||||||
|
// Spigot start
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:30:02 +0800
|
||||||
|
Subject: [PATCH] Add config for out-of-order chat checks
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/network/chat/SignedMessageChain.java b/net/minecraft/network/chat/SignedMessageChain.java
|
||||||
|
index f6eed34b2fd72ab74cc9dc4b99ca184d512c0a66..73ef2de5efa8fb48975f70998195df76f6161d16 100644
|
||||||
|
--- a/net/minecraft/network/chat/SignedMessageChain.java
|
||||||
|
+++ b/net/minecraft/network/chat/SignedMessageChain.java
|
||||||
|
@@ -45,7 +45,7 @@ public class SignedMessageChain {
|
||||||
|
SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
|
||||||
|
if (signedMessageLink == null) {
|
||||||
|
throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN);
|
||||||
|
- } else if (body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) {
|
||||||
|
+ } else if (me.earthme.luminol.config.modules.misc.InorderChatConfig.enabled && body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) { // Luminol - Add config for out-of-order chat checks
|
||||||
|
this.setChainBroken();
|
||||||
|
throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
|
||||||
|
} else {
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:17:52 +0800
|
||||||
|
Subject: [PATCH] Add config for server mod name
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
|
index 29101af861b6b8c577d08c940cea17c843d00081..7e4fe0f33f69ae37fd8b1ffbfc8795a2b7ba3cad 100644
|
||||||
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
|
@@ -1966,7 +1966,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
|
||||||
|
@DontObfuscate
|
||||||
|
public String getServerModName() {
|
||||||
|
- return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
|
||||||
|
+ return me.earthme.luminol.config.modules.misc.ServerModNameConfig.fakeVanilla ? "vanilla" : me.earthme.luminol.config.modules.misc.ServerModNameConfig.serverModName; // Paper // Luminol - Add config for this
|
||||||
|
}
|
||||||
|
|
||||||
|
public SystemReport fillSystemReport(SystemReport systemReport) {
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:23:13 +0800
|
||||||
|
Subject: [PATCH] Add config for unsafe teleportation
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||||
|
index 34e31fa13e5107f13e166f694fafe58e306330ae..c444c4b7dc8454abd257030a8c59b9b22b9013d9 100644
|
||||||
|
--- a/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||||
|
+++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||||
|
@@ -70,7 +70,7 @@ public class FallingBlockEntity extends Entity {
|
||||||
|
public float fallDamagePerDistance = 0.0F;
|
||||||
|
@Nullable
|
||||||
|
public CompoundTag blockData;
|
||||||
|
- public boolean forceTickAfterTeleportToDuplicate;
|
||||||
|
+ public boolean forceTickAfterTeleportToDuplicate = me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled; // Luminol - Unsafe teleportation
|
||||||
|
protected static final EntityDataAccessor<BlockPos> DATA_START_POS = SynchedEntityData.defineId(FallingBlockEntity.class, EntityDataSerializers.BLOCK_POS);
|
||||||
|
public boolean autoExpire = true; // Paper - Expand FallingBlock API
|
||||||
|
|
||||||
|
@@ -387,7 +387,7 @@ public class FallingBlockEntity extends Entity {
|
||||||
|
ResourceKey<Level> resourceKey1 = this.level().dimension();
|
||||||
|
boolean flag = (resourceKey1 == Level.END || resourceKey == Level.END) && resourceKey1 != resourceKey;
|
||||||
|
Entity entity = super.teleport(teleportTransition);
|
||||||
|
- this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper
|
||||||
|
+ this.forceTickAfterTeleportToDuplicate = entity != null && flag && (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation || me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled); // Paper // Luminol - Unsafe teleportation
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java
|
||||||
|
index 6e495b2c4176d5a30ea911f8e44a22655df92ef6..cd12e35d784c8ac4737fa617d2e78cef6606299f 100644
|
||||||
|
--- a/net/minecraft/world/level/block/EndPortalBlock.java
|
||||||
|
+++ b/net/minecraft/world/level/block/EndPortalBlock.java
|
||||||
|
@@ -69,6 +69,11 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
|
||||||
|
if (level.paperConfig().misc.disableEndCredits) {serverPlayer.seenCredits = true; return;} // Paper - Option to disable end credits
|
||||||
|
serverPlayer.showEndCredits();
|
||||||
|
} else {
|
||||||
|
+ // Luminol start - unsafe teleportation
|
||||||
|
+ if (me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled && !(entity instanceof net.minecraft.world.entity.player.Player)) {
|
||||||
|
+ entity.endPortalLogicAsync(pos);
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
entity.setAsInsidePortal(this, pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:29:26 +0800
|
||||||
|
Subject: [PATCH] Add config for username check
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||||
|
index 829ff1f36d565f15cfe5d4997d3ccfdfe7898e0f..b7cfe0c73de732e22f90a7b38321c775e405aaa5 100644
|
||||||
|
--- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||||
|
+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||||
|
@@ -175,7 +175,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
||||||
|
public void handleHello(ServerboundHelloPacket packet) {
|
||||||
|
Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet");
|
||||||
|
// Paper start - Validate usernames
|
||||||
|
- if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.UsernameCheckConfig.enabled // Luminol - Add config for username check
|
||||||
|
+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
|
||||||
|
&& io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation
|
||||||
|
&& !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) {
|
||||||
|
Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username");
|
||||||
|
diff --git a/net/minecraft/server/players/GameProfileCache.java b/net/minecraft/server/players/GameProfileCache.java
|
||||||
|
index 066f84df5c31242ab542932f1e243369d0e766e2..144a2644c15f276f02bb3be859dc5d05a677ac55 100644
|
||||||
|
--- a/net/minecraft/server/players/GameProfileCache.java
|
||||||
|
+++ b/net/minecraft/server/players/GameProfileCache.java
|
||||||
|
@@ -75,7 +75,7 @@ public class GameProfileCache {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Optional<GameProfile> lookupGameProfile(GameProfileRepository profileRepo, String name) {
|
||||||
|
- if (!StringUtil.isValidPlayerName(name)) {
|
||||||
|
+ if (!StringUtil.isValidPlayerName(name, false)) { // Luminol - Add config for username check - Directly return, skip unnecessary following logic
|
||||||
|
return createUnknownProfile(name);
|
||||||
|
} else {
|
||||||
|
final boolean shouldLookup = !org.apache.commons.lang3.StringUtils.isBlank(name) // Paper - Don't lookup a profile with a blank name
|
||||||
|
diff --git a/net/minecraft/util/StringUtil.java b/net/minecraft/util/StringUtil.java
|
||||||
|
index 77947e6915facee44588943fcd3e5b513de37e77..d9f95c5cf4bd2946244c153db0fd21c8d51ae20d 100644
|
||||||
|
--- a/net/minecraft/util/StringUtil.java
|
||||||
|
+++ b/net/minecraft/util/StringUtil.java
|
||||||
|
@@ -62,8 +62,14 @@ public class StringUtil {
|
||||||
|
public static boolean isAllowedChatCharacter(char character) {
|
||||||
|
return character != 167 && character >= ' ' && character != 127;
|
||||||
|
}
|
||||||
|
+ // Luminol start - Add config for username checks
|
||||||
|
+ public static boolean isValidPlayerName(String username){
|
||||||
|
+ return isValidPlayerName(username, !me.earthme.luminol.config.modules.misc.UsernameCheckConfig.enabled);
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
|
||||||
|
- public static boolean isValidPlayerName(String playerName) {
|
||||||
|
+ public static boolean isValidPlayerName(String playerName, boolean byPass) { // Luminol - Add config for username checks
|
||||||
|
+ if (byPass) return playerName.length() <= 16; // Luminol - Add config for username checks
|
||||||
|
return playerName.length() <= 16 && playerName.chars().filter(i -> i <= 32 || i >= 127).findAny().isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:24:50 +0800
|
||||||
|
Subject: [PATCH] Add config for vanilla random
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index 737ae61a40385d6231576e3cec405b1bdfbd08a9..49c76f150c913fdc21d0e253b78625e273f69a22 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -281,7 +281,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
public double yOld;
|
||||||
|
public double zOld;
|
||||||
|
public boolean noPhysics;
|
||||||
|
- public final RandomSource random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
|
||||||
|
+ public final RandomSource random = me.earthme.luminol.config.modules.fixes.VanillaRandomSourceConfig.useLegacyRandomSourceForPlayers ? RandomSource.create() : SHARED_RANDOM; // Paper - Share random for entities to make them more random // Luminol - Add config for vanilla random SHARED_RANDOM
|
||||||
|
public int tickCount;
|
||||||
|
private int remainingFireTicks;
|
||||||
|
public boolean wasTouchingWater;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:51:21 +0800
|
||||||
|
Subject: [PATCH] Add config for watchdog timeout
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/io/papermc/paper/threadedregions/FoliaWatchdogThread.java b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java
|
||||||
|
index e9ca1a15049b0211d10401cb78e953b93afaf6c7..fe1560579f9c9572082d52cf910f5916957f5601 100644
|
||||||
|
--- a/io/papermc/paper/threadedregions/FoliaWatchdogThread.java
|
||||||
|
+++ b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java
|
||||||
|
@@ -65,7 +65,7 @@ public final class FoliaWatchdogThread extends Thread {
|
||||||
|
|
||||||
|
for (final RunningTick tick : ticks) {
|
||||||
|
final long elapsed = now - tick.lastPrint;
|
||||||
|
- if (elapsed <= TimeUnit.SECONDS.toNanos(5L)) {
|
||||||
|
+ if (elapsed <= TimeUnit.MILLISECONDS.toNanos(me.earthme.luminol.config.modules.misc.FoliaWatchogConfig.tickRegionTimeOutMs)) { // Luminol - Add config for watchdog timeout
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
tick.lastPrint = now;
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:35:13 +0800
|
||||||
|
Subject: [PATCH] Add config to disable entity tick catchers
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
|
||||||
|
index 5fe048ce442957a534d44454e0bb908afe8ad3a6..93d722d437121e605cee0e168ac17ee9bef0610e 100644
|
||||||
|
--- a/net/minecraft/world/level/Level.java
|
||||||
|
+++ b/net/minecraft/world/level/Level.java
|
||||||
|
@@ -1533,6 +1533,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
|
||||||
|
try {
|
||||||
|
consumerEntity.accept(entity);
|
||||||
|
} catch (Throwable var6) {
|
||||||
|
+ if (me.earthme.luminol.config.modules.experiment.DisableEntityCatchConfig.enabled) throw var6; // Luminol
|
||||||
|
// Paper start - Prevent block entity and entity crashes
|
||||||
|
final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
|
||||||
|
MinecraftServer.LOGGER.error(msg, var6);
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sun, 13 Apr 2025 11:07:04 +0800
|
||||||
|
Subject: [PATCH] Add config to disable heightmap warning
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/Heightmap.java b/net/minecraft/world/level/levelgen/Heightmap.java
|
||||||
|
index f7b8637680e654dc0b3e8850d65081a1c565bb69..5edbc84650243d1c47d269d4e8176ccdffa6c4e9 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/Heightmap.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/Heightmap.java
|
||||||
|
@@ -128,7 +128,8 @@ public class Heightmap {
|
||||||
|
if (raw.length == data.length) {
|
||||||
|
System.arraycopy(data, 0, raw, 0, data.length);
|
||||||
|
} else {
|
||||||
|
- LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.DisableHeightmapWarnConfig.enabled)
|
||||||
|
+ LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
|
||||||
|
primeHeightmaps(chunk, EnumSet.of(type));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sun, 18 May 2025 03:48:53 +0800
|
||||||
|
Subject: [PATCH] Add config to modify tripwire behavior
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
|
||||||
|
index 8a3a8b0fdf9545a41501dc992c6982d9c8ce7b66..8f9f5b0bf098a32a732e3ff9f636e3ea828e5f43 100644
|
||||||
|
--- a/net/minecraft/world/level/block/TripWireHookBlock.java
|
||||||
|
+++ b/net/minecraft/world/level/block/TripWireHookBlock.java
|
||||||
|
@@ -200,10 +200,17 @@ public class TripWireHookBlock extends Block {
|
||||||
|
BlockPos blockPos1 = pos.relative(direction, i2);
|
||||||
|
BlockState blockState2 = blockStates[i2];
|
||||||
|
if (blockState2 != null) {
|
||||||
|
- BlockState blockState3 = level.getBlockState(blockPos1);
|
||||||
|
- if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
|
||||||
|
- if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3); // Paper - prevent tripwire from updating
|
||||||
|
+ // Luminol start - tripwire and tripwireHook dupe
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) {
|
||||||
|
+ level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3);
|
||||||
|
+ level.getBlockState(blockPos1);
|
||||||
|
+ } else {
|
||||||
|
+ BlockState blockState3 = level.getBlockState(blockPos1);
|
||||||
|
+ if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
|
||||||
|
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3); // Paper - prevent tripwire from updating
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+ // Luminol end - tripwire and tripwireHook dupe
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
|
||||||
|
index 49b810ae9d9a8d0718a5f8c512e15a5573ed04fd..7d5fc6860ed426c4906f8c3eb2c10fd6db4296e5 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
|
||||||
|
@@ -28,6 +28,11 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
|
||||||
|
// CraftBukkit end
|
||||||
|
BlockPos.MutableBlockPos mutableBlockPos = pos.mutable();
|
||||||
|
|
||||||
|
+ // Luminol start - tripwire behavior modifier
|
||||||
|
+ java.util.List<BlockPos> blockList1 = new java.util.ArrayList<>();
|
||||||
|
+ java.util.List<BlockPos> blockList2 = new java.util.ArrayList<>();
|
||||||
|
+ boolean flag21 = !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode, "VANILLA20")
|
||||||
|
+ && !java.util.Objects.equals(me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode, "MIXED");
|
||||||
|
for (int i = -2; i <= 2; i++) {
|
||||||
|
for (int i1 = -2; i1 <= 2; i1++) {
|
||||||
|
for (int i2 = -1; i2 < 3; i2++) {
|
||||||
|
@@ -35,7 +40,29 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
|
||||||
|
Block block = i2 == -1 ? Blocks.OBSIDIAN : Blocks.AIR;
|
||||||
|
if (!blockList.getBlockState(blockPos).is(block)) { // CraftBukkit
|
||||||
|
if (dropBlocks) {
|
||||||
|
- blockList.destroyBlock(blockPos, true, null); // CraftBukkit
|
||||||
|
+ boolean flag = false;
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) {
|
||||||
|
+ switch (me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.behaviorMode) {
|
||||||
|
+ case "VANILLA20": {
|
||||||
|
+ flag = true;
|
||||||
|
+ }
|
||||||
|
+ case "MIXED": {
|
||||||
|
+ net.minecraft.world.level.block.state.BlockState state = level.getBlockState(blockPos);
|
||||||
|
+ if (state.is(Blocks.TRIPWIRE)) {
|
||||||
|
+ if (state.getValue(net.minecraft.world.level.block.TripWireBlock.DISARMED)) {
|
||||||
|
+ flag = true;
|
||||||
|
+ blockList2.add(blockPos.immutable());
|
||||||
|
+ }
|
||||||
|
+ if (!flag) {
|
||||||
|
+ flag = checkString(blockList2, blockPos);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ default: {} // Luminol - 1.21 & default Logic - default empty
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (flag) blockList1.add(blockPos.immutable());
|
||||||
|
+ else blockList.destroyBlock(blockPos, true, null); // CraftBukkit
|
||||||
|
}
|
||||||
|
|
||||||
|
blockList.setBlock(blockPos, block.defaultBlockState(), 3); // CraftBukkit
|
||||||
|
@@ -53,11 +80,30 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
|
||||||
|
if (portalEvent.isCancelled()) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (dropBlocks) {
|
||||||
|
- blockList.placeBlocks(state -> level.destroyBlock(state.getPosition(), true, null));
|
||||||
|
+ if (flag21 || !me.earthme.luminol.config.modules.misc.TripwireBehaviorConfig.enabled) {
|
||||||
|
+ if (dropBlocks) {
|
||||||
|
+ blockList.placeBlocks(state -> level.destroyBlock(state.getPosition(), true, null));
|
||||||
|
+ } else {
|
||||||
|
+ blockList.placeBlocks();
|
||||||
|
+ }
|
||||||
|
} else {
|
||||||
|
+ if (dropBlocks) {
|
||||||
|
+ blockList.getSnapshotBlocks().forEach((state) -> {
|
||||||
|
+ level.destroyBlock(state.getPosition(), !blockList1.contains(state.getPosition()), null);
|
||||||
|
+ });
|
||||||
|
+ // Luminol - prevent tripwire dupe in end platform generate
|
||||||
|
+ }
|
||||||
|
blockList.placeBlocks();
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ private static boolean checkString(java.util.List<BlockPos> blockList, BlockPos blockPos) {
|
||||||
|
+ for (BlockPos pos : blockList) {
|
||||||
|
+ if (pos.getY() != blockPos.getY()) continue;
|
||||||
|
+ if (pos.getX() == blockPos.getX() || pos.getZ() == blockPos.getZ()) return true;
|
||||||
|
+ }
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // Luminol end - tripwire behavior modifier
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:31:09 +0800
|
||||||
|
Subject: [PATCH] Add config to verify signature only in online-mode
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/player/ProfilePublicKey.java b/net/minecraft/world/entity/player/ProfilePublicKey.java
|
||||||
|
index 15293ed76018f4790754721bd687cbbf906c71dc..c2eaf52590f417b9562edcc70cca68ad9904fe90 100644
|
||||||
|
--- a/net/minecraft/world/entity/player/ProfilePublicKey.java
|
||||||
|
+++ b/net/minecraft/world/entity/player/ProfilePublicKey.java
|
||||||
|
@@ -23,7 +23,7 @@ public record ProfilePublicKey(ProfilePublicKey.Data data) {
|
||||||
|
public static final Codec<ProfilePublicKey> TRUSTED_CODEC = ProfilePublicKey.Data.CODEC.xmap(ProfilePublicKey::new, ProfilePublicKey::data);
|
||||||
|
|
||||||
|
public static ProfilePublicKey createValidated(SignatureValidator signatureValidator, UUID profileId, ProfilePublicKey.Data data) throws ProfilePublicKey.ValidationException {
|
||||||
|
- if (!data.validateSignature(signatureValidator, profileId)) {
|
||||||
|
+ if (!data.validateSignature(signatureValidator, profileId) && (org.bukkit.Bukkit.getServer().getOnlineMode() && me.earthme.luminol.config.modules.misc.PublickeyVerifyConfig.enabled)) { // Luminol - Verify signature only in online-mode
|
||||||
|
throw new ProfilePublicKey.ValidationException(INVALID_SIGNATURE, org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PUBLIC_KEY_SIGNATURE); // Paper - kick event causes
|
||||||
|
} else {
|
||||||
|
return new ProfilePublicKey(data);
|
||||||
@@ -0,0 +1,390 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:49:22 +0800
|
||||||
|
Subject: [PATCH] Add configurable region format framework & linear v2 region
|
||||||
|
format support
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
|
||||||
|
index a814512fcfb85312474ae2c2c21443843bf57831..2e084a5b28cbe4737f48c25e10af589213525362 100644
|
||||||
|
--- a/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
|
||||||
|
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
|
||||||
|
@@ -8,9 +8,9 @@ public interface ChunkSystemRegionFileStorage {
|
||||||
|
|
||||||
|
public boolean moonrise$doesRegionFileNotExistNoIO(final int chunkX, final int chunkZ);
|
||||||
|
|
||||||
|
- public RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ);
|
||||||
|
+ public abomination.IRegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
- public RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException;
|
||||||
|
+ public abomination.IRegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException; // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
public MoonriseRegionFileIO.RegionDataController.WriteData moonrise$startWrite(
|
||||||
|
final int chunkX, final int chunkZ, final CompoundTag compound
|
||||||
|
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
|
||||||
|
index f5ed467c0880e4bcdf1b9ae773a5aac21c4381c3..f517079dad3b7e29af33feb78fe344d006570aab 100644
|
||||||
|
--- a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
|
||||||
|
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
|
||||||
|
@@ -1260,7 +1260,7 @@ public final class MoonriseRegionFileIO {
|
||||||
|
this.regionDataController.finishWrite(this.chunkX, this.chunkZ, writeData);
|
||||||
|
// Paper start - flush regionfiles on save
|
||||||
|
if (this.world.paperConfig().chunks.flushRegionsOnSave) {
|
||||||
|
- final RegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ);
|
||||||
|
+ final abomination.IRegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ); // Luminol - Add configurable region file
|
||||||
|
if (regionFile != null) {
|
||||||
|
regionFile.flush();
|
||||||
|
} // else: evicted from cache, which should have called flush
|
||||||
|
@@ -1470,7 +1470,7 @@ public final class MoonriseRegionFileIO {
|
||||||
|
|
||||||
|
public static interface IORunnable {
|
||||||
|
|
||||||
|
- public void run(final RegionFile regionFile) throws IOException;
|
||||||
|
+ public void run(final abomination.IRegionFile regionFile) throws IOException; // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java b/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
|
||||||
|
index 51c126735ace8fdde89ad97b5cab62f244212db0..c7d4d944eb198ac53a3eeae717a25c7d5815c8c1 100644
|
||||||
|
--- a/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
|
||||||
|
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/storage/ChunkSystemChunkBuffer.java
|
||||||
|
@@ -8,5 +8,5 @@ public interface ChunkSystemChunkBuffer {
|
||||||
|
|
||||||
|
public void moonrise$setWriteOnClose(final boolean value);
|
||||||
|
|
||||||
|
- public void moonrise$write(final RegionFile regionFile) throws IOException;
|
||||||
|
+ public void moonrise$write(final abomination.IRegionFile regionFile) throws IOException; // Luminol - Configurable region file format
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
|
index 7e4fe0f33f69ae37fd8b1ffbfc8795a2b7ba3cad..8502fdb94142cf12b8d9d4900d8a2440051051ae 100644
|
||||||
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
|
@@ -981,10 +981,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
// CraftBukkit end
|
||||||
|
if (flush) {
|
||||||
|
for (ServerLevel serverLevel2 : this.getAllLevels()) {
|
||||||
|
- LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", serverLevel2.getChunkSource().chunkMap.getStorageName());
|
||||||
|
+ LOGGER.info("ThreadedChunkStorage ({}): All chunks are saved", serverLevel2.getChunkSource().chunkMap.getStorageName()); // Luminol - configurable region format
|
||||||
|
}
|
||||||
|
|
||||||
|
- LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
|
||||||
|
+ LOGGER.info("ThreadedChunkStorage: All dimensions are saved"); // Luminol - configurable region format
|
||||||
|
}
|
||||||
|
|
||||||
|
return flag;
|
||||||
|
diff --git a/net/minecraft/util/worldupdate/WorldUpgrader.java b/net/minecraft/util/worldupdate/WorldUpgrader.java
|
||||||
|
index 79d57ca8a7870a02e95562d89cbd4341d8282660..9ac0e2f5ee4e8ac2e70c5445a7c9f47f0e414929 100644
|
||||||
|
--- a/net/minecraft/util/worldupdate/WorldUpgrader.java
|
||||||
|
+++ b/net/minecraft/util/worldupdate/WorldUpgrader.java
|
||||||
|
@@ -75,7 +75,7 @@ public class WorldUpgrader implements AutoCloseable {
|
||||||
|
volatile int skipped;
|
||||||
|
final Reference2FloatMap<ResourceKey<Level>> progressMap = Reference2FloatMaps.synchronize(new Reference2FloatOpenHashMap<>());
|
||||||
|
volatile Component status = Component.translatable("optimizeWorld.stage.counting");
|
||||||
|
- static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
|
||||||
|
+ static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\\\"+ net.minecraft.world.level.chunk.storage.RegionFileStorage.getExtensionName() +"$"); // Luminol - Configurable region file format
|
||||||
|
final DimensionDataStorage overworldDataStorage;
|
||||||
|
|
||||||
|
public WorldUpgrader(
|
||||||
|
@@ -272,7 +272,7 @@ public class WorldUpgrader implements AutoCloseable {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<WorldUpgrader.FileToUpgrade> getAllChunkPositions(RegionStorageInfo regionStorageInfo, Path path) {
|
||||||
|
- File[] files = path.toFile().listFiles((directory, filename) -> filename.endsWith(".mca"));
|
||||||
|
+ File[] files = path.toFile().listFiles((directory, filename) -> filename.endsWith(net.minecraft.world.level.chunk.storage.RegionFileStorage.getExtensionName())); // Luminol - Configurable region file format
|
||||||
|
if (files == null) {
|
||||||
|
return List.of();
|
||||||
|
} else {
|
||||||
|
@@ -285,7 +285,7 @@ public class WorldUpgrader implements AutoCloseable {
|
||||||
|
int i1 = Integer.parseInt(matcher.group(2)) << 5;
|
||||||
|
List<ChunkPos> list1 = Lists.newArrayList();
|
||||||
|
|
||||||
|
- try (RegionFile regionFile = new RegionFile(regionStorageInfo, file.toPath(), path, true)) {
|
||||||
|
+ try (abomination.IRegionFile regionFile = net.minecraft.world.level.chunk.storage.RegionFileStorage.createNew(regionStorageInfo, file.toPath(), path, true)) { // Luminol - Configurable region file format
|
||||||
|
for (int i2 = 0; i2 < 32; i2++) {
|
||||||
|
for (int i3 = 0; i3 < 32; i3++) {
|
||||||
|
ChunkPos chunkPos = new ChunkPos(i2 + i, i3 + i1);
|
||||||
|
@@ -333,7 +333,7 @@ public class WorldUpgrader implements AutoCloseable {
|
||||||
|
|
||||||
|
protected abstract boolean tryProcessOnePosition(T chunkStorage, ChunkPos chunkPos, ResourceKey<Level> dimension);
|
||||||
|
|
||||||
|
- private void onFileFinished(RegionFile regionFile) {
|
||||||
|
+ private void onFileFinished(abomination.IRegionFile regionFile) { // Luminol - Configurable region file format
|
||||||
|
if (WorldUpgrader.this.recreateRegionFiles) {
|
||||||
|
if (this.previousWriteFuture != null) {
|
||||||
|
this.previousWriteFuture.join();
|
||||||
|
@@ -438,7 +438,7 @@ public class WorldUpgrader implements AutoCloseable {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- record FileToUpgrade(RegionFile file, List<ChunkPos> chunksToUpgrade) {
|
||||||
|
+ record FileToUpgrade(abomination.IRegionFile file, List<ChunkPos> chunksToUpgrade) { // Luminol - Configurable region file format
|
||||||
|
}
|
||||||
|
|
||||||
|
class PoiUpgrader extends WorldUpgrader.SimpleRegionStorageUpgrader {
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/storage/RegionFile.java b/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||||||
|
index 22f3aa1674664906e8ec45372d758d79017e3987..76f1b5bb94b82044d72658d4b187dd020d4c9012 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/storage/RegionFile.java
|
||||||
|
@@ -22,7 +22,7 @@ import net.minecraft.util.profiling.jfr.JvmProfiler;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
-public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemRegionFile { // Paper - rewrite chunk system
|
||||||
|
+public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemRegionFile , abomination.IRegionFile{ // Paper - rewrite chunk system // Luminol - Configurable region file format
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
|
||||||
|
private static final int SECTOR_BYTES = 4096;
|
||||||
|
@@ -130,7 +130,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
|
||||||
|
return this.recalculateCount.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
- boolean recalculateHeader() throws IOException {
|
||||||
|
+ public boolean recalculateHeader() throws IOException { // Luminol - Configurable region file format // Luminol - Configurable region file format
|
||||||
|
if (!this.canRecalcHeader) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@@ -794,7 +794,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- protected synchronized void write(ChunkPos chunkPos, ByteBuffer chunkData) throws IOException {
|
||||||
|
+ public synchronized void write(ChunkPos chunkPos, ByteBuffer chunkData) throws IOException { // Luminol - Configurable region file format
|
||||||
|
int offsetIndex = getOffsetIndex(chunkPos);
|
||||||
|
int i = this.offsets.get(offsetIndex);
|
||||||
|
int sectorNumber = getSectorNumber(i);
|
||||||
|
@@ -912,7 +912,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public final void moonrise$write(final RegionFile regionFile) throws IOException {
|
||||||
|
+ public final void moonrise$write(final abomination.IRegionFile regionFile) throws IOException { // Luminol - Configurable region file format
|
||||||
|
regionFile.write(this.pos, ByteBuffer.wrap(this.buf, 0, this.count));
|
||||||
|
}
|
||||||
|
// Paper end - rewrite chunk system
|
||||||
|
@@ -978,11 +978,11 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
|
||||||
|
return (x & 31) + (z & 31) * 32;
|
||||||
|
}
|
||||||
|
|
||||||
|
- synchronized boolean isOversized(int x, int z) {
|
||||||
|
+ public synchronized boolean isOversized(int x, int z) { // Luminol - Configurable region file format
|
||||||
|
return this.oversized[getChunkIndex(x, z)] == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- synchronized void setOversized(int x, int z, boolean oversized) throws IOException {
|
||||||
|
+ public synchronized void setOversized(int x, int z, boolean oversized) throws IOException { // Luminol - Configurable region file format
|
||||||
|
final int offset = getChunkIndex(x, z);
|
||||||
|
boolean previous = this.oversized[offset] == 1;
|
||||||
|
this.oversized[offset] = (byte) (oversized ? 1 : 0);
|
||||||
|
@@ -1021,7 +1021,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
|
||||||
|
return this.path.getParent().resolve(this.path.getFileName().toString().replaceAll("\\.mca$", "") + "_oversized_" + x + "_" + z + ".nbt");
|
||||||
|
}
|
||||||
|
|
||||||
|
- synchronized net.minecraft.nbt.CompoundTag getOversizedData(int x, int z) throws IOException {
|
||||||
|
+ public synchronized net.minecraft.nbt.CompoundTag getOversizedData(int x, int z) throws IOException { // Luminol - Configurable region file format
|
||||||
|
Path file = getOversizedFile(x, z);
|
||||||
|
try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new java.util.zip.InflaterInputStream(Files.newInputStream(file))))) {
|
||||||
|
return net.minecraft.nbt.NbtIo.read((java.io.DataInput) out);
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
||||||
|
index 384f2cd090d6d23bd1308d6e82c24338f2bf55d1..a81245aff4cc982b9eaca976ebbb54a8188b247b 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
||||||
|
@@ -18,7 +18,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper
|
||||||
|
public static final String ANVIL_EXTENSION = ".mca";
|
||||||
|
private static final int MAX_CACHE_SIZE = 256;
|
||||||
|
- public final Long2ObjectLinkedOpenHashMap<RegionFile> regionCache = new Long2ObjectLinkedOpenHashMap<>();
|
||||||
|
+ public final Long2ObjectLinkedOpenHashMap<abomination.IRegionFile> regionCache = new Long2ObjectLinkedOpenHashMap<>(); // Luminol - Configurable region file format
|
||||||
|
private final RegionStorageInfo info;
|
||||||
|
private final Path folder;
|
||||||
|
private final boolean sync;
|
||||||
|
@@ -33,7 +33,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
@Nullable
|
||||||
|
public static ChunkPos getRegionFileCoordinates(Path file) {
|
||||||
|
String fileName = file.getFileName().toString();
|
||||||
|
- if (!fileName.startsWith("r.") || !fileName.endsWith(".mca")) {
|
||||||
|
+ if (!fileName.startsWith("r.") || !fileName.endsWith(getExtensionName())) { // Luminol - Configurable region file format
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -58,8 +58,27 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
private static final int MAX_NON_EXISTING_CACHE = 1024 * 4;
|
||||||
|
private final it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet nonExistingRegionFiles = new it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet();
|
||||||
|
private static String getRegionFileName(final int chunkX, final int chunkZ) {
|
||||||
|
- return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + ".mca";
|
||||||
|
+ return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + getExtensionName(); // Luminol - Configurable region file format
|
||||||
|
}
|
||||||
|
+ // Luminol start - Configurable region file format
|
||||||
|
+ public static abomination.IRegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
|
||||||
|
+ final me.earthme.luminol.utils.EnumRegionFormat regionFormat = me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat;
|
||||||
|
+ final String fullFileName = filePath.getFileName().toString();
|
||||||
|
+ final String[] fullNameSplit = fullFileName.split("\\.");
|
||||||
|
+ final String extensionName = fullNameSplit[fullNameSplit.length - 1];
|
||||||
|
+
|
||||||
|
+ if (!regionFormat.getArgument().equalsIgnoreCase(extensionName)) {
|
||||||
|
+ net.minecraft.server.MinecraftServer.setFatalException(new RuntimeException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument()));
|
||||||
|
+ throw new IOException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return regionFormat.getCreator().create(new me.earthme.luminol.utils.RegionCreatorInfo(info, filePath, folder, sync));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static String getExtensionName() {
|
||||||
|
+ return "." + me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat.getArgument();
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
|
||||||
|
private boolean doesRegionFilePossiblyExist(final long position) {
|
||||||
|
synchronized (this.nonExistingRegionFiles) {
|
||||||
|
@@ -93,15 +112,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public synchronized final RegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ) {
|
||||||
|
+ public synchronized final abomination.IRegionFile moonrise$getRegionFileIfLoaded(final int chunkX, final int chunkZ) { // Luminol - Configurable region file format
|
||||||
|
return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkX >> REGION_SHIFT, chunkZ >> REGION_SHIFT));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
- public synchronized final RegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException {
|
||||||
|
+ public synchronized final abomination.IRegionFile moonrise$getRegionFileIfExists(final int chunkX, final int chunkZ) throws IOException { // Luminol - Configurable region file format
|
||||||
|
final long key = ChunkPos.asLong(chunkX >> REGION_SHIFT, chunkZ >> REGION_SHIFT);
|
||||||
|
|
||||||
|
- RegionFile ret = this.regionCache.getAndMoveToFirst(key);
|
||||||
|
+ abomination.IRegionFile ret = this.regionCache.getAndMoveToFirst(key); // Luminol - Configurable region file format
|
||||||
|
if (ret != null) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@@ -125,7 +144,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
|
||||||
|
FileUtil.createDirectoriesSafe(this.folder);
|
||||||
|
|
||||||
|
- ret = new RegionFile(this.info, regionPath, this.folder, this.sync);
|
||||||
|
+ ret = this.createNew(this.info, regionPath, this.folder, this.sync); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
this.regionCache.putAndMoveToFirst(key, ret);
|
||||||
|
|
||||||
|
@@ -144,7 +163,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
}
|
||||||
|
|
||||||
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
||||||
|
- final RegionFile regionFile = this.getRegionFile(pos);
|
||||||
|
+ final abomination.IRegionFile regionFile = this.getRegionFile(pos); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
// note: not required to keep regionfile loaded after this call, as the write param takes a regionfile as input
|
||||||
|
// (and, the regionfile parameter is unused for writing until the write call)
|
||||||
|
@@ -178,7 +197,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
) throws IOException {
|
||||||
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
||||||
|
if (writeData.result() == ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE) {
|
||||||
|
- final RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);
|
||||||
|
+ final abomination.IRegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ); // Luminol - Configurable region file format
|
||||||
|
if (regionFile != null) {
|
||||||
|
regionFile.clear(pos);
|
||||||
|
} // else: didn't exist
|
||||||
|
@@ -193,7 +212,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
public final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.ReadData moonrise$readData(
|
||||||
|
final int chunkX, final int chunkZ
|
||||||
|
) throws IOException {
|
||||||
|
- final RegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ);
|
||||||
|
+ final abomination.IRegionFile regionFile = this.moonrise$getRegionFileIfExists(chunkX, chunkZ); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
final DataInputStream input = regionFile == null ? null : regionFile.getChunkDataInputStream(new ChunkPos(chunkX, chunkZ));
|
||||||
|
|
||||||
|
@@ -238,7 +257,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
|
||||||
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
||||||
|
final ChunkPos headerChunkPos = SerializableChunkData.getChunkCoordinate(ret);
|
||||||
|
- final RegionFile regionFile = this.getRegionFile(pos);
|
||||||
|
+ final abomination.IRegionFile regionFile = this.getRegionFile(pos); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
if (regionFile.getRecalculateCount() != readData.recalculateCount()) {
|
||||||
|
return null;
|
||||||
|
@@ -262,7 +281,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
}
|
||||||
|
// Paper end - rewrite chunk system
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
- public RegionFile getRegionFile(ChunkPos chunkcoordintpair) throws IOException {
|
||||||
|
+ public abomination.IRegionFile getRegionFile(ChunkPos chunkcoordintpair) throws IOException { // Luminol - Configurable region file format
|
||||||
|
return this.getRegionFile(chunkcoordintpair, false);
|
||||||
|
}
|
||||||
|
// Paper end - rewrite chunk system
|
||||||
|
@@ -274,7 +293,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
this.isChunkData = isChunkDataFolder(this.folder); // Paper - recalculate region file headers
|
||||||
|
}
|
||||||
|
|
||||||
|
- @org.jetbrains.annotations.Contract("_, false -> !null") @Nullable private RegionFile getRegionFile(ChunkPos chunkPos, boolean existingOnly) throws IOException { // CraftBukkit
|
||||||
|
+ @org.jetbrains.annotations.Contract("_, false -> !null") @Nullable private abomination.IRegionFile getRegionFile(ChunkPos chunkPos, boolean existingOnly) throws IOException { // CraftBukkit
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
if (existingOnly) {
|
||||||
|
return this.moonrise$getRegionFileIfExists(chunkPos.x, chunkPos.z);
|
||||||
|
@@ -282,7 +301,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
synchronized (this) {
|
||||||
|
final long key = ChunkPos.asLong(chunkPos.x >> REGION_SHIFT, chunkPos.z >> REGION_SHIFT);
|
||||||
|
|
||||||
|
- RegionFile ret = this.regionCache.getAndMoveToFirst(key);
|
||||||
|
+ abomination.IRegionFile ret = this.regionCache.getAndMoveToFirst(key); // Luminol - Configurable region file format
|
||||||
|
if (ret != null) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@@ -297,7 +316,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
|
||||||
|
FileUtil.createDirectoriesSafe(this.folder);
|
||||||
|
|
||||||
|
- ret = new RegionFile(this.info, regionPath, this.folder, this.sync);
|
||||||
|
+ ret = this.createNew(this.info, regionPath, this.folder, this.sync); // Luminol - Configurable region file format
|
||||||
|
|
||||||
|
this.regionCache.putAndMoveToFirst(key, ret);
|
||||||
|
|
||||||
|
@@ -311,7 +330,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
- private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
|
||||||
|
+ private static CompoundTag readOversizedChunk(abomination.IRegionFile regionfile, ChunkPos chunkCoordinate) throws IOException { // Luminol - Configurable region file format
|
||||||
|
synchronized (regionfile) {
|
||||||
|
try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
|
||||||
|
CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
|
||||||
|
@@ -346,7 +365,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
@Nullable
|
||||||
|
public CompoundTag read(ChunkPos chunkPos) throws IOException {
|
||||||
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
||||||
|
- RegionFile regionFile = this.getRegionFile(chunkPos, true);
|
||||||
|
+ abomination.IRegionFile regionFile = this.getRegionFile(chunkPos, true); // Luminol - Configurable region file format
|
||||||
|
if (regionFile == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
@@ -385,7 +404,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
|
||||||
|
public void scanChunk(ChunkPos chunkPos, StreamTagVisitor visitor) throws IOException {
|
||||||
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
||||||
|
- RegionFile regionFile = this.getRegionFile(chunkPos, true);
|
||||||
|
+ abomination.IRegionFile regionFile = this.getRegionFile(chunkPos, true); // Luminol - Configurable region file format
|
||||||
|
if (regionFile == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -399,7 +418,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
}
|
||||||
|
|
||||||
|
public void write(ChunkPos chunkPos, @Nullable CompoundTag chunkData) throws IOException { // Paper - rewrite chunk system - public
|
||||||
|
- RegionFile regionFile = this.getRegionFile(chunkPos, chunkData == null); // CraftBukkit // Paper - rewrite chunk system
|
||||||
|
+ abomination.IRegionFile regionFile = this.getRegionFile(chunkPos, chunkData == null); // CraftBukkit // Paper - rewrite chunk system // Luminol - Configurable region file format
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
if (regionFile == null) {
|
||||||
|
// if the RegionFile doesn't exist, no point in deleting from it
|
||||||
|
@@ -429,7 +448,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
synchronized (this) {
|
||||||
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
||||||
|
- for (final RegionFile regionFile : this.regionCache.values()) {
|
||||||
|
+ for (final abomination.IRegionFile regionFile : this.regionCache.values()) { // Luminol - Configurable region file format
|
||||||
|
try {
|
||||||
|
regionFile.close();
|
||||||
|
} catch (final IOException ex) {
|
||||||
|
@@ -445,7 +464,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
synchronized (this) {
|
||||||
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
||||||
|
- for (final RegionFile regionFile : this.regionCache.values()) {
|
||||||
|
+ for (final abomination.IRegionFile regionFile : this.regionCache.values()) { // Luminol - Configurable region file format
|
||||||
|
try {
|
||||||
|
regionFile.flush();
|
||||||
|
} catch (final IOException ex) {
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:39:35 +0800
|
||||||
|
Subject: [PATCH] Add fix for off region adult following ai behavior
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
|
||||||
|
index d69cb6f45cba4234605c7a0f7ddf8f331eee0c62..2ac16196b96041abc82bd3230d8305fe3333831f 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
|
||||||
|
@@ -29,6 +29,12 @@ public class BabyFollowAdult {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
LivingEntity livingEntity = instance.get(memoryAccessor);
|
||||||
|
+ // Luminol start - Fix off world entity following which caused async issue
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(livingEntity)) {
|
||||||
|
+ memoryAccessor.erase();
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
if (entity.closerThan(livingEntity, followRange.getMaxValue() + 1) && !entity.closerThan(livingEntity, followRange.getMinValue())) {
|
||||||
|
// CraftBukkit start
|
||||||
|
org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(entity, livingEntity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER);
|
||||||
|
@@ -39,6 +45,12 @@ public class BabyFollowAdult {
|
||||||
|
memoryAccessor.erase();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
+ // Luminol start - Fix off region baby follow adult ai
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(((org.bukkit.craftbukkit.entity.CraftEntity)event.getTarget()).getHandleRaw())) {
|
||||||
|
+ memoryAccessor.erase();
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
livingEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle();
|
||||||
|
// CraftBukkit end
|
||||||
|
WalkTarget walkTarget = new WalkTarget(
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kercute <A3167717663@hotmail.com>
|
||||||
|
Date: Sun, 16 Mar 2025 23:31:41 +0800
|
||||||
|
Subject: [PATCH] Add force the data command to be enabled config
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
|
||||||
|
index 68f2f2d8067d11fa4459c9fa21bc3fd4134b9157..14719cca5ff91c8647b3b616b2dfd4d153946d92 100644
|
||||||
|
--- a/net/minecraft/commands/Commands.java
|
||||||
|
+++ b/net/minecraft/commands/Commands.java
|
||||||
|
@@ -189,7 +189,9 @@ public class Commands {
|
||||||
|
ClearInventoryCommands.register(this.dispatcher, context);
|
||||||
|
//CloneCommands.register(this.dispatcher, context); // Folia - region threading - TODO
|
||||||
|
DamageCommand.register(this.dispatcher, context);
|
||||||
|
- //DataCommands.register(this.dispatcher); // Folia - region threading - TODO
|
||||||
|
+ 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
|
||||||
|
//DebugCommand.register(this.dispatcher); // Folia - region threading - TODO
|
||||||
|
DefaultGameModeCommands.register(this.dispatcher);
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Mon, 27 Jan 2025 13:01:55 +0800
|
||||||
|
Subject: [PATCH] Add tick regions api
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/io/papermc/paper/threadedregions/ThreadedRegionizer.java
|
||||||
|
index 604385af903845d966382ad0a4168798e4ed4a0e..45aa5484b1cdb317ed55f1b001dbfe13a720b2a7 100644
|
||||||
|
--- a/io/papermc/paper/threadedregions/ThreadedRegionizer.java
|
||||||
|
+++ b/io/papermc/paper/threadedregions/ThreadedRegionizer.java
|
||||||
|
@@ -43,6 +43,7 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
|
||||||
|
private final RegionCallbacks<R, S> callbacks;
|
||||||
|
private final StampedLock regionLock = new StampedLock();
|
||||||
|
private Thread writeLockOwner;
|
||||||
|
+ public final me.earthme.luminol.api.ThreadedRegionizer threadedRegionizerAPI; // Luminol - Tick region API
|
||||||
|
|
||||||
|
/*
|
||||||
|
static final record Operation(String type, int chunkX, int chunkZ) {}
|
||||||
|
@@ -72,6 +73,7 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
|
||||||
|
this.world = world;
|
||||||
|
this.callbacks = callbacks;
|
||||||
|
//this.loadTestData();
|
||||||
|
+ this.threadedRegionizerAPI = new me.earthme.luminol.api.impl.ThreadedRegionizerImpl(this.world); // Luminol - Tick region API
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -693,6 +695,7 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
|
||||||
|
|
||||||
|
private final ReferenceOpenHashSet<ThreadedRegion<R, S>> mergeIntoLater = new ReferenceOpenHashSet<>();
|
||||||
|
private final ReferenceOpenHashSet<ThreadedRegion<R, S>> expectingMergeFrom = new ReferenceOpenHashSet<>();
|
||||||
|
+ public final me.earthme.luminol.api.ThreadedRegion threadedRegionAPI = new me.earthme.luminol.api.impl.ThreadedRegionImpl((ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>) this); // Luminol - Tickregion API
|
||||||
|
|
||||||
|
public ThreadedRegion(final ThreadedRegionizer<R, S> regioniser) {
|
||||||
|
this.regioniser = regioniser;
|
||||||
|
@@ -819,7 +822,7 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
|
||||||
|
return this.deadSections.size() == this.sectionByKey.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
- private final double getDeadSectionPercent() {
|
||||||
|
+ public final double getDeadSectionPercent() { // Luminol - Threaded regions api
|
||||||
|
return (double)this.deadSections.size() / (double)this.sectionByKey.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java
|
||||||
|
index 988fe74578065c9464f5639e5cc6af79619edef5..bfb39cbf1ba58d02da7e35300eb95872747506e8 100644
|
||||||
|
--- a/io/papermc/paper/threadedregions/TickRegions.java
|
||||||
|
+++ b/io/papermc/paper/threadedregions/TickRegions.java
|
||||||
|
@@ -134,6 +134,7 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
|
||||||
|
private final AtomicInteger entityCount = new AtomicInteger();
|
||||||
|
private final AtomicInteger playerCount = new AtomicInteger();
|
||||||
|
private final AtomicInteger chunkCount = new AtomicInteger();
|
||||||
|
+ public final me.earthme.luminol.api.RegionStats regionStatsAPI = new me.earthme.luminol.api.impl.RegionStatsImpl(this); // Luminol - Tickregion API
|
||||||
|
|
||||||
|
public int getEntityCount() {
|
||||||
|
return this.entityCount.get();
|
||||||
|
@@ -183,6 +184,7 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
|
||||||
|
private final RegionStats regionStats;
|
||||||
|
|
||||||
|
public volatile ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler; // Folia - profiler
|
||||||
|
+ public final me.earthme.luminol.api.TickRegionData tickRegionDataAPI = new me.earthme.luminol.api.impl.TickRegionDataImpl(this); // Luminol - Tickregion API
|
||||||
|
|
||||||
|
private TickRegionData(final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region) {
|
||||||
|
this.region = region;
|
||||||
@@ -0,0 +1,341 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:27:31 +0800
|
||||||
|
Subject: [PATCH] Add tpsbar with chunkhot membar and regionbar
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/ca/spottedleaf/moonrise/paper/util/BaseChunkSystemHooks.java b/ca/spottedleaf/moonrise/paper/util/BaseChunkSystemHooks.java
|
||||||
|
index bd3ce123652af11974be4cbf8d2e96f1b2ee0a68..5f26fd89704aa3fd9c37a1d68a7c4c65ce1e7a5d 100644
|
||||||
|
--- a/ca/spottedleaf/moonrise/paper/util/BaseChunkSystemHooks.java
|
||||||
|
+++ b/ca/spottedleaf/moonrise/paper/util/BaseChunkSystemHooks.java
|
||||||
|
@@ -131,6 +131,7 @@ public abstract class BaseChunkSystemHooks implements ca.spottedleaf.moonrise.co
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChunkNotTicking(final LevelChunk chunk, final ChunkHolder holder) {
|
||||||
|
+ chunk.getChunkHot().clear(); // KioCG
|
||||||
|
chunk.getLevel().getCurrentWorldData().removeTickingChunk(chunk); // Folia - region threading
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
|
index 8502fdb94142cf12b8d9d4900d8a2440051051ae..d824b49b98266539258a83f9a36f73c5961a1588 100644
|
||||||
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
|
@@ -1664,7 +1664,46 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
// Folia end - region threading
|
||||||
|
//this.tickCount++; // Folia - region threading
|
||||||
|
//this.tickRateManager.tick(); // Folia - region threading
|
||||||
|
+ // KioCG start - ChunkHot
|
||||||
|
+ final ca.spottedleaf.moonrise.common.list.IteratorSafeOrderedReferenceSet<net.minecraft.world.level.chunk.LevelChunk> chunks = new ca.spottedleaf.moonrise.common.list.IteratorSafeOrderedReferenceSet<>();
|
||||||
|
+ if (region != null){
|
||||||
|
+ for (net.minecraft.world.level.chunk.LevelChunk chunk : region.world.getCurrentWorldData().getTickingChunks()) {
|
||||||
|
+ /* wait for rewrite - temporarily crash fix
|
||||||
|
+ for (net.minecraft.server.level.ServerChunkCache.ChunkAndHolder chunkAndHolder : region.world.getCurrentWorldData().getTickingChunks()){
|
||||||
|
+ final net.minecraft.world.level.chunk.LevelChunk chunk = chunkAndHolder.chunk();
|
||||||
|
+ */
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(region.world, chunk.locX, chunk.locZ)){
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ chunks.add(chunk);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (region != null && io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() % 20 == 0){
|
||||||
|
+ final java.util.Iterator<net.minecraft.world.level.chunk.LevelChunk> chunkIterator = chunks.unsafeIterator();
|
||||||
|
+ while (chunkIterator.hasNext()){
|
||||||
|
+ final net.minecraft.world.level.chunk.LevelChunk targetChunk = chunkIterator.next();
|
||||||
|
+
|
||||||
|
+ targetChunk.getChunkHot().nextTick();
|
||||||
|
+ targetChunk.getChunkHot().start();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ //KioCG end
|
||||||
|
this.tickChildren(hasTimeLeft, region); // Folia - region threading
|
||||||
|
+ // KioCG start - ChunkHot
|
||||||
|
+ if (region != null && io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() % 20 == 0){
|
||||||
|
+ final java.util.Iterator<net.minecraft.world.level.chunk.LevelChunk> chunkIterator = chunks.unsafeIterator();
|
||||||
|
+ while (chunkIterator.hasNext()){
|
||||||
|
+ final net.minecraft.world.level.chunk.LevelChunk targetChunk = chunkIterator.next();
|
||||||
|
+
|
||||||
|
+ if (!targetChunk.getChunkHot().isStarted()){
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ targetChunk.getChunkHot().stop();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ //KioCG end
|
||||||
|
if (false && nanos - this.lastServerStatus >= STATUS_EXPIRE_TIME_NANOS) { // Folia - region threading
|
||||||
|
this.lastServerStatus = nanos;
|
||||||
|
this.status = this.buildServerStatus();
|
||||||
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
index 61d63e5668e110e9c0b891959bf4cd7c91e54645..f07d3009caf964b8e1b5328bb3e28866e0c41955 100644
|
||||||
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
@@ -721,6 +721,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void stopServer() {
|
||||||
|
+ me.earthme.luminol.functions.GlobalServerTpsBar.cancelBarUpdateTask(); //Luminol - Tpsbar
|
||||||
|
+ me.earthme.luminol.functions.GlobalServerMemoryBar.cancelBarUpdateTask(); //Luminol - Memory bar
|
||||||
|
+ me.earthme.luminol.functions.GlobalServerRegionBar.cancelBarUpdateTask(); //Luminol - Region bar
|
||||||
|
super.stopServer();
|
||||||
|
//Util.shutdownExecutors(); // Paper - Improved watchdog support; moved into super
|
||||||
|
SkullBlockEntity.clear();
|
||||||
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
index 5e3be75b27ed609be005e8169dc84c125518253e..00482efc8e736e73ad136105ad7b9dd2cafd581f 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
@@ -1350,6 +1350,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
final int timerId = isActive ? entity.getType().tickTimerId : entity.getType().inactiveTickTimerId;
|
||||||
|
final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler();
|
||||||
|
profiler.startTimer(timerId);
|
||||||
|
+ LevelChunk levelChunk = entity.shouldTickHot() ? this.getChunkIfLoaded(entity.moonrise$getSectionX(),entity.moonrise$getSectionZ()) : null; // KioCG
|
||||||
|
+ if (levelChunk != null) levelChunk.getChunkHot().startTicking(); try { // KioCG
|
||||||
|
try {
|
||||||
|
// Folia end - profiler
|
||||||
|
if (isActive) { // Paper - EAR 2
|
||||||
|
@@ -1367,6 +1369,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
} else {entity.inactiveTick();} // Paper - EAR 2
|
||||||
|
profilerFiller.pop();
|
||||||
|
} finally { profiler.stopTimer(timerId); } // Folia - profiler
|
||||||
|
+ } finally { if (levelChunk != null) levelChunk.getChunkHot().stopTickingAndCount(); } // KioCG
|
||||||
|
|
||||||
|
for (Entity entity1 : entity.getPassengers()) {
|
||||||
|
this.tickPassenger(entity, entity1, isActive); // Paper - EAR 2
|
||||||
|
@@ -1386,6 +1389,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
final int timerId = isActive ? passengerEntity.getType().tickTimerId : passengerEntity.getType().inactiveTickTimerId;
|
||||||
|
final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler();
|
||||||
|
profiler.startTimer(timerId);
|
||||||
|
+ LevelChunk levelChunk = !(passengerEntity instanceof Player) ? this.getChunkIfLoaded(passengerEntity.blockPosition()) : null; // KioCG
|
||||||
|
+ if (levelChunk != null) levelChunk.getChunkHot().startTicking(); try { // KioCG
|
||||||
|
try {
|
||||||
|
// Folia end - profiler
|
||||||
|
passengerEntity.setOldPosAndRot();
|
||||||
|
@@ -1420,6 +1425,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
|
||||||
|
}
|
||||||
|
} finally { profiler.stopTimer(timerId); } // Folia - profiler
|
||||||
|
+ } finally { if (levelChunk != null) levelChunk.getChunkHot().stopTickingAndCount(); } // KioCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
index 5e7a9be34bec7eefbb46db1409bfd90351866ec2..4e3c545f6121d3846d81d776c29edc42d6204f5c 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
@@ -431,7 +431,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
|
||||||
|
public @Nullable String clientBrandName = null; // Paper - Brand support
|
||||||
|
public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
|
||||||
|
-
|
||||||
|
+ public volatile boolean isTpsBarVisible = false; //Luminol - Tps bar
|
||||||
|
+ public volatile boolean isMemBarVisible = false; //Luminol - Memory bar
|
||||||
|
+ public volatile boolean isRegionBarVisible = false; //Luminol - Region bar
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
|
||||||
|
private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
|
||||||
|
@@ -1025,8 +1027,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
this.trackEnteredOrExitedLavaOnVehicle();
|
||||||
|
this.updatePlayerAttributes();
|
||||||
|
this.advancements.flushDirty(this, true);
|
||||||
|
+
|
||||||
|
+ // KioCG start - ChunkHot
|
||||||
|
+ if (this.tickCount % 20 == 0){
|
||||||
|
+ this.nearbyChunkHot = this.refreshNearbyChunkHot();
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // KioCG start - ChunkHot
|
||||||
|
+ private volatile long nearbyChunkHot = 0;
|
||||||
|
+
|
||||||
|
+ public long getNearbyChunkHot() { return this.nearbyChunkHot; }
|
||||||
|
+
|
||||||
|
+ private long refreshNearbyChunkHot() {
|
||||||
|
+ long total = 0L;
|
||||||
|
+ int searchRadius = ((ServerLevel) this.level()).moonrise$getViewDistanceHolder().getViewDistances().tickViewDistance();
|
||||||
|
+ for (int i = this.moonrise$getSectionX() - searchRadius; i <= this.moonrise$getSectionX() + searchRadius; ++i) {
|
||||||
|
+ for (int j = this.moonrise$getSectionZ() - searchRadius; j <= this.moonrise$getSectionZ() + searchRadius; ++j) {
|
||||||
|
+ net.minecraft.world.level.chunk.LevelChunk targetChunk = this.level().getChunkIfLoaded(i, j);
|
||||||
|
+ if (targetChunk != null) {
|
||||||
|
+ total += targetChunk.getChunkHot().getAverage();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return total;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
+
|
||||||
|
+
|
||||||
|
private void updatePlayerAttributes() {
|
||||||
|
AttributeInstance attribute = this.getAttribute(Attributes.BLOCK_INTERACTION_RANGE);
|
||||||
|
if (attribute != null) {
|
||||||
|
diff --git a/net/minecraft/world/entity/AreaEffectCloud.java b/net/minecraft/world/entity/AreaEffectCloud.java
|
||||||
|
index ec20a5a6d7c8f65abda528fec36bec7bc71117f6..b971cd61db1cfa05b8f2fd6c8a2dac2e27851288 100644
|
||||||
|
--- a/net/minecraft/world/entity/AreaEffectCloud.java
|
||||||
|
+++ b/net/minecraft/world/entity/AreaEffectCloud.java
|
||||||
|
@@ -423,4 +423,11 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
|
||||||
|
return super.applyImplicitComponent(component, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index 49c76f150c913fdc21d0e253b78625e273f69a22..f5f03801da03089ea1d22de1012d90a2b7b17322 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -6218,4 +6218,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
|
||||||
|
}
|
||||||
|
// Paper end - Expose entity id counter
|
||||||
|
+
|
||||||
|
+ public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/LightningBolt.java b/net/minecraft/world/entity/LightningBolt.java
|
||||||
|
index b091a382624140acb3f3f82647bdd592b7ee1f95..81b4e418687536b54f4ee8bd131185a8547ae651 100644
|
||||||
|
--- a/net/minecraft/world/entity/LightningBolt.java
|
||||||
|
+++ b/net/minecraft/world/entity/LightningBolt.java
|
||||||
|
@@ -288,4 +288,11 @@ public class LightningBolt extends Entity {
|
||||||
|
public final boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
|
||||||
|
index 1240fb5394b1475c8e95a0e65bd03f2d15565d6f..d9ee3b56db44687cfcc6a75f44a1abbcc8ef95a9 100644
|
||||||
|
--- a/net/minecraft/world/entity/Mob.java
|
||||||
|
+++ b/net/minecraft/world/entity/Mob.java
|
||||||
|
@@ -1618,4 +1618,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||||
|
this.getNavigation().updatePathfinderMaxVisitedNodes();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return super.shouldTickHot() && (!this.removeWhenFarAway(0.0) || this.isPersistenceRequired() || this.requiresCustomPersistence());
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/animal/horse/TraderLlama.java b/net/minecraft/world/entity/animal/horse/TraderLlama.java
|
||||||
|
index 2cd1b988f44caf271a7d2dfccf118be53b77caba..d829b230ab366922697061bdbb9a4f1cdc00744f 100644
|
||||||
|
--- a/net/minecraft/world/entity/animal/horse/TraderLlama.java
|
||||||
|
+++ b/net/minecraft/world/entity/animal/horse/TraderLlama.java
|
||||||
|
@@ -157,4 +157,11 @@ public class TraderLlama extends Llama {
|
||||||
|
super.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return super.shouldTickHot() && !this.canDespawn();
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||||
|
index c2573946dd1244eb5d1ef2be7823211064daa80d..7e9662bf7c17b2f5eda2ff88970a23e4fb09456a 100644
|
||||||
|
--- a/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||||
|
+++ b/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||||
|
@@ -278,4 +278,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||||
|
return !pos.closerToCenterThan(this.trader.position(), distance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
|
||||||
|
index 73d1557f2d7d60a9a2ad2c3f710b0969c4c5cf40..47f62fbe97c559c25ad2bc67c18f2025c78e2c69 100644
|
||||||
|
--- a/net/minecraft/world/entity/player/Player.java
|
||||||
|
+++ b/net/minecraft/world/entity/player/Player.java
|
||||||
|
@@ -1493,6 +1493,13 @@ public abstract class Player extends LivingEntity {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
+
|
||||||
|
public Either<Player.BedSleepingProblem, Unit> startSleepInBed(BlockPos bedPos) {
|
||||||
|
// CraftBukkit start
|
||||||
|
return this.startSleepInBed(bedPos, false);
|
||||||
|
diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java
|
||||||
|
index b6cdd02ead8ecc38afd4e76fa0c19a9433550b1d..71c1473e470db82dffcf6be4b4ded61564577e92 100644
|
||||||
|
--- a/net/minecraft/world/entity/projectile/Projectile.java
|
||||||
|
+++ b/net/minecraft/world/entity/projectile/Projectile.java
|
||||||
|
@@ -488,4 +488,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
||||||
|
public interface ProjectileFactory<T extends Projectile> {
|
||||||
|
T create(ServerLevel level, LivingEntity owner, ItemStack spawnedFrom);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // KioCG start
|
||||||
|
+ @Override
|
||||||
|
+ public boolean shouldTickHot() {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // KioCG end
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
|
||||||
|
index e74ea44096e071878372c5b8889f45cd2bd4ae23..7add73f2dd957374661affebfa2b0102d99363f8 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/LevelChunk.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
|
||||||
|
@@ -106,6 +106,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
private boolean postProcessingDone;
|
||||||
|
private ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder chunkAndHolder;
|
||||||
|
+ private final com.kiocg.ChunkHot chunkHot = new com.kiocg.ChunkHot(); public com.kiocg.ChunkHot getChunkHot() { return this.chunkHot; } // KioCG
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public final boolean moonrise$isPostProcessingDone() {
|
||||||
|
@@ -937,6 +938,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
|
||||||
|
try {
|
||||||
|
ProfilerFiller profilerFiller = Profiler.get();
|
||||||
|
profilerFiller.push(this::getType);
|
||||||
|
+ LevelChunk.this.chunkHot.startTicking(); // KioCG
|
||||||
|
profiler.startTimer(timerId); try { // Folia - profiler
|
||||||
|
BlockState blockState = LevelChunk.this.getBlockState(blockPos);
|
||||||
|
if (this.blockEntity.getType().isValid(blockState)) {
|
||||||
|
@@ -951,7 +953,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
|
||||||
|
}
|
||||||
|
// Paper end - Remove the Block Entity if it's invalid
|
||||||
|
}
|
||||||
|
- } finally { profiler.stopTimer(timerId); } // Folia - profiler
|
||||||
|
+ } finally { profiler.stopTimer(timerId); LevelChunk.this.chunkHot.stopTickingAndCount(); } // Folia - profiler // KioCG
|
||||||
|
|
||||||
|
profilerFiller.pop();
|
||||||
|
} catch (Throwable var5) {
|
||||||
|
diff --git a/net/minecraft/world/level/redstone/NeighborUpdater.java b/net/minecraft/world/level/redstone/NeighborUpdater.java
|
||||||
|
index 332b33a004ab11150cca0cc2cefc26d0286648f5..714e291b17856aacdac7db992fc18e6ae662f659 100644
|
||||||
|
--- a/net/minecraft/world/level/redstone/NeighborUpdater.java
|
||||||
|
+++ b/net/minecraft/world/level/redstone/NeighborUpdater.java
|
||||||
|
@@ -57,7 +57,10 @@ public interface NeighborUpdater {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
+ net.minecraft.world.level.chunk.LevelChunk levelChunk = level.getChunkIfLoaded(pos); // KioCG
|
||||||
|
+ if (levelChunk != null) levelChunk.getChunkHot().startTicking(); try { // KioCG
|
||||||
|
state.handleNeighborChanged(level, pos, neighborBlock, orientation, movedByPiston);
|
||||||
|
+ } finally { if (levelChunk != null) levelChunk.getChunkHot().stopTickingAndCount(); } // KioCG
|
||||||
|
// Spigot start
|
||||||
|
} catch (StackOverflowError ex) {
|
||||||
|
level.lastPhysicsProblem = pos.immutable();
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Fri, 31 Jan 2025 20:28:45 +0800
|
||||||
|
Subject: [PATCH] Add missing teleportation apis for folia
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
index 4e3c545f6121d3846d81d776c29edc42d6204f5c..2b06a0fba825199b07febf368418af803d8c3f8c 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
@@ -1701,6 +1701,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
if (respawnComplete != null) {
|
||||||
|
respawnComplete.accept(ServerPlayer.this);
|
||||||
|
}
|
||||||
|
+ // Luminol - Add missing teleportation apis
|
||||||
|
+ new me.earthme.luminol.api.entity.player.PostPlayerRespawnEvent(ServerPlayer.this.getBukkitEntity()).callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index f5f03801da03089ea1d22de1012d90a2b7b17322..50b4a82a054d41ac1439f9769eaefebc103b6d94 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -4310,6 +4310,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO any events that can modify go HERE
|
||||||
|
+ // Luminol start - Add missing teleportation apis
|
||||||
|
+ org.bukkit.Location destinationLoc;
|
||||||
|
+
|
||||||
|
+ if (pitch == null) {
|
||||||
|
+ if (yaw == null) {
|
||||||
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, Float.NaN);
|
||||||
|
+ } else {
|
||||||
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, Float.NaN);
|
||||||
|
+ }
|
||||||
|
+ }else {
|
||||||
|
+ if (yaw == null) {
|
||||||
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, Float.NaN, pitch);
|
||||||
|
+ }else {
|
||||||
|
+ destinationLoc = io.papermc.paper.util.MCUtil.toLocation(destination, pos, yaw, pitch);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ final me.earthme.luminol.api.entity.EntityTeleportAsyncEvent wrapped = new me.earthme.luminol.api.entity.EntityTeleportAsyncEvent(
|
||||||
|
+ this.getBukkitEntity(),
|
||||||
|
+ cause,
|
||||||
|
+ destinationLoc
|
||||||
|
+ );
|
||||||
|
+
|
||||||
|
+ wrapped.callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
|
||||||
|
// check for same region
|
||||||
|
if (destination == this.level()) {
|
||||||
|
@@ -4426,7 +4451,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
// we just select the spawn position
|
||||||
|
case END: {
|
||||||
|
if (destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END) {
|
||||||
|
- BlockPos targetPos = ServerLevel.END_SPAWN_POINT;
|
||||||
|
+ BlockPos targetPos = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
|
||||||
|
+ // Luminol start - Add missing teleportation apis
|
||||||
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
||||||
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
|
||||||
|
+
|
||||||
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
||||||
|
+ orginalPortalLocation,
|
||||||
|
+ targetPortalLocation
|
||||||
|
+ );
|
||||||
|
+
|
||||||
|
+ portalLocateEvent.callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
// need to load chunks so we can create the platform
|
||||||
|
destination.moonrise$loadChunksAsync(
|
||||||
|
targetPos, 16, // load 16 blocks to be safe from block physics
|
||||||
|
@@ -4447,7 +4483,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
- BlockPos spawnPos = destination.getSharedSpawnPos();
|
||||||
|
+ BlockPos spawnPos = destination.getSharedSpawnPos(); // Luminol - Rename
|
||||||
|
+ // Luminol start - Add missing teleportation apis
|
||||||
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
||||||
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos);
|
||||||
|
+
|
||||||
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
||||||
|
+ orginalPortalLocation,
|
||||||
|
+ targetPortalLocation
|
||||||
|
+ );
|
||||||
|
+
|
||||||
|
+ portalLocateEvent.callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
// need to load chunk for heightmap
|
||||||
|
destination.moonrise$loadChunksAsync(
|
||||||
|
spawnPos, 0,
|
||||||
|
@@ -4498,8 +4545,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
|
||||||
|
WorldBorder destinationBorder = destination.getWorldBorder();
|
||||||
|
double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType());
|
||||||
|
- BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale);
|
||||||
|
+ BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
|
||||||
|
+ // Luminol start - Add missing teleportation apis
|
||||||
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
|
||||||
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
|
||||||
|
+
|
||||||
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
||||||
|
+ orginalPortalLocation,
|
||||||
|
+ targetPortalLocation
|
||||||
|
+ );
|
||||||
|
|
||||||
|
+ portalLocateEvent.callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
ca.spottedleaf.concurrentutil.completable.CallbackCompletable<BlockUtil.FoundRectangle> portalFound
|
||||||
|
= new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>();
|
||||||
|
|
||||||
|
@@ -4636,6 +4693,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
if (!this.canPortalAsync(destination, takePassengers)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
+ // Luminol start - Add missing teleportation events
|
||||||
|
+ if (!new me.earthme.luminol.api.entity.PreEntityPortalEvent(
|
||||||
|
+ this.getBukkitEntity(),
|
||||||
|
+ io.papermc.paper.util.MCUtil.toLocation(this.level, portalPos),
|
||||||
|
+ destination.getWorld()
|
||||||
|
+ ).callEvent()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
|
||||||
|
Vec3 initialPosition = this.position();
|
||||||
|
ChunkPos initialPositionChunk = new ChunkPos(
|
||||||
|
@@ -4703,6 +4769,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
if (teleportComplete != null) {
|
||||||
|
teleportComplete.accept(teleported);
|
||||||
|
}
|
||||||
|
+ // Kaiiju end
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
diff --git a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
||||||
|
index 12b9a6c16501cb0c01983c44bb247071ce675274..2dbf5064f0353b5d60d75573dc9724c3c42a25fe 100644
|
||||||
|
--- a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
||||||
|
+++ b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
|
||||||
|
@@ -193,6 +193,18 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
|
||||||
|
portalTile.trySearchForExit(portalWorld, portalPos);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
+ // Luminol start - Add missing teleportation apis
|
||||||
|
+ final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(toTeleport.level(), portalPos);
|
||||||
|
+ final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(portalWorld, teleportPos);
|
||||||
|
+
|
||||||
|
+ final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
|
||||||
|
+ orginalPortalLocation,
|
||||||
|
+ targetPortalLocation
|
||||||
|
+ );
|
||||||
|
+
|
||||||
|
+ portalLocateEvent.callEvent();
|
||||||
|
+ // Luminol end
|
||||||
|
+
|
||||||
|
|
||||||
|
// note: we handle the position from the TeleportTransition
|
||||||
|
net.minecraft.world.level.portal.TeleportTransition teleport = net.minecraft.world.level.block.EndGatewayBlock.getTeleportTransition(
|
||||||
@@ -0,0 +1,235 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Wed, 22 Jan 2025 17:23:16 +0800
|
||||||
|
Subject: [PATCH] Gale: Optimize noise generation
|
||||||
|
|
||||||
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||||
|
ishland <ishlandmc@yeah.net>
|
||||||
|
As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0106-Optimize-noise-generation.patch)
|
||||||
|
C2ME (https://github.com/RelativityMC/C2ME-fabric)
|
||||||
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
|
||||||
|
index fb11a2eea540d55e50eab59f9857ca5d99f556f8..dcc1a3f8b611c9f103b848db90b077b984b60ada 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
|
||||||
|
@@ -11,6 +11,27 @@ public final class ImprovedNoise {
|
||||||
|
public final double yo;
|
||||||
|
public final double zo;
|
||||||
|
|
||||||
|
+ // Gale start - C2ME - optimize noise generation
|
||||||
|
+ private static final double[] FLAT_SIMPLEX_GRAD = new double[]{
|
||||||
|
+ 1, 1, 0, 0,
|
||||||
|
+ -1, 1, 0, 0,
|
||||||
|
+ 1, -1, 0, 0,
|
||||||
|
+ -1, -1, 0, 0,
|
||||||
|
+ 1, 0, 1, 0,
|
||||||
|
+ -1, 0, 1, 0,
|
||||||
|
+ 1, 0, -1, 0,
|
||||||
|
+ -1, 0, -1, 0,
|
||||||
|
+ 0, 1, 1, 0,
|
||||||
|
+ 0, -1, 1, 0,
|
||||||
|
+ 0, 1, -1, 0,
|
||||||
|
+ 0, -1, -1, 0,
|
||||||
|
+ 1, 1, 0, 0,
|
||||||
|
+ 0, -1, 1, 0,
|
||||||
|
+ -1, 1, 0, 0,
|
||||||
|
+ 0, -1, -1, 0,
|
||||||
|
+ };
|
||||||
|
+ // Gale end - C2ME - optimize noise generation
|
||||||
|
+
|
||||||
|
public ImprovedNoise(RandomSource random) {
|
||||||
|
this.xo = random.nextDouble() * 256.0;
|
||||||
|
this.yo = random.nextDouble() * 256.0;
|
||||||
|
@@ -38,9 +59,11 @@ public final class ImprovedNoise {
|
||||||
|
double d = x + this.xo;
|
||||||
|
double d1 = y + this.yo;
|
||||||
|
double d2 = z + this.zo;
|
||||||
|
- int floor = Mth.floor(d);
|
||||||
|
- int floor1 = Mth.floor(d1);
|
||||||
|
- int floor2 = Mth.floor(d2);
|
||||||
|
+ // Gale start - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
+ double floor = Math.floor(d);
|
||||||
|
+ double floor1 = Math.floor(d1);
|
||||||
|
+ double floor2 = Math.floor(d2);
|
||||||
|
+ // Gale end - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
double d3 = d - floor;
|
||||||
|
double d4 = d1 - floor1;
|
||||||
|
double d5 = d2 - floor2;
|
||||||
|
@@ -53,25 +76,27 @@ public final class ImprovedNoise {
|
||||||
|
d6 = d4;
|
||||||
|
}
|
||||||
|
|
||||||
|
- d7 = Mth.floor(d6 / yScale + 1.0E-7F) * yScale;
|
||||||
|
+ d7 = Math.floor(d6 / yScale + 1.0E-7F) * yScale; // Gale - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
} else {
|
||||||
|
d7 = 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return this.sampleAndLerp(floor, floor1, floor2, d3, d4 - d7, d5, d4);
|
||||||
|
+ return this.sampleAndLerp((int) floor, (int) floor1, (int) floor2, d3, d4 - d7, d5, d4); // Gale - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
}
|
||||||
|
|
||||||
|
public double noiseWithDerivative(double x, double y, double z, double[] values) {
|
||||||
|
double d = x + this.xo;
|
||||||
|
double d1 = y + this.yo;
|
||||||
|
double d2 = z + this.zo;
|
||||||
|
- int floor = Mth.floor(d);
|
||||||
|
- int floor1 = Mth.floor(d1);
|
||||||
|
- int floor2 = Mth.floor(d2);
|
||||||
|
+ // Gale start - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
+ double floor = Math.floor(d);
|
||||||
|
+ double floor1 = Math.floor(d1);
|
||||||
|
+ double floor2 = Math.floor(d2);
|
||||||
|
+ // Gale end - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
double d3 = d - floor;
|
||||||
|
double d4 = d1 - floor1;
|
||||||
|
double d5 = d2 - floor2;
|
||||||
|
- return this.sampleWithDerivative(floor, floor1, floor2, d3, d4, d5, values);
|
||||||
|
+ return this.sampleWithDerivative((int) floor, (int) floor1, (int) floor2, d3, d4, d5, values); // Gale - C2ME - optimize noise generation - optimize: remove frequent type conversions
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double gradDot(int gradIndex, double xFactor, double yFactor, double zFactor) {
|
||||||
|
@@ -83,24 +108,69 @@ public final class ImprovedNoise {
|
||||||
|
}
|
||||||
|
|
||||||
|
private double sampleAndLerp(int gridX, int gridY, int gridZ, double deltaX, double weirdDeltaY, double deltaZ, double deltaY) {
|
||||||
|
- int i = this.p(gridX);
|
||||||
|
- int i1 = this.p(gridX + 1);
|
||||||
|
- int i2 = this.p(i + gridY);
|
||||||
|
- int i3 = this.p(i + gridY + 1);
|
||||||
|
- int i4 = this.p(i1 + gridY);
|
||||||
|
- int i5 = this.p(i1 + gridY + 1);
|
||||||
|
- double d = gradDot(this.p(i2 + gridZ), deltaX, weirdDeltaY, deltaZ);
|
||||||
|
- double d1 = gradDot(this.p(i4 + gridZ), deltaX - 1.0, weirdDeltaY, deltaZ);
|
||||||
|
- double d2 = gradDot(this.p(i3 + gridZ), deltaX, weirdDeltaY - 1.0, deltaZ);
|
||||||
|
- double d3 = gradDot(this.p(i5 + gridZ), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ);
|
||||||
|
- double d4 = gradDot(this.p(i2 + gridZ + 1), deltaX, weirdDeltaY, deltaZ - 1.0);
|
||||||
|
- double d5 = gradDot(this.p(i4 + gridZ + 1), deltaX - 1.0, weirdDeltaY, deltaZ - 1.0);
|
||||||
|
- double d6 = gradDot(this.p(i3 + gridZ + 1), deltaX, weirdDeltaY - 1.0, deltaZ - 1.0);
|
||||||
|
- double d7 = gradDot(this.p(i5 + gridZ + 1), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ - 1.0);
|
||||||
|
- double d8 = Mth.smoothstep(deltaX);
|
||||||
|
- double d9 = Mth.smoothstep(deltaY);
|
||||||
|
- double d10 = Mth.smoothstep(deltaZ);
|
||||||
|
- return Mth.lerp3(d8, d9, d10, d, d1, d2, d3, d4, d5, d6, d7);
|
||||||
|
+ // Gale start - C2ME - optimize noise generation - inline math & small optimization: remove frequent type conversions and redundant ops
|
||||||
|
+ final int var0 = gridX & 0xFF;
|
||||||
|
+ final int var1 = (gridX + 1) & 0xFF;
|
||||||
|
+ final int var2 = this.p[var0] & 0xFF;
|
||||||
|
+ final int var3 = this.p[var1] & 0xFF;
|
||||||
|
+ final int var4 = (var2 + gridY) & 0xFF;
|
||||||
|
+ final int var5 = (var3 + gridY) & 0xFF;
|
||||||
|
+ final int var6 = (var2 + gridY + 1) & 0xFF;
|
||||||
|
+ final int var7 = (var3 + gridY + 1) & 0xFF;
|
||||||
|
+ final int var8 = this.p[var4] & 0xFF;
|
||||||
|
+ final int var9 = this.p[var5] & 0xFF;
|
||||||
|
+ final int var10 = this.p[var6] & 0xFF;
|
||||||
|
+ final int var11 = this.p[var7] & 0xFF;
|
||||||
|
+
|
||||||
|
+ final int var12 = (var8 + gridZ) & 0xFF;
|
||||||
|
+ final int var13 = (var9 + gridZ) & 0xFF;
|
||||||
|
+ final int var14 = (var10 + gridZ) & 0xFF;
|
||||||
|
+ final int var15 = (var11 + gridZ) & 0xFF;
|
||||||
|
+ final int var16 = (var8 + gridZ + 1) & 0xFF;
|
||||||
|
+ final int var17 = (var9 + gridZ + 1) & 0xFF;
|
||||||
|
+ final int var18 = (var10 + gridZ + 1) & 0xFF;
|
||||||
|
+ final int var19 = (var11 + gridZ + 1) & 0xFF;
|
||||||
|
+ final int var20 = (this.p[var12] & 15) << 2;
|
||||||
|
+ final int var21 = (this.p[var13] & 15) << 2;
|
||||||
|
+ final int var22 = (this.p[var14] & 15) << 2;
|
||||||
|
+ final int var23 = (this.p[var15] & 15) << 2;
|
||||||
|
+ final int var24 = (this.p[var16] & 15) << 2;
|
||||||
|
+ final int var25 = (this.p[var17] & 15) << 2;
|
||||||
|
+ final int var26 = (this.p[var18] & 15) << 2;
|
||||||
|
+ final int var27 = (this.p[var19] & 15) << 2;
|
||||||
|
+ final double var60 = deltaX - 1.0;
|
||||||
|
+ final double var61 = weirdDeltaY - 1.0;
|
||||||
|
+ final double var62 = deltaZ - 1.0;
|
||||||
|
+ final double var87 = FLAT_SIMPLEX_GRAD[(var20) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var20) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var20) | 2] * deltaZ;
|
||||||
|
+ final double var88 = FLAT_SIMPLEX_GRAD[(var21) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var21) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var21) | 2] * deltaZ;
|
||||||
|
+ final double var89 = FLAT_SIMPLEX_GRAD[(var22) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var22) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var22) | 2] * deltaZ;
|
||||||
|
+ final double var90 = FLAT_SIMPLEX_GRAD[(var23) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var23) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var23) | 2] * deltaZ;
|
||||||
|
+ final double var91 = FLAT_SIMPLEX_GRAD[(var24) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var24) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var24) | 2] * var62;
|
||||||
|
+ final double var92 = FLAT_SIMPLEX_GRAD[(var25) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var25) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var25) | 2] * var62;
|
||||||
|
+ final double var93 = FLAT_SIMPLEX_GRAD[(var26) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var26) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var26) | 2] * var62;
|
||||||
|
+ final double var94 = FLAT_SIMPLEX_GRAD[(var27) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var27) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var27) | 2] * var62;
|
||||||
|
+
|
||||||
|
+ final double var95 = deltaX * 6.0 - 15.0;
|
||||||
|
+ final double var96 = deltaY * 6.0 - 15.0;
|
||||||
|
+ final double var97 = deltaZ * 6.0 - 15.0;
|
||||||
|
+ final double var98 = deltaX * var95 + 10.0;
|
||||||
|
+ final double var99 = deltaY * var96 + 10.0;
|
||||||
|
+ final double var100 = deltaZ * var97 + 10.0;
|
||||||
|
+ final double var101 = deltaX * deltaX * deltaX * var98;
|
||||||
|
+ final double var102 = deltaY * deltaY * deltaY * var99;
|
||||||
|
+ final double var103 = deltaZ * deltaZ * deltaZ * var100;
|
||||||
|
+
|
||||||
|
+ final double var113 = var87 + var101 * (var88 - var87);
|
||||||
|
+ final double var114 = var93 + var101 * (var94 - var93);
|
||||||
|
+ final double var115 = var91 + var101 * (var92 - var91);
|
||||||
|
+ final double var116 = var89 + var101 * (var90 - var89);
|
||||||
|
+ final double var117 = var114 - var115;
|
||||||
|
+ final double var118 = var102 * (var116 - var113);
|
||||||
|
+ final double var119 = var102 * var117;
|
||||||
|
+ final double var120 = var113 + var118;
|
||||||
|
+ final double var121 = var115 + var119;
|
||||||
|
+ return var120 + (var103 * (var121 - var120));
|
||||||
|
+ // Gale end - C2ME - optimize noise generation - inline math & small optimization: remove frequent type conversions and redundant ops
|
||||||
|
}
|
||||||
|
|
||||||
|
private double sampleWithDerivative(int gridX, int gridY, int gridZ, double deltaX, double deltaY, double deltaZ, double[] noiseValues) {
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/synth/PerlinNoise.java b/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
|
||||||
|
index da3c26fbad32d75d71f7e59c8c3341316a754756..2c28bb2fed04542a2ee126fe0c1c1f0253a3e2eb 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
|
||||||
|
@@ -26,6 +26,10 @@ public class PerlinNoise {
|
||||||
|
private final double lowestFreqValueFactor;
|
||||||
|
private final double lowestFreqInputFactor;
|
||||||
|
private final double maxValue;
|
||||||
|
+ // Gale start - C2ME - optimize noise generation
|
||||||
|
+ private final int octaveSamplersCount;
|
||||||
|
+ private final double [] amplitudesArray;
|
||||||
|
+ // Gale end - C2ME - optimize noise generation
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static PerlinNoise createLegacyForBlendedNoise(RandomSource random, IntStream octaves) {
|
||||||
|
@@ -127,6 +131,10 @@ public class PerlinNoise {
|
||||||
|
this.lowestFreqInputFactor = Math.pow(2.0, -i);
|
||||||
|
this.lowestFreqValueFactor = Math.pow(2.0, size - 1) / (Math.pow(2.0, size) - 1.0);
|
||||||
|
this.maxValue = this.edgeValue(2.0);
|
||||||
|
+ // Gale start - C2ME - optimize noise generation
|
||||||
|
+ this.octaveSamplersCount = this.noiseLevels.length;
|
||||||
|
+ this.amplitudesArray = this.amplitudes.toDoubleArray();
|
||||||
|
+ // Gale end - C2ME - optimize noise generation
|
||||||
|
}
|
||||||
|
|
||||||
|
protected double maxValue() {
|
||||||
|
@@ -138,7 +146,27 @@ public class PerlinNoise {
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getValue(double x, double y, double z) {
|
||||||
|
- return this.getValue(x, y, z, 0.0, 0.0, false);
|
||||||
|
+ // Gale start - C2ME - optimize noise generation - optimize for common cases
|
||||||
|
+ double d = 0.0;
|
||||||
|
+ double e = this.lowestFreqInputFactor;
|
||||||
|
+ double f = this.lowestFreqValueFactor;
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < this.octaveSamplersCount; ++i) {
|
||||||
|
+ ImprovedNoise perlinNoiseSampler = this.noiseLevels[i];
|
||||||
|
+ if (perlinNoiseSampler != null) {
|
||||||
|
+ @SuppressWarnings("deprecation")
|
||||||
|
+ double g = perlinNoiseSampler.noise(
|
||||||
|
+ wrap(x * e), wrap(y * e), wrap(z * e), 0.0, 0.0
|
||||||
|
+ );
|
||||||
|
+ d += this.amplitudesArray[i] * g * f;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ e *= 2.0;
|
||||||
|
+ f /= 2.0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return d;
|
||||||
|
+ // Gale end - C2ME - optimize noise generation - optimize for common cases
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Wed, 22 Jan 2025 17:18:00 +0800
|
||||||
|
Subject: [PATCH] Gale: Replace AI attributes with optimized collections
|
||||||
|
|
||||||
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||||
|
2No2Name <2No2Name@web.de>
|
||||||
|
As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch)
|
||||||
|
Lithium (https://github.com/CaffeineMC/lithium-fabric)
|
||||||
|
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
|
||||||
|
index fdb02fc40579866167e8cc9bcefbd961588b53a6..58d8424262db14b2dca0b2c5a40748b6c0c18e83 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/attributes/AttributeMap.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
|
||||||
|
@@ -14,9 +14,11 @@ import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
|
||||||
|
public class AttributeMap {
|
||||||
|
- private final Map<Holder<Attribute>, AttributeInstance> attributes = new Object2ObjectOpenHashMap<>();
|
||||||
|
- private final Set<AttributeInstance> attributesToSync = new ObjectOpenHashSet<>();
|
||||||
|
- private final Set<AttributeInstance> attributesToUpdate = new ObjectOpenHashSet<>();
|
||||||
|
+ // Gale start - Lithium - replace AI attributes with optimized collections
|
||||||
|
+ private final Map<Holder<Attribute>, AttributeInstance> attributes = new it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap<>(0);
|
||||||
|
+ private final Set<AttributeInstance> attributesToSync = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0);
|
||||||
|
+ private final Set<AttributeInstance> attributesToUpdate = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0);
|
||||||
|
+ // Gale end - Lithium - replace AI attributes with optimized collections
|
||||||
|
private final AttributeSupplier supplier;
|
||||||
|
|
||||||
|
public AttributeMap(AttributeSupplier supplier) {
|
||||||
@@ -1,24 +1,24 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: MrHua269 <wangxyper@163.com>
|
From: MrHua269 <wangxyper@163.com>
|
||||||
Date: Sat, 30 Nov 2024 12:13:26 +0800
|
Date: Sun, 12 Jan 2025 15:35:15 +0800
|
||||||
Subject: [PATCH] Gale Skip entity move if movement is zero
|
Subject: [PATCH] Gale: Skip entity move if movement is zero
|
||||||
|
|
||||||
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||||
|
ishland <ishlandmc@yeah.net>
|
||||||
|
As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch)
|
||||||
|
VMP (https://github.com/RelativityMC/VMP-fabric)
|
||||||
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
index 537187df8f400f8625216b0fc21cd19c3bf28e85..75182b1f12ed5ad0ff541aee28b40a72b783230d 100644
|
index 50b4a82a054d41ac1439f9769eaefebc103b6d94..803cdabbcde93be8352e7370cf1f129f4663d277 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
@@ -283,6 +283,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
@@ -1107,7 +1107,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
public float yRotO;
|
private double moveStartZ;
|
||||||
public float xRotO;
|
// Paper end - detailed watchdog information
|
||||||
private AABB bb;
|
|
||||||
+ private boolean boundingBoxChanged = false; // Gale - VMP - skip entity move if movement is zero
|
|
||||||
public boolean onGround;
|
|
||||||
public boolean horizontalCollision;
|
|
||||||
public boolean verticalCollision;
|
|
||||||
@@ -1181,6 +1182,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
||||||
//Luminol end
|
|
||||||
|
|
||||||
|
+ private boolean boundingBoxChanged = false; // Gale - VMP - skip entity move if movement is zero
|
||||||
|
+
|
||||||
public void move(MoverType type, Vec3 movement) {
|
public void move(MoverType type, Vec3 movement) {
|
||||||
+ // Gale start - VMP - skip entity move if movement is zero
|
+ // Gale start - VMP - skip entity move if movement is zero
|
||||||
+ if (!this.boundingBoxChanged && movement.equals(Vec3.ZERO)) {
|
+ if (!this.boundingBoxChanged && movement.equals(Vec3.ZERO)) {
|
||||||
@@ -28,15 +28,15 @@ index 537187df8f400f8625216b0fc21cd19c3bf28e85..75182b1f12ed5ad0ff541aee28b40a72
|
|||||||
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
|
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
|
||||||
// Paper start - detailed watchdog information
|
// Paper start - detailed watchdog information
|
||||||
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
|
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
|
||||||
@@ -5245,6 +5251,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
@@ -5273,6 +5280,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void setBoundingBox(AABB boundingBox) {
|
public final void setBoundingBox(AABB bb) {
|
||||||
+ // Gale start - VMP - skip entity move if movement is zero
|
+ // Gale start - VMP - skip entity move if movement is zero
|
||||||
+ if (!this.bb.equals(boundingBox)) {
|
+ if (!this.bb.equals(bb)) {
|
||||||
+ this.boundingBoxChanged = true;
|
+ this.boundingBoxChanged = true;
|
||||||
+ }
|
+ }
|
||||||
+ // Gale end - VMP - skip entity move if movement is zero
|
+ // Gale end - VMP - skip entity move if movement is zero
|
||||||
// CraftBukkit start - block invalid bounding boxes
|
// CraftBukkit start - block invalid bounding boxes
|
||||||
double minX = boundingBox.minX,
|
double minX = bb.minX,
|
||||||
minY = boundingBox.minY,
|
minY = bb.minY,
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 14:15:24 +0800
|
||||||
|
Subject: [PATCH] Gale: Use platform math functions
|
||||||
|
|
||||||
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||||
|
Xymb <xymb@endcrystal.me>
|
||||||
|
As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0019-Use-platform-math-functions.patch)
|
||||||
|
Kaiiju (https://github.com/KaiijuMC/Kaiiju)
|
||||||
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/util/Mth.java b/net/minecraft/util/Mth.java
|
||||||
|
index 73e04606e2cc5f30377550d1f2a5aa355b173257..c4d5dad5dc02534ef76d65e75e89058ced9699b0 100644
|
||||||
|
--- a/net/minecraft/util/Mth.java
|
||||||
|
+++ b/net/minecraft/util/Mth.java
|
||||||
|
@@ -58,18 +58,15 @@ public class Mth {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int floor(float value) {
|
||||||
|
- int i = (int)value;
|
||||||
|
- return value < i ? i - 1 : i;
|
||||||
|
+ return (int) Math.floor(value); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int floor(double value) {
|
||||||
|
- int i = (int)value;
|
||||||
|
- return value < i ? i - 1 : i;
|
||||||
|
+ return (int) Math.floor(value); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static long lfloor(double value) {
|
||||||
|
- long l = (long)value;
|
||||||
|
- return value < l ? l - 1L : l;
|
||||||
|
+ return (long) Math.floor(value); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static float abs(float value) {
|
||||||
|
@@ -81,13 +78,11 @@ public class Mth {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int ceil(float value) {
|
||||||
|
- int i = (int)value;
|
||||||
|
- return value > i ? i + 1 : i;
|
||||||
|
+ return (int) Math.ceil(value); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int ceil(double value) {
|
||||||
|
- int i = (int)value;
|
||||||
|
- return value > i ? i + 1 : i;
|
||||||
|
+ return (int) Math.ceil(value); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int clamp(int value, int min, int max) {
|
||||||
|
@@ -123,15 +118,7 @@ public class Mth {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static double absMax(double x, double y) {
|
||||||
|
- if (x < 0.0) {
|
||||||
|
- x = -x;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (y < 0.0) {
|
||||||
|
- y = -y;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return Math.max(x, y);
|
||||||
|
+ return Math.max(Math.abs(x), Math.abs(y)); // Gale - use platform math functions
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int floorDiv(int dividend, int divisor) {
|
||||||
@@ -1,40 +1,17 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: MrHua269 <wangxyper@163.com>
|
From: MrHua269 <wangxyper@163.com>
|
||||||
Date: Sat, 30 Nov 2024 12:07:11 +0800
|
Date: Sun, 12 Jan 2025 15:31:52 +0800
|
||||||
Subject: [PATCH] Gale Variable entity wake-up duration
|
Subject: [PATCH] Gale: Variable entity wake-up duration
|
||||||
|
|
||||||
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||||
|
As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0054-Variable-entity-wake-up-duration.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/GaleVariableEntityWakeupConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/GaleVariableEntityWakeupConfig.java
|
diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
new file mode 100644
|
index c0d23b0b5adca79ce451da8cca16dc3aeac2c799..328cf3c11c3ad5aa2b92a6c3bd350dd37ce6041a 100644
|
||||||
index 0000000000000000000000000000000000000000..fa30e8dc39a2d4bd1399e41230b307b19eeb716a
|
--- a/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
--- /dev/null
|
+++ b/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
+++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/GaleVariableEntityWakeupConfig.java
|
@@ -60,27 +60,39 @@ public final class ActivationRange {
|
||||||
@@ -0,0 +1,20 @@
|
|
||||||
+package me.earthme.luminol.config.modules.optimizations;
|
|
||||||
+
|
|
||||||
+import me.earthme.luminol.config.ConfigInfo;
|
|
||||||
+import me.earthme.luminol.config.EnumConfigCategory;
|
|
||||||
+import me.earthme.luminol.config.IConfigModule;
|
|
||||||
+
|
|
||||||
+public class GaleVariableEntityWakeupConfig implements IConfigModule {
|
|
||||||
+ @ConfigInfo(baseName = "entity_wakeup_duration_ratio_standard_deviation")
|
|
||||||
+ public static double entityWakeUpDurationRatioStandardDeviation = 0.2;
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public EnumConfigCategory getCategory() {
|
|
||||||
+ return EnumConfigCategory.OPTIMIZATIONS;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ @Override
|
|
||||||
+ public String getBaseName() {
|
|
||||||
+ return "variable_entity_waking_up";
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
|
||||||
index 820145408fa2150820c4c14ea55bee23e7e9a366..57eb8bfb0e9d4a45d89eca75a2de219bff626bb5 100644
|
|
||||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
||||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
|
||||||
@@ -74,28 +74,41 @@ public class ActivationRange
|
|
||||||
if (entity.activationType == ActivationType.VILLAGER) {
|
if (entity.activationType == ActivationType.VILLAGER) {
|
||||||
if (inactiveFor > config.wakeUpInactiveVillagersEvery && worldData.wakeupInactiveRemainingVillagers > 0) { // Folia - threaded regions
|
if (inactiveFor > config.wakeUpInactiveVillagersEvery && worldData.wakeupInactiveRemainingVillagers > 0) { // Folia - threaded regions
|
||||||
worldData.wakeupInactiveRemainingVillagers--; // Folia - threaded regions
|
worldData.wakeupInactiveRemainingVillagers--; // Folia - threaded regions
|
||||||
@@ -62,7 +39,6 @@ index 820145408fa2150820c4c14ea55bee23e7e9a366..57eb8bfb0e9d4a45d89eca75a2de219b
|
|||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
// Paper end
|
|
||||||
|
|
||||||
+ // Gale start - variable entity wake-up duration
|
+ // Gale start - variable entity wake-up duration
|
||||||
+ private static final java.util.concurrent.ThreadLocalRandom wakeUpDurationRandom = java.util.concurrent.ThreadLocalRandom.current();
|
+ private static final java.util.concurrent.ThreadLocalRandom wakeUpDurationRandom = java.util.concurrent.ThreadLocalRandom.current();
|
||||||
@@ -76,7 +52,6 @@ index 820145408fa2150820c4c14ea55bee23e7e9a366..57eb8bfb0e9d4a45d89eca75a2de219b
|
|||||||
+ }
|
+ }
|
||||||
+ // Gale end - variable entity wake-up duration
|
+ // Gale end - variable entity wake-up duration
|
||||||
+
|
+
|
||||||
+
|
//static AABB maxBB = new AABB(0, 0, 0, 0, 0, 0); // Folia - threaded regions - replaced by local variable
|
||||||
// Folia - threaded regions - replaced by local variable
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sat, 8 Mar 2025 21:20:11 +0800
|
||||||
|
Subject: [PATCH] Leaf: Replace brain maps with optimized collection
|
||||||
|
|
||||||
|
Co-authored by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
||||||
|
As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0070-Replace-brain-maps-with-optimized-collection.patch)
|
||||||
|
Licensed under: MIT (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/MIT.txt)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/Brain.java b/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
index c589e18b68e45d5991291db3a0bdd833588ce945..ff17bda274989d6b94cea280378a6e5de4f84d4b 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/Brain.java
|
||||||
|
@@ -45,14 +45,14 @@ public class Brain<E extends LivingEntity> {
|
||||||
|
static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private final Supplier<Codec<Brain<E>>> codec;
|
||||||
|
private static final int SCHEDULE_UPDATE_DELAY = 20;
|
||||||
|
- private final Map<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> memories = Maps.newHashMap();
|
||||||
|
- private final Map<SensorType<? extends Sensor<? super E>>, Sensor<? super E>> sensors = Maps.newLinkedHashMap();
|
||||||
|
+ private final Map<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> memories = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
+ private final Map<SensorType<? extends Sensor<? super E>>, Sensor<? super E>> sensors = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
private final Map<Integer, Map<Activity, Set<BehaviorControl<? super E>>>> availableBehaviorsByPriority = Maps.newTreeMap();
|
||||||
|
private Schedule schedule = Schedule.EMPTY;
|
||||||
|
- private final Map<Activity, Set<Pair<MemoryModuleType<?>, MemoryStatus>>> activityRequirements = Maps.newHashMap();
|
||||||
|
- private final Map<Activity, Set<MemoryModuleType<?>>> activityMemoriesToEraseWhenStopped = Maps.newHashMap();
|
||||||
|
- private Set<Activity> coreActivities = Sets.newHashSet();
|
||||||
|
- private final Set<Activity> activeActivities = Sets.newHashSet();
|
||||||
|
+ private final Map<Activity, Set<Pair<MemoryModuleType<?>, MemoryStatus>>> activityRequirements = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
+ private final Map<Activity, Set<MemoryModuleType<?>>> activityMemoriesToEraseWhenStopped = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
+ private Set<Activity> coreActivities = new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
+ private final Set<Activity> activeActivities = new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(); // Leaf - Replace brain maps with optimized collection
|
||||||
|
private Activity defaultActivity = Activity.IDLE;
|
||||||
|
private long lastScheduleUpdate = -9999L;
|
||||||
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sat, 8 Mar 2025 21:14:53 +0800
|
||||||
|
Subject: [PATCH] Leaf: Remove useless creating stats json bases on player name
|
||||||
|
logic
|
||||||
|
|
||||||
|
Co-authored by: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
||||||
|
As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0043-Remove-useless-creating-stats-json-bases-on-player-n.patch)
|
||||||
|
Licensed under: MIT (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/MIT.txt)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
||||||
|
index dd68471549096b86ea82f2add3d3886fb054e78b..b8bd7410e3d5cd8f81f41b52a3a8732134829478 100644
|
||||||
|
--- a/net/minecraft/server/players/PlayerList.java
|
||||||
|
+++ b/net/minecraft/server/players/PlayerList.java
|
||||||
|
@@ -1418,6 +1418,8 @@ public abstract class PlayerList {
|
||||||
|
if (serverStatsCounter == null) {
|
||||||
|
File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
|
||||||
|
File file1 = new File(file, uuid + ".json");
|
||||||
|
+ // Leaf start - Remove useless creating stats json bases on player name logic
|
||||||
|
+ /*
|
||||||
|
if (!file1.exists()) {
|
||||||
|
File file2 = new File(file, displayName + ".json"); // CraftBukkit
|
||||||
|
Path path = file2.toPath();
|
||||||
|
@@ -1425,6 +1427,8 @@ public abstract class PlayerList {
|
||||||
|
file2.renameTo(file1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ */
|
||||||
|
+ // Leaf end - Remove useless creating stats json bases on player name logic
|
||||||
|
|
||||||
|
serverStatsCounter = new ServerStatsCounter(this.server, file1);
|
||||||
|
// this.stats.put(uuid, serverStatsCounter); // CraftBukkit
|
||||||
@@ -0,0 +1,421 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Tue, 28 Jan 2025 18:56:53 +0800
|
||||||
|
Subject: [PATCH] Leaf: Secure seed and matter seed command
|
||||||
|
|
||||||
|
Co-authored by: Apehum <apehumchik@gmail.com>
|
||||||
|
As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/paper-patches/features/0019-Matter-Secure-Seed.patch and https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/GPL-3.0.txt)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/commands/SeedCommand.java b/net/minecraft/server/commands/SeedCommand.java
|
||||||
|
index 7c1e18d8362be5ae885c32b05e98b9ef45942d93..eb77dd6c009a0121e03a4041761dd2d69adcdfe9 100644
|
||||||
|
--- a/net/minecraft/server/commands/SeedCommand.java
|
||||||
|
+++ b/net/minecraft/server/commands/SeedCommand.java
|
||||||
|
@@ -12,6 +12,16 @@ public class SeedCommand {
|
||||||
|
long seed = commandContext.getSource().getLevel().getSeed();
|
||||||
|
Component component = ComponentUtils.copyOnClickText(String.valueOf(seed));
|
||||||
|
commandContext.getSource().sendSuccess(() -> Component.translatable("commands.seed.success", component), false);
|
||||||
|
+ // Leaf start - Matter - SecureSeed Command
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ su.plo.matter.Globals.setupGlobals(commandContext.getSource().getLevel());
|
||||||
|
+ String seedStr = su.plo.matter.Globals.seedToString(su.plo.matter.Globals.worldSeed);
|
||||||
|
+ Component featureSeedComponent = ComponentUtils.copyOnClickText(seedStr);
|
||||||
|
+
|
||||||
|
+ commandContext.getSource().sendSuccess(() -> Component.translatable(("Feature seed: %s"), featureSeedComponent), false);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - SecureSeed Command
|
||||||
|
+
|
||||||
|
return (int)seed;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
||||||
|
index 4a01088da91fc6d620cb804a9ab6d6eb1630b473..3360d691cfdb8f83d6e396c83aeaa9e809d7e8db 100644
|
||||||
|
--- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
||||||
|
+++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
||||||
|
@@ -115,7 +115,17 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
|
||||||
|
String string = this.get("level-seed", "");
|
||||||
|
boolean flag = this.get("generate-structures", true);
|
||||||
|
long l = WorldOptions.parseSeed(string).orElse(WorldOptions.randomSeed());
|
||||||
|
- this.worldOptions = new WorldOptions(l, flag, false);
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ String featureSeedStr = this.get("feature-level-seed", "");
|
||||||
|
+ long[] featureSeed = su.plo.matter.Globals.parseSeed(featureSeedStr)
|
||||||
|
+ .orElse(su.plo.matter.Globals.createRandomWorldSeed());
|
||||||
|
+
|
||||||
|
+ this.worldOptions = new WorldOptions(l, featureSeed, flag, false);
|
||||||
|
+ } else {
|
||||||
|
+ this.worldOptions = new WorldOptions(l, flag, false);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
this.worldDimensionData = new DedicatedServerProperties.WorldDimensionData(
|
||||||
|
this.get("generator-settings", property -> GsonHelper.parse(!property.isEmpty() ? property : "{}"), new JsonObject()),
|
||||||
|
this.get("level-type", property -> property.toLowerCase(Locale.ROOT), WorldPresets.NORMAL.location().toString())
|
||||||
|
diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
|
||||||
|
index 250d09fe3c49d1d0cbfde0fc06abd16fe329f9ed..05bad0366bd36b8134290a0cceb4d4dfcbbd0544 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerChunkCache.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerChunkCache.java
|
||||||
|
@@ -674,6 +674,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
|
||||||
|
}
|
||||||
|
|
||||||
|
public ChunkGenerator getGenerator() {
|
||||||
|
+ su.plo.matter.Globals.setupGlobals(level); // Leaf - Matter - Secure Seed
|
||||||
|
return this.chunkMap.generator();
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
index 00482efc8e736e73ad136105ad7b9dd2cafd581f..55f3497503e3317d765abb0bd4a9a620f63cd240 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
@@ -567,6 +567,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
chunkGenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkGenerator, gen);
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
+ su.plo.matter.Globals.setupGlobals(this); // Leaf - Matter - Secure Seed
|
||||||
|
boolean flag = server.forceSynchronousWrites();
|
||||||
|
DataFixer fixerUpper = server.getFixerUpper();
|
||||||
|
// Paper - rewrite chunk system
|
||||||
|
diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
|
||||||
|
index 7b9105cc38380d60892647e52608787dbde28f0d..88c1880947cd9d8b3952cce3f8f3ae04ce047968 100644
|
||||||
|
--- a/net/minecraft/world/entity/monster/Slime.java
|
||||||
|
+++ b/net/minecraft/world/entity/monster/Slime.java
|
||||||
|
@@ -329,7 +329,12 @@ public class Slime extends Mob implements Enemy {
|
||||||
|
}
|
||||||
|
|
||||||
|
ChunkPos chunkPos = new ChunkPos(pos);
|
||||||
|
- boolean flag = level.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkPos.x, chunkPos.z, ((WorldGenLevel) level).getSeed(), level.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ boolean isSlimeChunk = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled
|
||||||
|
+ ? level.getChunk(chunkPos.x, chunkPos.z).isSlimeChunk()
|
||||||
|
+ : WorldgenRandom.seedSlimeChunk(chunkPos.x, chunkPos.z, ((WorldGenLevel) level).getSeed(), level.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
|
||||||
|
+ boolean flag = level.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || isSlimeChunk;
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
// Paper start - Replace rules for Height in Slime Chunks
|
||||||
|
final double maxHeightSlimeChunk = level.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.slimeChunk.maximum;
|
||||||
|
if (random.nextInt(10) == 0 && flag && pos.getY() < maxHeightSlimeChunk) {
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java
|
||||||
|
index 182c14b660f8860bed627eed4e01fd4002153e9a..686c031ec73acc80683aaa39a78fe9221f0215a6 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/ChunkAccess.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/ChunkAccess.java
|
||||||
|
@@ -88,6 +88,10 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
|
||||||
|
public org.bukkit.craftbukkit.persistence.DirtyCraftPersistentDataContainer persistentDataContainer = new org.bukkit.craftbukkit.persistence.DirtyCraftPersistentDataContainer(ChunkAccess.DATA_TYPE_REGISTRY);
|
||||||
|
// CraftBukkit end
|
||||||
|
public final Registry<Biome> biomeRegistry; // CraftBukkit
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ private boolean slimeChunk;
|
||||||
|
+ private boolean hasComputedSlimeChunk;
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
|
||||||
|
// Paper start - rewrite chunk system
|
||||||
|
private volatile ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] blockNibbles;
|
||||||
|
@@ -192,6 +196,17 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
|
||||||
|
return GameEventListenerRegistry.NOOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ public boolean isSlimeChunk() {
|
||||||
|
+ if (!hasComputedSlimeChunk) {
|
||||||
|
+ hasComputedSlimeChunk = true;
|
||||||
|
+ slimeChunk = su.plo.matter.WorldgenCryptoRandom.seedSlimeChunk(chunkPos.x, chunkPos.z).nextInt(10) == 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return slimeChunk;
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+
|
||||||
|
public abstract BlockState getBlockState(final int x, final int y, final int z); // Paper
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
|
||||||
|
index a7b0a9f9e7bb8918abc631eed0043f834646fa04..7664edaf958363701438311aa9fa3bc9f2a30874 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/ChunkGenerator.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
|
||||||
|
@@ -342,7 +342,11 @@ public abstract class ChunkGenerator {
|
||||||
|
Registry<Structure> registry = level.registryAccess().lookupOrThrow(Registries.STRUCTURE);
|
||||||
|
Map<Integer, List<Structure>> map = registry.stream().collect(Collectors.groupingBy(structure1 -> structure1.step().ordinal()));
|
||||||
|
List<FeatureSorter.StepFeatureData> list = this.featuresPerStep.get();
|
||||||
|
- WorldgenRandom worldgenRandom = new WorldgenRandom(new XoroshiroRandomSource(RandomSupport.generateUniqueSeed()));
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled
|
||||||
|
+ ? new su.plo.matter.WorldgenCryptoRandom(blockPos.getX(), blockPos.getZ(), su.plo.matter.Globals.Salt.UNDEFINED, 0)
|
||||||
|
+ : new WorldgenRandom(new XoroshiroRandomSource(RandomSupport.generateUniqueSeed()));
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
long l = worldgenRandom.setDecorationSeed(level.getSeed(), blockPos.getX(), blockPos.getZ());
|
||||||
|
Set<Holder<Biome>> set = new ObjectArraySet<>();
|
||||||
|
ChunkPos.rangeClosed(sectionPos.chunk(), 1).forEach(chunkPos -> {
|
||||||
|
@@ -551,8 +555,15 @@ public abstract class ChunkGenerator {
|
||||||
|
} else {
|
||||||
|
ArrayList<StructureSet.StructureSelectionEntry> list1 = new ArrayList<>(list.size());
|
||||||
|
list1.addAll(list);
|
||||||
|
- WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
- worldgenRandom.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z);
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom;
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(pos.x, pos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 0);
|
||||||
|
+ } else {
|
||||||
|
+ worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
+ worldgenRandom.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
for (StructureSet.StructureSelectionEntry structureSelectionEntry1 : list1) {
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
|
||||||
|
index 619b98e42e254c0c260c171a26a2472ddf59b885..7abafc6f9f89159277ff84aa79a2edc4abcd7da3 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
|
||||||
|
@@ -205,7 +205,12 @@ public class ChunkGeneratorStructureState {
|
||||||
|
List<CompletableFuture<ChunkPos>> list = new ArrayList<>(count);
|
||||||
|
int spread = placement.spread();
|
||||||
|
HolderSet<Biome> holderSet = placement.preferredBiomes();
|
||||||
|
- RandomSource randomSource = RandomSource.create();
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ RandomSource randomSource = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled
|
||||||
|
+ ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.STRONGHOLDS, 0)
|
||||||
|
+ : RandomSource.create();
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
// Paper start - Add missing structure set seed configs
|
||||||
|
if (this.conf.strongholdSeed != null && structureSet.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) {
|
||||||
|
randomSource.setSeed(this.conf.strongholdSeed);
|
||||||
|
@@ -213,6 +218,7 @@ public class ChunkGeneratorStructureState {
|
||||||
|
// Paper end - Add missing structure set seed configs
|
||||||
|
randomSource.setSeed(this.concentricRingsSeed);
|
||||||
|
} // Paper - Add missing structure set seed configs
|
||||||
|
+ } // Leaf - Matter - Secure Seed
|
||||||
|
double d = randomSource.nextDouble() * Math.PI * 2.0;
|
||||||
|
int i = 0;
|
||||||
|
int i1 = 0;
|
||||||
|
diff --git a/net/minecraft/world/level/chunk/status/ChunkStep.java b/net/minecraft/world/level/chunk/status/ChunkStep.java
|
||||||
|
index b8348976e80578d9eff64eea68c04c603fed49ad..bc5c6ea1f1e4f1608a70116f03fb2a58ca3252c3 100644
|
||||||
|
--- a/net/minecraft/world/level/chunk/status/ChunkStep.java
|
||||||
|
+++ b/net/minecraft/world/level/chunk/status/ChunkStep.java
|
||||||
|
@@ -60,6 +60,7 @@ public final class ChunkStep implements ca.spottedleaf.moonrise.patches.chunk_sy
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<ChunkAccess> apply(WorldGenContext worldGenContext, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk) {
|
||||||
|
+ su.plo.matter.Globals.setupGlobals(worldGenContext.level()); // Leaf - Matter - Secure Seed
|
||||||
|
if (chunk.getPersistedStatus().isBefore(this.targetStatus)) {
|
||||||
|
ProfiledDuration profiledDuration = JvmProfiler.INSTANCE
|
||||||
|
.onChunkGenerate(chunk.getPos(), worldGenContext.level().dimension(), this.targetStatus.getName());
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/WorldOptions.java b/net/minecraft/world/level/levelgen/WorldOptions.java
|
||||||
|
index c92508741439a8d0d833ea02d0104416adb83c92..a4063fe0c8e113f0fbd751b84aefaaad68e08ca0 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/WorldOptions.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/WorldOptions.java
|
||||||
|
@@ -9,8 +9,20 @@ import net.minecraft.util.RandomSource;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
public class WorldOptions {
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ private static final com.google.gson.Gson gson = new com.google.gson.Gson();
|
||||||
|
+ private static final boolean isSecureSeedEnabled = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled;
|
||||||
|
public static final MapCodec<WorldOptions> CODEC = RecordCodecBuilder.mapCodec(
|
||||||
|
- instance -> instance.group(
|
||||||
|
+ instance -> isSecureSeedEnabled
|
||||||
|
+ ? instance.group(
|
||||||
|
+ Codec.LONG.fieldOf("seed").stable().forGetter(WorldOptions::seed),
|
||||||
|
+ Codec.STRING.fieldOf("feature_seed").orElse(gson.toJson(su.plo.matter.Globals.createRandomWorldSeed())).stable().forGetter(WorldOptions::featureSeedSerialize),
|
||||||
|
+ Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldOptions::generateStructures),
|
||||||
|
+ Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldOptions::generateBonusChest),
|
||||||
|
+ Codec.STRING.lenientOptionalFieldOf("legacy_custom_options").stable().forGetter(worldOptions -> worldOptions.legacyCustomOptions)
|
||||||
|
+ )
|
||||||
|
+ .apply(instance, instance.stable(WorldOptions::new))
|
||||||
|
+ : instance.group(
|
||||||
|
Codec.LONG.fieldOf("seed").stable().forGetter(WorldOptions::seed),
|
||||||
|
Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldOptions::generateStructures),
|
||||||
|
Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldOptions::generateBonusChest),
|
||||||
|
@@ -18,8 +30,14 @@ public class WorldOptions {
|
||||||
|
)
|
||||||
|
.apply(instance, instance.stable(WorldOptions::new))
|
||||||
|
);
|
||||||
|
- public static final WorldOptions DEMO_OPTIONS = new WorldOptions("North Carolina".hashCode(), true, true);
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ public static final WorldOptions DEMO_OPTIONS = isSecureSeedEnabled
|
||||||
|
+ ? new WorldOptions((long) "North Carolina".hashCode(), su.plo.matter.Globals.createRandomWorldSeed(), true, true)
|
||||||
|
+ : new WorldOptions("North Carolina".hashCode(), true, true);
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
private final long seed;
|
||||||
|
+ private long[] featureSeed = su.plo.matter.Globals.createRandomWorldSeed(); // Leaf - Matter - Secure Seed
|
||||||
|
private final boolean generateStructures;
|
||||||
|
private final boolean generateBonusChest;
|
||||||
|
private final Optional<String> legacyCustomOptions;
|
||||||
|
@@ -28,14 +46,35 @@ public class WorldOptions {
|
||||||
|
this(seed, generateStructures, generateBonusChest, Optional.empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ public WorldOptions(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest) {
|
||||||
|
+ this(seed, featureSeed, generateStructures, bonusChest, Optional.empty());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private WorldOptions(long seed, String featureSeedJson, boolean generateStructures, boolean bonusChest, Optional<String> legacyCustomOptions) {
|
||||||
|
+ this(seed, gson.fromJson(featureSeedJson, long[].class), generateStructures, bonusChest, legacyCustomOptions);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+
|
||||||
|
public static WorldOptions defaultWithRandomSeed() {
|
||||||
|
- return new WorldOptions(randomSeed(), true, false);
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ return isSecureSeedEnabled
|
||||||
|
+ ? new WorldOptions(randomSeed(), su.plo.matter.Globals.createRandomWorldSeed(), true, false)
|
||||||
|
+ : new WorldOptions(randomSeed(), true, false);
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
}
|
||||||
|
|
||||||
|
public static WorldOptions testWorldWithRandomSeed() {
|
||||||
|
return new WorldOptions(randomSeed(), false, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ private WorldOptions(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest, Optional<String> legacyCustomOptions) {
|
||||||
|
+ this(seed, generateStructures, bonusChest, legacyCustomOptions);
|
||||||
|
+ this.featureSeed = featureSeed;
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+
|
||||||
|
private WorldOptions(long seed, boolean generateStructures, boolean generateBonusChest, Optional<String> legacyCustomOptions) {
|
||||||
|
this.seed = seed;
|
||||||
|
this.generateStructures = generateStructures;
|
||||||
|
@@ -47,6 +86,16 @@ public class WorldOptions {
|
||||||
|
return this.seed;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ public long[] featureSeed() {
|
||||||
|
+ return this.featureSeed;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private String featureSeedSerialize() {
|
||||||
|
+ return gson.toJson(this.featureSeed);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+
|
||||||
|
public boolean generateStructures() {
|
||||||
|
return this.generateStructures;
|
||||||
|
}
|
||||||
|
@@ -59,17 +108,25 @@ public class WorldOptions {
|
||||||
|
return this.legacyCustomOptions.isPresent();
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
public WorldOptions withBonusChest(boolean generateBonusChest) {
|
||||||
|
- return new WorldOptions(this.seed, this.generateStructures, generateBonusChest, this.legacyCustomOptions);
|
||||||
|
+ return isSecureSeedEnabled
|
||||||
|
+ ? new WorldOptions(this.seed, this.featureSeed, this.generateStructures, generateBonusChest, this.legacyCustomOptions)
|
||||||
|
+ : new WorldOptions(this.seed, this.generateStructures, generateBonusChest, this.legacyCustomOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WorldOptions withStructures(boolean generateStructures) {
|
||||||
|
- return new WorldOptions(this.seed, generateStructures, this.generateBonusChest, this.legacyCustomOptions);
|
||||||
|
+ return isSecureSeedEnabled
|
||||||
|
+ ? new WorldOptions(this.seed, this.featureSeed, generateStructures, this.generateBonusChest, this.legacyCustomOptions)
|
||||||
|
+ : new WorldOptions(this.seed, generateStructures, this.generateBonusChest, this.legacyCustomOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WorldOptions withSeed(OptionalLong seed) {
|
||||||
|
- return new WorldOptions(seed.orElse(randomSeed()), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions);
|
||||||
|
+ return isSecureSeedEnabled
|
||||||
|
+ ? new WorldOptions(seed.orElse(randomSeed()), su.plo.matter.Globals.createRandomWorldSeed(), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions)
|
||||||
|
+ : new WorldOptions(seed.orElse(randomSeed()), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions);
|
||||||
|
}
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
|
||||||
|
public static OptionalLong parseSeed(String seed) {
|
||||||
|
seed = seed.trim();
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||||
|
index 4e72eb49dbf4c70ae7556ba6eb210fcd5ef36aaa..4404211177c7a0595851c1ca01d2aa5758f625c9 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||||
|
@@ -41,7 +41,11 @@ public class GeodeFeature extends Feature<GeodeConfiguration> {
|
||||||
|
int i1 = geodeConfiguration.maxGenOffset;
|
||||||
|
List<Pair<BlockPos, Integer>> list = Lists.newLinkedList();
|
||||||
|
int i2 = geodeConfiguration.distributionPoints.sample(randomSource);
|
||||||
|
- WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed()));
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled
|
||||||
|
+ ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.GEODE_FEATURE, 0)
|
||||||
|
+ : new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed()));
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0);
|
||||||
|
List<BlockPos> list1 = Lists.newLinkedList();
|
||||||
|
double d = (double)i2 / geodeConfiguration.outerWallDistance.getMaxValue();
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/structure/Structure.java b/net/minecraft/world/level/levelgen/structure/Structure.java
|
||||||
|
index 8328e864c72b7a358d6bb1f33459b8c4df2ecb1a..05a0e97edd828ce998226fd651929b04bbb461f7 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/structure/Structure.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/Structure.java
|
||||||
|
@@ -249,6 +249,11 @@ public abstract class Structure {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WorldgenRandom makeRandom(long seed, ChunkPos chunkPos) {
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ return new su.plo.matter.WorldgenCryptoRandom(chunkPos.x, chunkPos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, seed);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
worldgenRandom.setLargeFeatureSeed(seed, chunkPos.x, chunkPos.z);
|
||||||
|
return worldgenRandom;
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java
|
||||||
|
index ee0d9dddb36b6879fa113299e24f1aa3b2b151cc..8a93a4eb0a4935af169ff4d4108a8c6e715187bd 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java
|
||||||
|
@@ -67,8 +67,15 @@ public class RandomSpreadStructurePlacement extends StructurePlacement {
|
||||||
|
public ChunkPos getPotentialStructureChunk(long seed, int regionX, int regionZ) {
|
||||||
|
int i = Math.floorDiv(regionX, this.spacing);
|
||||||
|
int i1 = Math.floorDiv(regionZ, this.spacing);
|
||||||
|
- WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
- worldgenRandom.setLargeFeatureWithSalt(seed, i, i1, this.salt());
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom;
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(i, i1, su.plo.matter.Globals.Salt.POTENTIONAL_FEATURE, this.salt);
|
||||||
|
+ } else {
|
||||||
|
+ worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
+ worldgenRandom.setLargeFeatureWithSalt(seed, i, i1, this.salt());
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
int i2 = this.spacing - this.separation;
|
||||||
|
int i3 = this.spreadType.evaluate(worldgenRandom, i2);
|
||||||
|
int i4 = this.spreadType.evaluate(worldgenRandom, i2);
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
|
||||||
|
index 1f939b325ec5291b3c4aabc4735c863f9436a6f8..e5ed4c9d59b880968cedd49d5b415c4eb22d02be 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
|
||||||
|
@@ -119,8 +119,16 @@ public abstract class StructurePlacement {
|
||||||
|
public abstract StructurePlacementType<?> type();
|
||||||
|
|
||||||
|
private static boolean probabilityReducer(long levelSeed, int regionX, int regionZ, int salt, float probability, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs; ignore here
|
||||||
|
- WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
- worldgenRandom.setLargeFeatureWithSalt(levelSeed, regionX, regionZ, salt);
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom;
|
||||||
|
+ if (me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled) {
|
||||||
|
+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(regionX, regionZ, su.plo.matter.Globals.Salt.UNDEFINED, salt);
|
||||||
|
+ } else {
|
||||||
|
+ worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
+ worldgenRandom.setLargeFeatureWithSalt(levelSeed, salt, regionX, regionZ);
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
+
|
||||||
|
return worldgenRandom.nextFloat() < probability;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java b/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java
|
||||||
|
index 1cfa0fcd28685736fcdce4aef817e4d4cc4061cb..307999350819dfbc31cfd32438b7711a4f6d1467 100644
|
||||||
|
--- a/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java
|
||||||
|
+++ b/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java
|
||||||
|
@@ -64,7 +64,11 @@ public class JigsawPlacement {
|
||||||
|
ChunkGenerator chunkGenerator = context.chunkGenerator();
|
||||||
|
StructureTemplateManager structureTemplateManager = context.structureTemplateManager();
|
||||||
|
LevelHeightAccessor levelHeightAccessor = context.heightAccessor();
|
||||||
|
- WorldgenRandom worldgenRandom = context.random();
|
||||||
|
+ // Leaf start - Matter - Secure Seed
|
||||||
|
+ WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.misc.SecureSeedConfig.enabled
|
||||||
|
+ ? new su.plo.matter.WorldgenCryptoRandom(context.chunkPos().x, context.chunkPos().z, su.plo.matter.Globals.Salt.JIGSAW_PLACEMENT, 0)
|
||||||
|
+ : context.random();
|
||||||
|
+ // Leaf end - Matter - Secure Seed
|
||||||
|
Registry<StructureTemplatePool> registry = registryAccess.lookupOrThrow(Registries.TEMPLATE_POOL);
|
||||||
|
Rotation random = Rotation.getRandom(worldgenRandom);
|
||||||
|
StructureTemplatePool structureTemplatePool = startPool.unwrapKey()
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: adabugra <57899270+adabugra@users.noreply.github.com>
|
||||||
|
Date: Fri, 31 Jan 2025 19:17:01 +0300
|
||||||
|
Subject: [PATCH] Leaves: Disable moved wrongly threshold
|
||||||
|
|
||||||
|
Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
|
||||||
|
As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/patches/removed/server/0099-Disable-moved-wrongly-threshold.patch)
|
||||||
|
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 4bab02bb85b4be5bf539b498de040fd1d4fc671a..4ced5b334fbfe68ce8eef38eeea5af6d007cea00 100644
|
||||||
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
|
@@ -600,7 +600,7 @@ public class ServerGamePacketListenerImpl
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Paper end - Prevent moving into unloaded chunks
|
||||||
|
- if (d7 - d6 > Math.max(100.0, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed)) && !this.isSingleplayerOwner()) {
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 - d6 > Math.max(100.0, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed)) && !this.isSingleplayerOwner()) { // Leaves - disable can
|
||||||
|
// CraftBukkit end
|
||||||
|
LOGGER.warn(
|
||||||
|
"{} (vehicle of {}) moved too quickly! {},{},{}", rootVehicle.getName().getString(), this.player.getName().getString(), d3, d4, d5
|
||||||
|
@@ -630,7 +630,7 @@ public class ServerGamePacketListenerImpl
|
||||||
|
d5 = d2 - rootVehicle.getZ();
|
||||||
|
d7 = d3 * d3 + d4 * d4 + d5 * d5;
|
||||||
|
boolean flag1 = false;
|
||||||
|
- if (d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
@@ -1519,7 +1519,7 @@ public class ServerGamePacketListenerImpl
|
||||||
|
|
||||||
|
if (this.shouldCheckPlayerMovement(isFallFlying)) {
|
||||||
|
float f2 = isFallFlying ? 300.0F : 100.0F;
|
||||||
|
- if (d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) {
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) { // Leaves - disable can
|
||||||
|
// CraftBukkit end
|
||||||
|
// Paper start - Add fail move event
|
||||||
|
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
|
||||||
|
@@ -1593,7 +1593,8 @@ public class ServerGamePacketListenerImpl
|
||||||
|
d5 = d2 - this.player.getZ();
|
||||||
|
d7 = d3 * d3 + d4 * d4 + d5 * d5;
|
||||||
|
boolean movedWrongly = false; // Paper - Add fail move event; rename
|
||||||
|
- if (!this.player.isChangingDimension()
|
||||||
|
+ if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled // Leaves - disable can
|
||||||
|
+ && !this.player.isChangingDimension()
|
||||||
|
&& d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold // Spigot
|
||||||
|
&& !this.player.isSleeping()
|
||||||
|
&& !this.player.isCreative()
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Wed, 4 Jun 2025 12:51:07 +0800
|
||||||
|
Subject: [PATCH] Leaves: Configurable collision behavior
|
||||||
|
|
||||||
|
Co-authored by: Fortern <blueten.ki@gmail.com>
|
||||||
|
As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/c5f18b7864206cea4411211b51787f10affbcb9c/leaves-server/minecraft-patches/features/0111-Configurable-collision-behavior.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
|
||||||
|
index 864ce0bd822a2bd6fb39866103dc54b56bf0b63c..b03096b298dbdd35ac0e4d54f96c2ab3b5b4bd21 100644
|
||||||
|
--- a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
|
||||||
|
+++ b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
|
||||||
|
@@ -101,6 +101,14 @@ public final class CollisionUtil {
|
||||||
|
(box1.minZ - box2.maxZ) < -COLLISION_EPSILON && (box1.maxZ - box2.minZ) > COLLISION_EPSILON;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaves start - Configurable collision behavior
|
||||||
|
+ public static boolean voxelShapeIntersectVanilla(final AABB box1, final AABB box2) {
|
||||||
|
+ return box1.minX < box2.maxX && box1.maxX > box2.minX &&
|
||||||
|
+ box1.minY < box2.maxY && box1.maxY > box2.minY &&
|
||||||
|
+ box1.minZ < box2.maxZ && box1.maxZ > box2.minZ;
|
||||||
|
+ }
|
||||||
|
+ // Leaves end - Configurable collision behavior
|
||||||
|
+
|
||||||
|
// assume !isEmpty(target) && abs(source_move) >= COLLISION_EPSILON
|
||||||
|
public static double collideX(final AABB target, final AABB source, final double source_move) {
|
||||||
|
if ((source.minY - target.maxY) < -COLLISION_EPSILON && (source.maxY - target.minY) > COLLISION_EPSILON &&
|
||||||
|
@@ -2025,7 +2033,7 @@ public final class CollisionUtil {
|
||||||
|
AABB singleAABB = ((CollisionVoxelShape)blockCollision).moonrise$getSingleAABBRepresentation();
|
||||||
|
if (singleAABB != null) {
|
||||||
|
singleAABB = singleAABB.move((double)blockX, (double)blockY, (double)blockZ);
|
||||||
|
- if (!voxelShapeIntersect(aabb, singleAABB)) {
|
||||||
|
+ if (shouldSkip(aabb, blockCollision, singleAABB)) { // Leaves - Configurable collision behavior
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2078,6 +2086,18 @@ public final class CollisionUtil {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaves start - Configurable collision behavior
|
||||||
|
+ private static boolean shouldSkip(AABB aabb, VoxelShape blockCollision, AABB singleAABB) {
|
||||||
|
+ boolean isBlockShape = blockCollision == Shapes.block();
|
||||||
|
+ return switch (me.earthme.luminol.config.modules.misc.CollisionBehaviorConfig.behaviorMode) {
|
||||||
|
+ case "VANILLA" -> !voxelShapeIntersectVanilla(aabb, singleAABB);
|
||||||
|
+ case "PAPER" -> !voxelShapeIntersect(aabb, singleAABB);
|
||||||
|
+ default -> isBlockShape && !voxelShapeIntersectVanilla(aabb, singleAABB) || !isBlockShape && !voxelShapeIntersect(aabb, singleAABB);
|
||||||
|
+ // All other value as BLOCK_SHAPE_VANILLA to process
|
||||||
|
+ };
|
||||||
|
+ }
|
||||||
|
+ // Leaves end - Configurable collision behavior
|
||||||
|
+
|
||||||
|
public static boolean getEntityHardCollisions(final Level world, final Entity entity, AABB aabb,
|
||||||
|
final List<AABB> into, final int collisionFlags, final Predicate<Entity> predicate) {
|
||||||
|
final boolean checkOnly = (collisionFlags & COLLISION_FLAG_CHECK_ONLY) != 0;
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Wed, 4 Jun 2025 12:54:22 +0800
|
||||||
|
Subject: [PATCH] Leaves: Fix chunk reload detector
|
||||||
|
|
||||||
|
Co-authored by: Fortern <blueten.ki@gmail.com>
|
||||||
|
As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/c5f18b7864206cea4411211b51787f10affbcb9c/leaves-server/minecraft-patches/features/0123-Fix-chunk-reload-detector.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
|
||||||
|
index e96d4dee14c05f2fa329bfb1588ec795d4e3d730..2d4c68b01cc1508a1a4715a91316a7db80d4efa2 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerEntity.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerEntity.java
|
||||||
|
@@ -370,7 +370,7 @@ public class ServerEntity {
|
||||||
|
if (!list.isEmpty()) {
|
||||||
|
consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list, true)); // Paper - data sanitization
|
||||||
|
}
|
||||||
|
- ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
|
||||||
|
+ if (this.entity.totalEntityAge == 0) ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending // Leaves - fix chunk reload detector (#492)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.entity.getPassengers().isEmpty()) {
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Mon, 28 Apr 2025 22:51:32 +0800
|
||||||
|
Subject: [PATCH] Leaves: Fix SculkCatalyst exp skip
|
||||||
|
|
||||||
|
Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
|
||||||
|
As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/leaves-server/paper-patches/features/0016-Fix-SculkCatalyst-exp-skip.patch)
|
||||||
|
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 2b06a0fba825199b07febf368418af803d8c3f8c..8b6b881896797b93a2f475c21101463e1888cee1 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
@@ -1362,7 +1362,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
}
|
||||||
|
|
||||||
|
// SPIGOT-5478 must be called manually now
|
||||||
|
- if (event.shouldDropExperience()) this.dropExperience(this.level(), cause.getEntity()); // Paper - tie to event
|
||||||
|
+ if (shouldDropExperience(event.shouldDropExperience(), event.forceUseEventDropStatus())) this.dropExperience(this.level(), cause.getEntity()); // Paper - tie to event
|
||||||
|
// we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
|
||||||
|
if (!event.getKeepInventory()) {
|
||||||
|
// Paper start - PlayerDeathEvent#getItemsToKeep
|
||||||
|
@@ -1409,6 +1409,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
this.setClientLoaded(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Leaves start - exp fix
|
||||||
|
+ private boolean shouldDropExperience(boolean eventResult, boolean forceUseEvent) {
|
||||||
|
+ if (forceUseEvent) {
|
||||||
|
+ return eventResult;
|
||||||
|
+ }
|
||||||
|
+ return wasExperienceConsumed() ? false : eventResult;
|
||||||
|
+ }
|
||||||
|
+ // Leaves end - exp fix
|
||||||
|
+
|
||||||
|
private void tellNeutralMobsThatIDied() {
|
||||||
|
AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
|
||||||
|
this.level()
|
||||||
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
index 144d15bda80d3e5fbae0a824088fe05567a259c6..45b6bce44db3f262f59e4473029568a1efd5a083 100644
|
||||||
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
@@ -277,6 +277,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
private Waypoint.Icon locatorBarIcon = new Waypoint.Icon();
|
||||||
|
// CraftBukkit start
|
||||||
|
public int expToDrop;
|
||||||
|
+ public int expToReward; // Leaves - exp fix
|
||||||
|
public List<DefaultDrop> drops = new java.util.ArrayList<>(); // Paper - Restore vanilla drops behavior
|
||||||
|
public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
|
||||||
|
public boolean collides = true;
|
||||||
|
@@ -1879,6 +1880,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
entity.killedEntity((ServerLevel) this.level(), this);
|
||||||
|
}
|
||||||
|
this.gameEvent(GameEvent.ENTITY_DIE);
|
||||||
|
+ if (!this.wasExperienceConsumed()) this.dropExperience((ServerLevel) this.level(), damageSource.getEntity()); // Leaves - exp fix
|
||||||
|
} else {
|
||||||
|
this.dead = false;
|
||||||
|
this.setHealth((float) deathEvent.getReviveHealth());
|
||||||
|
@@ -1952,7 +1954,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
this.drops = new java.util.ArrayList<>();
|
||||||
|
// this.dropEquipment(level); // CraftBukkit - moved up
|
||||||
|
// CraftBukkit end
|
||||||
|
- this.dropExperience(level, damageSource.getEntity());
|
||||||
|
+ // this.dropExperience(level, damageSource.getEntity()); // Leaves - exp fix
|
||||||
|
return deathEvent; // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
|
||||||
|
index 91ddb30cd98b11f70b196a108e7cc11d39ca1a71..ebc8d936d8796f869dfe264c0f4523115389fea8 100644
|
||||||
|
--- a/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
|
||||||
|
+++ b/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
|
||||||
|
@@ -96,8 +96,7 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
|
||||||
|
public boolean handleGameEvent(ServerLevel level, Holder<GameEvent> gameEvent, GameEvent.Context context, Vec3 pos) {
|
||||||
|
if (gameEvent.is(GameEvent.ENTITY_DIE) && context.sourceEntity() instanceof LivingEntity livingEntity) {
|
||||||
|
if (!livingEntity.wasExperienceConsumed()) {
|
||||||
|
- DamageSource lastDamageSource = livingEntity.getLastDamageSource();
|
||||||
|
- int experienceReward = livingEntity.getExperienceReward(level, Optionull.map(lastDamageSource, DamageSource::getEntity));
|
||||||
|
+ int experienceReward = livingEntity.expToReward; // Leaves - exp fix
|
||||||
|
if (livingEntity.shouldDropExperience() && experienceReward > 0) {
|
||||||
|
this.sculkSpreader.addCursors(BlockPos.containing(pos.relative(Direction.UP, 0.5)), experienceReward);
|
||||||
|
this.tryAwardItSpreadsAdvancement(level, livingEntity);
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bacteriawa <A3167717663@hotmail.com>
|
||||||
|
Date: Thu, 7 Nov 2024 21:50:47 +0100
|
||||||
|
Subject: [PATCH] Lithium: Fast util
|
||||||
|
|
||||||
|
This patch is based on the following mixins:
|
||||||
|
* "net/caffeinemc/mods/lithium/mixin/math/fast_util/DirectionMixin.java"
|
||||||
|
* "net/caffeinemc/mods/lithium/mixin/math/fast_util/AABBMixin.java"
|
||||||
|
By: 2No2Name <2No2Name@web.de>
|
||||||
|
As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
|
||||||
|
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/core/Direction.java b/net/minecraft/core/Direction.java
|
||||||
|
index 63fd7b45750430b565d599337d3112cbaa7e7550..1363c80e7c7be20c52a947f2eb6fabc5e5b6c97c 100644
|
||||||
|
--- a/net/minecraft/core/Direction.java
|
||||||
|
+++ b/net/minecraft/core/Direction.java
|
||||||
|
@@ -222,7 +222,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa
|
||||||
|
}
|
||||||
|
|
||||||
|
public Direction getOpposite() {
|
||||||
|
- return this.opposite; // Paper - optimise collisions
|
||||||
|
+ return VALUES[this.oppositeIndex]; // Leaf - Lithium - fast util
|
||||||
|
}
|
||||||
|
|
||||||
|
public Direction getClockWise(Direction.Axis axis) {
|
||||||
|
@@ -355,7 +355,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Direction getRandom(RandomSource random) {
|
||||||
|
- return Util.getRandom(VALUES, random);
|
||||||
|
+ return VALUES[random.nextInt(VALUES.length)]; // Leaf - Lithium - fast util
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Direction getApproximateNearest(double x, double y, double z) {
|
||||||
|
diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java
|
||||||
|
index 84f3073444ae9e11e5d11224d6af6474ced925e2..e1bcb22d4efcfa1eb8dedb011e632cbeeabb2e82 100644
|
||||||
|
--- a/net/minecraft/world/phys/AABB.java
|
||||||
|
+++ b/net/minecraft/world/phys/AABB.java
|
||||||
|
@@ -19,6 +19,15 @@ public class AABB {
|
||||||
|
public final double maxY;
|
||||||
|
public final double maxZ;
|
||||||
|
|
||||||
|
+ // Leaf start - Lithium - fast util
|
||||||
|
+ static {
|
||||||
|
+ assert Direction.Axis.X.ordinal() == 0;
|
||||||
|
+ assert Direction.Axis.Y.ordinal() == 1;
|
||||||
|
+ assert Direction.Axis.Z.ordinal() == 2;
|
||||||
|
+ assert Direction.Axis.values().length == 3;
|
||||||
|
+ }
|
||||||
|
+ // Leaf end - Lithium - fast util
|
||||||
|
+
|
||||||
|
public AABB(double x1, double y1, double z1, double x2, double y2, double z2) {
|
||||||
|
this.minX = Math.min(x1, x2);
|
||||||
|
this.minY = Math.min(y1, y2);
|
||||||
|
@@ -80,11 +89,33 @@ public class AABB {
|
||||||
|
}
|
||||||
|
|
||||||
|
public double min(Direction.Axis axis) {
|
||||||
|
- return axis.choose(this.minX, this.minY, this.minZ);
|
||||||
|
+ // Leaf start - Lithium - fast util
|
||||||
|
+ switch (axis.ordinal()) {
|
||||||
|
+ case 0: //X
|
||||||
|
+ return this.minX;
|
||||||
|
+ case 1: //Y
|
||||||
|
+ return this.minY;
|
||||||
|
+ case 2: //Z
|
||||||
|
+ return this.minZ;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ throw new IllegalArgumentException();
|
||||||
|
+ // Leaf end - Lithium - fast util
|
||||||
|
}
|
||||||
|
|
||||||
|
public double max(Direction.Axis axis) {
|
||||||
|
- return axis.choose(this.maxX, this.maxY, this.maxZ);
|
||||||
|
+ // Leaf start - Lithium - fast util
|
||||||
|
+ switch (axis.ordinal()) {
|
||||||
|
+ case 0: //X
|
||||||
|
+ return this.maxX;
|
||||||
|
+ case 1: //Y
|
||||||
|
+ return this.maxY;
|
||||||
|
+ case 2: //Z
|
||||||
|
+ return this.maxZ;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ throw new IllegalArgumentException();
|
||||||
|
+ // Leaf end - Lithium - fast util
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bacteriawa <A3167717663@hotmail.com>
|
||||||
|
Date: Fri, 8 Nov 2024 00:22:44 +0800
|
||||||
|
Subject: [PATCH] Lithium: Skip unnecessary calculations if player is not
|
||||||
|
flying or swing
|
||||||
|
|
||||||
|
This patch is based on the following mixins:
|
||||||
|
* "net/caffeinemc/mods/lithium/mixin/entity/fast_elytra_check/LivingEntityMixin.java"
|
||||||
|
* "net/caffeinemc/mods/lithium/mixin/entity/fast_hand_swing/LivingEntityMixin.java"
|
||||||
|
By: 2No2Name <2No2Name@web.de>
|
||||||
|
As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
|
||||||
|
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
index 45b6bce44db3f262f59e4473029568a1efd5a083..cb02249308aa3f94b337a6413bc5b3b178f374f7 100644
|
||||||
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
@@ -2724,6 +2724,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void updateSwingTime() {
|
||||||
|
+ if (!this.swinging && this.swingTime == 0) return; // Leaf - Lithium - entity.fast_hand_swing
|
||||||
|
int currentSwingDuration = this.getCurrentSwingDuration();
|
||||||
|
if (this.swinging) {
|
||||||
|
this.swingTime++;
|
||||||
|
@@ -3631,6 +3632,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
protected void updateFallFlying() {
|
||||||
|
this.checkFallDistanceAccumulation();
|
||||||
|
if (!this.level().isClientSide) {
|
||||||
|
+ if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // Leaf - Lithium - entity.fast_elytra_check
|
||||||
|
if (!this.canGlide()) {
|
||||||
|
if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
|
||||||
|
this.setSharedFlag(7, false);
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 11:03:59 +0800
|
||||||
|
Subject: [PATCH] Kaiiju: Don't pathfind outside region
|
||||||
|
|
||||||
|
Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com>
|
||||||
|
As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0028-Don-t-pathfind-outside-region.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java b/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
|
||||||
|
index 621ba76784f2b92790eca62be4d0688834335ab6..52b3f1795843f40fdb3298cfd1a570a211a08739 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
|
||||||
|
@@ -119,7 +119,9 @@ public class MoveToTargetSink extends Behavior<Mob> {
|
||||||
|
|
||||||
|
private boolean tryComputePath(Mob mob, WalkTarget target, long time) {
|
||||||
|
BlockPos blockPos = target.getTarget().currentBlockPosition();
|
||||||
|
+ if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(mob.level(), blockPos)) // Kaiiju - Don't pathfind outside region
|
||||||
|
this.path = mob.getNavigation().createPath(blockPos, 0);
|
||||||
|
+ else this.path = null; // Kaiiju - Don't pathfind outside region
|
||||||
|
this.speedModifier = target.getSpeedModifier();
|
||||||
|
Brain<?> brain = mob.getBrain();
|
||||||
|
if (this.reachedTarget(mob, target)) {
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 11:07:08 +0800
|
||||||
|
Subject: [PATCH] Kaiiju: Entity tick and removal limiter
|
||||||
|
|
||||||
|
Co-authored by: Xymb <xymb@endcrystal.me>
|
||||||
|
As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
|
||||||
|
|
||||||
|
diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
||||||
|
index 01ea2e7133a41f1a75169c7e3edbd528b268412b..8c4d89c47fd176d584d3dbd0e3325f69b5e847c3 100644
|
||||||
|
--- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
||||||
|
+++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
|
||||||
|
@@ -357,6 +357,7 @@ public final class RegionizedWorldData {
|
||||||
|
private final IteratorSafeOrderedReferenceSet<Mob> navigatingMobs = new IteratorSafeOrderedReferenceSet<>();
|
||||||
|
public final ReferenceList<Entity> trackerEntities = new ReferenceList<>(EMPTY_ENTITY_ARRAY); // Moonrise - entity tracker
|
||||||
|
public final ReferenceList<Entity> trackerUnloadedEntities = new ReferenceList<>(EMPTY_ENTITY_ARRAY); // Moonrise - entity tracker
|
||||||
|
+ public final dev.kaiijumc.kaiiju.KaiijuEntityThrottler entityThrottler = new dev.kaiijumc.kaiiju.KaiijuEntityThrottler(); // Kaiiju
|
||||||
|
|
||||||
|
// block ticking
|
||||||
|
private final ObjectLinkedOpenHashSet<BlockEventData> blockEvents = new ObjectLinkedOpenHashSet<>();
|
||||||
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
index 55f3497503e3317d765abb0bd4a9a620f63cd240..7b7c72f14ae966ef142d68615b2f88ba42a079f5 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
@@ -807,6 +807,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
}
|
||||||
|
|
||||||
|
profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ACTIVATE_ENTITIES); try { // Folia - profiler
|
||||||
|
+ if (dev.kaiijumc.kaiiju.KaiijuEntityLimits.enabled) regionizedWorldData.entityThrottler.tickLimiterStart(); // Kaiiju
|
||||||
|
io.papermc.paper.entity.activation.ActivationRange.activateEntities(this); // Paper - EAR
|
||||||
|
} finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ACTIVATE_ENTITIES); } // Folia - profiler
|
||||||
|
profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ENTITY_TICK); try { // Folia - profiler
|
||||||
|
@@ -828,6 +829,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
|
||||||
|
entity.stopRiding();
|
||||||
|
}
|
||||||
|
+ // Kaiiju start
|
||||||
|
+ if (dev.kaiijumc.kaiiju.KaiijuEntityLimits.enabled) {
|
||||||
|
+ dev.kaiijumc.kaiiju.KaiijuEntityThrottler.EntityThrottlerReturn throttle = regionizedWorldData.entityThrottler.tickLimiterShouldSkip(entity);
|
||||||
|
+ if (throttle.remove && !entity.hasCustomName()) entity.remove(Entity.RemovalReason.DISCARDED);
|
||||||
|
+ if (throttle.skip) return;
|
||||||
|
+ }
|
||||||
|
+ // Kaiiju end
|
||||||
|
|
||||||
|
profilerFiller.push("tick");
|
||||||
|
this.guardEntityTick(this::tickNonPassenger, entity);
|
||||||
|
@@ -837,6 +845,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
+ if (dev.kaiijumc.kaiiju.KaiijuEntityLimits.enabled) regionizedWorldData.entityThrottler.tickLimiterFinish(regionizedWorldData); // Kaiiju
|
||||||
|
} finally { profiler.stopTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.ENTITY_TICK); } // Folia - profiler
|
||||||
|
profilerFiller.pop();
|
||||||
|
profiler.startTimer(ca.spottedleaf.leafprofiler.LProfilerRegistry.TILE_ENTITY); try { // Folia - profiler
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 11:04:12 +0800
|
||||||
|
Subject: [PATCH] Kaiiju: Vanilla end portal teleportation
|
||||||
|
|
||||||
|
Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com>
|
||||||
|
As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0024-Vanilla-end-portal-teleportation.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index 803cdabbcde93be8352e7370cf1f129f4663d277..e5de7480c2e025fc9a8b4845fdb959049f1afdda 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -4475,14 +4475,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
targetPos, 16, // load 16 blocks to be safe from block physics
|
||||||
|
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
|
||||||
|
(chunks) -> {
|
||||||
|
- net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, targetPos.below(), true, null);
|
||||||
|
-
|
||||||
|
+ //net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, targetPos.below(), true, null); // Kaiiju - Vanilla end teleportation - moved down
|
||||||
|
+ // Kaiiju start - Vanilla end teleportation
|
||||||
|
+ Vec3 finalPos;
|
||||||
|
+ if (this instanceof Player) finalPos = Vec3.atBottomCenterOf(targetPos.below());
|
||||||
|
+ else finalPos = Vec3.atBottomCenterOf(targetPos);
|
||||||
|
+ // Kaiiju end
|
||||||
|
// the portal obsidian is placed at targetPos.y - 2, so if we want to place the entity
|
||||||
|
// on the obsidian, we need to spawn at targetPos.y - 1
|
||||||
|
portalInfoCompletable.complete(
|
||||||
|
new net.minecraft.world.level.portal.TeleportTransition(
|
||||||
|
- destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f,
|
||||||
|
- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
|
||||||
|
+ destination, finalPos, this.getDeltaMovement(), Direction.WEST.toYRot(), 0.0f, // Kaiiju - Vanilla end teleportation
|
||||||
|
+ //Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)), // Kaiiju - Vanilla end teleportation
|
||||||
|
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
|
||||||
|
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
|
||||||
|
)
|
||||||
|
@@ -4508,11 +4512,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
|
||||||
|
(chunks) -> {
|
||||||
|
BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos);
|
||||||
|
-
|
||||||
|
+ // Kaiiju start - Vanilla end teleportation
|
||||||
|
+ Vec3 finalPos;
|
||||||
|
+ if (this instanceof Player) finalPos = Vec3.atBottomCenterOf(adjustedSpawn.below());
|
||||||
|
+ else finalPos = Vec3.atBottomCenterOf(adjustedSpawn);
|
||||||
|
+ // Kaiiju end
|
||||||
|
// done
|
||||||
|
portalInfoCompletable.complete(
|
||||||
|
new net.minecraft.world.level.portal.TeleportTransition(
|
||||||
|
- destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f,
|
||||||
|
+ destination, finalPos, this.getDeltaMovement(), 0.0f, 0.0f, // Kaiiju - Vanilla end teleportation
|
||||||
|
Relative.union(Relative.DELTA, Relative.ROTATION),
|
||||||
|
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
|
||||||
|
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
|
||||||
|
@@ -4709,6 +4717,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// Luminol end
|
||||||
|
+ // Kaiiju start - sync end platform spawning & entity teleportation
|
||||||
|
+ final java.util.function.Consumer<Entity> tpComplete = type == PortalType.END && destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END ?
|
||||||
|
+ e -> net.minecraft.world.level.levelgen.feature.EndPlatformFeature.createEndPlatform(destination, ServerLevel.END_SPAWN_POINT.below(), true, null) : teleportComplete;
|
||||||
|
+ // Kaiiju end
|
||||||
|
|
||||||
|
Vec3 initialPosition = this.position();
|
||||||
|
ChunkPos initialPositionChunk = new ChunkPos(
|
||||||
|
@@ -4773,8 +4785,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
info.postTeleportTransition().onTransition(teleported);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (teleportComplete != null) {
|
||||||
|
+ // Kaiiju start - vanilla end teleportation
|
||||||
|
+ /*if (teleportComplete != null) {
|
||||||
|
teleportComplete.accept(teleported);
|
||||||
|
+ }*/
|
||||||
|
+ if (tpComplete != null){
|
||||||
|
+ tpComplete.accept(teleported);
|
||||||
|
}
|
||||||
|
// Kaiiju end
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sat, 8 Mar 2025 21:21:11 +0800
|
||||||
|
Subject: [PATCH] Paper: Prevent zombie reinforcements loading chunks
|
||||||
|
|
||||||
|
Origin: https://github.com/PaperMC/Paper/pull/11945
|
||||||
|
Co-authored by: Newwind <support@newwindserver.com>
|
||||||
|
As part of: Paper (https://github.com/PaperMC/Paper/blob/2ae1f05336d0f13b646e6c284f83ded16aae84ff/patches/server/1045-Prevent-zombie-reinforcements-loading-chunks.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/PaperMC/Paper/blob/fa360aa83657d15e8e803ce55800986f6bff8f70/licenses/GPL.md)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
|
||||||
|
index a23607874a72723914cbfeea0ad1c51236c044d8..14d0758aca54d9a25e369dfa8c89c930f27946c9 100644
|
||||||
|
--- a/net/minecraft/world/entity/monster/Zombie.java
|
||||||
|
+++ b/net/minecraft/world/entity/monster/Zombie.java
|
||||||
|
@@ -352,6 +352,13 @@ public class Zombie extends Monster {
|
||||||
|
int i2 = floor1 + Mth.nextInt(this.random, 7, 40) * Mth.nextInt(this.random, -1, 1);
|
||||||
|
int i3 = floor2 + Mth.nextInt(this.random, 7, 40) * Mth.nextInt(this.random, -1, 1);
|
||||||
|
BlockPos blockPos = new BlockPos(i1, i2, i3);
|
||||||
|
+
|
||||||
|
+ // Paper start - Prevent reinforcement checks from loading chunks
|
||||||
|
+ if (this.level().getChunkIfLoadedImmediately(blockPos.getX() >> 4, blockPos.getZ() >> 4) == null) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+ // Paper end - Prevent reinforcement checks from loading chunks
|
||||||
|
+
|
||||||
|
if (SpawnPlacements.isSpawnPositionOk(type, level, blockPos)
|
||||||
|
&& SpawnPlacements.checkSpawnRules(type, level, EntitySpawnReason.REINFORCEMENT, blockPos, level.random)) {
|
||||||
|
zombie.setPos(i1, i2, i3);
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 12:21:59 +0800
|
||||||
|
Subject: [PATCH] Petal: Reduce sensor work
|
||||||
|
|
||||||
|
Co-authored by: peaches94 <peachescu94@gmail.com>
|
||||||
|
As part of: Petal (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b376f3d94c8b0db2b60d99/patches/server/0005-feat-reduce-sensor-work.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b376f3d94c8b0db2b60d99/LICENSE)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
|
||||||
|
index d9ee3b56db44687cfcc6a75f44a1abbcc8ef95a9..4c1442410f18b2ebafdb4c4d480f0f59ef656492 100644
|
||||||
|
--- a/net/minecraft/world/entity/Mob.java
|
||||||
|
+++ b/net/minecraft/world/entity/Mob.java
|
||||||
|
@@ -753,11 +753,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Paper end - Allow nerfed mobs to jump and float
|
||||||
|
+ int i = this.tickCount + this.getId(); //Luminol - Petal - Move up
|
||||||
|
ProfilerFiller profilerFiller = Profiler.get();
|
||||||
|
profilerFiller.push("sensing");
|
||||||
|
- this.sensing.tick();
|
||||||
|
+ if (i % me.earthme.luminol.config.modules.optimizations.PetalReduceSensorWorkConfig.delayTicks == 0 || !me.earthme.luminol.config.modules.optimizations.PetalReduceSensorWorkConfig.enabled) this.sensing.tick(); // Luminol - Petal - Reduce sensor work
|
||||||
|
profilerFiller.pop();
|
||||||
|
- int i = this.tickCount + this.getId();
|
||||||
|
if (i % 2 != 0 && this.tickCount > 1) {
|
||||||
|
profilerFiller.push("targetSelector");
|
||||||
|
this.targetSelector.tickRunningGoals(false);
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 12:25:44 +0800
|
||||||
|
Subject: [PATCH] Pufferfish: Cache climbing check for activation
|
||||||
|
|
||||||
|
Co-authored by: Paul Sauve <paul@technove.co>
|
||||||
|
As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/patches/server/0017-Cache-climbing-check-for-activation.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE)
|
||||||
|
|
||||||
|
diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
|
index 328cf3c11c3ad5aa2b92a6c3bd350dd37ce6041a..7e8e67a413ec5d8ca6a0ce54fba884d361acde95 100644
|
||||||
|
--- a/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
|
+++ b/io/papermc/paper/entity/activation/ActivationRange.java
|
||||||
|
@@ -243,7 +243,7 @@ public final class ActivationRange {
|
||||||
|
}
|
||||||
|
// special cases.
|
||||||
|
if (entity instanceof final LivingEntity living) {
|
||||||
|
- if (living.onClimbable() || living.jumping || living.hurtTime > 0 || !living.activeEffects.isEmpty() || living.isFreezing()) {
|
||||||
|
+ if (living.onClimableCached() || living.onClimbable() || living.jumping || living.hurtTime > 0 || !living.activeEffects.isEmpty() || living.isFreezing()) { // Pufferfish - use cached
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (entity instanceof final Mob mob && mob.getTarget() != null) {
|
||||||
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
index cb02249308aa3f94b337a6413bc5b3b178f374f7..19b44e5b5c4c0b7caee7f67420ac4732da52c375 100644
|
||||||
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
@@ -2146,6 +2146,20 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
return this.lastClimbablePos;
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+ // Pufferfish start
|
||||||
|
+ private boolean cachedOnClimable = false;
|
||||||
|
+ private BlockPos lastClimbingPosition = null;
|
||||||
|
+
|
||||||
|
+ public boolean onClimableCached() {
|
||||||
|
+ if (!this.blockPosition().equals(this.lastClimbingPosition)) {
|
||||||
|
+ this.cachedOnClimable = this.onClimbable();
|
||||||
|
+ this.lastClimbingPosition = this.blockPosition();
|
||||||
|
+ }
|
||||||
|
+ return this.cachedOnClimable;
|
||||||
|
+ }
|
||||||
|
+ // Pufferfish end
|
||||||
|
+
|
||||||
|
public boolean onClimbable() {
|
||||||
|
if (this.isSpectator()) {
|
||||||
|
return false;
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 12:27:17 +0800
|
||||||
|
Subject: [PATCH] Pufferfish: Reduce chunk loading & lookups
|
||||||
|
|
||||||
|
Co-authored by: Paul Sauve <paul@technove.co>
|
||||||
|
As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/patches/server/0014-Reduce-chunk-loading-lookups.patch)
|
||||||
|
Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
|
||||||
|
index 4edd94ac765d2ab107612504b67e6e07da609313..c0e38131da55d8a85444ef4248224d37a7271089 100644
|
||||||
|
--- a/net/minecraft/world/entity/monster/EnderMan.java
|
||||||
|
+++ b/net/minecraft/world/entity/monster/EnderMan.java
|
||||||
|
@@ -296,11 +296,18 @@ public class EnderMan extends Monster implements NeutralMob {
|
||||||
|
private boolean teleport(double x, double y, double z) {
|
||||||
|
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(x, y, z);
|
||||||
|
|
||||||
|
- while (mutableBlockPos.getY() > this.level().getMinY() && !this.level().getBlockState(mutableBlockPos).blocksMotion()) {
|
||||||
|
+ // Pufferfish start - single chunk lookup
|
||||||
|
+ net.minecraft.world.level.chunk.LevelChunk chunk = this.level().getChunkIfLoaded(mutableBlockPos);
|
||||||
|
+ if (chunk == null) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // Pufferfish end
|
||||||
|
+ while (mutableBlockPos.getY() > this.level().getMinY() && !chunk.getBlockState(mutableBlockPos).blocksMotion()) { // Pufferfish
|
||||||
|
+
|
||||||
|
mutableBlockPos.move(Direction.DOWN);
|
||||||
|
}
|
||||||
|
|
||||||
|
- BlockState blockState = this.level().getBlockState(mutableBlockPos);
|
||||||
|
+ BlockState blockState = chunk.getBlockState(mutableBlockPos); // Pufferfish
|
||||||
|
boolean flag = blockState.blocksMotion();
|
||||||
|
boolean isWater = blockState.getFluidState().is(FluidTags.WATER);
|
||||||
|
if (flag && !isWater) {
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Thu, 30 Jan 2025 08:42:29 +0800
|
||||||
|
Subject: [PATCH] Purpur: Lobotomize stuck villagers
|
||||||
|
|
||||||
|
Co-authored by: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||||
|
As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0001-Ridables.patch)
|
||||||
|
Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
|
||||||
|
index 3a4d349738aada9c171f01cd695987a21da3785c..6ce3d8c406f7afbc9aa8e0d6577ebf9b4724ae36 100644
|
||||||
|
--- a/net/minecraft/world/entity/npc/Villager.java
|
||||||
|
+++ b/net/minecraft/world/entity/npc/Villager.java
|
||||||
|
@@ -197,6 +197,53 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||||
|
this.setVillagerData(this.getVillagerData().withType(villagerType).withProfession(level.registryAccess(), VillagerProfession.NONE));
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Purpur start
|
||||||
|
+ private boolean isLobotomized = false; public boolean isLobotomized() { return this.isLobotomized; } // Purpur
|
||||||
|
+ private int notLobotomizedCount = 0; // Purpur
|
||||||
|
+
|
||||||
|
+ private boolean checkLobotomized() {
|
||||||
|
+ int interval = me.earthme.luminol.config.modules.optimizations.LobotomizeVillageConfig.villagerLobotomizeCheckInterval;
|
||||||
|
+ boolean shouldCheckForTradeLocked = me.earthme.luminol.config.modules.optimizations.LobotomizeVillageConfig.villagerLobotomizeWaitUntilTradeLocked;
|
||||||
|
+ if (this.notLobotomizedCount > 3) {
|
||||||
|
+ // check half as often if not lobotomized for the last 3+ consecutive checks
|
||||||
|
+ interval *= 2;
|
||||||
|
+ }
|
||||||
|
+ if (this.level().getGameTime() % interval == 0) {
|
||||||
|
+ // offset Y for short blocks like dirt_path/farmland
|
||||||
|
+ this.isLobotomized = !(shouldCheckForTradeLocked && this.getVillagerXp() == 0) && !canTravelFrom(BlockPos.containing(this.position().x, this.getBoundingBox().minY + 0.0625D, this.position().z));
|
||||||
|
+
|
||||||
|
+ if (this.isLobotomized) {
|
||||||
|
+ this.notLobotomizedCount = 0;
|
||||||
|
+ } else {
|
||||||
|
+ this.notLobotomizedCount++;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return this.isLobotomized;
|
||||||
|
+ }
|
||||||
|
+ // Purpur end
|
||||||
|
+
|
||||||
|
+ private boolean canTravelFrom(BlockPos pos) {
|
||||||
|
+ return canTravelTo(pos.east()) || canTravelTo(pos.west()) || canTravelTo(pos.north()) || canTravelTo(pos.south());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private boolean canTravelTo(BlockPos pos) {
|
||||||
|
+ net.minecraft.world.level.block.state.BlockState state = this.level().getBlockStateIfLoaded(pos);
|
||||||
|
+ if (state == null) {
|
||||||
|
+ // chunk not loaded
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ net.minecraft.world.level.block.Block bottom = state.getBlock();
|
||||||
|
+ if (bottom instanceof net.minecraft.world.level.block.FenceBlock ||
|
||||||
|
+ bottom instanceof net.minecraft.world.level.block.FenceGateBlock ||
|
||||||
|
+ bottom instanceof net.minecraft.world.level.block.WallBlock) {
|
||||||
|
+ // bottom block is too tall to get over
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ net.minecraft.world.level.block.Block top = level().getBlockState(pos.above()).getBlock();
|
||||||
|
+ // only if both blocks have no collision
|
||||||
|
+ return !bottom.hasCollision && !top.hasCollision;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public Brain<Villager> getBrain() {
|
||||||
|
return (Brain<Villager>)super.getBrain();
|
||||||
|
@@ -293,11 +340,20 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||||
|
// Paper start - EAR 2
|
||||||
|
this.customServerAiStep(level, false);
|
||||||
|
}
|
||||||
|
- protected void customServerAiStep(ServerLevel level, final boolean inactive) {
|
||||||
|
+ protected void customServerAiStep(ServerLevel level, boolean inactive) { // Purpur - not final
|
||||||
|
// Paper end - EAR 2
|
||||||
|
ProfilerFiller profilerFiller = Profiler.get();
|
||||||
|
profilerFiller.push("villagerBrain");
|
||||||
|
+ // Purpur start
|
||||||
|
+ if (me.earthme.luminol.config.modules.optimizations.LobotomizeVillageConfig.villagerLobotomizeEnabled) {
|
||||||
|
+ // treat as inactive if lobotomized
|
||||||
|
+ inactive = inactive || checkLobotomized();
|
||||||
|
+ } else {
|
||||||
|
+ this.isLobotomized = false;
|
||||||
|
+ }
|
||||||
|
+ // Purpur end
|
||||||
|
if (!inactive) this.getBrain().tick(level, this); // Paper - EAR 2
|
||||||
|
+ else if (this.isLobotomized && shouldRestock()) restock(); // Purpur - Lobotomize stuck villagers
|
||||||
|
profilerFiller.pop();
|
||||||
|
if (this.assignProfessionWhenSpawned) {
|
||||||
|
this.assignProfessionWhenSpawned = false;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 15:35:43 +0800
|
||||||
|
Subject: [PATCH] SparklyPaper: Optimize canSee checks
|
||||||
|
|
||||||
|
Co-authored by: MrPowerGamerBR <git@mrpowergamerbr.com>
|
||||||
|
As part of: SparklyPaper (https://github.com/SparklyPower/SparklyPaper/blob/a69d3690472c9967772ffd4d4bd1f41403b7ea6f/sparklypaper-server/paper-patches/features/0005-Optimize-canSee-checks.patch)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
|
||||||
|
index 4d603fafd07141a63db22f6e5a544fabbb6b9630..6868b915bf3deb85783a638d4441a15fea6da2dc 100644
|
||||||
|
--- a/net/minecraft/server/level/ChunkMap.java
|
||||||
|
+++ b/net/minecraft/server/level/ChunkMap.java
|
||||||
|
@@ -1294,7 +1294,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||||||
|
}
|
||||||
|
// Folia end - region threading
|
||||||
|
// CraftBukkit start - respect vanish API
|
||||||
|
- if (flag && (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(player) || !player.getBukkitEntity().canSee(this.entity.getBukkitEntity()))) { // Paper - only consider hits // Folia - region threading
|
||||||
|
+ if (flag && (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(player) || !player.getBukkitEntity().canSeeChunkMapUpdatePlayer(this.entity.getBukkitEntity()))) { // Paper - only consider hits // Folia - region threading // SparklyPaper - optimize canSee checks
|
||||||
|
flag = false;
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 15:37:25 +0800
|
||||||
|
Subject: [PATCH] SparklyPaper: Skip "distanceToSqr" call in
|
||||||
|
"ServerEntity#sendChanges" if the delta movement hasn't changed
|
||||||
|
|
||||||
|
Co-authored by: MrPowerGamerBR <git@mrpowergamerbr.com>
|
||||||
|
As part of: SparklyPaper (https://github.com/SparklyPower/SparklyPaper/blob/a69d3690472c9967772ffd4d4bd1f41403b7ea6f/sparklypaper-server/minecraft-patches/features/0002-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch)
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
|
||||||
|
index 2d4c68b01cc1508a1a4715a91316a7db80d4efa2..3a9293d5328ef0befa0b709169489b61a2266807 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerEntity.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerEntity.java
|
||||||
|
@@ -209,6 +209,8 @@ public class ServerEntity {
|
||||||
|
|
||||||
|
if (this.entity.hasImpulse || this.trackDelta || this.entity instanceof LivingEntity && ((LivingEntity)this.entity).isFallFlying()) {
|
||||||
|
Vec3 deltaMovement = this.entity.getDeltaMovement();
|
||||||
|
+
|
||||||
|
+ if (deltaMovement != this.lastSentMovement) { // SparklyPaper start - skip distanceToSqr call in ServerEntity#sendChanges if the delta movement hasn't changed
|
||||||
|
double d = deltaMovement.distanceToSqr(this.lastSentMovement);
|
||||||
|
if (d > 1.0E-7 || d > 0.0 && deltaMovement.lengthSqr() == 0.0) {
|
||||||
|
this.lastSentMovement = deltaMovement;
|
||||||
|
@@ -226,6 +228,7 @@ public class ServerEntity {
|
||||||
|
this.broadcast.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.lastSentMovement));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ } // SparklyPaper end
|
||||||
|
}
|
||||||
|
|
||||||
|
if (packet != null) {
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sat, 26 Apr 2025 21:47:45 +0800
|
||||||
|
Subject: [PATCH] Correct player respawn place
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
index 8b6b881896797b93a2f475c21101463e1888cee1..a632bfb00e151a395e886aff3471084dc6cf4102 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||||
|
@@ -566,8 +566,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
double amountX = selectMaxX - selectMinX;
|
||||||
|
double amountZ = selectMaxZ - selectMinZ;
|
||||||
|
|
||||||
|
- int selectX = amountX < 1.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor((amountX + 1.0) * random.nextDouble() + selectMinX);
|
||||||
|
- int selectZ = amountZ < 1.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor((amountZ + 1.0) * random.nextDouble() + selectMinZ);
|
||||||
|
+ // Luminol start - Correct player respawn place
|
||||||
|
+ int selectX = amountX < 0.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor(amountX * random.nextDouble() + selectMinX);
|
||||||
|
+ int selectZ = amountZ < 0.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor(amountZ * random.nextDouble() + selectMinZ);
|
||||||
|
+ // Luminol end - Correct player respawn place
|
||||||
|
|
||||||
|
return new BlockPos(selectX, 0, selectZ);
|
||||||
|
}
|
||||||
|
@@ -578,10 +580,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||||
|
}
|
||||||
|
|
||||||
|
private static BlockPos findSpawnAround(ServerLevel world, ServerPlayer player, BlockPos selected) {
|
||||||
|
+ // Luminol start - Correct player respawn place
|
||||||
|
+ BlockPos inChunk;
|
||||||
|
+ inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX(), selected.getZ());
|
||||||
|
+ if (inChunk != null) {
|
||||||
|
+ AABB checkVolume = player.getBoundingBoxAt((double)inChunk.getX() + 0.5, (double)inChunk.getY(), (double)inChunk.getZ() + 0.5);
|
||||||
|
+ if (player.noCollisionNoLiquid(world, checkVolume)) {
|
||||||
|
+ return inChunk;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Luminol end - Correct player respawn place
|
||||||
|
// try hard to find, so that we don't attempt another chunk load
|
||||||
|
for (int dz = -SPAWN_RADIUS_SELECTION_SEARCH; dz <= SPAWN_RADIUS_SELECTION_SEARCH; ++dz) {
|
||||||
|
for (int dx = -SPAWN_RADIUS_SELECTION_SEARCH; dx <= SPAWN_RADIUS_SELECTION_SEARCH; ++dx) {
|
||||||
|
- BlockPos inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX() + dx, selected.getZ() + dz);
|
||||||
|
+ inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX() + dx, selected.getZ() + dz); // Luminol - Correct player respawn place
|
||||||
|
if (inChunk == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sat, 24 May 2025 04:04:42 +0800
|
||||||
|
Subject: [PATCH] Command IllegalArgumentException crash fix
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/commands/FillCommand.java b/net/minecraft/server/commands/FillCommand.java
|
||||||
|
index 7665bff921eda626c0f1498a4ca03b62483d10ed..350adc15b06f2405137c2c753cbb673541df61fb 100644
|
||||||
|
--- a/net/minecraft/server/commands/FillCommand.java
|
||||||
|
+++ b/net/minecraft/server/commands/FillCommand.java
|
||||||
|
@@ -248,6 +248,10 @@ public class FillCommand {
|
||||||
|
// Folia start - region threading
|
||||||
|
} catch (CommandSyntaxException ex) {
|
||||||
|
sendMessage(source, ex);
|
||||||
|
+ // Luminol Start - Server crash fix
|
||||||
|
+ } catch (IllegalArgumentException ex) {
|
||||||
|
+ net.minecraft.server.commands.SetBlockCommand.processIAE(source, ex);
|
||||||
|
+ // Luminol End - Server crash fix
|
||||||
|
}}); return 0; // Folia end - region threading
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/server/commands/SetBlockCommand.java b/net/minecraft/server/commands/SetBlockCommand.java
|
||||||
|
index 07cff4e1e7af98cf3ead1f255557c1a994072610..34cc1906bfb49501bb2b3477bc99429e05cbb0f6 100644
|
||||||
|
--- a/net/minecraft/server/commands/SetBlockCommand.java
|
||||||
|
+++ b/net/minecraft/server/commands/SetBlockCommand.java
|
||||||
|
@@ -102,6 +102,15 @@ public class SetBlockCommand {
|
||||||
|
}
|
||||||
|
// Folia end - region threading
|
||||||
|
|
||||||
|
+ // Luminol Start - Server crash fix
|
||||||
|
+ public static void processIAE(CommandSourceStack src, IllegalArgumentException ex) {
|
||||||
|
+ Component hoverText = Component.translatable("command.failed")
|
||||||
|
+ .withStyle(style -> style.withHoverEvent(new net.minecraft.network.chat.HoverEvent.ShowText(Component.literal(ex.getMessage()))));
|
||||||
|
+ src.sendFailure(hoverText);
|
||||||
|
+ com.mojang.logging.LogUtils.getLogger().error(ex.getMessage(), ex);
|
||||||
|
+ }
|
||||||
|
+ // Luminol end - Server crash fix
|
||||||
|
+
|
||||||
|
private static int setBlock(
|
||||||
|
CommandSourceStack source, BlockPos pos, BlockInput block, SetBlockCommand.Mode mode, @Nullable Predicate<BlockInWorld> filter, boolean strict
|
||||||
|
) throws CommandSyntaxException {
|
||||||
|
@@ -139,6 +148,10 @@ public class SetBlockCommand {
|
||||||
|
// Folia start - region threading
|
||||||
|
} catch (CommandSyntaxException ex) {
|
||||||
|
sendMessage(source, ex);
|
||||||
|
+ // Luminol Start - Server crash fix
|
||||||
|
+ } catch (IllegalArgumentException ex) {
|
||||||
|
+ processIAE(source, ex);
|
||||||
|
+ // Luminol End - Server crash fix
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return 1;
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 11:00:49 +0800
|
||||||
|
Subject: [PATCH] Force disable builtin spark plugin
|
||||||
|
|
||||||
|
The spark passed down from paper has some memory leaking issue, so we fully removed it from the code to prevent that memory leaking issue.
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
|
index d824b49b98266539258a83f9a36f73c5961a1588..737df5c9345e22fa4487cbb83c7462b92a4f9e78 100644
|
||||||
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
|
@@ -783,8 +783,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
// Paper end - Configurable player collision
|
||||||
|
|
||||||
|
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
|
||||||
|
- this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
|
||||||
|
- this.server.spark.enableAfterPlugins(this.server); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
+ if (false) this.server.spark.enableAfterPlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
|
||||||
|
io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
|
||||||
|
io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.INITIAL); // Paper - call commands event for regular plugins
|
||||||
|
@@ -1067,7 +1067,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
|
||||||
|
// CraftBukkit start
|
||||||
|
if (this.server != null) {
|
||||||
|
- this.server.spark.disable(); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.disable(); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
this.server.disablePlugins();
|
||||||
|
this.server.waitForAsyncTasksShutdown(); // Paper - Wait for Async Tasks during shutdown
|
||||||
|
}
|
||||||
|
@@ -1251,7 +1251,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
this.statusIcon = this.loadStatusIcon().orElse(null);
|
||||||
|
this.status = this.buildServerStatus();
|
||||||
|
|
||||||
|
- this.server.spark.enableBeforePlugins(); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.enableBeforePlugins(); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
// Folia start - region threading
|
||||||
|
if (true) {
|
||||||
|
io.papermc.paper.threadedregions.RegionizedServer.getInstance().init(); // Folia - region threading - only after loading worlds
|
||||||
|
@@ -1594,7 +1594,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.emptyTicks >= i) {
|
||||||
|
- this.server.spark.tickStart(); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.tickStart(); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
if (this.emptyTicks == i) {
|
||||||
|
LOGGER.info("Server empty for {} seconds, pausing", this.pauseWhileEmptySeconds());
|
||||||
|
this.autoSave();
|
||||||
|
@@ -1613,7 +1613,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
// Paper end - avoid issues with certain tasks not processing during sleep
|
||||||
|
//this.server.spark.executeMainThreadTasks(); // Paper - spark // Folia - region threading
|
||||||
|
this.tickConnection();
|
||||||
|
- this.server.spark.tickEnd(((double)(System.nanoTime() - lastTick) / 1000000D)); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.tickEnd(((double)(System.nanoTime() - lastTick) / 1000000D)); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1636,7 +1636,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
};
|
||||||
|
// Folia end - region threading
|
||||||
|
|
||||||
|
- this.server.spark.tickStart(); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.tickStart(); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper - Server Tick Events // Folia - region threading
|
||||||
|
// Folia start - region threading
|
||||||
|
if (region != null) {
|
||||||
|
@@ -1744,7 +1744,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
long remaining = scheduledEnd - endTime; // Folia - region ticking
|
||||||
|
new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
|
||||||
|
// Paper end - Server Tick Events
|
||||||
|
- this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region threading
|
||||||
|
+ if (false) this.server.spark.tickEnd(((double)(endTime - startTime) / 1000000D)); // Paper - spark // Folia - region threading // Luminol - Force disable builtin spark
|
||||||
|
// Folia - region threading
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
index f07d3009caf964b8e1b5328bb3e28866e0c41955..1f3c26cc9f3b687693c36f2946394fad5ab6bc9f 100644
|
||||||
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
|
@@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
// Paper end - initialize global and world-defaults configuration
|
||||||
|
me.earthme.luminol.config.LuminolConfig.finalizeLoadConfig(); // Luminol - load config file
|
||||||
|
me.earthme.luminol.config.LuminolConfig.setupLatch(); // Luminol - load config file
|
||||||
|
- this.server.spark.enableEarlyIfRequested(); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
|
||||||
|
if (this.convertOldUsers()) {
|
||||||
|
this.getProfileCache().save(false); // Paper
|
||||||
|
@@ -183,7 +183,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
|
||||||
|
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
|
||||||
|
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
|
||||||
|
- this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
|
||||||
|
+ if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark
|
||||||
|
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
|
||||||
|
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
|
||||||
|
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sat, 8 Mar 2025 09:55:40 +0800
|
||||||
|
Subject: [PATCH] Fix a series issue around entity memory typed GlobalPos and
|
||||||
|
WalkTarget
|
||||||
|
|
||||||
|
Fixes the issue remained by the memory cleaning fix due to that there is a little complex relationship in these memories, and we need to manual patch them
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
||||||
|
index 2664d72c3b6906d0505df2e63c0e5075eba9461b..f03c3c512ea48c2a89eebae62484922d28e4f831 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
||||||
|
@@ -69,6 +69,11 @@ public class BehaviorUtils {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setWalkAndLookTargetMemories(LivingEntity entity, PositionTracker positionTracker, float speedModifier, int closeEnoughDist) {
|
||||||
|
+ // Luminol - Do not set walk target if target position is out of current tick region
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity.level(), positionTracker.currentBlockPosition())) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
WalkTarget walkTarget = new WalkTarget(positionTracker, speedModifier, closeEnoughDist);
|
||||||
|
entity.getBrain().setMemory(MemoryModuleType.LOOK_TARGET, positionTracker);
|
||||||
|
entity.getBrain().setMemory(MemoryModuleType.WALK_TARGET, walkTarget);
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/behavior/SleepInBed.java b/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
||||||
|
index bc6a5cacd67d46e0beb97adf30d98c1034be1a44..dd35eef062c36a409b6d3e701664db504c4c7631 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/behavior/SleepInBed.java
|
||||||
|
@@ -42,6 +42,12 @@ public class SleepInBed extends Behavior<LivingEntity> {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Luminol - Prevent off-tick-region chunk operations
|
||||||
|
+ final net.minecraft.world.level.Level currentLevel = owner.level();
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(currentLevel, globalPos.pos())) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // Luminol -end
|
||||||
|
BlockState blockState = level.getBlockStateIfLoaded(globalPos.pos()); // Paper - Prevent sync chunk loads when villagers try to find beds
|
||||||
|
if (blockState == null) { return false; } // Paper - Prevent sync chunk loads when villagers try to find beds
|
||||||
|
return globalPos.pos().closerToCenterThan(owner.position(), 2.0) && blockState.is(BlockTags.BEDS) && !blockState.getValue(BedBlock.OCCUPIED);
|
||||||
|
diff --git a/net/minecraft/world/entity/animal/allay/AllayAi.java b/net/minecraft/world/entity/animal/allay/AllayAi.java
|
||||||
|
index 36a9887f8be04c5c3fda6d926d819a9e5b2a79f2..5681592bdeb050d875c4c5d0dfaf6e015beb1c74 100644
|
||||||
|
--- a/net/minecraft/world/entity/animal/allay/AllayAi.java
|
||||||
|
+++ b/net/minecraft/world/entity/animal/allay/AllayAi.java
|
||||||
|
@@ -114,6 +114,17 @@ public class AllayAi {
|
||||||
|
Optional<GlobalPos> memory = brain.getMemory(MemoryModuleType.LIKED_NOTEBLOCK_POSITION);
|
||||||
|
if (memory.isPresent()) {
|
||||||
|
GlobalPos globalPos = memory.get();
|
||||||
|
+ // Luminol start - Do not like item if they were out of current tickregion
|
||||||
|
+ final Level targetLevel = entity.level().getServer().getLevel(globalPos.dimension());
|
||||||
|
+ final BlockPos targetPos = globalPos.pos();
|
||||||
|
+
|
||||||
|
+ // thread checks
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, targetPos)) {
|
||||||
|
+ brain.eraseMemory(MemoryModuleType.LIKED_NOTEBLOCK_POSITION); // The memory value is not being belong to current tick region anymore
|
||||||
|
+ return Optional.empty();
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
+
|
||||||
|
if (shouldDepositItemsAtLikedNoteblock(entity, brain, globalPos)) {
|
||||||
|
return Optional.of(new BlockPosTracker(globalPos.pos().above()));
|
||||||
|
}
|
||||||
|
diff --git a/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
|
||||||
|
index 6a9f31c1f39cc14ad7b5ae3af85908bc7a4caae4..34fea93dddfe0b947eb2517dd083ca842d19a0c6 100644
|
||||||
|
--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
|
||||||
|
+++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
|
||||||
|
@@ -268,7 +268,17 @@ public class Sniffer extends Animal {
|
||||||
|
|
||||||
|
private boolean canDig(BlockPos pos) {
|
||||||
|
return this.level().getBlockState(pos).is(BlockTags.SNIFFER_DIGGABLE_BLOCK)
|
||||||
|
- && this.getExploredPositions().noneMatch(globalPos -> GlobalPos.of(this.level().dimension(), pos).equals(globalPos))
|
||||||
|
+ && this.getExploredPositions().noneMatch(globalPos -> { // Luminol start - Do not pathfind out of tickregion
|
||||||
|
+ // thread checks
|
||||||
|
+ final Level targetLevel = net.minecraft.server.MinecraftServer.getServer().getLevel(globalPos.dimension());
|
||||||
|
+ final BlockPos targetPos = globalPos.pos();
|
||||||
|
+
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, targetPos)) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return GlobalPos.of(this.level().dimension(), pos).equals(globalPos); // Original logic
|
||||||
|
+ }) // Luminol end
|
||||||
|
&& Optional.ofNullable(this.getNavigation().createPath(pos, 1)).map(Path::canReach).orElse(false);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sat, 10 May 2025 19:46:16 +0800
|
||||||
|
Subject: [PATCH] Fix creative player item pick
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
|
||||||
|
index a596813c3cbacb1a4be86d41be01e8850fc6799c..244996de73d75e812e27aa896cd3875a14179b74 100644
|
||||||
|
--- a/net/minecraft/world/entity/item/ItemEntity.java
|
||||||
|
+++ b/net/minecraft/world/entity/item/ItemEntity.java
|
||||||
|
@@ -409,7 +409,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
||||||
|
Item item1 = item.getItem();
|
||||||
|
int count = item.getCount();
|
||||||
|
// CraftBukkit start - fire PlayerPickupItemEvent
|
||||||
|
- int canHold = entity.getInventory().canHold(item);
|
||||||
|
+ // Luminol start - Fix creative item picking
|
||||||
|
+ int canHold;
|
||||||
|
+ if (entity instanceof net.minecraft.server.level.ServerPlayer
|
||||||
|
+ && ((net.minecraft.server.level.ServerPlayer) entity).gameMode.getGameModeForPlayer().equals(net.minecraft.world.level.GameType.CREATIVE)) {
|
||||||
|
+ canHold = count;
|
||||||
|
+ } else {
|
||||||
|
+ canHold = entity.getInventory().canHold(item);
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
int remaining = count - canHold;
|
||||||
|
boolean flyAtPlayer = false; // Paper
|
||||||
|
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
||||||
|
Date: Sun, 27 Apr 2025 14:26:01 +0800
|
||||||
|
Subject: [PATCH] Fix entity portal-teleport speed
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
index 7b7c72f14ae966ef142d68615b2f88ba42a079f5..87377bba2ebdc0eba5b7b212d971994c35ca0b62 100644
|
||||||
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
|
@@ -1364,7 +1364,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
if (levelChunk != null) levelChunk.getChunkHot().startTicking(); try { // KioCG
|
||||||
|
try {
|
||||||
|
// Folia end - profiler
|
||||||
|
+ // Luminol start - Entity portal-teleport speed fix
|
||||||
|
if (isActive) { // Paper - EAR 2
|
||||||
|
+ if (!(entity instanceof Player) && entity.teleportTickType == 2) { // Luminol - after portal compensate tick
|
||||||
|
+ entity.tick();
|
||||||
|
+ entity.tick();
|
||||||
|
+ entity.teleportTickType = 0;
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ if (entity.handlePortal()) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ } else if (!(entity instanceof Player) && entity.teleportTickType == 1) { // Luminol - portal teleport only
|
||||||
|
+ entity.teleportTickType++;
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ if (entity.handlePortal()) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
entity.tick();
|
||||||
|
// Folia start - region threading
|
||||||
|
if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
|
||||||
|
@@ -1375,6 +1395,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
|
// portalled
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
+ // Luminol end - Entity portal-teleport speed fix
|
||||||
|
// Folia end - region threading
|
||||||
|
} else {entity.inactiveTick();} // Paper - EAR 2
|
||||||
|
profilerFiller.pop();
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index e5de7480c2e025fc9a8b4845fdb959049f1afdda..4d275da5772f90ed460f6aafef483c06b740c702 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -371,6 +371,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
public long activatedTick = Integer.MIN_VALUE;
|
||||||
|
public boolean isTemporarilyActive;
|
||||||
|
public long activatedImmunityTick = Integer.MIN_VALUE;
|
||||||
|
+ public int teleportTickType = 0;// Luminol - Entity portal-teleport speed fix
|
||||||
|
|
||||||
|
public void inactiveTick() {
|
||||||
|
}
|
||||||
|
@@ -3422,6 +3423,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
} else {
|
||||||
|
if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
|
||||||
|
this.portalProcess = new PortalProcessor(portal, pos.immutable());
|
||||||
|
+ this.teleportTickType = 1; // Luminol - Entity portal-teleport speed fix
|
||||||
|
} else if (!this.portalProcess.isInsidePortalThisTick()) {
|
||||||
|
this.portalProcess.updateEntryPosition(pos.immutable());
|
||||||
|
this.portalProcess.setAsInsidePortalThisTick(true);
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Thu, 24 Apr 2025 23:11:13 +0800
|
||||||
|
Subject: [PATCH] Fix off tickregion sync teleport
|
||||||
|
|
||||||
|
Folis's teleportAsync implementation has some checks missing during the sync teleportation checks, if we are teleport to the edge of the tickregion, it is still asserting that we are in the same tickregion and moved us directly, but there is actually some logics is already touching the stuff out of current tickregion.So we added some new edge checks to the sync teleportation checks which will check the tickregion belonging in a shape of cycle which is in min(entity's bounding box + simulate distance, 6) of radius to fix that issue
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index 4d275da5772f90ed460f6aafef483c06b740c702..43d0ad699a02a5156fe958f709c941a7cab6daa3 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -4226,6 +4226,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
this.resetStoredPositions();
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Luminol start - Fix sync teleport issue
|
||||||
|
+ private boolean checkNearbyTickRegions(int destX, int destZ) {
|
||||||
|
+ // Dumb end gateway search the chunks in radius of 5 chunks, so we need keep 6(5+1) by default check radius
|
||||||
|
+ int sizeBx = Math.min(6, (int) (this.bb.maxX - this.bb.minX) + this.level.getCraftServer().getSimulationDistance());
|
||||||
|
+ int sizeBz = Math.min(6, (int) (this.bb.maxZ - this.bb.minZ) + this.level.getCraftServer().getSimulationDistance());
|
||||||
|
+
|
||||||
|
+ // check tick thread around these area
|
||||||
|
+ return ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.level,
|
||||||
|
+ (destX >> 4) - sizeBx,
|
||||||
|
+ (destZ >> 4) - sizeBz,
|
||||||
|
+ (destX >> 4) + sizeBx,
|
||||||
|
+ (destZ >> 4) + sizeBz);
|
||||||
|
+ }
|
||||||
|
+ // Luminol end
|
||||||
|
+
|
||||||
|
protected final void transform(TeleportTransition telpeort) {
|
||||||
|
PositionMoveRotation move = PositionMoveRotation.calculateAbsolute(
|
||||||
|
PositionMoveRotation.of(this), PositionMoveRotation.of(telpeort), telpeort.relatives()
|
||||||
|
@@ -4348,7 +4363,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
// check for same region
|
||||||
|
if (destination == this.level()) {
|
||||||
|
Vec3 currPos = this.position();
|
||||||
|
- if (
|
||||||
|
+ // Luminol - Prevent entity sync teleported to the edge of tickregion
|
||||||
|
+ if (this.checkNearbyTickRegions((int) pos.x, (int) pos.z) && // Luminol - Fix sync teleport issue
|
||||||
|
destination.regioniser.getRegionAtUnsynchronised(
|
||||||
|
ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(currPos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(currPos)
|
||||||
|
) == destination.regioniser.getRegionAtUnsynchronised(
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Tue, 11 Feb 2025 13:34:47 +0800
|
||||||
|
Subject: [PATCH] Fix uncorrected death check of folia
|
||||||
|
|
||||||
|
In the new mc version, mojang changed some checks in A.C.M(AbstractContainerMenu) and there is a new death check of player which will be executed when player dead.But on folia, player entity cannot be discarded unless they disconnected from the server, so there is an obvious bug that when player dead, the logic depend on that dead check will not be executed correctly because the check logic is still asserting the player is alive by checking if the player is discarded, which caused some exploits can save items in the crafting slots(with InventoryTweaks turned on in meteor client) when keepInventory is set to false
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
|
index f4548edae77eb86e54ba499acbb20613fd60d7bd..852b4381985ed167b05881f068e9542c31cdaf23 100644
|
||||||
|
--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
|
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
|
@@ -690,7 +690,7 @@ public abstract class AbstractContainerMenu {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void dropOrPlaceInInventory(Player player, ItemStack stack) {
|
||||||
|
- boolean flag = player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION;
|
||||||
|
+ boolean flag = !player.isAlive(); //player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; // Luminol - Fix uncorrected death check of folia
|
||||||
|
boolean flag1 = player instanceof ServerPlayer serverPlayer && serverPlayer.hasDisconnected();
|
||||||
|
if (flag || flag1) {
|
||||||
|
player.drop(stack, false);
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:53:41 +0800
|
||||||
|
Subject: [PATCH] Teleport async if entity was moving to another region at once
|
||||||
|
|
||||||
|
On folia, entity usually cannot move out of the tickregion, but sometimes it actually does(like some end pearl gun that can shoot an end pearl to the block faraway than 10000 blocks even more). To fix this, we added a temporary fix which teleport these entities to the destination instead running its move logics so that we could ensure anything is under control.But one thing need to consider is that teleportAsync is actually calling halfway of the entity tick and there is still something running when teleportAsync called, which is actually modified the entity in another thread, so there is still need an improvement
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
|
index 43d0ad699a02a5156fe958f709c941a7cab6daa3..990ea0359c9015f867dc529a284148cd4846f5e8 100644
|
||||||
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -1110,6 +1110,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
|
||||||
|
private boolean boundingBoxChanged = false; // Gale - VMP - skip entity move if movement is zero
|
||||||
|
|
||||||
|
+ //Luminol start - Fix large pos moving
|
||||||
|
+ private volatile boolean preventMoving = false;
|
||||||
|
+ //Luminol end
|
||||||
|
+
|
||||||
|
public void move(MoverType type, Vec3 movement) {
|
||||||
|
// Gale start - VMP - skip entity move if movement is zero
|
||||||
|
if (!this.boundingBoxChanged && movement.equals(Vec3.ZERO)) {
|
||||||
|
@@ -1125,6 +1129,32 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
|
this.moveStartZ = this.getZ();
|
||||||
|
this.moveVector = movement;
|
||||||
|
}
|
||||||
|
+ //Luminol start - Fix high position moving
|
||||||
|
+ if (me.earthme.luminol.config.modules.fixes.FoliaEntityMovingFixConfig.enabled && ca.spottedleaf.moonrise.common.util.TickThread.isTickThread()){ //Except the threads because it may be called by the chunk system worker thread
|
||||||
|
+ var finalPosition = movement.add(this.position);
|
||||||
|
+ if (this.preventMoving || Double.isNaN(finalPosition.x) || Double.isNaN(finalPosition.y) || Double.isNaN(finalPosition.z)){
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(((ServerLevel) this.level),finalPosition)){
|
||||||
|
+ this.preventMoving = true;
|
||||||
|
+ this.teleportAsync(
|
||||||
|
+ (ServerLevel) this.level(),
|
||||||
|
+ finalPosition,
|
||||||
|
+ this.getYRot(), this.getXRot(),
|
||||||
|
+ null, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.UNKNOWN,
|
||||||
|
+ Entity.TELEPORT_FLAG_LOAD_CHUNK | Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS,
|
||||||
|
+ result -> {
|
||||||
|
+ this.preventMoving = false;
|
||||||
|
+ }
|
||||||
|
+ );
|
||||||
|
+ if (me.earthme.luminol.config.modules.fixes.FoliaEntityMovingFixConfig.warnOnDetected){
|
||||||
|
+ MinecraftServer.LOGGER.warn("Entity {} with entityId {} has tried moving to another region!",this.type.getCategory().getName(),this.getId());
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ //Luminol end
|
||||||
|
try {
|
||||||
|
// Paper end - detailed watchdog information
|
||||||
|
if (this.noPhysics) {
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <wangxyper@163.com>
|
||||||
|
Date: Sun, 12 Jan 2025 10:56:59 +0800
|
||||||
|
Subject: [PATCH] Try fixing folia off region POI accessing issue
|
||||||
|
|
||||||
|
Folia's POIManager sometimes is trying getting the POI record that doesn't belong to current tickregion which is causing some off-main-thread exceptions thrown, so we need to replace the logic with corrected one
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/net/minecraft/world/entity/ai/village/poi/PoiManager.java
|
||||||
|
index c10810bf00d75f459c3c6a9415c1e09f0519d50e..3adafa43367cd6648ecbccb92ba5bd509740d5a4 100644
|
||||||
|
--- a/net/minecraft/world/entity/ai/village/poi/PoiManager.java
|
||||||
|
+++ b/net/minecraft/world/entity/ai/village/poi/PoiManager.java
|
||||||
|
@@ -212,7 +212,7 @@ public class PoiManager extends SectionStorage<PoiSection, PoiSection.Packed> im
|
||||||
|
|
||||||
|
public Stream<PoiRecord> getInSquare(Predicate<Holder<PoiType>> typePredicate, BlockPos pos, int distance, PoiManager.Occupancy status) {
|
||||||
|
int i = Math.floorDiv(distance, 16) + 1;
|
||||||
|
- return ChunkPos.rangeClosed(new ChunkPos(pos), i).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, status)).filter(poiRecord -> {
|
||||||
|
+ return ChunkPos.rangeClosed(new ChunkPos(pos), i).filter(cpos -> me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled ? ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.world,cpos) : true).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, status)).filter(poiRecord -> { // Luminol - Fix off region POI access
|
||||||
|
BlockPos pos1 = poiRecord.getPos();
|
||||||
|
return Math.abs(pos1.getX() - pos.getX()) <= distance && Math.abs(pos1.getZ() - pos.getZ()) <= distance;
|
||||||
|
});
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MrHua269 <mrhua269@gmail.com>
|
||||||
|
Date: Sun, 15 Jun 2025 16:58:05 +0800
|
||||||
|
Subject: [PATCH] Do not fire pre creature spawn event unless some plugin is
|
||||||
|
listening it
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
|
||||||
|
index f324a74a191d3fe3e270556d07c4543ec34e0195..2fb36cba4cda3f7b84efae9cba6bed2394fb0457 100644
|
||||||
|
--- a/net/minecraft/world/level/NaturalSpawner.java
|
||||||
|
+++ b/net/minecraft/world/level/NaturalSpawner.java
|
||||||
|
@@ -360,16 +360,18 @@ public final class NaturalSpawner {
|
||||||
|
) {
|
||||||
|
EntityType<?> entityType = data.type();
|
||||||
|
// Paper start - PreCreatureSpawnEvent
|
||||||
|
- com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
|
||||||
|
- org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level),
|
||||||
|
- org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(entityType), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL
|
||||||
|
- );
|
||||||
|
- if (!event.callEvent()) {
|
||||||
|
- if (event.shouldAbortSpawn()) {
|
||||||
|
- return PreSpawnStatus.ABORT;
|
||||||
|
+ if (com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent.getHandlerList().getRegisteredListeners().length != 0) { // Luminol - Do not fire pre creature spawn event unless some plugin is listening it
|
||||||
|
+ com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
|
||||||
|
+ org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level),
|
||||||
|
+ org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(entityType), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL
|
||||||
|
+ );
|
||||||
|
+ if (!event.callEvent()) {
|
||||||
|
+ if (event.shouldAbortSpawn()) {
|
||||||
|
+ return PreSpawnStatus.ABORT;
|
||||||
|
+ }
|
||||||
|
+ return PreSpawnStatus.CANCELLED;
|
||||||
|
}
|
||||||
|
- return PreSpawnStatus.CANCELLED;
|
||||||
|
- }
|
||||||
|
+ } // Luminol - Do not fire pre creature spawn event unless some plugin is listening it
|
||||||
|
final boolean success = entityType.getCategory() != MobCategory.MISC
|
||||||
|
// Paper end - PreCreatureSpawnEvent
|
||||||
|
&& (
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user