mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1f057278d | ||
|
|
6bbe2c64a9 | ||
|
|
684cd96e32 | ||
|
|
1f4e13fce0 | ||
|
|
55ad9e6d7d | ||
|
|
5c8d1618bc | ||
|
|
a6f5057840 | ||
|
|
1b0360928f | ||
|
|
921771bd11 | ||
|
|
089bb1fc84 | ||
|
|
602f1ef947 | ||
|
|
3b18e003f6 | ||
|
|
c33f2d1be6 | ||
|
|
022116141c | ||
|
|
a8b243c0cd | ||
|
|
c22355cc45 | ||
|
|
74bc36307e | ||
|
|
88d2dc6c8f | ||
|
|
de13ba8ab8 | ||
|
|
4f838a87d4 | ||
|
|
70d700e630 | ||
|
|
78fffcf45a | ||
|
|
cdba403ab6 | ||
|
|
6821d7b1cc | ||
|
|
9524ce4580 | ||
|
|
f2bbeab3b9 | ||
|
|
4a8adf5465 | ||
|
|
f5fa2f2a57 | ||
|
|
b33e168969 | ||
|
|
1f6e1ff257 | ||
|
|
7f8897141e | ||
|
|
b9a097c9e1 | ||
|
|
62f00266c5 | ||
|
|
6986cd7ab3 | ||
|
|
e7051b3484 | ||
|
|
f667d25d0b | ||
|
|
48d72fb7c6 | ||
|
|
2fb2bbeed0 |
No files matched your search
@@ -3,7 +3,6 @@
|
|||||||
*.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
|
||||||
@@ -22,6 +21,3 @@ src/generated/**/*.json text eol=lf
|
|||||||
src/generated_test/**/.cache/cache text eol=lf
|
src/generated_test/**/.cache/cache text eol=lf
|
||||||
src/generated_test/**/*.json text eol=lf
|
src/generated_test/**/*.json text eol=lf
|
||||||
|
|
||||||
# We force eclipse to use unix line endings
|
|
||||||
ide/eclipse/template/.settings/*.prefs text eol=lf
|
|
||||||
|
|
||||||
@@ -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..minecraftforge.net/ -->
|
<!-- Discord: https://discord.gg/UvedJ9m -->
|
||||||
@@ -11,7 +11,6 @@ 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}
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
name: Publish
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ '1.21.11' ]
|
|
||||||
|
|
||||||
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@v4 # Payload artifact is consumed in Actionable
|
- uses: actions/upload-artifact@v3 # 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@v4 # Payload artifact is consumed in Actionable
|
- uses: actions/upload-artifact@v3 # Payload artifact is consumed in Actionable
|
||||||
with:
|
with:
|
||||||
name: payload
|
name: payload
|
||||||
path: ${{ github.event_path }}
|
path: ${{ github.event_path }}
|
||||||
+17
-26
@@ -1,6 +1,3 @@
|
|||||||
#forgedev dev if the folder exists in here
|
|
||||||
forgedev
|
|
||||||
|
|
||||||
#eclipse
|
#eclipse
|
||||||
**/bin
|
**/bin
|
||||||
**/.settings
|
**/.settings
|
||||||
@@ -16,21 +13,18 @@ forgedev
|
|||||||
/classes
|
/classes
|
||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
# We however WANT the ide folder as it has tempaltes/configs for developing Forge.
|
|
||||||
!ide/**
|
|
||||||
|
|
||||||
#gradle
|
#gradle
|
||||||
/build
|
/build
|
||||||
/.gradle
|
/.gradle
|
||||||
/*/build
|
/*/build
|
||||||
/*/.gradle
|
/*/.gradle
|
||||||
|
|
||||||
# Minecraft
|
|
||||||
/run
|
|
||||||
/*.launch
|
|
||||||
|
|
||||||
# Projects repo, either ignore it, or ignore patches.
|
# Projects repo, either ignore it, or ignore patches.
|
||||||
src/minecraft
|
/projects/mcp/
|
||||||
|
/projects/clean/
|
||||||
|
/projects/forge/
|
||||||
|
/projects/fmlonly/
|
||||||
|
#/patches/*
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/projects/**/build/
|
/projects/**/build/
|
||||||
@@ -38,21 +32,18 @@ src/minecraft
|
|||||||
/projects/**/run/
|
/projects/**/run/
|
||||||
/projects/**/*.launch
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
src/*/generated/**/.cache/
|
src/generated/resources/.cache/
|
||||||
|
src/generated_test/resources/.cache/
|
||||||
|
src/generated_mdk/resources/.cache/
|
||||||
|
|
||||||
# Generated by gradle every import
|
#Patch rejects
|
||||||
**/src/main/resources/META-INF/MANIFEST.MF
|
#/patches-/
|
||||||
/fmlloader/src/main/resources/forge_version.json
|
#*.patch.rej
|
||||||
|
#/projects/*/rejects/
|
||||||
|
|
||||||
/ForgeRoot.ipr
|
# FML changelog
|
||||||
/ForgeRoot.iws
|
changelog.txt
|
||||||
|
*.py
|
||||||
|
*.7z
|
||||||
|
/logs/
|
||||||
|
|
||||||
# APT stuff
|
|
||||||
/*/.gitignore
|
|
||||||
/*/.factorypath
|
|
||||||
/*/.apt_generated/
|
|
||||||
/lib/
|
|
||||||
/_actual/
|
|
||||||
/runs/
|
|
||||||
/forge.ipr
|
|
||||||
/forge.iws
|
|
||||||
Vendored
+104
@@ -0,0 +1,104 @@
|
|||||||
|
<?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
+208
@@ -0,0 +1,208 @@
|
|||||||
|
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", "21", 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", "8.8", 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_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
|
||||||
|
text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only 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."
|
||||||
|
|
||||||
|
features {
|
||||||
|
feature {
|
||||||
|
id = "trigger_fml_only_files_generator"
|
||||||
|
type = "triggerBuildFeature"
|
||||||
|
param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
|
||||||
|
param("parameters", """
|
||||||
|
env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
|
||||||
|
env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
|
||||||
|
env.PUBLISHED_JAVA_GROUP
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
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
@@ -0,0 +1,65 @@
|
|||||||
|
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 it's 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 stabelized 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.
|
||||||
|
http://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.
|
||||||
|
http://www.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: https://minecraftforge.net/
|
Homepage: http://minecraftforge.net/
|
||||||
https://github.com/MinecraftForge/MinecraftForge
|
https://github.com/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1724
-778
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,3 @@
|
|||||||
|
/.gradle/
|
||||||
|
/build/
|
||||||
|
/out/
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
repositories {
|
||||||
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'org.ow2.asm:asm:9.5'
|
||||||
|
implementation 'org.ow2.asm:asm-tree:9.5'
|
||||||
|
implementation 'net.minecraftforge:srgutils:0.5.+'
|
||||||
|
implementation 'commons-io:commons-io:2.12.0'
|
||||||
|
implementation 'com.google.code.gson:gson:2.10.1'
|
||||||
|
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
import groovy.json.JsonBuilder
|
||||||
|
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
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
||||||
|
def 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
@@ -0,0 +1,32 @@
|
|||||||
|
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.stream().sorted().toList() ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
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, Closure cl) {
|
||||||
|
cl.delegate = obj
|
||||||
|
cl.resolveStrategy = Closure.DELEGATE_FIRST
|
||||||
|
cl()
|
||||||
|
return obj
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
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.Optional
|
||||||
|
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
|
||||||
|
|
||||||
|
abstract class Crowdin extends DefaultTask {
|
||||||
|
@Input abstract Property<String> getId()
|
||||||
|
@Input @Optional abstract Property<String> getKey()
|
||||||
|
@Input boolean json = true
|
||||||
|
@OutputFile abstract RegularFileProperty getOutput()
|
||||||
|
@OutputFile abstract RegularFileProperty getExport()
|
||||||
|
|
||||||
|
Crowdin() {
|
||||||
|
outputs.upToDateWhen{ false }
|
||||||
|
id.convention('minecraft-forge')
|
||||||
|
output.convention(project.layout.buildDirectory.dir(name).map {it.file("output.zip") })
|
||||||
|
export.convention(project.layout.buildDirectory.dir(name).map {it.file("export.json") })
|
||||||
|
}
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
def run() {
|
||||||
|
File outputFile = output.get().asFile
|
||||||
|
File exportFile = export.get().asFile
|
||||||
|
if (outputFile.exists())
|
||||||
|
outputFile.delete()
|
||||||
|
|
||||||
|
if (!key.isPresent())
|
||||||
|
return
|
||||||
|
String key = this.key.get()
|
||||||
|
String id = this.id.get()
|
||||||
|
|
||||||
|
// Force an export
|
||||||
|
new URL("https://api.crowdin.com/api/project/${id}/export?key=${key}").withInputStream { i ->
|
||||||
|
exportFile.withOutputStream { it << i }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!exportFile.text.contains('success')) {
|
||||||
|
throw new RuntimeException("Crowdin export failed, see ${exportFile} for more info")
|
||||||
|
}
|
||||||
|
|
||||||
|
new URL("https://api.crowdin.com/api/project/${id}/download/all.zip?key=${key}").withInputStream { i ->
|
||||||
|
new ZipInputStream(i).withCloseable { zin ->
|
||||||
|
outputFile.withOutputStream { out ->
|
||||||
|
new ZipOutputStream(out).withCloseable { zout ->
|
||||||
|
ZipEntry zein
|
||||||
|
while ((zein = zin.nextEntry) != null) {
|
||||||
|
if (zein.isDirectory()) {
|
||||||
|
zout.putNextEntry(new ZipEntry(zein.name))
|
||||||
|
} else {
|
||||||
|
// 1.13+ uses json
|
||||||
|
if (zein.name.endsWith('.json') == json) {
|
||||||
|
ZipEntry zeout = new ZipEntry(json ? zein.name.toLowerCase() : zein.name)
|
||||||
|
zeout.time = 1
|
||||||
|
zout.putNextEntry(zeout)
|
||||||
|
zout << zin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
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
|
||||||
|
def libraries = new ArrayList()
|
||||||
|
|
||||||
|
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.equals(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.equals(target.sha1())) {
|
||||||
|
throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Files.write(librariesOutput.get().asFile.toPath(), libraries)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
import groovy.transform.EqualsAndHashCode
|
||||||
|
|
||||||
|
import java.util.ArrayList
|
||||||
|
import java.util.HashMap
|
||||||
|
import java.util.TreeMap
|
||||||
|
import java.util.TreeSet
|
||||||
|
import java.util.function.BiConsumer
|
||||||
|
|
||||||
|
import org.gradle.api.DefaultTask
|
||||||
|
import org.gradle.api.tasks.*
|
||||||
|
|
||||||
|
import org.objectweb.asm.Opcodes
|
||||||
|
import org.objectweb.asm.Type
|
||||||
|
import org.objectweb.asm.tree.ClassNode
|
||||||
|
import org.objectweb.asm.tree.FieldNode
|
||||||
|
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) {
|
||||||
|
def 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
|
||||||
|
}
|
||||||
|
|
||||||
|
@EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
|
||||||
|
public 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(def owner, def name, def desc) {
|
||||||
|
if (blacklist == null)
|
||||||
|
blacklist = new HashSet()
|
||||||
|
blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
|
||||||
|
}
|
||||||
|
def blacklist(def owner) {
|
||||||
|
blacklist(owner, '', '')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def 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)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
import org.gradle.api.DefaultTask
|
||||||
|
import org.gradle.api.file.DirectoryProperty
|
||||||
|
import org.gradle.api.tasks.InputDirectory
|
||||||
|
import org.gradle.api.tasks.TaskAction
|
||||||
|
|
||||||
|
import java.nio.file.Files
|
||||||
|
|
||||||
|
abstract class FixPatchImports extends DefaultTask {
|
||||||
|
|
||||||
|
@InputDirectory abstract DirectoryProperty getClean()
|
||||||
|
@InputDirectory abstract DirectoryProperty getPatched()
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
void run() {
|
||||||
|
final patchedPath = getPatched().get().asFile.toPath()
|
||||||
|
final cleanPath = getClean().get().asFile.toPath()
|
||||||
|
|
||||||
|
try (final var stream = Files.find(patchedPath, Integer.MAX_VALUE, (path, attr) -> path.toString().endsWith('.java'))) {
|
||||||
|
final itr = stream.iterator()
|
||||||
|
while (itr.hasNext()) {
|
||||||
|
final next = itr.next()
|
||||||
|
final clean = cleanPath.resolve(patchedPath.relativize(next).toString())
|
||||||
|
|
||||||
|
final patchedLines = Files.readAllLines(next)
|
||||||
|
final cleanLines = Files.readAllLines(clean)
|
||||||
|
|
||||||
|
final patchedImport = patchedLines.findLastIndexOf(2) { it.startsWith('import ') }
|
||||||
|
final cleanImport = cleanLines.findLastIndexOf(2) { it.startsWith('import ') }
|
||||||
|
|
||||||
|
if (cleanImport !== patchedImport) {
|
||||||
|
patchedLines.removeIf { it.startsWith('import ') }
|
||||||
|
patchedLines.addAll(2, cleanLines.subList(2, cleanImport + 1))
|
||||||
|
Files.write(next, patchedLines)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
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()
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
import org.gradle.api.tasks.bundling.Zip
|
||||||
|
import org.gradle.api.tasks.*
|
||||||
|
import org.gradle.api.provider.SetProperty
|
||||||
|
|
||||||
|
abstract class InstallerJar extends Zip {
|
||||||
|
@Input @Optional abstract SetProperty<String> getPackedDependencies()
|
||||||
|
|
||||||
|
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'))
|
||||||
|
|
||||||
|
def installerJson = project.tasks.installerJson
|
||||||
|
def launcherJson = project.tasks.launcherJson
|
||||||
|
def downloadInstaller = project.tasks.downloadInstaller
|
||||||
|
|
||||||
|
dependsOn(installerJson, launcherJson, downloadInstaller)
|
||||||
|
from(installerJson, launcherJson)
|
||||||
|
|
||||||
|
from(project.rootProject.file('/src/main/resources/url.png'))
|
||||||
|
project.afterEvaluate {
|
||||||
|
from(project.zipTree(downloadInstaller.output)) {
|
||||||
|
duplicatesStrategy = 'exclude'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!System.env.TEAMCITY_VERSION) {
|
||||||
|
dependsOn(project.universalJar)
|
||||||
|
from(project.universalJar) {
|
||||||
|
into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
|
||||||
|
}
|
||||||
|
|
||||||
|
packedDependencies.get().forEach {
|
||||||
|
def jarTask = project.rootProject.getTasks().findByPath(it)
|
||||||
|
dependsOn(jarTask)
|
||||||
|
from(jarTask) {
|
||||||
|
into '/maven/' + jarTask.project.group.replace('.', '/') + '/' + jarTask.archiveBaseName.get() + '/' + jarTask.project.version + '/'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
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 java.nio.file.Files
|
||||||
|
|
||||||
|
abstract class InstallerJson extends DefaultTask {
|
||||||
|
@OutputFile abstract RegularFileProperty getOutput()
|
||||||
|
@InputFiles abstract ConfigurableFileCollection getInput()
|
||||||
|
@Input @Optional abstract SetProperty<String> getPackedDependencies()
|
||||||
|
@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() {
|
||||||
|
getLauncherJsonName().convention('/version.json')
|
||||||
|
getLogo().convention('/big_logo.png')
|
||||||
|
getMirrors().convention('https://files.minecraftforge.net/mirrors-2.0.json')
|
||||||
|
getWelcome().convention("Welcome to the simple ${project.name.capitalize()} installer.")
|
||||||
|
|
||||||
|
getOutput().convention(project.layout.buildDirectory.file('install_profile.json'))
|
||||||
|
|
||||||
|
['client', 'server'].each { side ->
|
||||||
|
['slim', 'extra'].each { type ->
|
||||||
|
def tsk = project.tasks.getByName("download${side.capitalize()}${type.capitalize()}")
|
||||||
|
dependsOn(tsk)
|
||||||
|
input.from(tsk.output)
|
||||||
|
}
|
||||||
|
def tsk = project.tasks.getByName("create${side.capitalize()}SRG")
|
||||||
|
dependsOn(tsk)
|
||||||
|
input.from(tsk.output)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
project.afterEvaluate {
|
||||||
|
(packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach {
|
||||||
|
dependsOn(it)
|
||||||
|
input.from it.archiveFile
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
protected void exec() {
|
||||||
|
def libs = libraries
|
||||||
|
for (def child : packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]) {
|
||||||
|
def dep = Util.getMavenDep(child)
|
||||||
|
def path = Util.getMavenPath(child)
|
||||||
|
libs.put(dep.toString(), [
|
||||||
|
name: dep,
|
||||||
|
downloads: [
|
||||||
|
artifact: [
|
||||||
|
path: path,
|
||||||
|
url: "https://maven.minecraftforge.net/${path}",
|
||||||
|
sha1: child.archiveFile.get().asFile.sha1(),
|
||||||
|
size: child.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())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
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 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<>()
|
||||||
|
@Input @Optional abstract SetProperty<String> getPackedDependencies()
|
||||||
|
|
||||||
|
@Internal final vanilla = project.project(':mcp').file('build/mcp/downloadJson/version.json')
|
||||||
|
@Internal final timestamp = iso8601Now()
|
||||||
|
@Internal final 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/"
|
||||||
|
]
|
||||||
|
@Internal final id = "${project.rootProject.ext.MC_VERSION}-${project.name}${project.version.substring(project.rootProject.ext.MC_VERSION.length())}"
|
||||||
|
|
||||||
|
LauncherJson() {
|
||||||
|
getOutput().convention(project.layout.buildDirectory.file('version.json'))
|
||||||
|
|
||||||
|
dependsOn(':fmlloader:jar', 'universalJar')
|
||||||
|
getInput().from(project.tasks.universalJar.archiveFile,
|
||||||
|
project.project(':fmlloader').jar.archiveFile,
|
||||||
|
vanilla)
|
||||||
|
|
||||||
|
project.afterEvaluate {
|
||||||
|
packedDependencies.get().forEach {
|
||||||
|
def jarTask = project.rootProject.tasks.findByPath(it)
|
||||||
|
dependsOn(jarTask)
|
||||||
|
input.from jarTask.archiveFile
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
protected void exec() {
|
||||||
|
if (!json.libraries)
|
||||||
|
json.libraries = []
|
||||||
|
def libs = [:]
|
||||||
|
getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib }
|
||||||
|
getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib }
|
||||||
|
|
||||||
|
packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach {
|
||||||
|
def path = Util.getMavenPath(it)
|
||||||
|
def key = Util.getMavenDep(it)
|
||||||
|
|
||||||
|
libs[key] = [
|
||||||
|
name: key,
|
||||||
|
downloads: [
|
||||||
|
artifact: [
|
||||||
|
path: path,
|
||||||
|
url: "https://maven.minecraftforge.net/${path}",
|
||||||
|
sha1: it.archiveFile.get().asFile.sha1(),
|
||||||
|
size: it.archiveFile.get().asFile.length()
|
||||||
|
]
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
libs.each { key, lib -> json.libraries.add(lib) }
|
||||||
|
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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))) {
|
||||||
|
def 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()
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
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().compareTo(o.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
+57
@@ -0,0 +1,57 @@
|
|||||||
|
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 fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect {
|
||||||
|
def artifactId = it.split(':')[1]
|
||||||
|
return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}")
|
||||||
|
}.toArray(Dependency[]::new))
|
||||||
|
|
||||||
|
project.tasks.named('checkJarCompatibility') {
|
||||||
|
baseLibraries.from(project.provider {
|
||||||
|
fmlLibs.resolvedConfiguration.lenientConfiguration.files
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
import groovy.json.JsonBuilder
|
||||||
|
import groovy.json.JsonSlurper
|
||||||
|
import org.objectweb.asm.ClassReader
|
||||||
|
import org.objectweb.asm.Opcodes
|
||||||
|
import org.objectweb.asm.tree.ClassNode
|
||||||
|
|
||||||
|
import java.io.File
|
||||||
|
import java.security.MessageDigest
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.zip.ZipEntry
|
||||||
|
import java.util.zip.ZipInputStream
|
||||||
|
|
||||||
|
public class Util {
|
||||||
|
static final ASM_LEVEL = Opcodes.ASM9
|
||||||
|
|
||||||
|
static void init() {
|
||||||
|
File.metaClass.sha1 = { ->
|
||||||
|
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
||||||
|
delegate.eachByte 4096, {bytes, size ->
|
||||||
|
md.update(bytes, 0, size)
|
||||||
|
}
|
||||||
|
return md.digest().collect {String.format "%02x", it}.join()
|
||||||
|
}
|
||||||
|
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
|
||||||
|
|
||||||
|
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 = { ->
|
||||||
|
def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
|
||||||
|
def result = format.format(delegate)
|
||||||
|
return result[0..21] + ':' + result[22..-1]
|
||||||
|
}
|
||||||
|
|
||||||
|
String.metaClass.rsplit = { String del, int limit = -1 ->
|
||||||
|
def lst = new ArrayList()
|
||||||
|
def x = 0, idx
|
||||||
|
def 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String[] getClasspath(project, libs, artifact) {
|
||||||
|
def ret = []
|
||||||
|
artifactTree(project, artifact).each { key, lib ->
|
||||||
|
libs[lib.name] = lib
|
||||||
|
if (lib.name != artifact)
|
||||||
|
ret.add(lib.name)
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
public static def getArtifacts(project, config, classifiers) {
|
||||||
|
def ret = [:]
|
||||||
|
config.resolvedConfiguration.resolvedArtifacts.each {
|
||||||
|
def art = [
|
||||||
|
group: it.moduleVersion.id.group,
|
||||||
|
name: it.moduleVersion.id.name,
|
||||||
|
version: it.moduleVersion.id.version,
|
||||||
|
classifier: it.classifier,
|
||||||
|
extension: it.extension,
|
||||||
|
file: it.file
|
||||||
|
]
|
||||||
|
def key = art.group + ':' + art.name
|
||||||
|
def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/"
|
||||||
|
def filename = "${art.name}-${art.version}"
|
||||||
|
if (art.classifier != null)
|
||||||
|
filename += "-${art.classifier}"
|
||||||
|
filename += ".${art.extension}"
|
||||||
|
def path = "${folder}${filename}"
|
||||||
|
def url = "https://libraries.minecraft.net/${path}"
|
||||||
|
if (!checkExists(url)) {
|
||||||
|
url = "https://maven.minecraftforge.net/${path}"
|
||||||
|
}
|
||||||
|
ret[key] = [
|
||||||
|
name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
|
||||||
|
downloads: [
|
||||||
|
artifact: [
|
||||||
|
path: path,
|
||||||
|
url: url,
|
||||||
|
sha1: sha1(art.file),
|
||||||
|
size: art.file.length()
|
||||||
|
]
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
public static def getMavenPath(task) {
|
||||||
|
def classifier = task.archiveClassifier.get()
|
||||||
|
def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
|
||||||
|
return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar'
|
||||||
|
}
|
||||||
|
|
||||||
|
public static def getMavenDep(task) {
|
||||||
|
def classifier = task.archiveClassifier.get()
|
||||||
|
return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
public static def iso8601Now() { new Date().iso8601() }
|
||||||
|
|
||||||
|
public static def sha1(file) {
|
||||||
|
MessageDigest md = MessageDigest.getInstance('SHA-1')
|
||||||
|
file.eachByte 4096, {bytes, size ->
|
||||||
|
md.update(bytes, 0, size)
|
||||||
|
}
|
||||||
|
return md.digest().collect {String.format "%02x", it}.join()
|
||||||
|
}
|
||||||
|
|
||||||
|
private static def artifactTree(project, artifact) {
|
||||||
|
if (!project.ext.has('tree_resolver'))
|
||||||
|
project.ext.tree_resolver = 1
|
||||||
|
def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
|
||||||
|
def dep = project.dependencies.create(artifact)
|
||||||
|
cfg.dependencies.add(dep)
|
||||||
|
def files = cfg.resolve()
|
||||||
|
return getArtifacts(project, cfg, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean checkExists(url) {
|
||||||
|
try {
|
||||||
|
def code = new URL(url).openConnection().with {
|
||||||
|
requestMethod = 'HEAD'
|
||||||
|
connect()
|
||||||
|
responseCode
|
||||||
|
}
|
||||||
|
return code == 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(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)
|
||||||
|
}
|
||||||
|
|
||||||
|
static void processClassNodes(File file, Closure process) {
|
||||||
|
file.withInputStream { i ->
|
||||||
|
new ZipInputStream(i).withCloseable { zin ->
|
||||||
|
ZipEntry zein
|
||||||
|
while ((zein = zin.nextEntry) != null) {
|
||||||
|
if (zein.name.endsWith('.class')) {
|
||||||
|
def node = new ClassNode(ASM_LEVEL)
|
||||||
|
new ClassReader(zin).accept(node, 0)
|
||||||
|
process(node)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.forge.tasks
|
||||||
|
|
||||||
|
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() {
|
||||||
|
def mcVer = MinecraftVersion.from(mcVersion.get())
|
||||||
|
def 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 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])
|
||||||
|
def 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])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
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 ->
|
||||||
|
def 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)
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package net.minecraftforge.forge.tasks.checks
|
||||||
|
|
||||||
|
import groovy.transform.CompileStatic
|
||||||
|
|
||||||
|
@CompileStatic
|
||||||
|
enum CheckMode {
|
||||||
|
CHECK,
|
||||||
|
FIX
|
||||||
|
}
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
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('\\', '/')))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def accessChange(previous, current) {
|
||||||
|
//return ACCESS_MAP[previous] < ACCESS_MAP[current]
|
||||||
|
return previous != current
|
||||||
|
}
|
||||||
|
|
||||||
|
void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
|
||||||
|
final 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) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
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 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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
package net.minecraftforge.forge.tasks.checks
|
||||||
|
|
||||||
|
import groovy.transform.CompileStatic
|
||||||
|
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()
|
||||||
|
|
||||||
|
final 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') 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") }
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-36
@@ -2,15 +2,16 @@
|
|||||||
|
|
||||||
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 |
|
||||||
|--------------|-----------------------------|
|
|---------| ------------- |
|
||||||
| All versions | [Supported][Support-Policy] |
|
| 1.20.x | Active |
|
||||||
|
| 1.19.x | Legacy |
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -26,23 +27,10 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
*Latest build* there. Latest builds may have newer features but may be
|
*Latest build* there. Latest builds may have newer features but may be
|
||||||
more unstable as a result. The installer will attempt to install Forge
|
more unstable as a result. The installer will attempt to install Forge
|
||||||
into your vanilla launcher environment, where you can then create a new
|
into your vanilla launcher environment, where you can then create a new
|
||||||
profile using that version and play the game!
|
profile using that version and play the game!
|
||||||
|
|
||||||
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 |
|
|
||||||
|---------------|-------------------|
|
|
||||||
| 1.20.6+ | [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].
|
||||||
@@ -70,32 +58,19 @@ 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-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/
|
||||||
|
|
||||||
[Documentation]: https://docs.minecraftforge.net/
|
[Documentation]: https://docs.minecraftforge.net/en/1.20.1/
|
||||||
[Getting-Started]: https://docs.minecraftforge.net/en/latest/gettingstarted/
|
[Getting-Started]: https://docs.minecraftforge.net/en/1.20.1/gettingstarted/
|
||||||
[ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/
|
[ForgeDev]: https://docs.minecraftforge.net/en/1.20.1/forgedev/
|
||||||
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
[Pull-Requests]: https://docs.minecraftforge.net/en/1.20.1/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/
|
|
||||||
+57
-61
@@ -1,78 +1,74 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'com.github.ben-manes.versions'
|
||||||
id 'maven-publish'
|
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
||||||
alias libs.plugins.licenser
|
id 'org.cadixdev.licenser'
|
||||||
alias libs.plugins.gradleutils
|
|
||||||
alias libs.plugins.gitversion
|
|
||||||
alias libs.plugins.changelog
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
}
|
}
|
||||||
|
apply plugin: 'java-library'
|
||||||
|
apply plugin: 'jacoco'
|
||||||
|
apply plugin: 'org.javamodularity.moduleplugin'
|
||||||
|
|
||||||
gradleutils.displayName = 'FML'
|
dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
|
||||||
final vendor = 'Forge Development LLC'
|
|
||||||
description = 'Modifications to Minecraft to enable mod developers.'
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly libs.jetbrains.annotations
|
compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
|
||||||
|
|
||||||
api libs.eventbus
|
api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
|
||||||
|
|
||||||
implementation projects.fmlloader
|
implementation(project(':fmlloader'))
|
||||||
implementation libs.commons.io
|
implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
task sourcesJar(type: Jar) {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
archiveClassifier = 'sources'
|
||||||
withSourcesJar()
|
from sourceSets.main.allSource
|
||||||
|
}
|
||||||
|
|
||||||
|
ext {
|
||||||
|
MANIFESTS = [
|
||||||
|
'': [
|
||||||
|
'FMLModType': 'LIBRARY',
|
||||||
|
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
||||||
|
'Git-Commit': GIT_INFO.abbreviatedId,
|
||||||
|
'Git-Branch': GIT_INFO.branch,
|
||||||
|
'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}"
|
||||||
|
] as LinkedHashMap,
|
||||||
|
'net/minecraftforge/fml/loading/': [
|
||||||
|
'Specification-Title': 'FMLLoader',
|
||||||
|
'Specification-Vendor': 'Forge Development LLC',
|
||||||
|
'Specification-Version': '1',
|
||||||
|
'Implementation-Title': 'FML Loader',
|
||||||
|
'Implementation-Version': '1.0',
|
||||||
|
'Implementation-Vendor': 'Forge'
|
||||||
|
] as LinkedHashMap
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
jar.doFirst {
|
||||||
|
manifest.attributes['Automatic-Module-Name'] = project.name
|
||||||
|
MANIFESTS.each { pkg, values ->
|
||||||
|
if (pkg == '')
|
||||||
|
manifest.attributes(values)
|
||||||
|
else
|
||||||
|
manifest.attributes(values, pkg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
}
|
|
||||||
changelog {
|
include 'net/minecraftforge/'
|
||||||
from changelogBase
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
artifacts {
|
||||||
options.compilerArgs << '-Xlint:-unchecked'
|
archives jar
|
||||||
|
archives sourcesJar
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('jar', Jar) {
|
publishing.publications.mavenJava(MavenPublication) {
|
||||||
manifest {
|
from components.java
|
||||||
attributes([
|
artifact sourcesJar
|
||||||
'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 {
|
|
||||||
repositories {
|
|
||||||
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,39 +5,36 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
||||||
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
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.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 Bindings() {}
|
private static final Bindings INSTANCE = new 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() {
|
||||||
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
|
final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
|
||||||
*/
|
if (providers.size() != 1) {
|
||||||
public static Supplier<BusGroup> getForgeBus() {
|
throw new IllegalStateException("Could not find bindings provider");
|
||||||
return PROVIDER.getForgeBusSupplier();
|
}
|
||||||
|
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 PROVIDER.getMessageParser();
|
return INSTANCE.provider.getMessageParser();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
|
||||||
return PROVIDER.getConfigConfiguration();
|
return INSTANCE.provider.getConfigConfiguration();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,9 +57,7 @@ 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();
|
||||||
for (TaskInfo t : tasks) {
|
tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
|
||||||
makeRunnable(t, Runnable::run, aggregate);
|
|
||||||
}
|
|
||||||
timer.stop();
|
timer.stop();
|
||||||
if (aggregate.getSuppressed().length > 0) {
|
if (aggregate.getSuppressed().length > 0) {
|
||||||
LOGGER.fatal(
|
LOGGER.fatal(
|
||||||
@@ -116,7 +114,7 @@ public class DeferredWorkQueue
|
|||||||
return future;
|
return future;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class TaskInfo {
|
private static class TaskInfo {
|
||||||
private final ModContainer owner;
|
private final ModContainer owner;
|
||||||
private Runnable task;
|
private Runnable task;
|
||||||
private CompletableFuture<?> future;
|
private CompletableFuture<?> future;
|
||||||
|
|||||||
@@ -25,18 +25,7 @@ import java.util.function.Supplier;
|
|||||||
* <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 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>
|
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
*
|
|
||||||
* @deprecated Historically, this allowed for safe execution of code on the correct side by exploiting a low-level
|
|
||||||
* detail in Java 8, but in newer versions a simple if check is enough.
|
|
||||||
* <br>
|
|
||||||
* For example:
|
|
||||||
* <pre>{@code
|
|
||||||
* if (FMLEnvironment.dist.isClient()) {
|
|
||||||
* // client code here
|
|
||||||
* }
|
|
||||||
* }</pre>
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "1.21.5", forRemoval = true)
|
|
||||||
public final class DistExecutor
|
public final class DistExecutor
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
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<BusGroup> getForgeBusSupplier();
|
Supplier<IEventBus> getForgeBusSupplier();
|
||||||
Supplier<I18NParser> getMessageParser();
|
Supplier<I18NParser> getMessageParser();
|
||||||
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,6 @@ import java.util.function.Supplier;
|
|||||||
* @param <T> the type of the record which is held by the extension point
|
* @param <T> the type of the record which is held by the extension point
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused") // Type parameter T
|
@SuppressWarnings("unused") // Type parameter T
|
||||||
// TODO: Complete re-write, this hasnt actually be used in a generic way by mods and we could make it a lot simpler.
|
|
||||||
public interface IExtensionPoint<T extends Record>
|
public interface IExtensionPoint<T extends Record>
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@@ -41,7 +40,7 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
* where {@code true} means it is from the server and {@code false} means it is from the world save. The return
|
* where {@code true} means it is from the server and {@code false} means it is from the world save. The return
|
||||||
* value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
|
* value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
|
||||||
*
|
*
|
||||||
* <p>The local compatibility version may be of the value {@link DisplayTest#IGNORESERVERONLY},
|
* <p>The local compatibility version may be of the value {@link net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY},
|
||||||
* in which case clients will ignore the mod's presence if it is present on the server but not on the client.
|
* in which case clients will ignore the mod's presence if it is present on the server but not on the client.
|
||||||
* However, the remote version test predicate must still accept this value as a remote version in order to display
|
* However, the remote version test predicate must still accept this value as a remote version in order to display
|
||||||
* as compatible if the mod is present on the client.</p>
|
* as compatible if the mod is present on the client.</p>
|
||||||
@@ -95,7 +94,7 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
*/
|
*/
|
||||||
@SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
|
@SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
|
||||||
record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
|
record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
|
||||||
public static final String IGNORESERVERONLY = "SERVER_ONLY";
|
public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ignores any version information coming from the server - use for server only mods
|
* Ignores any version information coming from the server - use for server only mods
|
||||||
@@ -104,8 +103,6 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Ignores all information and provides no information
|
* Ignores all information and provides no information
|
||||||
* <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
|
|
||||||
* Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
|
|
||||||
*/
|
*/
|
||||||
public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
|
public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
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 java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -59,27 +61,27 @@ public interface IModLoadingState {
|
|||||||
/**
|
/**
|
||||||
* 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 Optional<CompletableFuture<Void>> buildTransition(
|
default <T extends Event & IModBusEvent>
|
||||||
final Executor syncExecutor,
|
Optional<CompletableFuture<Void>> buildTransition(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.completedFuture(null),
|
e -> CompletableFuture.runAsync(() -> {}, e),
|
||||||
e -> CompletableFuture.completedFuture(null)
|
e -> CompletableFuture.runAsync(() -> {}, e));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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
|
||||||
@@ -87,6 +89,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>
|
||||||
Optional<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,
|
||||||
|
|||||||
@@ -5,9 +5,12 @@
|
|||||||
|
|
||||||
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 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;
|
||||||
@@ -15,67 +18,103 @@ import java.util.function.Function;
|
|||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
@SuppressWarnings("unchecked")
|
||||||
|
|
||||||
public interface IModStateTransition {
|
public interface IModStateTransition {
|
||||||
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
|
|
||||||
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
|
|
||||||
|
|
||||||
static IModStateTransition buildNoopTransition() {
|
static IModStateTransition buildNoopTransition() {
|
||||||
return ModStateTransitionHelper.NOOP;
|
return new NoopTransition();
|
||||||
}
|
}
|
||||||
|
|
||||||
default CompletableFuture<Void> build(
|
default <T extends Event & IModBusEvent>
|
||||||
final String name,
|
CompletableFuture<Void> build(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>
|
||||||
* This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
|
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
|
||||||
* ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
|
final Executor parallelExecutor,
|
||||||
*/
|
final List<CompletableFuture<Void>> completableFutures,
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
final ProgressMeter progressBar,
|
||||||
default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
final EventGenerator<T> eventGenerator,
|
||||||
return () -> Stream.ofNullable(eventFunction());
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
|
||||||
}
|
final EventGenerator<T> nextGenerator) {
|
||||||
|
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
|
||||||
@Nullable
|
|
||||||
default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
|
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
|
||||||
return null;
|
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> {
|
||||||
* I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
|
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
||||||
* However, the Future returned by this was never linked to the main transition future in any way. Which means that it was run
|
|
||||||
* in parallel and couldn't guarantee the state of the ModContainer.
|
|
||||||
* <p>
|
|
||||||
* Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
|
|
||||||
* <p>
|
|
||||||
* If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
|
|
||||||
* <p>
|
|
||||||
* Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
|
|
||||||
|
|
||||||
interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
|
|
||||||
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ public class InterModComms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
|
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.
|
||||||
@@ -115,14 +115,16 @@ public class InterModComms
|
|||||||
return getMessages(modId, s->Boolean.TRUE);
|
return getMessages(modId, s->Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private record QueueFilteringSpliterator(
|
private static class QueueFilteringSpliterator implements Spliterator<IMCMessage>
|
||||||
ConcurrentLinkedQueue<IMCMessage> queue,
|
{
|
||||||
Predicate<String> methodFilter,
|
private final ConcurrentLinkedQueue<IMCMessage> queue;
|
||||||
Iterator<IMCMessage> iterator
|
private final Predicate<String> methodFilter;
|
||||||
) implements Spliterator<IMCMessage> {
|
private final Iterator<IMCMessage> iterator;
|
||||||
|
|
||||||
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
||||||
this(queue, methodFilter, queue.iterator());
|
this.queue = queue;
|
||||||
|
this.iterator = queue.iterator();
|
||||||
|
this.methodFilter = methodFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ 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.
|
||||||
@@ -26,7 +27,6 @@ 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,14 +41,16 @@ 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,19 +5,22 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
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.HashSet;
|
import java.util.HashMap;
|
||||||
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.Set;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
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.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
@@ -30,32 +33,33 @@ 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 EnumMap<>(ModLoadingStage.class);
|
protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
|
||||||
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);
|
||||||
final Set<ModContainer> dependencies = new HashSet<>();
|
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
||||||
/**
|
|
||||||
* If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
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;
|
||||||
this.modInfo = info;
|
this.modInfo = info;
|
||||||
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
||||||
|
|
||||||
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
|
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
|
||||||
.orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
|
|
||||||
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
|
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
|
||||||
case "MATCH_VERSION" -> // default displaytest checks for version string match
|
case "MATCH_VERSION" -> // default displaytest checks for version string match
|
||||||
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
|
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
|
||||||
@@ -77,35 +81,58 @@ 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 IModInfo getModInfo() {
|
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,7 +141,8 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,10 +167,7 @@ public abstract class ModContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void dispatchConfigEvent(IConfigEvent event) {
|
public void dispatchConfigEvent(IConfigEvent event) {
|
||||||
var handler = configHandler.orElse(null);
|
configHandler.ifPresent(configHandler->configHandler.accept(event));
|
||||||
if (handler != null) {
|
|
||||||
handler.accept(event);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -158,17 +183,9 @@ 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 IModBusEvent> void acceptEvent(T e) {}
|
protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,9 @@
|
|||||||
|
|
||||||
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.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;
|
||||||
@@ -12,15 +15,27 @@ 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 java.util.Collections;
|
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;
|
||||||
@@ -30,25 +45,27 @@ 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 class ModList
|
||||||
|
{
|
||||||
|
private static Logger LOGGER = LogManager.getLogger();
|
||||||
private static ModList INSTANCE;
|
private static ModList INSTANCE;
|
||||||
private final List<IModFileInfo> modFiles;
|
private final List<IModFileInfo> modFiles;
|
||||||
private final List<IModInfo> sortedList;
|
private final List<IModInfo> sortedList;
|
||||||
private final Map<String, IModFileInfo> fileById;
|
private final Map<String, ModFileInfo> fileById;
|
||||||
private List<ModContainer> mods;
|
private List<ModContainer> mods;
|
||||||
private Map<String, ModContainer> indexedMods;
|
private Map<String, ModContainer> indexedMods;
|
||||||
private List<ModFileScanData> modFileScanData;
|
private List<ModFileScanData> modFileScanData;
|
||||||
private List<ModContainer> sortedContainers;
|
private List<ModContainer> sortedContainers;
|
||||||
|
|
||||||
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
||||||
var modFileInfos = this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
|
{
|
||||||
this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
|
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
|
||||||
var byId = new HashMap<String, IModFileInfo>();
|
this.sortedList = sortedList.stream().
|
||||||
for (var file : modFileInfos) {
|
map(ModInfo.class::cast).
|
||||||
for (var mod : file.getMods())
|
collect(Collectors.toList());
|
||||||
byId.put(mod.getModId(), mod.getOwningFile());
|
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
|
||||||
}
|
map(ModInfo.class::cast).
|
||||||
this.fileById = Map.copyOf(byId);
|
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
||||||
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,20 +74,19 @@ public class ModList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String fileToLine(IModFile mf) {
|
private 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(),
|
||||||
mainMod.getDisplayName(),
|
mf.getModInfos().get(0).getDisplayName(),
|
||||||
mainMod.getModId(),
|
mf.getModInfos().get(0).getModId(),
|
||||||
mainMod.getVersion(),
|
mf.getModInfos().get(0).getVersion(),
|
||||||
getModContainerState(mainMod.getModId()),
|
getModContainerState(mf.getModInfos().get(0).getModId()),
|
||||||
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String crashReport() {
|
private String crashReport() {
|
||||||
return "\n" + applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
|
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
|
||||||
|
{
|
||||||
INSTANCE = new ModList(modFiles, sortedList);
|
INSTANCE = new ModList(modFiles, sortedList);
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
@@ -79,59 +95,123 @@ public class ModList {
|
|||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModFileInfo> getModFiles() {
|
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
||||||
|
ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
|
||||||
|
thread.setName("modloading-worker-" + thread.getPoolIndex());
|
||||||
|
// The default sets it to the SystemClassloader, so copy the current one.
|
||||||
|
thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
|
||||||
|
return thread;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<IModFileInfo> getModFiles()
|
||||||
|
{
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModFileInfo getModFileById(String modid) {
|
public IModFileInfo getModFileById(String modid)
|
||||||
|
{
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setLoadedMods(final List<ModContainer> modContainers) {
|
<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))
|
||||||
|
.collect(Collectors.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).collect(Collectors.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.mods = modContainers;
|
||||||
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
|
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
|
||||||
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T> Optional<T> getModObjectById(String modId) {
|
public <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 Optional<? extends ModContainer> getModContainerById(String modId)
|
||||||
|
{
|
||||||
return Optional.ofNullable(this.indexedMods.get(modId));
|
return Optional.ofNullable(this.indexedMods.get(modId));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
public 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 List<IModInfo> getMods()
|
||||||
|
{
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoaded(String modTarget) {
|
public boolean isLoaded(String modTarget)
|
||||||
|
{
|
||||||
return this.indexedMods.containsKey(modTarget);
|
return this.indexedMods.containsKey(modTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int size() {
|
public int size()
|
||||||
|
{
|
||||||
return mods.size();
|
return mods.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileScanData> getAllScanData() {
|
public List<ModFileScanData> getAllScanData()
|
||||||
if (modFileScanData == null) {
|
{
|
||||||
|
if (modFileScanData == null)
|
||||||
|
{
|
||||||
modFileScanData = this.sortedList.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 modFileScanData;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModFile(Consumer<IModFile> fileConsumer) {
|
public void forEachModFile(Consumer<IModFile> fileConsumer)
|
||||||
|
{
|
||||||
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -147,11 +227,13 @@ public class ModList {
|
|||||||
this.sortedContainers.forEach(containerConsumer);
|
this.sortedContainers.forEach(containerConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModContainer> getLoadedMods() {
|
|
||||||
return this.sortedContainers;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
public <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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import net.minecraftforge.eventbus.api.bus.BusGroup;
|
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.FMLEnvironment;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
@@ -32,6 +32,7 @@ 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 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;
|
||||||
|
|
||||||
@@ -71,68 +72,60 @@ 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 class ModLoader
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
private static ModLoader INSTANCE;
|
||||||
private final LoadingModList loadingModList;
|
private final LoadingModList loadingModList;
|
||||||
|
|
||||||
private final List<ModLoadingException> loadingExceptions;
|
private final List<ModLoadingException> loadingExceptions;
|
||||||
private final Set<IModInfo> erroredModInfos;
|
|
||||||
private final List<ModLoadingWarning> loadingWarnings;
|
private final List<ModLoadingWarning> loadingWarnings;
|
||||||
private final ModStateManager stateManager;
|
private final ModStateManager stateManager;
|
||||||
private static boolean loadingStateValid;
|
private boolean loadingStateValid;
|
||||||
private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
|
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
||||||
|
private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
|
||||||
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
||||||
private ModList modList;
|
private ModList modList;
|
||||||
|
|
||||||
private ModLoader() {
|
private ModLoader()
|
||||||
var loadingModList = this.loadingModList = FMLLoader.getLoadingModList();
|
{
|
||||||
var loadingExceptions = this.loadingExceptions = loadingModList.getErrors().stream()
|
INSTANCE = this;
|
||||||
|
this.loadingModList = FMLLoader.getLoadingModList();
|
||||||
|
this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
|
||||||
.flatMap(ModLoadingException::fromEarlyException)
|
.flatMap(ModLoadingException::fromEarlyException)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
this.loadingWarnings = loadingModList.getBrokenFiles().stream()
|
this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
|
||||||
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (loadingExceptions.isEmpty()) {
|
FMLLoader.getLoadingModList().getModFiles().stream()
|
||||||
this.erroredModInfos = Collections.emptySet();
|
|
||||||
} else {
|
|
||||||
this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
|
|
||||||
this.erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
|
|
||||||
}
|
|
||||||
loadingModList.getModFiles().stream()
|
|
||||||
.filter(ModFileInfo::missingLicense)
|
.filter(ModFileInfo::missingLicense)
|
||||||
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
|
.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()))
|
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
|
||||||
.forEach(this.loadingExceptions::add);
|
.forEach(this.loadingExceptions::add);
|
||||||
this.stateManager = new ModStateManager();
|
this.stateManager = new ModStateManager();
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
|
CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
|
||||||
CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
|
CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String computeLanguageList() {
|
private String computeLanguageList() {
|
||||||
return "\n" + FMLLoader.getLanguageLoadingProvider()
|
return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
.applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
|
|
||||||
.collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String computeModLauncherServiceList() {
|
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() {
|
public static ModLoader get()
|
||||||
return LazyInit.INSTANCE;
|
{
|
||||||
}
|
return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
|
||||||
|
|
||||||
private static final class LazyInit {
|
|
||||||
private static final ModLoader INSTANCE = new ModLoader();
|
|
||||||
private LazyInit() {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -149,23 +142,21 @@ public class ModLoader {
|
|||||||
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
|
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
|
||||||
loadingModList.getMods());
|
loadingModList.getMods());
|
||||||
if (!this.loadingExceptions.isEmpty()) {
|
if (!this.loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
var failedBounds = new ArrayList<ForgeFeature.Bound>();
|
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
|
||||||
for (var mod : loadingModList.getMods()) {
|
.map(ModInfo::getForgeFeatures)
|
||||||
for (var feature : mod.getForgeFeatures()) {
|
.flatMap(Collection::stream)
|
||||||
if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
|
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
|
||||||
failedBounds.add(feature);
|
.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.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(failedBounds.stream()
|
throw new LoadingFailedException(failedBounds.stream()
|
||||||
@@ -173,79 +164,38 @@ public class ModLoader {
|
|||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final var modContainers = new HashMap<String, ModContainer>();
|
final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
|
||||||
for (var file : loadingModList.getModFiles()) {
|
.map(ModFileInfo::getFile)
|
||||||
var containers = this.buildMods(file.getFile());
|
.map(this::buildMods)
|
||||||
for (var container : containers)
|
.<ModContainer>mapMulti(Iterable::forEach)
|
||||||
modContainers.put(container.getModId(), container);
|
.toList();
|
||||||
}
|
|
||||||
|
|
||||||
if (!loadingExceptions.isEmpty()) {
|
if (!loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
|
modList.setLoadedMods(modContainers);
|
||||||
// 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());
|
|
||||||
this.modList = modList;
|
this.modList = modList;
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
|
||||||
}
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
|
var stateList = stateManager.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().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
|
||||||
}
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
|
var stateList = stateManager.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().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
statusConsumer.accept("Mod loading complete - %d mods loaded".formatted(this.modList.size()));
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,73 +204,65 @@ public class ModLoader {
|
|||||||
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));
|
||||||
var inlineRunnable = state.inlineRunnable().orElse(null);
|
state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
|
||||||
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
|
|
||||||
|
|
||||||
var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
|
|
||||||
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
|
|
||||||
|
|
||||||
completedStates.add(state);
|
completedStates.add(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
|
private void handleInlineTransition(final Consumer<ModList> 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.accept(this.modList);
|
||||||
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 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) {
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
Throwable t = e.getCause();
|
Throwable t = e.getCause();
|
||||||
boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
|
final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
|
||||||
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
.filter(obj -> !(obj instanceof ModLoadingException))
|
||||||
if (hasNotModLoadingEx) {
|
.collect(Collectors.toList());
|
||||||
|
if (!notModLoading.isEmpty()) {
|
||||||
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.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)
|
||||||
.toList();
|
.collect(Collectors.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.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
throw new LoadingFailedException(modLoadingExceptions);
|
throw new LoadingFailedException(modLoadingExceptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ModContainer> buildMods(final IModFile modFile) {
|
private List<ModContainer> buildMods(final IModFile modFile)
|
||||||
final Map<String, IModInfo> modInfoMap = new HashMap<>();
|
{
|
||||||
for (var mod : modFile.getModFileInfo().getMods())
|
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
||||||
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 = new ArrayList<>();
|
final List<ModContainer> containers = modFile.getScanResult().getTargets()
|
||||||
for (var entry : modFile.getScanResult().getTargets().entrySet()) {
|
.entrySet()
|
||||||
var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
|
.stream()
|
||||||
if (container != null)
|
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
|
||||||
containers.add(container);
|
.filter(Objects::nonNull)
|
||||||
}
|
.collect(Collectors.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().collect(Collectors.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().collect(Collectors.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);
|
||||||
@@ -335,20 +277,17 @@ public class ModLoader {
|
|||||||
|
|
||||||
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
loadingExceptions.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).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
|
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
||||||
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
|
|
||||||
) {
|
|
||||||
try {
|
try {
|
||||||
IModInfo info = modInfoMap.get(modId);
|
final String modId = idToProviderEntry.getKey();
|
||||||
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
||||||
if (info == null)
|
IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
|
||||||
throw new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId);
|
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
||||||
|
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
|
||||||
@@ -363,73 +302,59 @@ 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 loadingStateValid;
|
return get().loadingStateValid;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @deprecated Use {@link #hasCompletedState(IModLoadingState)} instead */
|
|
||||||
@Deprecated(forRemoval = true)
|
|
||||||
public boolean hasCompletedState(final String stateName) {
|
public boolean hasCompletedState(final String stateName) {
|
||||||
IModLoadingState state = stateManager.findState(stateName);
|
IModLoadingState state = stateManager.findState(stateName);
|
||||||
return completedStates.contains(state);
|
return completedStates.contains(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasCompletedState(IModLoadingState state) {
|
public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
|
||||||
return completedStates.contains(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
for (var mod : ModList.get().getLoadedMods())
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
|
||||||
mod.acceptEvent(generator.apply(mod));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends IModBusEvent> void postEvent(T e) {
|
public <T extends Event & 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;
|
||||||
}
|
}
|
||||||
for (var mod : ModList.get().getLoadedMods())
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
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;
|
||||||
}
|
}
|
||||||
for (var mod : ModList.get().getLoadedMods())
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
mod.acceptEvent(e);
|
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
||||||
@SuppressWarnings("removal")
|
postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
||||||
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;
|
||||||
}
|
}
|
||||||
for (var mod : ModList.get().getLoadedMods()) {
|
ModList.get().forEachModInOrder(mc -> {
|
||||||
pre.accept(mod, e);
|
pre.accept(mc, e);
|
||||||
mod.acceptEvent(e);
|
mc.acceptEvent(e);
|
||||||
post.accept(mod, e);
|
post.accept(mc, e);
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModLoadingWarning> getWarnings() {
|
public List<ModLoadingWarning> getWarnings()
|
||||||
|
{
|
||||||
return ImmutableList.copyOf(this.loadingWarnings);
|
return ImmutableList.copyOf(this.loadingWarnings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addWarning(ModLoadingWarning warning) {
|
public void addWarning(ModLoadingWarning warning)
|
||||||
|
{
|
||||||
this.loadingWarnings.add(warning);
|
this.loadingWarnings.add(warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -439,7 +364,7 @@ public class ModLoader {
|
|||||||
return runningDataGen;
|
return runningDataGen;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class ErroredModContainer extends ModContainer {
|
private static class ErroredModContainer extends ModContainer {
|
||||||
public ErroredModContainer() {
|
public ErroredModContainer() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,63 +8,39 @@ 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;
|
||||||
* @deprecated Going to be moved to ForgeHooks for Internal use.
|
|
||||||
*/
|
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
|
||||||
public 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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Going to be moved to ForgeHooks for Internal use.
|
|
||||||
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
|
|
||||||
*/
|
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
|
||||||
public ModContainer getActiveContainer() {
|
public ModContainer getActiveContainer() {
|
||||||
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return {@link ModLoadingContext#getActiveContainer()} by default.
|
|
||||||
*/
|
|
||||||
public ModContainer getContainer() {
|
|
||||||
return getActiveContainer();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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
|
||||||
@@ -72,7 +48,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) {
|
||||||
getContainer().registerExtensionPoint(point, extension);
|
getActiveContainer().registerExtensionPoint(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -81,7 +57,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) {
|
||||||
getContainer().registerDisplayTest(() -> displayTest);
|
getActiveContainer().registerDisplayTest(() -> displayTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -90,7 +66,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) {
|
||||||
getContainer().registerDisplayTest(displayTest);
|
getActiveContainer().registerDisplayTest(displayTest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -100,7 +76,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) {
|
||||||
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -110,29 +86,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) {
|
||||||
getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
getActiveContainer().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, getContainer().getModId());
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getContainer().addConfig(new ModConfig(type, spec, getContainer()));
|
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
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, getContainer().getModId(), fileName);
|
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
|
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,10 @@
|
|||||||
|
|
||||||
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 java.util.Objects;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
@@ -25,27 +26,20 @@ 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(
|
public record ModLoadingState(String name, String previous,
|
||||||
String name,
|
Function<ModList, String> message,
|
||||||
String previous,
|
ToIntFunction<ModList> size,
|
||||||
Function<ModList, String> message,
|
ModLoadingPhase phase,
|
||||||
ToIntFunction<ModList> size,
|
Optional<Consumer<ModList>> inlineRunnable,
|
||||||
ModLoadingPhase phase,
|
Optional<IModStateTransition> transition) implements IModLoadingState {
|
||||||
Optional<Consumer<ModList>> inlineRunnable,
|
|
||||||
Optional<IModStateTransition> transition
|
|
||||||
) implements IModLoadingState {
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<CompletableFuture<Void>> buildTransition(
|
public <T extends Event & IModBusEvent>
|
||||||
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,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
||||||
) {
|
return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
|
||||||
var transition = this.transition.orElse(null);
|
|
||||||
return transition == null
|
|
||||||
? Optional.empty()
|
|
||||||
: Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,12 +49,9 @@ public record ModLoadingState(
|
|||||||
* @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 -> "", ml -> 0, phase, Optional.empty(), Optional.empty());
|
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -71,13 +62,11 @@ public record ModLoadingState(
|
|||||||
* @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 of(name, phase).after(previous).withTransition(transition);
|
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -89,14 +78,11 @@ public record ModLoadingState(
|
|||||||
* @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 Function<ModList, String> message, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return of(name, phase).after(previous).message(message).withTransition(transition);
|
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -108,75 +94,9 @@ public record ModLoadingState(
|
|||||||
* @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 Consumer<ModList> inline) {
|
||||||
return of(name, phase).after(previous).withInline(inline);
|
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
&& Objects.equals(this.previous, that.previous);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
int result = phase.hashCode();
|
|
||||||
result = 31 * result + name.hashCode();
|
|
||||||
result = 31 * result + Objects.hashCode(previous);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Builder {
|
|
||||||
private final String name;
|
|
||||||
private final ModLoadingPhase phase;
|
|
||||||
private String after;
|
|
||||||
private Function<ModList, String> message = null;
|
|
||||||
private ToIntFunction<ModList> 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(ml -> value); }
|
|
||||||
public Builder message(final Function<ModList, String> value) {
|
|
||||||
this.message = value;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Builder size(final int value) { return size(ml -> value); }
|
|
||||||
public Builder size(final ToIntFunction<ModList> value) {
|
|
||||||
this.size = value;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState empty() {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState withTransition(final IModStateTransition transition) {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState withInline(final Consumer<ModList> inline) {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,8 @@ 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 {
|
public class ModLoadingWarning
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Mod Info for mod with warning
|
* Mod Info for mod with warning
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -16,13 +16,15 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
@SuppressWarnings("UnstableApiUsage")
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
public class ModStateManager {
|
public class ModStateManager {
|
||||||
|
static ModStateManager INSTANCE;
|
||||||
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
||||||
|
|
||||||
public ModStateManager() {
|
public ModStateManager() {
|
||||||
|
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->{})
|
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
|
||||||
.map(IModStateProvider::getAllStates)
|
.map(IModStateProvider::getAllStates)
|
||||||
.flatMap(List::stream)
|
.<IModLoadingState>mapMulti(Iterable::forEach)
|
||||||
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,20 +36,16 @@ 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);
|
||||||
for (IModLoadingState node : nodes) {
|
nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
|
||||||
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 IModLoadingState findState(final String stateName) {
|
||||||
var result = stateMap.values()
|
return stateMap.values()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap(List::stream)
|
.flatMap(Collection::stream)
|
||||||
.filter(mls -> mls.name().equals(stateName))
|
.filter(mls -> mls.name().equals(stateName))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(null);
|
.orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
|
||||||
if (result != null) return result;
|
|
||||||
else throw new IllegalArgumentException("Unknown IModLoadingState: " + stateName);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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> void addCompletableFutureTaskForModDispatch(
|
|
||||||
final IModStateTransition transition,
|
|
||||||
final Executor executor,
|
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final EventGenerator<T> eventGenerator,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
|
|
||||||
) {
|
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
|
||||||
if (preDispatchHook != null)
|
|
||||||
completableFutures.add(preDispatchHook);
|
|
||||||
|
|
||||||
var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
|
|
||||||
for (var mod : ModList.get().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);
|
|
||||||
}
|
|
||||||
|
|
||||||
var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
|
|
||||||
completableFutures.add(dispatch);
|
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
|
||||||
if (postDispatchHook != null)
|
|
||||||
completableFutures.add(postDispatchHook);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static <T extends IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
|
|
||||||
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
|
|
||||||
return hookTyped.apply(executor, eventGenerator);
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
) {
|
|
||||||
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
|
||||||
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
|
|
||||||
|
|
||||||
@SuppressWarnings({ "removal", "unchecked" })
|
|
||||||
var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
|
|
||||||
for (int x = 0; x < events.size(); x++) {
|
|
||||||
var gen = events.get(x);
|
|
||||||
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
|
|
||||||
? transition.nextModLoadingStage()
|
|
||||||
: ModLoadingStage::currentState;
|
|
||||||
addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
|
|
||||||
}
|
|
||||||
|
|
||||||
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
|
||||||
final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::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 transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@ import static net.minecraftforge.fml.Logging.LOADING;
|
|||||||
public class ModWorkManager {
|
public 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 {
|
public interface DrivenExecutor extends Executor {
|
||||||
boolean selfDriven();
|
boolean selfDriven();
|
||||||
boolean driveOne();
|
boolean driveOne();
|
||||||
@@ -34,11 +33,8 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private static class SyncExecutor implements DrivenExecutor {
|
||||||
private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
|
private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>();
|
||||||
public SyncExecutor() {
|
|
||||||
this(new ConcurrentLinkedDeque<>());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean driveOne() {
|
public boolean driveOne() {
|
||||||
@@ -60,7 +56,13 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
|
private static class WrappingExecutor implements DrivenExecutor {
|
||||||
|
private final Executor wrapped;
|
||||||
|
|
||||||
|
public WrappingExecutor(final Executor executor) {
|
||||||
|
this.wrapped = executor;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean selfDriven() {
|
public boolean selfDriven() {
|
||||||
return true;
|
return true;
|
||||||
@@ -77,9 +79,11 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final SyncExecutor syncExecutor = new SyncExecutor();
|
private static SyncExecutor syncExecutor;
|
||||||
|
|
||||||
public static DrivenExecutor syncExecutor() {
|
public static DrivenExecutor syncExecutor() {
|
||||||
|
if (syncExecutor == null)
|
||||||
|
syncExecutor = new SyncExecutor();
|
||||||
return syncExecutor;
|
return syncExecutor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,8 +91,14 @@ public class ModWorkManager {
|
|||||||
return new WrappingExecutor(executor);
|
return new WrappingExecutor(executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static ForkJoinPool parallelThreadPool;
|
||||||
public static Executor parallelExecutor() {
|
public static Executor parallelExecutor() {
|
||||||
return LazyInit.PARALLEL_EXECUTOR;
|
if (parallelThreadPool == null) {
|
||||||
|
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) {
|
||||||
@@ -99,14 +109,4 @@ 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 final OptionalMod<?> EMPTY = new OptionalMod<>(true);
|
private static 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;
|
||||||
@@ -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<?> optionalMod) {
|
if (obj instanceof OptionalMod) {
|
||||||
return Objects.equals(optionalMod.modId, modId);
|
return Objects.equals(((OptionalMod)obj).modId, modId);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ package net.minecraftforge.fml;
|
|||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@@ -34,72 +35,81 @@ import java.util.zip.GZIPInputStream;
|
|||||||
|
|
||||||
import static net.minecraftforge.fml.VersionChecker.Status.*;
|
import static net.minecraftforge.fml.VersionChecker.Status.*;
|
||||||
|
|
||||||
public class VersionChecker {
|
public class VersionChecker
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20);
|
private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20);
|
||||||
private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15);
|
private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15);
|
||||||
|
|
||||||
public enum Status {
|
public enum Status
|
||||||
|
{
|
||||||
PENDING(),
|
PENDING(),
|
||||||
FAILED(),
|
FAILED(),
|
||||||
UP_TO_DATE(),
|
UP_TO_DATE(),
|
||||||
OUTDATED(3, true, true),
|
OUTDATED(3, true),
|
||||||
AHEAD(),
|
AHEAD(),
|
||||||
BETA(),
|
BETA(),
|
||||||
BETA_OUTDATED(6, true, true);
|
BETA_OUTDATED(6, true);
|
||||||
|
|
||||||
private final int sheetOffset;
|
final int sheetOffset;
|
||||||
private final boolean draw, animated;
|
final boolean draw, animated;
|
||||||
|
|
||||||
Status() {
|
Status()
|
||||||
|
{
|
||||||
this(0, false, false);
|
this(0, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
Status(int sheetOffset, boolean draw, boolean animated) {
|
Status(int sheetOffset)
|
||||||
|
{
|
||||||
|
this(sheetOffset, true, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
Status(int sheetOffset, boolean animated)
|
||||||
|
{
|
||||||
|
this(sheetOffset, true, animated);
|
||||||
|
}
|
||||||
|
|
||||||
|
Status(int sheetOffset, boolean draw, boolean animated)
|
||||||
|
{
|
||||||
this.sheetOffset = sheetOffset;
|
this.sheetOffset = sheetOffset;
|
||||||
this.draw = draw;
|
this.draw = draw;
|
||||||
this.animated = animated;
|
this.animated = animated;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSheetOffset() {
|
public int getSheetOffset()
|
||||||
|
{
|
||||||
return sheetOffset;
|
return sheetOffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean shouldDraw() {
|
public boolean shouldDraw()
|
||||||
|
{
|
||||||
return draw;
|
return draw;
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {}
|
||||||
|
|
||||||
public static void startVersionCheck() {
|
public static void startVersionCheck()
|
||||||
new Thread("Forge Version Check") {
|
{
|
||||||
|
new Thread("Forge Version Check")
|
||||||
|
{
|
||||||
private HttpClient client;
|
private HttpClient client;
|
||||||
private String mcVersion;
|
|
||||||
private String agent;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run()
|
||||||
if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK)) {
|
{
|
||||||
|
if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK))
|
||||||
|
{
|
||||||
LOGGER.info("Global Forge version check system disabled, no further processing.");
|
LOGGER.info("Global Forge version check system disabled, no further processing.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var mc = ModList.get().getModContainerById("minecraft");
|
|
||||||
var forge = ModList.get().getModContainerById("forge");
|
|
||||||
this.mcVersion = mc.get().getModInfo().getVersion().toString();
|
|
||||||
|
|
||||||
this.agent = "Java-http-client/" + System.getProperty("java.version")
|
|
||||||
+ " MinecraftForge/" + mcVersion + '-' + forge.get().getModInfo().getVersion();
|
|
||||||
|
|
||||||
client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build();
|
client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build();
|
||||||
gatherMods().forEach(this::process);
|
gatherMods().forEach(this::process);
|
||||||
}
|
}
|
||||||
@@ -109,9 +119,15 @@ public class VersionChecker {
|
|||||||
*/
|
*/
|
||||||
private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
|
private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
|
||||||
URL currentUrl = url;
|
URL currentUrl = url;
|
||||||
var userAgent = this.agent + ' ' + mod.getModId() + '/' + mod.getVersion();
|
|
||||||
|
|
||||||
for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++) {
|
final StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("Java-http-client/").append(System.getProperty("java.version")).append(' ');
|
||||||
|
sb.append("MinecraftForge/").append(FMLLoader.versionInfo().mcAndForgeVersion()).append(' ');
|
||||||
|
sb.append(mod.getModId()).append('/').append(mod.getVersion());
|
||||||
|
final String userAgent = sb.toString();
|
||||||
|
|
||||||
|
for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++)
|
||||||
|
{
|
||||||
var request = HttpRequest.newBuilder()
|
var request = HttpRequest.newBuilder()
|
||||||
.uri(currentUrl.toURI())
|
.uri(currentUrl.toURI())
|
||||||
.timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS))
|
.timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS))
|
||||||
@@ -123,7 +139,8 @@ public class VersionChecker {
|
|||||||
final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
|
final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
|
||||||
|
|
||||||
int responseCode = response.statusCode();
|
int responseCode = response.statusCode();
|
||||||
if (responseCode >= 300 && responseCode <= 399) {
|
if (responseCode >= 300 && responseCode <= 399)
|
||||||
|
{
|
||||||
String newLocation = response.headers().firstValue("Location")
|
String newLocation = response.headers().firstValue("Location")
|
||||||
.orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url));
|
.orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url));
|
||||||
currentUrl = new URL(currentUrl, newLocation);
|
currentUrl = new URL(currentUrl, newLocation);
|
||||||
@@ -133,22 +150,26 @@ public class VersionChecker {
|
|||||||
final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip");
|
final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip");
|
||||||
|
|
||||||
final String bodyStr;
|
final String bodyStr;
|
||||||
try (var inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body();
|
try (InputStream inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body())
|
||||||
var bufferedReader = new BufferedReader(new InputStreamReader(inStream))
|
{
|
||||||
) {
|
try (var bufferedReader = new BufferedReader(new InputStreamReader(inStream)))
|
||||||
bodyStr = bufferedReader.lines().collect(Collectors.joining("\n"));
|
{
|
||||||
|
bodyStr = bufferedReader.lines().collect(Collectors.joining("\n"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return bodyStr;
|
return bodyStr;
|
||||||
}
|
}
|
||||||
throw new IOException("Too many redirects while trying to fetch " + url);
|
throw new IOException("Too many redirects while trying to fetch " + url);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void process(IModInfo mod) {
|
private void process(IModInfo mod)
|
||||||
|
{
|
||||||
Status status = PENDING;
|
Status status = PENDING;
|
||||||
ComparableVersion target = null;
|
ComparableVersion target = null;
|
||||||
Map<ComparableVersion, String> changes = null;
|
Map<ComparableVersion, String> changes = null;
|
||||||
String display_url = null;
|
String display_url = null;
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
if (mod.getUpdateURL().isEmpty()) return;
|
if (mod.getUpdateURL().isEmpty()) return;
|
||||||
URL url = mod.getUpdateURL().get();
|
URL url = mod.getUpdateURL().get();
|
||||||
LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString());
|
LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString());
|
||||||
@@ -157,40 +178,54 @@ public class VersionChecker {
|
|||||||
|
|
||||||
LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
|
LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
|
||||||
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, Object> json = new Gson().fromJson(data, Map.class);
|
Map<String, Object> json = new Gson().fromJson(data, Map.class);
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, String> promos = (Map<String, String>)json.get("promos");
|
Map<String, String> promos = (Map<String, String>)json.get("promos");
|
||||||
display_url = (String)json.get("homepage");
|
display_url = (String)json.get("homepage");
|
||||||
|
|
||||||
|
var mcVersion = FMLLoader.versionInfo().mcVersion();
|
||||||
String rec = promos.get(mcVersion + "-recommended");
|
String rec = promos.get(mcVersion + "-recommended");
|
||||||
String lat = promos.get(mcVersion + "-latest");
|
String lat = promos.get(mcVersion + "-latest");
|
||||||
ComparableVersion current = new ComparableVersion(mod.getVersion().toString());
|
ComparableVersion current = new ComparableVersion(mod.getVersion().toString());
|
||||||
|
|
||||||
if (rec != null) {
|
if (rec != null)
|
||||||
|
{
|
||||||
ComparableVersion recommended = new ComparableVersion(rec);
|
ComparableVersion recommended = new ComparableVersion(rec);
|
||||||
int diff = recommended.compareTo(current);
|
int diff = recommended.compareTo(current);
|
||||||
|
|
||||||
if (diff == 0)
|
if (diff == 0)
|
||||||
status = UP_TO_DATE;
|
status = UP_TO_DATE;
|
||||||
else if (diff < 0) {
|
else if (diff < 0)
|
||||||
|
{
|
||||||
status = AHEAD;
|
status = AHEAD;
|
||||||
if (lat != null) {
|
if (lat != null)
|
||||||
|
{
|
||||||
ComparableVersion latest = new ComparableVersion(lat);
|
ComparableVersion latest = new ComparableVersion(lat);
|
||||||
if (current.compareTo(latest) < 0) {
|
if (current.compareTo(latest) < 0)
|
||||||
|
{
|
||||||
status = OUTDATED;
|
status = OUTDATED;
|
||||||
target = latest;
|
target = latest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
status = OUTDATED;
|
status = OUTDATED;
|
||||||
target = recommended;
|
target = recommended;
|
||||||
}
|
}
|
||||||
} else if (lat != null) {
|
}
|
||||||
|
else if (lat != null)
|
||||||
|
{
|
||||||
ComparableVersion latest = new ComparableVersion(lat);
|
ComparableVersion latest = new ComparableVersion(lat);
|
||||||
status = current.compareTo(latest) < 0 ? BETA_OUTDATED : BETA;
|
if (current.compareTo(latest) < 0)
|
||||||
|
status = BETA_OUTDATED;
|
||||||
|
else
|
||||||
|
status = BETA;
|
||||||
target = latest;
|
target = latest;
|
||||||
} else
|
}
|
||||||
|
else
|
||||||
status = BETA;
|
status = BETA;
|
||||||
|
|
||||||
LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target);
|
LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target);
|
||||||
@@ -198,30 +233,38 @@ public class VersionChecker {
|
|||||||
changes = new LinkedHashMap<>();
|
changes = new LinkedHashMap<>();
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, String> tmp = (Map<String, String>)json.get(mcVersion);
|
Map<String, String> tmp = (Map<String, String>)json.get(mcVersion);
|
||||||
if (tmp != null) {
|
if (tmp != null)
|
||||||
|
{
|
||||||
List<ComparableVersion> ordered = new ArrayList<>();
|
List<ComparableVersion> ordered = new ArrayList<>();
|
||||||
for (String key : tmp.keySet()) {
|
for (String key : tmp.keySet())
|
||||||
|
{
|
||||||
ComparableVersion ver = new ComparableVersion(key);
|
ComparableVersion ver = new ComparableVersion(key);
|
||||||
if (ver.compareTo(current) > 0 && (target == null || ver.compareTo(target) < 1))
|
if (ver.compareTo(current) > 0 && (target == null || ver.compareTo(target) < 1))
|
||||||
|
{
|
||||||
ordered.add(ver);
|
ordered.add(ver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Collections.sort(ordered);
|
Collections.sort(ordered);
|
||||||
|
|
||||||
for (ComparableVersion ver : ordered) {
|
for (ComparableVersion ver : ordered)
|
||||||
|
{
|
||||||
changes.put(ver, tmp.get(ver.toString()));
|
changes.put(ver, tmp.get(ver.toString()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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.get().getMods()) {
|
||||||
if (info.getUpdateURL().isPresent())
|
if (info.getUpdateURL().isPresent())
|
||||||
@@ -230,10 +273,12 @@ public class VersionChecker {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
|
private static 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,7 +14,6 @@ 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;
|
||||||
@@ -26,66 +25,9 @@ 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());
|
||||||
@@ -95,7 +37,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);
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -104,9 +46,13 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
||||||
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
try {
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
|
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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -114,16 +60,14 @@ 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 {
|
||||||
this.getWatcher().removeWatch(configPath);
|
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
||||||
if (!Files.isDirectory(file.getParent())) {
|
Files.createDirectories(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);
|
||||||
@@ -167,16 +111,17 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
private static class ConfigWatcher implements Runnable {
|
||||||
public String toString() {
|
private final ModConfig modConfig;
|
||||||
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
private final CommentedFileConfig commentedFileConfig;
|
||||||
}
|
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,9 +8,6 @@ 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.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.fml.DistExecutor;
|
|
||||||
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;
|
||||||
@@ -50,32 +47,15 @@ public class ConfigTracker {
|
|||||||
|
|
||||||
public void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
|
||||||
openConfig(config, configBasePath);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: [FML] This is only called for the server (outside of forceUnload)
|
|
||||||
// rethink config implementation for eventual FML rewrite
|
|
||||||
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
|
||||||
closeConfig(config, configBasePath);
|
|
||||||
}
|
|
||||||
ConfigFileTypeHandler.get(type).stopWatcher();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is a better way to do this, please tell me. Because this is FUCKED
|
private void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
public void forceUnload() {
|
|
||||||
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
|
|
||||||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
|
|
||||||
this.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);
|
||||||
@@ -83,7 +63,7 @@ public class ConfigTracker {
|
|||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void closeConfig(final ModConfig config, final Path configBasePath) {
|
private 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
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.event.InheritableEvent;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
import net.minecraftforge.fml.Bindings;
|
import net.minecraftforge.fml.Bindings;
|
||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
@@ -29,7 +29,7 @@ public interface IConfigEvent {
|
|||||||
ModConfig getConfig();
|
ModConfig getConfig();
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
default <T extends InheritableEvent & IConfigEvent> T self() {
|
default <T extends Event & IConfigEvent> T self() {
|
||||||
return (T) this;
|
return (T) this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,13 +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.get(type);
|
this.configHandler = ConfigFileTypeHandler.TOML;
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.INSTANCE.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,33 +5,8 @@
|
|||||||
|
|
||||||
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 mod lifecycle events dispatched on the
|
* Marker interface for events dispatched on the ModLifecycle event bus instead of the primary event bus
|
||||||
* {@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 extends InheritableEvent {
|
public interface IModBusEvent {
|
||||||
/**
|
|
||||||
* @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,11 +7,8 @@ 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,13 +7,11 @@ 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);
|
||||||
|
|
||||||
public static SidedThreadGroup get(boolean client) {
|
private SidedThreadGroups() {
|
||||||
return client ? CLIENT : SERVER;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private SidedThreadGroups() { }
|
|
||||||
}
|
}
|
||||||
+81
-105
@@ -1,117 +1,93 @@
|
|||||||
import org.gradle.api.plugins.jvm.JvmTestSuite
|
plugins {
|
||||||
|
id 'com.github.ben-manes.versions'
|
||||||
|
id 'org.javamodularity.moduleplugin' version '1.8.7' apply false
|
||||||
|
id 'org.cadixdev.licenser'
|
||||||
|
}
|
||||||
|
apply plugin: 'java-library'
|
||||||
|
apply plugin: 'jacoco'
|
||||||
|
apply plugin: 'org.javamodularity.moduleplugin'
|
||||||
|
|
||||||
import org.gradle.internal.os.OperatingSystem
|
import org.gradle.internal.os.OperatingSystem
|
||||||
|
|
||||||
plugins {
|
|
||||||
id 'java-library'
|
|
||||||
id 'jvm-test-suite'
|
|
||||||
id 'maven-publish'
|
|
||||||
alias libs.plugins.licenser
|
|
||||||
alias libs.plugins.gradleutils
|
|
||||||
alias libs.plugins.gitversion
|
|
||||||
alias libs.plugins.changelog
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
|
||||||
}
|
|
||||||
|
|
||||||
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 {
|
dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
|
||||||
withSourcesJar()
|
java.withSourcesJar()
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly('org.jetbrains:annotations:23.0.0')
|
||||||
|
implementation(project(':fmlloader'))
|
||||||
|
implementation(project(':fmlcore'))
|
||||||
|
implementation('org.lwjgl:lwjgl:3.3.1')
|
||||||
|
implementation('org.lwjgl:lwjgl-glfw:3.3.1')
|
||||||
|
implementation('org.lwjgl:lwjgl-opengl:3.3.1')
|
||||||
|
implementation('org.lwjgl:lwjgl-stb:3.3.1')
|
||||||
|
implementation('org.lwjgl:lwjgl-tinyfd:3.3.1')
|
||||||
|
implementation('org.slf4j:slf4j-api:1.8.0-beta4')
|
||||||
|
implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
|
||||||
|
testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2')
|
||||||
|
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")
|
||||||
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
}
|
||||||
|
|
||||||
|
ext {
|
||||||
|
MANIFESTS = [
|
||||||
|
'': [
|
||||||
|
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
||||||
|
'Git-Commit': GIT_INFO.abbreviatedId,
|
||||||
|
'Git-Branch': GIT_INFO.branch,
|
||||||
|
'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}",
|
||||||
|
] as LinkedHashMap,
|
||||||
|
'net/minecraftforge/fml/earlydisplay/': [
|
||||||
|
'Specification-Title': 'FMLEarlyDisplay',
|
||||||
|
'Specification-Vendor': 'Forge Development LLC',
|
||||||
|
'Specification-Version': '1',
|
||||||
|
'Implementation-Title': 'FML Early Display',
|
||||||
|
'Implementation-Version': '1.0',
|
||||||
|
'Implementation-Vendor': 'Forge'
|
||||||
|
] as LinkedHashMap
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
jar.doFirst {
|
||||||
|
MANIFESTS.each { pkg, values ->
|
||||||
|
if (pkg == '')
|
||||||
|
manifest.attributes(values)
|
||||||
|
else
|
||||||
|
manifest.attributes(values, pkg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
include 'net/minecraftforge/'
|
||||||
}
|
}
|
||||||
|
|
||||||
changelog {
|
publishing.publications.mavenJava(MavenPublication) {
|
||||||
from changelogBase
|
from components.java
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly libs.jetbrains.annotations
|
|
||||||
|
|
||||||
implementation projects.fmlloader
|
|
||||||
implementation projects.fmlcore
|
|
||||||
implementation libs.bundles.lwjgl
|
|
||||||
implementation earlyDisplayLibs.slf4j.api
|
|
||||||
implementation libs.jopt.simple
|
|
||||||
}
|
|
||||||
|
|
||||||
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
|
|
||||||
// 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() } }
|
|
||||||
}
|
|
||||||
|
|
||||||
testing.suites.named('test', JvmTestSuite) {
|
|
||||||
useJUnitJupiter('5.8.2')
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation earlyDisplayTestLibs.powermock.core
|
|
||||||
runtimeOnly earlyDisplayLibs.slf4j.jdk14
|
|
||||||
runtimeOnly.bundle lwjglTestLibs
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('jar', Jar) {
|
|
||||||
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 {
|
|
||||||
repositories {
|
|
||||||
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
-87
@@ -14,7 +14,9 @@ import net.minecraftforge.fml.loading.ImmediateWindowProvider;
|
|||||||
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.lwjgl.PointerBuffer;
|
import org.lwjgl.PointerBuffer;
|
||||||
|
import org.lwjgl.glfw.GLFWImage;
|
||||||
import org.lwjgl.glfw.GLFWVidMode;
|
import org.lwjgl.glfw.GLFWVidMode;
|
||||||
|
import org.lwjgl.stb.STBImage;
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
import org.lwjgl.system.MemoryUtil;
|
import org.lwjgl.system.MemoryUtil;
|
||||||
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
||||||
@@ -22,10 +24,13 @@ 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;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
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.ArrayList;
|
||||||
@@ -85,17 +90,11 @@ 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 static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
private ScheduledExecutorService renderScheduler;
|
||||||
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;
|
||||||
@@ -114,13 +113,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
public String name() {
|
public String name() {
|
||||||
return "fmlearlywindow";
|
return "fmlearlywindow";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Runnable initialize(String[] arguments) {
|
public Runnable initialize(String[] arguments) {
|
||||||
String mcVersion = FMLLoader.versionInfo().mcVersion();
|
|
||||||
String forgeVersion = FMLLoader.versionInfo().forgeVersion();
|
|
||||||
|
|
||||||
final OptionParser parser = new OptionParser();
|
final OptionParser parser = new OptionParser();
|
||||||
|
var mcversionopt = parser.accepts("fml.mcVersion").withRequiredArg().ofType(String.class);
|
||||||
|
var forgeversionopt = parser.accepts("fml.forgeVersion").withRequiredArg().ofType(String.class);
|
||||||
var widthopt = parser.accepts("width")
|
var widthopt = parser.accepts("width")
|
||||||
.withRequiredArg().ofType(Integer.class)
|
.withRequiredArg().ofType(Integer.class)
|
||||||
.defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
|
.defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
|
||||||
@@ -135,7 +132,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth);
|
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth);
|
||||||
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight);
|
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight);
|
||||||
fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE);
|
fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE);
|
||||||
if (System.getenv("FML_EARLY_WINDOW_DARK") != null) {
|
if (System.getenv("FML_EARLY_WINDOW_DARK")!= null) {
|
||||||
this.colourScheme = ColourScheme.BLACK;
|
this.colourScheme = ColourScheme.BLACK;
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@@ -154,9 +151,10 @@ 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 " + FMLLoader.versionInfo().forgeVersion()));
|
var forgeVersion = parsed.valueOf(forgeversionopt);
|
||||||
|
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading "+ forgeVersion));
|
||||||
performanceInfo = new PerformanceInfo();
|
performanceInfo = new PerformanceInfo();
|
||||||
return start(mcVersion, forgeVersion);
|
return start(parsed.valueOf(mcversionopt), forgeVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer
|
private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer
|
||||||
@@ -234,16 +232,16 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
|
crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage());
|
||||||
}
|
}
|
||||||
this.elements = new ArrayList<>(List.of(
|
this.elements = new ArrayList<>(List.of(
|
||||||
RenderElement.anvil(font),
|
RenderElement.anvil(font),
|
||||||
RenderElement.logMessageOverlay(font),
|
RenderElement.logMessageOverlay(font),
|
||||||
RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion),
|
RenderElement.forgeVersionOverlay(font, mcVersion+"-"+forgeVersion.split("-")[0]),
|
||||||
RenderElement.performanceBar(font),
|
RenderElement.performanceBar(font),
|
||||||
RenderElement.progressBars(font)
|
RenderElement.progressBars(font)
|
||||||
));
|
));
|
||||||
|
|
||||||
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.addFirst(RenderElement.squir());
|
this.elements.add(0, 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);
|
||||||
@@ -263,11 +261,7 @@ 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);
|
||||||
|
|
||||||
for (var itr = this.elements.iterator(); itr.hasNext(); ) {
|
this.elements.removeIf(element -> !element.render(context, framecount));
|
||||||
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++;
|
||||||
}
|
}
|
||||||
@@ -292,6 +286,11 @@ 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.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;
|
||||||
@@ -303,7 +302,14 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return this.glVersion;
|
return this.glVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void crashElegantly(String errorDetails) {
|
private 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");
|
||||||
@@ -359,15 +365,14 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
|
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
|
||||||
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
|
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
|
||||||
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
|
glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
|
||||||
|
if (mcVersion != null) {
|
||||||
String vanillaWindowTitle = "Minecraft* ";
|
// this emulates what we would get without early progress window
|
||||||
if (mcVersion != null) vanillaWindowTitle += mcVersion;
|
// as vanilla never sets these, so GLFW uses the first window title
|
||||||
|
// set them explicitly to avoid it using "FML early loading progress" as the class
|
||||||
// this emulates what we would get without early progress window
|
String vanillaWindowTitle = "Minecraft* " + mcVersion;
|
||||||
// as vanilla never sets these, so GLFW uses the first window title
|
glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
|
||||||
// set them explicitly to avoid it using "FML early loading progress" as the class
|
glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
|
||||||
glfwWindowHintString(GLFW_X11_CLASS_NAME, vanillaWindowTitle);
|
}
|
||||||
glfwWindowHintString(GLFW_X11_INSTANCE_NAME, vanillaWindowTitle);
|
|
||||||
|
|
||||||
long primaryMonitor = glfwGetPrimaryMonitor();
|
long primaryMonitor = glfwGetPrimaryMonitor();
|
||||||
if (primaryMonitor == 0) {
|
if (primaryMonitor == 0) {
|
||||||
@@ -389,8 +394,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}, 10, TimeUnit.SECONDS);
|
}, 10, TimeUnit.SECONDS);
|
||||||
int versidx = 0;
|
int versidx = 0;
|
||||||
var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
|
var skipVersions = FMLConfig.<String>getListConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SKIP_GL_VERSIONS);
|
||||||
boolean showHelpLog = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG);
|
final String[] lastGLError=new String[GL_VERSIONS.length];
|
||||||
final String[] lastGLError = new String[GL_VERSIONS.length];
|
|
||||||
do {
|
do {
|
||||||
final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
|
final var glVersionToTry = GL_VERSIONS[versidx][0] + "." + GL_VERSIONS[versidx][1];
|
||||||
if (skipVersions.contains(glVersionToTry)) {
|
if (skipVersions.contains(glVersionToTry)) {
|
||||||
@@ -399,23 +403,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
LOGGER.info("Trying GL version " + glVersionToTry);
|
LOGGER.info("Trying GL version " + glVersionToTry);
|
||||||
if (showHelpLog && versidx == 0) {
|
|
||||||
LOGGER.info("""
|
|
||||||
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
|
||||||
|
|
||||||
Possible solutions:
|
|
||||||
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
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, GL_VERSIONS[versidx][1]);
|
||||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||||
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
||||||
window = glfwCreateWindow(winWidth, winHeight, vanillaWindowTitle, 0L, 0L);
|
window = glfwCreateWindow(winWidth, winHeight, "Minecraft: Forge Loading...", 0L, 0L);
|
||||||
var erridx = versidx;
|
var erridx = versidx;
|
||||||
handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
|
handleLastGLFWError((error, description) -> lastGLError[erridx] = String.format("Trying %d.%d: GLFW error: [0x%X]%s", GL_VERSIONS[erridx][0], GL_VERSIONS[erridx][1], error, description));
|
||||||
if (lastGLError[versidx] != null) {
|
if (lastGLError[versidx] != null) {
|
||||||
@@ -443,9 +435,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.glVersion = gotVersion;
|
this.glVersion = gotVersion;
|
||||||
this.window = window;
|
this.window = window;
|
||||||
|
|
||||||
if (showHelpLog)
|
|
||||||
FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_LOG_HELP_MSG, false);
|
|
||||||
|
|
||||||
int[] x = new int[1];
|
int[] x = new int[1];
|
||||||
int[] y = new int[1];
|
int[] y = new int[1];
|
||||||
glfwGetMonitorPos(primaryMonitor, x, y);
|
glfwGetMonitorPos(primaryMonitor, x, y);
|
||||||
@@ -463,19 +452,19 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
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);
|
||||||
|
|
||||||
// Attempt setting the icon
|
// Attempt setting the icon
|
||||||
// int[] channels = new int[1];
|
int[] channels = new int[1];
|
||||||
// try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
|
try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
|
||||||
// final ByteBuffer imgBuffer;
|
final ByteBuffer imgBuffer;
|
||||||
// try (GLFWImage glfwImages = GLFWImage.malloc()) {
|
try (GLFWImage glfwImages = GLFWImage.malloc()) {
|
||||||
// imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
|
imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
|
||||||
// glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
|
glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
|
||||||
// glfwSetWindowIcon(window, glfwImgBuffer);
|
glfwSetWindowIcon(window, glfwImgBuffer);
|
||||||
// STBImage.stbi_image_free(imgBuffer);
|
STBImage.stbi_image_free(imgBuffer);
|
||||||
// }
|
}
|
||||||
// } catch (NullPointerException e) {
|
} catch (NullPointerException e) {
|
||||||
// System.err.println("Failed to load forge logo");
|
System.err.println("Failed to load forge logo");
|
||||||
// }
|
}
|
||||||
// handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
|
handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));
|
||||||
|
|
||||||
glfwSetFramebufferSizeCallback(window, this::fbResize);
|
glfwSetFramebufferSizeCallback(window, this::fbResize);
|
||||||
glfwSetWindowPosCallback(window, this::winMove);
|
glfwSetWindowPosCallback(window, this::winMove);
|
||||||
@@ -492,6 +481,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void badWindowHandler(final int code, final long desc) {
|
||||||
|
LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
|
||||||
|
}
|
||||||
|
|
||||||
private void winResize(long window, int width, int height) {
|
private void winResize(long window, int width, int height) {
|
||||||
if (window == this.window && width != 0 && height != 0) {
|
if (window == this.window && width != 0 && height != 0) {
|
||||||
this.winWidth = width;
|
this.winWidth = width;
|
||||||
@@ -511,7 +504,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.winY = y;
|
this.winY = y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
private 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);
|
||||||
@@ -603,25 +596,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
final var FORGE_MODULE = "net.minecraftforge.forge";
|
var fm = layer.findModule("forge").orElseThrow();
|
||||||
var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
|
getClass().getModule().addReads(fm);
|
||||||
if (forge_module == null)
|
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
|
||||||
throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
|
loadingOverlay = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
|
||||||
|
|
||||||
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() {
|
||||||
@@ -639,7 +617,8 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.addFirst(RenderElement.mojang(textureId, framecount));
|
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
||||||
|
// this.elements.get(0).retire(framecount + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|||||||
+6
-5
@@ -13,25 +13,26 @@ 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;
|
float memory;
|
||||||
private String text;
|
private String text;
|
||||||
|
|
||||||
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 = MEMORY_BEAN.getHeapMemoryUsage();
|
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
|
||||||
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
||||||
|
|
||||||
if (!showCPUUsage) {
|
if (!showCPUUsage) {
|
||||||
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
|
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +44,7 @@ public class PerformanceInfo {
|
|||||||
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
String text() {
|
String text() {
|
||||||
|
|||||||
+39
-30
@@ -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,9 +38,6 @@ 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> {}
|
||||||
|
|
||||||
@@ -59,18 +56,11 @@ 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;
|
||||||
@@ -85,7 +75,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 = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
final float fade = 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;
|
||||||
@@ -94,9 +84,19 @@ 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 {
|
||||||
int progress = frame % 100;
|
var progress = frame % 100;
|
||||||
return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
|
return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,8 +249,8 @@ public class RenderElement {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
private static Initializer 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,13 +264,14 @@ 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) {
|
||||||
private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
return ()->{
|
||||||
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);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,13 +281,21 @@ 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) {
|
||||||
return Math.clamp(num, min, max);
|
if (num < min) {
|
||||||
|
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) {
|
||||||
return Math.min(max, Math.max(num, min));
|
if (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,6 +11,8 @@ 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;
|
||||||
|
|
||||||
@@ -22,8 +24,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 static final int GLYPH_COUNT = 127 - 32;
|
private final int GLYPH_COUNT = 127-32;
|
||||||
private final Glyph[] glyphs;
|
private 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) {
|
||||||
@@ -120,7 +122,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 < GLYPH_COUNT && c > 32) {
|
if (c - 32 < this.GLYPH_COUNT && c > 32) {
|
||||||
yield this.glyphs[c - 32].charwidth();
|
yield this.glyphs[c - 32].charwidth();
|
||||||
} else {
|
} else {
|
||||||
yield 0;
|
yield 0;
|
||||||
@@ -151,7 +153,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 < GLYPH_COUNT && c > 32) {
|
if (c-32 < font.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;
|
||||||
|
|||||||
+85
-177
@@ -1,189 +1,97 @@
|
|||||||
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 'com.github.ben-manes.versions'
|
||||||
id 'jvm-test-suite'
|
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
||||||
id 'maven-publish'
|
id 'org.cadixdev.licenser'
|
||||||
alias libs.plugins.licenser
|
}
|
||||||
alias libs.plugins.gradleutils
|
apply plugin: 'java-library'
|
||||||
alias libs.plugins.gitversion
|
apply plugin: 'jacoco'
|
||||||
alias libs.plugins.changelog
|
apply plugin: 'org.javamodularity.moduleplugin'
|
||||||
alias libs.plugins.apt
|
|
||||||
id 'net.minecraftforge.forge.build.convention'
|
dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
|
||||||
|
configurations.forEach{ it.transitive = false }
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
|
||||||
|
|
||||||
|
api("org.ow2.asm:asm:${ASM_VERSION}")
|
||||||
|
api("org.ow2.asm:asm-tree:${ASM_VERSION}")
|
||||||
|
api("org.ow2.asm:asm-commons:${ASM_VERSION}")
|
||||||
|
api("net.minecraftforge:forgespi:${SPI_VERSION}")
|
||||||
|
api("net.minecraftforge:mergetool:${MERGETOOL_VERSION}:api")
|
||||||
|
api("org.apache.logging.log4j:log4j-api:${LOG4J_VERSION}")
|
||||||
|
api("org.slf4j:slf4j-api:${SLF4J_API_VERSION}")
|
||||||
|
api("com.google.guava:guava:${GUAVA_VERSION}")
|
||||||
|
api("com.google.code.gson:gson:${GSON_VERSION}")
|
||||||
|
api("org.apache.maven:maven-artifact:${APACHE_MAVEN_ARTIFACT_VERSION}")
|
||||||
|
api("org.apache.commons:commons-lang3:${APACHE_COMMONS_LANG3_VERSION}")
|
||||||
|
api("com.electronwill.night-config:core:${NIGHTCONFIG_VERSION}")
|
||||||
|
api("com.electronwill.night-config:toml:${NIGHTCONFIG_VERSION}")
|
||||||
|
api("cpw.mods:modlauncher:${MODLAUNCHER_VERSION}")
|
||||||
|
api("net.minecraftforge:coremods:${COREMODS_VERSION}")
|
||||||
|
api("com.mojang:logging:${MOJANG_LOGGING_VERSION}")
|
||||||
|
api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
|
||||||
|
api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
|
||||||
|
|
||||||
|
implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}")
|
||||||
|
implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
|
||||||
|
implementation("net.minecraftforge:accesstransformers:${ACCESSTRANSFORMERS_VERSION}")
|
||||||
|
implementation("net.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}")
|
||||||
|
// implementation("org.jline:jline:${JLINE_VERSION}")
|
||||||
|
|
||||||
|
implementation("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
|
||||||
|
annotationProcessor("org.apache.logging.log4j:log4j-core:${LOG4J_VERSION}")
|
||||||
|
|
||||||
|
testCompileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
|
||||||
|
testRuntimeOnly("cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}")
|
||||||
}
|
}
|
||||||
|
|
||||||
gradleutils.displayName = 'FMLLoader'
|
task sourcesJar(type: Jar) {
|
||||||
final vendor = 'Forge Development LLC'
|
archiveClassifier = 'sources'
|
||||||
description = 'Modifications to Minecraft to enable mod developers.'
|
from sourceSets.main.allSource
|
||||||
|
}
|
||||||
|
|
||||||
java {
|
ext {
|
||||||
toolchain.languageVersion = JavaLanguageVersion.of(javaVersion)
|
MANIFESTS = [
|
||||||
withSourcesJar()
|
'/': [
|
||||||
|
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
||||||
|
'Git-Commit': GIT_INFO.abbreviatedId,
|
||||||
|
'Git-Branch': GIT_INFO.branch,
|
||||||
|
'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}",
|
||||||
|
] as LinkedHashMap,
|
||||||
|
'net/minecraftforge/fml/loading/': [
|
||||||
|
'Specification-Title': 'FMLLoader',
|
||||||
|
'Specification-Vendor': 'Forge Development LLC',
|
||||||
|
'Specification-Version': '1',
|
||||||
|
'Implementation-Title': 'FML Loader',
|
||||||
|
'Implementation-Version': '1.0',
|
||||||
|
'Implementation-Vendor': 'Forge'
|
||||||
|
] as LinkedHashMap
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
jar.doFirst {
|
||||||
|
manifest.attributes['Automatic-Module-Name'] = project.name
|
||||||
|
MANIFESTS.each { pkg, values ->
|
||||||
|
manifest.attributes(values, pkg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.compilerArgs << '-Xlint:-unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
license {
|
license {
|
||||||
header = rootProject.file('LICENSE-header.txt')
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
|
||||||
|
include 'net/minecraftforge/'
|
||||||
}
|
}
|
||||||
|
|
||||||
changelog {
|
artifacts {
|
||||||
from changelogBase
|
archives jar
|
||||||
|
archives sourcesJar
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
publishing.publications.mavenJava(MavenPublication) {
|
||||||
compileOnly libs.jetbrains.annotations
|
from components.java
|
||||||
|
artifact sourcesJar
|
||||||
// TODO [FMLLoader] Figure out a better way to lock transitive dependencies to the explicit versions shipped by the isntaller
|
}
|
||||||
api(libs.bundles.asm ){ transitive = false } // Needed by all the black magic
|
|
||||||
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 }
|
|
||||||
|
|
||||||
// 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
|
||||||
options.compilerArgs << '-Xlint:unchecked'
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('jar', Jar) {
|
|
||||||
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 {
|
|
||||||
repositories {
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A simple task to write JSON to a file. Using Task#doLast to output files is no longer supported.
|
|
||||||
// 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'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+37
-28
@@ -34,10 +34,11 @@ import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
|||||||
* }</code>
|
* }</code>
|
||||||
* </pre>
|
* </pre>
|
||||||
*/
|
*/
|
||||||
public final class CapabilityTokenSubclass implements ILaunchPluginService {
|
public class CapabilityTokenSubclass implements ILaunchPluginService {
|
||||||
private static final String FUNC_NAME = "getType";
|
|
||||||
private static final String FUNC_DESC = "()Ljava/lang/String;";
|
private final String FUNC_NAME = "getType";
|
||||||
private static final String CAP_INJECT = "net/minecraftforge/common/capabilities/CapabilityToken"; // Don't directly reference this to prevent class loading.
|
private final String FUNC_DESC = "()Ljava/lang/String;";
|
||||||
|
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() {
|
||||||
@@ -48,48 +49,49 @@ public final 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 NAY;
|
return isEmpty ? NAY : YAY;
|
||||||
|
|
||||||
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)) {
|
{
|
||||||
for (MethodNode mtd : classNode.methods) {
|
if (CAP_INJECT.equals(classNode.name))
|
||||||
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)) {
|
}
|
||||||
var cls = new Object() { String value = null; };
|
else if (CAP_INJECT.equals(classNode.superName))
|
||||||
|
{
|
||||||
|
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;
|
||||||
@@ -104,8 +106,15 @@ public final 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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+110
@@ -0,0 +1,110 @@
|
|||||||
|
/*
|
||||||
|
* 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));
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {}
|
||||||
|
}
|
||||||
+26
-34
@@ -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;
|
||||||
@@ -20,6 +20,8 @@ import org.objectweb.asm.tree.MethodNode;
|
|||||||
|
|
||||||
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.Marker;
|
||||||
|
import org.slf4j.MarkerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modifies specified enums to allow runtime extension by making the $VALUES field non-final and
|
* Modifies specified enums to allow runtime extension by making the $VALUES field non-final and
|
||||||
@@ -28,16 +30,15 @@ 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 static final Type STRING = Type.getType(String.class);
|
private final Type STRING = Type.getType(String.class);
|
||||||
private static final Type ENUM = Type.getType(Enum.class);
|
private final Type ENUM = Type.getType(Enum.class);
|
||||||
private static final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
|
private final Type MARKER_IFACE = Type.getType("Lnet/minecraftforge/common/IExtensibleEnum;");
|
||||||
private static final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
|
private final Type ARRAY_UTILS = Type.getType("Lorg/apache/commons/lang3/ArrayUtils;"); //Don't directly reference this to prevent class loading.
|
||||||
private static final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
|
private final String ADD_DESC = Type.getMethodDescriptor(Type.getType(Object[].class), Type.getType(Object[].class), Type.getType(Object.class));
|
||||||
private static final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
|
private final Type UNSAFE_HACKS = Type.getType("Lnet/minecraftforge/fml/unsafe/UnsafeHacks;"); //Again, not direct reference to prevent class loading.
|
||||||
private static final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
|
private final String CLEAN_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Class.class));
|
||||||
private static final String NAME_DESC = Type.getMethodDescriptor(STRING);
|
private final String NAME_DESC = Type.getMethodDescriptor(STRING);
|
||||||
private static final String EQUALS_DESC = Type.getMethodDescriptor(Type.BOOLEAN_TYPE, STRING);
|
private 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() {
|
||||||
@@ -47,21 +48,10 @@ 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.get().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 NAY;
|
return isEmpty ? NAY : YAY;
|
||||||
|
|
||||||
String internalName = classType.getInternalName();
|
|
||||||
if (internalName.startsWith("net/minecraft/client/model") || internalName.startsWith("net/minecraft/world"))
|
|
||||||
return YAY;
|
|
||||||
|
|
||||||
return NAY;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -70,24 +60,25 @@ 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;
|
||||||
|
|
||||||
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
|
||||||
|
|
||||||
Type array = Type.getType("[" + classType.getDescriptor());
|
Type array = Type.getType("[" + classType.getDescriptor());
|
||||||
String arrayDesc = array.getDescriptor();
|
final int flags = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
|
||||||
|
|
||||||
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
//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"))
|
||||||
.toList();
|
.collect(Collectors.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());
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var mtd : candidates)
|
candidates.forEach(mtd ->
|
||||||
{
|
{
|
||||||
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)) {
|
||||||
@@ -119,7 +110,8 @@ 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;
|
||||||
System.arraycopy(args, 1, ctrArgs, 2, args.length - 1);
|
for (int x = 1; x < args.length; x++)
|
||||||
|
ctrArgs[1 + x] = args[x];
|
||||||
|
|
||||||
String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
|
String desc = Type.getMethodDescriptor(Type.VOID_TYPE, ctrArgs);
|
||||||
|
|
||||||
@@ -241,7 +233,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,14 +5,17 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
|
|
||||||
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 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 {
|
||||||
|
|||||||
+61
@@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import cpw.mods.modlauncher.api.NamedPath;
|
||||||
|
import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
public class ClasspathTransformerDiscoverer implements ITransformerDiscoveryService {
|
||||||
|
|
||||||
|
private final List<Path> legacyClasspath = Arrays.stream(System.getProperty("legacyClassPath", "").split(File.pathSeparator)).map(Path::of).toList();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<NamedPath> candidates(Path gameDirectory) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<NamedPath> candidates(final Path gameDirectory, final String launchTarget) {
|
||||||
|
if (launchTarget != null && launchTarget.contains("dev")) {
|
||||||
|
this.scan(gameDirectory);
|
||||||
|
}
|
||||||
|
return List.copyOf(found);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final static List<NamedPath> found = new ArrayList<>();
|
||||||
|
|
||||||
|
public static List<Path> allExcluded() {
|
||||||
|
return found.stream().map(np->np.paths()[0]).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void scan(final Path gameDirectory) {
|
||||||
|
try {
|
||||||
|
locateTransformers("META-INF/services/cpw.mods.modlauncher.api.ITransformationService");
|
||||||
|
locateTransformers("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator");
|
||||||
|
} catch (IOException e) {
|
||||||
|
LogManager.getLogger().error("Error during discovery of transform services from the classpath", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void locateTransformers(String resource) throws IOException {
|
||||||
|
final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources(resource);
|
||||||
|
while (resources.hasMoreElements()) {
|
||||||
|
URL url = resources.nextElement();
|
||||||
|
Path path = ClasspathLocatorUtils.findJarPathFor(resource, url.toString(), url);
|
||||||
|
if (legacyClasspath.stream().anyMatch(path::equals) || !Files.exists(path) || Files.isDirectory(path))
|
||||||
|
continue;
|
||||||
|
found.add(new NamedPath(path.toUri().toString(), path));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,8 +14,6 @@ import java.util.List;
|
|||||||
* or server.
|
* or server.
|
||||||
*/
|
*/
|
||||||
public class EarlyLoadingException extends RuntimeException {
|
public class EarlyLoadingException extends RuntimeException {
|
||||||
private static final long serialVersionUID = 2302192216172508006L;
|
|
||||||
|
|
||||||
public static class ExceptionData {
|
public static class ExceptionData {
|
||||||
private final IModInfo modInfo;
|
private final IModInfo modInfo;
|
||||||
private final String i18message;
|
private final String i18message;
|
||||||
|
|||||||
@@ -38,12 +38,12 @@ public class FMLConfig
|
|||||||
EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
|
EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"),
|
||||||
EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
|
EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
|
||||||
EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
|
EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
|
||||||
EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
|
|
||||||
;
|
;
|
||||||
|
|
||||||
private final String entry;
|
private final String entry;
|
||||||
private final Object defaultValue;
|
private final Object defaultValue;
|
||||||
private final String comment;
|
private final String comment;
|
||||||
|
private final Class<?> valueType;
|
||||||
private final Function<Object, Object> entryFunction;
|
private final Function<Object, Object> entryFunction;
|
||||||
|
|
||||||
ConfigValue(final String entry, final Object defaultValue, final String comment) {
|
ConfigValue(final String entry, final Object defaultValue, final String comment) {
|
||||||
@@ -53,6 +53,7 @@ public class FMLConfig
|
|||||||
this.entry = entry;
|
this.entry = entry;
|
||||||
this.defaultValue = defaultValue;
|
this.defaultValue = defaultValue;
|
||||||
this.comment = comment;
|
this.comment = comment;
|
||||||
|
this.valueType = defaultValue.getClass();
|
||||||
this.entryFunction = entryFunction;
|
this.entryFunction = entryFunction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,38 +8,44 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.Launcher;
|
import cpw.mods.modlauncher.Launcher;
|
||||||
import cpw.mods.modlauncher.api.*;
|
import cpw.mods.modlauncher.api.*;
|
||||||
|
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
||||||
|
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer;
|
import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModValidator;
|
import net.minecraftforge.fml.loading.moddiscovery.ModValidator;
|
||||||
import net.minecraftforge.accesstransformer.service.AccessTransformerService;
|
import net.minecraftforge.accesstransformer.service.AccessTransformerService;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
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.util.ArrayList;
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.*;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.ServiceConfigurationError;
|
|
||||||
import java.util.ServiceLoader;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
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 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 ILaunchPluginService eventBus;
|
||||||
private static LanguageLoadingProvider languageLoadingProvider;
|
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 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 VersionInfo versionInfo;
|
||||||
private static String launchHandlerName;
|
private static String launchHandlerName;
|
||||||
private static CommonLaunchHandler commonLaunchHandler;
|
private static CommonLaunchHandler commonLaunchHandler;
|
||||||
public static Runnable progressWindowTick;
|
public static Runnable progressWindowTick;
|
||||||
@@ -48,73 +54,80 @@ public class FMLLoader {
|
|||||||
private static boolean production;
|
private static boolean production;
|
||||||
private static IModuleLayerManager moduleLayerManager;
|
private static IModuleLayerManager moduleLayerManager;
|
||||||
|
|
||||||
static void onInitialLoad(IEnvironment env, Set<String> otherServices) throws IncompatibleEnvironmentException {
|
static void onInitialLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException
|
||||||
LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
|
{
|
||||||
LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
|
final String version = LauncherVersion.getVersion();
|
||||||
|
LOGGER.debug(CORE,"FML {} loading", version);
|
||||||
|
final Package modLauncherPackage = ITransformationService.class.getPackage();
|
||||||
|
LOGGER.debug(CORE,"FML found ModLauncher version : {}", modLauncherPackage.getImplementationVersion());
|
||||||
|
if (!modLauncherPackage.isCompatibleWith("4.0")) {
|
||||||
|
LOGGER.error(CORE, "Found incompatible ModLauncher specification : {}, version {} from {}", modLauncherPackage.getSpecificationVersion(), modLauncherPackage.getImplementationVersion(), modLauncherPackage.getImplementationVendor());
|
||||||
|
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
|
||||||
|
}
|
||||||
|
|
||||||
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
|
||||||
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
|
||||||
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
|
||||||
checkPackage(Environment.class, "2.0", "ForgeSPI");
|
});
|
||||||
|
|
||||||
|
final Package atPackage = accessTransformer.getClass().getPackage();
|
||||||
|
LOGGER.debug(CORE,"FML found AccessTransformer version : {}", atPackage.getImplementationVersion());
|
||||||
|
if (!atPackage.isCompatibleWith("1.0")) {
|
||||||
|
LOGGER.error(CORE, "Found incompatible AccessTransformer specification : {}, version {} from {}", atPackage.getSpecificationVersion(), atPackage.getImplementationVersion(), atPackage.getImplementationVendor());
|
||||||
|
throw new IncompatibleEnvironmentException("Incompatible accesstransformer found "+atPackage.getSpecificationVersion());
|
||||||
|
}
|
||||||
|
|
||||||
|
eventBus = environment.findLaunchPlugin("eventbus").orElseThrow(()-> {
|
||||||
|
LOGGER.error(CORE, "Event Bus library is missing, we need this to run");
|
||||||
|
return new IncompatibleEnvironmentException("Missing EventBus, cannot run");
|
||||||
|
});
|
||||||
|
|
||||||
|
final Package eventBusPackage = eventBus.getClass().getPackage();
|
||||||
|
LOGGER.debug(CORE,"FML found EventBus version : {}", eventBusPackage.getImplementationVersion());
|
||||||
|
if (!eventBusPackage.isCompatibleWith("1.0")) {
|
||||||
|
LOGGER.error(CORE, "Found incompatible EventBus specification : {}, version {} from {}", eventBusPackage.getSpecificationVersion(), eventBusPackage.getImplementationVersion(), eventBusPackage.getImplementationVendor());
|
||||||
|
throw new IncompatibleEnvironmentException("Incompatible eventbus found "+eventBusPackage.getSpecificationVersion());
|
||||||
|
}
|
||||||
|
|
||||||
|
runtimeDistCleaner = (RuntimeDistCleaner)environment.findLaunchPlugin("runtimedistcleaner").orElseThrow(()-> {
|
||||||
|
LOGGER.error(CORE, "Dist Cleaner is missing, we need this to run");
|
||||||
|
return new IncompatibleEnvironmentException("Missing DistCleaner, cannot run!");
|
||||||
|
});
|
||||||
|
LOGGER.debug(CORE, "Found Runtime Dist Cleaner");
|
||||||
|
|
||||||
|
var coreModProviders = ServiceLoaderUtils.streamWithErrorHandling(ServiceLoader.load(FMLLoader.class.getModule().getLayer(), ICoreModProvider.class), sce -> LOGGER.error(CORE, "Failed to load a coremod library, expect problems", sce)).toList();
|
||||||
|
|
||||||
|
if (coreModProviders.isEmpty()) {
|
||||||
|
LOGGER.error(CORE, "Found no coremod provider. Cannot run");
|
||||||
|
throw new IncompatibleEnvironmentException("No coremod library found");
|
||||||
|
} else if (coreModProviders.size() > 1) {
|
||||||
|
LOGGER.error(CORE, "Found multiple coremod providers : {}. Cannot run", coreModProviders.stream().map(p -> p.getClass().getName()).collect(Collectors.toList()));
|
||||||
|
throw new IncompatibleEnvironmentException("Multiple coremod libraries found");
|
||||||
|
}
|
||||||
|
|
||||||
|
coreModProvider = coreModProviders.get(0);
|
||||||
|
final Package coremodPackage = coreModProvider.getClass().getPackage();
|
||||||
|
LOGGER.debug(CORE,"FML found CoreMod version : {}", coremodPackage.getImplementationVersion());
|
||||||
|
|
||||||
|
|
||||||
|
LOGGER.debug(CORE, "Found ForgeSPI package implementation version {}", Environment.class.getPackage().getImplementationVersion());
|
||||||
|
LOGGER.debug(CORE, "Found ForgeSPI package specification {}", Environment.class.getPackage().getSpecificationVersion());
|
||||||
|
if (Integer.parseInt(Environment.class.getPackage().getSpecificationVersion()) < 2) {
|
||||||
|
LOGGER.error(CORE, "Found an out of date ForgeSPI implementation: {}, loading cannot continue", Environment.class.getPackage().getSpecificationVersion());
|
||||||
|
throw new IncompatibleEnvironmentException("ForgeSPI is out of date, we cannot continue");
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Class.forName("com.electronwill.nightconfig.core.Config", false, env.getClass().getClassLoader());
|
Class.forName("com.electronwill.nightconfig.core.Config", false, environment.getClass().getClassLoader());
|
||||||
Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, env.getClass().getClassLoader());
|
Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, environment.getClass().getClassLoader());
|
||||||
} catch (ClassNotFoundException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
LOGGER.error(CORE, "Failed to load NightConfig");
|
LOGGER.error(CORE, "Failed to load NightConfig");
|
||||||
throw new IncompatibleEnvironmentException("Missing NightConfig");
|
throw new IncompatibleEnvironmentException("Missing NightConfig");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
|
||||||
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
|
{
|
||||||
var plugin = env.findLaunchPlugin(id).orElse(null);
|
|
||||||
if (plugin == null) {
|
|
||||||
LOGGER.error(CORE, "{} library is missing, we need this to run", name);
|
|
||||||
throw new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
|
|
||||||
}
|
|
||||||
checkPackage(plugin.getClass(), version, name);
|
|
||||||
return (T) plugin;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
|
|
||||||
var pkg = cls.getPackage();
|
|
||||||
var info = JarVersionLookupHandler.getInfo(pkg);
|
|
||||||
LOGGER.debug(CORE, "Found {} version: {}", name, info.impl().version().orElse("MISSING"));
|
|
||||||
|
|
||||||
if (!pkg.isCompatibleWith(version)) {
|
|
||||||
LOGGER.error(CORE, "Found incompatible {} specification: {}, version {} from {}", name,
|
|
||||||
info.spec().version().orElse("MISSING"),
|
|
||||||
info.impl().version().orElse("MISSING"),
|
|
||||||
info.impl().vendor().orElse("MISSING")
|
|
||||||
);
|
|
||||||
throw new IncompatibleEnvironmentException("Incompatible " + name + " found " + info.spec().version().orElse("MISSING"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private static <T> T getSingleService(Class<T> clazz, String name) throws IncompatibleEnvironmentException {
|
|
||||||
var providers = new ArrayList<T>();
|
|
||||||
for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) {
|
|
||||||
try {
|
|
||||||
providers.add(itr.next());
|
|
||||||
} catch (ServiceConfigurationError e) {
|
|
||||||
LOGGER.error(CORE, "Failed to load a " + name + " library, expect problems", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (providers.isEmpty()) {
|
|
||||||
LOGGER.error(CORE, "Found no {} provider. Cannot run", name);
|
|
||||||
throw new IncompatibleEnvironmentException("No " + name + " library found");
|
|
||||||
} else if (providers.size() > 1) {
|
|
||||||
LOGGER.error(CORE, "Found multiple {} providers: {}. Cannot run", name, providers.stream().map(p -> p.getClass().getName()).toList());
|
|
||||||
throw new IncompatibleEnvironmentException("Multiple " + name + " libraries found");
|
|
||||||
}
|
|
||||||
|
|
||||||
return providers.get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) {
|
|
||||||
final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
|
final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
|
||||||
arguments.put("launchTarget", launchTarget);
|
arguments.put("launchTarget", launchTarget);
|
||||||
final Optional<ILaunchHandlerService> launchHandler = environment.findLaunchHandler(launchTarget);
|
final Optional<ILaunchHandlerService> launchHandler = environment.findLaunchHandler(launchTarget);
|
||||||
@@ -124,27 +137,31 @@ public class FMLLoader {
|
|||||||
throw new RuntimeException("Missing launch handler: " + launchTarget);
|
throw new RuntimeException("Missing launch handler: " + launchTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: [FML][Loader] What the fuck is the point of using a service if you require a specific concrete class
|
|
||||||
if (!(launchHandler.get() instanceof CommonLaunchHandler)) {
|
if (!(launchHandler.get() instanceof CommonLaunchHandler)) {
|
||||||
LOGGER.error(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName());
|
LOGGER.error(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName());
|
||||||
throw new RuntimeException("Incompatible launch handler found");
|
throw new RuntimeException("Incompatible launch handler found");
|
||||||
}
|
}
|
||||||
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
||||||
launchHandlerName = launchHandler.get().name();
|
launchHandlerName = launchHandler.get().name();
|
||||||
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Path.of(".").toAbsolutePath());
|
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());
|
||||||
|
|
||||||
naming = commonLaunchHandler.getNaming();
|
naming = commonLaunchHandler.getNaming();
|
||||||
dist = commonLaunchHandler.getDist();
|
dist = commonLaunchHandler.getDist();
|
||||||
production = commonLaunchHandler.isProduction();
|
production = commonLaunchHandler.isProduction();
|
||||||
|
|
||||||
accessTransformer.getExtension().accept(Map.entry(naming, "srg"));
|
versionInfo = new VersionInfo(arguments);
|
||||||
|
|
||||||
|
accessTransformer.getExtension().accept(Pair.of(naming, "srg"));
|
||||||
|
|
||||||
|
LOGGER.debug(CORE,"Received command line version data : {}", versionInfo);
|
||||||
|
|
||||||
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");
|
||||||
modValidator = ModDiscoverer.discoverMods(arguments);
|
modDiscoverer = new ModDiscoverer(arguments);
|
||||||
|
modValidator = modDiscoverer.discoverMods();
|
||||||
var pluginResources = modValidator.getPluginResources();
|
var pluginResources = modValidator.getPluginResources();
|
||||||
return List.of(pluginResources);
|
return List.of(pluginResources);
|
||||||
}
|
}
|
||||||
@@ -157,34 +174,48 @@ public class FMLLoader {
|
|||||||
return List.of(modValidator.getModResources());
|
return List.of(modValidator.getModResources());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LanguageLoadingProvider getLanguageLoadingProvider() {
|
public static ICoreModProvider getCoreModProvider() {
|
||||||
|
return coreModProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LanguageLoadingProvider getLanguageLoadingProvider()
|
||||||
|
{
|
||||||
return languageLoadingProvider;
|
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 {}", atPath, modName.getFilePath());
|
{
|
||||||
|
LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath());
|
||||||
accessTransformer.offerResource(atPath, modName.getFileName());
|
accessTransformer.offerResource(atPath, modName.getFileName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Dist getDist() {
|
public static Dist getDist()
|
||||||
|
{
|
||||||
return dist;
|
return dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void beforeStart(ModuleLayer gameLayer) {
|
public static void beforeStart(ModuleLayer gameLayer)
|
||||||
|
{
|
||||||
ImmediateWindowHandler.acceptGameLayer(gameLayer);
|
ImmediateWindowHandler.acceptGameLayer(gameLayer);
|
||||||
ImmediateWindowHandler.updateProgress("Launching minecraft");
|
ImmediateWindowHandler.updateProgress("Launching minecraft");
|
||||||
progressWindowTick.run();
|
progressWindowTick.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList getLoadingModList() {
|
public static LoadingModList getLoadingModList()
|
||||||
|
{
|
||||||
return loadingModList;
|
return loadingModList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Path getGamePath() {
|
public static Path getGamePath()
|
||||||
|
{
|
||||||
return gamePath;
|
return gamePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,7 +232,7 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<Map<String, String>> modLauncherModList() {
|
public static List<Map<String, String>> modLauncherModList() {
|
||||||
return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElse(List.of());
|
return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElseGet(Collections::emptyList);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String launcherHandlerName() {
|
public static String launcherHandlerName() {
|
||||||
|
|||||||
@@ -7,31 +7,53 @@ 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.ArgumentAcceptingOptionSpec;
|
||||||
|
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;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
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.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 final Map<String, Object> arguments = new HashMap<>();
|
private ArgumentAcceptingOptionSpec<String> modsOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> modListsOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> mavenRootsOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> forgeOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> mcOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> forgeGroupOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> mcpOption;
|
||||||
|
private ArgumentAcceptingOptionSpec<String> mappingsOption;
|
||||||
|
private List<String> modsArgumentList;
|
||||||
|
private List<String> modListsArgumentList;
|
||||||
|
private List<String> mavenRootsArgumentList;
|
||||||
|
private String targetForgeVersion;
|
||||||
|
private String targetMcVersion;
|
||||||
|
private String targetMcpVersion;
|
||||||
|
private String targetMcpMappings;
|
||||||
|
private String targetForgeGroup;
|
||||||
|
private Map<String, Object> arguments;
|
||||||
|
|
||||||
public FMLServiceProvider() {
|
public FMLServiceProvider()
|
||||||
var markers = System.getProperty("forge.logging.markers", "").split(",");
|
{
|
||||||
for (var marker : markers)
|
final String markerselection = System.getProperty("forge.logging.markers", "");
|
||||||
System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT");
|
Arrays.stream(markerselection.split(",")).forEach(marker -> System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name()
|
||||||
|
{
|
||||||
return "fml";
|
return "fml";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,6 +65,15 @@ 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<>();
|
||||||
|
arguments.put("modLists", modListsArgumentList);
|
||||||
|
arguments.put("mods", modsArgumentList);
|
||||||
|
arguments.put("mavenRoots", mavenRootsArgumentList);
|
||||||
|
arguments.put("forgeVersion", targetForgeVersion);
|
||||||
|
arguments.put("forgeGroup", targetForgeGroup);
|
||||||
|
arguments.put("mcVersion", targetMcVersion);
|
||||||
|
arguments.put("mcpVersion", targetMcpVersion);
|
||||||
|
arguments.put("mcpMappings", targetMcpMappings);
|
||||||
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);
|
||||||
@@ -61,13 +92,45 @@ public class FMLServiceProvider implements ITransformationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException {
|
public void onLoad(IEnvironment environment, Set<String> otherServices) throws IncompatibleEnvironmentException
|
||||||
|
{
|
||||||
|
// LOGGER.debug("Injecting tracing printstreams for STDOUT/STDERR.");
|
||||||
|
// System.setOut(new TracingPrintStream(LogManager.getLogger("STDOUT"), System.out));
|
||||||
|
// System.setErr(new TracingPrintStream(LogManager.getLogger("STDERR"), System.err));
|
||||||
FMLLoader.onInitialLoad(environment, otherServices);
|
FMLLoader.onInitialLoad(environment, otherServices);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull List<ITransformer> transformers() {
|
public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder)
|
||||||
return List.of();
|
{
|
||||||
|
forgeOption = argumentBuilder.apply("forgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required();
|
||||||
|
forgeGroupOption = argumentBuilder.apply("forgeGroup", "Forge Group (for testing)").withRequiredArg().ofType(String.class).defaultsTo("net.minecraftforge");
|
||||||
|
mcOption = argumentBuilder.apply("mcVersion", "Minecraft Version number").withRequiredArg().ofType(String.class).required();
|
||||||
|
mcpOption = argumentBuilder.apply("mcpVersion", "MCP Version number").withRequiredArg().ofType(String.class).required();
|
||||||
|
mappingsOption = argumentBuilder.apply("mcpMappings", "MCP Mappings Channel and Version").withRequiredArg().ofType(String.class);
|
||||||
|
modsOption = argumentBuilder.apply("mods", "List of mods to add").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
|
||||||
|
modListsOption = argumentBuilder.apply("modLists", "JSON modlists").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
|
||||||
|
mavenRootsOption = argumentBuilder.apply("mavenRoots", "Maven root directories").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void argumentValues(OptionResult option)
|
||||||
|
{
|
||||||
|
modsArgumentList = option.values(modsOption);
|
||||||
|
modListsArgumentList = option.values(modListsOption);
|
||||||
|
mavenRootsArgumentList = option.values(mavenRootsOption);
|
||||||
|
targetForgeVersion = option.value(forgeOption);
|
||||||
|
targetForgeGroup = option.value(forgeGroupOption);
|
||||||
|
targetMcVersion = option.value(mcOption);
|
||||||
|
targetMcpVersion = option.value(mcpOption);
|
||||||
|
targetMcpMappings = option.value(mappingsOption);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull List<ITransformer> transformers()
|
||||||
|
{
|
||||||
|
LOGGER.debug(CORE, "Loading coremod transformers");
|
||||||
|
return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
public class FileUtils
|
||||||
|
{
|
||||||
|
|
||||||
|
public static String fileExtension(final Path path) {
|
||||||
|
String fileName = path.getFileName().toString();
|
||||||
|
int idx = fileName.lastIndexOf('.');
|
||||||
|
if (idx > -1) {
|
||||||
|
return fileName.substring(idx+1);
|
||||||
|
} else {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean matchFileName(String path, String... matches) {
|
||||||
|
// Extract file name from path
|
||||||
|
String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length()));
|
||||||
|
// Check if it contains any of the desired keywords
|
||||||
|
for (String match : matches) {
|
||||||
|
if (name.contains(match)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
+10
-11
@@ -23,7 +23,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
private static ProgressMeter earlyProgress;
|
private static ProgressMeter earlyProgress;
|
||||||
public static void load(final String launchTarget, final String[] arguments) {
|
public static void load(final String launchTarget, final String[] arguments) {
|
||||||
if (!launchTarget.contains("client")) {
|
if (!List.of("forgeclient", "forgeclientuserdev", "forgeclientdev").contains(launchTarget)) {
|
||||||
provider = new DummyProvider();
|
provider = new DummyProvider();
|
||||||
LOGGER.info("ImmediateWindowProvider not loading because launch target is {}", launchTarget);
|
LOGGER.info("ImmediateWindowProvider not loading because launch target is {}", launchTarget);
|
||||||
} else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_CONTROL)) {
|
} else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_CONTROL)) {
|
||||||
@@ -32,16 +32,15 @@ public class ImmediateWindowHandler {
|
|||||||
} else {
|
} else {
|
||||||
final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER);
|
final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER);
|
||||||
LOGGER.info("Loading ImmediateWindowProvider {}", providername);
|
LOGGER.info("Loading ImmediateWindowProvider {}", providername);
|
||||||
for (var service : ServiceLoader.load(ImmediateWindowProvider.class)) {
|
final var maybeProvider = ServiceLoader.load(ImmediateWindowProvider.class)
|
||||||
if (providername.equals(service.name())) {
|
.stream()
|
||||||
provider = service;
|
.map(ServiceLoader.Provider::get)
|
||||||
break;
|
.filter(p -> Objects.equals(p.name(), providername))
|
||||||
}
|
.findFirst();
|
||||||
}
|
provider = maybeProvider.or(() -> {
|
||||||
if (provider == null) {
|
|
||||||
LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
|
LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername);
|
||||||
provider = new DummyProvider();
|
return Optional.of(new DummyProvider());
|
||||||
}
|
}).orElseThrow();
|
||||||
}
|
}
|
||||||
// Only update config if the provider isn't the dummy provider
|
// Only update config if the provider isn't the dummy provider
|
||||||
if (!Objects.equals(provider.name(), "dummyprovider"))
|
if (!Objects.equals(provider.name(), "dummyprovider"))
|
||||||
@@ -140,7 +139,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("net.minecraftforge.forge");
|
var fm = layer.findModule("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();
|
||||||
|
|||||||
+1
-42
@@ -11,72 +11,31 @@ import java.util.Optional;
|
|||||||
* Finds Version data from a package, with possible default values
|
* Finds Version data from a package, with possible default values
|
||||||
*/
|
*/
|
||||||
public class JarVersionLookupHandler {
|
public class JarVersionLookupHandler {
|
||||||
public record Version(Optional<String> title, Optional<String> vendor, Optional<String> version) {
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "[" +
|
|
||||||
"title=" + title.orElse(null) +
|
|
||||||
", vendor=" + vendor.orElse(null) +
|
|
||||||
", version=" + version.orElse(null) +
|
|
||||||
"]";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public record Info(Version spec, Version impl) {}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public static Info getInfo(String pkgName) {
|
|
||||||
return getInfo(Package.getPackage(pkgName));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Info getInfo(Class<?> clazz) {
|
|
||||||
return getInfo(clazz.getPackage());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Info getInfo(Package pkg) {
|
|
||||||
return new Info(
|
|
||||||
new Version(
|
|
||||||
Optional.ofNullable(pkg.getSpecificationTitle()),
|
|
||||||
Optional.ofNullable(pkg.getSpecificationVendor()),
|
|
||||||
Optional.ofNullable(pkg.getSpecificationVersion())
|
|
||||||
),
|
|
||||||
new Version(
|
|
||||||
Optional.ofNullable(pkg.getImplementationTitle()),
|
|
||||||
Optional.ofNullable(pkg.getImplementationVendor()),
|
|
||||||
Optional.ofNullable(pkg.getImplementationVersion())
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public static Optional<String> getImplementationVersion(final String pkgName) {
|
public static Optional<String> getImplementationVersion(final String pkgName) {
|
||||||
// Note that with Java 9, you'll probably want the module's version data, hence pulling this out
|
// Note that with Java 9, you'll probably want the module's version data, hence pulling this out
|
||||||
final String pkgVersion = Package.getPackage(pkgName).getImplementationVersion();
|
final String pkgVersion = Package.getPackage(pkgName).getImplementationVersion();
|
||||||
return Optional.ofNullable(pkgVersion);
|
return Optional.ofNullable(pkgVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public static Optional<String> getSpecificationVersion(final String pkgName) {
|
public static Optional<String> getSpecificationVersion(final String pkgName) {
|
||||||
// Note that with Java 9, you'll probably want the module's version data, hence pulling this out
|
// Note that with Java 9, you'll probably want the module's version data, hence pulling this out
|
||||||
final String pkgVersion = Package.getPackage(pkgName).getSpecificationVersion();
|
final String pkgVersion = Package.getPackage(pkgName).getSpecificationVersion();
|
||||||
return Optional.ofNullable(pkgVersion);
|
return Optional.ofNullable(pkgVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public static Optional<String> getImplementationVersion(final Class<?> clazz) {
|
public static Optional<String> getImplementationVersion(final Class<?> clazz) {
|
||||||
// With java 9 we'll use the module's version if it exists in preference.
|
// With java 9 we'll use the module's version if it exists in preference.
|
||||||
final String pkgVersion = clazz.getPackage().getImplementationVersion();
|
final String pkgVersion = clazz.getPackage().getImplementationVersion();
|
||||||
return Optional.ofNullable(pkgVersion);
|
return Optional.ofNullable(pkgVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public static Optional<String> getImplementationTitle(final Class<?> clazz) {
|
public static Optional<String> getImplementationTitle(final Class<?> clazz) {
|
||||||
// With java 9 we'll use the module's version if it exists in preference.
|
// With java 9 we'll use the module's version if it exists in preference.
|
||||||
final String pkgVersion = clazz.getPackage().getImplementationTitle();
|
final String pkgVersion = clazz.getPackage().getImplementationTitle();
|
||||||
return Optional.ofNullable(pkgVersion);
|
return Optional.ofNullable(pkgVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated(forRemoval = true, since = "1.20.2")
|
|
||||||
public static Optional<String> getSpecificationVersion(final Class<?> clazz) {
|
public static Optional<String> getSpecificationVersion(final Class<?> clazz) {
|
||||||
// With java 9 we'll use the module's version if it exists in preference.
|
// With java 9 we'll use the module's version if it exists in preference.
|
||||||
final String pkgVersion = clazz.getPackage().getSpecificationVersion();
|
final String pkgVersion = clazz.getPackage().getSpecificationVersion();
|
||||||
|
|||||||
+102
-76
@@ -7,19 +7,27 @@ package net.minecraftforge.fml.loading;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.Launcher;
|
import cpw.mods.modlauncher.Launcher;
|
||||||
import cpw.mods.modlauncher.api.IModuleLayerManager.Layer;
|
import cpw.mods.modlauncher.api.IModuleLayerManager;
|
||||||
|
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
||||||
|
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
|
||||||
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
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.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import java.net.URISyntaxException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
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.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.ServiceConfigurationError;
|
import java.util.Optional;
|
||||||
import java.util.ServiceLoader;
|
import java.util.ServiceLoader;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
@@ -28,97 +36,115 @@ 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 class LanguageLoadingProvider
|
||||||
public void forEach(Consumer<IModLanguageProvider> consumer) {
|
{
|
||||||
providers.forEach(consumer);
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
|
|
||||||
return providers.stream().map(function);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void reload() {
|
|
||||||
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 *
|
|
||||||
*==========================================================================*/
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private final List<IModLanguageProvider> languageProviders = new ArrayList<>();
|
||||||
private final ServiceLoader<IModLanguageProvider> serviceLoader;
|
private final ServiceLoader<IModLanguageProvider> serviceLoader;
|
||||||
private final List<IModLanguageProvider> providers = new ArrayList<>();
|
private final Map<String, ModLanguageWrapper> languageProviderMap = new HashMap<>();
|
||||||
private final Map<String, Wrapper> providersByName = new HashMap<>();
|
private List<Path> languagePaths = new ArrayList<>();
|
||||||
private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
|
|
||||||
|
|
||||||
private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
|
public void forEach(final Consumer<IModLanguageProvider> consumer)
|
||||||
|
{
|
||||||
|
languageProviders.forEach(consumer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T> Stream<T> applyForEach(final Function<IModLanguageProvider, T> function) {
|
||||||
|
return languageProviders.stream().map(function);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class ModLanguageWrapper {
|
||||||
|
private final IModLanguageProvider modLanguageProvider;
|
||||||
|
|
||||||
|
private final ArtifactVersion version;
|
||||||
|
public ModLanguageWrapper(IModLanguageProvider modLanguageProvider, ArtifactVersion version)
|
||||||
|
{
|
||||||
|
this.modLanguageProvider = modLanguageProvider;
|
||||||
|
this.version = version;
|
||||||
|
}
|
||||||
|
public ArtifactVersion getVersion()
|
||||||
|
{
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IModLanguageProvider getModLanguageProvider()
|
||||||
|
{
|
||||||
|
return modLanguageProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
LanguageLoadingProvider() {
|
LanguageLoadingProvider() {
|
||||||
var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
|
var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm->lm.getLayer(IModuleLayerManager.Layer.PLUGIN)).orElseThrow();
|
||||||
serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
|
serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
|
||||||
loadLanguageProviders();
|
loadLanguageProviders();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadLanguageProviders() {
|
private void loadLanguageProviders() {
|
||||||
providers.clear();
|
LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.error("Problem with language loaders")).count());
|
||||||
providersByName.clear();
|
serviceLoader.forEach(languageProviders::add);
|
||||||
|
|
||||||
serviceLoader.reload();
|
|
||||||
for (var itr = serviceLoader.iterator(); itr.hasNext(); ) {
|
|
||||||
try {
|
|
||||||
var srvc = itr.next();
|
|
||||||
providers.add(srvc);
|
|
||||||
} catch (ServiceConfigurationError sce) {
|
|
||||||
LOGGER.error(CORE, "Failed to load IModLauguageProvider Service: " + sce.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LOGGER.debug(CORE, "Found {} language providers", providers.size());
|
|
||||||
|
|
||||||
ImmediateWindowHandler.updateProgress("Loading language providers");
|
ImmediateWindowHandler.updateProgress("Loading language providers");
|
||||||
for (var provider : providers) {
|
languageProviders.forEach(lp -> {
|
||||||
var info = JarVersionLookupHandler.getInfo(provider.getClass());
|
final Path lpPath;
|
||||||
|
try {
|
||||||
if (info.impl().version().isEmpty() && FMLEnvironment.production) {
|
lpPath = Paths.get(lp.getClass().getProtectionDomain().getCodeSource().getLocation().toURI());
|
||||||
LOGGER.error(CORE, "Found unversioned language provider {}: {}", provider.name(), provider.getClass().getName());
|
} catch (URISyntaxException e) {
|
||||||
throw new RuntimeException("Failed to find implementation version for language provider " + provider.name() + " of type " + provider.getClass().getName());
|
throw new RuntimeException("Huh?", e);
|
||||||
}
|
}
|
||||||
|
Optional<String> implementationVersion = JarVersionLookupHandler.getImplementationVersion(lp.getClass());
|
||||||
|
String impl = implementationVersion.orElse(Files.isDirectory(lpPath) ? FMLLoader.versionInfo().forgeVersion().split("\\.")[0] : null);
|
||||||
|
if (impl == null) {
|
||||||
|
LOGGER.error(CORE, "Found unversioned language provider {}", lp.name());
|
||||||
|
throw new RuntimeException("Failed to find implementation version for language provider "+ lp.name());
|
||||||
|
}
|
||||||
|
LOGGER.debug(CORE, "Found language provider {}, version {}", lp.name(), impl);
|
||||||
|
ImmediateWindowHandler.updateProgress("Loaded language provider "+lp.name()+ " " + impl);
|
||||||
|
languageProviderMap.put(lp.name(), new ModLanguageWrapper(lp, new DefaultArtifactVersion(impl)));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
var version = info.impl().version().map(DefaultArtifactVersion::new).orElse(IN_DEV);
|
void addForgeLanguage(final Path forgePath) {
|
||||||
|
if (!languageProviderMap.containsKey("javafml")) {
|
||||||
LOGGER.debug(CORE, "Found language provider {}, version {}", provider.name(), version);
|
LOGGER.debug(CORE,"Adding forge as a language from {}", forgePath.toString());
|
||||||
ImmediateWindowHandler.updateProgress("Loaded language provider " + provider.name() + " " + version);
|
addLanguagePaths(Stream.of(forgePath));
|
||||||
providersByName.put(provider.name(), new Wrapper(version, provider));
|
serviceLoader.reload();
|
||||||
|
loadLanguageProviders();
|
||||||
|
} else {
|
||||||
|
LOGGER.debug(CORE, "Skipping adding forge jar - javafml is already present");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
|
private void addLanguagePaths(final Stream<Path> langPaths) {
|
||||||
var consumer = mod.getFileName();
|
languageProviders.clear();
|
||||||
var wrapper = providersByName.get(language);
|
languageProviderMap.clear();
|
||||||
|
// langPaths.peek(languagePaths::add).map(Path::toFile).map(File::toURI).map(rethrowFunction(URI::toURL)).forEach(languageClassLoader::addURL);
|
||||||
|
}
|
||||||
|
|
||||||
if (wrapper == null) {
|
public void addAdditionalLanguages(List<ModFile> modFiles)
|
||||||
LOGGER.error(LOADING, "Missing language {} version {} wanted by {}", language, versionRange, consumer);
|
{
|
||||||
var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, "null");
|
if (modFiles==null) return;
|
||||||
throw new EarlyLoadingException("Missing language " + language, null, List.of(data));
|
Stream<Path> langPaths = modFiles.stream().map(ModFile::getFilePath);
|
||||||
|
addLanguagePaths(langPaths);
|
||||||
|
serviceLoader.reload();
|
||||||
|
loadLanguageProviders();
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream<Path> getLibraries() {
|
||||||
|
return languagePaths.stream();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IModLanguageProvider findLanguage(ModFile mf, String modLoader, VersionRange modLoaderVersion) {
|
||||||
|
final String languageFileName = mf.getProvider() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName();
|
||||||
|
final ModLanguageWrapper mlw = languageProviderMap.get(modLoader);
|
||||||
|
if (mlw == null) {
|
||||||
|
LOGGER.error(LOADING,"Missing language {} version {} wanted by {}", modLoader, modLoaderVersion, languageFileName);
|
||||||
|
throw new EarlyLoadingException("Missing language "+modLoader, null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, "null")));
|
||||||
|
}
|
||||||
|
if (!VersionSupportMatrix.testVersionSupportMatrix(modLoaderVersion, modLoader, "languageloader", (llid, range) -> range.containsVersion(mlw.getVersion()))) {
|
||||||
|
LOGGER.error(LOADING,"Missing language {} version {} wanted by {}, found {}", modLoader, modLoaderVersion, languageFileName, mlw.getVersion());
|
||||||
|
throw new EarlyLoadingException("Missing language "+ modLoader + " matching range "+modLoaderVersion + " found "+mlw.getVersion(), null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, mlw.getVersion())));
|
||||||
}
|
}
|
||||||
|
|
||||||
var version = wrapper.version();
|
return mlw.getModLanguageProvider();
|
||||||
if (version == IN_DEV) {
|
|
||||||
LOGGER.debug(LOADING, "Language Provider {} version is unknown, but {} was requested by {}. Proceeding as this is development environement", language, versionRange, consumer);
|
|
||||||
return wrapper.service();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!versionRange.containsVersion(version)) {
|
|
||||||
LOGGER.error(LOADING, "Missing language {} version {} wanted by {}, found {}", language, versionRange, consumer, version);
|
|
||||||
var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, version);
|
|
||||||
throw new EarlyLoadingException("Missing language " + language + " matching range " + versionRange + " found " + version, null, List.of(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
return wrapper.service();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,19 +8,21 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
|
|
||||||
public class LauncherVersion {
|
public class LauncherVersion {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final String launcherVersion;
|
private static final String launcherVersion;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
var info = JarVersionLookupHandler.getInfo(LauncherVersion.class);
|
String vers = JarVersionLookupHandler.getImplementationVersion(LauncherVersion.class).orElse(System.getenv("LAUNCHER_VERSION"));
|
||||||
if (info.impl().version().isEmpty())
|
if (vers == null) throw new RuntimeException("Missing FMLLauncher version, cannot continue");
|
||||||
throw new IllegalStateException("Failed to find version for package " + LauncherVersion.class.getPackageName() + " This is an invalid environment");
|
launcherVersion = vers;
|
||||||
launcherVersion = info.impl().version().get();
|
LOGGER.debug(CORE, "Found FMLLauncher version {}", launcherVersion);
|
||||||
LOGGER.debug(LogMarkers.CORE, "Found FMLLauncher version {}", launcherVersion);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getVersion() {
|
public static String getVersion()
|
||||||
|
{
|
||||||
return launcherVersion;
|
return launcherVersion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import com.mojang.logging.LogUtils;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
public class LibraryFinder {
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static Path libsPath;
|
||||||
|
static Path findLibsPath() {
|
||||||
|
if (libsPath == null) {
|
||||||
|
libsPath = Path.of(System.getProperty("libraryDirectory","crazysnowmannonsense/cheezwhizz"));
|
||||||
|
if (!Files.isDirectory(libsPath)) {
|
||||||
|
throw new IllegalStateException("Missing libraryDirectory system property, cannot continue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return libsPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Path getForgeLibraryPath(final String mcVersion, final String forgeVersion, final String forgeGroup) {
|
||||||
|
Path forgePath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", "universal", mcVersion+"-"+forgeVersion));
|
||||||
|
LOGGER.debug(LogMarkers.CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath));
|
||||||
|
return forgePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
static String pathStatus(final Path path) {
|
||||||
|
return Files.exists(path) ? "present" : "missing";
|
||||||
|
}
|
||||||
|
|
||||||
|
static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) {
|
||||||
|
Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion));
|
||||||
|
Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion+"-"+mcpVersion));
|
||||||
|
Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion));
|
||||||
|
LOGGER.debug(LogMarkers.CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath));
|
||||||
|
LOGGER.debug(LogMarkers.CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath));
|
||||||
|
LOGGER.debug(LogMarkers.CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath));
|
||||||
|
return new Path[] { patchedBinariesPath, mcExtrasPath, srgMcPath };
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) {
|
||||||
|
return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version));
|
||||||
|
}
|
||||||
|
public static Path findPathForMaven(final String maven) {
|
||||||
|
return findLibsPath().resolve(MavenCoordinateResolver.get(maven));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,31 +5,31 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
||||||
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.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
|
||||||
|
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.ArrayList;
|
||||||
import java.util.Collection;
|
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.Map;
|
||||||
|
import java.util.NoSuchElementException;
|
||||||
import java.util.stream.Collectors;
|
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
|
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
||||||
* loading package</em>
|
* loading package</em>
|
||||||
*/
|
*/
|
||||||
public class LoadingModList {
|
public class LoadingModList
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
{
|
||||||
private static LoadingModList INSTANCE;
|
private static LoadingModList INSTANCE;
|
||||||
private final List<ModFileInfo> modFiles;
|
private final List<ModFileInfo> modFiles;
|
||||||
private final List<ModInfo> sortedList;
|
private final List<ModInfo> sortedList;
|
||||||
@@ -37,12 +37,15 @@ public class LoadingModList {
|
|||||||
private final List<EarlyLoadingException> preLoadErrors;
|
private final List<EarlyLoadingException> preLoadErrors;
|
||||||
private List<IModFile> brokenFiles;
|
private List<IModFile> brokenFiles;
|
||||||
|
|
||||||
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
||||||
|
{
|
||||||
this.modFiles = modFiles.stream()
|
this.modFiles = modFiles.stream()
|
||||||
.map(ModFile::getModFileInfo)
|
.map(ModFile::getModFileInfo)
|
||||||
.map(ModFileInfo.class::cast)
|
.map(ModFileInfo.class::cast)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
this.sortedList = sortedList.stream().toList();
|
this.sortedList = sortedList.stream()
|
||||||
|
.map(ModInfo.class::cast)
|
||||||
|
.collect(Collectors.toList());
|
||||||
this.fileById = this.modFiles.stream()
|
this.fileById = this.modFiles.stream()
|
||||||
.map(ModFileInfo::getMods)
|
.map(ModFileInfo::getMods)
|
||||||
.flatMap(Collection::stream)
|
.flatMap(Collection::stream)
|
||||||
@@ -51,48 +54,50 @@ public class LoadingModList {
|
|||||||
this.preLoadErrors = new ArrayList<>();
|
this.preLoadErrors = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
|
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
|
||||||
|
{
|
||||||
INSTANCE = new LoadingModList(modFiles, sortedList);
|
INSTANCE = new LoadingModList(modFiles, sortedList);
|
||||||
if (earlyLoadingException != null)
|
if (earlyLoadingException != null)
|
||||||
|
{
|
||||||
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
||||||
|
}
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList get() {
|
public static LoadingModList get() {
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
public void addCoreMods()
|
||||||
public void addAccessTransformers() {
|
{
|
||||||
var errors = new ArrayList<ExceptionData>();
|
modFiles.stream()
|
||||||
|
.map(ModFileInfo::getFile)
|
||||||
for (ModFileInfo modFile : modFiles) {
|
.map(ModFile::getCoreMods)
|
||||||
ModFile mod = modFile.getFile();
|
.flatMap(List::stream)
|
||||||
for (var at : mod.getAccessTransformers()) {
|
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
||||||
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())
|
|
||||||
preLoadErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
|
public void addAccessTransformers()
|
||||||
|
{
|
||||||
|
modFiles.stream()
|
||||||
|
.map(ModFileInfo::getFile)
|
||||||
|
.forEach(mod -> mod.getAccessTransformer().ifPresent(path -> FMLLoader.addAccessTransformer(path, mod)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addForScanning(BackgroundScanHandler backgroundScanHandler)
|
||||||
|
{
|
||||||
backgroundScanHandler.setLoadingModList(this);
|
backgroundScanHandler.setLoadingModList(this);
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFileInfo::getFile)
|
.map(ModFileInfo::getFile)
|
||||||
.forEach(backgroundScanHandler::submitForScanning);
|
.forEach(backgroundScanHandler::submitForScanning);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileInfo> getModFiles() {
|
public List<ModFileInfo> getModFiles()
|
||||||
|
{
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Path findResource(final String className) {
|
public Path findResource(final String className)
|
||||||
|
{
|
||||||
for (ModFileInfo mf : modFiles) {
|
for (ModFileInfo mf : modFiles) {
|
||||||
final Path resource = mf.getFile().findResource(className);
|
final Path resource = mf.getFile().findResource(className);
|
||||||
if (Files.exists(resource)) return resource;
|
if (Files.exists(resource)) return resource;
|
||||||
@@ -100,11 +105,55 @@ public class LoadingModList {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModFileInfo getModFileById(String modid) {
|
public Enumeration<URL> findAllURLsForResource(final String resName) {
|
||||||
|
final String resourceName;
|
||||||
|
// 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)
|
||||||
|
{
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModInfo> getMods() {
|
public List<ModInfo> getMods()
|
||||||
|
{
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class MCPNamingService implements INameMappingService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map.Entry<String, String> understanding() {
|
public Map.Entry<String, String> understanding() {
|
||||||
return Map.entry("srg", "mcp");
|
return Pair.of("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 = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
|
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.
|
||||||
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 = Path.of(groups[0]);
|
Path result = Paths.get(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]);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-26
@@ -10,10 +10,7 @@ import cpw.mods.jarhandling.SecureJar;
|
|||||||
import cpw.mods.modlauncher.Launcher;
|
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;
|
||||||
@@ -22,9 +19,10 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.ServiceLoader;
|
||||||
|
import java.util.zip.ZipFile;
|
||||||
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(
|
||||||
@@ -42,17 +40,6 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,15 +79,4 @@ 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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import com.mojang.logging.LogUtils;
|
||||||
|
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.net.URLConnection;
|
||||||
|
import java.net.URLStreamHandler;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.jar.Manifest;
|
||||||
|
|
||||||
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
|
|
||||||
|
public class ModJarURLHandler extends URLStreamHandler
|
||||||
|
{
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
// modjar://modid/path/to/file
|
||||||
|
@Override
|
||||||
|
protected URLConnection openConnection(URL url) {
|
||||||
|
return new ModJarURLConnection(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int hashCode(final URL u) {
|
||||||
|
return Objects.hash(u.getHost(), u.getFile());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean equals(final URL u1, final URL u2) {
|
||||||
|
return Objects.equals(u1.getProtocol(), u2.getProtocol())
|
||||||
|
&& Objects.equals(u1.getHost(), u2.getHost())
|
||||||
|
&& Objects.equals(u1.getFile(), u2.getFile());
|
||||||
|
}
|
||||||
|
|
||||||
|
static class ModJarURLConnection extends URLConnection {
|
||||||
|
private Path resource;
|
||||||
|
private String modpath;
|
||||||
|
private String modid;
|
||||||
|
private Optional<Manifest> manifest;
|
||||||
|
|
||||||
|
public ModJarURLConnection(final URL url) {
|
||||||
|
super(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void connect()
|
||||||
|
{
|
||||||
|
// if (resource == null) {
|
||||||
|
// modid = url.getHost();
|
||||||
|
// // trim first char
|
||||||
|
// modpath = url.getPath().substring(1);
|
||||||
|
// resource = FMLLoader.getLoadingModList().getModFileById(modid).getFile().findResource(modpath);
|
||||||
|
// manifest = FMLLoader.getLoadingModList().getModFileById(modid).getManifest();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public InputStream getInputStream() throws IOException
|
||||||
|
{
|
||||||
|
connect();
|
||||||
|
LOGGER.trace(CORE, "Loading modjar URL {} got resource {} {}", url, resource, resource != null ? Files.exists(resource) : "missing");
|
||||||
|
return Files.newInputStream(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getContentLengthLong() {
|
||||||
|
try {
|
||||||
|
connect();
|
||||||
|
return Files.size(resource);
|
||||||
|
} catch (IOException e) {
|
||||||
|
return -1L;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used to cache protectiondomains by "top level object" aka the modid
|
||||||
|
@Override
|
||||||
|
public URL getURL() {
|
||||||
|
return LamdbaExceptionUtils.uncheck(()->new URL("modjar://"+modid));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Optional<Manifest> getManifest() {
|
||||||
|
return manifest;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,7 +8,10 @@ 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.ModVersion;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator;
|
||||||
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
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;
|
||||||
@@ -19,251 +22,238 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
|
|||||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Collection;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import java.util.Comparator;
|
import java.util.function.Function;
|
||||||
import java.util.HashMap;
|
import java.util.jar.Manifest;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
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 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 record State(List<ModFile> files, List<ModInfo> mods) {}
|
private ModSorter(final List<ModFile> modFiles)
|
||||||
|
{
|
||||||
private ModSorter() {}
|
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
||||||
|
}
|
||||||
@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 {
|
||||||
modFiles = UniqueModListBuilder.buildUniqueList(mods).modFiles();
|
ms.buildUniqueList();
|
||||||
} 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
|
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
|
||||||
// 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.
|
|
||||||
return LoadingModList.of(systemMods.files(), systemMods.mods(), 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(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().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(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
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));
|
||||||
} 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 {
|
||||||
var sorted = sort(modFiles, named);
|
ms.sort();
|
||||||
return LoadingModList.of(sorted.files(), sorted.mods(), null);
|
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (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.
|
earlyLoadingException = e;
|
||||||
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
|
||||||
}
|
}
|
||||||
|
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
|
private void sort()
|
||||||
|
{
|
||||||
|
// 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));
|
||||||
|
|
||||||
int counter = 0;
|
final List<ModFileInfo> sorted;
|
||||||
var infos = new HashMap<ModInfo, Integer>();
|
try
|
||||||
for (var file : modFiles) {
|
{
|
||||||
if (file.getModFileInfo() instanceof ModFileInfo info) {
|
|
||||||
for (var imod : info.getMods()) {
|
|
||||||
var mod = (ModInfo)imod;
|
|
||||||
infos.put(mod, counter++);
|
|
||||||
graph.addNode(mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var file : modFiles) {
|
|
||||||
for (var info : file.getModInfos()) {
|
|
||||||
for (var dep : info.getDependencies()) {
|
|
||||||
// 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));
|
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
||||||
} catch (CyclePresentException e) {
|
}
|
||||||
Set<Set<ModInfo>> cycles = e.getCycles();
|
catch (CyclePresentException e)
|
||||||
var buf = new StringBuilder();
|
{
|
||||||
buf.append("Mod Sorting failed - Detected Cycles: \n");
|
Set<Set<ModFileInfo>> cycles = e.getCycles();
|
||||||
|
if (LOGGER.isErrorEnabled(LOADING))
|
||||||
var dataList = new ArrayList<ExceptionData>();
|
{
|
||||||
for (var cycle : cycles) {
|
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", 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');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
var dataList = cycles.stream()
|
||||||
LOGGER.error(LOADING, buf.toString());
|
.<ModFileInfo>mapMulti(Iterable::forEach)
|
||||||
|
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
|
||||||
|
.map(IModInfo::getModId)
|
||||||
|
.map(list -> new ExceptionData("fml.modloading.cycle", list))
|
||||||
|
.toList();
|
||||||
throw new EarlyLoadingException("Sorting error", e, dataList);
|
throw new EarlyLoadingException("Sorting error", e, dataList);
|
||||||
}
|
}
|
||||||
|
this.sortedList = sorted.stream()
|
||||||
var files = new LinkedHashSet<ModFile>();
|
.map(ModFileInfo::getMods)
|
||||||
var list = new ArrayList<ModInfo>();
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
|
.map(ModInfo.class::cast)
|
||||||
for (var mod : sorted) {
|
.collect(toList());
|
||||||
files.add(mod.getOwningFile().getFile());
|
this.modFiles = sorted.stream()
|
||||||
list.add(mod);
|
.map(ModFileInfo::getFile)
|
||||||
}
|
.collect(toList());
|
||||||
|
|
||||||
return new State(files.stream().toList(), list);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static State detectSystemMods(final List<ModFile> modFiles) {
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
|
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
||||||
|
{
|
||||||
|
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
||||||
|
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
||||||
|
// soft dep that doesn't exist. Just return. No edge required.
|
||||||
|
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buildUniqueList()
|
||||||
|
{
|
||||||
|
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");
|
final Set<String> systemMods = new HashSet<>();
|
||||||
|
// The minecraft mod is always a system mod
|
||||||
|
systemMods.add("minecraft");
|
||||||
|
// Find mod file from MinecraftLocator to define the system mods
|
||||||
|
modFiles.stream()
|
||||||
|
.filter(modFile -> modFile.getProvider().getClass() == MinecraftLocator.class)
|
||||||
|
.map(ModFile::getSecureJar)
|
||||||
|
.map(SecureJar::moduleDataProvider)
|
||||||
|
.map(SecureJar.ModuleDataProvider::getManifest)
|
||||||
|
.map(Manifest::getMainAttributes)
|
||||||
|
.map(mf -> mf.getValue("FML-System-Mods"))
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.findFirst()
|
||||||
|
.ifPresent(value -> systemMods.addAll(Arrays.asList(value.split(","))));
|
||||||
LOGGER.debug("Configured system mods: {}", systemMods);
|
LOGGER.debug("Configured system mods: {}", systemMods);
|
||||||
|
|
||||||
var mods = new ArrayList<ModInfo>();
|
this.systemMods = new ArrayList<>();
|
||||||
var files = new ArrayList<ModFile>();
|
for (String 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 record ModPair(ModFile file, ModInfo info) {}
|
|
||||||
private static ModPair findMod(final List<ModFile> modFiles, String name) {
|
|
||||||
for (var file : modFiles) {
|
|
||||||
for (var mod : file.getModFileInfo().getMods()) {
|
|
||||||
if (name.equals(mod.getModId()))
|
|
||||||
return new ModPair(file, (ModInfo)mod);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
|
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
||||||
final var modVersions = new HashMap<String, ArtifactVersion>();
|
{
|
||||||
final var modRequirements = new HashSet<ModVersion>();
|
final var modVersions = modFiles.stream()
|
||||||
int mandatoryRequired = 0;
|
.map(ModFile::getModInfos)
|
||||||
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
|
.collect(toMap(IModInfo::getModId, IModInfo::getVersion));
|
||||||
|
|
||||||
for (var file : files) {
|
final var modVersionDependencies = modFiles.stream()
|
||||||
for (var info : file.getModInfos()) {
|
.map(ModFile::getModInfos)
|
||||||
modVersions.put(info.getModId(), info.getVersion());
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
for (var dep : info.getDependencies()) {
|
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
|
||||||
if (dep.getSide().isCorrectSide()) {
|
|
||||||
if (modRequirements.add(dep) && dep.isMandatory())
|
|
||||||
mandatoryRequired++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
final var modRequirements = modVersionDependencies.values().stream()
|
||||||
|
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
|
||||||
|
.filter(mv -> mv.getSide().isCorrectSide())
|
||||||
|
.collect(toSet());
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
final var missingMandatory = new HashSet<ModVersion>();
|
if (!missingVersions.isEmpty()) {
|
||||||
final var missingOptional = new HashSet<ModVersion>();
|
if (mandatoryMissing > 0) {
|
||||||
|
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"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
for (var dep : modRequirements) {
|
return missingVersions.stream()
|
||||||
var modId = dep.getModId();
|
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
|
||||||
var existing = modVersions.get(modId);
|
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
|
||||||
|
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
|
||||||
if (!dep.isMandatory() && existing == null)
|
.toList();
|
||||||
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(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
|
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
||||||
var ret = new ArrayList<String>();
|
{
|
||||||
for (var dep : missing) {
|
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
||||||
var installed = modVersions.get(dep.getModId());
|
return String.format(
|
||||||
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'",
|
||||||
dep.getModId(),
|
dependency.getModId(),
|
||||||
dep.getOwner().getModId(),
|
dependency.getOwner().getModId(),
|
||||||
dep.getVersionRange(),
|
dependency.getVersionRange(),
|
||||||
installed != null ? installed.toString() : "[MISSING]"
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
));
|
);
|
||||||
}
|
|
||||||
return String.join("\n", ret);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
|
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
|
||||||
private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
|
{
|
||||||
return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
|
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
|
||||||
|
(range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,14 @@ 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;
|
||||||
@@ -22,232 +28,150 @@ 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 final class RuntimeDistCleaner implements ILaunchPluginService {
|
public 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);
|
||||||
private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
|
@Override
|
||||||
|
public String name()
|
||||||
|
{
|
||||||
|
return "runtimedistcleaner";
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
||||||
return "runtimedistcleaner";
|
{
|
||||||
|
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)
|
||||||
// TODO: [FML][RuntimeDistCleaner] In 26.1, only return YAY for MC classes on mod dev server
|
{
|
||||||
if (isEmpty)
|
return isEmpty ? NAY : YAY;
|
||||||
return NAY;
|
|
||||||
|
|
||||||
String internalName = classType.getInternalName();
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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);
|
|
||||||
final class LazyInit {
|
|
||||||
private LazyInit() {}
|
|
||||||
private static final boolean CAN_EXPLODE = !FMLEnvironment.production && "21.6".equals(FMLLoader.versionInfo().mcVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
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 (!annotations.isEmpty()) {
|
|
||||||
if (isNonMinecraftClass) {
|
|
||||||
if (LazyInit.CAN_EXPLODE)
|
|
||||||
throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
|
|
||||||
else
|
|
||||||
LOGGER.warn(DISTXFORM, "Class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", classNode.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!FMLEnvironment.production && hasModAnnotation(classNode.visibleAnnotations)) {
|
|
||||||
LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
|
|
||||||
throw new RuntimeException("Found @OnlyIn on @Mod class " + classNode.name + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
if (LazyInit.CAN_EXPLODE)
|
|
||||||
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");
|
|
||||||
else
|
|
||||||
LOGGER.warn(DISTXFORM, "Field {} in class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", field.name, classNode.name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
if (LazyInit.CAN_EXPLODE)
|
|
||||||
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");
|
|
||||||
else
|
|
||||||
LOGGER.warn(DISTXFORM, "Method {} in class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", method.name, classNode.name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 hasModAnnotation(final List<AnnotationNode> anns) {
|
|
||||||
if (anns == null || anns.isEmpty())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
for (var ann : anns) {
|
|
||||||
if (ann.desc.equals(MOD))
|
|
||||||
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 class LambdaGatherer extends MethodVisitor {
|
private static class LambdaGatherer extends MethodVisitor {
|
||||||
@@ -262,21 +186,23 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void accept(MethodNode method) {
|
public void accept(MethodNode method) {
|
||||||
for (var insn : method.instructions) {
|
Streams.stream(method.instructions.iterator()).
|
||||||
if (insn.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN)
|
filter(insnNode->insnNode.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN).
|
||||||
insn.accept(this);
|
forEach(insnNode->insnNode.accept(this));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
|
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs)
|
||||||
if (META_FACTORY.equals(bsm)) {
|
{
|
||||||
var handle = (Handle)bsmArgs[1];
|
if (META_FACTORY.equals(bsm))
|
||||||
dynamicLambdaHandles.add(handle);
|
{
|
||||||
|
Handle dynamicLambdaHandle = (Handle) bsmArgs[1];
|
||||||
|
dynamicLambdaHandles.add(dynamicLambdaHandle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Handle> getDynamicLambdaHandles() {
|
public List<Handle> getDynamicLambdaHandles()
|
||||||
|
{
|
||||||
return dynamicLambdaHandles;
|
return dynamicLambdaHandles;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,18 +5,19 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import com.google.common.collect.ImmutableMap;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
public class StringSubstitutor {
|
public class StringSubstitutor
|
||||||
private static final Map<String, String> GLOBALS = Map.of(
|
{
|
||||||
"mcVersion", FMLLoader.versionInfo().mcVersion(),
|
private static final Map<String,String> globals = ImmutableMap.of(
|
||||||
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
|
"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) {
|
||||||
@@ -24,19 +25,22 @@ public class StringSubstitutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static StrLookup<String> getStringLookup(final ModFile file) {
|
private static StrLookup<String> getStringLookup(final ModFile file) {
|
||||||
return new StrLookup<>() {
|
return new StrLookup<String>()
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public String lookup(String key) {
|
public String lookup(String key)
|
||||||
var parts = key.split("\\.");
|
{
|
||||||
if (parts.length == 1)
|
final String[] parts = key.split("\\.");
|
||||||
return key;
|
if (parts.length == 1) return key;
|
||||||
var pfx = parts[0];
|
final String 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]));
|
||||||
|
}
|
||||||
return key;
|
return key;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ 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;
|
||||||
@@ -17,19 +16,26 @@ 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;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
public class UniqueModListBuilder
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
|
{
|
||||||
public final class UniqueModListBuilder {
|
private final static Logger LOGGER = LogUtils.getLogger();
|
||||||
private UniqueModListBuilder() {}
|
|
||||||
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private final List<ModFile> modFiles;
|
||||||
|
|
||||||
|
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)
|
||||||
@@ -40,13 +46,13 @@ public final 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
|
||||||
final List<ModFile> uniqueModList = modFilesByFirstId.entrySet().stream()
|
uniqueModList = modFilesByFirstId.entrySet().stream()
|
||||||
.map(UniqueModListBuilder::selectNewestModInfo)
|
.map(this::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
|
||||||
final List<ModFile> uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
||||||
.map(UniqueModListBuilder::selectNewestModInfo)
|
.map(this::selectNewestModInfo)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// Transform to the full mod id list
|
// Transform to the full mod id list
|
||||||
@@ -57,40 +63,43 @@ public final 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 List<List<ModFile>> versionedLibs = uniqueLibListWithVersion.stream()
|
final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
|
||||||
.map(UniqueModListBuilder::getModId)
|
.map(UniqueModListBuilder::getModId)
|
||||||
.map(libFilesWithVersionByModuleName::get)
|
.collect(Collectors.toMap(
|
||||||
.toList();
|
Function.identity(),
|
||||||
|
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.getFirst().getModId(),
|
mods.get(0).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{}", String.join("\n", dupedModErrors));
|
LOGGER.error(LOADING, "Found duplicate mods:\n{}", dupedModErrors.stream().collect(joining("\n")));
|
||||||
throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
|
throw new EarlyLoadingException("Duplicate mods found", null, dupedModErrors.stream()
|
||||||
.map(EarlyLoadingException.ExceptionData::new)
|
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
final List<String> dupedLibErrors = versionedLibs.stream()
|
final List<String> dupedLibErrors = versionedLibIds.values().stream()
|
||||||
.filter(libModFiles -> libModFiles.size() > 1)
|
.filter(modFiles -> modFiles.size() > 1)
|
||||||
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
||||||
getModId(mods.getFirst()),
|
getModId(mods.get(0)),
|
||||||
mods.stream().map(ModFile::getFileName).collect(joining(", "))
|
mods.stream()
|
||||||
|
.map(modFile -> modFile.getFileName()).collect(joining(", "))
|
||||||
)).toList();
|
)).toList();
|
||||||
|
|
||||||
if (!dupedLibErrors.isEmpty()) {
|
if (!dupedLibErrors.isEmpty()) {
|
||||||
LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", String.join("\n", dupedLibErrors));
|
LOGGER.error(LOADING, "Found duplicate plugins or libraries:\n{}", dupedLibErrors.stream().collect(joining("\n")));
|
||||||
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
|
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, dupedLibErrors.stream()
|
||||||
.map(EarlyLoadingException.ExceptionData::new)
|
.map(s -> new EarlyLoadingException.ExceptionData(s))
|
||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,28 +107,30 @@ public final 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<>(uniqueModList);
|
final List<ModFile> loadedList = new ArrayList<>();
|
||||||
|
loadedList.addAll(uniqueModList);
|
||||||
loadedList.addAll(uniqueLibListWithVersion);
|
loadedList.addAll(uniqueLibListWithVersion);
|
||||||
|
|
||||||
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
private 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(UniqueModListBuilder::getVersion).reversed());
|
modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
|
||||||
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
|
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
|
||||||
}
|
}
|
||||||
return modInfoList.getFirst();
|
return modInfoList.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ArtifactVersion getVersion(final ModFile mf) {
|
private ArtifactVersion getVersion(final ModFile mf)
|
||||||
|
{
|
||||||
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
||||||
return mf.getJarVersion();
|
return mf.getJarVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
return mf.getModInfos().getFirst().getVersion();
|
return mf.getModInfos().get(0).getVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getModId(ModFile modFile) {
|
private static String getModId(ModFile modFile) {
|
||||||
@@ -127,8 +138,9 @@ public final class UniqueModListBuilder {
|
|||||||
return modFile.getSecureJar().name();
|
return modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
return modFile.getModFileInfo().getMods().getFirst().getModId();
|
return modFile.getModFileInfo().moduleName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -5,45 +5,18 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.util.Map;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
|
|
||||||
/** TODO: [FML][Loader] Remove VersionInfo - we shouldn't need to base any decisions on forge or mc version info at the loader level. So once I get a proper replacement i'm gunna kill this. */
|
|
||||||
public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersion, String forgeGroup) {
|
public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersion, String forgeGroup) {
|
||||||
|
VersionInfo(Map<String, ?> arguments) {
|
||||||
|
this((String) arguments.get("forgeVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion"), (String) arguments.get("forgeGroup"));
|
||||||
|
}
|
||||||
|
|
||||||
public String mcAndForgeVersion() {
|
public String mcAndForgeVersion() {
|
||||||
return mcVersion + "-" + forgeVersion;
|
return mcVersion+"-"+forgeVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String mcAndMCPVersion() {
|
public String mcAndMCPVersion() {
|
||||||
return mcVersion + "-" + mcpVersion;
|
return mcVersion + "-" + mcpVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================================================*
|
|
||||||
* INTERNAL SHIT *
|
|
||||||
*==========================================================================*/
|
|
||||||
private static final Gson GSON = new GsonBuilder().create();
|
|
||||||
private static <T> T readJson(String path, Class<T> type) {
|
|
||||||
try (var is = VersionInfo.class.getResourceAsStream(path)) {
|
|
||||||
if (is == null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
try (var reader = new InputStreamReader(is)) {
|
|
||||||
return GSON.fromJson(reader, type);
|
|
||||||
}
|
|
||||||
} catch (IOException | JsonSyntaxException e) {
|
|
||||||
throw new IllegalStateException("Failed to parse version info from " + path , e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static VersionInfo detect() {
|
|
||||||
var forge = readJson("/forge_version.json", JSON.class);
|
|
||||||
if (forge == null)
|
|
||||||
throw new IllegalStateException("Failed to find /forge_version.json This is a critical issue");
|
|
||||||
return new VersionInfo(forge.forge(), forge.mc(), forge.mcp(), "net.minecraftforge");
|
|
||||||
}
|
|
||||||
private record JSON(String forge, String mcp, String mc) {}
|
|
||||||
}
|
}
|
||||||
@@ -5,53 +5,36 @@
|
|||||||
|
|
||||||
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.Collections;
|
import java.util.ArrayList;
|
||||||
|
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 Map<String, List<ArtifactVersion>> OVERRIDE_VERSIONS;
|
private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
if ("1.21.1".equals(FMLLoader.versionInfo().mcVersion())) {
|
// final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
|
||||||
OVERRIDE_VERSIONS = Map.ofEntries(
|
// if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
|
||||||
// 1.21.1 is compatible with 1.21
|
// // 1.19.2 is Compatible with 1.19.1
|
||||||
entry("languageloader.javafml", "51"),
|
// add("languageloader.javafml", "42");
|
||||||
entry("mod.minecraft", "1.21"),
|
// add("mod.minecraft", "1.19.1");
|
||||||
entry("mod.forge", "51.0.33")
|
// add("mod.forge", "42.0.9");
|
||||||
);
|
// }
|
||||||
} else {
|
if (FMLLoader.versionInfo().mcVersion().equals("1.20.1")) {
|
||||||
OVERRIDE_VERSIONS = Collections.emptyMap();
|
add("mod.forge", "47.1.79");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private static void add(String key, String value) {
|
||||||
/**
|
overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
|
||||||
* @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
|
}
|
||||||
*/
|
public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
|
||||||
@Deprecated(forRemoval = true, since = "1.21.1")
|
|
||||||
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
|
|
||||||
if (standardLookup.test(lookupId, declaredRange)) return true;
|
if (standardLookup.test(lookupId, declaredRange)) return true;
|
||||||
return testVersionSupportMatrix(declaredRange, lookupId, type);
|
List<ArtifactVersion> custom = overrideVersions.get(type +"." +lookupId);
|
||||||
}
|
return custom == null ? false : custom.stream().anyMatch(declaredRange::containsVersion);
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, String declaredRange) {
|
|
||||||
return Map.entry(typeAndLookupId, List.of(new DefaultArtifactVersion(declaredRange)));
|
|
||||||
}
|
|
||||||
|
|
||||||
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,7 +18,9 @@ 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.
|
||||||
@@ -47,7 +49,10 @@ 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"))) {
|
||||||
options = new String[] { options[0], "disableAnsi=true" };
|
List<String> optionList = new ArrayList<>();
|
||||||
|
optionList.add(options[0]);
|
||||||
|
optionList.add("disableAnsi=true");
|
||||||
|
options = optionList.toArray(new String[0]);
|
||||||
}
|
}
|
||||||
return HighlightConverter.newInstance(config, options);
|
return HighlightConverter.newInstance(config, options);
|
||||||
}
|
}
|
||||||
|
|||||||
+52
@@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraftforge.forgespi.locating.IDependencyLocator;
|
||||||
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileModProvider implements IDependencyLocator
|
||||||
|
{
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
|
protected Optional<InputStream> loadResourceFromModFile(final IModFile modFile, final Path path) {
|
||||||
|
try {
|
||||||
|
return Optional.of(Files.newInputStream(modFile.findResource(path.toString())));
|
||||||
|
}
|
||||||
|
catch (final FileNotFoundException e) {
|
||||||
|
LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName());
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
catch (final Exception e) {
|
||||||
|
LOGGER.error("Failed to load resource {} from mod {}, cause {}", path, modFile.getFileName(), e);
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Optional<IModFile> loadModFileFrom(final IModFile file, final Path path) {
|
||||||
|
try {
|
||||||
|
final Path pathInModFile = file.findResource(path.toString());
|
||||||
|
return Optional.of(createMod(pathInModFile).file());
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
|
||||||
|
throw new ModFileLoadingException("Failed to load mod file "+file.getFileName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String identifyMod(final IModFile modFile) {
|
||||||
|
return modFile.getFileName();
|
||||||
|
}
|
||||||
|
}
|
||||||
Loaded 100 of 3719 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user