mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c5d527d71 | ||
|
|
e70dc0a4b7 | ||
|
|
e5ad486994 | ||
|
|
1085852834 | ||
|
|
4a16e75a77 | ||
|
|
084952a216 | ||
|
|
6e55ebe21b | ||
|
|
1f988d315f | ||
|
|
764b334c21 | ||
|
|
b018b8f476 | ||
|
|
fb7e264a76 | ||
|
|
f77fa169f8 | ||
|
|
38e0661f67 | ||
|
|
a88bd8f009 | ||
|
|
315d308268 | ||
|
|
b8a74727ce | ||
|
|
84120fa8fd | ||
|
|
7fa30346ff | ||
|
|
42d62ab0ea | ||
|
|
79b46ad197 | ||
|
|
42b0728dae | ||
|
|
f6730b3d4a | ||
|
|
dea6c06d5a | ||
|
|
c67b9d577b | ||
|
|
e0f8795c1f | ||
|
|
99cff44383 | ||
|
|
d11733a48c | ||
|
|
f5a168dc4b | ||
|
|
ff9db4b9f7 | ||
|
|
51d4f1505f | ||
|
|
cb12df41e1 | ||
|
|
1515adf026 | ||
|
|
892e236a74 | ||
|
|
b2c52b37a7 | ||
|
|
928204166e | ||
|
|
f86a22ce35 | ||
|
|
13ee25369c | ||
|
|
9523232a37 | ||
|
|
1af3922642 | ||
|
|
dfef5615a0 | ||
|
|
92cc8fc679 | ||
|
|
424f43868f | ||
|
|
d6cd51191e | ||
|
|
435de780a8 | ||
|
|
519399f856 | ||
|
|
547ce9cb7c | ||
|
|
b63dc48e19 | ||
|
|
aa170facb7 | ||
|
|
9919e5c1d5 | ||
|
|
84a8997263 | ||
|
|
f7c4320b7f | ||
|
|
84b1a40fe2 | ||
|
|
03b75632d8 | ||
|
|
2c3cb2025e | ||
|
|
0ca10b5569 | ||
|
|
1087e265aa | ||
|
|
d3ca95aee2 | ||
|
|
c5f3f34c5a | ||
|
|
9ef5d545f8 | ||
|
|
1b0ffa2633 | ||
|
|
763523d1c0 | ||
|
|
24d3705e19 | ||
|
|
40bce4b498 | ||
|
|
845c5958e0 | ||
|
|
6faa5667d6 | ||
|
|
8ab5cbca26 | ||
|
|
6ff02a6ba9 | ||
|
|
4db9bc68d9 | ||
|
|
84d354a7dd | ||
|
|
4df024ef43 | ||
|
|
49c927a505 | ||
|
|
73a937e088 | ||
|
|
65e8de880d | ||
|
|
1dacb882e0 | ||
|
|
22a51250b8 | ||
|
|
d264674a85 | ||
|
|
af9b4c1fe5 | ||
|
|
5a6baccee5 | ||
|
|
6443adcb6f | ||
|
|
fc649f4e06 | ||
|
|
2886f3ca34 | ||
|
|
1af16d70cc | ||
|
|
87abbdb8ef | ||
|
|
1b25285462 | ||
|
|
0f4e3146e0 | ||
|
|
b46f7c0d85 | ||
|
|
28d71761cd | ||
|
|
dbf1c8f10f | ||
|
|
f7dd6396e4 | ||
|
|
1a46f205d6 | ||
|
|
be0facc2aa | ||
|
|
67d4a0163b | ||
|
|
0cc85bc314 | ||
|
|
270e778ac5 | ||
|
|
9528fd8bcc | ||
|
|
5a75314bb3 | ||
|
|
cceb8db74e | ||
|
|
8e7b08b96d | ||
|
|
194f11069f | ||
|
|
5ef0d667e0 | ||
|
|
8a1c1d7e53 | ||
|
|
1353c1d9fa | ||
|
|
70a8663605 | ||
|
|
f179eed971 | ||
|
|
d4c8708229 | ||
|
|
4008057803 | ||
|
|
997d8e0aa2 | ||
|
|
15bd5f0d30 | ||
|
|
ccaa20b006 | ||
|
|
c48698f680 | ||
|
|
4285c931e7 | ||
|
|
03c43cf3da | ||
|
|
8d14797416 | ||
|
|
e4837f65a3 | ||
|
|
ee46af66e5 | ||
|
|
2bec354317 | ||
|
|
727c7780b3 | ||
|
|
5410f9b532 | ||
|
|
4c09d8d774 | ||
|
|
aded6fb847 | ||
|
|
c2ad951336 | ||
|
|
7fb5dfa3e6 | ||
|
|
0f8c2fa454 | ||
|
|
dfc2aa9c6a | ||
|
|
8865092bb2 | ||
|
|
abc3353375 | ||
|
|
e7a8da4d0b | ||
|
|
f938051373 | ||
|
|
9db0d72232 | ||
|
|
9e6e789b73 | ||
|
|
bc0d7179cc | ||
|
|
aafa34439a | ||
|
|
168a3bc6fc | ||
|
|
2fb8b2eb18 | ||
|
|
da82705e86 | ||
|
|
a237a39d52 | ||
|
|
c042dc5542 | ||
|
|
1493d06b5a | ||
|
|
9a11201a9e | ||
|
|
c34094ea50 | ||
|
|
c531b2b5c7 | ||
|
|
8ade7bbaeb | ||
|
|
6347071976 | ||
|
|
17bd0c4f91 | ||
|
|
bafaf90329 | ||
|
|
fcb81aa660 | ||
|
|
eb8fe02a5e | ||
|
|
c1874bb5ab | ||
|
|
f0b90dc35d | ||
|
|
eed24f017f | ||
|
|
7d79f0d581 | ||
|
|
94ce098056 | ||
|
|
fbaf92105e | ||
|
|
1e6845669c | ||
|
|
796cb29904 | ||
|
|
42472a8ab8 | ||
|
|
954db14250 | ||
|
|
56976e4d20 | ||
|
|
c38e0de8f5 | ||
|
|
d33f24ff33 | ||
|
|
87c4f90fb2 | ||
|
|
1f031ad2c3 | ||
|
|
8f0d3da1e4 | ||
|
|
10ca83e90d | ||
|
|
e5d4e5d3ab | ||
|
|
c7e4e60052 | ||
|
|
093acab825 | ||
|
|
c3bd365baa | ||
|
|
02fd859d5c | ||
|
|
349e12f939 | ||
|
|
9d3eb9df8f | ||
|
|
3c39a36c26 | ||
|
|
b0a64ff8ac | ||
|
|
e1ad29edd0 | ||
|
|
5ac711839f | ||
|
|
415cdd0588 | ||
|
|
7f23b3b525 | ||
|
|
de1050e420 | ||
|
|
ad75cb8644 | ||
|
|
30f3a7dbba | ||
|
|
9d74a3520f | ||
|
|
57d6f31adb | ||
|
|
9bf227afeb | ||
|
|
72f5b3f84d | ||
|
|
df3c7ce19a | ||
|
|
6cb444455d | ||
|
|
64ded22276 | ||
|
|
41c88f6e52 | ||
|
|
cdd91968b4 | ||
|
|
898696d770 | ||
|
|
3dcb4a2c9c | ||
|
|
c458ff17fd | ||
|
|
7009c1aa89 | ||
|
|
4311edd4cd | ||
|
|
735382be03 | ||
|
|
14bca0d757 |
No files matched your search
@@ -0,0 +1,28 @@
|
|||||||
|
name: Publish
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ '1.18.x' ]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
|
||||||
|
with:
|
||||||
|
java: 17
|
||||||
|
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 }}
|
||||||
Vendored
-104
@@ -1,104 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<name>MinecraftForge_Forge Config DSL Script</name>
|
|
||||||
<groupId>MinecraftForge_Forge</groupId>
|
|
||||||
<artifactId>MinecraftForge_Forge_dsl</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin-parent</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>jetbrains-all</id>
|
|
||||||
<url>https://download.jetbrains.com/teamcity-repository</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>teamcity-server</id>
|
|
||||||
<url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>JetBrains</id>
|
|
||||||
<url>https://download.jetbrains.com/teamcity-repository</url>
|
|
||||||
</pluginRepository>
|
|
||||||
</pluginRepositories>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<sourceDirectory>${basedir}</sourceDirectory>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>kotlin-maven-plugin</artifactId>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
|
|
||||||
<configuration/>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>compile</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>test-compile</id>
|
|
||||||
<phase>process-test-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>test-compile</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>teamcity-configs-maven-plugin</artifactId>
|
|
||||||
<version>${teamcity.dsl.version}</version>
|
|
||||||
<configuration>
|
|
||||||
<format>kotlin</format>
|
|
||||||
<dstDir>target/generated-configs</dstDir>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin</artifactId>
|
|
||||||
<version>${teamcity.dsl.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.teamcity</groupId>
|
|
||||||
<artifactId>configs-dsl-kotlin-plugins</artifactId>
|
|
||||||
<version>1.0-SNAPSHOT</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-script-runtime</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
Vendored
-136
@@ -1,136 +0,0 @@
|
|||||||
import jetbrains.buildServer.configs.kotlin.v2019_2.*
|
|
||||||
import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
|
|
||||||
|
|
||||||
/*
|
|
||||||
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)
|
|
||||||
|
|
||||||
params {
|
|
||||||
text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
|
||||||
text("docker_gradle_version", "7.4", 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.18.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()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
Vendored
-125
@@ -1,125 +0,0 @@
|
|||||||
@Library('forge-shared-library')_
|
|
||||||
|
|
||||||
pipeline {
|
|
||||||
options {
|
|
||||||
disableConcurrentBuilds()
|
|
||||||
}
|
|
||||||
agent {
|
|
||||||
docker {
|
|
||||||
image 'gradle:7-jdk16'
|
|
||||||
//args '-v forgegc:/home/gradle/.gradle_cache/'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
|
|
||||||
DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook')
|
|
||||||
DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}"
|
|
||||||
JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('notify_start') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
discordSend(
|
|
||||||
title: "${DISCORD_PREFIX} Started",
|
|
||||||
successful: true,
|
|
||||||
result: 'ABORTED', //White border
|
|
||||||
thumbnail: JENKINS_HEAD,
|
|
||||||
webhookURL: DISCORD_WEBHOOK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
stage('pull_cache') {
|
|
||||||
steps {
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/'
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/'
|
|
||||||
sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
stage('setup') {
|
|
||||||
steps {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
|
|
||||||
}
|
|
||||||
script {
|
|
||||||
env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "^version:" | cut -d" " -f2').trim()
|
|
||||||
env.FMLONLY_VERSION = sh(returnStdout: true, script: './gradlew :fmlonly:properties -q | grep "^version:" | cut -d" " -f2').trim()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('changelog') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
writeChangelog(currentBuild, 'build/changelog.txt')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('publish') {
|
|
||||||
when {
|
|
||||||
not {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
CROWDIN = credentials('forge-crowdin')
|
|
||||||
KEYSTORE = credentials('forge-jenkins-keystore-old')
|
|
||||||
KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
|
|
||||||
KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
post {
|
|
||||||
success {
|
|
||||||
build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false
|
|
||||||
build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:fmlonly ${env.FMLONLY_VERSION} latest")], propagate: false, wait: false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
|
|
||||||
when {
|
|
||||||
changeRequest()
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
CROWDIN = credentials('forge-crowdin')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
withGradle {
|
|
||||||
sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
post {
|
|
||||||
always {
|
|
||||||
script {
|
|
||||||
archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true
|
|
||||||
|
|
||||||
if (env.CHANGE_ID == null) { // This is unset for non-PRs
|
|
||||||
discordSend(
|
|
||||||
title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}",
|
|
||||||
description: '```\n' + getChanges(currentBuild) + '\n```',
|
|
||||||
successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"),
|
|
||||||
result: currentBuild.currentResult,
|
|
||||||
thumbnail: JENKINS_HEAD,
|
|
||||||
webhookURL: DISCORD_WEBHOOK
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
Minecraft Forge - Forge Development LLC
|
Copyright (c) Forge Development LLC and contributors
|
||||||
SPDX-License-Identifier: LGPL-2.1-only
|
SPDX-License-Identifier: LGPL-2.1-only
|
||||||
+234
-131
@@ -1,15 +1,11 @@
|
|||||||
buildscript {
|
import de.undercouch.gradle.tasks.download.Download
|
||||||
repositories {
|
|
||||||
mavenLocal()
|
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:[5.1.26,)'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
import groovy.json.JsonBuilder
|
import groovy.json.JsonBuilder
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckATs
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckExcs
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckPatches
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckSAS
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckTask
|
||||||
|
import net.minecraftforge.forge.tasks.checks.CheckMode
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
@@ -17,6 +13,7 @@ import java.util.LinkedHashMap
|
|||||||
import net.minecraftforge.forge.tasks.*
|
import net.minecraftforge.forge.tasks.*
|
||||||
import static net.minecraftforge.forge.tasks.Util.*
|
import static net.minecraftforge.forge.tasks.Util.*
|
||||||
import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
|
import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
|
||||||
|
import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility
|
||||||
import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
|
import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact
|
||||||
import net.minecraftforge.gradle.common.tasks.ExtractInheritance
|
import net.minecraftforge.gradle.common.tasks.ExtractInheritance
|
||||||
import net.minecraftforge.gradle.common.tasks.SignJar
|
import net.minecraftforge.gradle.common.tasks.SignJar
|
||||||
@@ -27,48 +24,47 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
|
|||||||
plugins {
|
plugins {
|
||||||
id 'org.cadixdev.licenser' version '0.6.1'
|
id 'org.cadixdev.licenser' version '0.6.1'
|
||||||
id 'com.github.ben-manes.versions' version '0.36.0'
|
id 'com.github.ben-manes.versions' version '0.36.0'
|
||||||
id 'net.minecraftforge.gradleutils' version '2.+'
|
id 'net.minecraftforge.gradleutils' version '[2.2,2.3)'
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'de.undercouch.download' version '4.1.2'
|
id 'idea'
|
||||||
|
id 'de.undercouch.download' version '5.1.3'
|
||||||
|
id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
|
||||||
|
id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
|
||||||
|
id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
|
||||||
}
|
}
|
||||||
|
|
||||||
Util.init() //Init all our extension methods!
|
Util.init() //Init all our extension methods!
|
||||||
|
|
||||||
|
jarSigner.autoDetect('forge')
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
JAR_SIGNER = null
|
|
||||||
if (project.hasProperty('keystore')) {
|
|
||||||
JAR_SIGNER = [
|
|
||||||
storepass: project.properties.keystoreStorePass,
|
|
||||||
keypass: project.properties.keystoreKeyPass,
|
|
||||||
keystore: project.properties.keystore
|
|
||||||
]
|
|
||||||
}
|
|
||||||
MAPPING_CHANNEL = 'official'
|
MAPPING_CHANNEL = 'official'
|
||||||
MAPPING_VERSION = '1.18.2'
|
MAPPING_VERSION = '1.18.2'
|
||||||
MC_VERSION = '1.18.2'
|
MC_VERSION = '1.18.2'
|
||||||
MCP_VERSION = '20220228.144236'
|
MCP_VERSION = '20220404.173914'
|
||||||
SPI_VERSION = '4.0.10'
|
SPI_VERSION = '4.0.15-4.x'
|
||||||
ACCESSTRANSFORMERS_VERSION = '8.0.4'
|
ACCESSTRANSFORMERS_VERSION = '8.0.4'
|
||||||
COREMODS_VERSION = '5.0.1'
|
COREMODS_VERSION = '5.2.5'
|
||||||
EVENTBUS_VERSION = '5.0.3'
|
EVENTBUS_VERSION = '5.0.3'
|
||||||
MODLAUNCHER_VERSION = '9.1.3'
|
MODLAUNCHER_VERSION = '9.1.3'
|
||||||
SECUREJARHANDLER_VERSION = '1.0.3'
|
SECUREJARHANDLER_VERSION = '1.0.8'
|
||||||
BOOTSTRAPLAUNCHER_VERSION = '1.0.0'
|
BOOTSTRAPLAUNCHER_VERSION = '1.0.0'
|
||||||
ASM_VERSION = '9.2'
|
ASM_VERSION = '9.7.1'
|
||||||
INSTALLER_VERSION = '2.1.+'
|
INSTALLER_VERSION = '2.2.+'
|
||||||
MIXIN_VERSION = '0.8.5'
|
MIXIN_VERSION = '0.8.5'
|
||||||
|
JARJAR_VERSION = '0.3.19'
|
||||||
|
|
||||||
GIT_INFO = gradleutils.gitInfo
|
GIT_INFO = gradleutils.gitInfo
|
||||||
VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
|
VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION)
|
||||||
// FML_VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, 'FML', MC_VERSION)
|
// FML_VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, 'FML', MC_VERSION)
|
||||||
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
|
||||||
|
|
||||||
SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.10.0'
|
|
||||||
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
|
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
|
||||||
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.2.10'
|
INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.1'
|
||||||
JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
|
JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
|
||||||
FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.17:all'
|
FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.25:all'
|
||||||
MIN_TAG_FOR_CHANGELOG = "39.0"
|
MIN_TAG_FOR_CHANGELOG = "39.0"
|
||||||
|
LAST_RB = GIT_INFO.tag.rsplit('.', 1)[1] as int >= 1 ? GIT_INFO.tag + '.0' : null
|
||||||
}
|
}
|
||||||
|
|
||||||
println('Version: ' + VERSION +
|
println('Version: ' + VERSION +
|
||||||
@@ -136,6 +132,10 @@ subprojects {
|
|||||||
name = 'forge'
|
name = 'forge'
|
||||||
url = 'https://maven.minecraftforge.net/'
|
url = 'https://maven.minecraftforge.net/'
|
||||||
}
|
}
|
||||||
|
maven {
|
||||||
|
name = 'minecraft'
|
||||||
|
url = 'https://libraries.minecraft.net/'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
@@ -197,46 +197,53 @@ project(':mcp') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
project(':clean') {
|
if (!System.env.TEAMCITY_VERSION) {
|
||||||
evaluationDependsOn(':mcp')
|
project(':clean') {
|
||||||
apply plugin: 'net.minecraftforge.gradle.patcher'
|
evaluationDependsOn(':mcp')
|
||||||
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
|
apply plugin: 'net.minecraftforge.gradle.patcher'
|
||||||
|
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
|
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
patcher {
|
patcher {
|
||||||
parent = project(':mcp')
|
parent = project(':mcp')
|
||||||
mcVersion = MC_VERSION
|
mcVersion = MC_VERSION
|
||||||
patchedSrc = file('src/main/java')
|
patchedSrc = file('src/main/java')
|
||||||
|
|
||||||
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
clean_client {
|
clean_client {
|
||||||
client true
|
client true
|
||||||
taskName 'clean_client'
|
taskName 'clean_client'
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
ideaModule "${rootProject.name}.${project.name}.main"
|
||||||
|
|
||||||
main 'net.minecraft.client.main.Main'
|
main 'net.minecraft.client.main.Main'
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
args '--gameDir', '.'
|
args '--gameDir', '.'
|
||||||
args '--version', MC_VERSION
|
args '--version', MC_VERSION
|
||||||
args '--assetsDir', downloadAssets.output
|
args '--assetsDir', downloadAssets.output
|
||||||
args '--assetIndex', '{asset_index}'
|
args '--assetIndex', '{asset_index}'
|
||||||
args '--accessToken', '0'
|
args '--accessToken', '0'
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_server {
|
||||||
|
client false
|
||||||
|
taskName 'clean_server'
|
||||||
|
ideaModule "${rootProject.name}.${project.name}.main"
|
||||||
|
|
||||||
|
main 'net.minecraft.server.Main'
|
||||||
|
workingDirectory project.file('run')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
clean_server {
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
client false
|
compileJava {
|
||||||
taskName 'clean_server'
|
dependsOn 'extractMapped'
|
||||||
ideaModule "${rootProject.name}.${project.name}.main"
|
|
||||||
|
|
||||||
main 'net.minecraft.server.Main'
|
|
||||||
workingDirectory project.file('run')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,6 +256,7 @@ def sharedDeps = {
|
|||||||
moduleonly "org.ow2.asm:asm-util:${ASM_VERSION}"
|
moduleonly "org.ow2.asm:asm-util:${ASM_VERSION}"
|
||||||
moduleonly "org.ow2.asm:asm-analysis:${ASM_VERSION}"
|
moduleonly "org.ow2.asm:asm-analysis:${ASM_VERSION}"
|
||||||
moduleonly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
moduleonly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
||||||
|
moduleonly "net.minecraftforge:JarJarFileSystems:${JARJAR_VERSION}"
|
||||||
|
|
||||||
installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}"
|
installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}"
|
||||||
installer "org.ow2.asm:asm:${ASM_VERSION}"
|
installer "org.ow2.asm:asm:${ASM_VERSION}"
|
||||||
@@ -260,7 +268,7 @@ def sharedDeps = {
|
|||||||
installer 'org.antlr:antlr4-runtime:4.9.1' //Dep of AccessTransformer
|
installer 'org.antlr:antlr4-runtime:4.9.1' //Dep of AccessTransformer
|
||||||
installer "net.minecraftforge:eventbus:${EVENTBUS_VERSION}"
|
installer "net.minecraftforge:eventbus:${EVENTBUS_VERSION}"
|
||||||
installer "net.minecraftforge:forgespi:${SPI_VERSION}"
|
installer "net.minecraftforge:forgespi:${SPI_VERSION}"
|
||||||
installer "net.minecraftforge:coremods:${COREMODS_VERSION}"
|
installer("net.minecraftforge:coremods:${COREMODS_VERSION}")
|
||||||
installer "cpw.mods:modlauncher:${MODLAUNCHER_VERSION}"
|
installer "cpw.mods:modlauncher:${MODLAUNCHER_VERSION}"
|
||||||
installer 'net.minecraftforge:unsafe:0.2.+'
|
installer 'net.minecraftforge:unsafe:0.2.+'
|
||||||
installer 'com.electronwill.night-config:core:3.6.4'
|
installer 'com.electronwill.night-config:core:3.6.4'
|
||||||
@@ -271,7 +279,11 @@ def sharedDeps = {
|
|||||||
installer 'org.jline:jline-reader:3.12.+' //Dep of TerminaalConsoleeAppender
|
installer 'org.jline:jline-reader:3.12.+' //Dep of TerminaalConsoleeAppender
|
||||||
installer 'org.jline:jline-terminal:3.12.+' //Dep of TerminaalConsoleeAppender
|
installer 'org.jline:jline-terminal:3.12.+' //Dep of TerminaalConsoleeAppender
|
||||||
installer "org.spongepowered:mixin:${MIXIN_VERSION}"
|
installer "org.spongepowered:mixin:${MIXIN_VERSION}"
|
||||||
installer 'org.openjdk.nashorn:nashorn-core:15.3'
|
installer 'org.openjdk.nashorn:nashorn-core:15.4'
|
||||||
|
installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
|
||||||
|
installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
|
||||||
|
installer 'net.java.dev.jna:jna:5.12.1'
|
||||||
|
installer 'net.java.dev.jna:jna-platform:5.12.1'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
installer 'org.lwjgl:lwjgl:3.2.2'
|
installer 'org.lwjgl:lwjgl:3.2.2'
|
||||||
@@ -322,31 +334,10 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
|
prj.task([type: DownloadMavenArtifact], 'downloadInstaller') {
|
||||||
artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk"
|
artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:fatjar"
|
||||||
changing = true
|
changing = true
|
||||||
}
|
}
|
||||||
|
|
||||||
prj.afterEvaluate {
|
|
||||||
[prj.tasks.universalJar, prj.tasks.installerJar].each { t ->
|
|
||||||
def signTask = prj.task([type: SignJar, dependsOn: t], "sign${t.name.capitalize()}") {
|
|
||||||
onlyIf {
|
|
||||||
JAR_SIGNER != null && t.state.failure == null
|
|
||||||
}
|
|
||||||
def jarsigner = JAR_SIGNER == null ? [:] : JAR_SIGNER
|
|
||||||
alias = 'forge'
|
|
||||||
storePass = jarsigner.storepass
|
|
||||||
keyPass = jarsigner.keypass
|
|
||||||
keyStore = jarsigner.keystore
|
|
||||||
inputFile = t.archiveFile.get().asFile
|
|
||||||
outputFile = t.archiveFile.get().asFile
|
|
||||||
doFirst {
|
|
||||||
prj.logger.lifecycle('Signing: ' + inputFile)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
t.finalizedBy(signTask)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
prj.tasks.userdevConfig {
|
prj.tasks.userdevConfig {
|
||||||
def launchPrefix = prj.name == "forge" ? "forge" : "fml"
|
def launchPrefix = prj.name == "forge" ? "forge" : "fml"
|
||||||
getArtifacts(prj, prj.configurations.installer, true).each { key, lib -> libraries.add(lib.name) }
|
getArtifacts(prj, prj.configurations.installer, true).each { key, lib -> libraries.add(lib.name) }
|
||||||
@@ -418,6 +409,8 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
run.args '--fml.forgeGroup', prj.group
|
run.args '--fml.forgeGroup', prj.group
|
||||||
run.args '--fml.mcpVersion', MCP_VERSION
|
run.args '--fml.mcpVersion', MCP_VERSION
|
||||||
|
|
||||||
|
run.jvmArgs '-Djava.net.preferIPv6Addresses=system'
|
||||||
|
|
||||||
if (run.name.contains('client')) {
|
if (run.name.contains('client')) {
|
||||||
run.client true
|
run.client true
|
||||||
} else {
|
} else {
|
||||||
@@ -425,8 +418,9 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
// SecureJarHandler bootstrap values.
|
// SecureJarHandler bootstrap values.
|
||||||
run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,mclanguage,${prj.name}-"
|
run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
|
||||||
//run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar'
|
// FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
|
||||||
|
run.property 'mergeModules', 'jna-5.12.1.jar,jna-platform-5.12.1.jar,java-objc-bridge-1.0.0.jar'
|
||||||
if (userdevRuns.contains(run)) {
|
if (userdevRuns.contains(run)) {
|
||||||
run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
|
run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
|
||||||
run.jvmArgs '-p', '{modules}'
|
run.jvmArgs '-p', '{modules}'
|
||||||
@@ -435,7 +429,9 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
run.jvmArgs '-p', prj.configurations.moduleonly.files.collect { it.path }.join(File.pathSeparator)
|
run.jvmArgs '-p', prj.configurations.moduleonly.files.collect { it.path }.join(File.pathSeparator)
|
||||||
}
|
}
|
||||||
run.jvmArgs '--add-modules', 'ALL-MODULE-PATH'
|
run.jvmArgs '--add-modules', 'ALL-MODULE-PATH'
|
||||||
|
// Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
|
||||||
run.jvmArgs '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler'
|
run.jvmArgs '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler'
|
||||||
|
run.jvmArgs '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler'
|
||||||
run.jvmArgs '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler'
|
run.jvmArgs '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler'
|
||||||
run.jvmArgs '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
run.jvmArgs '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
||||||
}
|
}
|
||||||
@@ -484,7 +480,7 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.join(','),
|
IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.join(','),
|
||||||
MODULES: 'ALL-MODULE-PATH'
|
MODULES: 'ALL-MODULE-PATH'
|
||||||
]
|
]
|
||||||
|
|
||||||
prj.task([dependsOn: rootProject.downloadServerRaw], 'makeClasspathFiles') {
|
prj.task([dependsOn: rootProject.downloadServerRaw], 'makeClasspathFiles') {
|
||||||
doLast {
|
doLast {
|
||||||
def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} +
|
def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} +
|
||||||
@@ -522,6 +518,7 @@ def sharedFmlonlyForge = { Project prj ->
|
|||||||
//rename 'run.sh', "run_forge_${VERSION.replace('-', '_').sh"
|
//rename 'run.sh', "run_forge_${VERSION.replace('-', '_').sh"
|
||||||
//rename 'run.bat', "run_forge_${VERSION.replace('-', '_').bat"
|
//rename 'run.bat', "run_forge_${VERSION.replace('-', '_').bat"
|
||||||
}
|
}
|
||||||
|
jarSigner.sign(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -537,7 +534,7 @@ project(':fmlonly') {
|
|||||||
|
|
||||||
ext {
|
ext {
|
||||||
MCP_ARTIFACT = project(':mcp').mcp.config.get()
|
MCP_ARTIFACT = project(':mcp').mcp.config.get()
|
||||||
PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar']
|
PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
|
||||||
MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
|
MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -566,6 +563,7 @@ project(':fmlonly') {
|
|||||||
implementation project(':fmlcore')
|
implementation project(':fmlcore')
|
||||||
implementation project(':fmlloader')
|
implementation project(':fmlloader')
|
||||||
implementation project(':javafmllanguage')
|
implementation project(':javafmllanguage')
|
||||||
|
implementation project(':lowcodelanguage')
|
||||||
implementation project(':mclanguage')
|
implementation project(':mclanguage')
|
||||||
runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
||||||
}
|
}
|
||||||
@@ -619,11 +617,13 @@ project(':fmlonly') {
|
|||||||
'--fml.forgeGroup', project.group,
|
'--fml.forgeGroup', project.group,
|
||||||
'--fml.mcpVersion', MCP_VERSION],
|
'--fml.mcpVersion', MCP_VERSION],
|
||||||
jvm: ["-DignoreList=${fmlonly_client.properties.ignoreList},\${version_name}.jar",
|
jvm: ["-DignoreList=${fmlonly_client.properties.ignoreList},\${version_name}.jar",
|
||||||
//"-DmergeModules=${fmlonly_client.properties.mergeModules}",
|
"-DmergeModules=${fmlonly_client.properties.mergeModules}",
|
||||||
'-DlibraryDirectory=${library_directory}',
|
'-DlibraryDirectory=${library_directory}',
|
||||||
'-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{"\${library_directory}/${it.downloads.artifact.path}"}.join('${classpath_separator}'),
|
'-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{"\${library_directory}/${it.downloads.artifact.path}"}.join('${classpath_separator}'),
|
||||||
'--add-modules', 'ALL-MODULE-PATH',
|
'--add-modules', 'ALL-MODULE-PATH',
|
||||||
|
// Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
|
||||||
'--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
|
'--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
|
||||||
|
'--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
|
||||||
'--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
|
'--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
|
||||||
'--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
'--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
||||||
]
|
]
|
||||||
@@ -633,7 +633,7 @@ project(':fmlonly') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task installerJson(type: InstallerJson, dependsOn: 'signUniversalJar') {
|
task installerJson(type: InstallerJson, dependsOn: universalJar) {
|
||||||
icon = rootProject.file('icon.ico')
|
icon = rootProject.file('icon.ico')
|
||||||
packedDependencies = PACKED_DEPS
|
packedDependencies = PACKED_DEPS
|
||||||
|
|
||||||
@@ -842,11 +842,16 @@ project(':fmlonly') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
||||||
afterEvaluate { prepareRuns.dependsOn(':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar') }
|
afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
|
||||||
|
|
||||||
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
|
compileJava {
|
||||||
|
dependsOn 'extractMapped'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
project(':forge') {
|
project(':forge') {
|
||||||
evaluationDependsOn(':clean')
|
evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
|
||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
apply plugin: 'net.minecraftforge.gradle.patcher'
|
apply plugin: 'net.minecraftforge.gradle.patcher'
|
||||||
apply plugin: 'org.cadixdev.licenser'
|
apply plugin: 'org.cadixdev.licenser'
|
||||||
@@ -891,7 +896,7 @@ project(':forge') {
|
|||||||
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
|
// Essentially, the same as the old, except dropping the first number, and the builds are no longer unique.
|
||||||
MCP_ARTIFACT = project(':mcp').mcp.config.get()
|
MCP_ARTIFACT = project(':mcp').mcp.config.get()
|
||||||
VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
|
VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
|
||||||
PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar']
|
PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar']
|
||||||
MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
|
MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -912,6 +917,7 @@ project(':forge') {
|
|||||||
implementation project(':fmlcore')
|
implementation project(':fmlcore')
|
||||||
implementation project(':fmlloader')
|
implementation project(':fmlloader')
|
||||||
implementation project(':javafmllanguage')
|
implementation project(':javafmllanguage')
|
||||||
|
implementation project(':lowcodelanguage')
|
||||||
implementation project(':mclanguage')
|
implementation project(':mclanguage')
|
||||||
runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}"
|
||||||
}
|
}
|
||||||
@@ -919,13 +925,19 @@ project(':forge') {
|
|||||||
|
|
||||||
patcher {
|
patcher {
|
||||||
excs.from file("$rootDir/src/main/resources/forge.exc")
|
excs.from file("$rootDir/src/main/resources/forge.exc")
|
||||||
parent = project(':clean')
|
parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
|
||||||
patches = file("$rootDir/patches/minecraft")
|
patches = file("$rootDir/patches/minecraft")
|
||||||
patchedSrc = file('src/main/java')
|
patchedSrc = file('src/main/java')
|
||||||
srgPatches = true
|
srgPatches = true
|
||||||
accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
|
accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
|
||||||
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
|
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
|
||||||
|
|
||||||
|
// the clean project provides these. if we're not using it, we need to provide them ourselves
|
||||||
|
if (System.env.TEAMCITY_VERSION) {
|
||||||
|
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
|
||||||
|
mcVersion = MC_VERSION
|
||||||
|
}
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
forge_client {
|
forge_client {
|
||||||
property 'eventbus.checkTypesOnDispatch', 'true'
|
property 'eventbus.checkTypesOnDispatch', 'true'
|
||||||
@@ -1039,6 +1051,9 @@ project(':forge') {
|
|||||||
'--mod', 'custom_tag_types_test',
|
'--mod', 'custom_tag_types_test',
|
||||||
'--mod', 'new_model_loader_test',
|
'--mod', 'new_model_loader_test',
|
||||||
'--mod', 'remove_tag_datagen_test',
|
'--mod', 'remove_tag_datagen_test',
|
||||||
|
'--mod', 'tag_based_tool_types',
|
||||||
|
'--mod', 'custom_transformtype_test',
|
||||||
|
'--mod', 'data_pack_registries_test',
|
||||||
'--output', rootProject.file('src/generated_test/resources/'),
|
'--output', rootProject.file('src/generated_test/resources/'),
|
||||||
'--existing', sourceSets.main.resources.srcDirs[0],
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
'--existing', sourceSets.test.resources.srcDirs[0]
|
'--existing', sourceSets.test.resources.srcDirs[0]
|
||||||
@@ -1052,7 +1067,8 @@ project(':forge') {
|
|||||||
'/': [
|
'/': [
|
||||||
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
|
||||||
'GitCommit': gradleutils.gitInfo.abbreviatedId,
|
'GitCommit': gradleutils.gitInfo.abbreviatedId,
|
||||||
'Git-Branch': gradleutils.gitInfo.branch
|
'Git-Branch': gradleutils.gitInfo.branch,
|
||||||
|
'FML-System-Mods': 'forge'
|
||||||
] as LinkedHashMap,
|
] as LinkedHashMap,
|
||||||
'net/minecraftforge/versions/forge/': [
|
'net/minecraftforge/versions/forge/': [
|
||||||
'Specification-Title': 'Forge',
|
'Specification-Title': 'Forge',
|
||||||
@@ -1097,9 +1113,12 @@ project(':forge') {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
task crowdin(type: Crowdin) {
|
tasks.register('downloadCrowdin', Download) {
|
||||||
key = project.hasProperty('crowdinKey') ? project.crowdinKey : null
|
src 'https://files.minecraftforge.net/crowdin.zip'
|
||||||
//TODO: Merge our english.json?
|
dest file('build/crowdin.zip')
|
||||||
|
useETag 'all'
|
||||||
|
onlyIfModified true
|
||||||
|
quiet true
|
||||||
}
|
}
|
||||||
|
|
||||||
sharedFmlonlyForge.call(project)
|
sharedFmlonlyForge.call(project)
|
||||||
@@ -1111,6 +1130,7 @@ project(':forge') {
|
|||||||
|
|
||||||
task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
|
task extractInheritance(type: ExtractInheritance, dependsOn: [genJoinedBinPatches, downloadLibraries]) {
|
||||||
tool = INSTALLER_TOOLS + ':fatjar'
|
tool = INSTALLER_TOOLS + ':fatjar'
|
||||||
|
args.add '--annotations'
|
||||||
input = genJoinedBinPatches.cleanJar
|
input = genJoinedBinPatches.cleanJar
|
||||||
libraries.addAll downloadLibraries.librariesOutput.map { rf -> Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) }
|
libraries.addAll downloadLibraries.librariesOutput.map { rf -> Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) }
|
||||||
}
|
}
|
||||||
@@ -1134,40 +1154,100 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkATs(type: CheckATs, dependsOn: [extractInheritance, createSrg2Mcp]) {
|
tasks.register('checkAll') {
|
||||||
inheritance = extractInheritance.output
|
dependsOn 'checkLicenses'
|
||||||
|
group = 'checks'
|
||||||
|
}
|
||||||
|
tasks.register('checkAllAndFix') {
|
||||||
|
dependsOn 'findFieldInstanceChecks', 'checkLicenses'
|
||||||
|
group = 'checks'
|
||||||
|
}
|
||||||
|
|
||||||
|
CheckTask.registerTask(tasks, 'ATs', CheckATs) {
|
||||||
|
dependsOn extractInheritance, createSrg2Mcp
|
||||||
ats.from patcher.accessTransformers
|
ats.from patcher.accessTransformers
|
||||||
|
inheritance = extractInheritance.output
|
||||||
mappings = createSrg2Mcp.output
|
mappings = createSrg2Mcp.output
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkSAS(type: CheckSAS, dependsOn: extractInheritance) {
|
CheckTask.registerTask(tasks, 'SAS', CheckSAS) {
|
||||||
inheritance = extractInheritance.output
|
dependsOn extractInheritance
|
||||||
sass.from patcher.sideAnnotationStrippers
|
sass.from patcher.sideAnnotationStrippers
|
||||||
|
inheritance = extractInheritance.output
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkExcs(type: CheckExcs, dependsOn: jar) {
|
CheckTask.registerTask(tasks, 'Excs', CheckExcs) {
|
||||||
|
dependsOn jar
|
||||||
binary = jar.archiveFile.get().asFile
|
binary = jar.archiveFile.get().asFile
|
||||||
excs.from patcher.excs
|
excs.from patcher.excs
|
||||||
}
|
}
|
||||||
|
|
||||||
task checkAll(dependsOn: [checkATs, checkSAS, checkExcs, findFieldInstanceChecks]){}
|
CheckTask.registerTask(tasks, 'Patches', CheckPatches) {
|
||||||
|
dependsOn genPatches
|
||||||
task checkPatchesAndFix(type: CheckPatches, dependsOn: genPatches) {
|
|
||||||
patchDir = file("$rootDir/patches")
|
patchDir = file("$rootDir/patches")
|
||||||
autoFix = true
|
patchesWithS2SArtifact = [
|
||||||
}
|
'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
|
||||||
|
'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
|
||||||
task checkPatches(type: CheckPatches, dependsOn: genPatches) {
|
]
|
||||||
patchDir = file("$rootDir/patches")
|
|
||||||
autoFix = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
genPatches {
|
genPatches {
|
||||||
finalizedBy checkPatches
|
finalizedBy checkAndFixPatches
|
||||||
autoHeader true
|
autoHeader true
|
||||||
lineEnding = '\n'
|
lineEnding = '\n'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def baseForgeVersionProperty = project.objects.property(String)
|
||||||
|
baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) })
|
||||||
|
baseForgeVersionProperty.finalizeValueOnRead()
|
||||||
|
def jarCompatibilityTaskSetup = { task ->
|
||||||
|
task.group = 'jar compatibility'
|
||||||
|
task.onlyIf {
|
||||||
|
baseForgeVersionProperty.getOrNull() != null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('setupCheckJarCompatibility', SetupCheckJarCompatibility) {
|
||||||
|
inputVersion = baseForgeVersionProperty
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('applyBaseCompatibilityJarBinPatches', ApplyBinPatches) {
|
||||||
|
jarCompatibilityTaskSetup(it)
|
||||||
|
|
||||||
|
clean = project.tasks.createJoinedSRG.output
|
||||||
|
patch = project.tasks.named('setupCheckJarCompatibility').flatMap { it.baseBinPatchesOutput }
|
||||||
|
output = project.layout.buildDirectory.dir(name).map { it.file('output.jar') }
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('mergeBaseForgeJar', MergeJars) {
|
||||||
|
jarCompatibilityTaskSetup(it)
|
||||||
|
|
||||||
|
inputJars.from(project.tasks.named('applyBaseCompatibilityJarBinPatches').flatMap { it.output })
|
||||||
|
inputJars.from(baseForgeVersionProperty.map { inputVersion ->
|
||||||
|
def output = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-universal.jar") }.get().asFile
|
||||||
|
project.rootProject.extensions.download.run {
|
||||||
|
src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-universal.jar"
|
||||||
|
dest output
|
||||||
|
}
|
||||||
|
return output
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.register('checkJarCompatibility', CheckJarCompatibility) {
|
||||||
|
jarCompatibilityTaskSetup(it)
|
||||||
|
dependsOn 'setupCheckJarCompatibility'
|
||||||
|
|
||||||
|
baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output }
|
||||||
|
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
||||||
|
|
||||||
|
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
||||||
|
concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile })
|
||||||
|
|
||||||
|
commonLibraries.from(project.configurations.minecraftImplementation)
|
||||||
|
commonLibraries.from(project.configurations.installer)
|
||||||
|
commonLibraries.from(project.configurations.moduleonly)
|
||||||
|
}
|
||||||
|
|
||||||
task launcherJson(type: LauncherJson) {
|
task launcherJson(type: LauncherJson) {
|
||||||
packedDependencies = [':fmlloader:jar']
|
packedDependencies = [':fmlloader:jar']
|
||||||
doFirst {
|
doFirst {
|
||||||
@@ -1187,12 +1267,15 @@ project(':forge') {
|
|||||||
'--fml.mcVersion', MC_VERSION,
|
'--fml.mcVersion', MC_VERSION,
|
||||||
'--fml.forgeGroup', project.group,
|
'--fml.forgeGroup', project.group,
|
||||||
'--fml.mcpVersion', MCP_VERSION],
|
'--fml.mcpVersion', MCP_VERSION],
|
||||||
jvm: ["-DignoreList=${forge_client.properties.ignoreList},\${version_name}.jar",
|
jvm: ['-Djava.net.preferIPv6Addresses=system',
|
||||||
//"-DmergeModules=${forge_client.properties.mergeModules}",
|
"-DignoreList=${forge_client.properties.ignoreList},\${version_name}.jar",
|
||||||
|
"-DmergeModules=${forge_client.properties.mergeModules}",
|
||||||
'-DlibraryDirectory=${library_directory}',
|
'-DlibraryDirectory=${library_directory}',
|
||||||
'-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{'${library_directory}/' + it.downloads.artifact.path}.join('${classpath_separator}'),
|
'-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{'${library_directory}/' + it.downloads.artifact.path}.join('${classpath_separator}'),
|
||||||
'--add-modules', 'ALL-MODULE-PATH',
|
'--add-modules', 'ALL-MODULE-PATH',
|
||||||
|
// Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
|
||||||
'--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
|
'--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
|
||||||
|
'--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
|
||||||
'--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
|
'--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
|
||||||
'--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
'--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
|
||||||
]
|
]
|
||||||
@@ -1202,7 +1285,7 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task installerJson(type: InstallerJson, dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches, 'signUniversalJar']) {
|
task installerJson(type: InstallerJson, dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches, universalJar]) {
|
||||||
ext {
|
ext {
|
||||||
// remove :fatjar
|
// remove :fatjar
|
||||||
BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length())
|
BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length())
|
||||||
@@ -1422,9 +1505,12 @@ project(':forge') {
|
|||||||
from extraTxts
|
from extraTxts
|
||||||
|
|
||||||
// add crowdin locales
|
// add crowdin locales
|
||||||
from { crowdin.output.present && crowdin.output.get().asFile.exists() ? zipTree(crowdin.output) : null}
|
from zipTree(downloadCrowdin.dest).matching {
|
||||||
dependsOn crowdin
|
include 'assets/forge/lang/*.json'
|
||||||
duplicatesStrategy = 'exclude'
|
}
|
||||||
|
|
||||||
|
dependsOn downloadCrowdin
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
|
||||||
doFirst {
|
doFirst {
|
||||||
MANIFESTS.each{ pkg, values ->
|
MANIFESTS.each{ pkg, values ->
|
||||||
@@ -1435,9 +1521,10 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
jarSigner.sign(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, 'signUniversalJar', launcherJson]) {
|
task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, universalJar, launcherJson]) {
|
||||||
packedDependencies = PACKED_DEPS
|
packedDependencies = PACKED_DEPS
|
||||||
from(extraTxts)
|
from(extraTxts)
|
||||||
from(rootProject.file('/forge_installer_logo.png')) {
|
from(rootProject.file('/forge_installer_logo.png')) {
|
||||||
@@ -1469,7 +1556,7 @@ project(':forge') {
|
|||||||
exclude it
|
exclude it
|
||||||
}
|
}
|
||||||
filter(ReplaceTokens, tokens: [
|
filter(ReplaceTokens, tokens: [
|
||||||
FORGE_VERSION: project.version,
|
FORGE_VERSION: FORGE_VERSION,
|
||||||
FORGE_GROUP: project.group,
|
FORGE_GROUP: project.group,
|
||||||
FORGE_NAME: project.name,
|
FORGE_NAME: project.name,
|
||||||
MC_VERSION: MC_VERSION,
|
MC_VERSION: MC_VERSION,
|
||||||
@@ -1487,12 +1574,6 @@ project(':forge') {
|
|||||||
header = file("$rootDir/LICENSE-header.txt")
|
header = file("$rootDir/LICENSE-header.txt")
|
||||||
|
|
||||||
include 'net/minecraftforge/'
|
include 'net/minecraftforge/'
|
||||||
exclude 'net/minecraftforge/server/terminalconsole/'
|
|
||||||
exclude 'net/minecraftforge/api/' // exclude API here because it's validated in the SPI build
|
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/ComparableVersion.java'
|
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/InvalidVersionSpecificationException.java'
|
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/Restriction.java'
|
|
||||||
exclude 'net/minecraftforge/fml/common/versioning/VersionRange.java'
|
|
||||||
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java'
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
@@ -1504,6 +1585,10 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named('checkLicenseMain') {
|
||||||
|
mustRunAfter 'extractMapped'
|
||||||
|
}
|
||||||
|
|
||||||
reobfJar {
|
reobfJar {
|
||||||
tool = FART
|
tool = FART
|
||||||
@@ -1536,12 +1621,22 @@ project(':forge') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
// Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run
|
||||||
afterEvaluate { prepareRuns.dependsOn(':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar') }
|
afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) }
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
|
}
|
||||||
|
|
||||||
|
// Disabling clean with CI causes an error if we don't have this...
|
||||||
|
compileJava {
|
||||||
|
dependsOn 'extractMapped'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//evaluationDependsOnChildren()
|
//evaluationDependsOnChildren()
|
||||||
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
|
||||||
dependsOn ':clean:extractMapped'
|
if (!System.env.TEAMCITY_VERSION)
|
||||||
|
dependsOn ':clean:extractMapped'
|
||||||
if (symlinkValid)
|
if (symlinkValid)
|
||||||
dependsOn ':fmlonly:extractMapped'
|
dependsOn ':fmlonly:extractMapped'
|
||||||
dependsOn ':forge:extractMapped'
|
dependsOn ':forge:extractMapped'
|
||||||
@@ -1557,4 +1652,12 @@ if (System.env.TEAMCITY_VERSION) {
|
|||||||
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
|
println "##teamcity[setParameter name='env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION' value='${project(':fmlonly').version}']"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
// IntelliJ IDEA does not do this by itself anymore...
|
||||||
|
downloadJavadoc = true
|
||||||
|
downloadSources = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,12 @@
|
|||||||
repositories {
|
repositories {
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'org.ow2.asm:asm:9.1'
|
implementation 'org.ow2.asm:asm:9.5'
|
||||||
implementation 'org.ow2.asm:asm-tree:9.1'
|
implementation 'org.ow2.asm:asm-tree:9.5'
|
||||||
implementation 'net.minecraftforge:srgutils:0.4.+'
|
implementation 'net.minecraftforge:srgutils:0.5.+'
|
||||||
|
implementation 'commons-io:commons-io:2.8.0'
|
||||||
|
implementation 'com.google.code.gson:gson:2.10'
|
||||||
|
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
|
||||||
}
|
}
|
||||||
@@ -1,267 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import net.minecraftforge.srgutils.IMappingFile
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.Optional
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
|
|
||||||
abstract class CheckATs extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getAts()
|
|
||||||
@InputFile @Optional abstract RegularFileProperty getMappings()
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def mappings = mappings.map { IMappingFile.load(it.asFile) }.getOrNull()
|
|
||||||
Util.init()
|
|
||||||
def parse = { line ->
|
|
||||||
def idx = line.indexOf('#')
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
|
||||||
def (modifier, cls, desc) = (line.trim() + ' ').split(' ', -1)
|
|
||||||
def key = cls + (desc.isEmpty() ? '' : ' ' + desc)
|
|
||||||
return [modifier, cls, desc, comment, key]
|
|
||||||
}
|
|
||||||
def accessLevel = { 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
|
|
||||||
}
|
|
||||||
def accessStr = { 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
def json = inheritance.get().asFile.json()
|
|
||||||
|
|
||||||
ats.each { f ->
|
|
||||||
TreeMap lines = [:]
|
|
||||||
def group = null
|
|
||||||
for (def line : f.readLines()) {
|
|
||||||
if (line.isEmpty()) continue
|
|
||||||
if (line.startsWith('#group ')) {
|
|
||||||
def (modifier, cls, desc, comment, key) = parse.call(line.substring(7))
|
|
||||||
|
|
||||||
if (desc != '*' && desc != '*()' && desc != '<init>')
|
|
||||||
throw new IllegalStateException('Invalid group: ' + line)
|
|
||||||
|
|
||||||
group = [modifier: modifier, cls: cls, desc: desc, comment: comment,
|
|
||||||
existing: [] as Set,
|
|
||||||
children: [] as TreeSet,
|
|
||||||
group: true
|
|
||||||
]
|
|
||||||
if (lines.containsKey(key))
|
|
||||||
throw new IllegalStateException('Duplicate group: ' + line)
|
|
||||||
|
|
||||||
lines[key] = group
|
|
||||||
} else if (group != null) {
|
|
||||||
if (line.startsWith('#endgroup')) {
|
|
||||||
group = null
|
|
||||||
} else {
|
|
||||||
def (modifier, cls, desc, comment, key) = parse.call(line)
|
|
||||||
group['existing'].add(key)
|
|
||||||
}
|
|
||||||
} else if (line.startsWith('#endgroup')) {
|
|
||||||
throw new IllegalStateException('Invalid group ending: ' + line)
|
|
||||||
} else if (line.startsWith('#')) {
|
|
||||||
//Nom
|
|
||||||
} else {
|
|
||||||
def (modifier, cls, desc, comment, key) = parse.call(line)
|
|
||||||
if (lines.containsKey(key)) {
|
|
||||||
println('Duplicate: ' + line)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
lines[key] = [modifier: modifier, cls: cls, desc: desc, comment: comment, group: false]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process Groups, this will remove any entries outside the group that is covered by the group
|
|
||||||
for (def key : new ArrayList<>(lines.keySet())) {
|
|
||||||
def entry = lines.get(key)
|
|
||||||
if (entry != null && entry['group']) {
|
|
||||||
def cls = entry['cls']
|
|
||||||
def jcls = json.get(cls.replaceAll('\\.', '/'))
|
|
||||||
if (jcls == null) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Group: ' + key)
|
|
||||||
} else if ('*' == entry['desc']) {
|
|
||||||
if (!jcls.containsKey('fields')) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Group, Class has no fields: ' + key)
|
|
||||||
} else {
|
|
||||||
jcls['fields'].each { field, value ->
|
|
||||||
def fkey = cls + ' ' + field
|
|
||||||
if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
|
|
||||||
if (lines.containsKey(fkey)) {
|
|
||||||
lines.remove(fkey)
|
|
||||||
} else if (!entry['existing'].contains(fkey)) {
|
|
||||||
println('Added: ' + fkey)
|
|
||||||
}
|
|
||||||
entry['children'].add(fkey)
|
|
||||||
} else if (lines.containsKey(fkey)) {
|
|
||||||
lines.remove(fkey)
|
|
||||||
println('Removed: ' + fkey)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('*()' == entry['desc']) {
|
|
||||||
if (!jcls.containsKey('methods')) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Group, Class has no methods: ' + key)
|
|
||||||
} else {
|
|
||||||
jcls['methods'].each{ mtd, value ->
|
|
||||||
if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$'))
|
|
||||||
return
|
|
||||||
key = cls + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
|
|
||||||
if (lines.containsKey(key)) {
|
|
||||||
lines.remove(key)
|
|
||||||
} else if (!entry['existing'].contains(key)) {
|
|
||||||
println('Added: ' + key)
|
|
||||||
}
|
|
||||||
entry['children'].add(key)
|
|
||||||
} else if (lines.containsKey(key)) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Removed: ' + key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
} else if ('<init>' == entry['desc']) { //Make all public non-abstract subclasses
|
|
||||||
json.each{ tcls,value ->
|
|
||||||
if (!value.containsKey('methods') || ((value['access'] & Opcodes.ACC_ABSTRACT) != 0))
|
|
||||||
return
|
|
||||||
def parents = [] as Set
|
|
||||||
def parent = tcls
|
|
||||||
while (parent != null && json.containsKey(parent)) {
|
|
||||||
parents.add(parent)
|
|
||||||
def p = json[parent]
|
|
||||||
parent = p == null ? null : p['superName']
|
|
||||||
}
|
|
||||||
if (parents.contains(cls.replaceAll('\\.', '/'))) {
|
|
||||||
value['methods'].each{ mtd, v ->
|
|
||||||
if (mtd.startsWith('<init>')) {
|
|
||||||
def child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
|
|
||||||
if (accessLevel.call(v['access']) < 3) {
|
|
||||||
if (lines.containsKey(child)) {
|
|
||||||
lines.remove(child)
|
|
||||||
} else if (!entry['existing'].contains(child)) {
|
|
||||||
println('Added: ' + child)
|
|
||||||
}
|
|
||||||
entry['children'].add(child)
|
|
||||||
} else if (lines.containsKey(child)) {
|
|
||||||
lines.remove(child)
|
|
||||||
println('Removed: ' + child)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process normal lines, remove invalid and remove narrowing
|
|
||||||
for (def key : new ArrayList<>(lines.keySet())) {
|
|
||||||
def entry = lines.get(key)
|
|
||||||
if (entry != null && !entry['group']) {
|
|
||||||
def cls = entry['cls']
|
|
||||||
def jcls = json.get(cls.replaceAll('\\.', '/'))
|
|
||||||
if (jcls == null) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid: ' + key)
|
|
||||||
} else if (entry['desc'] == '') {
|
|
||||||
if (accessLevel.call(jcls['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Narrowing: ' + key)
|
|
||||||
}
|
|
||||||
} else if (!entry['desc'].contains('(')) {
|
|
||||||
if (!jcls.containsKey('fields') || !jcls['fields'].containsKey(entry['desc'])) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid: ' + key)
|
|
||||||
} else {
|
|
||||||
def value = jcls['fields'][entry['desc']]
|
|
||||||
if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Narrowing: ' + key)
|
|
||||||
println(entry.comment)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
def jdesc = entry['desc'].replace('(', ' (')
|
|
||||||
if (!jcls.containsKey('methods') || !jcls['methods'].containsKey(jdesc)) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid: ' + key)
|
|
||||||
} else {
|
|
||||||
def value = jcls['methods'][jdesc]
|
|
||||||
if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
|
|
||||||
lines.remove(key)
|
|
||||||
println('Invalid Narrowing: ' + key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def data = []
|
|
||||||
def remapComment = { entry ->
|
|
||||||
if (!mappings || !entry || !entry.desc) return null
|
|
||||||
def comment = entry.comment?.substring(1)?.trim()
|
|
||||||
def jsonCls = json.get(entry.cls.replaceAll('\\.', '/'))
|
|
||||||
def mappingsClass = mappings?.getClass(jsonCls.name)
|
|
||||||
if (!mappingsClass) return entry.comment
|
|
||||||
def idx = entry.desc.indexOf('(')
|
|
||||||
def 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 == null ? '' : ' ' + value.comment))
|
|
||||||
value.children.each {
|
|
||||||
def line = value.modifier + ' ' + it
|
|
||||||
def (modifier, cls, desc, comment) = parse.call(line)
|
|
||||||
comment = remapComment.call([modifier: modifier, cls: cls, desc: desc, comment: comment])
|
|
||||||
data.add(line + (comment ? ' ' + comment : ''))
|
|
||||||
}
|
|
||||||
data.add('#endgroup')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
f.text = data.join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import org.objectweb.asm.ClassReader
|
|
||||||
import org.objectweb.asm.ClassVisitor
|
|
||||||
import org.objectweb.asm.MethodVisitor
|
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
import org.objectweb.asm.Type
|
|
||||||
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
abstract class CheckExcs extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getBinary()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getExcs()
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
Util.init()
|
|
||||||
def known = []
|
|
||||||
binary.get().asFile.withInputStream { i ->
|
|
||||||
new ZipInputStream(i).withCloseable { zin ->
|
|
||||||
def visitor = new ClassVisitor(Opcodes.ASM9) {
|
|
||||||
private String cls
|
|
||||||
@Override
|
|
||||||
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
|
|
||||||
this.cls = name
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
excs.each { f ->
|
|
||||||
def lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
def idx = line.indexOf('#')
|
|
||||||
if (idx == 0 || line.isEmpty()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
def comment = idx == -1 ? null : line.substring(idx)
|
|
||||||
if (idx != -1) line = line.substring(0, idx - 1)
|
|
||||||
|
|
||||||
if (!line.contains('=')) {
|
|
||||||
println('Invalid: ' + line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
def (key, value) = line.split('=', 2)
|
|
||||||
if (!known.contains(key)) {
|
|
||||||
println('Unknown: ' + line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
def (cls, desc) = key.split('\\.', 2)
|
|
||||||
if (!desc.contains('(')) {
|
|
||||||
println('Invalid: ' + line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
def name = desc.split('\\(', 2)[0]
|
|
||||||
desc = '(' + desc.split('\\(', 2)[1]
|
|
||||||
|
|
||||||
def (exceptions, args) = value.contains('|') ? value.split('|', 2) : [value, '']
|
|
||||||
|
|
||||||
if (args.split(',').length != Type.getArgumentTypes(desc).length) {
|
|
||||||
println('Invalid: ' + line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
lines.add(line)
|
|
||||||
}
|
|
||||||
f.text = lines.sort().join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,219 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.file.DirectoryProperty
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.InputDirectory
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Paths
|
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
abstract class CheckPatches extends DefaultTask {
|
|
||||||
@InputDirectory abstract DirectoryProperty getPatchDir()
|
|
||||||
@Input boolean autoFix = false
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
def hasS2SArtifact = [
|
|
||||||
Paths.get("patches/minecraft/net/minecraft/client/renderer/ViewArea.java.patch"),
|
|
||||||
Paths.get("patches/minecraft/net/minecraft/data/models/blockstates/Variant.java.patch")
|
|
||||||
]
|
|
||||||
|
|
||||||
def verified = true;
|
|
||||||
patchDir.get().asFileTree.each { patch ->
|
|
||||||
def patchPath = project.rootDir.toPath().relativize(patch.toPath())
|
|
||||||
verified &= verifyPatch(patch, autoFix, patchPath.toString(), hasS2SArtifact.contains(patchPath))
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!verified)
|
|
||||||
throw new RuntimeException('One or more patches failed verification. Check the log for errors.')
|
|
||||||
}
|
|
||||||
|
|
||||||
def verifyPatch(patch, fix, patchPath, hasS2SArtifact) {
|
|
||||||
def hunk_start_pattern = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
|
|
||||||
def white_space_pattern = Pattern.compile('^[+\\-]\\s*$')
|
|
||||||
def import_pattern = Pattern.compile('^[+\\-]\\s*import.*')
|
|
||||||
def field_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
|
|
||||||
def method_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
|
|
||||||
def class_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
|
|
||||||
|
|
||||||
def accessMap = [("private"):0, (null):1, ("protected"):2, ("public"):3]
|
|
||||||
|
|
||||||
def hasProblem = false;
|
|
||||||
def lines = patch.readLines()
|
|
||||||
|
|
||||||
def hunksStart = 0
|
|
||||||
def onlyWhiteSpace = false
|
|
||||||
|
|
||||||
def didFix = false
|
|
||||||
def newLines = []
|
|
||||||
def whiteSpaceErrors = []
|
|
||||||
|
|
||||||
// First two lines are file name ++/-- and we do not care
|
|
||||||
newLines.add(lines[0] + '\n')
|
|
||||||
newLines.add(lines[1] + '\n')
|
|
||||||
|
|
||||||
int i = 2
|
|
||||||
for (; i < lines.size(); ++i) {
|
|
||||||
def line = lines[i]
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
|
|
||||||
if (hunk_start_pattern.matcher(line).find()) {
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (fix || hasS2SArtifact) {
|
|
||||||
logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
|
|
||||||
def toRemove = i - hunksStart;
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
didFix = true
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (!whiteSpaceErrors.empty)
|
|
||||||
hasProblem = true
|
|
||||||
whiteSpaceErrors.each { error -> logger.lifecycle(error) }
|
|
||||||
whiteSpaceErrors.clear()
|
|
||||||
}
|
|
||||||
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.equals(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
|
|
||||||
(accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
(accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
(accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
|
|
||||||
logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
|
|
||||||
def nextLine = lines[i + 1]
|
|
||||||
if (nextLine.charAt(0) == (char)'+') {
|
|
||||||
def nextTrim = nextLine.substring(1).replaceAll("\\s", "")
|
|
||||||
def currTrim = line.substring(1).replaceAll("\\s", "")
|
|
||||||
|
|
||||||
if (nextTrim.equals(currTrim)) {
|
|
||||||
prefixChange = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def isWhiteSpaceChange = white_space_pattern.matcher(line).find()
|
|
||||||
|
|
||||||
if (!prefixChange && !isWhiteSpaceChange) {
|
|
||||||
onlyWhiteSpace = hasS2SArtifact && import_pattern.matcher(line).find()
|
|
||||||
}
|
|
||||||
else if (isWhiteSpaceChange) {
|
|
||||||
def prevLineChange = prevLine.startsWithAny('+','-')
|
|
||||||
def nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
|
|
||||||
|
|
||||||
if (!prevLineChange && !nextLineChange) {
|
|
||||||
whiteSpaceErrors.add(String.format("Patch contains white space change in valid hunk at line %d (cannot auto fix), file: %s", i + 1, patchPath))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (line.contains("\t")) {
|
|
||||||
if (!fix) {
|
|
||||||
logger.lifecycle("Patch contains tabs on line {}, file: {}", i + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
logger.lifecycle("Fixing tabs on line {}, file: {}", i + 1, patchPath)
|
|
||||||
line = line.replaceAll('\t', ' ')
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
newLines.add(line + '\n')
|
|
||||||
didFix = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (import_pattern.matcher(line).find() && !hasS2SArtifact) {
|
|
||||||
logger.lifecycle("Patch contains import change on line {}, file: {}", i + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (onlyWhiteSpace) {
|
|
||||||
if (fix || hasS2SArtifact) {
|
|
||||||
logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
|
|
||||||
def toRemove = i - hunksStart;
|
|
||||||
while (toRemove-- > 0)
|
|
||||||
newLines.remove(newLines.size() - 1)
|
|
||||||
didFix = true
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
|
|
||||||
hasProblem = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (!whiteSpaceErrors.empty)
|
|
||||||
hasProblem = true
|
|
||||||
whiteSpaceErrors.each { error -> logger.lifecycle(error) }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (didFix) {
|
|
||||||
if (newLines.size() <= 2) {
|
|
||||||
logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
|
|
||||||
Files.delete(patch.toPath())
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (!hasS2SArtifact)
|
|
||||||
logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
|
|
||||||
patch.withWriter('UTF-8') { writer ->
|
|
||||||
newLines.each { l -> writer.write(l) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return !hasProblem
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
package net.minecraftforge.forge.tasks
|
|
||||||
|
|
||||||
import org.gradle.api.file.ConfigurableFileCollection
|
|
||||||
import org.gradle.api.file.RegularFileProperty
|
|
||||||
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.tasks.InputFile
|
|
||||||
import org.gradle.api.tasks.InputFiles
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
abstract class CheckSAS extends DefaultTask {
|
|
||||||
@InputFile abstract RegularFileProperty getInheritance()
|
|
||||||
@InputFiles abstract ConfigurableFileCollection getSass()
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
protected void exec() {
|
|
||||||
Util.init()
|
|
||||||
def json = inheritance.get().asFile.json()
|
|
||||||
|
|
||||||
sass.each { f ->
|
|
||||||
def lines = []
|
|
||||||
f.eachLine { line ->
|
|
||||||
if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
|
|
||||||
def 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)
|
|
||||||
def (cls, desc) = (line.trim() + ' ').split(' ', -1)
|
|
||||||
cls = cls.replaceAll('\\.', '/')
|
|
||||||
desc = desc.replace('(', ' (')
|
|
||||||
|
|
||||||
if (json[cls] == null || (!desc.isEmpty() && (json[cls]['methods'] == null || json[cls]['methods'][desc] == null))) {
|
|
||||||
println('Invalid: ' + line)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
//Class SAS
|
|
||||||
if (desc.isEmpty()) {
|
|
||||||
lines.add(cls + (comment == null ? '' : ' ' + comment))
|
|
||||||
if (json[cls]['methods'] != null)
|
|
||||||
(json[cls]['methods'] as TreeMap).each {
|
|
||||||
findChildMethods(json, cls, it.key).each { lines.add('\t' + it) }
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
//Method SAS
|
|
||||||
lines.add(cls + ' ' + desc.replace(' ', '') + (comment == null ? '' : ' ' + comment))
|
|
||||||
findChildMethods(json, cls, desc).each { lines.add('\t' + it) }
|
|
||||||
}
|
|
||||||
f.text = lines.join('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static findChildMethods(json, cls, desc)
|
|
||||||
{
|
|
||||||
return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls}
|
|
||||||
.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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.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()
|
||||||
|
}
|
||||||
+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),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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,17 +18,17 @@ public class Util {
|
|||||||
return md.digest().collect {String.format "%02x", it}.join()
|
return md.digest().collect {String.format "%02x", it}.join()
|
||||||
}
|
}
|
||||||
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
|
File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
|
||||||
|
|
||||||
File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
|
File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
|
||||||
File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
|
File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
|
||||||
File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
|
File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
|
||||||
|
|
||||||
Date.metaClass.iso8601 = { ->
|
Date.metaClass.iso8601 = { ->
|
||||||
def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
|
def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
|
||||||
def result = format.format(delegate)
|
def result = format.format(delegate)
|
||||||
return result[0..21] + ':' + result[22..-1]
|
return result[0..21] + ':' + result[22..-1]
|
||||||
}
|
}
|
||||||
|
|
||||||
String.metaClass.rsplit = { String del, int limit = -1 ->
|
String.metaClass.rsplit = { String del, int limit = -1 ->
|
||||||
def lst = new ArrayList()
|
def lst = new ArrayList()
|
||||||
def x = 0, idx
|
def x = 0, idx
|
||||||
@@ -41,7 +41,7 @@ public class Util {
|
|||||||
return lst
|
return lst
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String[] getClasspath(project, libs, artifact) {
|
public static String[] getClasspath(project, libs, artifact) {
|
||||||
def ret = []
|
def ret = []
|
||||||
artifactTree(project, artifact).each { key, lib ->
|
artifactTree(project, artifact).each { key, lib ->
|
||||||
@@ -51,7 +51,7 @@ public class Util {
|
|||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
public static def getArtifacts(project, config, classifiers) {
|
public static def getArtifacts(project, config, classifiers) {
|
||||||
def ret = [:]
|
def ret = [:]
|
||||||
config.resolvedConfiguration.resolvedArtifacts.each {
|
config.resolvedConfiguration.resolvedArtifacts.each {
|
||||||
@@ -75,7 +75,7 @@ public class Util {
|
|||||||
url = "https://maven.minecraftforge.net/${path}"
|
url = "https://maven.minecraftforge.net/${path}"
|
||||||
}
|
}
|
||||||
//TODO remove when Mojang launcher is updated
|
//TODO remove when Mojang launcher is updated
|
||||||
if (!classifiers && art.classifier != null) {
|
if (!classifiers && art.classifier != null) {
|
||||||
//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
|
//Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar'
|
||||||
// However, keep the path normal so that our mirror system works.
|
// However, keep the path normal so that our mirror system works.
|
||||||
art.version = "${art.version}-${art.classifier}"
|
art.version = "${art.version}-${art.classifier}"
|
||||||
@@ -96,14 +96,14 @@ public class Util {
|
|||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
public static def getMavenPath(task) {
|
public static def getMavenPath(task) {
|
||||||
def classifier = task.archiveClassifier.get()
|
def classifier = task.archiveClassifier.get()
|
||||||
def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
|
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'
|
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) {
|
public static def getMavenDep(task) {
|
||||||
def classifier = task.archiveClassifier.get()
|
def classifier = task.archiveClassifier.get()
|
||||||
return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
|
return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
|
||||||
}
|
}
|
||||||
@@ -127,7 +127,7 @@ public class Util {
|
|||||||
def files = cfg.resolve()
|
def files = cfg.resolve()
|
||||||
return getArtifacts(project, cfg, true)
|
return getArtifacts(project, cfg, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean checkExists(url) {
|
private static boolean checkExists(url) {
|
||||||
try {
|
try {
|
||||||
def code = new URL(url).openConnection().with {
|
def code = new URL(url).openConnection().with {
|
||||||
@@ -142,4 +142,10 @@ public class Util {
|
|||||||
throw e
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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 List<String> data = []
|
||||||
|
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 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.Opcodes
|
||||||
|
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(Opcodes.ASM9) {
|
||||||
|
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,177 @@
|
|||||||
|
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('\\', '/')))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
(ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[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
|
||||||
|
(ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[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
|
||||||
|
(ACCESS_MAP[pMatcher.group(2)] < ACCESS_MAP[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,109 @@
|
|||||||
|
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 ->
|
||||||
|
configuration.setDelegate((T) task)
|
||||||
|
configuration.call(task)
|
||||||
|
task.mode.set(CheckMode.CHECK)
|
||||||
|
task.group = 'checks'
|
||||||
|
}
|
||||||
|
tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
|
||||||
|
|
||||||
|
tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
|
||||||
|
configuration.setDelegate((T) task)
|
||||||
|
configuration.call(task)
|
||||||
|
task.mode.set(CheckMode.FIX)
|
||||||
|
task.group = 'checks'
|
||||||
|
}
|
||||||
|
tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
|
||||||
|
}
|
||||||
|
}
|
||||||
+16
-13
@@ -2,16 +2,18 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[](https://files.minecraftforge.net)
|
[](https://files.minecraftforge.net)
|
||||||
[](https://files.minecraftforge.net) [](https://discord.gg/UvedJ9m) [](https://www.patreon.com/LexManos)
|
)](https://files.minecraftforge.net) [][Discord] [](https://www.patreon.com/LexManos)
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
|
|
||||||
| Version | Support |
|
| Version | Support |
|
||||||
| ------------- | ------------- |
|
| ------------- | ------------- |
|
||||||
| 1.18.x | Active |
|
| 1.20.x | Active |
|
||||||
| 1.16.x | LTS |
|
| 1.19.x | Legacy |
|
||||||
|
| 1.18.x | Legacy |
|
||||||
|
| 1.16.x | Legacy |
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -28,25 +30,25 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
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](https://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
|
[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
|
||||||
|
|
||||||
# Creating Mods
|
# Creating Mods
|
||||||
|
|
||||||
[See the "Getting Started" section in the Forge Documentation](https://mcforge.readthedocs.io/en/latest/gettingstarted/).
|
[See the "Getting Started" section in the Forge Documentation](https://docs.minecraftforge.net/en/1.18.x/gettingstarted/).
|
||||||
|
|
||||||
# Contribute to Forge
|
# Contribute to Forge
|
||||||
|
|
||||||
If you wish to actually inspect Forge, submit PRs or otherwise work
|
If you wish to actually inspect Forge, submit PRs or otherwise work
|
||||||
with Forge itself, you're in the right place!
|
with Forge itself, you're in the right place!
|
||||||
|
|
||||||
[See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
|
[See the guide to setting up a Forge workspace](https://docs.minecraftforge.net/en/1.18.x/forgedev/).
|
||||||
|
|
||||||
### Pull requests
|
### Pull requests
|
||||||
|
|
||||||
[See the "Making Changes and Pull Requests" section in the Forge documentation](https://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
|
[See the "Making Changes and Pull Requests" section in the Forge documentation](https://docs.minecraftforge.net/en/1.18.x/forgedev/#making-changes-and-pull-requests).
|
||||||
|
|
||||||
Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
|
Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
|
||||||
|
|
||||||
@@ -60,6 +62,7 @@ We require all contributors to acknowledge the [Forge Contributor
|
|||||||
*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos).*
|
*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free to use and modify. However, it costs money to run such a large project as this, so please consider [becoming a patron](https://www.patreon.com/LexManos).*
|
||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
[Forum]: https://www.minecraftforge.net/forum/
|
[Forum]: https://forums.minecraftforge.net
|
||||||
[Discord]: https://discord.gg/UvedJ9m
|
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
||||||
[Documentation]: https://mcforge.readthedocs.io
|
[Discord]: https://discord.minecraftforge.net
|
||||||
|
[Documentation]: https://docs.minecraftforge.net/en/1.18.x/
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.github.ben-manes.versions'
|
id 'com.github.ben-manes.versions'
|
||||||
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
||||||
|
id 'org.cadixdev.licenser'
|
||||||
}
|
}
|
||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
apply plugin: 'jacoco'
|
apply plugin: 'jacoco'
|
||||||
@@ -53,6 +54,12 @@ tasks.withType(JavaCompile) {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
|
||||||
|
include 'net/minecraftforge/'
|
||||||
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives jar
|
archives jar
|
||||||
archives sourcesJar
|
archives sourcesJar
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
public interface I18NParser {
|
public interface I18NParser {
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
@@ -32,7 +18,7 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
* The predicate tests the version from a remote instance or save for acceptability (Boolean is true for impl, false for local save)
|
* The predicate tests the version from a remote instance or save for acceptability (Boolean is true for impl, false for local save)
|
||||||
* and returns true if the version is compatible.
|
* and returns true if the version is compatible.
|
||||||
*
|
*
|
||||||
* <p>Return {@code net.minecraftforge.impl.impl.FMLNetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
|
* <p>Return {@code net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY} in the supplier, if you wish to be ignored
|
||||||
* as a server side only mod.</p>
|
* as a server side only mod.</p>
|
||||||
* <p>Return true in the predicate for all values of the input string (when impl boolean is true) if you are client side,
|
* <p>Return true in the predicate for all values of the input string (when impl boolean is true) if you are client side,
|
||||||
* and don't care about matching any potential server version.</p>
|
* and don't care about matching any potential server version.</p>
|
||||||
@@ -41,8 +27,8 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
* Examples: A server only mod
|
* Examples: A server only mod
|
||||||
* </p>
|
* </p>
|
||||||
* <pre>{@code
|
* <pre>{@code
|
||||||
* registerExtensionPoint(DISPLAYTEST, ()->Pair.of(
|
* registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
|
||||||
* ()->FMLNetworkConstants.IGNORESERVERONLY, // ignore me, I'm a server only mod
|
* ()->NetworkConstants.IGNORESERVERONLY, // ignore me, I'm a server only mod
|
||||||
* (s,b)->true // i accept anything from the server or the save, if I'm asked
|
* (s,b)->true // i accept anything from the server or the save, if I'm asked
|
||||||
* )
|
* )
|
||||||
* }</pre>
|
* }</pre>
|
||||||
@@ -51,12 +37,33 @@ public interface IExtensionPoint<T extends Record>
|
|||||||
* Examples: A client only mod
|
* Examples: A client only mod
|
||||||
* </p>
|
* </p>
|
||||||
* <pre>{@code
|
* <pre>{@code
|
||||||
* registerExtensionPoint(DISPLAYTEST, ()->Pair.of(
|
* registerExtensionPoint(DisplayTest.class, ()->new DisplayTest(
|
||||||
* ()->"anything. i don't care", // if i'm actually on the server, this string is sent but i'm a client only mod, so it won't be
|
* ()->"anything. i don't care", // if i'm actually on the server, this string is sent but i'm a client only mod, so it won't be
|
||||||
* (remoteversionstring,networkbool)->networkbool // i accept anything from the server, by returning true if it's asking about the server
|
* (remoteversionstring,networkbool)->networkbool // i accept anything from the server, by returning true if it's asking about the server
|
||||||
* )
|
* )
|
||||||
* }</pre>
|
* }</pre>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
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 = "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
|
||||||
|
*/
|
||||||
|
public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ignores all information and provides no information
|
||||||
|
*/
|
||||||
|
public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
|
||||||
|
* instead of a {@link Supplier}.
|
||||||
|
* <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
|
||||||
|
*/
|
||||||
|
public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
this(() -> version, remoteVersionTest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
@@ -23,6 +9,7 @@ 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.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
@@ -34,6 +21,7 @@ import java.util.Optional;
|
|||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
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;
|
||||||
|
|
||||||
@@ -70,9 +58,25 @@ public abstract class ModContainer
|
|||||||
this.namespace = this.modId;
|
this.namespace = this.modId;
|
||||||
this.modInfo = info;
|
this.modInfo = info;
|
||||||
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
|
||||||
// default displaytest extension checks for version string match
|
|
||||||
registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(()->this.modInfo.getVersion().toString(),
|
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
|
||||||
(incoming, isNetwork)->Objects.equals(incoming, this.modInfo.getVersion().toString())));
|
.orElseGet(() -> (Boolean) info.getOwningFile().getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE) ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
|
||||||
|
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
|
||||||
|
case "MATCH_VERSION" -> // default displaytest checks for version string match
|
||||||
|
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
|
||||||
|
(incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
|
||||||
|
case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
|
||||||
|
IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
|
||||||
|
case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
|
||||||
|
IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
|
||||||
|
case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
|
||||||
|
default -> // any other value throws an exception
|
||||||
|
throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
|
||||||
|
};
|
||||||
|
if (displayTestSupplier != null)
|
||||||
|
registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTestSupplier);
|
||||||
|
else
|
||||||
|
extensionPoints.remove(IExtensionPoint.DisplayTest.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -141,6 +145,22 @@ public abstract class ModContainer
|
|||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
||||||
|
registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
||||||
|
registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
public void addConfig(final ModConfig modConfig) {
|
public void addConfig(final ModConfig modConfig) {
|
||||||
configs.put(modConfig.getType(), modConfig);
|
configs.put(modConfig.getType(), modConfig);
|
||||||
}
|
}
|
||||||
@@ -167,4 +187,4 @@ public abstract class ModContainer
|
|||||||
* @param e Event to accept
|
* @param e Event to accept
|
||||||
*/
|
*/
|
||||||
protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
|
protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2022.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
@@ -25,11 +11,11 @@ import net.minecraftforge.fml.event.IModBusEvent;
|
|||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import net.minecraftforge.fml.loading.LoadingModList;
|
import net.minecraftforge.fml.loading.LoadingModList;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
|
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.progress.StartupMessageManager;
|
import net.minecraftforge.fml.loading.progress.StartupMessageManager;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
||||||
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@@ -42,6 +28,7 @@ import java.util.Optional;
|
|||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.CompletionException;
|
import java.util.concurrent.CompletionException;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
|
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;
|
||||||
@@ -236,7 +223,7 @@ public class ModLoader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ModContainer> buildMods(final ModFile modFile)
|
private List<ModContainer> buildMods(final IModFile modFile)
|
||||||
{
|
{
|
||||||
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
||||||
|
|
||||||
@@ -258,7 +245,7 @@ public class ModLoader
|
|||||||
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
|
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer buildModContainerFromTOML(final ModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
||||||
try {
|
try {
|
||||||
final String modId = idToProviderEntry.getKey();
|
final String modId = idToProviderEntry.getKey();
|
||||||
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
@@ -22,6 +8,7 @@ package net.minecraftforge.fml;
|
|||||||
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 java.util.function.BiPredicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class ModLoadingContext
|
public class ModLoadingContext
|
||||||
@@ -59,6 +46,44 @@ public class ModLoadingContext
|
|||||||
getActiveContainer().registerExtensionPoint(point, extension);
|
getActiveContainer().registerExtensionPoint(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
|
||||||
|
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
|
||||||
|
getActiveContainer().registerDisplayTest(() -> displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
|
||||||
|
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
|
||||||
|
getActiveContainer().registerDisplayTest(displayTest);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
|
||||||
|
* creates the DisplayTest instance for you using the provided parameters.</p>
|
||||||
|
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a {@link IExtensionPoint.DisplayTest} with the mod container.
|
||||||
|
* <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
|
||||||
|
* creates the DisplayTest instance for you using the provided parameters.</p>
|
||||||
|
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
|
||||||
|
*/
|
||||||
|
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
|
||||||
|
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
|
||||||
|
}
|
||||||
|
|
||||||
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
|
||||||
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
|
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
public enum ModLoadingPhase {
|
public enum ModLoadingPhase {
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.graph.GraphBuilder;
|
import com.google.common.graph.GraphBuilder;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
@@ -131,14 +117,22 @@ public class VersionChecker
|
|||||||
/**
|
/**
|
||||||
* Returns the response body as a String for the given URL while following redirects
|
* Returns the response body as a String for the given URL while following redirects
|
||||||
*/
|
*/
|
||||||
private String openUrlString(URL url) throws IOException, URISyntaxException, InterruptedException {
|
private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
|
||||||
URL currentUrl = url;
|
URL currentUrl = url;
|
||||||
|
|
||||||
|
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++)
|
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))
|
||||||
.setHeader("Accept-Encoding", "gzip")
|
.setHeader("Accept-Encoding", "gzip")
|
||||||
|
.setHeader("User-Agent", userAgent)
|
||||||
.GET()
|
.GET()
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -180,7 +174,7 @@ public class VersionChecker
|
|||||||
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());
|
||||||
|
|
||||||
String data = openUrlString(url);
|
String data = openUrlString(url, mod);
|
||||||
|
|
||||||
LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
|
LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2022.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.config;
|
package net.minecraftforge.fml.config;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.event;
|
package net.minecraftforge.fml.event;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util;
|
package net.minecraftforge.fml.util;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util;
|
package net.minecraftforge.fml.util;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util;
|
package net.minecraftforge.fml.util;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util;
|
package net.minecraftforge.fml.util;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util;
|
package net.minecraftforge.fml.util;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util.thread;
|
package net.minecraftforge.fml.util.thread;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util.thread;
|
package net.minecraftforge.fml.util.thread;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.util.thread;
|
package net.minecraftforge.fml.util.thread;
|
||||||
|
|||||||
+11
-1
@@ -1,6 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.github.ben-manes.versions'
|
id 'com.github.ben-manes.versions'
|
||||||
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
|
||||||
|
id 'org.cadixdev.licenser'
|
||||||
}
|
}
|
||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
apply plugin: 'jacoco'
|
apply plugin: 'jacoco'
|
||||||
@@ -15,7 +16,7 @@ dependencies {
|
|||||||
api("org.ow2.asm:asm:${ASM_VERSION}")
|
api("org.ow2.asm:asm:${ASM_VERSION}")
|
||||||
api("org.ow2.asm:asm-tree:${ASM_VERSION}")
|
api("org.ow2.asm:asm-tree:${ASM_VERSION}")
|
||||||
api("org.ow2.asm:asm-commons:${ASM_VERSION}")
|
api("org.ow2.asm:asm-commons:${ASM_VERSION}")
|
||||||
api('net.minecraftforge:forgespi:4.0.+')
|
api("net.minecraftforge:forgespi:${SPI_VERSION}")
|
||||||
api('org.apache.logging.log4j:log4j-api:2.17.0')
|
api('org.apache.logging.log4j:log4j-api:2.17.0')
|
||||||
api('org.slf4j:slf4j-api:1.8.0-beta4')
|
api('org.slf4j:slf4j-api:1.8.0-beta4')
|
||||||
api('com.google.guava:guava:21.0')
|
api('com.google.guava:guava:21.0')
|
||||||
@@ -26,6 +27,9 @@ dependencies {
|
|||||||
api('com.electronwill.night-config:toml:3.6.4')
|
api('com.electronwill.night-config:toml:3.6.4')
|
||||||
api('cpw.mods:modlauncher:9.0.+')
|
api('cpw.mods:modlauncher:9.0.+')
|
||||||
api('net.minecraftforge:coremods:5.0.+')
|
api('net.minecraftforge:coremods:5.0.+')
|
||||||
|
api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
|
||||||
|
api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
|
||||||
|
|
||||||
implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
|
implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
|
||||||
implementation('org.apache.logging.log4j:log4j-core:2.17.0')
|
implementation('org.apache.logging.log4j:log4j-core:2.17.0')
|
||||||
annotationProcessor('org.apache.logging.log4j:log4j-core:2.17.0')
|
annotationProcessor('org.apache.logging.log4j:log4j-core:2.17.0')
|
||||||
@@ -70,6 +74,12 @@ tasks.withType(JavaCompile) {
|
|||||||
options.compilerArgs << '-Xlint:unchecked'
|
options.compilerArgs << '-Xlint:unchecked'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
license {
|
||||||
|
header = rootProject.file('LICENSE-header.txt')
|
||||||
|
|
||||||
|
include 'net/minecraftforge/'
|
||||||
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives jar
|
archives jar
|
||||||
archives sourcesJar
|
archives sourcesJar
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.common.asm;
|
package net.minecraftforge.fml.common.asm;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.common.asm;
|
package net.minecraftforge.fml.common.asm;
|
||||||
|
|||||||
+15
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.common.asm;
|
package net.minecraftforge.fml.common.asm;
|
||||||
@@ -149,6 +135,19 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
|
|
||||||
mtd.access |= Opcodes.ACC_SYNCHRONIZED;
|
mtd.access |= Opcodes.ACC_SYNCHRONIZED;
|
||||||
mtd.instructions.clear();
|
mtd.instructions.clear();
|
||||||
|
mtd.localVariables.clear();
|
||||||
|
if (mtd.tryCatchBlocks != null)
|
||||||
|
{
|
||||||
|
mtd.tryCatchBlocks.clear();
|
||||||
|
}
|
||||||
|
if (mtd.visibleLocalVariableAnnotations != null)
|
||||||
|
{
|
||||||
|
mtd.visibleLocalVariableAnnotations.clear();
|
||||||
|
}
|
||||||
|
if (mtd.invisibleLocalVariableAnnotations != null)
|
||||||
|
{
|
||||||
|
mtd.invisibleLocalVariableAnnotations.clear();
|
||||||
|
}
|
||||||
InstructionAdapter ins = new InstructionAdapter(mtd);
|
InstructionAdapter ins = new InstructionAdapter(mtd);
|
||||||
|
|
||||||
int vars = 0;
|
int vars = 0;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.URISyntaxException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
|
public class ClasspathLocatorUtils {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|
||||||
|
public static Path findJarPathFor(final String resourceName, final String jarName, final URL resource) {
|
||||||
|
try {
|
||||||
|
Path path;
|
||||||
|
final URI uri = resource.toURI();
|
||||||
|
if (uri.getScheme().equals("jar") && uri.getRawSchemeSpecificPart().contains("!/")) {
|
||||||
|
int lastExcl = uri.getRawSchemeSpecificPart().lastIndexOf("!/");
|
||||||
|
path = Paths.get(new URI(uri.getRawSchemeSpecificPart().substring(0, lastExcl)));
|
||||||
|
} else {
|
||||||
|
path = Paths.get(new URI("file://"+uri.getRawSchemeSpecificPart().substring(0, uri.getRawSchemeSpecificPart().length()-resourceName.length())));
|
||||||
|
}
|
||||||
|
//LOGGER.debug(CORE, "Found JAR {} at path {}", jarName, path.toString());
|
||||||
|
return path;
|
||||||
|
} catch (NullPointerException | URISyntaxException e) {
|
||||||
|
LOGGER.fatal(LogMarkers.SCAN, "Failed to find JAR for class {} - {}", resourceName, jarName);
|
||||||
|
throw new RuntimeException("Unable to locate "+resourceName+" - "+jarName, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+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));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
@@ -61,7 +47,7 @@ public class EarlyLoadingException extends RuntimeException {
|
|||||||
return errorMessages;
|
return errorMessages;
|
||||||
}
|
}
|
||||||
|
|
||||||
EarlyLoadingException(final String message, final Throwable originalException, List<ExceptionData> errorMessages) {
|
public EarlyLoadingException(final String message, final Throwable originalException, List<ExceptionData> errorMessages) {
|
||||||
super(message, originalException);
|
super(message, originalException);
|
||||||
this.errorMessages = errorMessages;
|
this.errorMessages = errorMessages;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
@@ -80,6 +66,9 @@ public class FMLLoader
|
|||||||
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
|
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Allows us to communicate properties with other services through ModLauncher
|
||||||
|
setupBlackboardKeys();
|
||||||
|
|
||||||
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
|
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
|
||||||
LOGGER.fatal(CORE,"Access Transformer library is missing, we need this to run");
|
LOGGER.fatal(CORE,"Access Transformer library is missing, we need this to run");
|
||||||
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
|
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
|
||||||
@@ -141,6 +130,12 @@ public class FMLLoader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void setupBlackboardKeys() {
|
||||||
|
LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
|
||||||
|
var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
|
||||||
|
Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
|
||||||
|
}
|
||||||
|
|
||||||
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
|
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");
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import cpw.mods.modlauncher.api.INameMappingService;
|
import cpw.mods.modlauncher.api.INameMappingService;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
+2
-16
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,27 +1,14 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
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 net.minecraftforge.forgespi.language.IModFileInfo;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
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;
|
||||||
@@ -29,7 +16,6 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.fml.loading.toposort.CyclePresentException;
|
import net.minecraftforge.fml.loading.toposort.CyclePresentException;
|
||||||
import net.minecraftforge.fml.loading.toposort.TopologicalSort;
|
import net.minecraftforge.fml.loading.toposort.TopologicalSort;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
@@ -38,6 +24,7 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
import java.util.jar.Manifest;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@@ -47,14 +34,15 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
|||||||
public class ModSorter
|
public class ModSorter
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
private final UniqueModListBuilder uniqueModListBuilder;
|
||||||
private List<ModFile> modFiles;
|
private List<ModFile> modFiles;
|
||||||
private List<ModInfo> sortedList;
|
private List<ModInfo> sortedList;
|
||||||
private Map<String, ModInfo> modIdNameLookup;
|
private Map<String, IModInfo> modIdNameLookup;
|
||||||
private List<ModFile> forgeAndMC;
|
private List<ModFile> systemMods;
|
||||||
|
|
||||||
private ModSorter(final List<ModFile> modFiles)
|
private ModSorter(final List<ModFile> modFiles)
|
||||||
{
|
{
|
||||||
this.modFiles = modFiles;
|
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
||||||
@@ -64,13 +52,13 @@ public class ModSorter
|
|||||||
ms.buildUniqueList();
|
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
|
||||||
return LoadingModList.of(ms.forgeAndMC, ms.forgeAndMC.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
|
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
|
||||||
}
|
}
|
||||||
// try and validate dependencies
|
// try and validate dependencies
|
||||||
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(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(ms.forgeAndMC, ms.forgeAndMC.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), 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;
|
EarlyLoadingException earlyLoadingException = null;
|
||||||
@@ -89,11 +77,12 @@ public class ModSorter
|
|||||||
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
||||||
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
||||||
AtomicInteger counter = new AtomicInteger();
|
AtomicInteger counter = new AtomicInteger();
|
||||||
Map<IModFileInfo, Integer> infos = modFiles.stream()
|
Map<ModFileInfo, Integer> infos = modFiles.stream()
|
||||||
.map(ModFile::getModFileInfo)
|
.map(ModFile::getModFileInfo)
|
||||||
.filter(ModFileInfo.class::isInstance)
|
.filter(ModFileInfo.class::isInstance)
|
||||||
|
.map(ModFileInfo.class::cast)
|
||||||
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
||||||
infos.keySet().forEach(i -> graph.addNode((ModFileInfo) i));
|
infos.keySet().forEach(graph::addNode);
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFile::getModInfos)
|
.map(ModFile::getModInfos)
|
||||||
.<IModInfo>mapMulti(Iterable::forEach)
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
@@ -136,10 +125,9 @@ public class ModSorter
|
|||||||
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
||||||
{
|
{
|
||||||
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
||||||
final ModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
||||||
// soft dep that doesn't exist. Just return. No edge required.
|
// soft dep that doesn't exist. Just return. No edge required.
|
||||||
if (targetModInfo == null) return;
|
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
|
||||||
final ModFileInfo target = targetModInfo.getOwningFile();
|
|
||||||
if (self == target)
|
if (self == target)
|
||||||
return; // in case a jar has two mods that have dependencies between
|
return; // in case a jar has two mods that have dependencies between
|
||||||
switch (dep.getOrdering()) {
|
switch (dep.getOrdering()) {
|
||||||
@@ -150,62 +138,48 @@ public class ModSorter
|
|||||||
|
|
||||||
private void buildUniqueList()
|
private void buildUniqueList()
|
||||||
{
|
{
|
||||||
// Collect mod files by module name. This will be used for deduping purposes
|
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
|
||||||
final Map<String, List<IModFile>> modFilesByFirstId = modFiles.stream()
|
|
||||||
.collect(groupingBy(mf -> mf.getModFileInfo().moduleName()));
|
|
||||||
|
|
||||||
// Capture forge and MC here, so we can keep them for later
|
this.modFiles = uniqueModListData.modFiles();
|
||||||
forgeAndMC = new ArrayList<>();
|
|
||||||
var mc = modFilesByFirstId.get("minecraft");
|
|
||||||
if (mc != null && !mc.isEmpty())
|
|
||||||
forgeAndMC.add((ModFile) mc.get(0));
|
|
||||||
else
|
|
||||||
throw new IllegalStateException("Failed to find minecraft somehow?");
|
|
||||||
// TODO: remove this hardcoding and make it more flexible
|
|
||||||
var forge = modFilesByFirstId.get("forge");
|
|
||||||
if (forge != null && !forge.isEmpty())
|
|
||||||
forgeAndMC.add((ModFile) forge.get(0)); // Silently ignore if Forge isn't present
|
|
||||||
|
|
||||||
// Select the newest by artifact version sorting of non-unique files thus identified
|
detectSystemMods(uniqueModListData.modFilesByFirstId());
|
||||||
this.modFiles = modFilesByFirstId.entrySet().stream()
|
|
||||||
.map(this::selectNewestModInfo)
|
|
||||||
.map(Map.Entry::getValue)
|
|
||||||
.map(ModFile.class::cast)
|
|
||||||
.collect(toList());
|
|
||||||
|
|
||||||
// Transform to the full mod id list
|
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
|
||||||
final Map<String, List<ModInfo>> modIds = modFiles.stream()
|
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
|
||||||
.map(ModFile::getModInfos)
|
.collect(Collectors.toMap(
|
||||||
.flatMap(Collection::stream)
|
Map.Entry::getKey,
|
||||||
.map(ModInfo.class::cast)
|
e -> e.getValue().get(0).getModInfos().get(0)
|
||||||
.collect(groupingBy(IModInfo::getModId));
|
));
|
||||||
|
|
||||||
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
|
||||||
// We can't handle this
|
|
||||||
final List<ModInfo> dupedMods = modIds.values().stream()
|
|
||||||
.filter(modInfos -> modInfos.size() > 1)
|
|
||||||
.map(modInfos -> modInfos.get(0))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
if (!dupedMods.isEmpty()) {
|
|
||||||
final List<EarlyLoadingException.ExceptionData> duplicateModErrors = dupedMods.stream()
|
|
||||||
.map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedmod",
|
|
||||||
dm, Objects.toString(dm))).toList();
|
|
||||||
throw new EarlyLoadingException("Duplicate mods found", null, duplicateModErrors);
|
|
||||||
}
|
|
||||||
|
|
||||||
modIdNameLookup = modIds.entrySet().stream()
|
|
||||||
.collect(toMap(Map.Entry::getKey, e -> e.getValue().get(0)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map.Entry<String, IModFile> selectNewestModInfo(Map.Entry<String, List<IModFile>> fullList) {
|
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId)
|
||||||
List<IModFile> modInfoList = fullList.getValue();
|
{
|
||||||
if (modInfoList.size() > 1) {
|
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
||||||
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
final Set<String> systemMods = new HashSet<>();
|
||||||
modInfoList.sort(Comparator.<IModFile, ArtifactVersion>comparing(mf -> mf.getModInfos().get(0).getVersion()).reversed());
|
// The minecraft mod is always a system mod
|
||||||
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), modInfoList.get(0).getModInfos().get(0).getVersion());
|
systemMods.add("minecraft");
|
||||||
|
// Find mod file from MinecraftLocator to define the system mods
|
||||||
|
modFiles.stream()
|
||||||
|
.filter(modFile -> modFile.getLocator().getClass() == MinecraftLocator.class)
|
||||||
|
.map(ModFile::getSecureJar)
|
||||||
|
.map(SecureJar::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);
|
||||||
|
|
||||||
|
this.systemMods = new ArrayList<>();
|
||||||
|
for (String systemMod : systemMods) {
|
||||||
|
var container = modFilesByFirstId.get(systemMod);
|
||||||
|
if (container != null && !container.isEmpty()) {
|
||||||
|
LOGGER.debug("Found system mod: {}", systemMod);
|
||||||
|
this.systemMods.add((ModFile) container.get(0));
|
||||||
|
} else {
|
||||||
|
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return Map.entry(fullList.getKey(), modInfoList.get(0));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
||||||
@@ -235,10 +209,24 @@ public class ModSorter
|
|||||||
|
|
||||||
if (!missingVersions.isEmpty()) {
|
if (!missingVersions.isEmpty()) {
|
||||||
if (mandatoryMissing > 0) {
|
if (mandatoryMissing > 0) {
|
||||||
LOGGER.error(LOADING, "Missing mandatory dependencies: {}", missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).map(IModInfo.ModVersion::getModId).collect(Collectors.joining(", ")));
|
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) {
|
if (missingVersions.size() - mandatoryMissing > 0) {
|
||||||
LOGGER.error(LOADING, "Unsupported installed optional dependencies: {}", missingVersions.stream().filter(ver -> !ver.isMandatory()).map(IModInfo.ModVersion::getModId).collect(Collectors.joining(", ")));
|
LOGGER.error(
|
||||||
|
LOADING,
|
||||||
|
"Unsupported installed optional dependencies:\n{}",
|
||||||
|
missingVersions.stream()
|
||||||
|
.filter(ver -> !ver.isMandatory())
|
||||||
|
.map(ver -> formatDependencyError(ver, modVersions))
|
||||||
|
.collect(Collectors.joining("\n"))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return missingVersions.stream()
|
return missingVersions.stream()
|
||||||
@@ -250,6 +238,18 @@ public class ModSorter
|
|||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
||||||
|
{
|
||||||
|
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
||||||
|
return String.format(
|
||||||
|
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
||||||
|
dependency.getModId(),
|
||||||
|
dependency.getOwner().getModId(),
|
||||||
|
dependency.getVersionRange(),
|
||||||
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
|
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
|
||||||
{
|
{
|
||||||
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
|
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Minecraft Forge
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
* Copyright (c) 2016-2021.
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation version 2.1
|
|
||||||
* of the License.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static java.util.stream.Collectors.*;
|
||||||
|
|
||||||
|
public class UniqueModListBuilder
|
||||||
|
{
|
||||||
|
private final static Logger LOGGER = LogManager.getLogger();
|
||||||
|
|
||||||
|
private final List<ModFile> modFiles;
|
||||||
|
|
||||||
|
public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
|
||||||
|
|
||||||
|
public UniqueModListData buildUniqueList()
|
||||||
|
{
|
||||||
|
List<ModFile> uniqueModList;
|
||||||
|
List<ModFile> uniqueLibListWithVersion;
|
||||||
|
|
||||||
|
// Collect mod files by module name. This will be used for deduping purposes
|
||||||
|
final Map<String, List<ModFile>> modFilesByFirstId = modFiles.stream()
|
||||||
|
.filter(mf -> mf.getModFileInfo() != null)
|
||||||
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
|
final Map<String, List<ModFile>> libFilesWithVersionByModuleName = modFiles.stream()
|
||||||
|
.filter(mf -> mf.getModFileInfo() == null)
|
||||||
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
|
uniqueModList = modFilesByFirstId.entrySet().stream()
|
||||||
|
.map(this::selectNewestModInfo)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
|
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
||||||
|
.map(this::selectNewestModInfo)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
// Transform to the full mod id list
|
||||||
|
final Map<String, List<IModInfo>> modIds = uniqueModList.stream()
|
||||||
|
.filter(mf -> mf.getModFileInfo() != null) //Filter out non-mod files, we don't care about those for now.....
|
||||||
|
.map(ModFile::getModInfos)
|
||||||
|
.flatMap(Collection::stream)
|
||||||
|
.collect(groupingBy(IModInfo::getModId));
|
||||||
|
|
||||||
|
// Transform to the full lib id list
|
||||||
|
final Map<String, List<ModFile>> versionedLibIds = uniqueLibListWithVersion.stream()
|
||||||
|
.map(UniqueModListBuilder::getModId)
|
||||||
|
.collect(Collectors.toMap(
|
||||||
|
Function.identity(),
|
||||||
|
libFilesWithVersionByModuleName::get
|
||||||
|
));
|
||||||
|
|
||||||
|
// Its theoretically possible that some mod has somehow moved an id to a secondary place, thus causing a dupe.
|
||||||
|
// We can't handle this
|
||||||
|
final List<IModInfo> dupedMods = modIds.values().stream()
|
||||||
|
.filter(modInfos -> modInfos.size() > 1)
|
||||||
|
.map(modInfos -> modInfos.get(0))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
if (!dupedMods.isEmpty()) {
|
||||||
|
final List<EarlyLoadingException.ExceptionData> duplicateModErrors = dupedMods.stream()
|
||||||
|
.map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedmod", dm, Objects.toString(dm)))
|
||||||
|
.toList();
|
||||||
|
throw new EarlyLoadingException("Duplicate mods found", null, duplicateModErrors);
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ModFile> dupedLibs = versionedLibIds.values().stream()
|
||||||
|
.filter(modFiles -> modFiles.size() > 1)
|
||||||
|
.map(modFiles -> modFiles.get(0))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
if (!dupedLibs.isEmpty()) {
|
||||||
|
final List<EarlyLoadingException.ExceptionData> duplicateLibErrors = dupedLibs.stream()
|
||||||
|
.map(dm -> new EarlyLoadingException.ExceptionData("fml.modloading.dupedlib.versioned", dm, Objects.toString(dm)))
|
||||||
|
.toList();
|
||||||
|
throw new EarlyLoadingException("Duplicate plugins or libraries found", null, duplicateLibErrors);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collect unique mod files by module name. This will be used for deduping purposes
|
||||||
|
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
|
||||||
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
|
final List<ModFile> loadedList = new ArrayList<>();
|
||||||
|
loadedList.addAll(uniqueModList);
|
||||||
|
loadedList.addAll(uniqueLibListWithVersion);
|
||||||
|
|
||||||
|
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
||||||
|
List<ModFile> modInfoList = fullList.getValue();
|
||||||
|
if (modInfoList.size() > 1) {
|
||||||
|
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
||||||
|
modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
|
||||||
|
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
|
||||||
|
}
|
||||||
|
return modInfoList.get(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArtifactVersion getVersion(final ModFile mf)
|
||||||
|
{
|
||||||
|
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
||||||
|
return mf.getJarVersion();
|
||||||
|
}
|
||||||
|
|
||||||
|
return mf.getModInfos().get(0).getVersion();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getModId(ModFile modFile) {
|
||||||
|
if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) {
|
||||||
|
return modFile.getSecureJar().name();
|
||||||
|
}
|
||||||
|
|
||||||
|
return modFile.getModFileInfo().moduleName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
|
}
|
||||||
Loaded 100 of 1226 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user