mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e25d8106c | ||
|
|
cedee17635 | ||
|
|
fafa95bdf4 | ||
|
|
d5d1e3157d | ||
|
|
b1008b481b | ||
|
|
e14159c05d | ||
|
|
211d3aa692 | ||
|
|
88bb2217e5 | ||
|
|
278bdfc132 | ||
|
|
66d4d888eb | ||
|
|
ee1e695124 | ||
|
|
6435274d1e | ||
|
|
6c3729d6e9 | ||
|
|
6a702686db | ||
|
|
d3476f3f80 | ||
|
|
6665cdcf4e | ||
|
|
d9665f6447 | ||
|
|
ec73fd5240 | ||
|
|
3bbdbacb81 | ||
|
|
478d8b3f18 | ||
|
|
03f928a3de | ||
|
|
4834f16aef | ||
|
|
7846d25606 | ||
|
|
77cb0c5c4e | ||
|
|
5e421e8b8b | ||
|
|
5f37e8af53 | ||
|
|
5ab792f1d7 | ||
|
|
38ebbf189c | ||
|
|
f247eebd55 | ||
|
|
555989cf10 | ||
|
|
49fe93b1b5 | ||
|
|
48167e93b4 | ||
|
|
2bd132a6f8 | ||
|
|
b8168a12df | ||
|
|
df271e0265 | ||
|
|
d7687a72d5 | ||
|
|
047e5fe252 | ||
|
|
5ac2675f87 | ||
|
|
b544849f7d | ||
|
|
39683f28dd | ||
|
|
da4fd10ee8 | ||
|
|
e1c2add370 | ||
|
|
c71ba862cf | ||
|
|
3c057d277b | ||
|
|
b99abff6ce | ||
|
|
558e7d754e | ||
|
|
d29524bac3 | ||
|
|
929064ee69 | ||
|
|
b4024a7884 | ||
|
|
07f6499143 | ||
|
|
236842f210 | ||
|
|
ef811aebe8 | ||
|
|
d61de63482 | ||
|
|
8368a1d20a | ||
|
|
8b8d3fdef7 | ||
|
|
f5d4fbbee5 | ||
|
|
6f4f60e213 | ||
|
|
01bfc33b28 | ||
|
|
17e1002e86 | ||
|
|
da1b8f4efa | ||
|
|
42bbe44a34 | ||
|
|
f095474adf | ||
|
|
1b5ca64f20 | ||
|
|
b518c804fb | ||
|
|
e50a0ffc6c | ||
|
|
7ea0a41fe2 | ||
|
|
f3d16621c0 | ||
|
|
aa55a6a831 | ||
|
|
3449217c65 | ||
|
|
41609a03d2 | ||
|
|
9b8e5c7109 | ||
|
|
f05ad3afd0 | ||
|
|
6a615f1a4b | ||
|
|
4376cd6b85 | ||
|
|
d17a111dc0 | ||
|
|
1b99b2cea4 | ||
|
|
4ef6695a30 | ||
|
|
0e6341a23e | ||
|
|
17ce723edf | ||
|
|
fc80e30289 | ||
|
|
ecd1491f96 | ||
|
|
8f7fbc76e1 | ||
|
|
ec405958c9 | ||
|
|
e2ff990601 | ||
|
|
8443262e39 | ||
|
|
8e09d47cd6 | ||
|
|
0404d2d776 | ||
|
|
aea804cb6e | ||
|
|
0bffcb83c5 | ||
|
|
9a022d1451 | ||
|
|
58aa3b276c | ||
|
|
b0ccf1a480 | ||
|
|
c1d703e395 | ||
|
|
728fd6ff24 | ||
|
|
0a885a77e7 | ||
|
|
15dbadaae6 | ||
|
|
4c1c3aafdb | ||
|
|
f06727a205 | ||
|
|
ef0e7bc17f | ||
|
|
ec7a098f81 | ||
|
|
ff25961a05 | ||
|
|
c999a2d4eb | ||
|
|
ce79df9716 | ||
|
|
eae9b9145d | ||
|
|
7f56986027 | ||
|
|
c6874bce67 | ||
|
|
aa11175f41 | ||
|
|
2730559ff3 | ||
|
|
e80c3402b7 | ||
|
|
837c259668 | ||
|
|
2e48910b4c | ||
|
|
70dd556db6 | ||
|
|
e44a558f37 | ||
|
|
1e154cbe3e | ||
|
|
d5c5df1b64 | ||
|
|
5e75de5eb7 | ||
|
|
ddb1e52e99 | ||
|
|
9e55363e2c | ||
|
|
219abfed22 | ||
|
|
6915753b5a | ||
|
|
1527738ddc | ||
|
|
18c806f1d0 | ||
|
|
47f7c68ed5 | ||
|
|
5e8942e0a7 | ||
|
|
a02f3f9841 | ||
|
|
c5e462f7d2 | ||
|
|
d1f79d6655 | ||
|
|
9d5e81b1a9 | ||
|
|
a1c275df46 | ||
|
|
4ef7fe8bd8 | ||
|
|
ce8838e721 | ||
|
|
b7e2593d48 | ||
|
|
33d177f02e | ||
|
|
5d2186df63 | ||
|
|
77af36b807 | ||
|
|
54eeca0aed | ||
|
|
3de0566425 | ||
|
|
a5ebf3b645 | ||
|
|
63d0496cc4 | ||
|
|
31f623e794 | ||
|
|
eb001a6382 | ||
|
|
504dcad849 | ||
|
|
81f7f029c3 | ||
|
|
207c1997c9 | ||
|
|
e348ae5b84 | ||
|
|
0f3b8ee830 | ||
|
|
b4b6e48a7a | ||
|
|
d50a3b5ab7 | ||
|
|
88904a1d09 | ||
|
|
b864faf0ef | ||
|
|
c97eabc0c4 | ||
|
|
6ae39c8597 | ||
|
|
dcafb4f633 | ||
|
|
1ea7ce9831 | ||
|
|
674f2efd54 | ||
|
|
02e82c672d | ||
|
|
b25f6e3a7c | ||
|
|
e69b07a54a | ||
|
|
79efe2ac36 | ||
|
|
464483db5b | ||
|
|
f49adb285f | ||
|
|
55862dfd1d | ||
|
|
124b9bd8d3 | ||
|
|
bae3915728 | ||
|
|
b3c2c62c7e | ||
|
|
68698d70c1 | ||
|
|
d55dee9394 | ||
|
|
2d114f2719 | ||
|
|
3e6583af01 | ||
|
|
762f6a7d78 | ||
|
|
3c5a534b7a | ||
|
|
bc62d1693a | ||
|
|
554ead8d4a | ||
|
|
ec5ac91389 | ||
|
|
f63813d929 | ||
|
|
5d4825ac4b | ||
|
|
3024ef7707 | ||
|
|
0d3b488728 | ||
|
|
a01012f20c | ||
|
|
d4e3ef4a22 | ||
|
|
d7293a78dc | ||
|
|
8e4e02e258 | ||
|
|
2f5a6fee48 | ||
|
|
0e74886f8d | ||
|
|
07977ba242 | ||
|
|
a894c244fe | ||
|
|
cf32a799a4 | ||
|
|
0fda1d9393 | ||
|
|
c7f0acbe38 | ||
|
|
9c06c20023 | ||
|
|
041084d1da | ||
|
|
e643d0a11f | ||
|
|
5efb8d3f12 | ||
|
|
70537542d1 | ||
|
|
bd4b059c2b | ||
|
|
e0d2c68c5b | ||
|
|
86d4bda32e | ||
|
|
98b90f26bc | ||
|
|
4e7c471fa3 | ||
|
|
ec6f9fc6e7 | ||
|
|
427fef1d4b | ||
|
|
83594b0b0a | ||
|
|
b76064e57a | ||
|
|
b2bf70c7f1 | ||
|
|
384286a453 | ||
|
|
d93b7db69a | ||
|
|
bdbde4bb0f | ||
|
|
e2a68ad903 | ||
|
|
46cfe50108 | ||
|
|
4b423a3087 | ||
|
|
7d0b07e858 | ||
|
|
40220600b0 | ||
|
|
0c7a0e927c | ||
|
|
60e8157b9a | ||
|
|
b8f5e4553b | ||
|
|
de587eb50a | ||
|
|
086bcb7148 | ||
|
|
c22589b5b3 | ||
|
|
e0fbab3c49 | ||
|
|
7cfed38194 | ||
|
|
b8105ca5a6 | ||
|
|
c3ee633897 | ||
|
|
23b41ce9b3 | ||
|
|
2c6156be25 | ||
|
|
eeb3eb3689 | ||
|
|
44a158a714 | ||
|
|
770298b1d5 | ||
|
|
7bd50903a6 | ||
|
|
64295d04ff | ||
|
|
f168ce4499 | ||
|
|
419c349a1f | ||
|
|
26d0f7282f | ||
|
|
93c72d2d92 | ||
|
|
f252871322 | ||
|
|
32c8597305 | ||
|
|
9714512c31 | ||
|
|
f106ff0c21 | ||
|
|
9c85a6bb64 | ||
|
|
dc594f196a | ||
|
|
db4d8a4729 | ||
|
|
0ca1d0ebd0 | ||
|
|
4995902bc0 | ||
|
|
28e55b2843 | ||
|
|
decaace84a | ||
|
|
72f98dc4a3 | ||
|
|
2951c1dac8 | ||
|
|
40a0a16db0 | ||
|
|
520680b037 | ||
|
|
2844bead6e | ||
|
|
d498ec4a45 | ||
|
|
e2d1ca7d0e | ||
|
|
a547327c61 | ||
|
|
e9a7ce9544 | ||
|
|
511be6415c | ||
|
|
4d85053a4d | ||
|
|
4fcf1877c1 | ||
|
|
41fd15fc57 | ||
|
|
8e0845d032 | ||
|
|
c04e533a61 | ||
|
|
54f4997f71 | ||
|
|
3272e995ab | ||
|
|
8edb551571 | ||
|
|
4bf0de4763 | ||
|
|
f6a54436b9 | ||
|
|
7a497cdbd6 | ||
|
|
06336a40d8 | ||
|
|
842c95cfb9 | ||
|
|
aa2f471e87 | ||
|
|
4209d1fc12 | ||
|
|
583f363b6b | ||
|
|
1c633b4624 | ||
|
|
2677511da6 | ||
|
|
387441c045 | ||
|
|
4a2db246e0 | ||
|
|
3d9e12a71d | ||
|
|
cdeb786877 | ||
|
|
ff7085b95b | ||
|
|
16dde4d551 | ||
|
|
60661350c6 | ||
|
|
7ee4a44c75 | ||
|
|
f22894cf70 | ||
|
|
a3fce36942 | ||
|
|
549dbe7df4 | ||
|
|
5505e472aa | ||
|
|
c2c7f9b656 | ||
|
|
fd8a0f9c8b | ||
|
|
0ac873e296 | ||
|
|
38b5b678cb | ||
|
|
9a2bc1e7c2 | ||
|
|
95b49bedbc | ||
|
|
7c36115e3d | ||
|
|
c037e6aca1 | ||
|
|
e8f1b7ed6d | ||
|
|
5da16e6719 | ||
|
|
f0a82d79a6 | ||
|
|
2b3a4137e1 | ||
|
|
640c206117 | ||
|
|
59a7bbdb57 | ||
|
|
be7ad14b4b | ||
|
|
c700b4ea9d | ||
|
|
dffa3dd4c9 | ||
|
|
4b934809c4 | ||
|
|
ddf76db9b3 | ||
|
|
64d6b4f76a | ||
|
|
58012bfb17 | ||
|
|
0cad6b14d9 | ||
|
|
8848294210 | ||
|
|
0e28336fc0 | ||
|
|
968fa9eeb5 | ||
|
|
43768ea328 | ||
|
|
0e829630da | ||
|
|
0467d71466 | ||
|
|
115eb5e4c8 | ||
|
|
a7345372fd | ||
|
|
bd714b2f76 | ||
|
|
7b782e5b05 |
No files matched your search
@@ -3,6 +3,7 @@
|
|||||||
*.patch text eol=lf
|
*.patch text eol=lf
|
||||||
*.java text eol=lf
|
*.java text eol=lf
|
||||||
*.gradle text eol=crlf
|
*.gradle text eol=crlf
|
||||||
|
**/MANIFEST.MF text eol=crlf
|
||||||
*.png binary
|
*.png binary
|
||||||
*.gif binary
|
*.gif binary
|
||||||
*.exe binary
|
*.exe binary
|
||||||
|
|||||||
@@ -10,4 +10,4 @@ assignees: ''
|
|||||||
<!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
|
<!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
|
||||||
<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
|
<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
|
||||||
<!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
|
<!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
|
||||||
<!-- Discord: https://discord.gg/UvedJ9m -->
|
<!-- Discord: https://discord..minecraftforge.net/ -->
|
||||||
@@ -11,6 +11,7 @@ assignees: ''
|
|||||||
|
|
||||||
<!-- For support with crashes and issues, please create a post on the forum instead: -->
|
<!-- For support with crashes and issues, please create a post on the forum instead: -->
|
||||||
<!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
|
<!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
|
||||||
|
<!-- You can also use the discord for support, https://discord.minecraftforge.net/ -->
|
||||||
|
|
||||||
**Minecraft Version:** {Minecraft version}
|
**Minecraft Version:** {Minecraft version}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: Publish
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ '26.1.2' ]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
|
||||||
|
with:
|
||||||
|
java: 21
|
||||||
|
gradle_setup: './gradlew setup'
|
||||||
|
gradle_tasks: 'build publish'
|
||||||
|
artifact_name: 'forge'
|
||||||
|
secrets:
|
||||||
|
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
|
PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
|
||||||
|
PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
|
||||||
|
PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
|
||||||
|
MAVEN_USER: ${{ secrets.MAVEN_USER }}
|
||||||
|
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
|
||||||
|
SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
|
||||||
|
SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
|
||||||
|
SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
|
||||||
|
SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
|
||||||
@@ -7,7 +7,7 @@ jobs:
|
|||||||
name: Upload payload
|
name: Upload payload
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
|
- uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
|
||||||
with:
|
with:
|
||||||
name: payload
|
name: payload
|
||||||
path: ${{ github.event_path }}
|
path: ${{ github.event_path }}
|
||||||
@@ -7,7 +7,7 @@ jobs:
|
|||||||
name: Upload payload
|
name: Upload payload
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
|
- uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
|
||||||
with:
|
with:
|
||||||
name: payload
|
name: payload
|
||||||
path: ${{ github.event_path }}
|
path: ${{ github.event_path }}
|
||||||
+20
-15
@@ -1,3 +1,6 @@
|
|||||||
|
#forgedev dev if the folder exists in here
|
||||||
|
forgedev
|
||||||
|
|
||||||
#eclipse
|
#eclipse
|
||||||
**/bin
|
**/bin
|
||||||
**/.settings
|
**/.settings
|
||||||
@@ -22,11 +25,12 @@
|
|||||||
/*/build
|
/*/build
|
||||||
/*/.gradle
|
/*/.gradle
|
||||||
|
|
||||||
|
# Minecraft
|
||||||
|
/run
|
||||||
|
/*.launch
|
||||||
|
|
||||||
# Projects repo, either ignore it, or ignore patches.
|
# Projects repo, either ignore it, or ignore patches.
|
||||||
/projects/mcp/
|
src/minecraft
|
||||||
/projects/clean/
|
|
||||||
/projects/forge/
|
|
||||||
#/patches/*
|
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/projects/**/build/
|
/projects/**/build/
|
||||||
@@ -35,20 +39,21 @@
|
|||||||
/projects/**/*.launch
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
src/*/generated/**/.cache/
|
src/*/generated/**/.cache/
|
||||||
|
|
||||||
# Generated by gradle every import
|
# Generated by gradle every import
|
||||||
**/src/main/resources/META-INF/MANIFEST.MF
|
**/src/main/resources/META-INF/MANIFEST.MF
|
||||||
/fmlloader/src/main/resources/forge_version.json
|
/fmlloader/src/main/resources/forge_version.json
|
||||||
|
|
||||||
#Patch rejects
|
|
||||||
#/patches-/
|
|
||||||
#*.patch.rej
|
|
||||||
#/projects/*/rejects/
|
|
||||||
|
|
||||||
# FML changelog
|
|
||||||
changelog.txt
|
|
||||||
*.py
|
|
||||||
*.7z
|
|
||||||
/logs/
|
|
||||||
|
|
||||||
/ForgeRoot.ipr
|
/ForgeRoot.ipr
|
||||||
/ForgeRoot.iws
|
/ForgeRoot.iws
|
||||||
|
|
||||||
|
# APT stuff
|
||||||
|
/*/.gitignore
|
||||||
|
/*/.factorypath
|
||||||
|
/*/.apt_generated/
|
||||||
|
/fmlcore/logs/
|
||||||
|
/lib/
|
||||||
|
/_actual/
|
||||||
|
/runs/
|
||||||
|
/forge.ipr
|
||||||
|
/forge.iws
|
||||||
Vendored
-104
@@ -1,104 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<name>MinecraftForge_Forge Config DSL Script</name>
|
|
||||||
<groupId>MinecraftForge_Forge</groupId>
|
|
||||||
<artifactId>MinecraftForge_Forge_dsl</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin-parent</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>jetbrains-all</id>
|
|
||||||
<url>https://download.jetbrains.com/teamcity-repository</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>teamcity-server</id>
|
|
||||||
<url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>JetBrains</id>
|
|
||||||
<url>https://download.jetbrains.com/teamcity-repository</url>
|
|
||||||
</pluginRepository>
|
|
||||||
</pluginRepositories>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<sourceDirectory>${basedir}</sourceDirectory>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>kotlin-maven-plugin</artifactId>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
|
|
||||||
<configuration/>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>compile</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>test-compile</id>
|
|
||||||
<phase>process-test-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>test-compile</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>teamcity-configs-maven-plugin</artifactId>
|
|
||||||
<version>${teamcity.dsl.version}</version>
|
|
||||||
<configuration>
|
|
||||||
<format>kotlin</format>
|
|
||||||
<dstDir>target/generated-configs</dstDir>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin</artifactId>
|
|
||||||
<version>${teamcity.dsl.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin-plugins</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-script-runtime</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
Vendored
-193
@@ -1,193 +0,0 @@
|
|||||||
import jetbrains.buildServer.configs.kotlin.v2019_2.*
|
|
||||||
import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
|
|
||||||
import jetbrains.buildServer.configs.kotlin.*
|
|
||||||
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
|
|
||||||
|
|
||||||
/*
|
|
||||||
The settings script is an entry point for defining a TeamCity
|
|
||||||
project hierarchy. The script should contain a single call to the
|
|
||||||
project() function with a Project instance or an init function as
|
|
||||||
an argument.
|
|
||||||
|
|
||||||
VcsRoots, BuildTypes, Templates, and subprojects can be
|
|
||||||
registered inside the project using the vcsRoot(), buildType(),
|
|
||||||
template(), and subProject() methods respectively.
|
|
||||||
|
|
||||||
To debug settings scripts in command-line, run the
|
|
||||||
|
|
||||||
mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
|
|
||||||
|
|
||||||
command and attach your debugger to the port 8000.
|
|
||||||
|
|
||||||
To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
|
|
||||||
-> Tool Windows -> Maven Projects), find the generate task node
|
|
||||||
(Plugins -> teamcity-configs -> teamcity-configs:generate), the
|
|
||||||
'Debug' option is available in the context menu for the task.
|
|
||||||
*/
|
|
||||||
|
|
||||||
version = "2021.2"
|
|
||||||
|
|
||||||
project {
|
|
||||||
|
|
||||||
buildType(Build)
|
|
||||||
buildType(BuildSecondaryBranches)
|
|
||||||
buildType(PullRequests)
|
|
||||||
buildType(PullRequestChecks)
|
|
||||||
buildType(PullRequestCompatibility)
|
|
||||||
|
|
||||||
params {
|
|
||||||
text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
|
||||||
text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
|
||||||
text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
|
||||||
text("git_branch_spec", """
|
|
||||||
+:refs/heads/(main*)
|
|
||||||
+:refs/heads/(master*)
|
|
||||||
+:refs/heads/(develop|release|staging|main|master)
|
|
||||||
+:refs/heads/(1.*)
|
|
||||||
""".trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
|
|
||||||
text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
|
||||||
text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
|
|
||||||
text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
|
|
||||||
//These are references and not actually keys
|
|
||||||
password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
|
|
||||||
password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
|
|
||||||
password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
|
|
||||||
text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
|
|
||||||
|
|
||||||
checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
|
|
||||||
checked = "true", unchecked = "false")
|
|
||||||
checkbox("should_execute_test", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
|
|
||||||
checked = "true", unchecked = "false")
|
|
||||||
}
|
|
||||||
|
|
||||||
features {
|
|
||||||
githubIssues {
|
|
||||||
id = "MinecraftForge_MinecraftForge__IssueTracker"
|
|
||||||
displayName = "MinecraftForge/MinecraftForge"
|
|
||||||
repositoryURL = "https://github.com/MinecraftForge/MinecraftForge"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
object Build : BuildType({
|
|
||||||
templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
|
|
||||||
id("MinecraftForge_MinecraftForge__Build")
|
|
||||||
name = "Build"
|
|
||||||
description = "Builds and Publishes the main branches of the project."
|
|
||||||
})
|
|
||||||
|
|
||||||
object BuildSecondaryBranches : BuildType({
|
|
||||||
templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
|
|
||||||
id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
|
|
||||||
name = "Build - Secondary Branches"
|
|
||||||
description = "Builds and Publishes the secondary branches of the project."
|
|
||||||
params {
|
|
||||||
text("git_branch_spec", """
|
|
||||||
+:refs/heads/(*)
|
|
||||||
-:refs/heads/noci*
|
|
||||||
""".trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
|
|
||||||
}
|
|
||||||
vcs {
|
|
||||||
branchFilter = """
|
|
||||||
+:*
|
|
||||||
-:1.*
|
|
||||||
-:<default>
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
object PullRequests : BuildType({
|
|
||||||
templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
|
|
||||||
id("MinecraftForge_MinecraftForge__PullRequests")
|
|
||||||
name = "Pull Requests"
|
|
||||||
description = "Builds pull requests for the project"
|
|
||||||
|
|
||||||
params {
|
|
||||||
checkbox("should_execute_build", "true", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
|
|
||||||
checked = "true", unchecked = "false")
|
|
||||||
text(
|
|
||||||
"gradle_build_task",
|
|
||||||
"assemble",
|
|
||||||
label = "Gradle build task to execute during build",
|
|
||||||
description = "Determines the build task that is executed to build the project.",
|
|
||||||
display = ParameterDisplay.HIDDEN,
|
|
||||||
allowEmpty = false
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
vcs {
|
|
||||||
branchFilter = """
|
|
||||||
+:*
|
|
||||||
-:1.*
|
|
||||||
-:<default>
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
object PullRequestChecks : BuildType({
|
|
||||||
templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
|
|
||||||
id("MinecraftForge_MinecraftForge__PullRequestChecks")
|
|
||||||
name = "Pull Requests (Checks)"
|
|
||||||
description = "Checks pull requests for the project"
|
|
||||||
|
|
||||||
steps {
|
|
||||||
gradle {
|
|
||||||
name = "Check"
|
|
||||||
id = "RUNNER_10_Check"
|
|
||||||
|
|
||||||
tasks = "checkAll"
|
|
||||||
gradleParams = "--continue %gradle_custom_args%"
|
|
||||||
enableStacktrace = true
|
|
||||||
dockerImage = "%docker_gradle_image%"
|
|
||||||
dockerRunParameters = """
|
|
||||||
-v "/opt/cache/agent/gradle:/home/gradle/.gradle"
|
|
||||||
-v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
|
|
||||||
--network=host
|
|
||||||
-u 1000:1000
|
|
||||||
%docker_additional_args%
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vcs {
|
|
||||||
branchFilter = """
|
|
||||||
+:*
|
|
||||||
-:1.*
|
|
||||||
-:<default>
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
object PullRequestCompatibility : BuildType({
|
|
||||||
templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
|
|
||||||
id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
|
|
||||||
name = "Pull Requests (Compatibility)"
|
|
||||||
description = "Validates binary compatibility for pull requests made to the project"
|
|
||||||
|
|
||||||
steps {
|
|
||||||
gradle {
|
|
||||||
name = "Validate"
|
|
||||||
id = "RUNNER_10_Compatibility"
|
|
||||||
|
|
||||||
tasks = "checkJarCompatibility"
|
|
||||||
gradleParams = "--continue %gradle_custom_args%"
|
|
||||||
enableStacktrace = true
|
|
||||||
dockerImage = "%docker_gradle_image%"
|
|
||||||
dockerRunParameters = """
|
|
||||||
-v "/opt/cache/agent/gradle:/home/gradle/.gradle"
|
|
||||||
-v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
|
|
||||||
--network=host
|
|
||||||
-u 1000:1000
|
|
||||||
%docker_additional_args%
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vcs {
|
|
||||||
branchFilter = """
|
|
||||||
+:*
|
|
||||||
-:1.*
|
|
||||||
-:<default>
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
-65
@@ -1,65 +0,0 @@
|
|||||||
Minecraft Forge: Credits/Thank You
|
|
||||||
|
|
||||||
Forge is a set of tools and modifications to the Minecraft base game code to assist
|
|
||||||
mod developers in creating new and exciting content. It has been in development for
|
|
||||||
several years now, but I would like to take this time thank a few people who have
|
|
||||||
helped it along its way.
|
|
||||||
|
|
||||||
First, the people who originally created the Forge projects way back in Minecraft
|
|
||||||
alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance
|
|
||||||
of me taking over the project, who knows what Minecraft modding would be today.
|
|
||||||
|
|
||||||
Secondly, someone who has worked with me, and developed some of the core features
|
|
||||||
that allow modding to be as functional, and as simple as it is, cpw. For developing
|
|
||||||
FML, which stabilized the client and server modding ecosystem. As well as the base
|
|
||||||
loading system that allows us to modify Minecraft's code as elegently as possible.
|
|
||||||
|
|
||||||
Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
|
|
||||||
sane as well as guiding the community into creating better additions to Forge.
|
|
||||||
|
|
||||||
Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which
|
|
||||||
I am a part}. For creating some of the core tools needed to make Minecraft modding
|
|
||||||
both possible, and as stable as can be.
|
|
||||||
On that note, here is some specific information of the MCP data we use:
|
|
||||||
* Minecraft Coder Pack (MCP) *
|
|
||||||
Forge Mod Loader and Minecraft Forge have permission to distribute and automatically
|
|
||||||
download components of MCP and distribute MCP data files. This permission is not
|
|
||||||
transitive and others wishing to redistribute the Minecraft Forge source independently
|
|
||||||
should seek permission of MCP or remove the MCP data files and request their users
|
|
||||||
to download MCP separately.
|
|
||||||
|
|
||||||
And lastly, the countless community members who have spent time submitting bug reports,
|
|
||||||
pull requests, and just helping out the community in general. Thank you.
|
|
||||||
|
|
||||||
--LexManos
|
|
||||||
|
|
||||||
=========================================================================
|
|
||||||
|
|
||||||
This is Forge Mod Loader.
|
|
||||||
|
|
||||||
You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
|
|
||||||
|
|
||||||
This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
|
|
||||||
and minecraft clients.
|
|
||||||
|
|
||||||
The code is authored by cpw.
|
|
||||||
|
|
||||||
It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
|
|
||||||
https://www.minecraftforum.net/topic/75440-
|
|
||||||
This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
|
|
||||||
|
|
||||||
It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
|
|
||||||
https://minecraftforge.net/
|
|
||||||
|
|
||||||
Additionally, it contains an implementation of topological sort based on that
|
|
||||||
published at http://keithschwarz.com/interesting/code/?dir=topological-sort
|
|
||||||
|
|
||||||
It also contains code from the Maven project for performing versioned dependency
|
|
||||||
resolution. http://maven.apache.org/
|
|
||||||
|
|
||||||
It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
|
|
||||||
with credit to it's authors.
|
|
||||||
|
|
||||||
Forge Mod Loader downloads components from the Minecraft Coder Pack
|
|
||||||
(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
|
|
||||||
|
|
||||||
+1
-1
@@ -3,7 +3,7 @@ parts herein are licensed under the terms of the LGPL 2.1 found
|
|||||||
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
|
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
|
||||||
copied below.
|
copied below.
|
||||||
|
|
||||||
Homepage: http://minecraftforge.net/
|
Homepage: https://minecraftforge.net/
|
||||||
https://github.com/MinecraftForge/MinecraftForge
|
https://github.com/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+777
-36
@@ -1,55 +1,796 @@
|
|||||||
import net.minecraftforge.forge.tasks.*
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'net.minecraftforge.licenser' version '1.0.1'
|
id 'java-library'
|
||||||
id 'com.github.ben-manes.versions' version '0.46.0'
|
id 'idea'
|
||||||
id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
|
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'de.undercouch.download' version '5.4.0'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false
|
alias libs.plugins.versions
|
||||||
id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
|
alias libs.plugins.gradleutils
|
||||||
id 'org.barfuin.gradle.taskinfo' version '2.1.0'
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
alias libs.plugins.jarsigner
|
||||||
|
id 'net.minecraftforge.forgedev'
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
Util.init() //Init all our extension methods!
|
gradleutils.displayName = 'Forge'
|
||||||
|
group = 'net.minecraftforge'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
ext {
|
// NOTE: See settings.gradle for all the referenceable version variables.
|
||||||
GIT_INFO = gradleutils.gitInfo
|
// All subprojects (that apply 'net.minecraftforge.forge.build.convention') will have these available.
|
||||||
VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
|
println "Version: $version"
|
||||||
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
|
||||||
|
java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
|
|
||||||
|
jarSigner.autoDetect('forge')
|
||||||
|
|
||||||
|
// We have to tell ForgeDev to use the exact versions of tools we ship in the installer
|
||||||
|
fdtools {
|
||||||
|
configure('binpatcher') {
|
||||||
|
version = buildLibs.binarypatcher.get().version
|
||||||
|
}
|
||||||
|
configure('installertools') {
|
||||||
|
version = buildLibs.installertools.get().version
|
||||||
|
}
|
||||||
|
configure('jarcompatibilitychecker') {
|
||||||
|
javaLauncher = javaToolchains.launcherFor(java.toolchain)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
changelog {
|
/* This is used for debugging, comparing all published artifacts against actual production
|
||||||
from '47.999'
|
forgedev.validatePublish {
|
||||||
|
task {
|
||||||
|
baseBranch = 'upstream/26.1.2'
|
||||||
|
versionPrefix = minecraftVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
final minecraftFiles = forgedev.minecraftFiles(minecraftVersion)
|
||||||
|
|
||||||
|
final mcpBase = forgedev.mcpBase {
|
||||||
|
mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}"
|
||||||
|
accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
|
sideAnnotationStrippers.from file('src/main/resources/forge.sas')
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.patches {
|
||||||
|
base = mcpBase
|
||||||
|
patches = file('patches/minecraft')
|
||||||
|
patched = file('src/minecraft/java')
|
||||||
|
sourceSets.main.java.srcDir patched
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('setup') {
|
tasks.register('setup') {
|
||||||
dependsOn ':forge:extractMapped'
|
dependsOn forgedev.patches.apply
|
||||||
if (findProject(':clean'))
|
|
||||||
dependsOn ':clean:extractMapped'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('doChecks') {
|
sourceSets {
|
||||||
dependsOn ':forge:checkJarCompatibility'
|
named('main') {
|
||||||
dependsOn ':forge:publish'
|
resources.srcDir 'src/main/generated'
|
||||||
}
|
}
|
||||||
|
named('test') {
|
||||||
project(':mcp') {
|
resources.srcDir 'src/test/generated'
|
||||||
apply plugin: 'net.minecraftforge.gradle.mcp'
|
|
||||||
mcp {
|
|
||||||
config MC_VERSION + '-' + MCP_VERSION
|
|
||||||
pipeline = 'joined'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (System.env.TEAMCITY_VERSION) {
|
license {
|
||||||
//Only setup the CI environment if and only if the environment variables are set.
|
header = file('LICENSE-header.txt')
|
||||||
tasks.named('configureTeamCity').configure {
|
|
||||||
doLast {
|
include 'net/minecraftforge/'
|
||||||
println "##teamcity[buildNumber '${project(':forge').version}']"
|
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
||||||
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
|
|
||||||
|
tasks.tap {
|
||||||
|
register('main') {
|
||||||
|
files.from files('src/main/java')
|
||||||
|
}
|
||||||
|
|
||||||
|
register('test') {
|
||||||
|
files.from files('src/test/java')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
publishAll = false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO [ForgeDev] Support compileOnlyApi, runtimeOnly, and a consumable annotation processor configuration
|
||||||
|
configurations {
|
||||||
|
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
||||||
|
register('bootstrap') {
|
||||||
|
transitive = false
|
||||||
|
canBeDeclared = true
|
||||||
|
canBeResolved = true
|
||||||
|
}
|
||||||
|
|
||||||
|
register('installer') {
|
||||||
|
transitive = false
|
||||||
|
canBeDeclared = true
|
||||||
|
canBeResolved = true
|
||||||
|
extendsFrom(bootstrap)
|
||||||
|
}
|
||||||
|
|
||||||
|
named('api') {
|
||||||
|
extendsFrom(installer)
|
||||||
|
}
|
||||||
|
|
||||||
|
named('implementation') {
|
||||||
|
// Inherit vanilla Minecraft's dependencies
|
||||||
|
extendsFrom(mcpBase.dependencyConfiguration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// These need to actually be on the classpath at the start. This is only used for the server shim jar.
|
||||||
|
// And this is only needed because custom file systems are REQUIRED to be on the boot classloader.
|
||||||
|
// This has ASM/BootStrap/Unsafe all because I haven't gotten around to moving UnionFileSystem out to its own project.
|
||||||
|
bootstrap libs.jarjar.fs // JarInJar file system
|
||||||
|
bootstrap libs.roimfs // JarInJar File System - FileSystems need to be on boot loader.
|
||||||
|
bootstrap libs.bundles.jimfs // In memory file system used for ForgeDev launches
|
||||||
|
bootstrap libs.securemodules // Has Union file system in it
|
||||||
|
bootstrap libs.unsafe // Needed by securemodules
|
||||||
|
bootstrap libs.bundles.asm // Needed by securemodules
|
||||||
|
|
||||||
|
implementation libs.jopt.simple
|
||||||
|
|
||||||
|
installer libs.bootstrap
|
||||||
|
installer libs.bootstrap.api // Needed by securemodules
|
||||||
|
installer libs.accesstransformers
|
||||||
|
installer libs.eventbus
|
||||||
|
installer libs.jspecify // Dep of EventBus
|
||||||
|
installer libs.forgespi
|
||||||
|
installer libs.coremods.api
|
||||||
|
installer libs.modlauncher
|
||||||
|
installer libs.mergetool.api
|
||||||
|
installer libs.bundles.night.config
|
||||||
|
installer libs.maven.artifact
|
||||||
|
installer libs.bundles.terminalconsoleappender
|
||||||
|
installer libs.mixin
|
||||||
|
installer libs.mixinextras.forge
|
||||||
|
installer libs.bundles.jarjar
|
||||||
|
installer libs.roimfs
|
||||||
|
|
||||||
|
installer projects.fmlcore
|
||||||
|
installer projects.fmlloader
|
||||||
|
installer projects.fmlearlydisplay
|
||||||
|
installer projects.javafmllanguage
|
||||||
|
installer projects.lowcodelanguage
|
||||||
|
installer projects.mclanguage
|
||||||
|
installer projects.forgeTransformers
|
||||||
|
|
||||||
|
runtimeOnly files(mcpBase.extra)
|
||||||
|
|
||||||
|
runtimeOnly libs.bootstrap
|
||||||
|
runtimeOnly libs.bootstrap.dev
|
||||||
|
|
||||||
|
annotationProcessor libs.eventbus.validator
|
||||||
|
}
|
||||||
|
|
||||||
|
final EXTRA_TXTS = [
|
||||||
|
file('LICENSE.txt'),
|
||||||
|
changelog.task.flatMap(task -> task.outputFile)
|
||||||
|
]
|
||||||
|
forgedev.runs {
|
||||||
|
configureEach {
|
||||||
|
options {
|
||||||
|
workingDir = layout.projectDirectory.dir("runs/$name")
|
||||||
|
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args '--gameDir', '.'
|
||||||
|
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
|
||||||
|
|
||||||
|
systemProperty 'bsl.debug', 'true'
|
||||||
|
systemProperty 'terminal.jline', 'true'
|
||||||
|
with(sourceSets.test) {
|
||||||
|
systemProperty 'forge.enableGameTest', 'true'
|
||||||
|
systemProperty 'forgedev.enableTestMods', 'true'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('client') {
|
||||||
|
options {
|
||||||
|
systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
|
||||||
|
systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
|
||||||
|
|
||||||
|
args '--launchTarget', 'forge_dev_client',
|
||||||
|
'--username', 'Dev',
|
||||||
|
'--version', project.name,
|
||||||
|
'--accessToken', '0',
|
||||||
|
'--userType', 'mojang',
|
||||||
|
'--versionType', 'release',
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('server') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_server'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('gameTestServer') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_server_gametest'
|
||||||
|
args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('data') {
|
||||||
|
options {
|
||||||
|
args '--launchTarget', 'forge_dev_data',
|
||||||
|
'--all',
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
|
||||||
|
with(sourceSets.main) {
|
||||||
|
args '--mod', 'forge',
|
||||||
|
'--output', rootProject.file('src/main/generated/')
|
||||||
|
}
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
args '--mod', '.+',
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--output', rootProject.file('src/test/generated/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
create('clientData') {
|
||||||
|
options {
|
||||||
|
args '--all',
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', '{assets_root}',
|
||||||
|
'--assetIndex', '{asset_index}'
|
||||||
|
|
||||||
|
with(sourceSets.main) {
|
||||||
|
args '--launchTarget', 'forge_dev_client_data',
|
||||||
|
'--mod', 'forge',
|
||||||
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
|
'--mod', 'forge'
|
||||||
|
}
|
||||||
|
|
||||||
|
with(sourceSets.test) {
|
||||||
|
args '--launchTarget', 'forge_dev',
|
||||||
|
'--launchEntry', 'minecraft/net.minecraft.client.data.Main',
|
||||||
|
'--launchData',
|
||||||
|
'--mod', '.+',
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--output', rootProject.file('src/test/generated/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tasks.register('genAllData') {
|
||||||
|
dependsOn forgedev.runs.data.run, forgedev.runs.data.runTest, forgedev.runs.clientData.run, forgedev.runs.clientData.runTest
|
||||||
|
}
|
||||||
|
|
||||||
|
final serverShim = forgedev.shim {
|
||||||
|
config {
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args = ['--launchTarget', 'forge_server']
|
||||||
|
}
|
||||||
|
classpath {
|
||||||
|
libraries configurations.installer
|
||||||
|
library tasks.named('universalJar', Jar)
|
||||||
|
library forgedev.binaryPatches('server').apply, 'server'
|
||||||
|
serverBundle.fileProvider(minecraftFiles.server)
|
||||||
|
}
|
||||||
|
bootstrapClasspath(configurations.bootstrap)
|
||||||
|
jar {
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') {
|
||||||
|
jar.fileProvider(mcpBase.classes)
|
||||||
|
output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
|
||||||
|
blacklist 'net/minecraft/world/level/BaseSpawner' // Ignore this class as we special case it.
|
||||||
|
invokeVirtual('finalizeSpawn', '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;')
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.validateDeprecations(tasks.named('jar', Jar)) {
|
||||||
|
mcVersion = minecraftVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.checks() {
|
||||||
|
base = mcpBase
|
||||||
|
ats {}
|
||||||
|
sas {}
|
||||||
|
execs {}
|
||||||
|
|
||||||
|
patches {
|
||||||
|
dependsOn forgedev.patches.make
|
||||||
|
patchDir = forgedev.patches.patches
|
||||||
|
patchesWithS2SArtifact = [
|
||||||
|
'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
|
||||||
|
'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fix {
|
||||||
|
dependsOn finalizeSpawn
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.patches.make.configure {
|
||||||
|
finalizedBy forgedev.checks.patches.fix
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final crowdin = forgedev.crowdin // Create the crowdin tasks
|
||||||
|
tasks.named('jar', Jar) {
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
exclude '.cache'
|
||||||
|
|
||||||
|
from(zipTree(crowdin.flatMap { it.output } )) {
|
||||||
|
include 'assets/forge/lang/*.json'
|
||||||
|
}
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.forge'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Specification-Version' : gitversion.info.tag,
|
||||||
|
'Implementation-Title' : project.group,
|
||||||
|
'Implementation-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/versions/forge/')
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : 'Minecraft',
|
||||||
|
'Specification-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Specification-Version' : minecraftVersion,
|
||||||
|
'Implementation-Title' : 'MCP',
|
||||||
|
'Implementation-Vendor' : gradleutils.vendor.get(),
|
||||||
|
'Implementation-Version': mcpVersion
|
||||||
|
], 'net/minecraftforge/versions/mcp/')
|
||||||
|
}
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
final universalJar = tasks.register('universalJar', Jar) {
|
||||||
|
from (zipTree(tasks.named('jar', Jar).flatMap { it.archiveFile } )) {
|
||||||
|
exclude(forgedev.filterVanilla(mcpBase.classes))
|
||||||
|
}
|
||||||
|
manifest = tasks.named('jar', Jar).get().manifest
|
||||||
|
archiveClassifier = 'universal'
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
final sourcesJarAll = tasks.register('sourcesJarAll', Jar) {
|
||||||
|
archiveClassifier = 'sources-all'
|
||||||
|
from(sourceSets.main.allJava.srcDirs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Our sources, plus the patches we do to Vanilla Minecraft
|
||||||
|
final sourcesJar = tasks.register('sourcesJar', Jar) {
|
||||||
|
archiveClassifier = 'sources'
|
||||||
|
from(sourceSets.main.allJava.srcDirs - forgedev.patches.patched.asFile.get())
|
||||||
|
mustRunAfter(forgedev.patches.make)
|
||||||
|
from(forgedev.patches.patches) {
|
||||||
|
into 'patches/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.userDev {
|
||||||
|
base(mcpBase)
|
||||||
|
|
||||||
|
config {
|
||||||
|
universal universalJar
|
||||||
|
sources sourcesJar
|
||||||
|
addLibraries(configurations.installer)
|
||||||
|
// TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config
|
||||||
|
// so we don't gotta keep making exceptions for MixinExtras
|
||||||
|
addCompileDependency(libs.mixinextras.common)
|
||||||
|
addAnnotationProcessorDependency(libs.mixinextras.common)
|
||||||
|
|
||||||
|
// TODO [ForgeDev] Consolidate Patcher + UserDev Config runs in a sane way
|
||||||
|
runs {
|
||||||
|
configureEach {
|
||||||
|
parents = []
|
||||||
|
main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
args '--gameDir', '.'
|
||||||
|
jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
|
||||||
|
client = it.name.containsIgnoreCase('client')
|
||||||
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('clientData') {
|
||||||
|
args '--launchTarget', "forge_userdev_client_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('client') {
|
||||||
|
property 'forge.enableGameTest', 'true'
|
||||||
|
args '--launchTarget', "forge_userdev_client"
|
||||||
|
args '--version', 'MOD_DEV'
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
|
register('server') {
|
||||||
|
property 'forge.enableGameTest', 'true'
|
||||||
|
args '--launchTarget', "forge_userdev_server"
|
||||||
|
}
|
||||||
|
|
||||||
|
register('gameTestServer') {
|
||||||
|
args '--launchTarget', "forge_userdev_server_gametest"
|
||||||
|
}
|
||||||
|
|
||||||
|
register('data') {
|
||||||
|
args '--launchTarget', "forge_userdev_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
patches {
|
||||||
|
modified.setFrom(sourcesJarAll.flatMap { it.archiveFile })
|
||||||
|
}
|
||||||
|
binaryPatches {
|
||||||
|
mustRunAfter(forgedev.patches.make)
|
||||||
|
patches.setFrom(forgedev.patches.patches)
|
||||||
|
dirty.setFrom(tasks.named('jar', Jar).flatMap { it.archiveFile })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
forgedev.userdevCompatibility(minecraftVersion) {
|
||||||
|
clean = mcpBase.classes
|
||||||
|
dirty = tasks.named('jar', Jar)
|
||||||
|
}
|
||||||
|
|
||||||
|
// region Installer tasks, Not needed when we simplify the installer/remove obf
|
||||||
|
final clientBinPatches = forgedev.binaryPatches('client') {
|
||||||
|
clean = minecraftFiles.client
|
||||||
|
// Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
|
||||||
|
apply {
|
||||||
|
store = true
|
||||||
|
marker = '.forge_patched_minecraft'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final serverBinPatches = forgedev.binaryPatches('server') {
|
||||||
|
clean = minecraftFiles.serverExtracted
|
||||||
|
apply { store = true }
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
forgedev.installer {
|
||||||
|
dev = !forgedev.ci
|
||||||
|
offline = false
|
||||||
|
baseVersion = buildLibs.installer.get().version.toString()
|
||||||
|
|
||||||
|
// Add extra libraries
|
||||||
|
pack serverShim.jar // The Server executable jar IS needed to be packed, as the installer would need a spec bump in order to download it
|
||||||
|
pack universalJar // I don't think this is strictly needed to be packed anymore, will need to double check later
|
||||||
|
|
||||||
|
launcherLibrary universalJar
|
||||||
|
// We configure the launcher here to keep the order for easier diff, after publishing, move this to the LauncherJson configuration below
|
||||||
|
launcherJson {
|
||||||
|
// We create this during install, so it's not downloadable
|
||||||
|
generated(clientBinPatches.apply, 'client')
|
||||||
|
}
|
||||||
|
|
||||||
|
launcherLibraries configurations.installer
|
||||||
|
|
||||||
|
final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
|
||||||
|
final installertools = tool(buildLibs.installertools)
|
||||||
|
final binarypatcher = tool(buildLibs.binarypatcher)
|
||||||
|
|
||||||
|
jar {
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
from(rootProject.file('/forge_installer_logo.png')) {
|
||||||
|
rename { 'big_logo.png' }
|
||||||
|
}
|
||||||
|
from(clientBinPatches.create.flatMap { t -> t.output }) {
|
||||||
|
rename { 'data/client.lzma' }
|
||||||
|
}
|
||||||
|
from(serverBinPatches.create.flatMap { t -> t.output }) {
|
||||||
|
rename { 'data/server.lzma' }
|
||||||
|
}
|
||||||
|
|
||||||
|
final argsFile = rootProject.file('server_files/args.txt')
|
||||||
|
final tokens = [tokens: [
|
||||||
|
SHIM_JAR_FILE: serverShim.jar.get().archiveFileName.get(),
|
||||||
|
MAVEN_PATH: forgedev.mavenArtifact.directory
|
||||||
|
]]
|
||||||
|
from(argsFile) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
rename { 'unix_args.txt' }
|
||||||
|
}
|
||||||
|
from(argsFile) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
rename { 'win_args.txt' }
|
||||||
|
}
|
||||||
|
|
||||||
|
from(rootProject.file('server_files')) {
|
||||||
|
filter(tokens, ReplaceTokens)
|
||||||
|
into 'data'
|
||||||
|
exclude 'args.txt'
|
||||||
|
}
|
||||||
|
|
||||||
|
jarSigner.sign(it)
|
||||||
|
}
|
||||||
|
json {
|
||||||
|
icon = rootProject.file('icon.ico')
|
||||||
|
executable serverShim.jar
|
||||||
|
minecraft = minecraftVersion
|
||||||
|
profileVersion = launcherId
|
||||||
|
|
||||||
|
final projectArtifact = "${project.group}:${project.name}:${project.version}"
|
||||||
|
|
||||||
|
data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]"
|
||||||
|
data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
|
||||||
|
|
||||||
|
data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
|
||||||
|
data 'PATCHED', "[$projectArtifact:client]", "[$projectArtifact:server]"
|
||||||
|
data 'PATCHED_SHA', clientBinPatches.apply.flatMap { it.output }, serverBinPatches.apply.flatMap { it.output }
|
||||||
|
|
||||||
|
steps = [
|
||||||
|
extract(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
archive '{INSTALLER}'
|
||||||
|
extract 'data/README.txt', '{ROOT}/README.txt'
|
||||||
|
extract 'data/run.sh', '{ROOT}/run.sh'
|
||||||
|
executable '{ROOT}/run.sh'
|
||||||
|
extract 'data/run.bat', '{ROOT}/run.bat'
|
||||||
|
optional 'data/user_jvm_args.txt', '{ROOT}/user_jvm_args.txt'
|
||||||
|
extract 'data/unix_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/unix_args.txt"
|
||||||
|
extract 'data/win_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/win_args.txt"
|
||||||
|
},
|
||||||
|
extractBundle(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
libraries()
|
||||||
|
},
|
||||||
|
extractBundle(installertools) {
|
||||||
|
side = 'server'
|
||||||
|
jar '{MINECRAFT_JAR}', '{MC_UNPACKED}'
|
||||||
|
cache '{MC_UNPACKED}', '{MC_UNPACKED_SHA}'
|
||||||
|
},
|
||||||
|
step(binarypatcher) {
|
||||||
|
side = 'server'
|
||||||
|
args = [
|
||||||
|
'--clean', '{MC_UNPACKED}',
|
||||||
|
'--output', '{PATCHED}',
|
||||||
|
'--apply', '{BINPATCH}',
|
||||||
|
'--data', '--unpatched',
|
||||||
|
'--store'
|
||||||
|
]
|
||||||
|
cache '{PATCHED}', '{PATCHED_SHA}'
|
||||||
|
},
|
||||||
|
step(binarypatcher) {
|
||||||
|
side = 'client'
|
||||||
|
args = [
|
||||||
|
'--clean', '{MINECRAFT_JAR}',
|
||||||
|
'--output', '{PATCHED}',
|
||||||
|
'--apply', '{BINPATCH}',
|
||||||
|
'--data', '--unpatched',
|
||||||
|
'--store',
|
||||||
|
'--marker', '.forge_patched_minecraft'
|
||||||
|
]
|
||||||
|
cache '{PATCHED}', '{PATCHED_SHA}'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
launcherJson {
|
||||||
|
// These are flags to preserve glitchy old behavior to make diffing easier, removing when migrating to production is recommended
|
||||||
|
sortLibraries = false // Don't sort, makes things non-deterministic, but easier to diff old versions
|
||||||
|
duplicateLibraries = true // Our 'bootstrap' layer go added twice
|
||||||
|
librariesLast = false // Makes libraries be added before args
|
||||||
|
|
||||||
|
id = launcherId
|
||||||
|
inheritsFrom = minecraftVersion
|
||||||
|
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
|
gameArgs = [ '--launchTarget', 'forge_client' ]
|
||||||
|
jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders' ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final mdkGradleWrapper = tasks.register('mdkGradleWrapper', Wrapper) {
|
||||||
|
gradleVersion = '9.5.0'
|
||||||
|
scriptFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradlew")
|
||||||
|
jarFile = layout.buildDirectory.dir("wrapper/" + gradleVersion + "/gradle/wrapper/gradle-wrapper.jar")
|
||||||
|
}
|
||||||
|
|
||||||
|
final mdkZip = tasks.register('mdkZip', Zip) {
|
||||||
|
dependsOn mdkGradleWrapper
|
||||||
|
|
||||||
|
archiveBaseName = project.name
|
||||||
|
archiveClassifier = 'mdk'
|
||||||
|
archiveVersion = project.version
|
||||||
|
destinationDirectory = file('build/libs')
|
||||||
|
from(EXTRA_TXTS)
|
||||||
|
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getScriptFile)
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getBatchScript)
|
||||||
|
into('gradle/wrapper/') {
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getJarFile)
|
||||||
|
from mdkGradleWrapper.map(Wrapper.&getPropertiesFile)
|
||||||
|
}
|
||||||
|
from(rootProject.file('mdk/')){
|
||||||
|
rootProject.file('mdk/gitignore.txt').eachLine {
|
||||||
|
if (!it.trim().isEmpty() && !it.trim().startsWith('#'))
|
||||||
|
exclude it
|
||||||
|
}
|
||||||
|
filter(ReplaceTokens, tokens: [
|
||||||
|
FORGE_VERSION: forgeVersion,
|
||||||
|
FORGE_GROUP: project.group,
|
||||||
|
FORGE_NAME: project.name,
|
||||||
|
MC_VERSION: minecraftVersion,
|
||||||
|
FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0],
|
||||||
|
MC_NEXT_VERSION: minecraftNextVersion,
|
||||||
|
EVENTBUS_VERSION: libs.versions.eventbus.get()
|
||||||
|
])
|
||||||
|
rename 'gitignore\\.txt', '.gitignore'
|
||||||
|
rename 'gitattributes\\.txt', '.gitattributes'
|
||||||
|
}
|
||||||
|
from(rootProject.file('src/test/java/com/example/examplemod/')) {
|
||||||
|
into('src/main/java/com/example/examplemod/')
|
||||||
|
}
|
||||||
|
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
||||||
|
into('src/main/resources/')
|
||||||
|
exclude '**/.cache/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
tasks.named('javadoc', Javadoc) {
|
||||||
|
description = 'Generates the combined javadocs for the FML projects and the main Forge project'
|
||||||
|
var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage', ':forge-transformers' ]
|
||||||
|
source includedProjects.collect { project(it).sourceSets.main.allJava }
|
||||||
|
classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath })
|
||||||
|
|
||||||
|
var docsDir = rootProject.file('src/docs/')
|
||||||
|
inputs.dir(docsDir)
|
||||||
|
.withPropertyName('docs resources directory')
|
||||||
|
.withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
|
.optional()
|
||||||
|
|
||||||
|
failOnError = false
|
||||||
|
|
||||||
|
// Exclude the Minecraft classes if not enabled
|
||||||
|
if (!project.hasProperty('generateAllDocumentation')) {
|
||||||
|
exclude 'net/minecraft/**'
|
||||||
|
exclude 'com/mojang/**'
|
||||||
|
}
|
||||||
|
exclude 'mcp/**'
|
||||||
|
|
||||||
|
options {
|
||||||
|
stylesheetFile = new File(docsDir, 'stylesheet.css')
|
||||||
|
|
||||||
|
tags = [
|
||||||
|
'apiNote:a:<em>API Note:</em>',
|
||||||
|
'implSpec:a:<em>Implementation Requirements:</em>',
|
||||||
|
'implNote:a:<em>Implementation Note:</em>'
|
||||||
|
]
|
||||||
|
|
||||||
|
groups = [
|
||||||
|
'Forge Mod Loader': [
|
||||||
|
'net.minecraftforge.fml.common.asm*',
|
||||||
|
'net.minecraftforge.fml.loading*',
|
||||||
|
'net.minecraftforge.fml.server*'
|
||||||
|
],
|
||||||
|
'FML Core': [
|
||||||
|
'net.minecraftforge.fml',
|
||||||
|
'net.minecraftforge.fml.config*',
|
||||||
|
'net.minecraftforge.fml.event*',
|
||||||
|
'net.minecraftforge.fml.util*'
|
||||||
|
],
|
||||||
|
'FML Common': [
|
||||||
|
'net.minecraftforge.fml.core',
|
||||||
|
'net.minecraftforge.fml.event.config',
|
||||||
|
'net.minecraftforge.fml.event.lifecycle'
|
||||||
|
],
|
||||||
|
'FML Java/MC Language Providers': [
|
||||||
|
'net.minecraftforge.fml.common',
|
||||||
|
'net.minecraftforge.fml.javafmlmod',
|
||||||
|
'net.minecraftforge.fml.mclanguageprovider'
|
||||||
|
],
|
||||||
|
'Minecraft Forge API': [
|
||||||
|
'net.minecraftforge*'
|
||||||
|
]
|
||||||
|
]
|
||||||
|
|
||||||
|
author = false
|
||||||
|
noSince = true
|
||||||
|
noHelp = true
|
||||||
|
|
||||||
|
bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1."
|
||||||
|
windowTitle = "Minecraft Forge API ${version}"
|
||||||
|
docTitle = "Minecraft Forge API - ${forgeVersion} for Minecraft ${minecraftVersion}"
|
||||||
|
header = "<div style=\"margin-top: 9px;padding: 5px 6px;\"><strong>${forgeVersion} for Minecraft ${minecraftVersion}</strong></div>"
|
||||||
|
}
|
||||||
|
|
||||||
|
doLast {
|
||||||
|
project.copy {
|
||||||
|
from docsDir
|
||||||
|
exclude '/stylesheet.css'
|
||||||
|
into destinationDir
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
repositories {
|
||||||
|
maven gradleutils.publishingForgeMaven
|
||||||
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
artifact universalJar
|
||||||
|
artifact forgedev.installer.jar
|
||||||
|
artifact mdkZip
|
||||||
|
artifact forgedev.userDev.jar
|
||||||
|
artifact sourcesJar
|
||||||
|
artifact serverShim.jar
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
// These are debugging tasks that are only used when developing ForgeDevPlugin, to bulk test task's config/caching
|
||||||
|
// region ForgeDev Tests
|
||||||
|
def all = tasks.register('all') {}
|
||||||
|
afterEvaluate {
|
||||||
|
if (gradle.startParameter.taskNames.contains('all')) {
|
||||||
|
tasks.forEach { task -> // This forces everything to be realized, which is why we have the startParameter check
|
||||||
|
if (!gradle.startParameter.isTaskGraph() && task.name.startsWith('run')) return
|
||||||
|
if (task.name in [all.name, 'dependencyInsight', 'dependencies', 'dependencyUpdates', 'init', 'buildEnvironment', 'idea',
|
||||||
|
'eclipse', 'javaToolchains', 'outgoingVariants', 'projects', 'properties', 'resolvableConfigurations', 'tasks', 'updateDaemonJvm',
|
||||||
|
'generateActionsWorkflow'
|
||||||
|
]) return
|
||||||
|
if (task.name.startsWith('clean')) return
|
||||||
|
if (task.name == 'checkJarCompatibility') return // This doesn't work in FG6 dev, I think it's cuz we check vs srg names. Will need to look at later
|
||||||
|
all.configure { dependsOn(task) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
// endregion
|
||||||
|
// We dont have any unit tests, so disable this error
|
||||||
|
tasks.withType(AbstractTestTask).configureEach {
|
||||||
|
failOnNoDiscoveredTests = false
|
||||||
|
}
|
||||||
|
// This shouldn't be needed according to the Gradle devs, as we never run these commands together.
|
||||||
|
// But in another case of Gradle being gradle, here we are
|
||||||
|
[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
|
||||||
|
.each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
|
||||||
|
forgedev.runs.configureEach {
|
||||||
|
run.configure { dependsOn finalizeSpawn}
|
||||||
|
runTest.configure { dependsOn finalizeSpawn}
|
||||||
|
}
|
||||||
|
|
||||||
|
// run gradlew dependencyUpdates --no-parallel
|
||||||
|
//noinspection UnnecessaryQualifiedReference
|
||||||
|
tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) {
|
||||||
|
resolutionStrategy {
|
||||||
|
mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions
|
||||||
|
force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
/.gradle/
|
|
||||||
/build/
|
|
||||||
/out/
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
repositories {
|
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation 'org.ow2.asm:asm:9.6'
|
|
||||||
implementation 'org.ow2.asm:asm-tree:9.6'
|
|
||||||
implementation 'net.minecraftforge:srgutils:0.5.+'
|
|
||||||
implementation 'commons-io:commons-io:2.13.0'
|
|
||||||
implementation 'com.google.code.gson:gson:2.10.1'
|
|
||||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.util.zip.ZipFile
|
|
||||||
|
|
||||||
abstract class BundleList extends DefaultTask {
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getConfig()
|
|
||||||
@InputFile abstract RegularFileProperty getServerBundle()
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
BundleList() {
|
|
||||||
config.setFrom(project.configurations.installer)
|
|
||||||
output.convention(project.layout.buildDirectory.file("$name/output.list"))
|
|
||||||
configure {
|
|
||||||
dependsOn(project.tasks.universalJar)
|
|
||||||
inputs.file(project.tasks.universalJar.archiveFile)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def entries = [:] as TreeMap
|
|
||||||
def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
|
|
||||||
for (def dep : resolved) {
|
|
||||||
def info = Util.getMavenInfoFromDep(dep)
|
|
||||||
//println("$dep.file.sha1\t$info.name\t$info.path")
|
|
||||||
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
|
|
||||||
}
|
|
||||||
|
|
||||||
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
|
||||||
var info = Util.getMavenInfoFromTask(packed)
|
|
||||||
def file = packed.archiveFile.get().asFile
|
|
||||||
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
|
|
||||||
|
|
||||||
var classifier = 'server'
|
|
||||||
var genned = project.tasks.applyServerBinPatches
|
|
||||||
info = Util.getMavenInfoFromTask(genned, classifier)
|
|
||||||
file = genned.output.get().asFile
|
|
||||||
entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
|
|
||||||
|
|
||||||
try (def zip = new ZipFile(serverBundle.get().asFile)) {
|
|
||||||
def entry = zip.getEntry('META-INF/libraries.list')
|
|
||||||
def data = zip.getInputStream(entry).text.split('\n')
|
|
||||||
for (def line : data) {
|
|
||||||
def (sha, artifact, path) = line.split('\t')
|
|
||||||
def (group, name, other) = artifact.split(':', 3)
|
|
||||||
//println("Group: $group Name: $name")
|
|
||||||
def key = "$group:$name"
|
|
||||||
if (!entries.containsKey(key))
|
|
||||||
entries.put(key, line)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
output.get().asFile.text = entries.values().join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.FieldNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class BytecodeFinder extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getJar()
|
|
||||||
// It should be fine to mark the output as internal as we want to control when we run it anyways.
|
|
||||||
// This also shuts Gradle 8 up about implicit task dependencies.
|
|
||||||
@Internal abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
BytecodeFinder() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
Util.init()
|
|
||||||
|
|
||||||
var outputFile = output.get().asFile
|
|
||||||
if (outputFile.exists())
|
|
||||||
outputFile.delete()
|
|
||||||
|
|
||||||
pre()
|
|
||||||
|
|
||||||
Util.processClassNodes(jar.get().asFile, this.&process)
|
|
||||||
|
|
||||||
post()
|
|
||||||
outputFile.text = new JsonBuilder(getData()).toPrettyString()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected process(ClassNode node) {
|
|
||||||
if (node.fields !== null) node.fields.each { process(node, it) }
|
|
||||||
if (node.methods !== null) node.methods.each { process(node, it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
protected pre() {}
|
|
||||||
protected process(ClassNode parent, FieldNode node) {}
|
|
||||||
protected process(ClassNode parent, MethodNode node) {}
|
|
||||||
protected post() {}
|
|
||||||
protected abstract Object getData()
|
|
||||||
}
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
|
||||||
|
|
||||||
private final Set<String> matches = new HashSet<>()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
|
||||||
for (final current : node.instructions) {
|
|
||||||
if (predicate.get().call(parent, node, current)) {
|
|
||||||
matches.add(parent.name)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
@Override
|
|
||||||
protected Object getData() {
|
|
||||||
return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks;
|
|
||||||
|
|
||||||
import groovy.transform.CompileDynamic;
|
|
||||||
import groovy.transform.CompileStatic;
|
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.TreeSet;
|
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.Reader;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.io.Writer;
|
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Eclipse config files are literally just java properties, with the header cleaned up.
|
|
||||||
* https://github.com/eclipse/buildship/blob/5b2c7fca7fa86cd74d71b3c099c7b1559eba038e/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/internal/configuration/PreferenceStore.java#L238
|
|
||||||
*
|
|
||||||
* This does the same thing, as well as sorting alphabetically.
|
|
||||||
* It also ignores all comments. We can add them latter if someone cares.
|
|
||||||
*/
|
|
||||||
@CompileStatic
|
|
||||||
public class CleanProperties extends Properties {
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
private static final String LINE_SEP = System.getProperty("line.separator");
|
|
||||||
private static final String UNIX_LINE_SEP = "\n";
|
|
||||||
private static final Charset ENCODING = StandardCharsets.UTF_8;
|
|
||||||
|
|
||||||
public CleanProperties load(File input) throws IOException {
|
|
||||||
if (input.exists()) {
|
|
||||||
try (Reader is = new InputStreamReader(new FileInputStream(input), ENCODING)) {
|
|
||||||
super.load(is);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void store(File out) throws IOException {
|
|
||||||
if (!out.getParentFile().exists())
|
|
||||||
out.getParentFile().mkdirs();
|
|
||||||
|
|
||||||
try (OutputStream os = new FileOutputStream(out)) {
|
|
||||||
store(os, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized Enumeration<Object> keys() {
|
|
||||||
Set<Object> ret = new TreeSet<>();
|
|
||||||
for (Enumeration<?> e = super.keys(); e.hasMoreElements();)
|
|
||||||
ret.add(e.nextElement());
|
|
||||||
return Collections.enumeration(ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileDynamic
|
|
||||||
@Override
|
|
||||||
public Set<Map.Entry<Object, Object>> entrySet() {
|
|
||||||
Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
|
|
||||||
ret.addAll(super.entrySet());
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void store(OutputStream out, String comments) throws IOException {
|
|
||||||
out.write(clean().getBytes(ENCODING));
|
|
||||||
out.flush();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void store(Writer out, String comments) throws IOException {
|
|
||||||
out.write(clean());
|
|
||||||
out.flush();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String clean() throws IOException {
|
|
||||||
ByteArrayOutputStream tmp = new ByteArrayOutputStream();
|
|
||||||
try {
|
|
||||||
super.store(tmp, null);
|
|
||||||
} finally {
|
|
||||||
tmp.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
String ret = tmp.toString(ENCODING).replace(LINE_SEP, UNIX_LINE_SEP);
|
|
||||||
ret = ret.substring(ret.indexOf(UNIX_LINE_SEP) + 1);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.stc.FirstParam
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer
|
|
||||||
|
|
||||||
public class ClosureHelper {
|
|
||||||
BiConsumer<String, Closure> callback
|
|
||||||
|
|
||||||
public ClosureHelper(Closure cl, BiConsumer<String, Closure> callback) {
|
|
||||||
this.callback = callback
|
|
||||||
apply(this, cl)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def methodMissing(String name, Object args) {
|
|
||||||
if (!args.class.isArray()) return
|
|
||||||
Object[] aargs = (Object[])args
|
|
||||||
|
|
||||||
if (aargs.length == 1 && aargs[0] instanceof Closure) {
|
|
||||||
this.callback.accept(name, (Closure)aargs[0])
|
|
||||||
} else {
|
|
||||||
throw new IllegalArgumentException('Unknown method: "' + name + '" with arguments ' + args + ' for ' + this)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <T> T apply(T obj, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
|
|
||||||
cl.delegate = obj
|
|
||||||
cl.resolveStrategy = Closure.DELEGATE_FIRST
|
|
||||||
cl()
|
|
||||||
return obj
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.DirectoryProperty
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.Internal
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.OutputFiles
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.gradle.api.tasks.OutputDirectory
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
abstract class DownloadLibraries extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInput()
|
|
||||||
@OutputDirectory abstract DirectoryProperty getOutput()
|
|
||||||
@OutputFile abstract RegularFileProperty getLibrariesOutput()
|
|
||||||
|
|
||||||
DownloadLibraries() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name))
|
|
||||||
librariesOutput.convention(project.layout.buildDirectory.dir(name).map(d -> d.file('libraries.txt')))
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
def run() {
|
|
||||||
Util.init()
|
|
||||||
File outputDir = output.get().asFile
|
|
||||||
var libraries = new ArrayList<String>()
|
|
||||||
|
|
||||||
def json = input.get().asFile.json().libraries.each { lib ->
|
|
||||||
//TODO: Thread?
|
|
||||||
def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
|
|
||||||
artifacts.each{ art ->
|
|
||||||
def target = new File(outputDir, art.path)
|
|
||||||
libraries.add(target.absolutePath)
|
|
||||||
if (!target.exists() || art.sha1 != target.sha1()) {
|
|
||||||
project.logger.lifecycle("Downloading ${art.url}")
|
|
||||||
if (!target.parentFile.exists()) {
|
|
||||||
target.parentFile.mkdirs()
|
|
||||||
}
|
|
||||||
new URL(art.url).withInputStream { i ->
|
|
||||||
target.withOutputStream { it << i }
|
|
||||||
}
|
|
||||||
if (art.sha1 != target.sha1()) {
|
|
||||||
throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Files.write(librariesOutput.get().asFile.toPath(), libraries)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
|
|
||||||
import java.util.zip.ZipFile
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class ExtractFile extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInput()
|
|
||||||
@Input abstract Property<String> getTarget()
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var zip = new ZipFile(input.get().asFile);
|
|
||||||
var entry = zip.getEntry(target.get())
|
|
||||||
if (entry == null)
|
|
||||||
throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
|
|
||||||
var stream = zip.getInputStream(entry)
|
|
||||||
output.get().asFile.withOutputStream { out ->
|
|
||||||
stream.transferTo(out)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.EqualsAndHashCode
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.objectweb.asm.tree.AbstractInsnNode
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
import org.objectweb.asm.tree.MethodNode
|
|
||||||
|
|
||||||
import static org.objectweb.asm.Opcodes.*
|
|
||||||
|
|
||||||
abstract class FieldCompareFinder extends BytecodeFinder {
|
|
||||||
@Nested
|
|
||||||
Map<String, Search> fields = [:] as HashMap
|
|
||||||
@Internal
|
|
||||||
Map<Search, String> fieldsReverse = [:] as HashMap
|
|
||||||
@Internal
|
|
||||||
Map<String, Set<ObjectTarget>> targets = [:] as TreeMap
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected pre() {
|
|
||||||
//fields.each{ k,v -> logger.lifecycle("Fields: " + k + ' ' + v) }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
|
||||||
AbstractInsnNode last = null
|
|
||||||
def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
|
|
||||||
for (int x = 0; x < node.instructions.size(); x++) {
|
|
||||||
def current = node.instructions.get(x)
|
|
||||||
if (current.opcode === IF_ACMPEQ || current.opcode === IF_ACMPNE) {
|
|
||||||
if (last !== null && (last.opcode === GETSTATIC || last.opcode === GETFIELD)) {
|
|
||||||
def target = new Search(cls: last.owner, name: last.name)
|
|
||||||
def wanted = fieldsReverse.get(target)
|
|
||||||
def original = fields.get(wanted)
|
|
||||||
def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
|
|
||||||
if (wanted !== null && (original.blacklist === null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
|
|
||||||
targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
last = current
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Internal
|
|
||||||
@Override
|
|
||||||
protected Object getData() {
|
|
||||||
def ret = [:] as HashMap
|
|
||||||
targets.forEach{ k, v ->
|
|
||||||
def e = fields.get(k)
|
|
||||||
ret[k] = [
|
|
||||||
cls: e.cls,
|
|
||||||
name: e.name,
|
|
||||||
replacement: e.replacement,
|
|
||||||
targets: v
|
|
||||||
]
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
@EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
|
|
||||||
static class Search {
|
|
||||||
@Input
|
|
||||||
String cls
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String name
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String replacement
|
|
||||||
|
|
||||||
@Nested
|
|
||||||
@Optional
|
|
||||||
Set<ObjectTarget> blacklist
|
|
||||||
|
|
||||||
@Override
|
|
||||||
String toString() {
|
|
||||||
return cls + '.' + name
|
|
||||||
}
|
|
||||||
|
|
||||||
def blacklist(String owner, String name, String desc) {
|
|
||||||
if (blacklist === null)
|
|
||||||
blacklist = new HashSet<>()
|
|
||||||
blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
|
|
||||||
}
|
|
||||||
def blacklist(String owner) {
|
|
||||||
blacklist(owner, '', '')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void fields(Closure cl) {
|
|
||||||
new ClosureHelper(cl, {name, ccl ->
|
|
||||||
def search = ClosureHelper.apply(new Search(), ccl)
|
|
||||||
this.fields.put(name, search)
|
|
||||||
this.fieldsReverse.put(search, name)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.reflect.TypeToken
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.TupleConstructor
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
@TupleConstructor
|
|
||||||
final class InheritanceData implements Annotatable {
|
|
||||||
String name
|
|
||||||
int access
|
|
||||||
String superName
|
|
||||||
List<String> interfaces = []
|
|
||||||
Map<String, Method> methods = [:]
|
|
||||||
Map<String, Field> fields = [:]
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Method implements Annotatable {
|
|
||||||
int access
|
|
||||||
String override
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Field implements Annotatable {
|
|
||||||
int access
|
|
||||||
String desc
|
|
||||||
List<Annotation> annotations = []
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Annotation {
|
|
||||||
String desc
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Gson GSON = new Gson()
|
|
||||||
static Map<String, InheritanceData> parse(File file) {
|
|
||||||
try (final reader = file.newReader()) {
|
|
||||||
return GSON.fromJson(reader, new TypeToken<Map<String, InheritanceData>>() {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
interface Annotatable {
|
|
||||||
List<InheritanceData.Annotation> getAnnotations()
|
|
||||||
}
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.file.DuplicatesStrategy
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
import org.gradle.api.tasks.bundling.Zip
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
|
|
||||||
abstract class InstallerJar extends Zip {
|
|
||||||
@Input @Optional abstract Property<Boolean> getFat()
|
|
||||||
@Input @Optional abstract Property<Boolean> getOffline()
|
|
||||||
|
|
||||||
InstallerJar() {
|
|
||||||
archiveClassifier.set('installer')
|
|
||||||
archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
|
|
||||||
destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
|
|
||||||
fat.convention(false)
|
|
||||||
offline.convention(false)
|
|
||||||
|
|
||||||
def installerJson = project.tasks.installerJson
|
|
||||||
def launcherJson = project.tasks.launcherJson
|
|
||||||
def downloadInstaller = project.tasks.downloadInstaller
|
|
||||||
|
|
||||||
dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer)
|
|
||||||
from(installerJson, launcherJson)
|
|
||||||
|
|
||||||
from(project.rootProject.file('/src/main/resources/url.png'))
|
|
||||||
project.afterEvaluate {
|
|
||||||
from(project.zipTree(downloadInstaller.output)) {
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fat.get() || offline.get()) {
|
|
||||||
def cfg = project.tasks.register(name + "Config", Configure)
|
|
||||||
cfg.get().configure {
|
|
||||||
parent = this
|
|
||||||
dependsOn(project.tasks.installerJson, project.tasks.launcherJson)
|
|
||||||
}
|
|
||||||
dependsOn(cfg)
|
|
||||||
} else {
|
|
||||||
// Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file.
|
|
||||||
// I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
|
|
||||||
[
|
|
||||||
project.tasks.serverShimJar // Server bootstrap executable jar
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def path = Util.getMavenInfoFromTask(packed).path
|
|
||||||
from(packed) {
|
|
||||||
rename { "maven/$path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static abstract class Configure extends DefaultTask {
|
|
||||||
public Zip parent
|
|
||||||
private int count = 0;
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def deps = [:] as java.util.TreeMap
|
|
||||||
|
|
||||||
// Gather all things that need downloading
|
|
||||||
[
|
|
||||||
project.tasks.installerJson,
|
|
||||||
project.tasks.launcherJson
|
|
||||||
].each { task ->
|
|
||||||
def json = task.output.get().asFile.json
|
|
||||||
json.libraries.each { lib ->
|
|
||||||
if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
|
|
||||||
deps.put(lib.name, lib.downloads.artifact)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// First find things we build in this project.
|
|
||||||
[
|
|
||||||
project.tasks.universalJar, // Forge runtime code
|
|
||||||
project.tasks.serverShimJar // Shim jar for dedicated server
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def name = Util.getMavenInfoFromTask(packed).name
|
|
||||||
def info = deps.remove(name)
|
|
||||||
if (info !== null) {
|
|
||||||
println("Adding: $packed.path $name")
|
|
||||||
parent.from(packed) {
|
|
||||||
rename { "maven/$info.path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find any artifacts from the 'installer' config
|
|
||||||
// This config specifies the runtime files we intend for the interaller to have.
|
|
||||||
// And are typically what we would be developing and testing alongside Forge.
|
|
||||||
// So we may have local modified versions
|
|
||||||
def cfg = project.configurations.installer
|
|
||||||
while (cfg != null) {
|
|
||||||
//println('')
|
|
||||||
def resolved = cfg.resolvedConfiguration.resolvedArtifacts
|
|
||||||
int found = 0
|
|
||||||
for (def dep : resolved) {
|
|
||||||
def name = Util.getMavenInfoFromDep(dep).name
|
|
||||||
def info = deps.remove(name)
|
|
||||||
if (info == null) {
|
|
||||||
//println("Skipping: $name")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
//println("-$name")
|
|
||||||
found++
|
|
||||||
addFile(dep.file, info)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (deps.isEmpty()) {
|
|
||||||
cfg = null
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prevent infinite loops if something fucky happens
|
|
||||||
if (found == 0)
|
|
||||||
throw new IllegalStateException("Failed to find any installer dependencies")
|
|
||||||
|
|
||||||
def seen = [] as Set
|
|
||||||
cfg = project.configurations.detachedConfiguration()
|
|
||||||
cfg.transitive = false
|
|
||||||
for (def key : deps.keySet()) {
|
|
||||||
def (group, artifact, other) = key.split(':', 3)
|
|
||||||
// Only resolve unique group:artifact so we don't get version overrides
|
|
||||||
if (seen.add(group + ':' + artifact)) {
|
|
||||||
//println("+$key")
|
|
||||||
cfg.dependencies.add(project.dependencies.create(key))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void addFile(file, info) {
|
|
||||||
boolean pack = parent.offline.get() || info.url.isEmpty()
|
|
||||||
|
|
||||||
// If it's a offline jar just always pack
|
|
||||||
if (!pack) {
|
|
||||||
try {
|
|
||||||
var remote = new URL("${info.url}.sha1").getText('UTF-8')
|
|
||||||
pack = info.sha1 != remote
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
pack = !info.url.startsWith('https://libraries.minecraft.net/')
|
|
||||||
// Oh noes its not there!
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pack) {
|
|
||||||
println("Adding: $file.absolutePath")
|
|
||||||
parent.from(file) {
|
|
||||||
rename { "maven/$info.path" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.provider.SetProperty
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
abstract class InstallerJson extends DefaultTask {
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getInput()
|
|
||||||
@Input @Optional final Map<String, Object> libraries = new LinkedHashMap<>()
|
|
||||||
@Input Map<String, Object> json = new LinkedHashMap<>()
|
|
||||||
@InputFile abstract RegularFileProperty getIcon()
|
|
||||||
@Input abstract Property<String> getLauncherJsonName()
|
|
||||||
@Input abstract Property<String> getLogo()
|
|
||||||
@Input abstract Property<String> getMirrors()
|
|
||||||
@Input abstract Property<String> getWelcome()
|
|
||||||
|
|
||||||
InstallerJson() {
|
|
||||||
launcherJsonName.convention('/version.json')
|
|
||||||
logo.convention('/big_logo.png')
|
|
||||||
mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
|
|
||||||
welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
|
|
||||||
output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
|
|
||||||
|
|
||||||
project.afterEvaluate {
|
|
||||||
[
|
|
||||||
project.tasks.universalJar,
|
|
||||||
project.tasks.serverShimJar
|
|
||||||
].forEach { packed ->
|
|
||||||
dependsOn(packed)
|
|
||||||
input.from packed.archiveFile
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def libs = libraries
|
|
||||||
[
|
|
||||||
project.tasks.universalJar,
|
|
||||||
project.tasks.serverShimJar
|
|
||||||
].forEach { AbstractArchiveTask packed ->
|
|
||||||
def info = Util.getMavenInfoFromTask(packed)
|
|
||||||
libs.put(info.name, [
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "https://maven.minecraftforge.net/$info.path",
|
|
||||||
sha1: packed.archiveFile.get().asFile.sha1(),
|
|
||||||
size: packed.archiveFile.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
}
|
|
||||||
json.libraries = libs.values().sort{a,b -> a.name.compareTo(b.name)}
|
|
||||||
json.icon = "data:image/png;base64," + new String(Base64.getEncoder().encode(Files.readAllBytes(icon.get().asFile.toPath())))
|
|
||||||
json.json = launcherJsonName.get()
|
|
||||||
json.logo = logo.get()
|
|
||||||
if (!mirrors.get().isEmpty())
|
|
||||||
json.mirrorList = mirrors.get()
|
|
||||||
json.welcome = welcome.get()
|
|
||||||
|
|
||||||
Files.writeString(output.get().getAsFile().toPath(), new JsonBuilder(json).toPrettyString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.SetProperty
|
|
||||||
import org.gradle.api.tasks.*
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
|
|
||||||
import static net.minecraftforge.forge.tasks.Util.getArtifacts
|
|
||||||
import static net.minecraftforge.forge.tasks.Util.iso8601Now
|
|
||||||
|
|
||||||
abstract class LauncherJson extends DefaultTask {
|
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getInput()
|
|
||||||
@Input Map<String, Object> json = new LinkedHashMap<>()
|
|
||||||
|
|
||||||
LauncherJson() {
|
|
||||||
output.convention(project.layout.buildDirectory.file('libs/version.json'))
|
|
||||||
|
|
||||||
dependsOn(project.tasks.universalJar)
|
|
||||||
input.from(project.tasks.universalJar.archiveFile)
|
|
||||||
input.from(project.configurations.installer)
|
|
||||||
configure {
|
|
||||||
def mc = project.rootProject.ext.MC_VERSION
|
|
||||||
def forge = project.rootProject.ext.FORGE_VERSION
|
|
||||||
def timestamp = iso8601Now()
|
|
||||||
json.putAll([
|
|
||||||
_comment: [
|
|
||||||
"Please do not automate the download and installation of Forge.",
|
|
||||||
"Our efforts are supported by ads from the download page.",
|
|
||||||
"If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
|
|
||||||
],
|
|
||||||
id: "$mc-$project.name-$forge",
|
|
||||||
time: timestamp,
|
|
||||||
releaseTime: timestamp,
|
|
||||||
inheritsFrom: mc,
|
|
||||||
type: 'release',
|
|
||||||
logging: [:],
|
|
||||||
mainClass: '',
|
|
||||||
libraries: []
|
|
||||||
] as LinkedHashMap)
|
|
||||||
|
|
||||||
[
|
|
||||||
project.tasks.universalJar
|
|
||||||
].forEach { packed ->
|
|
||||||
dependsOn(packed)
|
|
||||||
input.from packed.archiveFile
|
|
||||||
}
|
|
||||||
|
|
||||||
def patched = project.tasks.applyClientBinPatches
|
|
||||||
dependsOn(patched)
|
|
||||||
input.from patched.output
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
|
||||||
def info = Util.getMavenInfoFromTask(packed)
|
|
||||||
json.libraries.add([
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "https://maven.minecraftforge.net/$info.path",
|
|
||||||
sha1: packed.archiveFile.get().asFile.sha1(),
|
|
||||||
size: packed.archiveFile.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
|
|
||||||
var classifier = 'client'
|
|
||||||
var genned = project.tasks.applyClientBinPatches
|
|
||||||
info = Util.getMavenInfoFromTask(genned, classifier)
|
|
||||||
json.libraries.add([
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: "",
|
|
||||||
sha1: genned.output.get().asFile.sha1(),
|
|
||||||
size: genned.output.get().asFile.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
])
|
|
||||||
|
|
||||||
json.libraries.addAll(getArtifacts(project.configurations.installer).values())
|
|
||||||
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.apache.commons.io.IOUtils
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
import java.util.zip.ZipOutputStream
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class MergeJars extends DefaultTask {
|
|
||||||
MergeJars() {
|
|
||||||
output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def jars = inputJars.files
|
|
||||||
|
|
||||||
try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
|
|
||||||
for (def jar : jars) {
|
|
||||||
try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
|
|
||||||
ZipEntry entry
|
|
||||||
while ((entry = zin.getNextEntry()) !== null) {
|
|
||||||
ZipEntry _new = new ZipEntry(entry.getName())
|
|
||||||
_new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
|
|
||||||
zout.putNextEntry(_new)
|
|
||||||
IOUtils.copy(zin, zout)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@InputFiles
|
|
||||||
abstract ConfigurableFileCollection getInputJars()
|
|
||||||
|
|
||||||
@OutputFile
|
|
||||||
abstract RegularFileProperty getOutput()
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.EqualsAndHashCode
|
|
||||||
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.Nested
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
|
|
||||||
@EqualsAndHashCode
|
|
||||||
public class ObjectTarget implements Comparable<ObjectTarget> {
|
|
||||||
@Input
|
|
||||||
String owner
|
|
||||||
|
|
||||||
@Input
|
|
||||||
String name
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Optional
|
|
||||||
String desc
|
|
||||||
|
|
||||||
@Override
|
|
||||||
String toString() {
|
|
||||||
if (desc == null)
|
|
||||||
return owner + '.' + name
|
|
||||||
return owner + '.' + name + desc
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
int compareTo(ObjectTarget o) {
|
|
||||||
return toString() <=> o.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-47
@@ -1,47 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.artifacts.Dependency
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
import org.gradle.api.tasks.OutputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.StandardCopyOption
|
|
||||||
|
|
||||||
abstract class SetupCheckJarCompatibility extends DefaultTask {
|
|
||||||
SetupCheckJarCompatibility() {
|
|
||||||
group = 'jar compatibility'
|
|
||||||
onlyIf {
|
|
||||||
inputVersion.getOrNull() !== null
|
|
||||||
}
|
|
||||||
outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
|
|
||||||
|
|
||||||
baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
def inputVersion = inputVersion.get()
|
|
||||||
|
|
||||||
def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
|
|
||||||
project.rootProject.extensions.download.run {
|
|
||||||
src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
|
|
||||||
dest baseForgeUserdev
|
|
||||||
}
|
|
||||||
|
|
||||||
def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
|
|
||||||
|
|
||||||
Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Optional
|
|
||||||
abstract Property<String> getInputVersion()
|
|
||||||
|
|
||||||
@OutputFile
|
|
||||||
abstract RegularFileProperty getBaseBinPatchesOutput()
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.reflect.TypeToken
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.eclipse.jgit.api.Git
|
|
||||||
|
|
||||||
import javax.annotation.Nullable
|
|
||||||
import java.util.stream.Collectors
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class TeamcityRequests {
|
|
||||||
public static final Gson GSON = new Gson()
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
|
|
||||||
final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
|
|
||||||
conn.setRequestProperty('Accept', 'application/json')
|
|
||||||
conn.setReadTimeout(5 * 1000)
|
|
||||||
conn.setConnectTimeout(5 * 1000)
|
|
||||||
conn.connect()
|
|
||||||
|
|
||||||
if (conn.responseCode !== 200) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
try (final InputStream is = conn.getInputStream()) {
|
|
||||||
GSON.fromJson(new InputStreamReader(is), clazz.getType())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static Map<String, Build> buildsByCommit() throws IOException {
|
|
||||||
final Map<String, Build> builds = [:]
|
|
||||||
jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
|
|
||||||
?.build?.forEach {
|
|
||||||
it.revisions.revision.each { rev -> builds[rev.version] = it }
|
|
||||||
}
|
|
||||||
return builds
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
static String attemptFindBase(File gitPath) {
|
|
||||||
try (final git = Git.open(gitPath)) {
|
|
||||||
final Map<String, Build> buildByCommit = buildsByCommit()
|
|
||||||
for (final commit in git.log().setMaxCount(100).call()) {
|
|
||||||
// Find the first commit which was built on CI
|
|
||||||
final build = buildByCommit[commit.id.name]
|
|
||||||
if (build) {
|
|
||||||
return build.number
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception ignored) {}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Builds {
|
|
||||||
public List<Build> build
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Build {
|
|
||||||
public String number
|
|
||||||
public Revisions revisions
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Revisions {
|
|
||||||
public int count
|
|
||||||
public List<Revision> revision
|
|
||||||
}
|
|
||||||
|
|
||||||
static final class Revision {
|
|
||||||
public String version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.stc.ClosureParams
|
|
||||||
import groovy.transform.stc.SimpleType
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.api.Task
|
|
||||||
import org.gradle.api.artifacts.Configuration
|
|
||||||
import org.gradle.api.artifacts.ResolvedArtifact
|
|
||||||
import org.gradle.api.tasks.bundling.AbstractArchiveTask
|
|
||||||
import org.objectweb.asm.ClassReader
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
|
|
||||||
import java.net.http.HttpClient
|
|
||||||
import java.net.http.HttpRequest
|
|
||||||
import java.net.http.HttpResponse
|
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.concurrent.ConcurrentHashMap
|
|
||||||
import java.util.concurrent.Semaphore
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
final class Util {
|
|
||||||
public static final int ASM_LEVEL = Opcodes.ASM9
|
|
||||||
private static final HttpClient HTTP = HttpClient.newBuilder().build()
|
|
||||||
|
|
||||||
static void init() {
|
|
||||||
File.metaClass.sha1 = { ->
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
|
||||||
delegate.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
|
|
||||||
File.metaClass.sha256 = { ->
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-256')
|
|
||||||
delegate.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
|
|
||||||
|
|
||||||
File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
|
|
||||||
File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
|
|
||||||
File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
|
|
||||||
|
|
||||||
Date.metaClass.iso8601 = { ->
|
|
||||||
var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
|
|
||||||
var result = format.format(delegate)
|
|
||||||
return result[0..21] + ':' + result[22..-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
String.metaClass.rsplit = { String del, int limit = -1 ->
|
|
||||||
var lst = new ArrayList<String>()
|
|
||||||
int x = 0
|
|
||||||
int idx
|
|
||||||
String tmp = delegate
|
|
||||||
while ((idx = tmp.lastIndexOf(del)) != -1 && (limit === -1 || x++ < limit)) {
|
|
||||||
lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
|
|
||||||
tmp = tmp.substring(0, idx)
|
|
||||||
}
|
|
||||||
lst.add(0, tmp)
|
|
||||||
return lst
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static String[] getClasspath(Project project, Map libs, String artifact) {
|
|
||||||
def ret = []
|
|
||||||
artifactTree(project, artifact).each { key, lib ->
|
|
||||||
libs[lib.name] = lib
|
|
||||||
if (lib.name != artifact)
|
|
||||||
ret.add(lib.name)
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getArtifacts(Configuration config) {
|
|
||||||
var ret = [:]
|
|
||||||
var semaphore = new Semaphore(1, true)
|
|
||||||
config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
|
|
||||||
var info = getMavenInfoFromDep(dep)
|
|
||||||
var domain = 'libraries.minecraft.net'
|
|
||||||
var url = "https://$domain/$info.path"
|
|
||||||
if (!checkExists(url))
|
|
||||||
url.values[0] = 'maven.minecraftforge.net'
|
|
||||||
|
|
||||||
var sha1 = sha1(dep.file)
|
|
||||||
|
|
||||||
semaphore.acquire()
|
|
||||||
ret[info.key] = [
|
|
||||||
name: info.name,
|
|
||||||
downloads: [
|
|
||||||
artifact: [
|
|
||||||
path: info.path,
|
|
||||||
url: url.toString(),
|
|
||||||
sha1: sha1,
|
|
||||||
size: dep.file.length()
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]
|
|
||||||
semaphore.release()
|
|
||||||
})
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromDep(ResolvedArtifact dep) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: dep.moduleVersion.id.group,
|
|
||||||
name: dep.moduleVersion.id.name,
|
|
||||||
version: dep.moduleVersion.id.version,
|
|
||||||
classifier: dep.classifier,
|
|
||||||
extension: dep.extension
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromTask(AbstractArchiveTask task) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: task.project.group.toString(),
|
|
||||||
name: task.project.name,
|
|
||||||
version: task.project.version.toString(),
|
|
||||||
classifier: task.archiveClassifier.get(),
|
|
||||||
extension: task.archiveExtension.get()
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static Map getMavenInfoFromTask(Task task, String classifier) {
|
|
||||||
return getMavenInfoFromMap([
|
|
||||||
group: task.project.group.toString(),
|
|
||||||
name: task.project.name,
|
|
||||||
version: task.project.version.toString(),
|
|
||||||
classifier: classifier,
|
|
||||||
extension: 'jar'
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static Map getMavenInfoFromMap(Map<String, String> art) {
|
|
||||||
var key = "$art.group:$art.name"
|
|
||||||
var name = "$art.group:$art.name:$art.version"
|
|
||||||
var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
|
|
||||||
if (art.classifier !== null) {
|
|
||||||
name += ":$art.classifier"
|
|
||||||
path += "-$art.classifier"
|
|
||||||
}
|
|
||||||
if ('jar' != art.extension) {
|
|
||||||
name += "@$art.extension"
|
|
||||||
path += ".$art.extension"
|
|
||||||
} else {
|
|
||||||
path += ".jar"
|
|
||||||
}
|
|
||||||
return [
|
|
||||||
key: key.toString(),
|
|
||||||
name: name.toString(),
|
|
||||||
path: path.toString(),
|
|
||||||
art: art
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
static String iso8601Now() { new Date().iso8601() }
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static String sha1(File file) {
|
|
||||||
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
|
||||||
file.eachByte(4096) { byte[] bytes, int size ->
|
|
||||||
md.update(bytes, 0, size)
|
|
||||||
}
|
|
||||||
return md.digest().collect(this.&toHex).join('')
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static String toHex(byte bite) {
|
|
||||||
return String.format('%02x', bite)
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
|
|
||||||
if (!project.ext.has('tree_resolver'))
|
|
||||||
project.ext.tree_resolver = 1
|
|
||||||
def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
|
|
||||||
cfg.transitive = transitive
|
|
||||||
def dep = project.dependencies.create(artifact)
|
|
||||||
cfg.dependencies.add(dep)
|
|
||||||
def files = cfg.resolve()
|
|
||||||
return getArtifacts(cfg)
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static boolean checkExists(String url) {
|
|
||||||
try {
|
|
||||||
return HTTP.send(HttpRequest.newBuilder(new URI(url))
|
|
||||||
.method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
|
|
||||||
).statusCode() === 200
|
|
||||||
} catch (Exception e) {
|
|
||||||
if (e.toString().contains('unable to find valid certification path to requested target'))
|
|
||||||
throw new RuntimeException("Failed to connect to $url: Missing certificate root authority, try updating Java")
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static String getLatestForgeVersion(String mcVersion) {
|
|
||||||
final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
|
|
||||||
final ver = json.promos["$mcVersion-latest"]
|
|
||||||
ver === null ? null : (mcVersion + '-' + ver)
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
|
|
||||||
file.withInputStream { i ->
|
|
||||||
new ZipInputStream(i).withCloseable { zin ->
|
|
||||||
ZipEntry zein
|
|
||||||
while ((zein = zin.nextEntry) !== null) {
|
|
||||||
if (zein.name.endsWith('.class')) {
|
|
||||||
var node = new ClassNode(ASM_LEVEL)
|
|
||||||
new ClassReader(zin).accept(node, 0)
|
|
||||||
process(node)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.srgutils.MinecraftVersion
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.objectweb.asm.tree.AnnotationNode
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
|
||||||
|
|
||||||
abstract class ValidateDeprecations extends DefaultTask {
|
|
||||||
@InputFile
|
|
||||||
abstract RegularFileProperty getInput()
|
|
||||||
|
|
||||||
@Input
|
|
||||||
abstract Property<String> getMcVersion()
|
|
||||||
|
|
||||||
ValidateDeprecations() {
|
|
||||||
this.onlyIf { !System.env.TEAMCITY_VERSION }
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
var mcVer = MinecraftVersion.from(mcVersion.get())
|
|
||||||
List<String> errors = []
|
|
||||||
|
|
||||||
Util.processClassNodes(input.get().asFile) {
|
|
||||||
processNode(mcVer, errors, it)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!errors.isEmpty()) {
|
|
||||||
errors.forEach {
|
|
||||||
this.logger.error("Deprecated ${it[0]} is marked for removal in ${it[1]} but is not yet removed")
|
|
||||||
}
|
|
||||||
throw new IllegalStateException("Found deprecated members marked for removal but not yet removed in ${mcVer}; see log for details")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected processNode(MinecraftVersion mcVer, List<String> errors, ClassNode node) {
|
|
||||||
node.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"class ${node.name}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node.fields?.each { field ->
|
|
||||||
field.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"field ${node.name}#${field.name}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node.methods?.each { method ->
|
|
||||||
method.visibleAnnotations?.each { annotation ->
|
|
||||||
ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
|
|
||||||
"method ${node.name}#${method.name}${method.desc}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
|
|
||||||
def values = annotation.values
|
|
||||||
if (values === null)
|
|
||||||
return
|
|
||||||
int forRemoval = values.indexOf('forRemoval')
|
|
||||||
int since = values.indexOf('since')
|
|
||||||
if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
|
|
||||||
def oldVersion = MinecraftVersion.from(values[since + 1])
|
|
||||||
int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
|
|
||||||
if (split.length < 2)
|
|
||||||
return
|
|
||||||
def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
|
|
||||||
if (removeVersion <= mcVer)
|
|
||||||
errors.add([context(), removeVersion])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
private static int[] splitDots(String version) {
|
|
||||||
String[] pts = version.split('\\.')
|
|
||||||
int[] values = new int[pts.length]
|
|
||||||
for (int x = 0; x < pts.length; x++)
|
|
||||||
values[x] = Integer.parseInt(pts[x])
|
|
||||||
return values
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,310 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.TupleConstructor
|
|
||||||
import net.minecraftforge.forge.tasks.InheritanceData
|
|
||||||
import net.minecraftforge.srgutils.IMappingFile
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFile
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckATs extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getAts()
|
|
||||||
@InputFile @Optional abstract RegularFileProperty getMappings()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final IMappingFile mappings = mappings.map { RegularFile it -> IMappingFile.load(it.asFile) }.getOrNull()
|
|
||||||
final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
|
|
||||||
|
|
||||||
ats.each {
|
|
||||||
final lines = process(it, reporter, inheritance)
|
|
||||||
if (fix) {
|
|
||||||
it.text = joinBack(lines, inheritance, mappings).join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TreeMap<String, ATParser.Entry> process(File file, Reporter reporter, Map<String, InheritanceData> inheritance) {
|
|
||||||
final TreeMap<String, ATParser.Entry> lines = ATParser.parse(file.readLines(), reporter)
|
|
||||||
final Map<String, ATParser.Entry> constructorGroups = [:]
|
|
||||||
|
|
||||||
final itr = lines.entrySet().iterator()
|
|
||||||
final toRemove = []
|
|
||||||
while (itr.hasNext()) {
|
|
||||||
final next = itr.next()
|
|
||||||
String key = next.key
|
|
||||||
final entry = next.value
|
|
||||||
if (entry === null) continue
|
|
||||||
|
|
||||||
final binaryName = entry.cls.replaceAll('\\.', '/')
|
|
||||||
|
|
||||||
// Process Groups, this will remove any entries outside the group that is covered by the group
|
|
||||||
if (entry.group) {
|
|
||||||
final jcls = inheritance[binaryName]
|
|
||||||
if (jcls === null) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group: $key")
|
|
||||||
} else if ('*' == entry.desc) {
|
|
||||||
if (!jcls.fields) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group, class has no fields: $key")
|
|
||||||
} else {
|
|
||||||
jcls.fields.each { field, value ->
|
|
||||||
final fkey = entry.cls + ' ' + field
|
|
||||||
if (accessLevel(value.access) < accessStr(entry.modifier)) {
|
|
||||||
if (lines.containsKey(fkey)) {
|
|
||||||
toRemove.add(fkey)
|
|
||||||
} else if (!entry.existing.contains(fkey)) {
|
|
||||||
reporter.report("Missing group entry: $fkey")
|
|
||||||
}
|
|
||||||
entry.children.add(fkey)
|
|
||||||
} else if (lines.containsKey(fkey)) {
|
|
||||||
toRemove.add(fkey)
|
|
||||||
reporter.report("Found invalid group entry: $fkey")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('*()' == entry.desc) {
|
|
||||||
if (!jcls.methods) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid group, class has no methods: $key")
|
|
||||||
} else {
|
|
||||||
jcls.methods.each { mtd, value ->
|
|
||||||
if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$')) return
|
|
||||||
key = entry.cls + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel(value.access) < accessStr(entry.modifier)) {
|
|
||||||
if (lines.containsKey(key)) {
|
|
||||||
toRemove.add(key)
|
|
||||||
} else if (!entry.existing.contains(key)) {
|
|
||||||
reporter.report("Missing group entry: $key")
|
|
||||||
}
|
|
||||||
entry.children.add(key)
|
|
||||||
} else if (lines.containsKey(key)) {
|
|
||||||
toRemove.add(key)
|
|
||||||
reporter.report("Found invalid group entry: $key")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('<init>' == entry.desc) { //Make all public non-abstract subclasses
|
|
||||||
constructorGroups.put(binaryName, entry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process normal lines, remove invalid and remove narrowing
|
|
||||||
else {
|
|
||||||
def jcls = inheritance.get(binaryName)
|
|
||||||
if (jcls === null) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else if (entry.desc == '') {
|
|
||||||
if (accessLevel(jcls.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key")
|
|
||||||
}
|
|
||||||
} else if (!entry.desc.contains('(')) {
|
|
||||||
if (!jcls.fields || !jcls.fields.containsKey(entry.desc)) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else {
|
|
||||||
final value = jcls.fields[entry.desc]
|
|
||||||
if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key - ${entry.comment}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
final jdesc = entry.desc.replace('(', ' (')
|
|
||||||
if (!jcls.methods || !jcls.methods.containsKey(jdesc)) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid: $key")
|
|
||||||
} else {
|
|
||||||
final value = jcls.methods[jdesc]
|
|
||||||
if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
|
|
||||||
itr.remove()
|
|
||||||
reporter.report("Invalid Narrowing: $key")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inheritance.each { tcls, value ->
|
|
||||||
if (!value.methods || ((value.access & Opcodes.ACC_ABSTRACT) !== 0)) return
|
|
||||||
String parent = tcls
|
|
||||||
while (parent !== null) {
|
|
||||||
constructorGroups[parent]?.tap { entry ->
|
|
||||||
value.methods.each { mtd, v ->
|
|
||||||
if (mtd.startsWith('<init>')) {
|
|
||||||
final child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel(v.access) < 3) {
|
|
||||||
if (lines.containsKey(child)) {
|
|
||||||
toRemove.add(child)
|
|
||||||
} else if (child !in entry.existing) {
|
|
||||||
reporter.report("Missing group entry: $child")
|
|
||||||
}
|
|
||||||
entry.children.add(child)
|
|
||||||
} else if (lines.containsKey(child)) {
|
|
||||||
toRemove.add(child)
|
|
||||||
reporter.report("Found invalid group entry: $child")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
parent = inheritance[parent]?.superName
|
|
||||||
}
|
|
||||||
}
|
|
||||||
constructorGroups.values().each { entry -> entry.existing.findAll { it !in entry.children }.each{ reporter.report("Found invalid group entry: $it") } }
|
|
||||||
|
|
||||||
toRemove.each(lines.&remove)
|
|
||||||
|
|
||||||
return lines
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance, IMappingFile mappings) {
|
|
||||||
final data = [] as List<String>
|
|
||||||
final remapComment = { ATParser.Entry entry ->
|
|
||||||
if (!mappings || !entry || !entry.desc) return null
|
|
||||||
final comment = entry.comment?.substring(1)?.trim()
|
|
||||||
final jsonCls = inheritance.get(entry.cls.replaceAll('\\.', '/'))
|
|
||||||
final mappingsClass = mappings?.getClass(jsonCls.name)
|
|
||||||
if (mappingsClass === null) return entry.comment
|
|
||||||
final idx = entry.desc.indexOf('(')
|
|
||||||
|
|
||||||
String mappedName = idx == -1
|
|
||||||
? mappingsClass.remapField(entry.desc)
|
|
||||||
: mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
|
|
||||||
if (!mappedName) return entry.comment
|
|
||||||
if (mappedName == '<init>')
|
|
||||||
mappedName = 'constructor'
|
|
||||||
|
|
||||||
if (comment?.startsWith(mappedName))
|
|
||||||
return '# ' + comment
|
|
||||||
if (comment && comment.indexOf(' ') !== -1) {
|
|
||||||
def split = comment.split(' - ').toList()
|
|
||||||
if (split[0].indexOf(' ') !== -1)
|
|
||||||
// The first string is more than one word, so append before it
|
|
||||||
return "# ${mappedName} - ${comment}"
|
|
||||||
split.remove(0)
|
|
||||||
return "# ${mappedName} - ${String.join(' - ', split)}"
|
|
||||||
}
|
|
||||||
return '# ' + mappedName
|
|
||||||
}
|
|
||||||
lines.each { key, value ->
|
|
||||||
if (!value.group) {
|
|
||||||
def comment = remapComment.call(value)
|
|
||||||
data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
|
|
||||||
} else {
|
|
||||||
data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
|
|
||||||
value.children.each {
|
|
||||||
final line = value.modifier + ' ' + it
|
|
||||||
final entry = ATParser.parseEntry(line)
|
|
||||||
final comment = remapComment(entry)
|
|
||||||
data.add(line + (comment ? ' ' + comment : ''))
|
|
||||||
}
|
|
||||||
data.add('#endgroup')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
|
|
||||||
static int accessStr(String access) {
|
|
||||||
if (access.endsWith('-f') || access.endsWith('+f')) return 4
|
|
||||||
switch (access.toLowerCase()) {
|
|
||||||
case 'public': return 3
|
|
||||||
case 'protected': return 2
|
|
||||||
case 'default': return 1
|
|
||||||
case 'private': return 0
|
|
||||||
default: return -1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int accessLevel(int access) {
|
|
||||||
if ((access & Opcodes.ACC_PUBLIC) !== 0) return 3
|
|
||||||
if ((access & Opcodes.ACC_PROTECTED) !== 0) return 2
|
|
||||||
if ((access & Opcodes.ACC_PRIVATE) !== 0) return 0
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
class ATParser {
|
|
||||||
static TreeMap<String, Entry> parse(List<String> lines, CheckTask.Reporter reporter) {
|
|
||||||
TreeMap<String, Entry> outLines = new TreeMap<>()
|
|
||||||
Entry group = null
|
|
||||||
for (final line : lines) {
|
|
||||||
if (line.isEmpty()) continue
|
|
||||||
if (line.startsWith('#group ')) {
|
|
||||||
final entry = parseEntry(line.substring(7))
|
|
||||||
|
|
||||||
if (entry.desc != '*' && entry.desc != '*()' && entry.desc != '<init>') {
|
|
||||||
reporter.report("Invalid group: $line", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
entry.group = true
|
|
||||||
entry.children = []
|
|
||||||
entry.existing = []
|
|
||||||
|
|
||||||
group = entry
|
|
||||||
|
|
||||||
if (outLines.containsKey(entry.key)) {
|
|
||||||
reporter.report("Duplicate group: $line", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
outLines[entry.key] = group
|
|
||||||
} else if (group !== null) {
|
|
||||||
if (line.startsWith('#endgroup')) {
|
|
||||||
group = null
|
|
||||||
} else {
|
|
||||||
final key = parseEntry(line).key
|
|
||||||
group.existing.add(key)
|
|
||||||
}
|
|
||||||
} else if (line.startsWith('#endgroup')) {
|
|
||||||
reporter.report("Invalid group ending: $line", false)
|
|
||||||
} else if (line.startsWith('#')) {
|
|
||||||
//Nom
|
|
||||||
} else {
|
|
||||||
final entry = parseEntry(line)
|
|
||||||
if (outLines.containsKey(entry.key)) {
|
|
||||||
reporter.report("Found duplicate: $line")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
outLines[entry.key] = entry
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return outLines
|
|
||||||
}
|
|
||||||
|
|
||||||
static Entry parseEntry(String line) {
|
|
||||||
final idx = line.indexOf('#')
|
|
||||||
final String comment = idx === -1 ? null : line.substring(idx)
|
|
||||||
if (idx !== -1) line = line.substring(0, idx - 1)
|
|
||||||
final data = (line.trim() + ' ').split(' ', -1)
|
|
||||||
new Entry(data[0], data[1], data[2], comment)
|
|
||||||
}
|
|
||||||
|
|
||||||
@TupleConstructor
|
|
||||||
static final class Entry {
|
|
||||||
String modifier, cls, desc, comment
|
|
||||||
|
|
||||||
Set<String> existing
|
|
||||||
TreeSet<String> children
|
|
||||||
boolean group = false
|
|
||||||
|
|
||||||
@Lazy
|
|
||||||
String key = {cls + (desc.isEmpty() ? '' : ' ' + desc)}()
|
|
||||||
|
|
||||||
Object getAt(String key) {
|
|
||||||
return getProperty(key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import net.minecraftforge.forge.tasks.Util
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.objectweb.asm.ClassReader
|
|
||||||
import org.objectweb.asm.ClassVisitor
|
|
||||||
import org.objectweb.asm.MethodVisitor
|
|
||||||
import org.objectweb.asm.Type
|
|
||||||
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
abstract class CheckExcs extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getBinary()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getExcs()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final Set<String> known = []
|
|
||||||
collectKnown(known)
|
|
||||||
|
|
||||||
excs.each { f ->
|
|
||||||
final lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
int idx = line.indexOf('#')
|
|
||||||
if (idx === 0 || line.isEmpty()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (idx !== -1) line = line.substring(0, idx - 1)
|
|
||||||
|
|
||||||
if (!line.contains('=')) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
def (String key, String value) = line.split('=', 2)
|
|
||||||
if (!known.contains(key)) {
|
|
||||||
reporter.report("Unknown: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
String desc = key.split('\\.', 2)[1]
|
|
||||||
if (!desc.contains('(')) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
desc = '(' + desc.split('\\(', 2)[1]
|
|
||||||
|
|
||||||
def (exceptions, String args) = value.contains('|') ? value.split('|', 2) : [value, '']
|
|
||||||
|
|
||||||
if (args.split(',').length !== Type.getArgumentTypes(desc).length) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lines.add(line)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fix) f.text = lines.sort().join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void collectKnown(Collection<String> known) {
|
|
||||||
binary.get().asFile.withInputStream { i ->
|
|
||||||
new ZipInputStream(i).withCloseable { zin ->
|
|
||||||
final visitor = new ClassVisitor(Util.ASM_LEVEL) {
|
|
||||||
private String cls
|
|
||||||
@Override
|
|
||||||
void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
|
||||||
this.cls = name
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
|
|
||||||
known.add(this.cls + '.' + name + descriptor)
|
|
||||||
super.visitMethod(access, name, descriptor, signature, exceptions)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ZipEntry zein
|
|
||||||
while ((zein = zin.nextEntry) !== null) {
|
|
||||||
if (zein.name.endsWith('.class')) {
|
|
||||||
ClassReader reader = new ClassReader(zin)
|
|
||||||
reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
enum CheckMode {
|
|
||||||
CHECK,
|
|
||||||
FIX
|
|
||||||
|
|
||||||
CheckMode() {}
|
|
||||||
}
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import org.gradle.api.file.DirectoryProperty
|
|
||||||
import org.gradle.api.provider.ListProperty
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.InputDirectory
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckPatches extends CheckTask {
|
|
||||||
|
|
||||||
private static final Pattern HUNK_START_PATTERN = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
|
|
||||||
private static final Pattern WHITESPACE_PATTERN = Pattern.compile('^[+\\-]\\s*$')
|
|
||||||
private static final Pattern IMPORT_PATTERN = Pattern.compile('^[+\\-]\\s*import.*')
|
|
||||||
private static final Pattern FIELD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
|
|
||||||
private static final Pattern METHOD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
|
|
||||||
private static final Pattern CLASS_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
|
|
||||||
private static final Map<String, Integer> ACCESS_MAP = [private: 0, protected: 2, public: 3].tap { it.put(null, 1) }
|
|
||||||
|
|
||||||
@InputDirectory abstract DirectoryProperty getPatchDir()
|
|
||||||
@Input @Optional abstract ListProperty<String> getPatchesWithS2SArtifact()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final patchDir = getPatchDir().get().asFile.toPath()
|
|
||||||
Files.walk(patchDir).withCloseable {
|
|
||||||
it.filter(Files.&isRegularFile).forEach { path ->
|
|
||||||
final String relativeName = patchDir.relativize(path).toString()
|
|
||||||
verifyPatch(path, reporter, fix, relativeName, patchesWithS2SArtifact.get().contains(relativeName.replace('\\', '/')))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean accessChange(String previous, String current) {
|
|
||||||
//return ACCESS_MAP[previous] < ACCESS_MAP[current]
|
|
||||||
return previous != current
|
|
||||||
}
|
|
||||||
|
|
||||||
void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
|
|
||||||
int oldFixedErrors = reporter.fixed.size()
|
|
||||||
|
|
||||||
final lines = Files.readAllLines(patch)
|
|
||||||
|
|
||||||
int hunksStart = 0
|
|
||||||
boolean onlyWhiteSpace = false
|
|
||||||
|
|
||||||
final List<String> newLines = []
|
|
||||||
|
|
||||||
// First two lines are file name ++/-- and we do not care
|
|
||||||
newLines.add(lines[0] + '\n')
|
|
||||||
newLines.add(lines[1] + '\n')
|
|
||||||
|
|
||||||
int i
|
|
||||||
for (i = 2; i < lines.size(); ++i) {
|
|
||||||
def line = lines[i]
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
|
|
||||||
if (HUNK_START_PATTERN.matcher(line).find()) {
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
|
|
||||||
int toRemove = i - hunksStart
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
}
|
|
||||||
hunksStart = i
|
|
||||||
onlyWhiteSpace = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.startsWithAny('+','-')) {
|
|
||||||
def prefixChange = false
|
|
||||||
def prevLine = lines[i - 1]
|
|
||||||
|
|
||||||
if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
|
|
||||||
def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
|
|
||||||
def currTrim = line.substring(1).replaceAll("\\s", "")
|
|
||||||
|
|
||||||
if (prevTrim == currTrim) {
|
|
||||||
prefixChange = true
|
|
||||||
}
|
|
||||||
|
|
||||||
def pMatcher = FIELD_PATTERN.matcher(prevLine)
|
|
||||||
def cMatcher = FIELD_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // = ...
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // field name
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
pMatcher = METHOD_PATTERN.matcher(prevLine)
|
|
||||||
cMatcher = METHOD_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // params
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // <T> void name
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
pMatcher = CLASS_PATTERN.matcher(prevLine)
|
|
||||||
cMatcher = CLASS_PATTERN.matcher(line)
|
|
||||||
|
|
||||||
if (pMatcher.find() && cMatcher.find() &&
|
|
||||||
pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
|
|
||||||
pMatcher.group(5) == cMatcher.group(5) && // class | interface
|
|
||||||
pMatcher.group(3) == cMatcher.group(3) && // static
|
|
||||||
(accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
|
|
||||||
final nextLine = lines[i + 1]
|
|
||||||
if (nextLine.charAt(0) == (char)'+') {
|
|
||||||
final nextTrim = nextLine.substring(1).replaceAll("\\s", "")
|
|
||||||
final currTrim = line.substring(1).replaceAll("\\s", "")
|
|
||||||
|
|
||||||
if (nextTrim == currTrim) {
|
|
||||||
prefixChange = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final isWhiteSpaceChange = WHITESPACE_PATTERN.matcher(line).find()
|
|
||||||
|
|
||||||
if (!prefixChange && !isWhiteSpaceChange) {
|
|
||||||
onlyWhiteSpace = hasS2SArtifact && IMPORT_PATTERN.matcher(line).find()
|
|
||||||
} else if (isWhiteSpaceChange) {
|
|
||||||
final prevLineChange = prevLine.startsWithAny('+','-')
|
|
||||||
final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
|
|
||||||
|
|
||||||
if (!prevLineChange && !nextLineChange) {
|
|
||||||
reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.contains('\t')) {
|
|
||||||
reporter.report("Patch contains tabs on line ${i + 1}, file: $patchPath")
|
|
||||||
line = line.replaceAll('\t', ' ')
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IMPORT_PATTERN.matcher(line).find() && !hasS2SArtifact) {
|
|
||||||
reporter.report("Patch contains import change on line ${i + 1}, file: $patchPath", false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
|
|
||||||
def toRemove = i - hunksStart;
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((reporter.fixed.size() > oldFixedErrors && fix) || hasS2SArtifact) {
|
|
||||||
if (newLines.size() <= 2) {
|
|
||||||
logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
|
|
||||||
Files.delete(patch)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
|
|
||||||
Files.newBufferedWriter(patch).withCloseable {
|
|
||||||
newLines.each { l -> it.write(l) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import net.minecraftforge.forge.tasks.Annotatable
|
|
||||||
import net.minecraftforge.forge.tasks.InheritanceData
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckSAS extends CheckTask {
|
|
||||||
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getSass()
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void check(Reporter reporter, boolean fix) {
|
|
||||||
final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
|
|
||||||
|
|
||||||
sass.each { f ->
|
|
||||||
final lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
if (line[0] == '\t') return // Skip any tabbed lines, those are ones we add
|
|
||||||
final idx = line.indexOf('#')
|
|
||||||
if (idx == 0 || line.isEmpty()) {
|
|
||||||
lines.add(line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
|
||||||
final spl = (line.trim().replace('(', ' (') + ' ').split(' ', -1)
|
|
||||||
def (String cls, String name, String desc) = [spl[0], spl[1], spl[2]]
|
|
||||||
cls = cls.replaceAll('\\.', '/')
|
|
||||||
|
|
||||||
if (inheritance[cls] === null) {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
} else if (name.isEmpty()) { //Class SAS
|
|
||||||
final toAdd = []
|
|
||||||
final clsSided = isSided(inheritance[cls])
|
|
||||||
boolean sided = clsSided
|
|
||||||
|
|
||||||
/* TODO: MergeTool doesn't do fields
|
|
||||||
if (json[cls]['fields'] != null) {
|
|
||||||
for (entry in json[cls]['fields']) {
|
|
||||||
if (isSided(entry.value)) {
|
|
||||||
sided = true
|
|
||||||
toAdd.add('\t' + cls + ' ' + entry.key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} */
|
|
||||||
|
|
||||||
final clsInh = inheritance[cls]
|
|
||||||
if (clsInh.methods) {
|
|
||||||
for (entry in clsInh.methods) {
|
|
||||||
if (isSided(entry.value)) {
|
|
||||||
sided = true
|
|
||||||
toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
|
|
||||||
} else if (clsSided) {
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
|
|
||||||
findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sided) {
|
|
||||||
lines.add(cls + (comment == null ? '' : ' ' + comment))
|
|
||||||
lines.addAll(toAdd.sort())
|
|
||||||
} else {
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (desc.isEmpty()) { // Fields
|
|
||||||
/* TODO: MergeTool doesn't do fields
|
|
||||||
if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
|
|
||||||
lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
|
|
||||||
else */
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
} else { // Methods
|
|
||||||
final clsInh = inheritance[cls]
|
|
||||||
if (clsInh.methods === null || !isSided(clsInh.methods[name + ' ' + desc]))
|
|
||||||
reporter.report("Invalid: $line")
|
|
||||||
else {
|
|
||||||
lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
|
|
||||||
findChildMethods(inheritance, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
|
|
||||||
findChildMethods(inheritance, cls, name + ' ' + desc).each { lines.add('\t' + it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fix) f.text = lines.join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static boolean isSided(Annotatable annotatable) {
|
|
||||||
if (annotatable === null) return false
|
|
||||||
for (ann in annotatable.annotations) {
|
|
||||||
if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static findChildMethods(Map<String, InheritanceData> json, String cls, String desc) {
|
|
||||||
return json.values().findAll{ it.methods !== null && it.methods[desc] !== null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
|
|
||||||
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks.checks
|
|
||||||
|
|
||||||
import groovy.transform.CompileStatic
|
|
||||||
import groovy.transform.stc.ClosureParams
|
|
||||||
import groovy.transform.stc.ThirdParam
|
|
||||||
import net.minecraftforge.forge.tasks.Util
|
|
||||||
import org.gradle.api.Action
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.logging.LogLevel
|
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.gradle.api.tasks.TaskContainer
|
|
||||||
import org.gradle.api.tasks.VerificationTask
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
abstract class CheckTask extends DefaultTask implements VerificationTask {
|
|
||||||
@Input
|
|
||||||
abstract Property<CheckMode> getMode()
|
|
||||||
|
|
||||||
private boolean ignoreFailures = false
|
|
||||||
|
|
||||||
@Input
|
|
||||||
@Override
|
|
||||||
boolean getIgnoreFailures() {
|
|
||||||
return ignoreFailures
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void setIgnoreFailures(boolean ignoreFailures) {
|
|
||||||
this.ignoreFailures = ignoreFailures
|
|
||||||
}
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
void run() {
|
|
||||||
Util.init()
|
|
||||||
|
|
||||||
boolean doFix = getMode().get() === CheckMode.FIX
|
|
||||||
final Reporter reporter = new Reporter(doFix)
|
|
||||||
check(reporter, doFix)
|
|
||||||
|
|
||||||
if (reporter.messages) {
|
|
||||||
if (getMode().get() === CheckMode.CHECK) {
|
|
||||||
logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
|
|
||||||
if (!ignoreFailures) {
|
|
||||||
throw new IllegalArgumentException("${reporter.messages.size()} errors were found!")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (logger.isEnabled(LogLevel.DEBUG)) {
|
|
||||||
logger.warn("Check task '{}' found {} errors and fixed {}:\n{}", name, reporter.messages.size(), reporter.fixed.size(), reporter.fixed.join('\n'))
|
|
||||||
} else {
|
|
||||||
logger.warn("Check task '{}' found {} errors and fixed {}.", name, reporter.messages.size(), reporter.fixed.size())
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reporter.notFixed) {
|
|
||||||
logger.error('{} errors could not be fixed:\n{}', reporter.notFixed.size(), reporter.notFixed.join('\n'))
|
|
||||||
if (!ignoreFailures) {
|
|
||||||
throw new IllegalArgumentException("${reporter.notFixed.size()} errors which cannot be fixed were found!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract void check(Reporter reporter, boolean fix)
|
|
||||||
|
|
||||||
@CompileStatic
|
|
||||||
static final class Reporter {
|
|
||||||
final boolean trackFixed
|
|
||||||
Reporter(boolean trackFixed) {
|
|
||||||
this.trackFixed = trackFixed
|
|
||||||
}
|
|
||||||
|
|
||||||
public final List<String> messages = []
|
|
||||||
|
|
||||||
public final List<String> fixed = []
|
|
||||||
public final List<String> notFixed = []
|
|
||||||
|
|
||||||
void report(String message, boolean canBeFixed = true) {
|
|
||||||
messages.add(message)
|
|
||||||
|
|
||||||
if (trackFixed) {
|
|
||||||
if (canBeFixed) {
|
|
||||||
fixed.add(message)
|
|
||||||
} else {
|
|
||||||
notFixed.add(message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
|
|
||||||
@DelegatesTo(genericTypeIndex = 0, target = 'type')
|
|
||||||
@ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
|
|
||||||
taskName = taskName.capitalize()
|
|
||||||
tasks.register("check$taskName", clazz) { CheckTask task ->
|
|
||||||
def castedTask = task as T
|
|
||||||
configuration.setDelegate(castedTask)
|
|
||||||
configuration.call(castedTask)
|
|
||||||
castedTask.mode.set(CheckMode.CHECK)
|
|
||||||
castedTask.group = 'checks'
|
|
||||||
}
|
|
||||||
tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
|
|
||||||
|
|
||||||
tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
|
|
||||||
def castedTask = task as T
|
|
||||||
configuration.setDelegate(castedTask)
|
|
||||||
configuration.call(castedTask)
|
|
||||||
castedTask.mode.set(CheckMode.FIX)
|
|
||||||
castedTask.group = 'checks'
|
|
||||||
}
|
|
||||||
tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'java-library'
|
|
||||||
id 'net.minecraftforge.gradle.patcher'
|
|
||||||
}
|
|
||||||
|
|
||||||
evaluationDependsOn(':mcp')
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven gradleutils.forgeMaven
|
|
||||||
maven gradleutils.minecraftLibsMaven
|
|
||||||
}
|
|
||||||
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(libs.forgespi)
|
|
||||||
}
|
|
||||||
|
|
||||||
patcher {
|
|
||||||
parent = project(':mcp')
|
|
||||||
mcVersion = MC_VERSION
|
|
||||||
patchedSrc = file('src/main/java')
|
|
||||||
|
|
||||||
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
|
||||||
|
|
||||||
runs {
|
|
||||||
clean_client {
|
|
||||||
client true
|
|
||||||
taskName 'clean_client'
|
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.client.main.Main'
|
|
||||||
workingDirectory project.file('run/client')
|
|
||||||
|
|
||||||
args '--gameDir', '.'
|
|
||||||
args '--version', MC_VERSION
|
|
||||||
args '--assetsDir', downloadAssets.output
|
|
||||||
args '--assetIndex', '{asset_index}'
|
|
||||||
args '--accessToken', '0'
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_server {
|
|
||||||
client false
|
|
||||||
taskName 'clean_server'
|
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.server.Main'
|
|
||||||
workingDirectory project.file('run/server')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
|
||||||
}
|
|
||||||
|
|
||||||
eclipse.classpath.file.whenMerged {
|
|
||||||
// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
|
|
||||||
def src = entries.find { it.path == 'src/main/java' }
|
|
||||||
if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
|
|
||||||
src.entryAttributes['ignore_optional_problems'] = 'true'
|
|
||||||
}
|
|
||||||
-1094
File diff suppressed because it is too large.
Load diff
@@ -1,76 +0,0 @@
|
|||||||
import net.minecraftforge.forge.tasks.CleanProperties
|
|
||||||
|
|
||||||
apply plugin: 'eclipse'
|
|
||||||
apply plugin: 'idea'
|
|
||||||
apply plugin: 'net.minecraftforge.gradleutils'
|
|
||||||
|
|
||||||
group = 'net.minecraftforge'
|
|
||||||
version = VERSION
|
|
||||||
println("Version: $version")
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven gradleutils.forgeMaven
|
|
||||||
maven gradleutils.minecraftLibsMaven
|
|
||||||
//mavenLocal()
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(Javadoc).configureEach {
|
|
||||||
options.tags = [
|
|
||||||
'apiNote:a:<em>API Note:</em>',
|
|
||||||
'implSpec:a:<em>Implementation Requirements:</em>',
|
|
||||||
'implNote:a:<em>Implementation Note:</em>'
|
|
||||||
]
|
|
||||||
options.addStringOption('Xdoclint:all,-missing', '-public')
|
|
||||||
}
|
|
||||||
|
|
||||||
// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
|
|
||||||
tasks.register('writeManifest') {
|
|
||||||
doLast {
|
|
||||||
if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
|
|
||||||
universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
|
|
||||||
else
|
|
||||||
jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('generateResources') {
|
|
||||||
dependsOn('writeManifest')
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
dependsOn 'generateResources'
|
|
||||||
dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
|
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge the resources and classes into the same directory. We'll need to split them at runtime because
|
|
||||||
// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
|
|
||||||
sourceSets.each {
|
|
||||||
def dir = layout.buildDirectory.dir("classes/java/$it.name")
|
|
||||||
it.output.resourcesDir = dir
|
|
||||||
it.java.destinationDirectory = dir
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('copyEclipseSettings') {
|
|
||||||
doLast {
|
|
||||||
rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
|
|
||||||
def target = project.file('.settings/' + file.name)
|
|
||||||
def temp = new CleanProperties().load(file)
|
|
||||||
def exst = new CleanProperties().load(target)
|
|
||||||
exst.put('eclipse.preferences.version', '1')
|
|
||||||
exst.putAll(temp)
|
|
||||||
exst.store(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
|
|
||||||
eclipse {
|
|
||||||
// Run everytime eclipse builds the code
|
|
||||||
//autoBuildTasks writeManifest
|
|
||||||
// Run when importing the project
|
|
||||||
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
|
||||||
}
|
|
||||||
+33
-6
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[][Download]
|
[][Download]
|
||||||
[][Download] [][Discord] [][Patreon]
|
)][Download] [][Discord] [][Patreon]
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
|
|
||||||
| Version | Support |
|
| Version | Support |
|
||||||
|---------| ------------- |
|
|--------------|-----------------------------|
|
||||||
| 1.20.x | Active |
|
| All versions | [Supported][Support-Policy] |
|
||||||
| 1.19.x | Legacy |
|
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -31,6 +30,20 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
|
|
||||||
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
|
## Required Java Versions
|
||||||
|
|
||||||
|
We require the version of Java that Minecraft requires, which is currently:
|
||||||
|
|
||||||
|
| Minecraft | Java |
|
||||||
|
|------------------|-------------------|
|
||||||
|
| 26.1+ | [25][Adoptium-25] |
|
||||||
|
| 1.20.6 - 1.21.11 | [21][Adoptium-21] |
|
||||||
|
| 1.18 - 1.20.4 | [17][Adoptium-17] |
|
||||||
|
| 1.17.1 | [16][Adoptium-16] |
|
||||||
|
| 1.16.5- | [8][Adoptium-8] |
|
||||||
|
|
||||||
|
**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
|
||||||
|
|
||||||
# Creating Mods
|
# Creating Mods
|
||||||
|
|
||||||
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
||||||
@@ -58,13 +71,26 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
to use and modify. However, it costs money to run such a large project as this, so please consider
|
to use and modify. However, it costs money to run such a large project as this, so please consider
|
||||||
[becoming a patron][Patreon].*
|
[becoming a patron][Patreon].*
|
||||||
|
|
||||||
|
### Thanks
|
||||||
|
[](https://www.yourkit.com/)
|
||||||
|
|
||||||
|
YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
|
||||||
|
|
||||||
[Contributing]: ./CONTRIBUTING.md
|
[Contributing]: ./CONTRIBUTING.md
|
||||||
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
|
|
||||||
|
[Adoptium-25]: https://adoptium.net/temurin/releases/?version=25
|
||||||
|
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
|
||||||
|
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
|
||||||
|
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
|
||||||
|
[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
|
||||||
|
[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
|
||||||
|
|
||||||
[Forum]: https://forums.minecraftforge.net/
|
[Forum]: https://forums.minecraftforge.net/
|
||||||
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
||||||
|
[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
|
||||||
|
|
||||||
[Discord]: https://discord.minecraftforge.net/
|
[Discord]: https://discord.minecraftforge.net/
|
||||||
|
|
||||||
@@ -74,3 +100,4 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
||||||
|
|
||||||
[Patreon]: https://www.patreon.com/LexManos
|
[Patreon]: https://www.patreon.com/LexManos
|
||||||
|
[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
for file in $(find repo | grep --invert-match -e md5 -e sha | grep -e .jar -e .zip); do
|
||||||
|
file_path=$(realpath $file)
|
||||||
|
file_name=$(basename $file)
|
||||||
|
|
||||||
|
echo "$file_name"
|
||||||
|
files=$(unzip -l $file | awk '{print $4}')
|
||||||
|
for f in $files; do
|
||||||
|
out="_actual/$file_name/$f"
|
||||||
|
parent=$(dirname "$out")
|
||||||
|
echo $out
|
||||||
|
|
||||||
|
if [ ! -d "$parent" ]; then
|
||||||
|
mkdir -p "$parent"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $f == *.class ]]; then
|
||||||
|
javap -v -p jar:file://$file_path!/$f | tail -n +4 >$out.txt
|
||||||
|
elif [[ $f != */ && $f != "Name" && $f != "----" ]]; then
|
||||||
|
unzip -o -q $file $f -d _actual/$file_name
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
+50
-39
@@ -1,67 +1,78 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'FML'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly libs.jetbrains.annotations
|
||||||
|
|
||||||
api(libs.eventbus)
|
api libs.eventbus
|
||||||
|
|
||||||
implementation(project(':fmlloader'))
|
implementation projects.fmlloader
|
||||||
implementation(libs.commons.io)
|
implementation libs.commons.io
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
license {
|
||||||
manifest {
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
attributes([
|
}
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
|
changelog {
|
||||||
'FMLModType': 'LIBRARY'
|
from changelogBase
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
|
||||||
'Specification-Title': 'FML',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'FML',
|
|
||||||
'Implementation-Version': '1.0',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC'
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
options.compilerArgs << '-Xlint:-unchecked'
|
options.compilerArgs << '-Xlint:-unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
|
||||||
|
'FMLModType' : 'LIBRARY'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Version': '1.0',
|
||||||
|
'Implementation-Vendor' : vendor
|
||||||
|
], 'net/minecraftforge/fml/')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlcore'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Modifactions to Minecraft to enable mod developers.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -5,45 +5,39 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.ServiceConfigurationError;
|
import java.util.ServiceConfigurationError;
|
||||||
import java.util.ServiceLoader;
|
import java.util.ServiceLoader;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used to allow access to certain things from the game layer
|
||||||
|
*/
|
||||||
public class Bindings {
|
public class Bindings {
|
||||||
private static final Bindings INSTANCE = new Bindings();
|
private Bindings() {}
|
||||||
|
|
||||||
private final IBindingsProvider provider;
|
/**
|
||||||
|
* The provider of the bindings
|
||||||
|
* @implNote May also throw a {@link ServiceConfigurationError}
|
||||||
|
*/
|
||||||
|
private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
|
||||||
|
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
|
||||||
|
|
||||||
private Bindings() {
|
/**
|
||||||
var providers = new ArrayList<IBindingsProvider>(1);
|
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
||||||
for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) {
|
*/
|
||||||
try {
|
public static Supplier<BusGroup> getForgeBus() {
|
||||||
providers.add(itr.next());
|
return PROVIDER.getForgeBusSupplier();
|
||||||
} catch (ServiceConfigurationError sce) {
|
|
||||||
sce.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (providers.size() != 1)
|
|
||||||
throw new IllegalStateException("Could not find bindings provider: " + providers);
|
|
||||||
|
|
||||||
this.provider = providers.get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Supplier<IEventBus> getForgeBus() {
|
|
||||||
return INSTANCE.provider.getForgeBusSupplier();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<I18NParser> getMessageParser() {
|
public static Supplier<I18NParser> getMessageParser() {
|
||||||
return INSTANCE.provider.getMessageParser();
|
return PROVIDER.getMessageParser();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
||||||
return INSTANCE.provider.getConfigConfiguration();
|
return PROVIDER.getConfigConfiguration();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,7 +57,9 @@ public class DeferredWorkQueue
|
|||||||
LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
|
LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
|
||||||
RuntimeException aggregate = new RuntimeException();
|
RuntimeException aggregate = new RuntimeException();
|
||||||
Stopwatch timer = Stopwatch.createStarted();
|
Stopwatch timer = Stopwatch.createStarted();
|
||||||
tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
|
for (TaskInfo t : tasks) {
|
||||||
|
makeRunnable(t, Runnable::run, aggregate);
|
||||||
|
}
|
||||||
timer.stop();
|
timer.stop();
|
||||||
if (aggregate.getSuppressed().length > 0) {
|
if (aggregate.getSuppressed().length > 0) {
|
||||||
LOGGER.fatal(
|
LOGGER.fatal(
|
||||||
@@ -114,7 +116,7 @@ public class DeferredWorkQueue
|
|||||||
return future;
|
return future;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class TaskInfo {
|
private static final class TaskInfo {
|
||||||
private final ModContainer owner;
|
private final ModContainer owner;
|
||||||
private Runnable task;
|
private Runnable task;
|
||||||
private CompletableFuture<?> future;
|
private CompletableFuture<?> future;
|
||||||
|
|||||||
@@ -1,262 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
|
||||||
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.lang.invoke.SerializedLambda;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Use to execute code conditionally based on sidedness.
|
|
||||||
* <ul>
|
|
||||||
* <li>When you want to call something on one side and return a result {@link #safeCallWhenOn(Dist, Supplier)}</li>
|
|
||||||
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
|
|
||||||
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
|
||||||
* </ul>
|
|
||||||
*/
|
|
||||||
public final class DistExecutor
|
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
|
||||||
private DistExecutor() {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run the callable in the supplier only on the specified {@link Dist}.
|
|
||||||
* This method is NOT sided-safe and special care needs to be taken in code using this method that implicit class
|
|
||||||
* loading is not triggered by the Callable.
|
|
||||||
*
|
|
||||||
* This method can cause unexpected ClassNotFound exceptions.
|
|
||||||
*
|
|
||||||
* Use {@link #safeCallWhenOn(Dist, Supplier)} where possible.
|
|
||||||
*
|
|
||||||
* @param dist The dist to run on
|
|
||||||
* @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
|
|
||||||
* @param <T> The return type from the callable
|
|
||||||
* @return The callable's result
|
|
||||||
* @deprecated use {@link #safeCallWhenOn(Dist, Supplier)} instead. This remains for advanced use cases.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
|
|
||||||
return unsafeCallWhenOn(dist, toRun);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> T unsafeCallWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
|
|
||||||
if (dist == FMLEnvironment.dist) {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return toRun.get().call();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Call the SafeCallable when on the correct {@link Dist}.
|
|
||||||
*
|
|
||||||
* <strong>The lambda supplied here is required to be a method reference to a method defined in
|
|
||||||
* another class, otherwise an invalid SafeReferent error will be thrown</strong>
|
|
||||||
* @param dist the dist which this will run on
|
|
||||||
* @param toRun the SafeCallable to run and return the result from
|
|
||||||
* @param <T> The type of the SafeCallable
|
|
||||||
* @return the result of the SafeCallable or null if on the wrong side
|
|
||||||
*/
|
|
||||||
public static <T> T safeCallWhenOn(Dist dist, Supplier<SafeCallable<T>> toRun) {
|
|
||||||
validateSafeReferent(toRun);
|
|
||||||
return callWhenOn(dist, toRun::get);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #callWhenOn(Dist, Supplier)}.
|
|
||||||
*
|
|
||||||
* This method can cause unexpected ClassNotFound exceptions.
|
|
||||||
*
|
|
||||||
* @see #callWhenOn(Dist, Supplier)
|
|
||||||
* @param dist Dist to run this code on
|
|
||||||
* @param toRun The code to run
|
|
||||||
* @deprecated use {@link #safeRunWhenOn(Dist, Supplier)} where possible. Advanced uses only.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
|
|
||||||
unsafeRunWhenOn(dist, toRun);
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #unsafeCallWhenOn(Dist, Supplier)}.
|
|
||||||
*
|
|
||||||
* This method can cause unexpected ClassNotFoundException problems in common scenarios. Understand the pitfalls of
|
|
||||||
* the way the class verifier works to load classes before using this.
|
|
||||||
*
|
|
||||||
* Use {@link #safeRunWhenOn(Dist, Supplier)} if you can.
|
|
||||||
*
|
|
||||||
* @see #unsafeCallWhenOn(Dist, Supplier)
|
|
||||||
* @param dist Dist to run this code on
|
|
||||||
* @param toRun The code to run
|
|
||||||
*/
|
|
||||||
public static void unsafeRunWhenOn(Dist dist, Supplier<Runnable> toRun) {
|
|
||||||
if (dist == FMLEnvironment.dist) {
|
|
||||||
toRun.get().run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Call the supplied SafeRunnable when on the correct Dist.
|
|
||||||
* @param dist The dist to run on
|
|
||||||
* @param toRun The code to run
|
|
||||||
*/
|
|
||||||
public static void safeRunWhenOn(Dist dist, Supplier<SafeRunnable> toRun) {
|
|
||||||
validateSafeReferent(toRun);
|
|
||||||
if (dist == FMLEnvironment.dist) {
|
|
||||||
toRun.get().run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Executes one of the two suppliers, based on which side is active.
|
|
||||||
*
|
|
||||||
* <p>
|
|
||||||
* Example (replacement for old SidedProxy):<br/>
|
|
||||||
* {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
|
|
||||||
*
|
|
||||||
* NOTE: the double supplier is required to avoid classloading the secondary target.
|
|
||||||
*
|
|
||||||
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
|
|
||||||
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
|
|
||||||
* @param <T> The common type to return
|
|
||||||
* @return The returned instance
|
|
||||||
* @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
|
|
||||||
return unsafeRunForDist(clientTarget, serverTarget);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
|
|
||||||
* and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
|
|
||||||
* not sided. Ensure you test both sides fully to be confident in using this.
|
|
||||||
*
|
|
||||||
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
|
|
||||||
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
|
|
||||||
* @param <T> The common type to return
|
|
||||||
* @return The returned instance
|
|
||||||
*/
|
|
||||||
public static <T> T unsafeRunForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
|
|
||||||
switch (FMLEnvironment.dist)
|
|
||||||
{
|
|
||||||
case CLIENT:
|
|
||||||
return clientTarget.get().get();
|
|
||||||
case DEDICATED_SERVER:
|
|
||||||
return serverTarget.get().get();
|
|
||||||
default:
|
|
||||||
throw new IllegalArgumentException("UNSIDED?");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Executes one of the two suppliers, based on which side is active.
|
|
||||||
*
|
|
||||||
* <p>
|
|
||||||
* Example (replacement for old SidedProxy):<br/>
|
|
||||||
* {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
|
|
||||||
*
|
|
||||||
* NOTE: the double supplier is required to avoid classloading the secondary target.
|
|
||||||
*
|
|
||||||
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
|
|
||||||
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
|
|
||||||
* @param <T> The common type to return
|
|
||||||
* @return The returned instance
|
|
||||||
*/
|
|
||||||
public static <T> T safeRunForDist(Supplier<SafeSupplier<T>> clientTarget, Supplier<SafeSupplier<T>> serverTarget) {
|
|
||||||
validateSafeReferent(clientTarget);
|
|
||||||
validateSafeReferent(serverTarget);
|
|
||||||
switch (FMLEnvironment.dist)
|
|
||||||
{
|
|
||||||
case CLIENT:
|
|
||||||
return clientTarget.get().get();
|
|
||||||
case DEDICATED_SERVER:
|
|
||||||
return serverTarget.get().get();
|
|
||||||
default:
|
|
||||||
throw new IllegalArgumentException("UNSIDED?");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A safe referent. This will assert that it is being called via a separated class method reference. This will
|
|
||||||
* avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
|
|
||||||
*
|
|
||||||
* SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
|
|
||||||
*
|
|
||||||
* <strong>Implementations need to be defined in a separate class to the referring site, with appropriate
|
|
||||||
* visibility to be accessible at the callsite (generally, avoid private methods).</strong>
|
|
||||||
*
|
|
||||||
* <p>
|
|
||||||
* Valid:<br/>
|
|
||||||
*
|
|
||||||
* {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
|
|
||||||
*
|
|
||||||
* <p>
|
|
||||||
* Invalid:<br/>
|
|
||||||
*
|
|
||||||
* {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
|
|
||||||
*/
|
|
||||||
public interface SafeReferent {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* SafeCallable version of {@link SafeReferent}.
|
|
||||||
* @see SafeReferent
|
|
||||||
* @param <T> The return type of the Callable
|
|
||||||
*/
|
|
||||||
public interface SafeCallable<T> extends SafeReferent, Callable<T>, Serializable {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* SafeSupplier version of {@link SafeReferent}
|
|
||||||
* @param <T> The return type of the Supplier
|
|
||||||
*/
|
|
||||||
public interface SafeSupplier<T> extends SafeReferent, Supplier<T>, Serializable {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* SafeRunnable version of {@link SafeReferent}
|
|
||||||
*/
|
|
||||||
public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
|
|
||||||
|
|
||||||
private static final void validateSafeReferent(Supplier<? extends SafeReferent> safeReferentSupplier) {
|
|
||||||
if (FMLEnvironment.production) return;
|
|
||||||
final SafeReferent setter;
|
|
||||||
try {
|
|
||||||
setter = safeReferentSupplier.get();
|
|
||||||
} catch (Exception e) {
|
|
||||||
// Typically a class cast exception, just return out, expected.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Class<?> cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
|
|
||||||
try {
|
|
||||||
Method m = cl.getDeclaredMethod("writeReplace");
|
|
||||||
m.setAccessible(true);
|
|
||||||
Object replacement = m.invoke(setter);
|
|
||||||
if (!(replacement instanceof SerializedLambda))
|
|
||||||
break;// custom interface implementation
|
|
||||||
SerializedLambda l = (SerializedLambda) replacement;
|
|
||||||
if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
|
|
||||||
LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
|
|
||||||
throw new RuntimeException("Unsafe Referent usage found in safe referent method");
|
|
||||||
}
|
|
||||||
} catch (NoSuchMethodException e) {
|
|
||||||
} catch (IllegalAccessException | InvocationTargetException e) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public interface IBindingsProvider {
|
public interface IBindingsProvider {
|
||||||
Supplier<IEventBus> getForgeBusSupplier();
|
Supplier<BusGroup> getForgeBusSupplier();
|
||||||
Supplier<I18NParser> getMessageParser();
|
Supplier<I18NParser> getMessageParser();
|
||||||
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
||||||
}
|
}
|
||||||
@@ -5,16 +5,15 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
import org.jspecify.annotations.NullMarked;
|
||||||
|
import org.jspecify.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.ToIntFunction;
|
import java.util.function.IntSupplier;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
|
* A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
|
||||||
@@ -22,6 +21,7 @@ import java.util.function.ToIntFunction;
|
|||||||
*
|
*
|
||||||
* @see IModStateProvider
|
* @see IModStateProvider
|
||||||
*/
|
*/
|
||||||
|
@NullMarked
|
||||||
public interface IModLoadingState {
|
public interface IModLoadingState {
|
||||||
/**
|
/**
|
||||||
* {@return the name of this state}
|
* {@return the name of this state}
|
||||||
@@ -44,44 +44,46 @@ public interface IModLoadingState {
|
|||||||
/**
|
/**
|
||||||
* {@return a function returning a human-friendly message for this state}
|
* {@return a function returning a human-friendly message for this state}
|
||||||
*/
|
*/
|
||||||
Function<ModList, String> message();
|
Supplier<String> message();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return a function that computes the size of this transition based on the size of the modlist.
|
* @return a function that computes the size of this transition based on the size of the modlist.
|
||||||
* Used to compute progress.
|
* Used to compute progress.
|
||||||
*/
|
*/
|
||||||
ToIntFunction<ModList> size();
|
default IntSupplier size() {
|
||||||
|
return ModList::size;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@return an optional runnable, which runs before starting the transition from this state to the next}
|
* {@return an optional runnable, which runs before starting the transition from this state to the next}
|
||||||
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
||||||
*/
|
*/
|
||||||
Optional<Consumer<ModList>> inlineRunnable();
|
@Nullable Runnable inlineRunnable();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds the transition task for this state with a blank pre-sync and post-sync task.
|
* Builds the transition task for this state with a blank pre-sync and post-sync task.
|
||||||
*
|
*
|
||||||
* @param <T> a type of event fired on the mod-specific event bus
|
|
||||||
* @param syncExecutor a synchronous executor
|
* @param syncExecutor a synchronous executor
|
||||||
* @param parallelExecutor a parallel executor
|
* @param parallelExecutor a parallel executor
|
||||||
* @param progressBar a progress meter for tracking progress
|
* @param progressBar a progress meter for tracking progress
|
||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
||||||
*/
|
*/
|
||||||
default <T extends Event & IModBusEvent>
|
default @Nullable CompletableFuture<Void> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar) {
|
final ProgressMeter progressBar
|
||||||
|
) {
|
||||||
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e),
|
_ -> CompletableFuture.completedFuture(null),
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e));
|
_ -> CompletableFuture.completedFuture(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
|
* Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
|
||||||
* to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
|
* to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
|
||||||
*
|
*
|
||||||
* @param <T> a type of event fired on the mod-specific event bus
|
|
||||||
* @param syncExecutor a synchronous executor
|
* @param syncExecutor a synchronous executor
|
||||||
* @param parallelExecutor a parallel executor
|
* @param parallelExecutor a parallel executor
|
||||||
* @param progressBar a progress meter for tracking progress
|
* @param progressBar a progress meter for tracking progress
|
||||||
@@ -89,8 +91,7 @@ public interface IModLoadingState {
|
|||||||
* @param postSyncTask a function which returns a task to run after event post-dispatch hook
|
* @param postSyncTask a function which returns a task to run after event post-dispatch hook
|
||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
*/
|
*/
|
||||||
<T extends Event & IModBusEvent>
|
@Nullable CompletableFuture<Void> buildTransition(final Executor syncExecutor,
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
|
|||||||
@@ -5,116 +5,47 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.Supplier;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public interface IModStateTransition {
|
public interface IModStateTransition {
|
||||||
static IModStateTransition buildNoopTransition() {
|
static IModStateTransition buildNoopTransition() {
|
||||||
return new NoopTransition();
|
return ModStateTransitionHelper.NOOP;
|
||||||
}
|
}
|
||||||
|
|
||||||
default <T extends Event & IModBusEvent>
|
default CompletableFuture<Void> build(
|
||||||
CompletableFuture<Void> build(final String name,
|
final String name,
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
) {
|
||||||
|
return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
|
||||||
this.eventFunctionStream().get()
|
|
||||||
.map(f -> (EventGenerator<T>) f)
|
|
||||||
.reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
|
|
||||||
.ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
|
|
||||||
|
|
||||||
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
|
||||||
final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
|
|
||||||
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
|
||||||
.thenApplyAsync(n -> {
|
|
||||||
progressBar.label(progressBar.name() + ": dispatching "+name);
|
|
||||||
return null;
|
|
||||||
}, parallelExecutor)
|
|
||||||
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
|
||||||
.thenApply(r -> {
|
|
||||||
postSyncTask.apply(syncExecutor);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
||||||
return ModLoadingStage::nextState;
|
return ModLoadingStage::nextState;
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T extends Event & IModBusEvent>
|
@Nullable
|
||||||
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
|
default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
|
||||||
final Executor parallelExecutor,
|
return null;
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final EventGenerator<T> eventGenerator,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
|
|
||||||
final EventGenerator<T> nextGenerator) {
|
|
||||||
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
|
|
||||||
|
|
||||||
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
|
|
||||||
completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
|
|
||||||
|
|
||||||
completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
|
|
||||||
|
|
||||||
var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
|
|
||||||
completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
|
|
||||||
|
|
||||||
return nextGenerator;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
|
|
||||||
ThreadSelector threadSelector();
|
ThreadSelector threadSelector();
|
||||||
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
||||||
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
|
|
||||||
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
|
|
||||||
|
|
||||||
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
|
||||||
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
||||||
return fn::apply;
|
return fn::apply;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
record NoopTransition() implements IModStateTransition {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
|
||||||
return Stream::of;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ThreadSelector threadSelector() {
|
|
||||||
return ThreadSelector.SYNC;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
|
||||||
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
|
|
||||||
return (t, f)-> CompletableFuture.completedFuture(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
|
|
||||||
return (t, f)-> CompletableFuture.completedFuture(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,63 +5,20 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Spliterator;
|
import java.util.Spliterator;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.ConcurrentMap;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
import java.util.stream.StreamSupport;
|
import java.util.stream.StreamSupport;
|
||||||
|
|
||||||
public class InterModComms
|
public final class InterModComms {
|
||||||
{
|
public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {}
|
||||||
public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {
|
|
||||||
|
|
||||||
/**
|
private static final ConcurrentHashMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
|
||||||
* Deprecated: use {@link #senderModId()}
|
|
||||||
* @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
|
|
||||||
* Consider it unreliable.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public final String getSenderModId() {
|
|
||||||
return this.senderModId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deprecated: use {@link #modId()}
|
|
||||||
* @return The modid being sent to.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public final String getModId() {
|
|
||||||
return this.modId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deprecated: use {@link #method()}
|
|
||||||
* @return The method being sent to.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public final String getMethod() {
|
|
||||||
return this.method;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param <T> The type of the message.
|
|
||||||
* @return A {@link Supplier} of the message.
|
|
||||||
* Use {@link #messageSupplier()}
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Deprecated
|
|
||||||
public final <T> Supplier<T> getMessageSupplier() {
|
|
||||||
return (Supplier<T>) this.messageSupplier;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
|
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
|
||||||
@@ -72,8 +29,9 @@ public class InterModComms
|
|||||||
* @return true if the message was enqueued for sending (the target modid is loaded)
|
* @return true if the message was enqueued for sending (the target modid is loaded)
|
||||||
*/
|
*/
|
||||||
public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
|
public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
|
||||||
if (!ModList.get().isLoaded(modId)) return false;
|
if (!ModList.isLoaded(modId)) return false;
|
||||||
containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
|
containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
|
||||||
|
.add(new IMCMessage(ModLoadingContext.get().getContainer().getModId(), modId, method, thing));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,8 +45,9 @@ public class InterModComms
|
|||||||
* @return true if the message was enqueued for sending (the target modid is loaded)
|
* @return true if the message was enqueued for sending (the target modid is loaded)
|
||||||
*/
|
*/
|
||||||
public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
|
public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
|
||||||
if (!ModList.get().isLoaded(modId)) return false;
|
if (!ModList.isLoaded(modId)) return false;
|
||||||
containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
|
containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
|
||||||
|
.add(new IMCMessage(senderModId, modId, method, thing));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,19 +71,17 @@ public class InterModComms
|
|||||||
* @return All messages
|
* @return All messages
|
||||||
*/
|
*/
|
||||||
public static Stream<IMCMessage> getMessages(final String modId) {
|
public static Stream<IMCMessage> getMessages(final String modId) {
|
||||||
return getMessages(modId, s->Boolean.TRUE);
|
return getMessages(modId, _ -> true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class QueueFilteringSpliterator implements Spliterator<IMCMessage>
|
private record QueueFilteringSpliterator(
|
||||||
{
|
ConcurrentLinkedQueue<IMCMessage> queue,
|
||||||
private final ConcurrentLinkedQueue<IMCMessage> queue;
|
Predicate<String> methodFilter,
|
||||||
private final Predicate<String> methodFilter;
|
Iterator<IMCMessage> iterator
|
||||||
private final Iterator<IMCMessage> iterator;
|
) implements Spliterator<IMCMessage> {
|
||||||
|
|
||||||
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
||||||
this.queue = queue;
|
this(queue, methodFilter, queue.iterator());
|
||||||
this.iterator = queue.iterator();
|
|
||||||
this.methodFilter = methodFilter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -138,13 +95,10 @@ public class InterModComms
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean tryAdvance(final Consumer<? super IMCMessage> action)
|
public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
|
||||||
{
|
|
||||||
IMCMessage next;
|
IMCMessage next;
|
||||||
do
|
do {
|
||||||
{
|
if (!iterator.hasNext()) {
|
||||||
if (!iterator.hasNext())
|
|
||||||
{
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
next = this.iterator.next();
|
next = this.iterator.next();
|
||||||
@@ -159,6 +113,5 @@ public class InterModComms
|
|||||||
public Spliterator<IMCMessage> trySplit() {
|
public Spliterator<IMCMessage> trySplit() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,8 +16,7 @@ import net.minecraftforge.api.distmarker.Dist;
|
|||||||
*
|
*
|
||||||
* @see Dist
|
* @see Dist
|
||||||
*/
|
*/
|
||||||
public enum LogicalSide
|
public enum LogicalSide {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
|
* The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
|
||||||
* viewpoint.
|
* viewpoint.
|
||||||
@@ -27,6 +26,7 @@ public enum LogicalSide
|
|||||||
* @see Dist#CLIENT
|
* @see Dist#CLIENT
|
||||||
*/
|
*/
|
||||||
CLIENT,
|
CLIENT,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
|
* The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
|
||||||
* on the level.
|
* on the level.
|
||||||
@@ -41,16 +41,14 @@ public enum LogicalSide
|
|||||||
/**
|
/**
|
||||||
* {@return if this logical side is the server}
|
* {@return if this logical side is the server}
|
||||||
*/
|
*/
|
||||||
public boolean isServer()
|
public boolean isServer() {
|
||||||
{
|
|
||||||
return !isClient();
|
return !isClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@return if the logical side is the client}
|
* {@return if the logical side is the client}
|
||||||
*/
|
*/
|
||||||
public boolean isClient()
|
public boolean isClient() {
|
||||||
{
|
|
||||||
return this == CLIENT;
|
return this == CLIENT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,24 +5,20 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
import java.util.HashSet;
|
||||||
import java.util.IdentityHashMap;
|
import java.util.IdentityHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.Set;
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -33,26 +29,19 @@ import java.util.function.Supplier;
|
|||||||
* a mechanism by which we can wrap actual mod code so that the loader and other
|
* a mechanism by which we can wrap actual mod code so that the loader and other
|
||||||
* facilities can treat mods at arms length.
|
* facilities can treat mods at arms length.
|
||||||
* </p>
|
* </p>
|
||||||
*
|
|
||||||
* @author cpw
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
public abstract class ModContainer {
|
||||||
public abstract class ModContainer
|
|
||||||
{
|
|
||||||
protected final String modId;
|
protected final String modId;
|
||||||
protected final String namespace;
|
protected final String namespace;
|
||||||
protected final IModInfo modInfo;
|
protected final IModInfo modInfo;
|
||||||
protected ModLoadingStage modLoadingStage;
|
protected ModLoadingStage modLoadingStage;
|
||||||
protected Supplier<?> contextExtension;
|
protected Supplier<?> contextExtension;
|
||||||
protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
|
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
||||||
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
||||||
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
final Set<ModContainer> dependencies = new HashSet<>();
|
||||||
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
|
||||||
|
|
||||||
public ModContainer(IModInfo info)
|
public ModContainer(IModInfo info) {
|
||||||
{
|
|
||||||
this.modId = info.getModId();
|
this.modId = info.getModId();
|
||||||
// TODO: Currently not reading namespace from configuration..
|
// TODO: Currently not reading namespace from configuration..
|
||||||
this.namespace = this.modId;
|
this.namespace = this.modId;
|
||||||
@@ -82,58 +71,35 @@ public abstract class ModContainer
|
|||||||
/**
|
/**
|
||||||
* Errored container state, used for filtering. Does nothing.
|
* Errored container state, used for filtering. Does nothing.
|
||||||
*/
|
*/
|
||||||
ModContainer()
|
ModContainer() {
|
||||||
{
|
|
||||||
this.modLoadingStage = ModLoadingStage.ERROR;
|
this.modLoadingStage = ModLoadingStage.ERROR;
|
||||||
modId = "BROKEN";
|
modId = "BROKEN";
|
||||||
namespace = "BROKEN";
|
namespace = "BROKEN";
|
||||||
modInfo = null;
|
modInfo = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the modid for this mod
|
* @return the modid for this mod
|
||||||
*/
|
*/
|
||||||
public final String getModId()
|
public final String getModId() {
|
||||||
{
|
|
||||||
return modId;
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the resource prefix for the mod
|
* @return the resource prefix for the mod
|
||||||
*/
|
*/
|
||||||
public final String getNamespace()
|
public final String getNamespace() {
|
||||||
{
|
|
||||||
return namespace;
|
return namespace;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The current loading stage for this mod
|
* @return The current loading stage for this mod
|
||||||
*/
|
*/
|
||||||
public ModLoadingStage getCurrentState()
|
public ModLoadingStage getCurrentState() {
|
||||||
{
|
|
||||||
return modLoadingStage;
|
return modLoadingStage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
|
public IModInfo getModInfo() {
|
||||||
final ModContainer target,
|
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
|
|
||||||
final Executor executor) {
|
|
||||||
return CompletableFuture
|
|
||||||
.runAsync(() -> {
|
|
||||||
ModLoadingContext.get().setActiveContainer(target);
|
|
||||||
target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
|
|
||||||
target.acceptEvent(eventGenerator.apply(target));
|
|
||||||
}, executor)
|
|
||||||
.whenComplete((mc, exception) -> {
|
|
||||||
target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
|
|
||||||
progressBar.increment();
|
|
||||||
ModLoadingContext.get().setActiveContainer(null);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public IModInfo getModInfo()
|
|
||||||
{
|
|
||||||
return modInfo;
|
return modInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,8 +108,7 @@ public abstract class ModContainer
|
|||||||
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
||||||
{
|
|
||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,9 +132,7 @@ public abstract class ModContainer
|
|||||||
configs.put(modConfig.getType(), modConfig);
|
configs.put(modConfig.getType(), modConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void dispatchConfigEvent(IConfigEvent event) {
|
public void dispatchConfigEvent(IConfigEvent event) {}
|
||||||
configHandler.ifPresent(configHandler->configHandler.accept(event));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Does this mod match the supplied mod?
|
* Does this mod match the supplied mod?
|
||||||
@@ -184,9 +147,17 @@ public abstract class ModContainer
|
|||||||
*/
|
*/
|
||||||
public abstract Object getMod();
|
public abstract Object getMod();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the mod bus group for this specific mod, or null if there is none.
|
||||||
|
* Leave null if you use {@link BusGroup#DEFAULT} for your mod lifecycle events.
|
||||||
|
*/
|
||||||
|
public BusGroup getModBusGroup() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
|
* Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
|
||||||
* @param e Event to accept
|
* @param e Event to accept
|
||||||
*/
|
*/
|
||||||
protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
|
protected <T extends IModBusEvent> void acceptEvent(T e) {}
|
||||||
}
|
}
|
||||||
@@ -5,37 +5,22 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.fml.loading.LoadingModList;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.util.AbstractMap;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.CompletionStage;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.ForkJoinPool;
|
|
||||||
import java.util.concurrent.ForkJoinWorkerThread;
|
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -45,195 +30,131 @@ import java.util.stream.Stream;
|
|||||||
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
||||||
* can dispatch game level events as a result.
|
* can dispatch game level events as a result.
|
||||||
*/
|
*/
|
||||||
public class ModList
|
public final class ModList {
|
||||||
{
|
private ModList() {}
|
||||||
//private static final Logger LOGGER = LogManager.getLogger();
|
|
||||||
private static ModList INSTANCE;
|
|
||||||
private final List<IModFileInfo> modFiles;
|
|
||||||
private final List<IModInfo> sortedList;
|
|
||||||
private final Map<String, ModFileInfo> fileById;
|
|
||||||
private List<ModContainer> mods;
|
|
||||||
private Map<String, ModContainer> indexedMods;
|
|
||||||
private List<ModFileScanData> modFileScanData;
|
|
||||||
private List<ModContainer> sortedContainers;
|
|
||||||
|
|
||||||
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
private static final List<IModFileInfo> MOD_FILES;
|
||||||
{
|
private static final List<IModInfo> SORTED_LIST;
|
||||||
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
|
private static final Map<String, IModFileInfo> FILE_BY_ID;
|
||||||
this.sortedList = sortedList.stream().
|
private static List<ModContainer> mods;
|
||||||
map(ModInfo.class::cast).
|
private static Map<String, ModContainer> indexedMods;
|
||||||
collect(Collectors.toList());
|
private static List<ModContainer> sortedContainers;
|
||||||
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
|
|
||||||
map(ModInfo.class::cast).
|
static {
|
||||||
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
|
||||||
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
var loadingSortedList = LoadingModList.getMods();
|
||||||
|
|
||||||
|
var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
|
||||||
|
SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
|
||||||
|
var byId = new HashMap<String, IModFileInfo>();
|
||||||
|
for (var file : modFileInfos) {
|
||||||
|
for (var mod : file.getMods())
|
||||||
|
byId.put(mod.getModId(), mod.getOwningFile());
|
||||||
|
}
|
||||||
|
FILE_BY_ID = Map.copyOf(byId);
|
||||||
|
CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getModContainerState(String modId) {
|
private static String getModContainerState(String modId) {
|
||||||
return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
|
return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
|
||||||
}
|
}
|
||||||
|
|
||||||
private String fileToLine(IModFile mf) {
|
private static String fileToLine(IModFile mf) {
|
||||||
|
var mainMod = mf.getModInfos().getFirst();
|
||||||
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
|
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
|
||||||
mf.getModInfos().get(0).getDisplayName(),
|
mainMod.getDisplayName(),
|
||||||
mf.getModInfos().get(0).getModId(),
|
mainMod.getModId(),
|
||||||
mf.getModInfos().get(0).getVersion(),
|
mainMod.getVersion(),
|
||||||
getModContainerState(mf.getModInfos().get(0).getModId()),
|
getModContainerState(mainMod.getModId()),
|
||||||
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
||||||
}
|
}
|
||||||
private String crashReport() {
|
|
||||||
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
private static String crashReport() {
|
||||||
|
return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
|
public static void init() {}
|
||||||
{
|
|
||||||
INSTANCE = new ModList(modFiles, sortedList);
|
public static List<IModFileInfo> getModFiles() {
|
||||||
return INSTANCE;
|
return MOD_FILES;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModList get() {
|
public static IModFileInfo getModFileById(String modid) {
|
||||||
return INSTANCE;
|
return FILE_BY_ID.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
static void setLoadedMods(final List<ModContainer> modContainers) {
|
||||||
ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
|
mods = modContainers;
|
||||||
thread.setName("modloading-worker-" + thread.getPoolIndex());
|
sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
|
||||||
// The default sets it to the SystemClassloader, so copy the current one.
|
indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
|
||||||
thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
|
|
||||||
return thread;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModFileInfo> getModFiles()
|
static void clearLoadedMods() {
|
||||||
{
|
mods = List.of();
|
||||||
return modFiles;
|
indexedMods = Map.of();
|
||||||
}
|
sortedContainers = List.of();
|
||||||
|
|
||||||
public IModFileInfo getModFileById(String modid)
|
|
||||||
{
|
|
||||||
return this.fileById.get(modid);
|
|
||||||
}
|
|
||||||
|
|
||||||
<T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
|
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
|
|
||||||
return executor -> gather(
|
|
||||||
this.mods.stream()
|
|
||||||
.map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
|
|
||||||
.toList()
|
|
||||||
).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
|
|
||||||
}
|
|
||||||
static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
|
|
||||||
if (t.stream().noneMatch(e->e.getValue()!=null)) {
|
|
||||||
return CompletableFuture.completedFuture(null);
|
|
||||||
} else {
|
|
||||||
final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
|
|
||||||
CompletableFuture<Void> cf = new CompletableFuture<>();
|
|
||||||
final RuntimeException accumulator = new RuntimeException();
|
|
||||||
cf.completeExceptionally(accumulator);
|
|
||||||
throwables.forEach(exception -> {
|
|
||||||
if (exception instanceof CompletionException) {
|
|
||||||
exception = exception.getCause();
|
|
||||||
}
|
|
||||||
if (exception.getSuppressed().length!=0) {
|
|
||||||
Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
|
|
||||||
} else {
|
|
||||||
accumulator.addSuppressed(exception);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return cf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
|
|
||||||
List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
|
|
||||||
CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
|
|
||||||
futures.forEach(future -> {
|
|
||||||
int i = list.size();
|
|
||||||
list.add(null);
|
|
||||||
results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
|
|
||||||
});
|
|
||||||
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setLoadedMods(final List<ModContainer> modContainers)
|
|
||||||
{
|
|
||||||
this.mods = modContainers;
|
|
||||||
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
|
|
||||||
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T> Optional<T> getModObjectById(String modId)
|
public static <T> Optional<T> getModObjectById(String modId) {
|
||||||
{
|
|
||||||
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerById(String modId)
|
public static Optional<? extends ModContainer> getModContainerById(String modId) {
|
||||||
{
|
return Optional.ofNullable(indexedMods.get(modId));
|
||||||
return Optional.ofNullable(this.indexedMods.get(modId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerByObject(Object obj)
|
public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
||||||
{
|
|
||||||
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModInfo> getMods()
|
public static List<IModInfo> getMods() {
|
||||||
{
|
return SORTED_LIST;
|
||||||
return this.sortedList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoaded(String modTarget)
|
public static boolean isLoaded(String modTarget) {
|
||||||
{
|
return indexedMods.containsKey(modTarget);
|
||||||
return this.indexedMods.containsKey(modTarget);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int size()
|
public static int size() {
|
||||||
{
|
|
||||||
return mods.size();
|
return mods.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileScanData> getAllScanData()
|
public static List<ModFileScanData> getAllScanData() {
|
||||||
{
|
final class LazyInit {
|
||||||
if (modFileScanData == null)
|
private LazyInit() {}
|
||||||
{
|
private static final List<ModFileScanData> MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
|
||||||
modFileScanData = this.sortedList.stream().
|
.map(IModInfo::getOwningFile)
|
||||||
map(IModInfo::getOwningFile).
|
.filter(Objects::nonNull)
|
||||||
filter(Objects::nonNull).
|
.map(IModFileInfo::getFile)
|
||||||
map(IModFileInfo::getFile).
|
.distinct()
|
||||||
distinct().
|
.map(IModFile::getScanResult)
|
||||||
map(IModFile::getScanResult).
|
.toList();
|
||||||
collect(Collectors.toList());
|
|
||||||
}
|
}
|
||||||
return modFileScanData;
|
return LazyInit.MOD_FILE_SCAN_DATA;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModFile(Consumer<IModFile> fileConsumer)
|
public static void forEachModFile(Consumer<IModFile> fileConsumer) {
|
||||||
{
|
MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
||||||
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
|
public static <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
|
||||||
return modFiles.stream().map(IModFileInfo::getFile).map(function);
|
return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
|
public static void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
|
||||||
indexedMods.forEach(modContainerConsumer);
|
indexedMods.forEach(modContainerConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
|
public static void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
|
||||||
this.sortedContainers.forEach(containerConsumer);
|
sortedContainers.forEach(containerConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
public static List<ModContainer> getLoadedMods() {
|
||||||
|
return sortedContainers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
||||||
return indexedMods.values().stream().map(function);
|
return indexedMods.values().stream().map(function);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class UncaughtModLoadingException extends ModLoadingException {
|
|
||||||
public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
|
|
||||||
super(null, stage, "fml.modloading.uncaughterror", originalException);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -5,17 +5,11 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
import com.google.common.collect.Streams;
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
import net.minecraftforge.fml.loading.*;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
|
||||||
import net.minecraftforge.fml.loading.ImmediateWindowHandler;
|
|
||||||
import net.minecraftforge.fml.loading.LoadingModList;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
|
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
@@ -33,8 +27,6 @@ import java.util.function.BiConsumer;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.CORE;
|
import static net.minecraftforge.fml.Logging.CORE;
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
@@ -74,157 +66,198 @@ import static net.minecraftforge.fml.Logging.LOADING;
|
|||||||
* and completes the mod loading sequence.</dd>
|
* and completes the mod loading sequence.</dd>
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
public class ModLoader
|
public final class ModLoader {
|
||||||
{
|
private ModLoader() {}
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static ModLoader INSTANCE;
|
private static final ArrayList<ModLoadingException> LOADING_EXCEPTIONS = new ArrayList<>();
|
||||||
private final LoadingModList loadingModList;
|
private static final ArrayList<ModLoadingWarning> LOADING_WARNINGS = new ArrayList<>();
|
||||||
|
private static final Consumer<String> STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
|
||||||
|
private static final HashSet<IModLoadingState> COMPLETED_STATES = new HashSet<>();
|
||||||
|
private static boolean loadingStateValid;
|
||||||
|
|
||||||
private final List<ModLoadingException> loadingExceptions;
|
private static String computeLanguageList() {
|
||||||
private final List<ModLoadingWarning> loadingWarnings;
|
return "\n" + LanguageLoadingProvider
|
||||||
private final ModStateManager stateManager;
|
.applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
|
||||||
private boolean loadingStateValid;
|
.collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
|
||||||
private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
|
|
||||||
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
|
||||||
private ModList modList;
|
|
||||||
|
|
||||||
private ModLoader()
|
|
||||||
{
|
|
||||||
INSTANCE = this;
|
|
||||||
this.loadingModList = FMLLoader.getLoadingModList();
|
|
||||||
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
|
||||||
.flatMap(ModLoadingException::fromEarlyException)
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
|
||||||
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
this.loadingModList.getModFiles().stream()
|
|
||||||
.filter(ModFileInfo::missingLicense)
|
|
||||||
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
|
|
||||||
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
|
|
||||||
.forEach(this.loadingExceptions::add);
|
|
||||||
this.stateManager = new ModStateManager();
|
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
|
|
||||||
CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String computeLanguageList() {
|
private static String computeModLauncherServiceList() {
|
||||||
return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
|
||||||
}
|
|
||||||
|
|
||||||
private String computeModLauncherServiceList() {
|
|
||||||
final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
|
final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
|
||||||
return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
|
return "\n" + mods.stream().map(mod -> mod.getOrDefault("file","nofile") +
|
||||||
" "+mod.getOrDefault("name", "missing")+
|
' ' + mod.getOrDefault("name", "missing") +
|
||||||
" "+mod.getOrDefault("type","NOTYPE")+
|
' ' + mod.getOrDefault("type","NOTYPE") +
|
||||||
" "+mod.getOrDefault("description", "")).
|
' ' + mod.getOrDefault("description", "")).
|
||||||
collect(Collectors.joining("\n\t\t","\t\t",""));
|
collect(Collectors.joining("\n\t\t","\t\t",""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModLoader get()
|
|
||||||
{
|
|
||||||
return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run on the primary starting thread by ClientModLoader and ServerModLoader
|
* Run on the primary starting thread by ClientModLoader and ServerModLoader
|
||||||
* @param syncExecutor An executor to run tasks on the main thread
|
* @param syncExecutor An executor to run tasks on the main thread
|
||||||
* @param parallelExecutor An executor to run tasks on a parallel loading thread pool
|
* @param parallelExecutor An executor to run tasks on a parallel loading thread pool
|
||||||
* @param periodicTask Optional periodic task to perform on the main thread while other activities run
|
* @param periodicTask Optional periodic task to perform on the main thread while other activities run
|
||||||
*/
|
*/
|
||||||
public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
|
var loadingExceptions = LoadingModList.getErrors().stream()
|
||||||
|
.flatMap(ModLoadingException::fromEarlyException)
|
||||||
|
.toList();
|
||||||
|
ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
|
||||||
|
LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
|
||||||
|
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
||||||
|
.toList());
|
||||||
|
Set<IModInfo> erroredModInfos;
|
||||||
|
if (loadingExceptions.isEmpty()) {
|
||||||
|
erroredModInfos = Collections.emptySet();
|
||||||
|
} else {
|
||||||
|
erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
|
||||||
|
erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
|
||||||
|
}
|
||||||
|
LoadingModList.getModFiles().stream()
|
||||||
|
.filter(ModFileInfo::missingLicense)
|
||||||
|
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
|
||||||
|
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
|
||||||
|
.forEach(LOADING_EXCEPTIONS::add);
|
||||||
|
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
||||||
|
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
||||||
|
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
||||||
|
CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
|
||||||
|
CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
|
||||||
|
|
||||||
ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
|
ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
|
||||||
ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
|
ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
|
||||||
loadingStateValid = true;
|
loadingStateValid = true;
|
||||||
FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
|
FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
|
||||||
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
|
if (!LOADING_EXCEPTIONS.isEmpty()) {
|
||||||
loadingModList.getMods());
|
LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
|
||||||
if (!this.loadingExceptions.isEmpty()) {
|
STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
|
||||||
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
|
ModList.clearLoadedMods();
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(LOADING_EXCEPTIONS);
|
||||||
|
}
|
||||||
|
var failedBounds = new ArrayList<ForgeFeature.Bound>();
|
||||||
|
for (var mod : LoadingModList.getMods()) {
|
||||||
|
for (var feature : mod.getForgeFeatures()) {
|
||||||
|
if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
|
||||||
|
failedBounds.add(feature);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
|
|
||||||
.map(ModInfo::getForgeFeatures)
|
|
||||||
.flatMap(Collection::stream)
|
|
||||||
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
if (!failedBounds.isEmpty()) {
|
if (!failedBounds.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
ModList.clearLoadedMods();
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(failedBounds.stream()
|
throw new LoadingFailedException(failedBounds.stream()
|
||||||
.map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
|
.map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
|
||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
|
final var modContainers = new HashMap<String, ModContainer>();
|
||||||
.map(ModFileInfo::getFile)
|
for (var file : LoadingModList.getModFiles()) {
|
||||||
.map(this::buildMods)
|
var containers = buildMods(file.getFile());
|
||||||
.<ModContainer>mapMulti(Iterable::forEach)
|
for (var container : containers)
|
||||||
.toList();
|
modContainers.put(container.getModId(), container);
|
||||||
if (!loadingExceptions.isEmpty()) {
|
}
|
||||||
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
|
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
if (!LOADING_EXCEPTIONS.isEmpty()) {
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
|
||||||
loadingStateValid = false;
|
STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
ModList.clearLoadedMods();
|
||||||
|
loadingStateValid = false;
|
||||||
|
throw new LoadingFailedException(LOADING_EXCEPTIONS);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
|
||||||
|
for (var mod : modContainers.values()) {
|
||||||
|
for (var dep : mod.getModInfo().getDependencies()) {
|
||||||
|
var target = modContainers.get(dep.getModId());
|
||||||
|
if (target == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case AFTER:
|
||||||
|
mod.dependencies.add(target);
|
||||||
|
break;
|
||||||
|
case BEFORE:
|
||||||
|
target.dependencies.add(mod);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ModList.setLoadedMods(modContainers.values().stream().toList());
|
||||||
|
var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
|
||||||
|
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
|
||||||
|
for (IModLoadingState mls : stateList) {
|
||||||
|
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
||||||
}
|
}
|
||||||
modList.setLoadedMods(modContainers);
|
|
||||||
this.modList = modList;
|
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
|
||||||
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
|
var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
|
||||||
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
for (IModLoadingState mls : stateList) {
|
||||||
|
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
||||||
|
}
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
|
var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
|
||||||
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
for (IModLoadingState mls : stateList) {
|
||||||
statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
|
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
||||||
|
}
|
||||||
|
|
||||||
|
var modBusGroups = Set.of(
|
||||||
|
ModList.getLoadedMods().stream()
|
||||||
|
.map(ModContainer::getModBusGroup)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.toArray(BusGroup[]::new)
|
||||||
|
);
|
||||||
|
for (var modBusGroup : modBusGroups) {
|
||||||
|
parallelExecutor.execute(modBusGroup::trim);
|
||||||
|
}
|
||||||
|
parallelExecutor.execute(BusGroup.DEFAULT::trim);
|
||||||
|
|
||||||
|
STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
|
private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
|
||||||
if (!isLoadingStateValid()) {
|
if (!isLoadingStateValid()) {
|
||||||
LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
|
LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
progressBar.label(progressBar.name()+ " working");
|
progressBar.label(progressBar.name() + " working");
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker));
|
|
||||||
state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
|
var inlineRunnable = state.inlineRunnable();
|
||||||
completedStates.add(state);
|
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
|
||||||
|
|
||||||
|
var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
|
||||||
|
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
|
||||||
|
|
||||||
|
COMPLETED_STATES.add(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
|
private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
|
||||||
var pb = StartupMessageManager.addProgressBar("State transition " +state.name()+" running", 0);
|
var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
transition.accept(this.modList);
|
transition.run();
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
pb.complete();
|
pb.complete();
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
|
||||||
|
private static void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
||||||
while (!transition.isDone()) {
|
while (!transition.isDone()) {
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
transition.join();
|
transition.join();
|
||||||
} catch (CompletionException e) {
|
} catch (CompletionException e) {
|
||||||
@@ -234,36 +267,38 @@ public class ModLoader
|
|||||||
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
||||||
if (hasNotModLoadingEx) {
|
if (hasNotModLoadingEx) {
|
||||||
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
||||||
.filter(ModLoadingException.class::isInstance)
|
.filter(ModLoadingException.class::isInstance)
|
||||||
.map(ModLoadingException.class::cast)
|
.map(ModLoadingException.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
|
||||||
throw new LoadingFailedException(modLoadingExceptions);
|
throw new LoadingFailedException(modLoadingExceptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ModContainer> buildMods(final IModFile modFile)
|
private static List<ModContainer> buildMods(final IModFile modFile) {
|
||||||
{
|
final Map<String, IModInfo> modInfoMap = new HashMap<>();
|
||||||
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
for (var mod : modFile.getModFileInfo().getMods())
|
||||||
|
modInfoMap.put(mod.getModId(), mod);
|
||||||
|
|
||||||
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
||||||
final List<ModContainer> containers = modFile.getScanResult().getTargets()
|
final List<ModContainer> containers = new ArrayList<>();
|
||||||
.entrySet()
|
for (var entry : modFile.getScanResult().getTargets().entrySet()) {
|
||||||
.stream()
|
var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
|
||||||
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
|
if (container != null)
|
||||||
.filter(Objects::nonNull)
|
containers.add(container);
|
||||||
.toList();
|
}
|
||||||
|
|
||||||
if (containers.size() != modInfoMap.size()) {
|
if (containers.size() != modInfoMap.size()) {
|
||||||
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
||||||
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
||||||
|
|
||||||
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
|
LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
|
||||||
modFile.getFilePath(),
|
modFile.getFilePath(),
|
||||||
containers.size(), containerIds,
|
containers.size(), containerIds,
|
||||||
modInfoMap.size(), modIds);
|
modInfoMap.size(), modIds);
|
||||||
@@ -276,23 +311,26 @@ public class ModLoader
|
|||||||
missingMods.removeAll(modIds);
|
missingMods.removeAll(modIds);
|
||||||
LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
|
LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
|
||||||
|
|
||||||
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
LOADING_EXCEPTIONS.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove errored mod containers
|
// remove errored mod containers
|
||||||
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
private static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
|
||||||
|
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
final String modId = idToProviderEntry.getKey();
|
IModInfo info = modInfoMap.get(modId);
|
||||||
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
||||||
IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
|
if (info == null)
|
||||||
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
throw new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId);
|
||||||
orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
|
|
||||||
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
|
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
|
||||||
} catch (ModLoadingException mle) {
|
} catch (ModLoadingException mle) {
|
||||||
// exceptions are caught and added to the error list for later handling
|
// exceptions are caught and added to the error list for later handling
|
||||||
loadingExceptions.add(mle);
|
LOADING_EXCEPTIONS.add(mle);
|
||||||
// return an errored container instance here, because we tried and failed building a container.
|
// return an errored container instance here, because we tried and failed building a container.
|
||||||
return new ErroredModContainer();
|
return new ErroredModContainer();
|
||||||
}
|
}
|
||||||
@@ -303,60 +341,67 @@ public class ModLoader
|
|||||||
* and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
|
* and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
|
||||||
*/
|
*/
|
||||||
public static boolean isLoadingStateValid() {
|
public static boolean isLoadingStateValid() {
|
||||||
return get().loadingStateValid;
|
return loadingStateValid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasCompletedState(final String stateName) {
|
public static boolean hasCompletedState(IModLoadingState state) {
|
||||||
IModLoadingState state = stateManager.findState(stateName);
|
return COMPLETED_STATES.contains(state);
|
||||||
return completedStates.contains(state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
|
public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
|
LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
|
for (var mod : ModList.getLoadedMods())
|
||||||
|
mod.acceptEvent(generator.apply(mod));
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEvent(T e) {
|
public static <T extends IModBusEvent> void postEvent(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
for (var mod : ModList.getLoadedMods())
|
||||||
|
mod.acceptEvent(e);
|
||||||
}
|
}
|
||||||
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
|
||||||
|
public static <T extends IModBusEvent> T postEventWithReturn(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
for (var mod : ModList.getLoadedMods())
|
||||||
|
mod.acceptEvent(e);
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
|
||||||
postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
@SuppressWarnings("removal")
|
||||||
|
public static <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
||||||
|
postEventWithWrapInModOrder(event,
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
|
||||||
|
public static <T extends IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> {
|
for (var mod : ModList.getLoadedMods()) {
|
||||||
pre.accept(mc, e);
|
pre.accept(mod, e);
|
||||||
mc.acceptEvent(e);
|
mod.acceptEvent(e);
|
||||||
post.accept(mc, e);
|
post.accept(mod, e);
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModLoadingWarning> getWarnings()
|
public static List<ModLoadingWarning> getWarnings() {
|
||||||
{
|
return List.copyOf(LOADING_WARNINGS);
|
||||||
return ImmutableList.copyOf(this.loadingWarnings);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addWarning(ModLoadingWarning warning)
|
public static void addWarning(ModLoadingWarning warning) {
|
||||||
{
|
LOADING_WARNINGS.add(warning);
|
||||||
this.loadingWarnings.add(warning);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean runningDataGen = false;
|
private static boolean runningDataGen = false;
|
||||||
@@ -365,7 +410,7 @@ public class ModLoader
|
|||||||
return runningDataGen;
|
return runningDataGen;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ErroredModContainer extends ModContainer {
|
private static final class ErroredModContainer extends ModContainer {
|
||||||
public ErroredModContainer() {
|
public ErroredModContainer() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,39 +8,49 @@ package net.minecraftforge.fml;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.fml.config.IConfigSpec;
|
import net.minecraftforge.fml.config.IConfigSpec;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class ModLoadingContext
|
public class ModLoadingContext {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
||||||
|
private ModContainer activeContainer;
|
||||||
private Object languageExtension;
|
private Object languageExtension;
|
||||||
private ModLoadingStage stage;
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use the context provided by your language loader in your mod's constructor. Example for Java mods: {@snippet :
|
||||||
|
* @Mod("examplemod")
|
||||||
|
* public final class ExampleMod {
|
||||||
|
* public ExampleMod(FMLJavaModLoadingContext context) {
|
||||||
|
* // Use context from the param instead of FMLJavaModLoadingContext.get() or ModLoadingContext.get()
|
||||||
|
* }
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since="1.21.1")
|
||||||
public static ModLoadingContext get() {
|
public static ModLoadingContext get() {
|
||||||
return context.get();
|
return context.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer activeContainer;
|
void setActiveContainer(final ModContainer container) {
|
||||||
|
|
||||||
public void setActiveContainer(final ModContainer container) {
|
|
||||||
this.activeContainer = container;
|
this.activeContainer = container;
|
||||||
this.languageExtension = container == null ? null : container.contextExtension.get();
|
this.languageExtension = container == null ? null : container.contextExtension.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModContainer getActiveContainer() {
|
/**
|
||||||
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
* @deprecated Going to be moved to ForgeHooks for Internal use.
|
||||||
}
|
*/
|
||||||
|
@Deprecated(forRemoval = true, since="1.21.1")
|
||||||
public String getActiveNamespace() {
|
public String getActiveNamespace() {
|
||||||
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ModContainer getContainer() {
|
||||||
|
return activeContainer == null
|
||||||
|
? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
|
||||||
|
: activeContainer;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register an {@link IExtensionPoint} with the mod container.
|
* Register an {@link IExtensionPoint} with the mod container.
|
||||||
* @param point The extension point to register
|
* @param point The extension point to register
|
||||||
@@ -48,7 +58,7 @@ public class ModLoadingContext
|
|||||||
* @param <T> The type signature of the extension operator
|
* @param <T> The type signature of the extension operator
|
||||||
*/
|
*/
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
||||||
getActiveContainer().registerExtensionPoint(point, extension);
|
getContainer().registerExtensionPoint(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -57,7 +67,7 @@ public class ModLoadingContext
|
|||||||
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register
|
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register
|
||||||
*/
|
*/
|
||||||
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
||||||
getActiveContainer().registerDisplayTest(() -> displayTest);
|
getContainer().registerDisplayTest(() -> displayTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,7 +76,7 @@ public class ModLoadingContext
|
|||||||
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
|
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
|
||||||
*/
|
*/
|
||||||
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
||||||
getActiveContainer().registerDisplayTest(displayTest);
|
getContainer().registerDisplayTest(displayTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,7 +86,7 @@ public class ModLoadingContext
|
|||||||
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
|
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
|
||||||
*/
|
*/
|
||||||
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -86,32 +96,29 @@ public class ModLoadingContext
|
|||||||
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
|
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
|
||||||
*/
|
*/
|
||||||
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
||||||
if (spec.isEmpty())
|
if (spec.isEmpty()) {
|
||||||
{
|
|
||||||
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
||||||
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
|
getContainer().addConfig(new ModConfig(type, spec, getContainer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
|
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
|
||||||
if (spec.isEmpty())
|
if (spec.isEmpty()) {
|
||||||
{
|
|
||||||
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
// This handles the case where a mod tries to register a config, without any options configured inside it.
|
||||||
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
|
getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T> T extension() {
|
public <T> T extension() {
|
||||||
return (T)languageExtension;
|
return (T)languageExtension;
|
||||||
|
|||||||
@@ -5,16 +5,16 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
import org.jspecify.annotations.NullMarked;
|
||||||
|
import org.jspecify.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Objects;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.ToIntFunction;
|
import java.util.function.IntSupplier;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of the {@link IModLoadingState} interface.
|
* Implementation of the {@link IModLoadingState} interface.
|
||||||
@@ -26,20 +26,26 @@ import java.util.function.ToIntFunction;
|
|||||||
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @param transition optional state transition information
|
* @param transition optional state transition information
|
||||||
*/
|
*/
|
||||||
public record ModLoadingState(String name, String previous,
|
@NullMarked
|
||||||
Function<ModList, String> message,
|
public record ModLoadingState(
|
||||||
ToIntFunction<ModList> size,
|
String name,
|
||||||
ModLoadingPhase phase,
|
String previous,
|
||||||
Optional<Consumer<ModList>> inlineRunnable,
|
Supplier<String> message,
|
||||||
Optional<IModStateTransition> transition) implements IModLoadingState {
|
IntSupplier size,
|
||||||
|
ModLoadingPhase phase,
|
||||||
|
@Nullable Runnable inlineRunnable,
|
||||||
|
@Nullable IModStateTransition transition
|
||||||
|
) implements IModLoadingState {
|
||||||
@Override
|
@Override
|
||||||
public <T extends Event & IModBusEvent>
|
public @Nullable CompletableFuture<Void> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
|
) {
|
||||||
|
if (transition == null) return null;
|
||||||
|
return transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -49,9 +55,12 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param name the name of the state
|
* @param name the name of the state
|
||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
||||||
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
|
return new ModLoadingState(name, previous, () -> "", () -> 0, phase, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,11 +71,13 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a default message
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -78,11 +89,14 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a custom message
|
* @return a mod loading state with state transition information and a custom message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous,
|
public static ModLoadingState withTransition(final String name, final String previous,
|
||||||
final Function<ModList, String> message, final ModLoadingPhase phase,
|
final Supplier<String> message, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).message(message).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -94,9 +108,75 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @return a mod loading state with an inline runnable and default message
|
* @return a mod loading state with an inline runnable and default message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final Consumer<ModList> inline) {
|
final Runnable inline) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
|
return of(name, phase).after(previous).withInline(inline);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public static Builder of(final String name, final ModLoadingPhase phase) {
|
||||||
|
return new Builder(name, phase);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
return o instanceof ModLoadingState that
|
||||||
|
&& this.phase == that.phase
|
||||||
|
&& this.name.equals(that.name)
|
||||||
|
&& this.previous.equals(that.previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
int result = phase.hashCode();
|
||||||
|
result = 31 * result + name.hashCode();
|
||||||
|
result = 31 * result + previous.hashCode();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final class Builder {
|
||||||
|
private final String name;
|
||||||
|
private final ModLoadingPhase phase;
|
||||||
|
private String after = "";
|
||||||
|
private @Nullable Supplier<String> message = null;
|
||||||
|
private @Nullable IntSupplier size = null;
|
||||||
|
|
||||||
|
private Builder(final String name, final ModLoadingPhase phase) {
|
||||||
|
this.name = name;
|
||||||
|
this.phase = phase;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder after(final ModLoadingState value) { return after(value.name()); }
|
||||||
|
public Builder after(final String value) {
|
||||||
|
this.after = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder message(final String value) { return message(() -> value); }
|
||||||
|
public Builder message(final Supplier<String> value) {
|
||||||
|
this.message = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder size(final int value) { return size(() -> value); }
|
||||||
|
public Builder size(final IntSupplier value) {
|
||||||
|
this.size = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState empty() {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : () -> "", size != null ? size : () -> 0, phase, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState withTransition(final IModStateTransition transition) {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : () -> "Processing transition " + name, size != null ? size : ModList::size, phase, null, transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState withInline(final Runnable inline) {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : () -> "Processing work " + name, size != null ? size : () -> 0, phase, inline, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,41 +5,27 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.Streams;
|
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
public class ModLoadingWarning {
|
/**
|
||||||
/**
|
* @param modInfo Mod info for mod with warning
|
||||||
* Mod Info for mod with warning
|
* @param warningStage The stage where this warning was encountered
|
||||||
*/
|
* @param i18nMessage I18N message to use for display
|
||||||
private final IModInfo modInfo;
|
* @param context Context for message display
|
||||||
/**
|
*/
|
||||||
* The stage where this warning was encountered
|
public record ModLoadingWarning(IModInfo modInfo, ModLoadingStage warningStage, String i18nMessage, List<Object> context) {
|
||||||
*/
|
|
||||||
private final ModLoadingStage warningStage;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* I18N message to use for display
|
|
||||||
*/
|
|
||||||
private final String i18nMessage;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Context for message display
|
|
||||||
*/
|
|
||||||
private final List<Object> context;
|
|
||||||
|
|
||||||
public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
|
public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
|
||||||
this.modInfo = modInfo;
|
this(modInfo, warningStage, i18nMessage, List.of(context));
|
||||||
this.warningStage = warningStage;
|
}
|
||||||
this.i18nMessage = i18nMessage;
|
|
||||||
this.context = Arrays.asList(context);
|
public ModLoadingWarning {
|
||||||
|
context = List.copyOf(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String formatToString() {
|
public String formatToString() {
|
||||||
return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
|
return Bindings.getMessageParser().get().parseMessage(i18nMessage, Stream.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -15,20 +15,19 @@ import java.util.function.Function;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@SuppressWarnings("UnstableApiUsage")
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
public class ModStateManager {
|
public final class ModStateManager {
|
||||||
static ModStateManager INSTANCE;
|
private ModStateManager() {}
|
||||||
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
private static final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
||||||
|
|
||||||
public ModStateManager() {
|
static {
|
||||||
INSTANCE = this;
|
|
||||||
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
|
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
|
||||||
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
|
stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, _ -> {})
|
||||||
.map(IModStateProvider::getAllStates)
|
.map(IModStateProvider::getAllStates)
|
||||||
.<IModLoadingState>mapMulti(Iterable::forEach)
|
.flatMap(List::stream)
|
||||||
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
.collect(Collectors.groupingBy(IModLoadingState::phase, () -> new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModLoadingState> getStates(final ModLoadingPhase phase) {
|
public static List<IModLoadingState> getStates(final ModLoadingPhase phase) {
|
||||||
var nodes = stateMap.get(phase);
|
var nodes = stateMap.get(phase);
|
||||||
var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
|
var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
|
||||||
|
|
||||||
@@ -36,16 +35,20 @@ public class ModStateManager {
|
|||||||
var dummy = ModLoadingState.empty("", "", phase);
|
var dummy = ModLoadingState.empty("", "", phase);
|
||||||
nodes.forEach(graph::addNode);
|
nodes.forEach(graph::addNode);
|
||||||
graph.addNode(dummy);
|
graph.addNode(dummy);
|
||||||
nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
|
for (IModLoadingState node : nodes) {
|
||||||
|
graph.putEdge(lookup.getOrDefault(node.previous(), dummy), node);
|
||||||
|
}
|
||||||
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
|
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModLoadingState findState(final String stateName) {
|
public static IModLoadingState findState(final String stateName) {
|
||||||
return stateMap.values()
|
var result = stateMap.values()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap(Collection::stream)
|
.flatMap(List::stream)
|
||||||
.filter(mls -> mls.name().equals(stateName))
|
.filter(mls -> mls.name().equals(stateName))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
|
.orElse(null);
|
||||||
|
if (result != null) return result;
|
||||||
|
else throw new IllegalArgumentException("Unknown IModLoadingState: " + stateName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.CompletionException;
|
||||||
|
import java.util.concurrent.CompletionStage;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.function.BiFunction;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
|
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
|
||||||
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
|
@ApiStatus.Internal
|
||||||
|
final class ModStateTransitionHelper {
|
||||||
|
static final IModStateTransition NOOP = new NoopTransition();
|
||||||
|
record NoopTransition() implements IModStateTransition {
|
||||||
|
@Override
|
||||||
|
public ThreadSelector threadSelector() {
|
||||||
|
return ThreadSelector.SYNC;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
||||||
|
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
|
||||||
|
if (t.stream().noneMatch(e -> e.exception() != null)) {
|
||||||
|
return CompletableFuture.completedFuture(null);
|
||||||
|
} else {
|
||||||
|
final var throwables = t.stream().map(FutureResult::exception).filter(Objects::nonNull).toList();
|
||||||
|
CompletableFuture<Void> cf = new CompletableFuture<>();
|
||||||
|
final RuntimeException accumulator = new RuntimeException();
|
||||||
|
cf.completeExceptionally(accumulator);
|
||||||
|
for (Throwable exception : throwables) {
|
||||||
|
if (exception instanceof CompletionException) {
|
||||||
|
exception = exception.getCause();
|
||||||
|
}
|
||||||
|
if (exception.getSuppressed().length != 0) {
|
||||||
|
for (Throwable throwable : exception.getSuppressed()) {
|
||||||
|
accumulator.addSuppressed(throwable);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
accumulator.addSuppressed(exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Same as [#completableFutureFromExceptionList(List)] but specialised for a single future
|
||||||
|
static <V> CompletionStage<Void> completableFutureFromException(FutureResult<V> t) {
|
||||||
|
if (t.exception() == null) {
|
||||||
|
return CompletableFuture.completedFuture(null);
|
||||||
|
} else {
|
||||||
|
var exception = t.exception();
|
||||||
|
CompletableFuture<Void> cf = new CompletableFuture<>();
|
||||||
|
RuntimeException accumulator = new RuntimeException();
|
||||||
|
cf.completeExceptionally(accumulator);
|
||||||
|
if (exception instanceof CompletionException) {
|
||||||
|
exception = exception.getCause();
|
||||||
|
}
|
||||||
|
if (exception.getSuppressed().length != 0) {
|
||||||
|
for (Throwable throwable : exception.getSuppressed()) {
|
||||||
|
accumulator.addSuppressed(throwable);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
accumulator.addSuppressed(exception);
|
||||||
|
}
|
||||||
|
return cf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
record FutureResult<V>(V value, Throwable exception) {}
|
||||||
|
|
||||||
|
static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
|
||||||
|
var list = new ArrayList<FutureResult<V>>(futures.size());
|
||||||
|
var results = new CompletableFuture[futures.size()];
|
||||||
|
|
||||||
|
for (var future : futures) {
|
||||||
|
int i = list.size();
|
||||||
|
list.add(null);
|
||||||
|
@SuppressWarnings("unchecked") // Bypass a weird javac error with generic by forcing it to be the exact type we want.
|
||||||
|
var raw = ((CompletableFuture<V>)future);
|
||||||
|
results[i] = raw.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static <T extends IModBusEvent> CompletableFuture<Void> addCompletableFutureTaskForModDispatch(
|
||||||
|
final Executor executor,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final EventGenerator<T> eventGenerator,
|
||||||
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
|
||||||
|
) {
|
||||||
|
var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
|
||||||
|
for (var mod : ModList.getLoadedMods()) {
|
||||||
|
|
||||||
|
CompletableFuture<Void> parent = null;
|
||||||
|
if (mod.dependencies.isEmpty()) {
|
||||||
|
parent = CompletableFuture.allOf();
|
||||||
|
} else {
|
||||||
|
var deps = new CompletableFuture[mod.dependencies.size()];
|
||||||
|
int idx = 0;
|
||||||
|
for (var depContainer : mod.dependencies) {
|
||||||
|
var future = modFutures.get(depContainer.getModId());
|
||||||
|
if (future == null)
|
||||||
|
throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
|
||||||
|
deps[idx++] = future;
|
||||||
|
}
|
||||||
|
parent = CompletableFuture.allOf(deps);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
var dispatch = parent
|
||||||
|
.thenRunAsync(() -> {
|
||||||
|
ModLoadingContext.get().setActiveContainer(mod);
|
||||||
|
var handler = mod.activityMap.get(mod.modLoadingStage);
|
||||||
|
if (handler != null)
|
||||||
|
handler.run();
|
||||||
|
mod.acceptEvent(eventGenerator.apply(mod));
|
||||||
|
}, executor)
|
||||||
|
.whenComplete((mc, exception) -> {
|
||||||
|
mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
|
||||||
|
progressBar.increment();
|
||||||
|
ModLoadingContext.get().setActiveContainer(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modFutures.put(mod.getModId(), dispatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
return gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
|
||||||
|
}
|
||||||
|
|
||||||
|
static <T extends IModBusEvent> CompletableFuture<Void> build(
|
||||||
|
final IModStateTransition transition,
|
||||||
|
final String name,
|
||||||
|
final Executor syncExecutor,
|
||||||
|
final Executor parallelExecutor,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
|
) {
|
||||||
|
CompletableFuture<Void> future;
|
||||||
|
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
|
||||||
|
|
||||||
|
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
||||||
|
CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
||||||
|
.thenRunAsync(() -> progressBar.label(progressBar.name() + ": dispatching " + name), parallelExecutor);
|
||||||
|
|
||||||
|
var eventGenerator = transition.eventFunction();
|
||||||
|
if (eventGenerator != null) {
|
||||||
|
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = transition.nextModLoadingStage();
|
||||||
|
future = addCompletableFutureTaskForModDispatch(executor, progressBar, eventGenerator, state);
|
||||||
|
|
||||||
|
final CompletableFuture<Void> eventDispatchCF = future.handle(FutureResult::new)
|
||||||
|
.thenCompose(ModStateTransitionHelper::completableFutureFromException);
|
||||||
|
postEventDispatchCF = postEventDispatchCF.thenComposeAsync(_ -> eventDispatchCF, parallelExecutor);
|
||||||
|
}
|
||||||
|
|
||||||
|
postEventDispatchCF = postEventDispatchCF.thenRun(() -> postSyncTask.apply(syncExecutor));
|
||||||
|
|
||||||
|
return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,30 +14,20 @@ import java.util.concurrent.locks.LockSupport;
|
|||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
public class ModWorkManager {
|
public final class ModWorkManager {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
|
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
|
||||||
public interface DrivenExecutor extends Executor {
|
|
||||||
boolean selfDriven();
|
|
||||||
boolean driveOne();
|
|
||||||
|
|
||||||
default void drive(Runnable ticker) {
|
public sealed interface DrivenExecutor extends Executor {
|
||||||
if (!selfDriven()) {
|
void drive(Runnable ticker);
|
||||||
ticker.run();
|
|
||||||
while (true) {
|
|
||||||
if (!driveOne()) break;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// park for a bit so other threads can schedule
|
|
||||||
LockSupport.parkNanos(PARK_TIME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
private static class SyncExecutor implements DrivenExecutor {
|
|
||||||
private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>();
|
|
||||||
|
|
||||||
@Override
|
private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
|
||||||
public boolean driveOne() {
|
public SyncExecutor() {
|
||||||
|
this(new ConcurrentLinkedDeque<>());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean driveOne() {
|
||||||
final Runnable task = tasks.pollFirst();
|
final Runnable task = tasks.pollFirst();
|
||||||
if (task != null) {
|
if (task != null) {
|
||||||
task.run();
|
task.run();
|
||||||
@@ -45,45 +35,36 @@ public class ModWorkManager {
|
|||||||
return task != null;
|
return task != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean selfDriven() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(final Runnable command) {
|
public void execute(final Runnable command) {
|
||||||
tasks.addLast(command);
|
tasks.addLast(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drive(Runnable ticker) {
|
||||||
|
ticker.run();
|
||||||
|
while (true) {
|
||||||
|
if (!driveOne()) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class WrappingExecutor implements DrivenExecutor {
|
private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
|
||||||
private final Executor wrapped;
|
|
||||||
|
|
||||||
public WrappingExecutor(final Executor executor) {
|
|
||||||
this.wrapped = executor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean selfDriven() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean driveOne() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(final Runnable command) {
|
public void execute(final Runnable command) {
|
||||||
wrapped.execute(command);
|
wrapped.execute(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drive(Runnable ticker) {
|
||||||
|
// Park for a bit so other threads can schedule
|
||||||
|
LockSupport.parkNanos(PARK_TIME);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SyncExecutor syncExecutor;
|
private static final SyncExecutor syncExecutor = new SyncExecutor();
|
||||||
|
|
||||||
public static DrivenExecutor syncExecutor() {
|
public static DrivenExecutor syncExecutor() {
|
||||||
if (syncExecutor == null)
|
|
||||||
syncExecutor = new SyncExecutor();
|
|
||||||
return syncExecutor;
|
return syncExecutor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,14 +72,8 @@ public class ModWorkManager {
|
|||||||
return new WrappingExecutor(executor);
|
return new WrappingExecutor(executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ForkJoinPool parallelThreadPool;
|
|
||||||
public static Executor parallelExecutor() {
|
public static Executor parallelExecutor() {
|
||||||
if (parallelThreadPool == null) {
|
return LazyInit.PARALLEL_EXECUTOR;
|
||||||
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
|
|
||||||
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
|
|
||||||
parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
|
|
||||||
}
|
|
||||||
return parallelThreadPool;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
||||||
@@ -109,4 +84,14 @@ public class ModWorkManager {
|
|||||||
return thread;
|
return thread;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final class LazyInit {
|
||||||
|
private LazyInit() {}
|
||||||
|
private static final ForkJoinPool PARALLEL_EXECUTOR;
|
||||||
|
|
||||||
|
static {
|
||||||
|
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
|
||||||
|
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
|
||||||
|
PARALLEL_EXECUTOR = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ public final class OptionalMod<T>
|
|||||||
return new OptionalMod<>(modId);
|
return new OptionalMod<>(modId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static OptionalMod<?> EMPTY = new OptionalMod<>(true);
|
private static final OptionalMod<?> EMPTY = new OptionalMod<>(true);
|
||||||
private static <T> OptionalMod<T> empty() {
|
private static <T> OptionalMod<T> empty() {
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
OptionalMod<T> t = (OptionalMod<T>) EMPTY;
|
OptionalMod<T> t = (OptionalMod<T>) EMPTY;
|
||||||
@@ -43,7 +43,7 @@ public final class OptionalMod<T>
|
|||||||
private T getValue()
|
private T getValue()
|
||||||
{
|
{
|
||||||
if (!searched) {
|
if (!searched) {
|
||||||
this.value = ModList.get().<T>getModObjectById(this.modId).orElse(null);
|
this.value = ModList.<T>getModObjectById(this.modId).orElse(null);
|
||||||
searched = true;
|
searched = true;
|
||||||
}
|
}
|
||||||
return this.value;
|
return this.value;
|
||||||
@@ -213,8 +213,8 @@ public final class OptionalMod<T>
|
|||||||
public boolean equals(Object obj)
|
public boolean equals(Object obj)
|
||||||
{
|
{
|
||||||
if (this == obj) return true;
|
if (this == obj) return true;
|
||||||
if (obj instanceof OptionalMod) {
|
if (obj instanceof OptionalMod<?> optionalMod) {
|
||||||
return Objects.equals(((OptionalMod)obj).modId, modId);
|
return Objects.equals(optionalMod.modId, modId);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,8 +48,8 @@ public class VersionChecker {
|
|||||||
BETA(),
|
BETA(),
|
||||||
BETA_OUTDATED(6, true, true);
|
BETA_OUTDATED(6, true, true);
|
||||||
|
|
||||||
final int sheetOffset;
|
private final int sheetOffset;
|
||||||
final boolean draw, animated;
|
private final boolean draw, animated;
|
||||||
|
|
||||||
Status() {
|
Status() {
|
||||||
this(0, false, false);
|
this(0, false, false);
|
||||||
@@ -72,6 +72,10 @@ public class VersionChecker {
|
|||||||
public boolean isAnimated() {
|
public boolean isAnimated() {
|
||||||
return animated;
|
return animated;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isOutdated() {
|
||||||
|
return this == OUTDATED || this == BETA_OUTDATED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
|
public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
|
||||||
@@ -89,8 +93,8 @@ public class VersionChecker {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var mc = ModList.get().getModContainerById("minecraft");
|
var mc = ModList.getModContainerById("minecraft");
|
||||||
var forge = ModList.get().getModContainerById("forge");
|
var forge = ModList.getModContainerById("forge");
|
||||||
this.mcVersion = mc.get().getModInfo().getVersion().toString();
|
this.mcVersion = mc.get().getModInfo().getVersion().toString();
|
||||||
|
|
||||||
this.agent = "Java-http-client/" + System.getProperty("java.version")
|
this.agent = "Java-http-client/" + System.getProperty("java.version")
|
||||||
@@ -211,7 +215,7 @@ public class VersionChecker {
|
|||||||
LOGGER.warn("Failed to process update information", e);
|
LOGGER.warn("Failed to process update information", e);
|
||||||
status = FAILED;
|
status = FAILED;
|
||||||
}
|
}
|
||||||
results.put(mod, new CheckResult(status, target, changes, display_url));
|
RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
|
||||||
}
|
}
|
||||||
}.start();
|
}.start();
|
||||||
}
|
}
|
||||||
@@ -219,17 +223,17 @@ public class VersionChecker {
|
|||||||
// Gather a list of mods that have opted in to this update system by providing a URL.
|
// Gather a list of mods that have opted in to this update system by providing a URL.
|
||||||
private static List<IModInfo> gatherMods() {
|
private static List<IModInfo> gatherMods() {
|
||||||
List<IModInfo> ret = new LinkedList<>();
|
List<IModInfo> ret = new LinkedList<>();
|
||||||
for (IModInfo info : ModList.get().getMods()) {
|
for (IModInfo info : ModList.getMods()) {
|
||||||
if (info.getUpdateURL().isPresent())
|
if (info.getUpdateURL().isPresent())
|
||||||
ret.add(info);
|
ret.add(info);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
|
private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
|
||||||
private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
|
private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
|
||||||
|
|
||||||
public static CheckResult getResult(IModInfo mod) {
|
public static CheckResult getResult(IModInfo mod) {
|
||||||
return results.getOrDefault(mod, PENDING_CHECK);
|
return RESULTS.getOrDefault(mod, PENDING_CHECK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,6 +14,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.apache.commons.io.FilenameUtils;
|
import org.apache.commons.io.FilenameUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -25,9 +26,66 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
|
|||||||
|
|
||||||
public class ConfigFileTypeHandler {
|
public class ConfigFileTypeHandler {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
|
|
||||||
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
||||||
|
|
||||||
|
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
|
||||||
|
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
|
||||||
|
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
|
||||||
|
|
||||||
|
private final @Nullable ModConfig.Type type;
|
||||||
|
private @Nullable FileWatcher watcher;
|
||||||
|
|
||||||
|
// exists for bin compat
|
||||||
|
public ConfigFileTypeHandler() {
|
||||||
|
this(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the handler for the given {@link ModConfig.Type}.
|
||||||
|
*
|
||||||
|
* @param type The type to get the handler for
|
||||||
|
* @return The handler
|
||||||
|
*/
|
||||||
|
static ConfigFileTypeHandler get(ModConfig.Type type) {
|
||||||
|
return switch (type) {
|
||||||
|
case CLIENT -> CLIENT;
|
||||||
|
case COMMON -> COMMON;
|
||||||
|
case SERVER -> SERVER;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
|
||||||
|
*
|
||||||
|
* @return The watcher
|
||||||
|
*
|
||||||
|
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
|
||||||
|
*/
|
||||||
|
FileWatcher getWatcher() {
|
||||||
|
if (this.watcher == null) {
|
||||||
|
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
|
||||||
|
this.watcher = new FileWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.watcher;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
|
||||||
|
* {@link FileWatcher#stop()}.
|
||||||
|
*/
|
||||||
|
void stopWatcher() {
|
||||||
|
if (this.watcher == null) return;
|
||||||
|
|
||||||
|
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
|
||||||
|
this.watcher.stop();
|
||||||
|
this.watcher = null;
|
||||||
|
}
|
||||||
|
|
||||||
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
||||||
return (c) -> {
|
return (c) -> {
|
||||||
final Path configPath = configBasePath.resolve(c.getFileName());
|
final Path configPath = configBasePath.resolve(c.getFileName());
|
||||||
@@ -37,7 +95,7 @@ public class ConfigFileTypeHandler {
|
|||||||
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
||||||
writingMode(WritingMode.REPLACE).
|
writingMode(WritingMode.REPLACE).
|
||||||
build();
|
build();
|
||||||
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -46,13 +104,9 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
||||||
try {
|
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException("Couldn't watch config file", e);
|
|
||||||
}
|
|
||||||
return configData;
|
return configData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -60,14 +114,16 @@ public class ConfigFileTypeHandler {
|
|||||||
public void unload(Path configBasePath, ModConfig config) {
|
public void unload(Path configBasePath, ModConfig config) {
|
||||||
Path configPath = configBasePath.resolve(config.getFileName());
|
Path configPath = configBasePath.resolve(config.getFileName());
|
||||||
try {
|
try {
|
||||||
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
this.getWatcher().removeWatch(configPath);
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
private static boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
||||||
Files.createDirectories(file.getParent());
|
if (!Files.isDirectory(file.getParent())) {
|
||||||
|
Files.createDirectories(file.getParent());
|
||||||
|
}
|
||||||
Path p = defaultConfigPath.resolve(modConfig.getFileName());
|
Path p = defaultConfigPath.resolve(modConfig.getFileName());
|
||||||
if (Files.exists(p)) {
|
if (Files.exists(p)) {
|
||||||
LOGGER.info(CONFIG, "Loading default config file from path {}", p);
|
LOGGER.info(CONFIG, "Loading default config file from path {}", p);
|
||||||
@@ -111,17 +167,16 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ConfigWatcher implements Runnable {
|
@Override
|
||||||
private final ModConfig modConfig;
|
public String toString() {
|
||||||
private final CommentedFileConfig commentedFileConfig;
|
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
||||||
private final ClassLoader realClassLoader;
|
}
|
||||||
|
|
||||||
ConfigWatcher(final ModConfig modConfig, final CommentedFileConfig commentedFileConfig, final ClassLoader classLoader) {
|
|
||||||
this.modConfig = modConfig;
|
|
||||||
this.commentedFileConfig = commentedFileConfig;
|
|
||||||
this.realClassLoader = classLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
private record ConfigWatcher(
|
||||||
|
ModConfig modConfig,
|
||||||
|
CommentedFileConfig commentedFileConfig,
|
||||||
|
ClassLoader realClassLoader
|
||||||
|
) implements Runnable {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
// Force the regular classloader onto the special thread
|
// Force the regular classloader onto the special thread
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ package net.minecraftforge.fml.config;
|
|||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||||
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
@@ -16,46 +18,60 @@ import java.nio.file.Path;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
public class ConfigTracker {
|
public final class ConfigTracker {
|
||||||
|
private ConfigTracker() {}
|
||||||
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
|
static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
|
||||||
public static final ConfigTracker INSTANCE = new ConfigTracker();
|
private static final ConcurrentHashMap<String, ModConfig> FILE_MAP = new ConcurrentHashMap<>();
|
||||||
private final ConcurrentHashMap<String, ModConfig> fileMap;
|
private static final Map<ModConfig.Type, Set<ModConfig>> CONFIG_SETS = Map.of(
|
||||||
private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
|
ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()),
|
||||||
private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod;
|
ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()),
|
||||||
|
ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>())
|
||||||
|
);
|
||||||
|
private static final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> CONFIGS_BY_MOD = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private ConfigTracker() {
|
static void trackConfig(final ModConfig config) {
|
||||||
this.fileMap = new ConcurrentHashMap<>();
|
if (FILE_MAP.containsKey(config.getFileName())) {
|
||||||
this.configSets = new EnumMap<>(ModConfig.Type.class);
|
LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), FILE_MAP.get(config.getFileName()).getModId(), config.getModId());
|
||||||
this.configsByMod = new ConcurrentHashMap<>();
|
|
||||||
this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
|
|
||||||
this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
|
|
||||||
// this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
|
|
||||||
this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
|
|
||||||
}
|
|
||||||
|
|
||||||
void trackConfig(final ModConfig config) {
|
|
||||||
if (this.fileMap.containsKey(config.getFileName())) {
|
|
||||||
LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
|
|
||||||
throw new RuntimeException("Config conflict detected!");
|
throw new RuntimeException("Config conflict detected!");
|
||||||
}
|
}
|
||||||
this.fileMap.put(config.getFileName(), config);
|
FILE_MAP.put(config.getFileName(), config);
|
||||||
this.configSets.get(config.getType()).add(config);
|
CONFIG_SETS.get(config.getType()).add(config);
|
||||||
this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
|
CONFIGS_BY_MOD.computeIfAbsent(config.getModId(), _ -> new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
|
||||||
LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
|
LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
public static void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
||||||
this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
|
for (ModConfig config : CONFIG_SETS.get(type)) {
|
||||||
|
openConfig(config, configBasePath);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
// TODO: [FML] This is only called for the server (outside of forceUnload)
|
||||||
|
// rethink config implementation for eventual FML rewrite
|
||||||
|
public static void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
||||||
this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
|
for (ModConfig config : CONFIG_SETS.get(type)) {
|
||||||
|
closeConfig(config, configBasePath);
|
||||||
|
}
|
||||||
|
ConfigFileTypeHandler.get(type).stopWatcher();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void openConfig(final ModConfig config, final Path configBasePath) {
|
// If there is a better way to do this, please tell me. Because this is FUCKED
|
||||||
|
public static void forceUnload() {
|
||||||
|
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
|
||||||
|
if (FMLEnvironment.dist.isClient())
|
||||||
|
unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get());
|
||||||
|
|
||||||
|
unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
|
||||||
|
|
||||||
|
// just in case server watcher is still alive somehow...
|
||||||
|
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
||||||
final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
|
final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
|
||||||
config.setConfigData(configData);
|
config.setConfigData(configData);
|
||||||
@@ -63,7 +79,7 @@ public class ConfigTracker {
|
|||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void closeConfig(final ModConfig config, final Path configBasePath) {
|
private static void closeConfig(final ModConfig config, final Path configBasePath) {
|
||||||
if (config.getConfigData() != null) {
|
if (config.getConfigData() != null) {
|
||||||
LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
||||||
// stop the filewatcher before we save the file and close it, so reload doesn't fire
|
// stop the filewatcher before we save the file and close it, so reload doesn't fire
|
||||||
@@ -76,8 +92,8 @@ public class ConfigTracker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadDefaultServerConfigs() {
|
public static void loadDefaultServerConfigs() {
|
||||||
configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> {
|
CONFIG_SETS.get(ModConfig.Type.SERVER).forEach(modConfig -> {
|
||||||
final CommentedConfig commentedConfig = CommentedConfig.inMemory();
|
final CommentedConfig commentedConfig = CommentedConfig.inMemory();
|
||||||
modConfig.getSpec().correct(commentedConfig);
|
modConfig.getSpec().correct(commentedConfig);
|
||||||
modConfig.setConfigData(commentedConfig);
|
modConfig.setConfigData(commentedConfig);
|
||||||
@@ -85,16 +101,16 @@ public class ConfigTracker {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getConfigFileName(String modId, ModConfig.Type type) {
|
public static String getConfigFileName(String modId, ModConfig.Type type) {
|
||||||
return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
|
return Optional.ofNullable(CONFIGS_BY_MOD.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
|
||||||
map(ModConfig::getFullPath).map(Object::toString).orElse(null);
|
map(ModConfig::getFullPath).map(Object::toString).orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<ModConfig.Type, Set<ModConfig>> configSets() {
|
public static Map<ModConfig.Type, Set<ModConfig>> configSets() {
|
||||||
return configSets;
|
return CONFIG_SETS;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConcurrentHashMap<String, ModConfig> fileMap() {
|
public static ConcurrentHashMap<String, ModConfig> fileMap() {
|
||||||
return fileMap;
|
return FILE_MAP;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.event.InheritableEvent;
|
||||||
import net.minecraftforge.fml.Bindings;
|
import net.minecraftforge.fml.Bindings;
|
||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
@@ -13,6 +13,7 @@ import java.util.function.Function;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public interface IConfigEvent {
|
public interface IConfigEvent {
|
||||||
|
// TODO: [FML] Get rid of this indirection somehow
|
||||||
record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
|
record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
|
||||||
|
|
||||||
ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
|
ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
|
||||||
@@ -29,7 +30,7 @@ public interface IConfigEvent {
|
|||||||
ModConfig getConfig();
|
ModConfig getConfig();
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
default <T extends Event & IConfigEvent> T self() {
|
default <T extends InheritableEvent & IConfigEvent> T self() {
|
||||||
return (T) this;
|
return (T) this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,15 +24,14 @@ public class ModConfig
|
|||||||
private final ModContainer container;
|
private final ModContainer container;
|
||||||
private final ConfigFileTypeHandler configHandler;
|
private final ConfigFileTypeHandler configHandler;
|
||||||
private CommentedConfig configData;
|
private CommentedConfig configData;
|
||||||
private Callable<Void> saveHandler;
|
|
||||||
|
|
||||||
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
|
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.spec = spec;
|
this.spec = spec;
|
||||||
this.fileName = fileName;
|
this.fileName = fileName;
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.configHandler = ConfigFileTypeHandler.TOML;
|
this.configHandler = ConfigFileTypeHandler.get(type);
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
|
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
|
||||||
@@ -41,8 +40,9 @@ public class ModConfig
|
|||||||
|
|
||||||
private static String defaultConfigName(Type type, String modId) {
|
private static String defaultConfigName(Type type, String modId) {
|
||||||
// config file name would be "forge-client.toml" and "forge-server.toml"
|
// config file name would be "forge-client.toml" and "forge-server.toml"
|
||||||
return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension());
|
return modId + '-' + type.extension() + ".toml";
|
||||||
}
|
}
|
||||||
|
|
||||||
public Type getType() {
|
public Type getType() {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,33 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.event;
|
package net.minecraftforge.fml.event;
|
||||||
|
|
||||||
|
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
||||||
|
import net.minecraftforge.eventbus.api.bus.EventBus;
|
||||||
|
import net.minecraftforge.eventbus.api.event.InheritableEvent;
|
||||||
|
import org.jspecify.annotations.NonNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
|
* Marker interface for mod lifecycle events dispatched on the
|
||||||
|
* {@linkplain net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup() mod BusGroup} instead
|
||||||
|
* of the {@linkplain BusGroup#DEFAULT default BusGroup}.
|
||||||
|
*
|
||||||
|
* @apiNote Each mod gets its own unique mod BusGroup instance, obtained from the mod loading context. Most events
|
||||||
|
* should go on the default BusGroup.
|
||||||
*/
|
*/
|
||||||
public interface IModBusEvent {
|
public interface IModBusEvent extends InheritableEvent {
|
||||||
|
/**
|
||||||
|
* @param modEventBusGroup Obtained from {@link net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext#getModBusGroup()} or your language provider's equivalent.
|
||||||
|
* @param eventClass The event type you want to get the associated bus for.
|
||||||
|
*/
|
||||||
|
static <T extends IModBusEvent> @NonNull EventBus<@NonNull T> getBus(@NonNull BusGroup modEventBusGroup, @NonNull Class<T> eventClass) {
|
||||||
|
// Do not copy! Temporary solution until the FML rewrite is complete. May throw in future
|
||||||
|
// without prior notice.
|
||||||
|
//
|
||||||
|
// Mods creating their own events should directly assign the result of the create method to a
|
||||||
|
// static final field in their event class, without wrapping or calling multiple times.
|
||||||
|
//
|
||||||
|
// Mods using existing events should instead use the existing static final BUS field in the
|
||||||
|
// event class (for most events) or getBus(BusGroup) method (for mod bus events).
|
||||||
|
return EventBus.create(modEventBusGroup, eventClass);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -7,8 +7,11 @@ package net.minecraftforge.fml.util.thread;
|
|||||||
|
|
||||||
import net.minecraftforge.fml.LogicalSide;
|
import net.minecraftforge.fml.LogicalSide;
|
||||||
|
|
||||||
public class EffectiveSide
|
/**
|
||||||
{
|
* Attempts to determine the effect side of the current thread, based on know threads in networking.
|
||||||
|
* This is not guaranteed to be correct, and modders should use other methods to determine the logical side when possible.
|
||||||
|
*/
|
||||||
|
public class EffectiveSide {
|
||||||
public static LogicalSide get() {
|
public static LogicalSide get() {
|
||||||
final ThreadGroup group = Thread.currentThread().getThreadGroup();
|
final ThreadGroup group = Thread.currentThread().getThreadGroup();
|
||||||
return group instanceof SidedThreadGroup ? ((SidedThreadGroup) group).getSide() : LogicalSide.CLIENT;
|
return group instanceof SidedThreadGroup ? ((SidedThreadGroup) group).getSide() : LogicalSide.CLIENT;
|
||||||
|
|||||||
@@ -7,11 +7,13 @@ package net.minecraftforge.fml.util.thread;
|
|||||||
|
|
||||||
import net.minecraftforge.fml.LogicalSide;
|
import net.minecraftforge.fml.LogicalSide;
|
||||||
|
|
||||||
public final class SidedThreadGroups
|
public final class SidedThreadGroups {
|
||||||
{
|
|
||||||
public static final SidedThreadGroup CLIENT = new SidedThreadGroup(LogicalSide.CLIENT);
|
public static final SidedThreadGroup CLIENT = new SidedThreadGroup(LogicalSide.CLIENT);
|
||||||
public static final SidedThreadGroup SERVER = new SidedThreadGroup(LogicalSide.SERVER);
|
public static final SidedThreadGroup SERVER = new SidedThreadGroup(LogicalSide.SERVER);
|
||||||
|
|
||||||
private SidedThreadGroups() {
|
public static SidedThreadGroup get(boolean client) {
|
||||||
|
return client ? CLIENT : SERVER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private SidedThreadGroups() { }
|
||||||
}
|
}
|
||||||
@@ -1,67 +1,74 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
import org.gradle.internal.os.OperatingSystem
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'jvm-test-suite'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
|
||||||
|
|
||||||
import org.gradle.internal.os.OperatingSystem
|
|
||||||
switch (OperatingSystem.current()) {
|
switch (OperatingSystem.current()) {
|
||||||
case OperatingSystem.LINUX:
|
case OperatingSystem.LINUX:
|
||||||
project.ext.lwjglNatives = "natives-linux"
|
project.ext.lwjglNatives = "natives-linux"
|
||||||
break
|
break
|
||||||
case OperatingSystem.MAC_OS:
|
case OperatingSystem.MAC_OS:
|
||||||
project.ext.lwjglNatives = "natives-macos"
|
project.ext.lwjglNatives = "natives-macos"
|
||||||
break
|
break
|
||||||
case OperatingSystem.WINDOWS:
|
case OperatingSystem.WINDOWS:
|
||||||
project.ext.lwjglNatives = "natives-windows"
|
project.ext.lwjglNatives = "natives-windows"
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gradleutils.displayName = 'FML Early Display'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
|
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
}
|
||||||
|
|
||||||
|
changelog {
|
||||||
|
from changelogBase
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(libs.nulls)
|
compileOnly libs.jetbrains.annotations
|
||||||
implementation(project(':fmlloader'))
|
|
||||||
implementation(project(':fmlcore'))
|
implementation projects.fmlloader
|
||||||
implementation(libs.bundles.lwjgl)
|
implementation projects.fmlcore
|
||||||
implementation('org.slf4j:slf4j-api:1.8.0-beta4')
|
implementation libs.bundles.lwjgl
|
||||||
implementation(libs.jopt.simple)
|
implementation earlyDisplayLibs.slf4j.api
|
||||||
testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
|
implementation libs.jopt.simple
|
||||||
testImplementation('org.powermock:powermock-core:2.0.9')
|
|
||||||
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.8.2')
|
|
||||||
testRuntimeOnly('org.slf4j:slf4j-jdk14:1.8.0-beta4')
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
|
|
||||||
testRuntimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test', Test).configure {
|
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
|
||||||
useJUnitPlatform()
|
// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration.
|
||||||
|
var lwjglTestLibs = [
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.glfw) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives },
|
||||||
|
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives }
|
||||||
|
].with { list ->
|
||||||
|
provider { list.collect { it.get() } }
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
manifest {
|
useJUnitJupiter('5.8.2')
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
|
dependencies {
|
||||||
'Forge-Module-Layer': 'boot'
|
implementation earlyDisplayTestLibs.powermock.core
|
||||||
] as LinkedHashMap)
|
runtimeOnly earlyDisplayLibs.slf4j.jdk14
|
||||||
attributes([
|
runtimeOnly.bundle lwjglTestLibs
|
||||||
'Specification-Title': 'FML Early Display',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
|
||||||
'Specification-Version': '1',
|
|
||||||
'Implementation-Title': 'FML Early Display',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
|
||||||
'Implementation-Version': '1.0'
|
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,24 +76,42 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
|
||||||
|
'Forge-Module-Layer' : 'boot'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': '1.0'
|
||||||
|
], 'net/minecraftforge/fml/earlydisplay/')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlearlydisplay'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
publications.register('mavenJava', MavenPublication) {
|
||||||
|
changelog.publish(it)
|
||||||
|
gradleutils.promote(it)
|
||||||
|
|
||||||
|
from components.java
|
||||||
|
|
||||||
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+66
-45
@@ -22,9 +22,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.Desktop;
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
@@ -48,8 +46,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.IntConsumer;
|
import java.util.function.IntConsumer;
|
||||||
import java.util.function.IntSupplier;
|
|
||||||
import java.util.function.LongSupplier;
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Collector;
|
import java.util.stream.Collector;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -72,7 +68,7 @@ import static org.lwjgl.opengl.GL32C.*;
|
|||||||
* Based on the prior ClientVisualization, with some personal touches.
|
* Based on the prior ClientVisualization, with some personal touches.
|
||||||
*/
|
*/
|
||||||
public class DisplayWindow implements ImmediateWindowProvider {
|
public class DisplayWindow implements ImmediateWindowProvider {
|
||||||
private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}, {3,2}};
|
private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}};
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
|
private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
|
||||||
private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
|
private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
|
||||||
|
|
||||||
@@ -87,11 +83,17 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
private ScheduledFuture<?> initializationFuture;
|
private ScheduledFuture<?> initializationFuture;
|
||||||
|
|
||||||
private PerformanceInfo performanceInfo;
|
private PerformanceInfo performanceInfo;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private ScheduledFuture<?> performanceTick;
|
private ScheduledFuture<?> performanceTick;
|
||||||
// The GL ID of the window. Used for all operations
|
// The GL ID of the window. Used for all operations
|
||||||
private long window;
|
private long window;
|
||||||
// The thread that contains and ticks the window while Forge is loading mods
|
// The thread that contains and ticks the window while Forge is loading mods
|
||||||
private ScheduledExecutorService renderScheduler;
|
private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
||||||
|
final var thread = Executors.defaultThreadFactory().newThread(r);
|
||||||
|
thread.setName("EarlyDisplay");
|
||||||
|
thread.setDaemon(true);
|
||||||
|
return thread;
|
||||||
|
});
|
||||||
private int fbWidth;
|
private int fbWidth;
|
||||||
private int fbHeight;
|
private int fbHeight;
|
||||||
private int fbScale;
|
private int fbScale;
|
||||||
@@ -150,7 +152,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
||||||
|
|
||||||
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
|
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
|
||||||
performanceInfo = new PerformanceInfo();
|
performanceInfo = new PerformanceInfo();
|
||||||
return start(mcVersion, forgeVersion);
|
return start(mcVersion, forgeVersion);
|
||||||
}
|
}
|
||||||
@@ -239,7 +241,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
var date = Calendar.getInstance();
|
var date = Calendar.getInstance();
|
||||||
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
||||||
this.elements.add(0, RenderElement.squir());
|
this.elements.addFirst(RenderElement.squir());
|
||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
@@ -259,7 +261,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
||||||
this.elements.removeIf(element -> !element.render(context, framecount));
|
for (var itr = this.elements.iterator(); itr.hasNext(); ) {
|
||||||
|
var element = itr.next();
|
||||||
|
if (!element.render(context, framecount))
|
||||||
|
itr.remove();
|
||||||
|
}
|
||||||
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
||||||
framecount++;
|
framecount++;
|
||||||
}
|
}
|
||||||
@@ -284,12 +290,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
* Start the window and Render Thread; we're ready to go.
|
* Start the window and Render Thread; we're ready to go.
|
||||||
*/
|
*/
|
||||||
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
||||||
renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
|
||||||
final var thread = Executors.defaultThreadFactory().newThread(r);
|
|
||||||
thread.setName("EarlyDisplay");
|
|
||||||
thread.setDaemon(true);
|
|
||||||
return thread;
|
|
||||||
});
|
|
||||||
initWindow(mcVersion);
|
initWindow(mcVersion);
|
||||||
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
||||||
return this::periodicTick;
|
return this::periodicTick;
|
||||||
@@ -301,14 +301,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return this.glVersion;
|
return this.glVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void crashElegantly(String errorDetails) {
|
private static void crashElegantly(String errorDetails) {
|
||||||
String qrText;
|
|
||||||
try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
|
|
||||||
qrText = is.lines().collect(Collectors.joining("\n"));
|
|
||||||
} catch (IOException ioe) {
|
|
||||||
qrText = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder msgBuilder = new StringBuilder(2000);
|
StringBuilder msgBuilder = new StringBuilder(2000);
|
||||||
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
||||||
msgBuilder.append("\n\n");
|
msgBuilder.append("\n\n");
|
||||||
@@ -319,17 +312,18 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
|
LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
|
||||||
// we show the display on a new dedicated thread
|
// we show the display on a new dedicated thread
|
||||||
Executors.newSingleThreadExecutor().submit(()-> {
|
Executors.newSingleThreadExecutor().submit(()-> {
|
||||||
var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", false);
|
var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", 0);
|
||||||
if (res) {
|
if (res != 0) {
|
||||||
try {
|
try {
|
||||||
Desktop.getDesktop().browse(URI.create(ERROR_URL));
|
Desktop.getDesktop().browse(URI.create(ERROR_URL));
|
||||||
} catch (IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", false);
|
TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called to initialize the window when preparing for the Render Thread.
|
* Called to initialize the window when preparing for the Render Thread.
|
||||||
*
|
*
|
||||||
@@ -407,13 +401,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
if (showHelpLog && versidx == 0) {
|
if (showHelpLog && versidx == 0) {
|
||||||
LOGGER.info("""
|
LOGGER.info("""
|
||||||
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
||||||
|
|
||||||
Possible solutions:
|
Possible solutions:
|
||||||
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
||||||
B) Check for driver updates on the graphics brand's website
|
B) Check for driver updates on the graphics brand's website
|
||||||
C) Try reinstalling your graphics drivers
|
C) Try reinstalling your graphics drivers
|
||||||
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
||||||
|
|
||||||
You can safely ignore this message if the game starts up successfully.""");
|
You can safely ignore this message if the game starts up successfully.""");
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
||||||
@@ -465,7 +459,9 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.winWidth = x[0];
|
this.winWidth = x[0];
|
||||||
this.winHeight = y[0];
|
this.winHeight = y[0];
|
||||||
|
|
||||||
|
// Setting the window position isn't supported on wayland, so check the error here
|
||||||
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
|
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
|
||||||
|
handleLastGLFWError();
|
||||||
|
|
||||||
// Attempt setting the icon
|
// Attempt setting the icon
|
||||||
// int[] channels = new int[1];
|
// int[] channels = new int[1];
|
||||||
@@ -488,7 +484,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
// Show the window
|
// Show the window
|
||||||
glfwShowWindow(window);
|
glfwShowWindow(window);
|
||||||
|
// Getting the window position isn't supported on wayland, so check the error here
|
||||||
glfwGetWindowPos(window, x, y);
|
glfwGetWindowPos(window, x, y);
|
||||||
|
handleLastGLFWError();
|
||||||
|
|
||||||
this.winX = x[0];
|
this.winX = x[0];
|
||||||
this.winY = y[0];
|
this.winY = y[0];
|
||||||
glfwGetFramebufferSize(window, x, y);
|
glfwGetFramebufferSize(window, x, y);
|
||||||
@@ -497,8 +496,16 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void badWindowHandler(final int code, final long desc) {
|
private static void handleLastGLFWError() {
|
||||||
LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
|
handleLastGLFWError((error, description) -> {
|
||||||
|
if (error == GLFW_FEATURE_UNAVAILABLE) {
|
||||||
|
// suppress window pos errors for unsupported platforms (wayland)
|
||||||
|
LOGGER.debug(String.format("Suppressing GLFW error: [0x%X]%s", error, description));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new IllegalStateException(String.format("GLFW error: [0x%X]%s", error, description));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void winResize(long window, int width, int height) {
|
private void winResize(long window, int width, int height) {
|
||||||
@@ -520,7 +527,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.winY = y;
|
this.winY = y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
||||||
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
||||||
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
||||||
int error = glfwGetError(pointerbuffer);
|
int error = glfwGetError(pointerbuffer);
|
||||||
@@ -538,7 +545,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
*
|
*
|
||||||
* @return the Window we own.
|
* @return the Window we own.
|
||||||
*/
|
*/
|
||||||
public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
|
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
|
||||||
// wait for the window to actually be initialized
|
// wait for the window to actually be initialized
|
||||||
try {
|
try {
|
||||||
this.initializationFuture.get(30, TimeUnit.SECONDS);
|
this.initializationFuture.get(30, TimeUnit.SECONDS);
|
||||||
@@ -558,11 +565,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
var renderlockticket = false;
|
var renderlockticket = false;
|
||||||
do {
|
do {
|
||||||
try {
|
try {
|
||||||
renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
|
renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
|
||||||
if (++tries > 9) {
|
if (++tries > 9) {
|
||||||
Thread.dumpStack();
|
Thread.dumpStack();
|
||||||
crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
|
crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
|
||||||
}
|
}
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.interrupted();
|
Thread.interrupted();
|
||||||
}
|
}
|
||||||
@@ -572,7 +579,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
glfwMakeContextCurrent(window);
|
glfwMakeContextCurrent(window);
|
||||||
// Set the title to what the game wants
|
// Set the title to what the game wants
|
||||||
glfwSetWindowTitle(window, title.get());
|
glfwSetWindowTitle(window, title);
|
||||||
glfwSwapInterval(0);
|
glfwSwapInterval(0);
|
||||||
// Clean up our hooks
|
// Clean up our hooks
|
||||||
glfwSetFramebufferSizeCallback(window, null).free();
|
glfwSetFramebufferSizeCallback(window, null).free();
|
||||||
@@ -612,10 +619,25 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge").orElseThrow();
|
final var FORGE_MODULE = "net.minecraftforge.forge";
|
||||||
getClass().getModule().addReads(fm);
|
var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
|
||||||
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
|
if (forge_module == null)
|
||||||
loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
|
throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
|
||||||
|
|
||||||
|
getClass().getModule().addReads(forge_module);
|
||||||
|
|
||||||
|
|
||||||
|
var clz = Class.forName(forge_module, "net.minecraftforge.client.loading.ForgeLoadingOverlay");
|
||||||
|
|
||||||
|
for (var mtd : clz.getDeclaredMethods()) {
|
||||||
|
if (Modifier.isStatic(mtd.getModifiers()) && "newInstance".equals(mtd.getName())) {
|
||||||
|
this.loadingOverlay = mtd;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadingOverlay == null)
|
||||||
|
throw new IllegalStateException("Could not find static newInstace method in " + clz.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getFramebufferTextureId() {
|
public int getFramebufferTextureId() {
|
||||||
@@ -633,8 +655,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
this.elements.addFirst(RenderElement.mojang(textureId, framecount));
|
||||||
// this.elements.get(0).retire(framecount + 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
@@ -644,4 +665,4 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.context.elementShader().close();
|
this.context.elementShader().close();
|
||||||
SimpleBufferBuilder.destroy();
|
SimpleBufferBuilder.destroy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+4
-5
@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
|
|||||||
import java.lang.management.MemoryUsage;
|
import java.lang.management.MemoryUsage;
|
||||||
|
|
||||||
public class PerformanceInfo {
|
public class PerformanceInfo {
|
||||||
|
private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
|
||||||
|
|
||||||
private final boolean showCPUUsage;
|
private final boolean showCPUUsage;
|
||||||
private final OperatingSystemMXBean osBean;
|
private final OperatingSystemMXBean osBean;
|
||||||
private final MemoryMXBean memoryBean;
|
|
||||||
|
|
||||||
private float memory;
|
private float memory;
|
||||||
private String text;
|
private String text;
|
||||||
@@ -24,15 +24,14 @@ public class PerformanceInfo {
|
|||||||
PerformanceInfo() {
|
PerformanceInfo() {
|
||||||
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
||||||
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
||||||
memoryBean = ManagementFactory.getMemoryMXBean();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void update() {
|
void update() {
|
||||||
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
|
final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
|
||||||
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
||||||
|
|
||||||
if (!showCPUUsage) {
|
if (!showCPUUsage) {
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
|
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ public class PerformanceInfo {
|
|||||||
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
|
text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
|
||||||
}
|
}
|
||||||
|
|
||||||
String text() {
|
String text() {
|
||||||
|
|||||||
+30
-39
@@ -22,8 +22,8 @@ public class RenderElement {
|
|||||||
static int globalAlpha = 255;
|
static int globalAlpha = 255;
|
||||||
private int retireCount;
|
private int retireCount;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
interface Renderer {
|
interface Renderer {
|
||||||
|
|
||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
||||||
|
|
||||||
default Renderer then(Renderer r) {
|
default Renderer then(Renderer r) {
|
||||||
@@ -38,6 +38,9 @@ public class RenderElement {
|
|||||||
interface TextureRenderer {
|
interface TextureRenderer {
|
||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
interface Initializer extends Supplier<Renderer> {}
|
interface Initializer extends Supplier<Renderer> {}
|
||||||
|
|
||||||
@@ -56,11 +59,18 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public RenderElement(final Initializer rendererInitializer) {
|
public RenderElement(final Initializer rendererInitializer) {
|
||||||
this.bb = new SimpleBufferBuilder(1);
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
this.renderer = rendererInitializer.get();
|
this.renderer = rendererInitializer.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RenderElement(Renderer renderer) {
|
||||||
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
|
this.renderer = renderer;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean render(DisplayContext ctx, int count) {
|
public boolean render(DisplayContext ctx, int count) {
|
||||||
this.renderer.accept(bb, ctx, count);
|
this.renderer.accept(bb, ctx, count);
|
||||||
return this.retireCount == 0 || this.retireCount < count;
|
return this.retireCount == 0 || this.retireCount < count;
|
||||||
@@ -75,7 +85,7 @@ public class RenderElement {
|
|||||||
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
||||||
for (int i = messages.size() - 1; i >= 0; i--) {
|
for (int i = messages.size() - 1; i >= 0; i--) {
|
||||||
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
||||||
final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
||||||
if (fade <0.01f) continue;
|
if (fade <0.01f) continue;
|
||||||
Message msg = pair.message();
|
Message msg = pair.message();
|
||||||
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
||||||
@@ -84,19 +94,9 @@ public class RenderElement {
|
|||||||
|
|
||||||
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
||||||
}
|
}
|
||||||
public static RenderElement monag() {
|
|
||||||
return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
|
|
||||||
var size = 256;
|
|
||||||
var x0 = (ctx.width() - 2 * size) / 2;
|
|
||||||
var y0 = 64;
|
|
||||||
QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
|
|
||||||
QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
|
|
||||||
}));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RenderElement mojang(final int textureId, final int frameStart) {
|
public static RenderElement mojang(final int textureId, final int frameStart) {
|
||||||
return new RenderElement(()->(bb, ctx, frame) -> {
|
return new RenderElement((bb, ctx, frame) -> {
|
||||||
var size = 256 * ctx.scale();
|
var size = 256 * ctx.scale();
|
||||||
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
||||||
var y0 = 64 * ctx.scale() + 32;
|
var y0 = 64 * ctx.scale() + 32;
|
||||||
@@ -148,11 +148,11 @@ public class RenderElement {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
public static RenderElement progressBars(SimpleFont font) {
|
public static RenderElement progressBars(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RenderElement performanceBar(SimpleFont font) {
|
public static RenderElement performanceBar(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
||||||
@@ -187,10 +187,10 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
private static float[] indeterminateBar(int frame, boolean isActive) {
|
private static float[] indeterminateBar(int frame, boolean isActive) {
|
||||||
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
||||||
return new float[] {0f,1f};
|
return new float[] { 0f, 1f };
|
||||||
} else {
|
} else {
|
||||||
var progress = frame % 100;
|
int progress = frame % 100;
|
||||||
return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
|
return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,8 +249,8 @@ public class RenderElement {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
||||||
return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
return (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
||||||
@@ -264,14 +264,13 @@ public class RenderElement {
|
|||||||
private static TextGenerator text(int x, int y, String text, int colour) {
|
private static TextGenerator text(int x, int y, String text, int colour) {
|
||||||
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
||||||
}
|
}
|
||||||
private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
|
||||||
return ()->{
|
private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
||||||
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
return (bb, ctx, frame) -> {
|
return (bb, ctx, frame) -> {
|
||||||
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
||||||
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,21 +280,13 @@ public class RenderElement {
|
|||||||
bb.draw();
|
bb.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public static float clamp(float num, float min, float max) {
|
public static float clamp(float num, float min, float max) {
|
||||||
if (num < min) {
|
return Math.clamp(num, min, max);
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int clamp(int num, int min, int max) {
|
public static int clamp(int num, int min, int max) {
|
||||||
if (num < min) {
|
return Math.min(max, Math.max(num, min));
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int hsvToRGB(float hue, float saturation, float value) {
|
public static int hsvToRGB(float hue, float saturation, float value) {
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ import org.lwjgl.stb.STBTTFontinfo;
|
|||||||
import org.lwjgl.stb.STBTTPackContext;
|
import org.lwjgl.stb.STBTTPackContext;
|
||||||
import org.lwjgl.stb.STBTTPackRange;
|
import org.lwjgl.stb.STBTTPackRange;
|
||||||
import org.lwjgl.stb.STBTTPackedchar;
|
import org.lwjgl.stb.STBTTPackedchar;
|
||||||
import org.lwjgl.system.MemoryStack;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
@@ -24,8 +22,8 @@ public class SimpleFont {
|
|||||||
private final int textureNumber;
|
private final int textureNumber;
|
||||||
private final int lineSpacing;
|
private final int lineSpacing;
|
||||||
private final int descent;
|
private final int descent;
|
||||||
private final int GLYPH_COUNT = 127-32;
|
private static final int GLYPH_COUNT = 127 - 32;
|
||||||
private Glyph[] glyphs;
|
private final Glyph[] glyphs;
|
||||||
|
|
||||||
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
||||||
Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
|
Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
|
||||||
@@ -122,7 +120,7 @@ public class SimpleFont {
|
|||||||
case '\n', '\t' -> 0;
|
case '\n', '\t' -> 0;
|
||||||
case ' ' -> glyphs[0].charwidth();
|
case ' ' -> glyphs[0].charwidth();
|
||||||
default -> {
|
default -> {
|
||||||
if (c - 32 < this.GLYPH_COUNT && c > 32) {
|
if (c - 32 < GLYPH_COUNT && c > 32) {
|
||||||
yield this.glyphs[c - 32].charwidth();
|
yield this.glyphs[c - 32].charwidth();
|
||||||
} else {
|
} else {
|
||||||
yield 0;
|
yield 0;
|
||||||
@@ -153,7 +151,7 @@ public class SimpleFont {
|
|||||||
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
||||||
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
||||||
default -> {
|
default -> {
|
||||||
if (c-32 < font.GLYPH_COUNT && c > 32) {
|
if (c-32 < GLYPH_COUNT && c > 32) {
|
||||||
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
||||||
}
|
}
|
||||||
yield pos;
|
yield pos;
|
||||||
|
|||||||
+161
-77
@@ -1,67 +1,75 @@
|
|||||||
import net.minecraftforge.gradleutils.PomUtils
|
import groovy.transform.CompileDynamic
|
||||||
|
import groovy.transform.CompileStatic
|
||||||
|
import groovy.transform.PackageScope
|
||||||
|
import net.minecraftforge.forgedev.legacy.tasks.JarJarMetadataOptions
|
||||||
|
import org.gradle.api.plugins.jvm.JvmTestSuite
|
||||||
|
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
|
id 'jvm-test-suite'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
alias libs.plugins.licenser
|
||||||
id 'net.minecraftforge.gradleutils'
|
alias libs.plugins.gradleutils
|
||||||
|
alias libs.plugins.gitversion
|
||||||
|
alias libs.plugins.changelog
|
||||||
|
alias libs.plugins.apt
|
||||||
|
id 'net.minecraftforge.forge.build.convention'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
gradleutils.displayName = 'FMLLoader'
|
||||||
|
final vendor = 'Forge Development LLC'
|
||||||
configurations.forEach{ it.transitive = false }
|
description = 'Modifications to Minecraft to enable mod developers.'
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(libs.nulls)
|
|
||||||
|
|
||||||
api(libs.bundles.asm) // Needed by all the black magic
|
|
||||||
api(libs.forgespi)
|
|
||||||
api(libs.mergetool.api)
|
|
||||||
api(libs.log4j.api)
|
|
||||||
api(libs.slf4j.api)
|
|
||||||
api(libs.guava)
|
|
||||||
api(libs.gson)
|
|
||||||
api(libs.maven.artifact)
|
|
||||||
api(libs.apache.commons)
|
|
||||||
api(libs.bundles.night.config)
|
|
||||||
api(libs.modlauncher)
|
|
||||||
api(libs.coremods)
|
|
||||||
api(libs.mojang.logging)
|
|
||||||
api(libs.jarjar.selector)
|
|
||||||
api(libs.jarjar.meta)
|
|
||||||
|
|
||||||
implementation(libs.jopt.simple)
|
|
||||||
implementation(libs.securemodules)
|
|
||||||
implementation(libs.accesstransformers)
|
|
||||||
implementation(libs.terminalconsoleappender)
|
|
||||||
implementation(libs.jimfs)
|
|
||||||
|
|
||||||
implementation(libs.log4j.core)
|
|
||||||
annotationProcessor(libs.log4j.core)
|
|
||||||
|
|
||||||
testCompileOnly(libs.nulls)
|
|
||||||
testRuntimeOnly(libs.bootstrap)
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
|
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar).configure {
|
license {
|
||||||
manifest {
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
attributes([
|
}
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
|
|
||||||
'Forge-Module-Layer': 'boot'
|
changelog {
|
||||||
] as LinkedHashMap)
|
from changelogBase
|
||||||
attributes([
|
}
|
||||||
'Specification-Title': 'FMLLoader',
|
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
dependencies {
|
||||||
'Specification-Version': '1',
|
compileOnly libs.jetbrains.annotations
|
||||||
'Implementation-Title': 'FMLLoader',
|
|
||||||
'Implementation-Vendor': 'Forge Development LLC',
|
// TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller
|
||||||
'Implementation-Version': FORGE_VERSION
|
api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
||||||
] as LinkedHashMap, 'net/minecraftforge/fml/loading/')
|
api(libs.forgespi ){ transitive = false }
|
||||||
|
api(libs.mergetool.api ){ transitive = false }
|
||||||
|
api(libs.log4j.api ){ transitive = false }
|
||||||
|
api(libs.slf4j.api ){ transitive = false }
|
||||||
|
api(libs.guava ){ transitive = false }
|
||||||
|
api(libs.gson ){ transitive = false }
|
||||||
|
api(libs.maven.artifact ){ transitive = false }
|
||||||
|
api(libs.apache.commons ){ transitive = false }
|
||||||
|
api(libs.bundles.night.config){ transitive = false }
|
||||||
|
api(libs.modlauncher ){ transitive = false }
|
||||||
|
api(libs.mojang.logging ){ transitive = false }
|
||||||
|
api(libs.jarjar.selector ){ transitive = false }
|
||||||
|
api(libs.jarjar.meta ){ transitive = false }
|
||||||
|
|
||||||
|
implementation(libs.jopt.simple ){ transitive = false }
|
||||||
|
implementation(libs.securemodules ){ transitive = false }
|
||||||
|
implementation(libs.accesstransformers ){ transitive = false }
|
||||||
|
implementation(libs.terminalconsoleappender){ transitive = false }
|
||||||
|
implementation(libs.jimfs ){ transitive = false }
|
||||||
|
implementation(libs.roimfs ){ transitive = false }
|
||||||
|
|
||||||
|
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
|
||||||
|
implementation(libs.log4j.core ){ transitive = false }
|
||||||
|
annotationProcessor(libs.bundles.log4j){ transitive = false }
|
||||||
|
}
|
||||||
|
|
||||||
|
testing.suites.named('test', JvmTestSuite) {
|
||||||
|
dependencies {
|
||||||
|
compileOnly libs.jetbrains.annotations
|
||||||
|
runtimeOnly libs.bootstrap
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,38 +77,114 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
tasks.named('jar', Jar) {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
manifest {
|
||||||
|
attributes([
|
||||||
|
'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
|
||||||
|
'Forge-Module-Layer' : 'boot'
|
||||||
|
])
|
||||||
|
attributes([
|
||||||
|
'Specification-Title' : gradleutils.displayName.get(),
|
||||||
|
'Specification-Vendor' : vendor,
|
||||||
|
'Specification-Version' : '1',
|
||||||
|
'Implementation-Title' : gradleutils.displayName.get(),
|
||||||
|
'Implementation-Vendor' : vendor,
|
||||||
|
'Implementation-Version': forgeVersion
|
||||||
|
], 'net/minecraftforge/fml/loading/')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
|
||||||
from components.java
|
|
||||||
artifactId = 'fmlloader'
|
|
||||||
pom {
|
|
||||||
name = project.name
|
|
||||||
description = 'Modifactions to Minecraft to enable mod developers.'
|
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
|
||||||
license PomUtils.Licenses.LGPLv2_1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('writeForgeVersionJson') {
|
publications.register('mavenJava', MavenPublication) {
|
||||||
doLast {
|
changelog.publish(it)
|
||||||
file('src/main/resources/forge_version.json').json = [
|
gradleutils.promote(it)
|
||||||
forge: FORGE_VERSION,
|
|
||||||
mc: MC_VERSION,
|
from components.java
|
||||||
mcp: MCP_VERSION
|
|
||||||
]
|
pom {
|
||||||
|
description = project.description
|
||||||
|
|
||||||
|
gradleutils.pom.addRemoteDetails(pom)
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license gradleutils.pom.licenses.LGPLv2_1
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('generateResources').configure {
|
// A simple task to write JSON to a file. Using Task#doLast to output files is no longer supported.
|
||||||
dependsOn('writeForgeVersionJson')
|
// This code may seem verbose, but it's better this way. If more projects need this, we can move it to buildSrc.
|
||||||
|
@CompileStatic
|
||||||
|
@PackageScope abstract class WriteForgeVersionJson extends DefaultTask {
|
||||||
|
abstract @Input Property<String> getForgeVersion()
|
||||||
|
abstract @Input Property<String> getMinecraftVersion()
|
||||||
|
abstract @Input Property<String> getMcpVersion()
|
||||||
|
|
||||||
|
abstract @OutputFile RegularFileProperty getOutputFile()
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
WriteForgeVersionJson() {}
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
@CompileDynamic
|
||||||
|
void exec() {
|
||||||
|
var json = new groovy.json.JsonBuilder()
|
||||||
|
json {
|
||||||
|
forge this.forgeVersion.get()
|
||||||
|
mc this.minecraftVersion.get()
|
||||||
|
mcp this.mcpVersion.get()
|
||||||
|
}
|
||||||
|
this.outputFile.asFile.get().text = json.toPrettyString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('writeForgeVersionJson', WriteForgeVersionJson) {
|
||||||
|
forgeVersion = project.forgeVersion
|
||||||
|
minecraftVersion = project.minecraftVersion
|
||||||
|
mcpVersion = project.mcpVersion
|
||||||
|
|
||||||
|
outputFile = file('src/main/resources/forge_version.json')
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
|
||||||
|
metadataFile = project.file('src/main/resources/jarjar_options.json')
|
||||||
|
// This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually...
|
||||||
|
//add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class')
|
||||||
|
add(libs.mixinextras.forge) {
|
||||||
|
containedJarMetadata {
|
||||||
|
path = ''
|
||||||
|
}
|
||||||
|
resource = 'com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class'
|
||||||
|
layer = 'GAMELIBRARY'
|
||||||
|
id = 'mixinextras'
|
||||||
|
nested = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('generateResources') {
|
||||||
|
dependsOn(
|
||||||
|
tasks.named('eclipseJdt'),
|
||||||
|
tasks.named('eclipseJdtApt'),
|
||||||
|
tasks.named('eclipseFactorypath'),
|
||||||
|
tasks.named('writeForgeVersionJson', WriteForgeVersionJson),
|
||||||
|
tasks.named('jarJarOptionsJson')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
eclipse.classpath {
|
||||||
|
// We need to set the default output directory for the log4j annotation processor
|
||||||
|
// Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
|
||||||
|
// So we have to do a hacky whenMerged
|
||||||
|
//defaultOutputDir = file('bin/main')
|
||||||
|
file.whenMerged {
|
||||||
|
entries.each { entry ->
|
||||||
|
if (entry.kind == 'output' && entry.hasProperty('path'))
|
||||||
|
entry.path = 'bin/main'
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+28
-37
@@ -34,11 +34,10 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
|||||||
* }</code>
|
* }</code>
|
||||||
* </pre>
|
* </pre>
|
||||||
*/
|
*/
|
||||||
public class CapabilityTokenSubclass implements ILaunchPluginService {
|
public final class CapabilityTokenSubclass implements ILaunchPluginService {
|
||||||
|
private static final String FUNC_NAME = "getType";
|
||||||
private final String FUNC_NAME = "getType";
|
private static final String FUNC_DESC = "()Ljava/lang/String;";
|
||||||
private final String FUNC_DESC = "()Ljava/lang/String;";
|
private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; // Don't directly reference this to prevent class loading.
|
||||||
private final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; //Don't directly reference this to prevent class loading.
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
@@ -49,49 +48,48 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
if (internalName.startsWith("net/minecraftforge/common/capabilities/"))
|
||||||
|
return YAY;
|
||||||
|
|
||||||
|
return internalName.contains("$") ? YAY : NAY; // Anonymous subclasses only
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
||||||
{
|
if (CAP_INJECT.equals(classNode.name)) {
|
||||||
if (CAP_INJECT.equals(classNode.name))
|
for (MethodNode mtd : classNode.methods) {
|
||||||
{
|
if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc)) {
|
||||||
for (MethodNode mtd : classNode.methods)
|
|
||||||
{
|
|
||||||
if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
|
|
||||||
{
|
|
||||||
mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
|
mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ComputeFlags.SIMPLE_REWRITE;
|
return ComputeFlags.SIMPLE_REWRITE;
|
||||||
}
|
} else if (CAP_INJECT.equals(classNode.superName)) {
|
||||||
else if (CAP_INJECT.equals(classNode.superName))
|
var cls = new Object() { String value = null; };
|
||||||
{
|
|
||||||
Holder cls = new Holder();
|
|
||||||
|
|
||||||
SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
|
SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
|
||||||
reader.accept(new SignatureVisitor(Opcodes.ASM9)
|
reader.accept(new SignatureVisitor(Opcodes.ASM9) {
|
||||||
{
|
final Deque<String> stack = new ArrayDeque<>();
|
||||||
Deque<String> stack = new ArrayDeque<>();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitClassType(final String name)
|
public void visitClassType(final String name) {
|
||||||
{
|
|
||||||
stack.push(name);
|
stack.push(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitInnerClassType(final String name)
|
public void visitInnerClassType(final String name) {
|
||||||
{
|
|
||||||
stack.push(stack.pop() + '$' + name);
|
stack.push(stack.pop() + '$' + name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitEnd()
|
public void visitEnd() {
|
||||||
{
|
|
||||||
var val = stack.pop();
|
var val = stack.pop();
|
||||||
if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
|
if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
|
||||||
cls.value = val;
|
cls.value = val;
|
||||||
@@ -106,15 +104,8 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
mtd.visitInsn(Opcodes.ARETURN);
|
mtd.visitInsn(Opcodes.ARETURN);
|
||||||
mtd.visitEnd();
|
mtd.visitEnd();
|
||||||
return ComputeFlags.COMPUTE_MAXS;
|
return ComputeFlags.COMPUTE_MAXS;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Holder {
|
|
||||||
String value;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
-111
@@ -1,111 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.fml.common.asm;
|
|
||||||
|
|
||||||
import java.util.EnumSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import org.objectweb.asm.Opcodes;
|
|
||||||
import org.objectweb.asm.Type;
|
|
||||||
import org.objectweb.asm.tree.AnnotationNode;
|
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
|
||||||
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the final modifier from fields with the @ObjectHolder annotation, prevents the JITer from in lining them so our runtime replacements can work.
|
|
||||||
* Will also de-finalize all fields in on class level annotations.
|
|
||||||
*/
|
|
||||||
public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|
||||||
// Hardcoded map of vanilla classes that should have object holders for each field of the given registry type.
|
|
||||||
// IMPORTANT: Updates to this collection must be reflected in ObjectHolderRegistry. Duplicated cuz classloaders, yay!
|
|
||||||
// Classnames are validated in ObjectHolderRegistry.
|
|
||||||
private static final Map<String, VanillaObjectHolderData> VANILLA_OBJECT_HOLDERS = Stream.of(
|
|
||||||
new VanillaObjectHolderData("net.minecraft.world.level.block.Blocks", "block", "net.minecraft.world.level.block.Block"),
|
|
||||||
new VanillaObjectHolderData("net.minecraft.world.item.Items", "item", "net.minecraft.world.item.Item"),
|
|
||||||
new VanillaObjectHolderData("net.minecraft.world.item.enchantment.Enchantments", "enchantment", "net.minecraft.world.item.enchantment.Enchantment"),
|
|
||||||
new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
|
|
||||||
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
|
||||||
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
|
||||||
).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
|
||||||
private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String name() {
|
|
||||||
return "object_holder_definalize";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
|
||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
|
||||||
{
|
|
||||||
return isEmpty ? NAY : YAY;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasHolder(List<AnnotationNode> lst)
|
|
||||||
{
|
|
||||||
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private String getValue(List<AnnotationNode> lst)
|
|
||||||
{
|
|
||||||
AnnotationNode ann = lst.stream().filter(n -> n.desc.equals(OBJECT_HOLDER)).findFirst().get();
|
|
||||||
if (ann.values != null)
|
|
||||||
{
|
|
||||||
for (int x = 0; x < ann.values.size() - 1; x += 2) {
|
|
||||||
if (ann.values.get(x).equals("value")) {
|
|
||||||
return (String)ann.values.get(x + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
|
||||||
{
|
|
||||||
final AtomicBoolean changes = new AtomicBoolean();
|
|
||||||
//Must be public static finals, and non-array objects
|
|
||||||
final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
|
||||||
|
|
||||||
//Fix Annotated Fields before injecting from class level
|
|
||||||
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
|
|
||||||
{
|
|
||||||
int prev = f.access;
|
|
||||||
f.access &= ~Opcodes.ACC_FINAL; //Strip final
|
|
||||||
f.access |= Opcodes.ACC_SYNTHETIC; //Add Synthetic so we can check in runtime. ? Good idea?
|
|
||||||
changes.compareAndSet(false, prev != f.access);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
|
|
||||||
{
|
|
||||||
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f ->
|
|
||||||
{
|
|
||||||
int prev = f.access;
|
|
||||||
f.access &= ~Opcodes.ACC_FINAL;
|
|
||||||
f.access |= Opcodes.ACC_SYNTHETIC;
|
|
||||||
/*if (!hasHolder(f.visibleAnnotations)) //Add field level annotation, doesn't do anything until after we figure out how ASMDataTable is gatherered
|
|
||||||
{
|
|
||||||
if (value == null)
|
|
||||||
f.visitAnnotation(OBJECT_HOLDER, true);
|
|
||||||
else
|
|
||||||
f.visitAnnotation(OBJECT_HOLDER, true).visit("value", value + ":" + f.name.toLowerCase());
|
|
||||||
}*/
|
|
||||||
changes.compareAndSet(false, prev != f.access);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
|
||||||
|
|
||||||
private record VanillaObjectHolderData(String holderClass, String registryName, String registryType) {}
|
|
||||||
}
|
|
||||||
+35
-25
@@ -7,9 +7,9 @@ package net.minecraftforge.fml.common.asm;
|
|||||||
|
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraftforge.fml.loading.LoadingModList;
|
||||||
import org.objectweb.asm.Label;
|
import org.objectweb.asm.Label;
|
||||||
import org.objectweb.asm.Opcodes;
|
import org.objectweb.asm.Opcodes;
|
||||||
import org.objectweb.asm.Type;
|
import org.objectweb.asm.Type;
|
||||||
@@ -28,15 +28,16 @@ import org.slf4j.Logger;
|
|||||||
public class RuntimeEnumExtender implements ILaunchPluginService {
|
public class RuntimeEnumExtender implements ILaunchPluginService {
|
||||||
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final Type STRING = Type.getType(String.class);
|
private static final Type STRING = Type.getType(String.class);
|
||||||
private final Type ENUM = Type.getType(Enum.class);
|
private static final Type ENUM = Type.getType(Enum.class);
|
||||||
private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
|
private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
|
||||||
private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
|
private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
|
||||||
private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
|
private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
|
||||||
private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
|
private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
|
||||||
private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
|
private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
|
||||||
private final String NAME_DESC = Type.getMethodDescriptor(STRING);
|
private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
|
||||||
private final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
|
private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
|
||||||
|
private static final int FLAGS = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
@@ -46,10 +47,21 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
|
private static final class LazyInit {
|
||||||
|
private LazyInit() {}
|
||||||
|
private static final boolean ANY_MODS = LoadingModList.getMods().size() > 2; // 2: forge, minecraft
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty || !LazyInit.ANY_MODS)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraft/client/model") || internalName.startsWith("net/minecraft/world"))
|
||||||
|
return YAY;
|
||||||
|
|
||||||
|
return NAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -58,25 +70,24 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
Type array = Type.getType("[" + classType.getDescriptor());
|
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
|
||||||
final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
|
|
||||||
|
|
||||||
FieldNode values = classNode.fields.stream().filter(f -> f.desc.contentEquals(array.getDescriptor()) && ((f.access & flags) == flags)).findFirst().orElse(null);
|
|
||||||
|
|
||||||
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
}
|
|
||||||
|
Type array = Type.getType("[" + classType.getDescriptor());
|
||||||
|
String arrayDesc = array.getDescriptor();
|
||||||
|
|
||||||
|
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
||||||
|
|
||||||
//Static methods named "create" with first argument as a string
|
//Static methods named "create" with first argument as a string
|
||||||
List<MethodNode> candidates = classNode.methods.stream()
|
List<MethodNode> candidates = classNode.methods.stream()
|
||||||
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
|
|
||||||
if (candidates.isEmpty()) {
|
if (candidates.isEmpty()) {
|
||||||
throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
|
throw new IllegalStateException("IExtensibleEnum has no candidate factory methods: " + classType.getClassName());
|
||||||
}
|
}
|
||||||
|
|
||||||
candidates.forEach(mtd ->
|
for (var mtd : candidates)
|
||||||
{
|
{
|
||||||
Type[] args = Type.getArgumentTypes(mtd.desc);
|
Type[] args = Type.getArgumentTypes(mtd.desc);
|
||||||
if (args.length == 0 || !args[0].equals(STRING)) {
|
if (args.length == 0 || !args[0].equals(STRING)) {
|
||||||
@@ -108,8 +119,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
Type[] ctrArgs = new Type[args.length + 1];
|
Type[] ctrArgs = new Type[args.length + 1];
|
||||||
ctrArgs[0] = STRING;
|
ctrArgs[0] = STRING;
|
||||||
ctrArgs[1] = Type.INT_TYPE;
|
ctrArgs[1] = Type.INT_TYPE;
|
||||||
for (int x = 1; x < args.length; x++)
|
System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);
|
||||||
ctrArgs[1 + x] = args[x];
|
|
||||||
|
|
||||||
String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
|
String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
|
||||||
|
|
||||||
@@ -231,7 +241,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
ins.load(vars, classType);
|
ins.load(vars, classType);
|
||||||
ins.areturn(classType);
|
ins.areturn(classType);
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
return ComputeFlags.COMPUTE_FRAMES;
|
return ComputeFlags.COMPUTE_FRAMES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,14 +6,13 @@
|
|||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
public class BackgroundWaiter {
|
public class BackgroundWaiter {
|
||||||
private static final ExecutorService runner = Executors.newSingleThreadExecutor();
|
|
||||||
|
|
||||||
public static void runAndTick(Runnable r, Runnable tick) {
|
public static void runAndTick(Runnable r, Runnable tick) {
|
||||||
|
var runner = Executors.newSingleThreadExecutor();
|
||||||
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
||||||
final Future<?> work = runner.submit(r);
|
final Future<?> work = runner.submit(r);
|
||||||
do {
|
do {
|
||||||
|
|||||||
@@ -16,12 +16,9 @@ import net.minecraftforge.accesstransformer.service.AccessTransformerService;
|
|||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
|
import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
|
||||||
import net.minecraftforge.forgespi.Environment;
|
import net.minecraftforge.forgespi.Environment;
|
||||||
import net.minecraftforge.forgespi.coremod.ICoreModProvider;
|
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -33,15 +30,11 @@ import java.util.function.BiFunction;
|
|||||||
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
|
import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
|
||||||
|
|
||||||
public class FMLLoader {
|
public final class FMLLoader {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static AccessTransformerService accessTransformer;
|
private static AccessTransformerService accessTransformer;
|
||||||
private static ModDiscoverer modDiscoverer;
|
|
||||||
private static ICoreModProvider coreModProvider;
|
|
||||||
private static LanguageLoadingProvider languageLoadingProvider;
|
|
||||||
private static Dist dist;
|
private static Dist dist;
|
||||||
private static String naming;
|
private static String naming;
|
||||||
private static LoadingModList loadingModList;
|
|
||||||
private static RuntimeDistCleaner runtimeDistCleaner;
|
private static RuntimeDistCleaner runtimeDistCleaner;
|
||||||
private static Path gamePath;
|
private static Path gamePath;
|
||||||
private static final VersionInfo versionInfo = VersionInfo.detect();
|
private static final VersionInfo versionInfo = VersionInfo.detect();
|
||||||
@@ -59,10 +52,7 @@ public class FMLLoader {
|
|||||||
|
|
||||||
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
||||||
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
||||||
/*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus");
|
|
||||||
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
||||||
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
|
|
||||||
LOGGER.debug(CORE,"FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
|
|
||||||
checkPackage(Environment.class, "2.0", "ForgeSPI");
|
checkPackage(Environment.class, "2.0", "ForgeSPI");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -74,14 +64,15 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
|
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
|
||||||
@SuppressWarnings("unchecked")
|
var plugin = env.findLaunchPlugin(id).orElse(null);
|
||||||
var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> {
|
if (plugin == null) {
|
||||||
LOGGER.error(CORE, "{} library is missing, we need this to run", name);
|
LOGGER.error(CORE, "{} library is missing, we need this to run", name);
|
||||||
return new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
|
throw new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
|
||||||
});
|
}
|
||||||
checkPackage(plugin.getClass(), version, name);
|
checkPackage(plugin.getClass(), version, name);
|
||||||
return plugin;
|
return (T) plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
|
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
|
||||||
@@ -99,6 +90,7 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private static <T> T getSingleService(Class<T> clazz, String name) throws IncompatibleEnvironmentException {
|
private static <T> T getSingleService(Class<T> clazz, String name) throws IncompatibleEnvironmentException {
|
||||||
var providers = new ArrayList<T>();
|
var providers = new ArrayList<T>();
|
||||||
for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) {
|
for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) {
|
||||||
@@ -137,51 +129,37 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
||||||
launchHandlerName = launchHandler.get().name();
|
launchHandlerName = launchHandler.get().name();
|
||||||
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());
|
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Path.of(".").toAbsolutePath());
|
||||||
|
|
||||||
naming = commonLaunchHandler.getNaming();
|
naming = commonLaunchHandler.getNaming();
|
||||||
dist = commonLaunchHandler.getDist();
|
dist = commonLaunchHandler.getDist();
|
||||||
production = commonLaunchHandler.isProduction();
|
production = commonLaunchHandler.isProduction();
|
||||||
|
|
||||||
accessTransformer.getExtension().accept(Pair.of(naming, "srg"));
|
accessTransformer.getExtension().accept(Map.entry(naming, "srg"));
|
||||||
|
|
||||||
runtimeDistCleaner.getExtension().accept(dist);
|
runtimeDistCleaner.getExtension().accept(dist);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
|
public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
|
||||||
LOGGER.debug(SCAN,"Scanning for Mod Locators");
|
LOGGER.debug(SCAN, "Scanning for Mod Locators");
|
||||||
modDiscoverer = new ModDiscoverer(arguments);
|
modValidator = ModDiscoverer.discoverMods(arguments);
|
||||||
modValidator = modDiscoverer.discoverMods();
|
|
||||||
var pluginResources = modValidator.getPluginResources();
|
var pluginResources = modValidator.getPluginResources();
|
||||||
return List.of(pluginResources);
|
return List.of(pluginResources);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
|
public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
|
||||||
moduleLayerManager = layerManager;
|
moduleLayerManager = layerManager;
|
||||||
languageLoadingProvider = new LanguageLoadingProvider();
|
LanguageLoadingProvider.reload();
|
||||||
backgroundScanHandler = modValidator.stage2Validation();
|
backgroundScanHandler = modValidator.stage2Validation();
|
||||||
loadingModList = backgroundScanHandler.getLoadingModList();
|
|
||||||
return List.of(modValidator.getModResources());
|
return List.of(modValidator.getModResources());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ICoreModProvider getCoreModProvider() {
|
|
||||||
return coreModProvider;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LanguageLoadingProvider getLanguageLoadingProvider() {
|
|
||||||
return languageLoadingProvider;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ModDiscoverer getModDiscoverer() {
|
|
||||||
return modDiscoverer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CommonLaunchHandler getLaunchHandler() {
|
public static CommonLaunchHandler getLaunchHandler() {
|
||||||
return commonLaunchHandler;
|
return commonLaunchHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addAccessTransformer(Path atPath, ModFile modName) {
|
public static void addAccessTransformer(Path atPath, ModFile modName) {
|
||||||
LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
|
LOGGER.debug(SCAN, "Adding Access Transformer {} in {}", atPath, modName.getFilePath());
|
||||||
accessTransformer.offerResource(atPath, modName.getFileName());
|
accessTransformer.offerResource(atPath, modName.getFileName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,10 +173,6 @@ public class FMLLoader {
|
|||||||
progressWindowTick.run();
|
progressWindowTick.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList getLoadingModList() {
|
|
||||||
return loadingModList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Path getGamePath() {
|
public static Path getGamePath() {
|
||||||
return gamePath;
|
return gamePath;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.api.*;
|
import cpw.mods.modlauncher.api.*;
|
||||||
import joptsimple.OptionSpecBuilder;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.Environment;
|
import net.minecraftforge.forgespi.Environment;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -19,12 +18,11 @@ import java.util.List;
|
|||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
|
|
||||||
public class FMLServiceProvider implements ITransformationService {
|
public class FMLServiceProvider implements ITransformationService {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private Map<String, Object> arguments;
|
private final Map<String, Object> arguments = new HashMap<>();
|
||||||
|
|
||||||
public FMLServiceProvider() {
|
public FMLServiceProvider() {
|
||||||
var markers = System.getProperty("forge.logging.markers", "").split(",");
|
var markers = System.getProperty("forge.logging.markers", "").split(",");
|
||||||
@@ -45,7 +43,6 @@ public class FMLServiceProvider implements ITransformationService {
|
|||||||
FMLConfig.load();
|
FMLConfig.load();
|
||||||
LOGGER.debug(CORE, "Preparing ModFile");
|
LOGGER.debug(CORE, "Preparing ModFile");
|
||||||
environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
|
environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
|
||||||
arguments = new HashMap<>();
|
|
||||||
LOGGER.debug(CORE, "Preparing launch handler");
|
LOGGER.debug(CORE, "Preparing launch handler");
|
||||||
FMLLoader.setupLaunchHandler(environment, arguments);
|
FMLLoader.setupLaunchHandler(environment, arguments);
|
||||||
FMLEnvironment.setupInteropEnvironment(environment);
|
FMLEnvironment.setupInteropEnvironment(environment);
|
||||||
@@ -68,18 +65,9 @@ public class FMLServiceProvider implements ITransformationService {
|
|||||||
FMLLoader.onInitialLoad(environment, otherServices);
|
FMLLoader.onInitialLoad(environment, otherServices);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void argumentValues(OptionResult option) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
@SuppressWarnings("rawtypes")
|
||||||
@Override
|
@Override
|
||||||
public @NotNull List<ITransformer> transformers() {
|
public @NotNull List<ITransformer> transformers() {
|
||||||
LOGGER.debug(CORE, "Loading coremod transformers");
|
return List.of();
|
||||||
return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -51,8 +51,8 @@ public class ImmediateWindowHandler {
|
|||||||
earlyProgress.label("Bootstrapping Minecraft");
|
earlyProgress.label("Bootstrapping Minecraft");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
|
public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
||||||
return provider.setupMinecraftWindow(width, height, title, monitor);
|
return provider.setupMinecraftWindow(width, height, title, monitor, backend);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
|
public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
|
||||||
@@ -104,9 +104,9 @@ public class ImmediateWindowHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) {
|
public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
|
||||||
try {
|
try {
|
||||||
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor);
|
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
|
||||||
return longsupplier.getAsLong();
|
return longsupplier.getAsLong();
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
throw new IllegalStateException("How did you get here?", e);
|
throw new IllegalStateException("How did you get here?", e);
|
||||||
@@ -140,7 +140,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge");
|
var fm = layer.findModule("net.minecraftforge.forge");
|
||||||
if (fm.isPresent()) {
|
if (fm.isPresent()) {
|
||||||
getClass().getModule().addReads(fm.get());
|
getClass().getModule().addReads(fm.get());
|
||||||
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ package net.minecraftforge.fml.loading;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.IntConsumer;
|
import java.util.function.IntConsumer;
|
||||||
import java.util.function.IntSupplier;
|
|
||||||
import java.util.function.LongSupplier;
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,7 +64,7 @@ public interface ImmediateWindowProvider {
|
|||||||
* @param monitor This is the monitor it should appear on.
|
* @param monitor This is the monitor it should appear on.
|
||||||
* @return The window id
|
* @return The window id
|
||||||
*/
|
*/
|
||||||
long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor);
|
long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
|
* This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
|
||||||
|
|||||||
+11
-19
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.ServiceConfigurationError;
|
import java.util.ServiceConfigurationError;
|
||||||
import java.util.ServiceLoader;
|
import java.util.ServiceLoader;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
@@ -28,43 +27,36 @@ import java.util.stream.Stream;
|
|||||||
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class LanguageLoadingProvider {
|
public final class LanguageLoadingProvider {
|
||||||
public void forEach(Consumer<IModLanguageProvider> consumer) {
|
public static void forEach(Consumer<IModLanguageProvider> consumer) {
|
||||||
providers.forEach(consumer);
|
providers.forEach(consumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
|
public static <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
|
||||||
return providers.stream().map(function);
|
return providers.stream().map(function);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reload() {
|
public static void reload() {
|
||||||
loadLanguageProviders();
|
loadLanguageProviders();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** This doesn't actually do anything with the argument, so just call reload(). Not sure when cpw broke that. */
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public void addAdditionalLanguages(List<ModFile> modFiles) {
|
|
||||||
reload();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*==========================================================================*
|
/*==========================================================================*
|
||||||
* INTERNAL SHIT *
|
* INTERNAL *
|
||||||
*==========================================================================*/
|
*==========================================================================*/
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final ServiceLoader<IModLanguageProvider> serviceLoader;
|
private static final ServiceLoader<IModLanguageProvider> serviceLoader;
|
||||||
private final List<IModLanguageProvider> providers = new ArrayList<>();
|
private static final ArrayList<IModLanguageProvider> providers = new ArrayList<>();
|
||||||
private final Map<String, Wrapper> providersByName = new HashMap<>();
|
private static final HashMap<String, Wrapper> providersByName = new HashMap<>();
|
||||||
private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
|
private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
|
||||||
|
|
||||||
private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
|
private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
|
||||||
|
|
||||||
LanguageLoadingProvider() {
|
static {
|
||||||
var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
|
var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
|
||||||
serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
|
serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
|
||||||
loadLanguageProviders();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadLanguageProviders() {
|
private static void loadLanguageProviders() {
|
||||||
providers.clear();
|
providers.clear();
|
||||||
providersByName.clear();
|
providersByName.clear();
|
||||||
|
|
||||||
@@ -97,7 +89,7 @@ public class LanguageLoadingProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
|
public static IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
|
||||||
var consumer = mod.getFileName();
|
var consumer = mod.getFileName();
|
||||||
var wrapper = providersByName.get(language);
|
var wrapper = providersByName.get(language);
|
||||||
|
|
||||||
|
|||||||
@@ -5,167 +5,46 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.NoSuchElementException;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/**
|
/// Master list of all mods in the loading context
|
||||||
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
public sealed interface LoadingModList permits LoadingModListImpl {
|
||||||
* loading package</em>
|
static ModFileInfo getModFileById(String modId) {
|
||||||
*/
|
return get().fileById().get(modId);
|
||||||
public class LoadingModList
|
|
||||||
{
|
|
||||||
private static LoadingModList INSTANCE;
|
|
||||||
private final List<ModFileInfo> modFiles;
|
|
||||||
private final List<ModInfo> sortedList;
|
|
||||||
private final Map<String, ModFileInfo> fileById;
|
|
||||||
private final List<EarlyLoadingException> preLoadErrors;
|
|
||||||
private List<IModFile> brokenFiles;
|
|
||||||
|
|
||||||
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
|
||||||
{
|
|
||||||
this.modFiles = modFiles.stream()
|
|
||||||
.map(ModFile::getModFileInfo)
|
|
||||||
.map(ModFileInfo.class::cast)
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
this.sortedList = sortedList.stream()
|
|
||||||
.map(ModInfo.class::cast)
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
this.fileById = this.modFiles.stream()
|
|
||||||
.map(ModFileInfo::getMods)
|
|
||||||
.flatMap(Collection::stream)
|
|
||||||
.map(ModInfo.class::cast)
|
|
||||||
.collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
|
||||||
this.preLoadErrors = new ArrayList<>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
|
static List<ModFileInfo> getModFiles() {
|
||||||
{
|
return get().getModFiles();
|
||||||
INSTANCE = new LoadingModList(modFiles, sortedList);
|
|
||||||
if (earlyLoadingException != null)
|
|
||||||
{
|
|
||||||
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
|
||||||
}
|
|
||||||
return INSTANCE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList get() {
|
static List<ModInfo> getMods() {
|
||||||
return INSTANCE;
|
return get().getMods();
|
||||||
}
|
|
||||||
public void addCoreMods()
|
|
||||||
{
|
|
||||||
modFiles.stream()
|
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.map(ModFile::getCoreMods)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addAccessTransformers()
|
static @Nullable Path findResource(String className) {
|
||||||
{
|
for (ModFileInfo modFileInfo : get().getModFiles()) {
|
||||||
modFiles.stream()
|
Path resource = modFileInfo.getFile().findResource(className);
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.forEach(mod -> mod.getAccessTransformer().ifPresent(path -> FMLLoader.addAccessTransformer(path, mod)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addForScanning(BackgroundScanHandler backgroundScanHandler)
|
|
||||||
{
|
|
||||||
backgroundScanHandler.setLoadingModList(this);
|
|
||||||
modFiles.stream()
|
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.forEach(backgroundScanHandler::submitForScanning);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ModFileInfo> getModFiles()
|
|
||||||
{
|
|
||||||
return modFiles;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Path findResource(final String className)
|
|
||||||
{
|
|
||||||
for (ModFileInfo mf : modFiles) {
|
|
||||||
final Path resource = mf.getFile().findResource(className);
|
|
||||||
if (Files.exists(resource)) return resource;
|
if (Files.exists(resource)) return resource;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Enumeration<URL> findAllURLsForResource(final String resName) {
|
static List<EarlyLoadingException> getErrors() {
|
||||||
final String resourceName;
|
return get().getErrors();
|
||||||
// strip a leading slash
|
|
||||||
if (resName.startsWith("/")) {
|
|
||||||
resourceName = resName.substring(1);
|
|
||||||
} else {
|
|
||||||
resourceName = resName;
|
|
||||||
}
|
|
||||||
return new Enumeration<URL>() {
|
|
||||||
private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
|
|
||||||
private URL next;
|
|
||||||
@Override
|
|
||||||
public boolean hasMoreElements() {
|
|
||||||
if (next!=null) return true;
|
|
||||||
next = findNextURL();
|
|
||||||
return next != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public URL nextElement() {
|
|
||||||
if (next == null) {
|
|
||||||
next = findNextURL();
|
|
||||||
if (next == null) throw new NoSuchElementException();
|
|
||||||
}
|
|
||||||
URL result = next;
|
|
||||||
next = null;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private URL findNextURL() {
|
|
||||||
while (modFileIterator.hasNext()) {
|
|
||||||
final ModFileInfo next = modFileIterator.next();
|
|
||||||
final Path resource = next.getFile().findResource(resourceName);
|
|
||||||
if (Files.exists(resource)) {
|
|
||||||
return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModFileInfo getModFileById(String modid)
|
static List<IModFile> getBrokenFiles() {
|
||||||
{
|
return get().getBrokenFiles();
|
||||||
return this.fileById.get(modid);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModInfo> getMods()
|
private static LoadingModListImpl get() {
|
||||||
{
|
return LoadingModListImpl.get();
|
||||||
return this.sortedList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<EarlyLoadingException> getErrors() {
|
|
||||||
return preLoadErrors;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setBrokenFiles(final List<IModFile> brokenFiles) {
|
|
||||||
this.brokenFiles = brokenFiles;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<IModFile> getBrokenFiles() {
|
|
||||||
return this.brokenFiles;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import com.mojang.logging.LogUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
||||||
|
* loading package</em>
|
||||||
|
*/
|
||||||
|
record LoadingModListImpl(
|
||||||
|
List<ModFileInfo> getModFiles,
|
||||||
|
List<ModInfo> getMods,
|
||||||
|
Map<String, ModFileInfo> fileById,
|
||||||
|
ArrayList<EarlyLoadingException> getErrors,
|
||||||
|
ArrayList<IModFile> getBrokenFiles
|
||||||
|
) implements LoadingModList {
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static ModSorter.State temp;
|
||||||
|
|
||||||
|
LoadingModListImpl(List<ModFile> modFiles, List<ModInfo> sortedList) {
|
||||||
|
var modFileInfos = modFiles.stream()
|
||||||
|
.map(ModFile::getModFileInfo)
|
||||||
|
.map(ModFileInfo.class::cast)
|
||||||
|
.toList();
|
||||||
|
sortedList = sortedList.stream().toList();
|
||||||
|
var fileById = modFileInfos.stream()
|
||||||
|
.map(ModFileInfo::getMods)
|
||||||
|
.flatMap(Collection::stream)
|
||||||
|
.map(ModInfo.class::cast)
|
||||||
|
.collect(Collectors.toUnmodifiableMap(ModInfo::getModId, ModInfo::getOwningFile));
|
||||||
|
this(modFileInfos, sortedList, fileById, new ArrayList<>(), new ArrayList<>());
|
||||||
|
}
|
||||||
|
|
||||||
|
static LoadingModListImpl init(ModSorter.State modSorterState, EarlyLoadingException earlyLoadingException) {
|
||||||
|
temp = modSorterState;
|
||||||
|
var instance = get();
|
||||||
|
if (earlyLoadingException != null)
|
||||||
|
instance.getErrors.add(earlyLoadingException);
|
||||||
|
temp = null;
|
||||||
|
instance.addAccessTransformers();
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
static LoadingModListImpl get() {
|
||||||
|
final class LazyInit {
|
||||||
|
private LazyInit() {}
|
||||||
|
private static final LoadingModListImpl INSTANCE
|
||||||
|
= new LoadingModListImpl(LoadingModListImpl.temp.files(), LoadingModListImpl.temp.mods());
|
||||||
|
}
|
||||||
|
return LazyInit.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addAccessTransformers() {
|
||||||
|
var errors = new ArrayList<ExceptionData>();
|
||||||
|
|
||||||
|
for (ModFileInfo modFile : getModFiles) {
|
||||||
|
ModFile mod = modFile.getFile();
|
||||||
|
for (var at : mod.getAccessTransformers()) {
|
||||||
|
if (!Files.exists(at)) {
|
||||||
|
var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
|
||||||
|
errors.add(new ExceptionData(message));
|
||||||
|
LOGGER.error(message);
|
||||||
|
} else
|
||||||
|
FMLLoader.addAccessTransformer(at, mod);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!errors.isEmpty())
|
||||||
|
getErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,7 +36,7 @@ public class MCPNamingService implements INameMappingService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map.Entry<String, String> understanding() {
|
public Map.Entry<String, String> understanding() {
|
||||||
return Pair.of("srg", "mcp");
|
return Map.entry("srg", "mcp");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
|
private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
|
||||||
URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath.
|
URL path = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
|
||||||
if (path == null)
|
if (path == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public class MavenCoordinateResolver {
|
|||||||
(!extension.isEmpty() ? "." + extension : ".jar");
|
(!extension.isEmpty() ? "." + extension : ".jar");
|
||||||
|
|
||||||
String[] groups = groupId.split("\\.");
|
String[] groups = groupId.split("\\.");
|
||||||
Path result = Paths.get(groups[0]);
|
Path result = Path.of(groups[0]);
|
||||||
for (int i = 1; i < groups.length; i++) {
|
for (int i = 1; i < groups.length; i++) {
|
||||||
result = result.resolve(groups[i]);
|
result = result.resolve(groups[i]);
|
||||||
}
|
}
|
||||||
|
|||||||
+27
@@ -7,9 +7,13 @@ package net.minecraftforge.fml.loading;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
|
import cpw.mods.modlauncher.Launcher;
|
||||||
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||||
import cpw.mods.modlauncher.api.NamedPath;
|
import cpw.mods.modlauncher.api.NamedPath;
|
||||||
|
import cpw.mods.modlauncher.api.TypesafeMap;
|
||||||
import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
|
import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -20,6 +24,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
@ApiStatus.Internal
|
||||||
public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
|
public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final Set<String> SERVICES = Set.of(
|
private static final Set<String> SERVICES = Set.of(
|
||||||
@@ -37,6 +42,17 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void earlyInitialization(final String launchTarget, final String[] arguments) {
|
public void earlyInitialization(final String launchTarget, final String[] arguments) {
|
||||||
|
boolean isMixinEnabledInDev = false;
|
||||||
|
for (String arg : arguments) {
|
||||||
|
if (arg.startsWith("-mixin") || arg.startsWith("--mixin")) {
|
||||||
|
isMixinEnabledInDev = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Launcher.INSTANCE.blackboard().putIfAbsent(
|
||||||
|
TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class),
|
||||||
|
isMixinEnabledInDev
|
||||||
|
);
|
||||||
ImmediateWindowHandler.load(launchTarget, arguments);
|
ImmediateWindowHandler.load(launchTarget, arguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,4 +92,15 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService
|
|||||||
.filter(SERVICES::contains)
|
.filter(SERVICES::contains)
|
||||||
.forEach(s -> found.add(new NamedPath(s, path)));
|
.forEach(s -> found.add(new NamedPath(s, path)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean isServiceProvider(Path path) {
|
||||||
|
var jar = SecureJar.from(path);
|
||||||
|
|
||||||
|
for (var providers : jar.moduleDataProvider().descriptor().provides()) {
|
||||||
|
if (SERVICES.contains(providers.service()))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.google.common.graph.GraphBuilder;
|
import com.google.common.graph.GraphBuilder;
|
||||||
import com.google.common.graph.MutableGraph;
|
import com.google.common.graph.MutableGraph;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
@@ -20,229 +20,250 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collection;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static java.util.stream.Collectors.*;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class ModSorter
|
public final class ModSorter {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final UniqueModListBuilder uniqueModListBuilder;
|
|
||||||
private List<ModFile> modFiles;
|
|
||||||
private List<ModInfo> sortedList;
|
|
||||||
private Map<String, IModInfo> modIdNameLookup;
|
|
||||||
private List<ModFile> systemMods;
|
|
||||||
|
|
||||||
private ModSorter(final List<ModFile> modFiles)
|
record State(List<ModFile> files, List<ModInfo> mods) {}
|
||||||
{
|
|
||||||
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
private ModSorter() {}
|
||||||
}
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
|
||||||
|
State systemMods = detectSystemMods(mods);
|
||||||
|
List<ModFile> modFiles;
|
||||||
|
|
||||||
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
|
||||||
{
|
|
||||||
final ModSorter ms = new ModSorter(mods);
|
|
||||||
try {
|
try {
|
||||||
ms.buildUniqueList();
|
modFiles = UniqueModListBuilder.buildUniqueList(mods).modFiles();
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
// We cannot build any list with duped mods. We have to abort immediately and report it
|
// We cannot build any list with duped mods. We have to abort immediately and report it
|
||||||
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
||||||
// So all this is really doing is wasting time.
|
// So all this is really doing is wasting time.
|
||||||
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
|
return LoadingModListImpl.init(systemMods, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var named = new HashMap<String, ModInfo>();
|
||||||
|
for (var file : modFiles) {
|
||||||
|
for (var info : file.getModInfos())
|
||||||
|
named.put(info.getModId(), (ModInfo)info);
|
||||||
|
}
|
||||||
|
|
||||||
// try and validate dependencies
|
// try and validate dependencies
|
||||||
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
|
||||||
|
|
||||||
// if we miss one or the other, we abort now
|
// if we miss one or the other, we abort now
|
||||||
if (!failedList.isEmpty()) {
|
if (!failedList.isEmpty()) {
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
return LoadingModListImpl.init(systemMods, new EarlyLoadingException("failure to validate mod list", null, failedList));
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, lets try and sort the modlist and proceed
|
// Otherwise, lets try and sort the modlist and proceed
|
||||||
EarlyLoadingException earlyLoadingException = null;
|
|
||||||
try {
|
try {
|
||||||
ms.sort();
|
var sorted = sort(modFiles, named);
|
||||||
|
return LoadingModListImpl.init(sorted, null);
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
earlyLoadingException = e;
|
// The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
|
||||||
|
return LoadingModListImpl.init(systemMods, e);
|
||||||
}
|
}
|
||||||
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sort()
|
private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
|
||||||
{
|
final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
|
||||||
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
|
||||||
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
|
||||||
AtomicInteger counter = new AtomicInteger();
|
|
||||||
Map<ModFileInfo, Integer> infos = modFiles.stream()
|
|
||||||
.map(ModFile::getModFileInfo)
|
|
||||||
.filter(ModFileInfo.class::isInstance)
|
|
||||||
.map(ModFileInfo.class::cast)
|
|
||||||
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
|
||||||
infos.keySet().forEach(graph::addNode);
|
|
||||||
modFiles.stream()
|
|
||||||
.map(ModFile::getModInfos)
|
|
||||||
.<IModInfo>mapMulti(Iterable::forEach)
|
|
||||||
.map(IModInfo::getDependencies)
|
|
||||||
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
|
|
||||||
.forEach(dep -> addDependency(graph, dep));
|
|
||||||
|
|
||||||
final List<ModFileInfo> sorted;
|
int counter = 0;
|
||||||
try
|
var infos = new HashMap<ModInfo, Integer>();
|
||||||
{
|
for (var file : modFiles) {
|
||||||
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
if (file.getModFileInfo() instanceof ModFileInfo info) {
|
||||||
}
|
for (var imod : info.getMods()) {
|
||||||
catch (CyclePresentException e)
|
var mod = (ModInfo)imod;
|
||||||
{
|
infos.put(mod, counter++);
|
||||||
Set<Set<ModFileInfo>> cycles = e.getCycles();
|
graph.addNode(mod);
|
||||||
if (LOGGER.isErrorEnabled(LOADING))
|
}
|
||||||
{
|
|
||||||
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
|
|
||||||
}
|
}
|
||||||
var dataList = cycles.stream()
|
}
|
||||||
.<ModFileInfo>mapMulti(Iterable::forEach)
|
|
||||||
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
|
for (var file : modFiles) {
|
||||||
.map(IModInfo::getModId)
|
for (var info : file.getModInfos()) {
|
||||||
.map(list -> new ExceptionData("fml.modloading.cycle", list))
|
for (var dep : info.getDependencies()) {
|
||||||
.toList();
|
// Ordering isn't effected by sides, should it be?
|
||||||
|
//if (!dep.getSide().isCorrectSide())
|
||||||
|
// continue;
|
||||||
|
|
||||||
|
var target = named.get(dep.getModId());
|
||||||
|
|
||||||
|
// soft dep that doesn't exist. No edge required.
|
||||||
|
if (target == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var self = (ModInfo)dep.getOwner();
|
||||||
|
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case BEFORE -> graph.putEdge(self, target);
|
||||||
|
case AFTER -> graph.putEdge(target, self);
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ModInfo> sorted;
|
||||||
|
try {
|
||||||
|
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
||||||
|
} catch (CyclePresentException e) {
|
||||||
|
Set<Set<ModInfo>> cycles = e.getCycles();
|
||||||
|
var buf = new StringBuilder();
|
||||||
|
buf.append("Mod Sorting failed - Detected Cycles: \n");
|
||||||
|
|
||||||
|
var dataList = new ArrayList<ExceptionData>();
|
||||||
|
for (var cycle : cycles) {
|
||||||
|
buf.append("\tCycle:\n");
|
||||||
|
for (var mod : cycle) {
|
||||||
|
var modDeps = new StringBuilder()
|
||||||
|
.append(mod.getModId())
|
||||||
|
.append(' ')
|
||||||
|
.append(mod.getDependencies().stream()
|
||||||
|
.filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
|
||||||
|
.map(dep -> dep.getOrdering().name() + " " + dep.getModId())
|
||||||
|
.collect(Collectors.joining(", "))
|
||||||
|
);
|
||||||
|
dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
|
||||||
|
buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.error(LOADING, buf.toString());
|
||||||
|
|
||||||
throw new EarlyLoadingException("Sorting error", e, dataList);
|
throw new EarlyLoadingException("Sorting error", e, dataList);
|
||||||
}
|
}
|
||||||
this.sortedList = sorted.stream()
|
|
||||||
.map(ModFileInfo::getMods)
|
|
||||||
.<IModInfo>mapMulti(Iterable::forEach)
|
|
||||||
.map(ModInfo.class::cast)
|
|
||||||
.collect(toList());
|
|
||||||
this.modFiles = sorted.stream()
|
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.collect(toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
var files = new LinkedHashSet<ModFile>();
|
||||||
{
|
var list = new ArrayList<ModInfo>();
|
||||||
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
|
||||||
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
for (var mod : sorted) {
|
||||||
// soft dep that doesn't exist. Just return. No edge required.
|
files.add(mod.getOwningFile().getFile());
|
||||||
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
|
list.add(mod);
|
||||||
if (self == target)
|
|
||||||
return; // in case a jar has two mods that have dependencies between
|
|
||||||
switch (dep.getOrdering()) {
|
|
||||||
case BEFORE -> topoGraph.putEdge(self, target);
|
|
||||||
case AFTER -> topoGraph.putEdge(target, self);
|
|
||||||
default -> {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files.stream().toList(), list);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buildUniqueList()
|
private static State detectSystemMods(final List<ModFile> modFiles) {
|
||||||
{
|
|
||||||
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
|
|
||||||
|
|
||||||
this.modFiles = uniqueModListData.modFiles();
|
|
||||||
|
|
||||||
detectSystemMods(uniqueModListData.modFilesByFirstId());
|
|
||||||
|
|
||||||
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
|
|
||||||
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
|
|
||||||
.collect(Collectors.toMap(
|
|
||||||
Map.Entry::getKey,
|
|
||||||
e -> e.getValue().get(0).getModInfos().get(0)
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
|
|
||||||
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
||||||
var systemMods = List.of("minecraft", "forge");
|
var systemMods = List.of("minecraft", "forge");
|
||||||
LOGGER.debug("Configured system mods: {}", systemMods);
|
LOGGER.debug("Configured system mods: {}", systemMods);
|
||||||
|
|
||||||
this.systemMods = new ArrayList<>();
|
var mods = new ArrayList<ModInfo>();
|
||||||
|
var files = new ArrayList<ModFile>();
|
||||||
for (var systemMod : systemMods) {
|
for (var systemMod : systemMods) {
|
||||||
var container = modFilesByFirstId.get(systemMod);
|
var mod = findMod(modFiles, systemMod);
|
||||||
if (container != null && !container.isEmpty()) {
|
if (mod == null)
|
||||||
LOGGER.debug("Found system mod: {}", systemMod);
|
|
||||||
this.systemMods.add((ModFile) container.get(0));
|
|
||||||
} else {
|
|
||||||
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
||||||
}
|
|
||||||
|
LOGGER.debug("Found system mod: {}", systemMod);
|
||||||
|
mods.add(mod.info());
|
||||||
|
files.add(mod.file());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files, mods);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
private record ModPair(ModFile file, ModInfo info) {}
|
||||||
{
|
private static ModPair findMod(final List<ModFile> modFiles, String name) {
|
||||||
final var modVersions = modFiles.stream()
|
for (var file : modFiles) {
|
||||||
.map(ModFile::getModInfos)
|
for (var mod : file.getModFileInfo().getMods()) {
|
||||||
.<IModInfo>mapMulti(Iterable::forEach)
|
if (name.equals(mod.getModId()))
|
||||||
.collect(toMap(IModInfo::getModId, IModInfo::getVersion));
|
return new ModPair(file, (ModInfo)mod);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
final var modVersionDependencies = modFiles.stream()
|
private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
|
||||||
.map(ModFile::getModInfos)
|
final var modVersions = new HashMap<String, ArtifactVersion>();
|
||||||
.<IModInfo>mapMulti(Iterable::forEach)
|
final var modRequirements = new HashSet<ModVersion>();
|
||||||
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
|
int mandatoryRequired = 0;
|
||||||
|
|
||||||
final var modRequirements = modVersionDependencies.values().stream()
|
for (var file : files) {
|
||||||
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
|
for (var info : file.getModInfos()) {
|
||||||
.filter(mv -> mv.getSide().isCorrectSide())
|
modVersions.put(info.getModId(), info.getVersion());
|
||||||
.collect(toSet());
|
for (var dep : info.getDependencies()) {
|
||||||
|
if (dep.getSide().isCorrectSide()) {
|
||||||
|
if (modRequirements.add(dep) && dep.isMandatory())
|
||||||
|
mandatoryRequired++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
||||||
final var missingVersions = modRequirements.stream()
|
|
||||||
.filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && this.modVersionNotContained(mv, modVersions))
|
|
||||||
.collect(toSet());
|
|
||||||
final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
|
|
||||||
|
|
||||||
if (!missingVersions.isEmpty()) {
|
final var missingMandatory = new HashSet<ModVersion>();
|
||||||
if (mandatoryMissing > 0) {
|
final var missingOptional = new HashSet<ModVersion>();
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Missing or unsupported mandatory dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(IModInfo.ModVersion::isMandatory)
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (missingVersions.size() - mandatoryMissing > 0) {
|
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Unsupported installed optional dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(ver -> !ver.isMandatory())
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return missingVersions.stream()
|
for (var dep : modRequirements) {
|
||||||
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
|
var modId = dep.getModId();
|
||||||
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
|
var existing = modVersions.get(modId);
|
||||||
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
|
|
||||||
.toList();
|
if (!dep.isMandatory() && existing == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var range = dep.getVersionRange();
|
||||||
|
if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
|
||||||
|
(dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
|
||||||
}
|
}
|
||||||
return Collections.emptyList();
|
|
||||||
|
|
||||||
|
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
|
||||||
|
|
||||||
|
var ret = new ArrayList<ExceptionData>();
|
||||||
|
|
||||||
|
if (!missingMandatory.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!missingOptional.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
|
||||||
{
|
var ret = new ArrayList<String>();
|
||||||
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
for (var dep : missing) {
|
||||||
return String.format(
|
var installed = modVersions.get(dep.getModId());
|
||||||
|
ret.add(String.format(
|
||||||
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
||||||
dependency.getModId(),
|
dep.getModId(),
|
||||||
dependency.getOwner().getModId(),
|
dep.getOwner().getModId(),
|
||||||
dependency.getVersionRange(),
|
dep.getVersionRange(),
|
||||||
installed != null ? installed.toString() : "[MISSING]"
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
);
|
));
|
||||||
|
}
|
||||||
|
return String.join("\n", ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
|
private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
|
||||||
{
|
private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
|
||||||
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
|
return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
|
||||||
(range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,14 +8,8 @@ package net.minecraftforge.fml.loading;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import com.google.common.collect.Streams;
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
@@ -28,153 +22,205 @@ import org.objectweb.asm.Type;
|
|||||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||||
import org.objectweb.asm.tree.AnnotationNode;
|
import org.objectweb.asm.tree.AnnotationNode;
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
import org.objectweb.asm.tree.FieldNode;
|
|
||||||
import org.objectweb.asm.tree.MethodNode;
|
import org.objectweb.asm.tree.MethodNode;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
|
|
||||||
public class RuntimeDistCleaner implements ILaunchPluginService
|
public final class RuntimeDistCleaner implements ILaunchPluginService {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
|
private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
|
||||||
private static String DIST;
|
private static String DIST;
|
||||||
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
|
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
|
||||||
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
|
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name()
|
public String name() {
|
||||||
{
|
|
||||||
return "runtimedistcleaner";
|
return "runtimedistcleaner";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
|
||||||
{
|
|
||||||
AtomicBoolean changes = new AtomicBoolean();
|
|
||||||
if (remove(classNode.visibleAnnotations, DIST))
|
|
||||||
{
|
|
||||||
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
|
|
||||||
throw new RuntimeException("Attempted to load class "+ classNode.name + " for invalid dist "+ DIST);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (classNode.interfaces != null )
|
|
||||||
{
|
|
||||||
unpack(classNode.visibleAnnotations).stream()
|
|
||||||
.filter(ann->Objects.equals(ann.desc, ONLYIN))
|
|
||||||
.filter(ann->ann.values.indexOf("_interface") != -1)
|
|
||||||
.filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST))
|
|
||||||
.map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName())
|
|
||||||
.forEach(intf -> {
|
|
||||||
if (classNode.interfaces.remove(intf)) {
|
|
||||||
LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, intf);
|
|
||||||
changes.compareAndSet(false, true);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
|
|
||||||
if (classNode.visibleAnnotations != null) {
|
|
||||||
Iterator<AnnotationNode> itr = classNode.visibleAnnotations.iterator();
|
|
||||||
while (itr.hasNext()) {
|
|
||||||
AnnotationNode ann = itr.next();
|
|
||||||
if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS)) {
|
|
||||||
LOGGER.debug(DISTXFORM,"Removing Class Annotation: {} @{}", classNode.name, ann.desc);
|
|
||||||
itr.remove();
|
|
||||||
changes.compareAndSet(false, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Iterator<FieldNode> fields = classNode.fields.iterator();
|
|
||||||
while(fields.hasNext())
|
|
||||||
{
|
|
||||||
FieldNode field = fields.next();
|
|
||||||
if (remove(field.visibleAnnotations, DIST))
|
|
||||||
{
|
|
||||||
LOGGER.debug(DISTXFORM,"Removing field: {}.{}", classNode.name, field.name);
|
|
||||||
fields.remove();
|
|
||||||
changes.compareAndSet(false, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LambdaGatherer lambdaGatherer = new LambdaGatherer();
|
|
||||||
Iterator<MethodNode> methods = classNode.methods.iterator();
|
|
||||||
while(methods.hasNext())
|
|
||||||
{
|
|
||||||
MethodNode method = methods.next();
|
|
||||||
if (remove(method.visibleAnnotations, DIST))
|
|
||||||
{
|
|
||||||
LOGGER.debug(DISTXFORM,"Removing method: {}.{}{}", classNode.name, method.name, method.desc);
|
|
||||||
methods.remove();
|
|
||||||
lambdaGatherer.accept(method);
|
|
||||||
changes.compareAndSet(false, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove dynamic synthetic lambda methods that are inside of removed methods
|
|
||||||
for (List<Handle> dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles();
|
|
||||||
!dynamicLambdaHandles.isEmpty(); dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles())
|
|
||||||
{
|
|
||||||
lambdaGatherer = new LambdaGatherer();
|
|
||||||
methods = classNode.methods.iterator();
|
|
||||||
while (methods.hasNext())
|
|
||||||
{
|
|
||||||
MethodNode method = methods.next();
|
|
||||||
if ((method.access & Opcodes.ACC_SYNTHETIC) == 0) continue;
|
|
||||||
for (Handle dynamicLambdaHandle : dynamicLambdaHandles)
|
|
||||||
{
|
|
||||||
if (method.name.equals(dynamicLambdaHandle.getName()) && method.desc.equals(dynamicLambdaHandle.getDesc()))
|
|
||||||
{
|
|
||||||
LOGGER.debug(DISTXFORM,"Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
|
|
||||||
methods.remove();
|
|
||||||
lambdaGatherer.accept(method);
|
|
||||||
changes.compareAndSet(false, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) {
|
|
||||||
if (anns == null) return Collections.emptyList();
|
|
||||||
List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList());
|
|
||||||
anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
|
|
||||||
.map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1))
|
|
||||||
.filter(v -> v != null)
|
|
||||||
.forEach(v -> v.forEach(ret::add));
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean remove(final List<AnnotationNode> anns, final String side)
|
|
||||||
{
|
|
||||||
return unpack(anns).stream().
|
|
||||||
filter(ann->Objects.equals(ann.desc, ONLYIN)).
|
|
||||||
filter(ann->ann.values.indexOf("_interface") == -1).
|
|
||||||
anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
|
||||||
public Consumer<Dist> getExtension()
|
|
||||||
{
|
|
||||||
return (s)-> {
|
|
||||||
DIST = s.name();
|
|
||||||
LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
|
||||||
|
// Only apply to MC classes when on a dedicated server in a production environment
|
||||||
|
if (FMLEnvironment.production)
|
||||||
|
return FMLEnvironment.dist.isDedicatedServer() && isMinecraftClass(internalName) ? YAY : NAY;
|
||||||
|
|
||||||
|
// For dev time it's a bit trickier so that we can throw exceptions when someone uses @OnlyIn in their mod code,
|
||||||
|
// so that it's more obvious that the behaviour they're expecting won't work in production anymore
|
||||||
|
if (internalName.startsWith("net/minecraftforge/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client
|
||||||
|
if (FMLEnvironment.dist.isClient() && isMinecraftClass(internalName))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY; // mod classes might have @OnlyIn, so parse them in dev to find out and throw if they do
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class LambdaGatherer extends MethodVisitor {
|
@Override
|
||||||
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
||||||
|
var changed = false;
|
||||||
|
|
||||||
|
var annotations = unpack(classNode.visibleAnnotations);
|
||||||
|
var isNonMinecraftClass = !isMinecraftClass(classNode.name);
|
||||||
|
|
||||||
|
if (remove(annotations, DIST)) {
|
||||||
|
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
|
||||||
|
throw new RuntimeException("Attempted to load class " + classNode.name + " for invalid dist " + DIST);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isNonMinecraftClass && !annotations.isEmpty())
|
||||||
|
throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
|
||||||
|
|
||||||
|
if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
|
||||||
|
for (var ann : annotations) {
|
||||||
|
if (ann.intf == null || DIST.equals(ann.side))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (classNode.interfaces.remove(ann.intf)) {
|
||||||
|
LOGGER.debug(DISTXFORM, "Removing Interface: {} implements {}", classNode.name, ann.intf);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
|
||||||
|
if (classNode.visibleAnnotations != null) {
|
||||||
|
for (var itr = classNode.visibleAnnotations.iterator(); itr.hasNext(); ) {
|
||||||
|
var ann = itr.next();
|
||||||
|
if (ONLYIN.equals(ann.desc) || ONLYINS.equals(ann.desc)) {
|
||||||
|
LOGGER.debug(DISTXFORM, "Removing Class Annotation: {} @{}", classNode.name, ann.desc);
|
||||||
|
itr.remove();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var itr = classNode.fields.iterator(); itr.hasNext(); ) {
|
||||||
|
var field = itr.next();
|
||||||
|
if (remove(unpack(field.visibleAnnotations), DIST)) {
|
||||||
|
LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
|
||||||
|
itr.remove();
|
||||||
|
changed = true;
|
||||||
|
|
||||||
|
if (isNonMinecraftClass)
|
||||||
|
throw new UnsupportedOperationException("Field " + field.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var lambdaGatherer = new LambdaGatherer();
|
||||||
|
for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
|
||||||
|
var method = itr.next();
|
||||||
|
if (remove(unpack(method.visibleAnnotations), DIST)) {
|
||||||
|
LOGGER.debug(DISTXFORM, "Removing method: {}.{}{}", classNode.name, method.name, method.desc);
|
||||||
|
itr.remove();
|
||||||
|
lambdaGatherer.accept(method);
|
||||||
|
changed = true;
|
||||||
|
|
||||||
|
if (isNonMinecraftClass)
|
||||||
|
throw new UnsupportedOperationException("Method " + method.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove dynamic synthetic lambda methods that are inside of removed methods
|
||||||
|
for (List<Handle> handles = lambdaGatherer.getDynamicLambdaHandles();
|
||||||
|
!handles.isEmpty(); handles = lambdaGatherer.getDynamicLambdaHandles()) {
|
||||||
|
lambdaGatherer = new LambdaGatherer();
|
||||||
|
for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
|
||||||
|
MethodNode method = itr.next();
|
||||||
|
if ((method.access & Opcodes.ACC_SYNTHETIC) == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
for (var handle : handles) {
|
||||||
|
if (method.name.equals(handle.getName()) && method.desc.equals(handle.getDesc())) {
|
||||||
|
LOGGER.debug(DISTXFORM, "Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
|
||||||
|
itr.remove();
|
||||||
|
lambdaGatherer.accept(method);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private record Target(String side, String intf) {
|
||||||
|
static Target from(final AnnotationNode node) {
|
||||||
|
var idx = node.values.indexOf("value");
|
||||||
|
var value = (String[])node.values.get(idx + 1); // Enums are stored as [Type, Value]
|
||||||
|
|
||||||
|
idx = node.values.indexOf("_interface");
|
||||||
|
if (idx == -1)
|
||||||
|
return new Target(value[1], null);
|
||||||
|
|
||||||
|
var intf = (Type)node.values.get(idx + 1);
|
||||||
|
return new Target(value[1], intf.getInternalName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unpack any OnlyIn or OnlyIns annotations to Target objects.
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static List<Target> unpack(final List<AnnotationNode> anns) {
|
||||||
|
if (anns == null || anns.isEmpty())
|
||||||
|
return Collections.emptyList();
|
||||||
|
|
||||||
|
var ret = new ArrayList<Target>();
|
||||||
|
for (var node : anns) {
|
||||||
|
if (ONLYIN.equals(node.desc))
|
||||||
|
ret.add(Target.from(node));
|
||||||
|
else if (ONLYINS.equals(node.desc)) {
|
||||||
|
if (node.values == null || node.values.isEmpty())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int idx = node.values.indexOf("value");
|
||||||
|
if (idx == -1)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var subNodes = (List<AnnotationNode>)node.values.get(idx + 1);
|
||||||
|
if (subNodes != null) {
|
||||||
|
for (var sub : subNodes)
|
||||||
|
ret.add(Target.from(sub));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean remove(final List<Target> targets, final String side) {
|
||||||
|
for (var target : targets) {
|
||||||
|
if (target.intf == null && !side.equals(target.side))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isMinecraftClass(final String internalName) {
|
||||||
|
return internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/");
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
@Override
|
||||||
|
public Consumer<Dist> getExtension() {
|
||||||
|
return s -> {
|
||||||
|
DIST = s.name();
|
||||||
|
LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class LambdaGatherer extends MethodVisitor {
|
||||||
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
||||||
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
||||||
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",
|
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",
|
||||||
@@ -186,23 +232,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void accept(MethodNode method) {
|
public void accept(MethodNode method) {
|
||||||
Streams.stream(method.instructions.iterator()).
|
for (var insn : method.instructions) {
|
||||||
filter(insnNode->insnNode.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN).
|
if (insn.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN)
|
||||||
forEach(insnNode->insnNode.accept(this));
|
insn.accept(this);
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs)
|
|
||||||
{
|
|
||||||
if (META_FACTORY.equals(bsm))
|
|
||||||
{
|
|
||||||
Handle dynamicLambdaHandle = (Handle) bsmArgs[1];
|
|
||||||
dynamicLambdaHandles.add(dynamicLambdaHandle);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Handle> getDynamicLambdaHandles()
|
@Override
|
||||||
{
|
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
|
||||||
|
if (META_FACTORY.equals(bsm)) {
|
||||||
|
var handle = (Handle)bsmArgs[1];
|
||||||
|
dynamicLambdaHandles.add(handle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Handle> getDynamicLambdaHandles() {
|
||||||
return dynamicLambdaHandles;
|
return dynamicLambdaHandles;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,18 +12,20 @@ import java.util.Map;
|
|||||||
import org.apache.commons.lang3.text.StrLookup;
|
import org.apache.commons.lang3.text.StrLookup;
|
||||||
import org.apache.commons.lang3.text.StrSubstitutor;
|
import org.apache.commons.lang3.text.StrSubstitutor;
|
||||||
|
|
||||||
|
// TODO: [FML] Remove this
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
public class StringSubstitutor {
|
public class StringSubstitutor {
|
||||||
|
private static final Map<String, String> GLOBALS = Map.of(
|
||||||
|
"mcVersion", FMLLoader.versionInfo().mcVersion(),
|
||||||
|
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
|
||||||
|
);
|
||||||
|
|
||||||
public static String replace(final String in, final ModFile file) {
|
public static String replace(final String in, final ModFile file) {
|
||||||
return new StrSubstitutor(getStringLookup(file)).replace(in);
|
return new StrSubstitutor(getStringLookup(file)).replace(in);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static StrLookup<String> getStringLookup(final ModFile file) {
|
private static StrLookup<String> getStringLookup(final ModFile file) {
|
||||||
var globals = Map.of(
|
return new StrLookup<>() {
|
||||||
"mcVersion", FMLLoader.versionInfo().mcVersion(),
|
|
||||||
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
|
|
||||||
);
|
|
||||||
return new StrLookup<String>() {
|
|
||||||
@Override
|
@Override
|
||||||
public String lookup(String key) {
|
public String lookup(String key) {
|
||||||
var parts = key.split("\\.");
|
var parts = key.split("\\.");
|
||||||
@@ -32,7 +34,7 @@ public class StringSubstitutor {
|
|||||||
var pfx = parts[0];
|
var pfx = parts[0];
|
||||||
|
|
||||||
if ("global".equals(pfx))
|
if ("global".equals(pfx))
|
||||||
return globals.get(parts[1]);
|
return GLOBALS.get(parts[1]);
|
||||||
else if ("file".equals(pfx) && file != null)
|
else if ("file".equals(pfx) && file != null)
|
||||||
return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
|
return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -16,26 +17,19 @@ import java.util.Collection;
|
|||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static java.util.stream.Collectors.groupingBy;
|
import static java.util.stream.Collectors.groupingBy;
|
||||||
import static java.util.stream.Collectors.joining;
|
import static java.util.stream.Collectors.joining;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class UniqueModListBuilder
|
@ApiStatus.Internal
|
||||||
{
|
@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
|
||||||
private final static Logger LOGGER = LogUtils.getLogger();
|
public final class UniqueModListBuilder {
|
||||||
|
private UniqueModListBuilder() {}
|
||||||
|
|
||||||
private final List<ModFile> modFiles;
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
|
|
||||||
|
|
||||||
public UniqueModListData buildUniqueList()
|
|
||||||
{
|
|
||||||
List<ModFile> uniqueModList;
|
|
||||||
List<ModFile> uniqueLibListWithVersion;
|
|
||||||
|
|
||||||
|
public static UniqueModListData buildUniqueList(List<ModFile> modFiles) {
|
||||||
// Collect mod files by module name. This will be used for deduping purposes
|
// Collect mod files by module name. This will be used for deduping purposes
|
||||||
final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
|
final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
|
||||||
.filter(mf -> mf.getModFileInfo() != null)
|
.filter(mf -> mf.getModFileInfo() != null)
|
||||||
@@ -46,13 +40,13 @@ public class UniqueModListBuilder
|
|||||||
.collect(groupingBy(UniqueModListBuilder::getModId));
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
// Select the newest by artifact version sorting of non-unique files thus identified
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
uniqueModList = modFilesByFirstId.entrySet().stream()
|
final List<ModFile> uniqueModList = modFilesByFirstId.entrySet().stream()
|
||||||
.map(this::selectNewestModInfo)
|
.map(UniqueModListBuilder::selectNewestModInfo)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// Select the newest by artifact version sorting of non-unique files thus identified
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
final List<ModFile> uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
||||||
.map(this::selectNewestModInfo)
|
.map(UniqueModListBuilder::selectNewestModInfo)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// Transform to the full mod id list
|
// Transform to the full mod id list
|
||||||
@@ -63,43 +57,40 @@ public class UniqueModListBuilder
|
|||||||
.collect(groupingBy(IModInfo::getModId));
|
.collect(groupingBy(IModInfo::getModId));
|
||||||
|
|
||||||
// Transform to the full lib id list
|
// Transform to the full lib id list
|
||||||
final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
|
final List<List<ModFile>> versionedLibs = uniqueLibListWithVersion.stream()
|
||||||
.map(UniqueModListBuilder::getModId)
|
.map(UniqueModListBuilder::getModId)
|
||||||
.collect(Collectors.toMap(
|
.map(libFilesWithVersionByModuleName::get)
|
||||||
Function.identity(),
|
.toList();
|
||||||
libFilesWithVersionByModuleName::get
|
|
||||||
));
|
|
||||||
|
|
||||||
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
||||||
// We can't handle this
|
// We can't handle this
|
||||||
final List<String> dupedModErrors = modIds.values().stream()
|
final List<String> dupedModErrors = modIds.values().stream()
|
||||||
.filter(modInfos -> modInfos.size() > 1)
|
.filter(modInfos -> modInfos.size() > 1)
|
||||||
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
|
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
|
||||||
mods.get(0).getModId(),
|
mods.getFirst().getModId(),
|
||||||
mods.stream()
|
mods.stream()
|
||||||
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
|
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
|
||||||
)).toList();
|
)).toList();
|
||||||
|
|
||||||
if (!dupedModErrors.isEmpty()) {
|
if (!dupedModErrors.isEmpty()) {
|
||||||
LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
|
LOGGER.error(LOADING, "Found duplicate mods:\n{}", String.join("\n", dupedModErrors));
|
||||||
throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
|
throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
|
||||||
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
.map(EarlyLoadingException.ExceptionData::new)
|
||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
final List<String> dupedLibErrors = versionedLibIds.values().stream()
|
final List<String> dupedLibErrors = versionedLibs.stream()
|
||||||
.filter(modFiles -> modFiles.size() > 1)
|
.filter(libModFiles -> libModFiles.size() > 1)
|
||||||
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
||||||
getModId(mods.get(0)),
|
getModId(mods.getFirst()),
|
||||||
mods.stream()
|
mods.stream().map(ModFile::getFileName).collect(joining(", "))
|
||||||
.map(modFile -> modFile.getFileName()).collect(joining(", "))
|
|
||||||
)).toList();
|
)).toList();
|
||||||
|
|
||||||
if (!dupedLibErrors.isEmpty()) {
|
if (!dupedLibErrors.isEmpty()) {
|
||||||
LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
|
LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", String.join("\n", dupedLibErrors));
|
||||||
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
|
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
|
||||||
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
.map(EarlyLoadingException.ExceptionData::new)
|
||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,40 +98,40 @@ public class UniqueModListBuilder
|
|||||||
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
|
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
|
||||||
.collect(groupingBy(UniqueModListBuilder::getModId));
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
final List<ModFile> loadedList = new ArrayList<>();
|
final List<ModFile> loadedList = new ArrayList<>(uniqueModList);
|
||||||
loadedList.addAll(uniqueModList);
|
|
||||||
loadedList.addAll(uniqueLibListWithVersion);
|
loadedList.addAll(uniqueLibListWithVersion);
|
||||||
|
|
||||||
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
private static ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
||||||
List<ModFile> modInfoList = fullList.getValue();
|
List<ModFile> modInfoList = fullList.getValue();
|
||||||
if (modInfoList.size() > 1) {
|
if (modInfoList.size() > 1) {
|
||||||
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
||||||
modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
|
modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
|
||||||
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
|
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
|
||||||
}
|
}
|
||||||
return modInfoList.get(0);
|
return modInfoList.getFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ArtifactVersion getVersion(final ModFile mf)
|
private static ArtifactVersion getVersion(final ModFile mf) {
|
||||||
{
|
List<IModInfo> modInfos;
|
||||||
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
if (mf.getModFileInfo() == null || (modInfos = mf.getModInfos()) == null || modInfos.isEmpty()) {
|
||||||
return mf.getJarVersion();
|
return mf.getJarVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
return mf.getModInfos().get(0).getVersion();
|
return modInfos.getFirst().getVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getModId(ModFile modFile) {
|
private static String getModId(ModFile modFile) {
|
||||||
if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) {
|
var modFileInfo = modFile.getModFileInfo();
|
||||||
|
List<IModInfo> mods;
|
||||||
|
if (modFileInfo == null || (mods = modFileInfo.getMods()).isEmpty()) {
|
||||||
return modFile.getSecureJar().name();
|
return modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
return modFile.getModFileInfo().moduleName();
|
return mods.getFirst().getModId();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -5,33 +5,44 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import net.minecraftforge.forgespi.language.MavenVersionAdapter;
|
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
||||||
import org.apache.maven.artifact.versioning.VersionRange;
|
import org.apache.maven.artifact.versioning.VersionRange;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
|
|
||||||
|
@ApiStatus.Internal // since 1.21.1, will be made non-public in a later MC version
|
||||||
public class VersionSupportMatrix {
|
public class VersionSupportMatrix {
|
||||||
private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
|
private static final Map<String, List<ArtifactVersion>> OVERRIDE_VERSIONS;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
|
if ("1.21.1".equals(FMLLoader.versionInfo().mcVersion())) {
|
||||||
if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
|
OVERRIDE_VERSIONS = Map.ofEntries(
|
||||||
// 1.19.2 is Compatible with 1.19.1
|
// 1.21.1 is compatible with 1.21
|
||||||
add("languageloader.javafml", "42");
|
entry("languageloader.javafml", "51"),
|
||||||
add("mod.minecraft", "1.19.1");
|
entry("mod.minecraft", "1.21"),
|
||||||
add("mod.forge", "42.0.9");
|
entry("mod.forge", "51.0.33")
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
OVERRIDE_VERSIONS = Collections.emptyMap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static void add(String key, String value) {
|
|
||||||
overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
|
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
|
||||||
|
if (OVERRIDE_VERSIONS.isEmpty()) return false;
|
||||||
|
List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);
|
||||||
|
return custom != null && custom.stream().anyMatch(declaredRange::containsVersion);
|
||||||
}
|
}
|
||||||
public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
|
|
||||||
if (standardLookup.test(lookupId, declaredRange)) return true;
|
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, String declaredRange) {
|
||||||
List<ArtifactVersion> custom = overrideVersions.get(type + "." + lookupId);
|
return Map.entry(typeAndLookupId, List.of(new DefaultArtifactVersion(declaredRange)));
|
||||||
return custom == null ? false : custom.stream().anyMatch(declaredRange::containsVersion);
|
}
|
||||||
|
|
||||||
|
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, List<String> declaredRanges) {
|
||||||
|
return Map.entry(typeAndLookupId, declaredRanges.stream().map(DefaultArtifactVersion::new).map(it -> (ArtifactVersion) it).toList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,9 +18,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
||||||
@@ -49,10 +47,7 @@ public class ForgeHighlight {
|
|||||||
LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
|
LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
|
||||||
}
|
}
|
||||||
if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
|
if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
|
||||||
List<String> optionList = new ArrayList<>();
|
options = new String[] { options[0], "disableAnsi=true" };
|
||||||
optionList.add(options[0]);
|
|
||||||
optionList.add("disableAnsi=true");
|
|
||||||
options = optionList.toArray(new String[0]);
|
|
||||||
}
|
}
|
||||||
return HighlightConverter.newInstance(config, options);
|
return HighlightConverter.newInstance(config, options);
|
||||||
}
|
}
|
||||||
|
|||||||
+96
-13
@@ -6,9 +6,9 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.JarMetadata;
|
import cpw.mods.jarhandling.JarMetadata;
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException;
|
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
import net.minecraftforge.forgespi.language.IConfigurable;
|
import net.minecraftforge.forgespi.language.IConfigurable;
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
@@ -19,60 +19,142 @@ import net.minecraftforge.forgespi.locating.IModProvider;
|
|||||||
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.lang.module.InvalidModuleDescriptorException;
|
||||||
|
import java.lang.module.ModuleDescriptor;
|
||||||
|
import java.lang.module.ModuleDescriptor.Version;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public abstract class AbstractModProvider implements IModProvider {
|
public abstract class AbstractModProvider implements IModProvider {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
protected static final String MODS_TOML = "META-INF/mods.toml";
|
protected static final String MODS_TOML = "META-INF/mods.toml";
|
||||||
|
protected static final String MODULE_INFO = "module-info.class";
|
||||||
|
|
||||||
protected IModLocator.ModFileOrException createMod(Path path) {
|
protected IModLocator.ModFileOrException createMod(Path path) {
|
||||||
|
return createMod(path, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
|
||||||
|
return createMod(path, ignoreUnknown, getDefaultJarModType());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
||||||
|
var debug = path.toString();
|
||||||
|
if (debug.equals("/"))
|
||||||
|
debug = path.toUri().toString();
|
||||||
|
|
||||||
var mjm = new ModJarMetadata();
|
var mjm = new ModJarMetadata();
|
||||||
var sj = SecureJar.from(
|
SecureJar sj = null;
|
||||||
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
try {
|
||||||
path
|
sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
|
||||||
);
|
} catch (Throwable t) {
|
||||||
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + debug + "\" - " + t.getMessage()));
|
||||||
|
}
|
||||||
|
|
||||||
IModFile mod;
|
IModFile mod;
|
||||||
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
||||||
if (type == null)
|
if (type == null)
|
||||||
type = getDefaultJarModType();
|
type = defaultType;
|
||||||
|
|
||||||
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, debug);
|
||||||
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
||||||
|
// ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
|
||||||
|
mjm.setModFile(mod);
|
||||||
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
||||||
}
|
}
|
||||||
} else if (type != null) {
|
} else if (type != null) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, debug);
|
||||||
mod = new ModFile(sj, this, this::manifestParser, type);
|
mod = new ModFile(sj, this, this::manifestParser, type);
|
||||||
|
} else if (ignoreUnknown) {
|
||||||
|
return null;
|
||||||
} else
|
} else
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + debug));
|
||||||
|
|
||||||
mjm.setModFile(mod);
|
|
||||||
return new IModLocator.ModFileOrException(mod, null);
|
return new IModLocator.ModFileOrException(mod, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
|
||||||
|
var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
|
||||||
|
if (info != null) {
|
||||||
|
try {
|
||||||
|
var desc = ModuleDescriptor.read(info, jar::getPackages);
|
||||||
|
var all = new HashSet<>(jar.getPackages());
|
||||||
|
all.removeAll(desc.packages());
|
||||||
|
if (!all.isEmpty()) {
|
||||||
|
var missing = all.stream().sorted().collect(Collectors.joining(", "));
|
||||||
|
LOGGER.error("Invalid module-info, missing packages " + missing);
|
||||||
|
throw new ModFileLoadingException("Invalid module-info, missing packages " + missing);
|
||||||
|
} else {
|
||||||
|
return new JarMetadata() {
|
||||||
|
@Override
|
||||||
|
public String name() {
|
||||||
|
return desc.name();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String version() {
|
||||||
|
return desc.version().map(Version::toString).or(desc::rawVersion).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ModuleDescriptor descriptor() {
|
||||||
|
return desc;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (InvalidModuleDescriptorException | IOException e) {
|
||||||
|
LOGGER.error("Failed to parse " + jar.getPrimaryPath() + " module-info", e);
|
||||||
|
throw new ModFileLoadingException("Invalid module-info: " + e.getMessage());
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
info.close();
|
||||||
|
} catch (IOException e) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (jar.moduleDataProvider().findFile(MODS_TOML).isEmpty())
|
||||||
|
return JarMetadata.from(jar, jar.getPrimaryPath());
|
||||||
|
|
||||||
|
return mjm;
|
||||||
|
}
|
||||||
|
|
||||||
protected IModFileInfo manifestParser(final IModFile mod) {
|
protected IModFileInfo manifestParser(final IModFile mod) {
|
||||||
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
||||||
var license = mf.getValue("LICENSE");
|
var license = mf.getValue("LICENSE");
|
||||||
var dummy = new IConfigurable() {
|
var dummy = new IConfigurable() {
|
||||||
|
@Override
|
||||||
|
public <T> Optional<T> getConfigElement(String key) {
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(String... key) {
|
public <T> Optional<T> getConfigElement(String... key) {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<? extends IConfigurable> getConfigList(String key) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<? extends IConfigurable> getConfigList(String... key) {
|
public List<? extends IConfigurable> getConfigList(String... key) {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
@@ -128,10 +210,11 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static final class Holder<T> {
|
private static final class Holder<T> {
|
||||||
T value;
|
private T value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
|
private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
|
||||||
|
@Override public <T> Optional<T> getConfigElement(final String string) { return Optional.empty(); }
|
||||||
@Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
|
@Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
|
||||||
@Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
|
@Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
|
||||||
@Override public List<IModInfo> getMods() { return Collections.emptyList(); }
|
@Override public List<IModInfo> getMods() { return Collections.emptyList(); }
|
||||||
|
|||||||
+7
-18
@@ -17,8 +17,7 @@ import java.time.Instant;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
|
|
||||||
public class BackgroundScanHandler
|
public final class BackgroundScanHandler {
|
||||||
{
|
|
||||||
private enum ScanStatus {
|
private enum ScanStatus {
|
||||||
NOT_STARTED,
|
NOT_STARTED,
|
||||||
RUNNING,
|
RUNNING,
|
||||||
@@ -29,10 +28,10 @@ public class BackgroundScanHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static final boolean DEBUG = LOGGER.isErrorEnabled(LogMarkers.SCAN);
|
||||||
private final ExecutorService modContentScanner;
|
private final ExecutorService modContentScanner;
|
||||||
private final List<ModFile> modFiles;
|
private final List<ModFile> modFiles;
|
||||||
private ScanStatus status;
|
private ScanStatus status;
|
||||||
private LoadingModList loadingModList;
|
|
||||||
|
|
||||||
public BackgroundScanHandler(final List<ModFile> modFiles) {
|
public BackgroundScanHandler(final List<ModFile> modFiles) {
|
||||||
this.modFiles = modFiles;
|
this.modFiles = modFiles;
|
||||||
@@ -55,29 +54,19 @@ public class BackgroundScanHandler
|
|||||||
}
|
}
|
||||||
status = ScanStatus.RUNNING;
|
status = ScanStatus.RUNNING;
|
||||||
ImmediateWindowHandler.updateProgress("Scanning mod candidates");
|
ImmediateWindowHandler.updateProgress("Scanning mod candidates");
|
||||||
final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
|
CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
|
||||||
.whenComplete(file::setScanResult)
|
.whenComplete(file::setScanResult);
|
||||||
.whenComplete((r,t)-> this.addCompletedFile(file,r,t));
|
if (DEBUG) future = future.whenComplete((r, t) -> addCompletedFile(file, t));
|
||||||
file.setFutureScanResult(future);
|
file.setFutureScanResult(future);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addCompletedFile(final ModFile file, final ModFileScanData modFileScanData, final Throwable throwable) {
|
private void addCompletedFile(final ModFile file, final Throwable throwable) {
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
status = ScanStatus.ERRORED;
|
status = ScanStatus.ERRORED;
|
||||||
LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable);
|
LOGGER.error(LogMarkers.SCAN, "An error occurred scanning file {}", file, throwable);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLoadingModList(LoadingModList loadingModList)
|
|
||||||
{
|
|
||||||
this.loadingModList = loadingModList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LoadingModList getLoadingModList()
|
|
||||||
{
|
|
||||||
return loadingModList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void waitForScanToComplete(final Runnable ticker) {
|
public void waitForScanToComplete(final Runnable ticker) {
|
||||||
boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null;
|
boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null;
|
||||||
Instant deadline = Instant.now().plus(Duration.ofMinutes(10));
|
Instant deadline = Instant.now().plus(Duration.ofMinutes(10));
|
||||||
|
|||||||
+14
-10
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading.moddiscovery;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
|
import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer;
|
||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
import net.minecraftforge.forgespi.locating.IModLocator;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
@@ -17,9 +18,9 @@ import java.io.IOException;
|
|||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.jar.Attributes;
|
import java.util.jar.Attributes;
|
||||||
@@ -27,7 +28,7 @@ import java.util.jar.JarFile;
|
|||||||
import java.util.jar.Manifest;
|
import java.util.jar.Manifest;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public class ClasspathLocator extends AbstractModProvider implements IModLocator {
|
public final class ClasspathLocator extends AbstractModProvider implements IModLocator {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
|
private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
|
||||||
|
|
||||||
@@ -44,7 +45,7 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
|
|||||||
// Find 'minecraft' during dev time this is also Forge. So skip it.
|
// Find 'minecraft' during dev time this is also Forge. So skip it.
|
||||||
// Can return null for dedicated server as Minecraft isn't on the classpath
|
// Can return null for dedicated server as Minecraft isn't on the classpath
|
||||||
// On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it.
|
// On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it.
|
||||||
var minecraft = getPathFromResource(cl, "net/minecraft/obfuscate/DontObfuscate.class");
|
var minecraft = getPathFromResource(cl, "net/minecraft/world/item/Item.class");
|
||||||
|
|
||||||
var claimed = new HashSet<Path>();
|
var claimed = new HashSet<Path>();
|
||||||
var tomls = getUrls(cl, MODS_TOML);
|
var tomls = getUrls(cl, MODS_TOML);
|
||||||
@@ -71,16 +72,20 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
|
|||||||
}
|
}
|
||||||
|
|
||||||
var ret = new ArrayList<ModFileOrException>();
|
var ret = new ArrayList<ModFileOrException>();
|
||||||
for (var path : claimed)
|
for (var path : claimed) {
|
||||||
ret.add(createMod(path));
|
// Filter out anything found by the ServiceLoader
|
||||||
|
if (!ModDirTransformerDiscoverer.isServiceProvider(path)
|
||||||
|
&& !JarInJarDependencyLocator.isOption(path))
|
||||||
|
ret.add(createMod(path));
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<URL> getUrls(ClassLoader cl, String resource) {
|
private static List<URL> getUrls(ClassLoader cl, String resource) {
|
||||||
try {
|
try {
|
||||||
var lst = Collections.list(cl.getResources(resource));
|
var lst = Collections.list(cl.getResources(resource));
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
||||||
Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString()));
|
lst.sort(Comparator.comparing(URL::toString));
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
|
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
|
||||||
for (var url : lst)
|
for (var url : lst)
|
||||||
LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
|
LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
|
||||||
@@ -100,11 +105,10 @@ public class ClasspathLocator extends AbstractModProvider implements IModLocator
|
|||||||
len += 2;
|
len += 2;
|
||||||
}
|
}
|
||||||
str = str.substring(0, str.length() - len);
|
str = str.substring(0, str.length() - len);
|
||||||
var path = Paths.get(URI.create(str));
|
return Path.of(URI.create(str));
|
||||||
return path;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Path getPathFromResource(ClassLoader cl, String resource) {
|
static Path getPathFromResource(ClassLoader cl, String resource) {
|
||||||
var url = cl.getResource(resource);
|
var url = cl.getResource(resource);
|
||||||
if (url == null)
|
if (url == null)
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
|
||||||
|
|
||||||
import net.minecraftforge.forgespi.coremod.ICoreModFile;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.Reader;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
|
||||||
public class CoreModFile implements ICoreModFile {
|
|
||||||
private final Path internalPath;
|
|
||||||
private final ModFile file;
|
|
||||||
private final String name;
|
|
||||||
|
|
||||||
CoreModFile(final String name, final Path path, final ModFile file) {
|
|
||||||
this.name = name;
|
|
||||||
this.internalPath = path;
|
|
||||||
this.file = file;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Reader readCoreMod() throws IOException {
|
|
||||||
return Files.newBufferedReader(this.internalPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getPath() {
|
|
||||||
return this.internalPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Reader getAdditionalFile(final String fileName) throws IOException {
|
|
||||||
return Files.newBufferedReader(file.findResource(fileName));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getOwnerId() {
|
|
||||||
return this.file.getModInfos().get(0).getModId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "{Name: " + name + ", Owner: " + getOwnerId() + " @ " + getPath() + "}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loaded 100 of 2923 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user