mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f31519b6bb | ||
|
|
f715248a1e | ||
|
|
e1bc30a04b | ||
|
|
85ab903cd1 | ||
|
|
530c7c4eb5 | ||
|
|
3c740e488d | ||
|
|
03d07a9621 | ||
|
|
90dc29b1ef | ||
|
|
eae9d72dd8 | ||
|
|
7ac8903a3b | ||
|
|
bd96ff8777 | ||
|
|
ebfd92e0e1 | ||
|
|
43288f79e3 | ||
|
|
dbd7da6885 | ||
|
|
bb98165ee8 | ||
|
|
6a1f1acc42 | ||
|
|
a982445295 | ||
|
|
89919519ac | ||
|
|
4d592ba5ac | ||
|
|
5657e6542b | ||
|
|
c1c327ce11 | ||
|
|
142f07cbad | ||
|
|
c4f18dfa4b | ||
|
|
9f5a6d716e | ||
|
|
984cedda5c | ||
|
|
cc4a431711 | ||
|
|
ee07bcac57 | ||
|
|
b1cc694453 | ||
|
|
838ab9e1a5 | ||
|
|
99a7fcd8bd | ||
|
|
3535dcdbb3 | ||
|
|
d7ccecefe0 | ||
|
|
d3e9cfaaba | ||
|
|
7134b93427 | ||
|
|
61694447b2 | ||
|
|
561f3ee534 | ||
|
|
d0fea9cf76 | ||
|
|
dd866ed53e | ||
|
|
54f5e1213a | ||
|
|
9d4f283e6b | ||
|
|
28d4205a97 | ||
|
|
d0d1f1d782 | ||
|
|
397ceac0b6 | ||
|
|
1b7665cdaa | ||
|
|
70f96ef64e | ||
|
|
0cf4446352 | ||
|
|
b8270cd9ff |
No files matched your search
+12
-1
@@ -26,6 +26,7 @@
|
|||||||
/projects/mcp/
|
/projects/mcp/
|
||||||
/projects/clean/
|
/projects/clean/
|
||||||
/projects/forge/
|
/projects/forge/
|
||||||
|
#/patches/*
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/projects/**/build/
|
/projects/**/build/
|
||||||
@@ -34,10 +35,20 @@
|
|||||||
/projects/**/*.launch
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
src/*/generated/**/.cache/
|
src/*/generated/**/.cache/
|
||||||
|
|
||||||
# Generated by gradle every import
|
# Generated by gradle every import
|
||||||
**/src/main/resources/META-INF/MANIFEST.MF
|
**/src/main/resources/META-INF/MANIFEST.MF
|
||||||
/fmlloader/src/main/resources/forge_version.json
|
/fmlloader/src/main/resources/forge_version.json
|
||||||
|
|
||||||
|
#Patch rejects
|
||||||
|
#/patches-/
|
||||||
|
#*.patch.rej
|
||||||
|
#/projects/*/rejects/
|
||||||
|
|
||||||
|
# FML changelog
|
||||||
|
changelog.txt
|
||||||
|
*.py
|
||||||
|
*.7z
|
||||||
|
/logs/
|
||||||
|
|
||||||
/ForgeRoot.ipr
|
/ForgeRoot.ipr
|
||||||
/ForgeRoot.iws
|
/ForgeRoot.iws
|
||||||
Vendored
+3
-3
@@ -36,9 +36,9 @@ project {
|
|||||||
buildType(PullRequestCompatibility)
|
buildType(PullRequestCompatibility)
|
||||||
|
|
||||||
params {
|
params {
|
||||||
text("docker_jdk_version", "21", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
text("docker_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", "8.7", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
text("docker_gradle_version", "7.5.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
||||||
text("git_main_branch", "1.21.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
text("git_main_branch", "1.20.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
|
||||||
text("git_branch_spec", """
|
text("git_branch_spec", """
|
||||||
+:refs/heads/(main*)
|
+:refs/heads/(main*)
|
||||||
+:refs/heads/(master*)
|
+:refs/heads/(master*)
|
||||||
|
|||||||
+2
-2
@@ -7,8 +7,8 @@ plugins {
|
|||||||
id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
|
id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'de.undercouch.download' version '5.4.0'
|
id 'de.undercouch.download' version '5.4.0'
|
||||||
id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false
|
id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false
|
||||||
id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false
|
id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false
|
||||||
id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
|
id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
|
||||||
id 'org.barfuin.gradle.taskinfo' version '2.1.0'
|
id 'org.barfuin.gradle.taskinfo' version '2.1.0'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'org.ow2.asm:asm:9.7'
|
implementation 'org.ow2.asm:asm:9.6'
|
||||||
implementation 'org.ow2.asm:asm-tree:9.7'
|
implementation 'org.ow2.asm:asm-tree:9.6'
|
||||||
implementation 'net.minecraftforge:srgutils:0.5.10'
|
implementation 'net.minecraftforge:srgutils:0.5.+'
|
||||||
implementation 'commons-io:commons-io:2.13.0'
|
implementation 'commons-io:commons-io:2.13.0'
|
||||||
implementation 'com.google.code.gson:gson:2.10.1'
|
implementation 'com.google.code.gson:gson:2.10.1'
|
||||||
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
|
implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
|
||||||
}
|
}
|
||||||
@@ -10,13 +10,11 @@ import java.util.zip.ZipFile
|
|||||||
|
|
||||||
abstract class BundleList extends DefaultTask {
|
abstract class BundleList extends DefaultTask {
|
||||||
@InputFiles abstract ConfigurableFileCollection getConfig()
|
@InputFiles abstract ConfigurableFileCollection getConfig()
|
||||||
@InputFiles abstract ConfigurableFileCollection getConfigExtra()
|
|
||||||
@InputFile abstract RegularFileProperty getServerBundle()
|
@InputFile abstract RegularFileProperty getServerBundle()
|
||||||
@OutputFile abstract RegularFileProperty getOutput()
|
@OutputFile abstract RegularFileProperty getOutput()
|
||||||
|
|
||||||
BundleList() {
|
BundleList() {
|
||||||
config.setFrom(project.configurations.installer)
|
config.setFrom(project.configurations.installer)
|
||||||
configExtra.setFrom(project.configurations.installerextra)
|
|
||||||
output.convention(project.layout.buildDirectory.file("$name/output.list"))
|
output.convention(project.layout.buildDirectory.file("$name/output.list"))
|
||||||
configure {
|
configure {
|
||||||
dependsOn(project.tasks.universalJar)
|
dependsOn(project.tasks.universalJar)
|
||||||
@@ -34,13 +32,6 @@ abstract class BundleList extends DefaultTask {
|
|||||||
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
|
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
|
||||||
}
|
}
|
||||||
|
|
||||||
resolved = project.configurations.installerextra.resolvedConfiguration.resolvedArtifacts
|
|
||||||
for (def dep : resolved) {
|
|
||||||
def info = Util.getMavenInfoFromDep(dep)
|
|
||||||
//println("$dep.file.sha1\t$info.name\t$info.path")
|
|
||||||
entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
|
|
||||||
}
|
|
||||||
|
|
||||||
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
var packed = (AbstractArchiveTask) project.tasks.universalJar
|
||||||
var info = Util.getMavenInfoFromTask(packed)
|
var info = Util.getMavenInfoFromTask(packed)
|
||||||
def file = packed.archiveFile.get().asFile
|
def file = packed.archiveFile.get().asFile
|
||||||
|
|||||||
+3
-19
@@ -3,7 +3,6 @@ package net.minecraftforge.forge.tasks
|
|||||||
import groovy.transform.CompileStatic
|
import groovy.transform.CompileStatic
|
||||||
import org.gradle.api.provider.Property
|
import org.gradle.api.provider.Property
|
||||||
import org.gradle.api.tasks.Internal
|
import org.gradle.api.tasks.Internal
|
||||||
import org.objectweb.asm.Opcodes
|
|
||||||
import org.objectweb.asm.tree.ClassNode
|
import org.objectweb.asm.tree.ClassNode
|
||||||
import org.objectweb.asm.tree.MethodNode
|
import org.objectweb.asm.tree.MethodNode
|
||||||
|
|
||||||
@@ -13,19 +12,13 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
abstract Property<Closure<Boolean>> getPredicate()
|
||||||
|
|
||||||
private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
|
private final Set<String> matches = new HashSet<>()
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
protected process(ClassNode parent, MethodNode node) {
|
||||||
for (final current : node.instructions) {
|
for (final current : node.instructions) {
|
||||||
if (predicate.get().call(parent, node, current)) {
|
if (predicate.get().call(parent, node, current)) {
|
||||||
var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
|
matches.add(parent.name)
|
||||||
|
|
||||||
// only add non-synthetic methods
|
|
||||||
if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
|
|
||||||
methods.add(node.name + node.desc)
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,15 +27,6 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
@Override
|
@Override
|
||||||
protected Object getData() {
|
protected Object getData() {
|
||||||
var array = new ArrayList<Object>()
|
return matches.toSorted(Comparator.<String>naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
||||||
matches.forEach { c, m ->
|
|
||||||
{
|
|
||||||
array.add(
|
|
||||||
'class': c,
|
|
||||||
'methods': m
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,7 +24,6 @@ abstract class LauncherJson extends DefaultTask {
|
|||||||
dependsOn(project.tasks.universalJar)
|
dependsOn(project.tasks.universalJar)
|
||||||
input.from(project.tasks.universalJar.archiveFile)
|
input.from(project.tasks.universalJar.archiveFile)
|
||||||
input.from(project.configurations.installer)
|
input.from(project.configurations.installer)
|
||||||
input.from(project.configurations.installerextra)
|
|
||||||
configure {
|
configure {
|
||||||
def mc = project.rootProject.ext.MC_VERSION
|
def mc = project.rootProject.ext.MC_VERSION
|
||||||
def forge = project.rootProject.ext.FORGE_VERSION
|
def forge = project.rootProject.ext.FORGE_VERSION
|
||||||
@@ -89,7 +88,6 @@ abstract class LauncherJson extends DefaultTask {
|
|||||||
]
|
]
|
||||||
])
|
])
|
||||||
|
|
||||||
json.libraries.addAll(getArtifacts(project.configurations.installerextra).values())
|
|
||||||
json.libraries.addAll(getArtifacts(project.configurations.installer).values())
|
json.libraries.addAll(getArtifacts(project.configurations.installer).values())
|
||||||
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
|
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ abstract class CheckPatches extends CheckTask {
|
|||||||
final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
|
final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
|
||||||
|
|
||||||
if (!prevLineChange && !nextLineChange) {
|
if (!prevLineChange && !nextLineChange) {
|
||||||
reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
|
reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath", false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,13 +61,4 @@ eclipse.classpath.file.whenMerged {
|
|||||||
def src = entries.find { it.path == 'src/main/java' }
|
def src = entries.find { it.path == 'src/main/java' }
|
||||||
if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
|
if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
|
||||||
src.entryAttributes['ignore_optional_problems'] = 'true'
|
src.entryAttributes['ignore_optional_problems'] = 'true'
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('genPatches').configure {
|
|
||||||
onlyIf { false }
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('extractRangeMap').configure {
|
|
||||||
onlyIf { false }
|
|
||||||
tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
|
|
||||||
}
|
}
|
||||||
+137
-113
@@ -12,9 +12,9 @@ import net.minecraftforge.gradle.common.tasks.ApplyBinPatches
|
|||||||
import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility
|
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.patcher.tasks.FilterNewJar
|
|
||||||
import net.minecraftforge.gradle.patcher.tasks.GeneratePatches
|
import net.minecraftforge.gradle.patcher.tasks.GeneratePatches
|
||||||
import net.minecraftforge.gradle.userdev.tasks.RenameJar
|
import net.minecraftforge.gradle.userdev.tasks.RenameJar
|
||||||
|
import net.minecraftforge.gradleutils.PomUtils
|
||||||
import org.apache.tools.ant.filters.ReplaceTokens
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
import org.objectweb.asm.Opcodes
|
import org.objectweb.asm.Opcodes
|
||||||
|
|
||||||
@@ -46,8 +46,6 @@ jarSigner.autoDetect('forge')
|
|||||||
|
|
||||||
applyPatches {
|
applyPatches {
|
||||||
level 'WARNING'
|
level 'WARNING'
|
||||||
failOnError = UPDATING != 'true'
|
|
||||||
rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@@ -90,21 +88,16 @@ ext {
|
|||||||
final String MAVEN_PATH = ext.MAVEN_PATH
|
final String MAVEN_PATH = ext.MAVEN_PATH
|
||||||
|
|
||||||
final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
|
final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar'
|
||||||
final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.3'
|
final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0'
|
||||||
final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
|
final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6'
|
||||||
final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
// Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it.
|
||||||
bootstrap { transitive = false }
|
bootstrap { transitive = false }
|
||||||
installer {
|
installer {
|
||||||
extendsFrom(bootstrap)
|
extendsFrom(bootstrap)
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
installerextra {
|
|
||||||
extendsFrom(bootstrap)
|
|
||||||
transitive = false
|
|
||||||
}
|
|
||||||
api.extendsFrom(installer)
|
api.extendsFrom(installer)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,11 +111,10 @@ dependencies {
|
|||||||
bootstrap(libs.unsafe) // Needed by securemodules
|
bootstrap(libs.unsafe) // Needed by securemodules
|
||||||
bootstrap(libs.bundles.asm) // Needed by securemodules
|
bootstrap(libs.bundles.asm) // Needed by securemodules
|
||||||
|
|
||||||
implementation(libs.jopt.simple)
|
|
||||||
|
|
||||||
installer(libs.bootstrap)
|
installer(libs.bootstrap)
|
||||||
installer(libs.bootstrap.api) // Needed by securemodules
|
installer(libs.bootstrap.api) // Needed by securemodules
|
||||||
installer(libs.accesstransformers)
|
installer(libs.accesstransformers)
|
||||||
|
installer(libs.antlr.runtime) // Dep of AccessTransformer
|
||||||
installer(libs.eventbus)
|
installer(libs.eventbus)
|
||||||
installer(libs.typetools) // Dep of EventBus
|
installer(libs.typetools) // Dep of EventBus
|
||||||
installer(libs.forgespi)
|
installer(libs.forgespi)
|
||||||
@@ -143,16 +135,10 @@ dependencies {
|
|||||||
installer(project(':lowcodelanguage'))
|
installer(project(':lowcodelanguage'))
|
||||||
installer(project(':mclanguage'))
|
installer(project(':mclanguage'))
|
||||||
|
|
||||||
installerextra("${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:srg2off")
|
|
||||||
|
|
||||||
runtimeOnly(libs.bootstrap)
|
runtimeOnly(libs.bootstrap)
|
||||||
runtimeOnly(libs.bootstrap.dev)
|
runtimeOnly(libs.bootstrap.dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('extractRangeMap').configure {
|
|
||||||
tool = S2S_TOOL
|
|
||||||
}
|
|
||||||
|
|
||||||
patcher {
|
patcher {
|
||||||
excs.from file("$rootDir/src/main/resources/forge.exc")
|
excs.from file("$rootDir/src/main/resources/forge.exc")
|
||||||
parent = project(':mcp')
|
parent = project(':mcp')
|
||||||
@@ -181,7 +167,6 @@ patcher {
|
|||||||
|
|
||||||
forge_client_test {
|
forge_client_test {
|
||||||
parent runs.forge_client
|
parent runs.forge_client
|
||||||
source sourceSets.test
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forge_server {
|
forge_server {
|
||||||
@@ -190,17 +175,14 @@ patcher {
|
|||||||
|
|
||||||
forge_server_test {
|
forge_server_test {
|
||||||
parent runs.forge_server
|
parent runs.forge_server
|
||||||
source sourceSets.test
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forge_server_gametest {
|
forge_server_gametest {
|
||||||
args '--launchTarget', 'forge_dev_server_gametest'
|
args '--launchTarget', 'forge_dev_server_gametest'
|
||||||
args '--uniqueWorld' // Unique world is used so that the world regenerates, as well as the world config isn't influenced by other runs
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forge_server_gametest_test {
|
forge_server_gametest_test {
|
||||||
parent runs.forge_server_gametest
|
parent runs.forge_server_gametest
|
||||||
source sourceSets.test
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forge_data {
|
forge_data {
|
||||||
@@ -216,7 +198,6 @@ patcher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
forge_data_test {
|
forge_data_test {
|
||||||
source sourceSets.test
|
|
||||||
args '--launchTarget', 'forge_dev_data',
|
args '--launchTarget', 'forge_dev_data',
|
||||||
'--mod', '.+',
|
'--mod', '.+',
|
||||||
'--all',
|
'--all',
|
||||||
@@ -227,6 +208,7 @@ patcher {
|
|||||||
'--assetsDir', downloadAssets.output,
|
'--assetsDir', downloadAssets.output,
|
||||||
'--assetIndex', "{asset_index}"
|
'--assetIndex', "{asset_index}"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -380,15 +362,33 @@ tasks.register('extractInheritance', ExtractInheritance) {
|
|||||||
Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
|
Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).toList()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
tasks.register("findFieldInstanceChecks", FieldCompareFinder) {
|
||||||
|
jar = createJoinedSRG.output
|
||||||
|
output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json')
|
||||||
|
fields {
|
||||||
|
/* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list
|
||||||
|
bows {
|
||||||
|
cls = 'net/minecraft/world/item/Items'
|
||||||
|
name = 'f_42411_'
|
||||||
|
replacement = 'net/minecraft/world/item/BowItem'
|
||||||
|
}
|
||||||
|
crossbows {
|
||||||
|
cls = 'net/minecraft/world/item/Items'
|
||||||
|
name = 'f_42717_'
|
||||||
|
replacement = 'net/minecraft/world/item/CrossbowItem'
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
}
|
||||||
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
||||||
jar = createClientOfficial.output
|
jar = createJoinedSRG.output
|
||||||
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
||||||
predicate = {
|
predicate = {
|
||||||
parent, node, insn ->
|
parent, node, insn ->
|
||||||
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
||||||
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
&& insn.getOpcode() === Opcodes.INVOKEVIRTUAL
|
||||||
&& insn.name == 'finalizeSpawn'
|
&& insn.name == 'm_6518_'
|
||||||
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.register('validateDeprecations', ValidateDeprecations) {
|
tasks.register('validateDeprecations', ValidateDeprecations) {
|
||||||
@@ -406,6 +406,16 @@ tasks.register("downloadServerShim", DownloadMavenArtifact) {
|
|||||||
artifact = libs.bootstrap.shim.get().toString()
|
artifact = libs.bootstrap.shim.get().toString()
|
||||||
changing = true
|
changing = true
|
||||||
}
|
}
|
||||||
|
tasks.register("downloadMCPConfig", DownloadMavenArtifact) {
|
||||||
|
artifact = MCP_ARTIFACT
|
||||||
|
}
|
||||||
|
tasks.register('extractMCPConfigMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
|
||||||
|
ext.output = file('build/mcp_mappings.tsrg')
|
||||||
|
tool = INSTALLER_TOOLS + ':fatjar'
|
||||||
|
args = ['--task', 'MCP_DATA', '--key', 'mappings', '--input', downloadMCPConfig.output.get().asFile.absolutePath, '--output', output.absolutePath]
|
||||||
|
outputs.file(output)
|
||||||
|
inputs.file(downloadMCPConfig.output)
|
||||||
|
}
|
||||||
tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
|
tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
|
||||||
ext.output = file('build/client_mappings.tsrg')
|
ext.output = file('build/client_mappings.tsrg')
|
||||||
tool = INSTALLER_TOOLS + ':fatjar'
|
tool = INSTALLER_TOOLS + ':fatjar'
|
||||||
@@ -418,34 +428,43 @@ tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.
|
|||||||
args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
|
args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath]
|
||||||
outputs.file(output)
|
outputs.file(output)
|
||||||
}
|
}
|
||||||
|
tasks.register('mergeClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
|
||||||
|
ext.output = file('build/client_mappings_merged.tsrg')
|
||||||
|
tool = INSTALLER_TOOLS + ':fatjar'
|
||||||
|
args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadClientMappings.output.absolutePath, '--output', output.absolutePath]
|
||||||
|
outputs.file(output)
|
||||||
|
}
|
||||||
|
tasks.register('mergeServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) {
|
||||||
|
ext.output = file('build/server_mappings_merged.tsrg')
|
||||||
|
tool = INSTALLER_TOOLS + ':fatjar'
|
||||||
|
args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadServerMappings.output.absolutePath, '--output', output.absolutePath]
|
||||||
|
outputs.file(output)
|
||||||
|
}
|
||||||
tasks.register("createJoinedSRG", DownloadMavenArtifact) {
|
tasks.register("createJoinedSRG", DownloadMavenArtifact) {
|
||||||
artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
|
artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg"
|
||||||
}
|
}
|
||||||
tasks.register("createClientOfficial", RenameJar) {
|
tasks.register("createClientSRG", RenameJar) {
|
||||||
tool = FART + ':all'
|
tool = FART + ':all'
|
||||||
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
|
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
|
||||||
mappings = downloadClientMappings.output
|
mappings = createMcp2Srg.srg
|
||||||
dependsOn(downloadClientRaw, downloadClientMappings)
|
dependsOn(downloadClientRaw)
|
||||||
input = downloadClientRaw.dest
|
input = downloadClientRaw.dest
|
||||||
output = file("build/createClientOfficial/output.jar")
|
output = file("build/createClientSRG/output.jar")
|
||||||
}
|
}
|
||||||
tasks.register("createServerOfficial", RenameJar) {
|
tasks.register("createServerSRG", RenameJar) {
|
||||||
tool = FART + ':all'
|
tool = FART + ':all'
|
||||||
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse']
|
args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs']
|
||||||
mappings = downloadServerMappings.output
|
mappings = createMcp2Srg.srg
|
||||||
dependsOn(downloadServerMappings)
|
|
||||||
input = extractServer.output
|
input = extractServer.output
|
||||||
output = file("build/createServerOfficial/output.jar")
|
output = file("build/createServerSRG/output.jar")
|
||||||
}
|
}
|
||||||
tasks.named('genClientBinPatches').configure {
|
tasks.named('genClientBinPatches').configure {
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
cleanJar = createClientOfficial.output
|
cleanJar = createClientSRG.output
|
||||||
dirtyJar = jar.archiveFile
|
|
||||||
}
|
}
|
||||||
tasks.named('genServerBinPatches').configure {
|
tasks.named('genServerBinPatches').configure {
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
cleanJar = createServerOfficial.output
|
cleanJar = createServerSRG.output
|
||||||
dirtyJar = jar.archiveFile
|
|
||||||
}
|
}
|
||||||
tasks.named('genJoinedBinPatches').configure {
|
tasks.named('genJoinedBinPatches').configure {
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
@@ -453,13 +472,13 @@ tasks.named('genJoinedBinPatches').configure {
|
|||||||
}
|
}
|
||||||
tasks.register('applyClientBinPatches', ApplyBinPatches) {
|
tasks.register('applyClientBinPatches', ApplyBinPatches) {
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
clean = createClientOfficial.output
|
clean = createClientSRG.output
|
||||||
patch = genClientBinPatches.output
|
patch = genClientBinPatches.output
|
||||||
args.addAll(['--data', '--unpatched'])
|
args.addAll(['--data', '--unpatched'])
|
||||||
}
|
}
|
||||||
tasks.register('applyServerBinPatches', ApplyBinPatches) {
|
tasks.register('applyServerBinPatches', ApplyBinPatches) {
|
||||||
tool = BINPATCH_TOOL
|
tool = BINPATCH_TOOL
|
||||||
clean = createServerOfficial.output
|
clean = createServerSRG.output
|
||||||
patch = genServerBinPatches.output
|
patch = genServerBinPatches.output
|
||||||
args.addAll(['--data', '--unpatched'])
|
args.addAll(['--data', '--unpatched'])
|
||||||
}
|
}
|
||||||
@@ -475,10 +494,10 @@ tasks.register('createServerShimClasspath', BundleList) {
|
|||||||
tasks.register('createServerShimConfig') {
|
tasks.register('createServerShimConfig') {
|
||||||
ext.output = file('build/libs/bootstrap-shim.properties')
|
ext.output = file('build/libs/bootstrap-shim.properties')
|
||||||
doLast {
|
doLast {
|
||||||
var cfg = new CleanProperties()
|
def cfg = new CleanProperties()
|
||||||
cfg['Main-Class'] = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
cfg."Main-Class" = 'net.minecraftforge.bootstrap.ForgeBootstrap'
|
||||||
cfg['Java-Version'] = '21'
|
cfg."Java-Version" = '17'
|
||||||
cfg['Arguments'] = '--launchTarget forge_server'
|
cfg."Arguments" = "--launchTarget forge_server"
|
||||||
cfg.store(output)
|
cfg.store(output)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -504,7 +523,7 @@ tasks.register('checkAll') {
|
|||||||
group = 'checks'
|
group = 'checks'
|
||||||
}
|
}
|
||||||
tasks.register('checkAllAndFix') {
|
tasks.register('checkAllAndFix') {
|
||||||
dependsOn 'findFinalizeSpawnTargets', 'checkLicenses'
|
dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses'
|
||||||
group = 'checks'
|
group = 'checks'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -612,15 +631,21 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
dependsOn(launcherJson)
|
dependsOn(launcherJson)
|
||||||
input.from(launcherJson.output)
|
input.from(launcherJson.output)
|
||||||
|
|
||||||
|
// Extract MCP Mappings
|
||||||
|
dependsOn(extractMCPConfigMappings)
|
||||||
|
input.from(extractMCPConfigMappings.output)
|
||||||
// Download Official Mappings
|
// Download Official Mappings
|
||||||
dependsOn(downloadClientMappings, downloadServerMappings)
|
dependsOn(downloadClientMappings, downloadServerMappings)
|
||||||
input.from(downloadClientMappings.output, downloadServerMappings.output)
|
input.from(downloadClientMappings.output, downloadServerMappings.output)
|
||||||
|
// Merge MCP and Official Mappings
|
||||||
|
dependsOn(mergeClientMappings, mergeServerMappings)
|
||||||
|
input.from(mergeClientMappings.output, mergeServerMappings.output)
|
||||||
// Get 'base' MC jar, Client is straight download, server is extracted from the bundle
|
// Get 'base' MC jar, Client is straight download, server is extracted from the bundle
|
||||||
dependsOn(downloadClientRaw, extractServer)
|
dependsOn(downloadClientRaw, extractServer)
|
||||||
input.from(downloadClientRaw.dest, extractServer.output)
|
input.from(downloadClientRaw.dest, extractServer.output)
|
||||||
// Rename MC Jar
|
// Rename MC Jar
|
||||||
dependsOn(createClientOfficial, createServerOfficial)
|
dependsOn(createClientSRG, createServerSRG)
|
||||||
input.from(createClientOfficial.output, createServerOfficial.output)
|
input.from(createClientSRG.output, createServerSRG.output)
|
||||||
// Apply Binary patches to vanilla jar
|
// Apply Binary patches to vanilla jar
|
||||||
dependsOn(applyClientBinPatches, applyServerBinPatches)
|
dependsOn(applyClientBinPatches, applyServerBinPatches)
|
||||||
input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
|
input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar)
|
||||||
@@ -638,14 +663,30 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
minecraft: MC_VERSION,
|
minecraft: MC_VERSION,
|
||||||
serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
|
serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar',
|
||||||
data: [
|
data: [
|
||||||
|
MAPPINGS: [
|
||||||
|
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]",
|
||||||
|
server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]"
|
||||||
|
],
|
||||||
|
MAPPINGS_SHA: [
|
||||||
|
client: "'${extractMCPConfigMappings.output.sha1}'",
|
||||||
|
server: "'${extractMCPConfigMappings.output.sha1}'"
|
||||||
|
],
|
||||||
MOJMAPS: [
|
MOJMAPS: [
|
||||||
client: "[net.minecraft:client:${MC_VERSION}:mappings@tsrg]",
|
client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]",
|
||||||
server: "[net.minecraft:server:${MC_VERSION}:mappings@tsrg]"
|
server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]"
|
||||||
],
|
],
|
||||||
MOJMAPS_SHA: [
|
MOJMAPS_SHA: [
|
||||||
client: "'${downloadClientMappings.output.sha1}'",
|
client: "'${downloadClientMappings.output.sha1}'",
|
||||||
server: "'${downloadServerMappings.output.sha1}'"
|
server: "'${downloadServerMappings.output.sha1}'"
|
||||||
],
|
],
|
||||||
|
MERGED_MAPPINGS: [
|
||||||
|
client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]",
|
||||||
|
server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]"
|
||||||
|
],
|
||||||
|
MERGED_MAPPINGS_SHA: [
|
||||||
|
client: "'${mergeClientMappings.output.sha1}'",
|
||||||
|
server: "'${mergeServerMappings.output.sha1}'"
|
||||||
|
],
|
||||||
MC_UNPACKED: [
|
MC_UNPACKED: [
|
||||||
client: "[net.minecraft:client:${MC_VERSION}]",
|
client: "[net.minecraft:client:${MC_VERSION}]",
|
||||||
server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
|
server: "[net.minecraft:server:${MC_VERSION}:unpacked]"
|
||||||
@@ -654,13 +695,13 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
client: "'${downloadClientRaw.dest.sha1}'",
|
client: "'${downloadClientRaw.dest.sha1}'",
|
||||||
server: "'${extractServer.output.get().asFile.sha1}'"
|
server: "'${extractServer.output.get().asFile.sha1}'"
|
||||||
],
|
],
|
||||||
MC_OFF: [
|
MC_SRG: [
|
||||||
client: "[net.minecraft:client:${MC_VERSION}:official]",
|
client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]",
|
||||||
server: "[net.minecraft:server:${MC_VERSION}:official]"
|
server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]"
|
||||||
],
|
],
|
||||||
MC_OFF_SHA: [
|
MC_SRG_SHA: [
|
||||||
client: "'${createClientOfficial.output.get().asFile.sha1}'",
|
client: "'${createClientSRG.output.get().asFile.sha1}'",
|
||||||
server: "'${createServerOfficial.output.get().asFile.sha1}'"
|
server: "'${createServerSRG.output.get().asFile.sha1}'"
|
||||||
],
|
],
|
||||||
BINPATCH: [
|
BINPATCH: [
|
||||||
client: '/data/client.lzma',
|
client: '/data/client.lzma',
|
||||||
@@ -727,6 +768,18 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
outputs: [
|
outputs: [
|
||||||
'{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
|
'{MC_UNPACKED}': '{MC_UNPACKED_SHA}'
|
||||||
]
|
]
|
||||||
|
], [
|
||||||
|
jar: INSTALLER_TOOLS,
|
||||||
|
classpath: INSTALLER_TOOLS_CLASSPATH,
|
||||||
|
args: [
|
||||||
|
'--task', 'MCP_DATA',
|
||||||
|
'--input', "[${MCP_ARTIFACT.descriptor}]",
|
||||||
|
'--output', '{MAPPINGS}',
|
||||||
|
'--key', 'mappings'
|
||||||
|
],
|
||||||
|
outputs: [
|
||||||
|
'{MAPPINGS}': '{MAPPINGS_SHA}'
|
||||||
|
]
|
||||||
], [
|
], [
|
||||||
jar: INSTALLER_TOOLS,
|
jar: INSTALLER_TOOLS,
|
||||||
classpath: INSTALLER_TOOLS_CLASSPATH,
|
classpath: INSTALLER_TOOLS_CLASSPATH,
|
||||||
@@ -740,18 +793,31 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
outputs: [
|
outputs: [
|
||||||
'{MOJMAPS}': '{MOJMAPS_SHA}'
|
'{MOJMAPS}': '{MOJMAPS_SHA}'
|
||||||
]
|
]
|
||||||
|
], [
|
||||||
|
jar: INSTALLER_TOOLS,
|
||||||
|
classpath: INSTALLER_TOOLS_CLASSPATH,
|
||||||
|
args: [
|
||||||
|
'--task', 'MERGE_MAPPING',
|
||||||
|
'--left', '{MAPPINGS}',
|
||||||
|
'--right', '{MOJMAPS}',
|
||||||
|
'--output', '{MERGED_MAPPINGS}',
|
||||||
|
'--classes', '--reverse-right'
|
||||||
|
],
|
||||||
|
outputs: [
|
||||||
|
'{MERGED_MAPPINGS}': '{MERGED_MAPPINGS_SHA}'
|
||||||
|
]
|
||||||
], [
|
], [
|
||||||
sides: ['server'],
|
sides: ['server'],
|
||||||
jar: FART,
|
jar: FART,
|
||||||
classpath: getClasspath(project, libs, FART),
|
classpath: getClasspath(project, libs, FART),
|
||||||
args: [
|
args: [
|
||||||
'--input', '{MC_UNPACKED}',
|
'--input', '{MC_UNPACKED}',
|
||||||
'--output', '{MC_OFF}',
|
'--output', '{MC_SRG}',
|
||||||
'--names', '{MOJMAPS}',
|
'--names', '{MERGED_MAPPINGS}',
|
||||||
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
|
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
|
||||||
],
|
],
|
||||||
outputs: [
|
outputs: [
|
||||||
'{MC_OFF}': '{MC_OFF_SHA}'
|
'{MC_SRG}': '{MC_SRG_SHA}'
|
||||||
]
|
]
|
||||||
], [
|
], [
|
||||||
sides: ['client'],
|
sides: ['client'],
|
||||||
@@ -759,18 +825,18 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
classpath: getClasspath(project, libs, FART),
|
classpath: getClasspath(project, libs, FART),
|
||||||
args: [
|
args: [
|
||||||
'--input', '{MINECRAFT_JAR}',
|
'--input', '{MINECRAFT_JAR}',
|
||||||
'--output', '{MC_OFF}',
|
'--output', '{MC_SRG}',
|
||||||
'--names', '{MOJMAPS}',
|
'--names', '{MERGED_MAPPINGS}',
|
||||||
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
|
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'
|
||||||
],
|
],
|
||||||
outputs: [
|
outputs: [
|
||||||
'{MC_OFF}': '{MC_OFF_SHA}'
|
'{MC_SRG}': '{MC_SRG_SHA}'
|
||||||
]
|
]
|
||||||
], [
|
], [
|
||||||
jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
|
jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar
|
||||||
classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
|
classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]),
|
||||||
args: [
|
args: [
|
||||||
'--clean', '{MC_OFF}',
|
'--clean', '{MC_SRG}',
|
||||||
'--output', '{PATCHED}',
|
'--output', '{PATCHED}',
|
||||||
'--apply', '{BINPATCH}',
|
'--apply', '{BINPATCH}',
|
||||||
'--data', '--unpatched'
|
'--data', '--unpatched'
|
||||||
@@ -785,27 +851,6 @@ tasks.register('installerJson', InstallerJson) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('officialClassesOnly', Zip).configure {
|
|
||||||
dependsOn(jar)
|
|
||||||
destinationDirectory = file('build/libs')
|
|
||||||
archiveClassifier = 'official-classes'
|
|
||||||
from zipTree(jar.archiveFile).matching {
|
|
||||||
include '**/*.class'
|
|
||||||
exclude 'mcp/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('filterJarNew').configure {
|
|
||||||
dependsOn('officialClassesOnly')
|
|
||||||
input = officialClassesOnly.archiveFile
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('filterJarNewSRG', FilterNewJar).configure {
|
|
||||||
input = reobfJar.output
|
|
||||||
srg = filterJarNew.srg
|
|
||||||
blacklist = filterJarNew.blacklist
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('universalJar').configure {
|
tasks.named('universalJar').configure {
|
||||||
dependsOn downloadCrowdin
|
dependsOn downloadCrowdin
|
||||||
from zipTree(downloadCrowdin.dest).matching {
|
from zipTree(downloadCrowdin.dest).matching {
|
||||||
@@ -817,9 +862,6 @@ tasks.named('universalJar').configure {
|
|||||||
exclude '.cache'
|
exclude '.cache'
|
||||||
|
|
||||||
manifest {
|
manifest {
|
||||||
attributes([
|
|
||||||
'Automatic-Module-Name': 'net.minecraftforge.forge'
|
|
||||||
] as LinkedHashMap)
|
|
||||||
attributes([
|
attributes([
|
||||||
'Specification-Title': 'Forge',
|
'Specification-Title': 'Forge',
|
||||||
'Specification-Vendor': 'Forge Development LLC',
|
'Specification-Vendor': 'Forge Development LLC',
|
||||||
@@ -840,20 +882,6 @@ tasks.named('universalJar').configure {
|
|||||||
jarSigner.sign(it)
|
jarSigner.sign(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('universalJarSrg', Jar).configure {
|
|
||||||
from zipTree(filterJarNewSRG.output)
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
||||||
from zipTree(universalJar.archiveFile)
|
|
||||||
destinationDirectory = file('build/libs')
|
|
||||||
archiveClassifier = 'universal-srg'
|
|
||||||
manifest.from(universalJar.manifest)
|
|
||||||
jarSigner.sign(it)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('userdevConfig').configure {
|
|
||||||
universal = "$project.group:$project.name:$project.version:universal-srg@jar"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register('installerJar', InstallerJar) {
|
tasks.register('installerJar', InstallerJar) {
|
||||||
fat = !System.env.TEAMCITY_VERSION
|
fat = !System.env.TEAMCITY_VERSION
|
||||||
//offline = true
|
//offline = true
|
||||||
@@ -923,9 +951,6 @@ tasks.register('mdkZip', Zip) {
|
|||||||
rename 'gitignore\\.txt', '.gitignore'
|
rename 'gitignore\\.txt', '.gitignore'
|
||||||
rename 'gitattributes\\.txt', '.gitattributes'
|
rename 'gitattributes\\.txt', '.gitattributes'
|
||||||
}
|
}
|
||||||
from(rootProject.file('src/test/java/com/example/examplemod/')) {
|
|
||||||
into('src/main/java/com/example/examplemod/')
|
|
||||||
}
|
|
||||||
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
||||||
into('src/main/resources/')
|
into('src/main/resources/')
|
||||||
exclude '**/.cache/'
|
exclude '**/.cache/'
|
||||||
@@ -1043,7 +1068,6 @@ tasks.named('javadoc', Javadoc).configure {
|
|||||||
publishing {
|
publishing {
|
||||||
publications.register('mavenJava', MavenPublication).configure {
|
publications.register('mavenJava', MavenPublication).configure {
|
||||||
artifact universalJar
|
artifact universalJar
|
||||||
artifact universalJarSrg
|
|
||||||
artifact installerJar
|
artifact installerJar
|
||||||
artifact mdkZip
|
artifact mdkZip
|
||||||
artifact userdevJar
|
artifact userdevJar
|
||||||
@@ -1055,8 +1079,8 @@ publishing {
|
|||||||
name = project.name
|
name = project.name
|
||||||
description = 'Modifactions to Minecraft to enable mod developers.'
|
description = 'Modifactions to Minecraft to enable mod developers.'
|
||||||
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
url = 'https://github.com/MinecraftForge/MinecraftForge'
|
||||||
gradleutils.pom.setGitHubDetails(pom, 'MinecraftForge')
|
PomUtils.setGitHubDetails(pom, 'MinecraftForge')
|
||||||
license gradleutils.pom.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1066,5 +1090,5 @@ publishing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Make sure we run bin compat checking during local testing.
|
// Make sure we run bin compat checking during local testing.
|
||||||
if ((!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) && CHECK_COMPATIBILITY == "true")
|
if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD)
|
||||||
tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
|
tasks.named('publish').configure { dependsOn(':forge:checkJarCompatibility') }
|
||||||
@@ -44,7 +44,6 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
|
dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
|
||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
options.warnings = false // Shutup deprecated for removal warnings
|
options.warnings = false // Shutup deprecated for removal warnings
|
||||||
options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge the resources and classes into the same directory. We'll need to split them at runtime because
|
// Merge the resources and classes into the same directory. We'll need to split them at runtime because
|
||||||
|
|||||||
+2
-2
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[][Download]
|
[][Download]
|
||||||
[][Download] [][Discord] [][Patreon]
|
)][Download] [][Discord] [][Patreon]
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
|
|||||||
@@ -57,9 +57,7 @@ public class DeferredWorkQueue
|
|||||||
LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
|
LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
|
||||||
RuntimeException aggregate = new RuntimeException();
|
RuntimeException aggregate = new RuntimeException();
|
||||||
Stopwatch timer = Stopwatch.createStarted();
|
Stopwatch timer = Stopwatch.createStarted();
|
||||||
for (TaskInfo t : tasks) {
|
tasks.forEach(t -> makeRunnable(t, Runnable::run, aggregate));
|
||||||
makeRunnable(t, Runnable::run, aggregate);
|
|
||||||
}
|
|
||||||
timer.stop();
|
timer.stop();
|
||||||
if (aggregate.getSuppressed().length > 0) {
|
if (aggregate.getSuppressed().length > 0) {
|
||||||
LOGGER.fatal(
|
LOGGER.fatal(
|
||||||
@@ -116,7 +114,7 @@ public class DeferredWorkQueue
|
|||||||
return future;
|
return future;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class TaskInfo {
|
private static class TaskInfo {
|
||||||
private final ModContainer owner;
|
private final ModContainer owner;
|
||||||
private Runnable task;
|
private Runnable task;
|
||||||
private CompletableFuture<?> future;
|
private CompletableFuture<?> future;
|
||||||
|
|||||||
@@ -68,15 +68,13 @@ public interface IModLoadingState {
|
|||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
||||||
*/
|
*/
|
||||||
default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
default <T extends Event & IModBusEvent>
|
||||||
final Executor syncExecutor,
|
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar
|
final ProgressMeter progressBar) {
|
||||||
) {
|
|
||||||
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
||||||
e -> CompletableFuture.completedFuture(null),
|
e -> CompletableFuture.runAsync(() -> {}, e),
|
||||||
e -> CompletableFuture.completedFuture(null)
|
e -> CompletableFuture.runAsync(() -> {}, e));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import net.minecraftforge.eventbus.api.Event;
|
|||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
@@ -16,67 +18,103 @@ import java.util.function.Function;
|
|||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
@SuppressWarnings("unchecked")
|
||||||
|
|
||||||
public interface IModStateTransition {
|
public interface IModStateTransition {
|
||||||
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
|
|
||||||
public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
|
|
||||||
|
|
||||||
static IModStateTransition buildNoopTransition() {
|
static IModStateTransition buildNoopTransition() {
|
||||||
return ModStateTransitionHelper.NOOP;
|
return new NoopTransition();
|
||||||
}
|
}
|
||||||
|
|
||||||
default CompletableFuture<Void> build(
|
default <T extends Event & IModBusEvent>
|
||||||
final String name,
|
CompletableFuture<Void> build(final String name,
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
||||||
) {
|
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
||||||
return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
|
|
||||||
|
this.eventFunctionStream().get()
|
||||||
|
.map(f -> (EventGenerator<T>) f)
|
||||||
|
.reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
|
||||||
|
.ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
|
||||||
|
|
||||||
|
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
||||||
|
final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
|
||||||
|
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
||||||
|
.thenApplyAsync(n -> {
|
||||||
|
progressBar.label(progressBar.name() + ": dispatching "+name);
|
||||||
|
return null;
|
||||||
|
}, parallelExecutor)
|
||||||
|
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
||||||
|
.thenApply(r -> {
|
||||||
|
postSyncTask.apply(syncExecutor);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
||||||
}
|
}
|
||||||
|
|
||||||
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
||||||
return ModLoadingStage::nextState;
|
return ModLoadingStage::nextState;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private <T extends Event & IModBusEvent>
|
||||||
* This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
|
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
|
||||||
* ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
|
final Executor parallelExecutor,
|
||||||
*/
|
final List<CompletableFuture<Void>> completableFutures,
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
final ProgressMeter progressBar,
|
||||||
default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
final EventGenerator<T> eventGenerator,
|
||||||
return () -> Stream.ofNullable(eventFunction());
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
|
||||||
}
|
final EventGenerator<T> nextGenerator) {
|
||||||
|
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
|
||||||
@Nullable
|
|
||||||
default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
|
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
|
||||||
return null;
|
completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
|
||||||
|
|
||||||
|
completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
|
||||||
|
|
||||||
|
var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
|
||||||
|
completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
|
||||||
|
|
||||||
|
return nextGenerator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
|
||||||
ThreadSelector threadSelector();
|
ThreadSelector threadSelector();
|
||||||
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
||||||
|
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
|
||||||
/**
|
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
|
||||||
* I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
|
|
||||||
* However, the Future returned by this was never linked to the main transition future in any way. Which means that it was run
|
|
||||||
* in parallel and couldn't guarantee the state of the ModContainer.
|
|
||||||
* <p>
|
|
||||||
* Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
|
|
||||||
* <p>
|
|
||||||
* If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
|
|
||||||
* <p>
|
|
||||||
* Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
|
|
||||||
|
|
||||||
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
||||||
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
||||||
return fn::apply;
|
return fn::apply;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
record NoopTransition() implements IModStateTransition {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
||||||
|
return Stream::of;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ThreadSelector threadSelector() {
|
||||||
|
return ThreadSelector.SYNC;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
||||||
|
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
|
||||||
|
return (t, f)-> CompletableFuture.completedFuture(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
|
||||||
|
return (t, f)-> CompletableFuture.completedFuture(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ public class InterModComms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
|
private static ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
|
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
|
||||||
@@ -115,14 +115,16 @@ public class InterModComms
|
|||||||
return getMessages(modId, s->Boolean.TRUE);
|
return getMessages(modId, s->Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private record QueueFilteringSpliterator(
|
private static class QueueFilteringSpliterator implements Spliterator<IMCMessage>
|
||||||
ConcurrentLinkedQueue<IMCMessage> queue,
|
{
|
||||||
Predicate<String> methodFilter,
|
private final ConcurrentLinkedQueue<IMCMessage> queue;
|
||||||
Iterator<IMCMessage> iterator
|
private final Predicate<String> methodFilter;
|
||||||
) implements Spliterator<IMCMessage> {
|
private final Iterator<IMCMessage> iterator;
|
||||||
|
|
||||||
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
|
||||||
this(queue, methodFilter, queue.iterator());
|
this.queue = queue;
|
||||||
|
this.iterator = queue.iterator();
|
||||||
|
this.methodFilter = methodFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ import net.minecraftforge.api.distmarker.Dist;
|
|||||||
*
|
*
|
||||||
* @see Dist
|
* @see Dist
|
||||||
*/
|
*/
|
||||||
public enum LogicalSide {
|
public enum LogicalSide
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
|
* The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
|
||||||
* viewpoint.
|
* viewpoint.
|
||||||
@@ -26,7 +27,6 @@ public enum LogicalSide {
|
|||||||
* @see Dist#CLIENT
|
* @see Dist#CLIENT
|
||||||
*/
|
*/
|
||||||
CLIENT,
|
CLIENT,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
|
* The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
|
||||||
* on the level.
|
* on the level.
|
||||||
@@ -41,14 +41,16 @@ public enum LogicalSide {
|
|||||||
/**
|
/**
|
||||||
* {@return if this logical side is the server}
|
* {@return if this logical side is the server}
|
||||||
*/
|
*/
|
||||||
public boolean isServer() {
|
public boolean isServer()
|
||||||
|
{
|
||||||
return !isClient();
|
return !isClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@return if the logical side is the client}
|
* {@return if the logical side is the client}
|
||||||
*/
|
*/
|
||||||
public boolean isClient() {
|
public boolean isClient()
|
||||||
|
{
|
||||||
return this == CLIENT;
|
return this == CLIENT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,15 +9,18 @@ import net.minecraftforge.eventbus.api.Event;
|
|||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashMap;
|
||||||
import java.util.IdentityHashMap;
|
import java.util.IdentityHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
@@ -30,24 +33,26 @@ import java.util.function.Supplier;
|
|||||||
* a mechanism by which we can wrap actual mod code so that the loader and other
|
* a mechanism by which we can wrap actual mod code so that the loader and other
|
||||||
* facilities can treat mods at arms length.
|
* facilities can treat mods at arms length.
|
||||||
* </p>
|
* </p>
|
||||||
|
*
|
||||||
|
* @author cpw
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
public abstract class ModContainer {
|
|
||||||
|
public abstract class ModContainer
|
||||||
|
{
|
||||||
protected final String modId;
|
protected final String modId;
|
||||||
protected final String namespace;
|
protected final String namespace;
|
||||||
protected final IModInfo modInfo;
|
protected final IModInfo modInfo;
|
||||||
protected ModLoadingStage modLoadingStage;
|
protected ModLoadingStage modLoadingStage;
|
||||||
protected Supplier<?> contextExtension;
|
protected Supplier<?> contextExtension;
|
||||||
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
|
||||||
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
||||||
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
||||||
final Set<ModContainer> dependencies = new HashSet<>();
|
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
||||||
/**
|
|
||||||
* If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
||||||
|
|
||||||
public ModContainer(IModInfo info) {
|
public ModContainer(IModInfo info)
|
||||||
|
{
|
||||||
this.modId = info.getModId();
|
this.modId = info.getModId();
|
||||||
// TODO: Currently not reading namespace from configuration..
|
// TODO: Currently not reading namespace from configuration..
|
||||||
this.namespace = this.modId;
|
this.namespace = this.modId;
|
||||||
@@ -77,35 +82,58 @@ public abstract class ModContainer {
|
|||||||
/**
|
/**
|
||||||
* Errored container state, used for filtering. Does nothing.
|
* Errored container state, used for filtering. Does nothing.
|
||||||
*/
|
*/
|
||||||
ModContainer() {
|
ModContainer()
|
||||||
|
{
|
||||||
this.modLoadingStage = ModLoadingStage.ERROR;
|
this.modLoadingStage = ModLoadingStage.ERROR;
|
||||||
modId = "BROKEN";
|
modId = "BROKEN";
|
||||||
namespace = "BROKEN";
|
namespace = "BROKEN";
|
||||||
modInfo = null;
|
modInfo = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the modid for this mod
|
* @return the modid for this mod
|
||||||
*/
|
*/
|
||||||
public final String getModId() {
|
public final String getModId()
|
||||||
|
{
|
||||||
return modId;
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the resource prefix for the mod
|
* @return the resource prefix for the mod
|
||||||
*/
|
*/
|
||||||
public final String getNamespace() {
|
public final String getNamespace()
|
||||||
|
{
|
||||||
return namespace;
|
return namespace;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The current loading stage for this mod
|
* @return The current loading stage for this mod
|
||||||
*/
|
*/
|
||||||
public ModLoadingStage getCurrentState() {
|
public ModLoadingStage getCurrentState()
|
||||||
|
{
|
||||||
return modLoadingStage;
|
return modLoadingStage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModInfo getModInfo() {
|
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
|
||||||
|
final ModContainer target,
|
||||||
|
final IModStateTransition.EventGenerator<T> eventGenerator,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
|
||||||
|
final Executor executor) {
|
||||||
|
return CompletableFuture
|
||||||
|
.runAsync(() -> {
|
||||||
|
ModLoadingContext.get().setActiveContainer(target);
|
||||||
|
target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
|
||||||
|
target.acceptEvent(eventGenerator.apply(target));
|
||||||
|
}, executor)
|
||||||
|
.whenComplete((mc, exception) -> {
|
||||||
|
target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
|
||||||
|
progressBar.increment();
|
||||||
|
ModLoadingContext.get().setActiveContainer(null);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public IModInfo getModInfo()
|
||||||
|
{
|
||||||
return modInfo;
|
return modInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,7 +142,8 @@ public abstract class ModContainer {
|
|||||||
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
|
||||||
|
{
|
||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,10 +168,7 @@ public abstract class ModContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void dispatchConfigEvent(IConfigEvent event) {
|
public void dispatchConfigEvent(IConfigEvent event) {
|
||||||
var handler = configHandler.orElse(null);
|
configHandler.ifPresent(configHandler->configHandler.accept(event));
|
||||||
if (handler != null) {
|
|
||||||
handler.accept(event);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -5,6 +5,9 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
@@ -12,15 +15,27 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import java.util.Collections;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.util.AbstractMap;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.CompletionException;
|
||||||
|
import java.util.concurrent.CompletionStage;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.concurrent.ForkJoinPool;
|
||||||
|
import java.util.concurrent.ForkJoinWorkerThread;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -30,25 +45,27 @@ import java.util.stream.Stream;
|
|||||||
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
||||||
* can dispatch game level events as a result.
|
* can dispatch game level events as a result.
|
||||||
*/
|
*/
|
||||||
public class ModList {
|
public class ModList
|
||||||
|
{
|
||||||
|
//private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static ModList INSTANCE;
|
private static ModList INSTANCE;
|
||||||
private final List<IModFileInfo> modFiles;
|
private final List<IModFileInfo> modFiles;
|
||||||
private final List<IModInfo> sortedList;
|
private final List<IModInfo> sortedList;
|
||||||
private final Map<String, IModFileInfo> fileById;
|
private final Map<String, ModFileInfo> fileById;
|
||||||
private List<ModContainer> mods;
|
private List<ModContainer> mods;
|
||||||
private Map<String, ModContainer> indexedMods;
|
private Map<String, ModContainer> indexedMods;
|
||||||
private List<ModFileScanData> modFileScanData;
|
private List<ModFileScanData> modFileScanData;
|
||||||
private List<ModContainer> sortedContainers;
|
private List<ModContainer> sortedContainers;
|
||||||
|
|
||||||
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
||||||
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
|
{
|
||||||
this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
|
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
|
||||||
var byId = new HashMap<String, IModFileInfo>();
|
this.sortedList = sortedList.stream().
|
||||||
for (var file : this.modFiles) {
|
map(ModInfo.class::cast).
|
||||||
for (var mod : file.getMods())
|
collect(Collectors.toList());
|
||||||
byId.put(mod.getModId(), mod.getOwningFile());
|
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
|
||||||
}
|
map(ModInfo.class::cast).
|
||||||
this.fileById = Collections.unmodifiableMap(byId);
|
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
||||||
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,20 +74,19 @@ public class ModList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String fileToLine(IModFile mf) {
|
private String fileToLine(IModFile mf) {
|
||||||
var mainMod = mf.getModInfos().getFirst();
|
|
||||||
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
|
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
|
||||||
mainMod.getDisplayName(),
|
mf.getModInfos().get(0).getDisplayName(),
|
||||||
mainMod.getModId(),
|
mf.getModInfos().get(0).getModId(),
|
||||||
mainMod.getVersion(),
|
mf.getModInfos().get(0).getVersion(),
|
||||||
getModContainerState(mainMod.getModId()),
|
getModContainerState(mf.getModInfos().get(0).getModId()),
|
||||||
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String crashReport() {
|
private String crashReport() {
|
||||||
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
|
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
|
||||||
|
{
|
||||||
INSTANCE = new ModList(modFiles, sortedList);
|
INSTANCE = new ModList(modFiles, sortedList);
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
@@ -79,47 +95,109 @@ public class ModList {
|
|||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModFileInfo> getModFiles() {
|
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
||||||
|
ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
|
||||||
|
thread.setName("modloading-worker-" + thread.getPoolIndex());
|
||||||
|
// The default sets it to the SystemClassloader, so copy the current one.
|
||||||
|
thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
|
||||||
|
return thread;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<IModFileInfo> getModFiles()
|
||||||
|
{
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModFileInfo getModFileById(String modid) {
|
public IModFileInfo getModFileById(String modid)
|
||||||
|
{
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setLoadedMods(final List<ModContainer> modContainers) {
|
<T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
|
||||||
|
final IModStateTransition.EventGenerator<T> eventGenerator,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
|
||||||
|
return executor -> gather(
|
||||||
|
this.mods.stream()
|
||||||
|
.map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
|
||||||
|
.toList()
|
||||||
|
).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
|
||||||
|
}
|
||||||
|
static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
|
||||||
|
if (t.stream().noneMatch(e->e.getValue()!=null)) {
|
||||||
|
return CompletableFuture.completedFuture(null);
|
||||||
|
} else {
|
||||||
|
final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
|
||||||
|
CompletableFuture<Void> cf = new CompletableFuture<>();
|
||||||
|
final RuntimeException accumulator = new RuntimeException();
|
||||||
|
cf.completeExceptionally(accumulator);
|
||||||
|
throwables.forEach(exception -> {
|
||||||
|
if (exception instanceof CompletionException) {
|
||||||
|
exception = exception.getCause();
|
||||||
|
}
|
||||||
|
if (exception.getSuppressed().length!=0) {
|
||||||
|
Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
|
||||||
|
} else {
|
||||||
|
accumulator.addSuppressed(exception);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return cf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
|
||||||
|
List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
|
||||||
|
CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
|
||||||
|
futures.forEach(future -> {
|
||||||
|
int i = list.size();
|
||||||
|
list.add(null);
|
||||||
|
results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
|
||||||
|
});
|
||||||
|
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setLoadedMods(final List<ModContainer> modContainers)
|
||||||
|
{
|
||||||
this.mods = modContainers;
|
this.mods = modContainers;
|
||||||
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
|
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
|
||||||
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T> Optional<T> getModObjectById(String modId) {
|
public <T> Optional<T> getModObjectById(String modId)
|
||||||
|
{
|
||||||
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerById(String modId) {
|
public Optional<? extends ModContainer> getModContainerById(String modId)
|
||||||
|
{
|
||||||
return Optional.ofNullable(this.indexedMods.get(modId));
|
return Optional.ofNullable(this.indexedMods.get(modId));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
public Optional<? extends ModContainer> getModContainerByObject(Object obj)
|
||||||
|
{
|
||||||
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModInfo> getMods() {
|
public List<IModInfo> getMods()
|
||||||
|
{
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoaded(String modTarget) {
|
public boolean isLoaded(String modTarget)
|
||||||
|
{
|
||||||
return this.indexedMods.containsKey(modTarget);
|
return this.indexedMods.containsKey(modTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int size() {
|
public int size()
|
||||||
|
{
|
||||||
return mods.size();
|
return mods.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileScanData> getAllScanData() {
|
public List<ModFileScanData> getAllScanData()
|
||||||
if (modFileScanData == null) {
|
{
|
||||||
|
if (modFileScanData == null)
|
||||||
|
{
|
||||||
modFileScanData = this.sortedList.stream().
|
modFileScanData = this.sortedList.stream().
|
||||||
map(IModInfo::getOwningFile).
|
map(IModInfo::getOwningFile).
|
||||||
filter(Objects::nonNull).
|
filter(Objects::nonNull).
|
||||||
@@ -132,7 +210,8 @@ public class ModList {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModFile(Consumer<IModFile> fileConsumer) {
|
public void forEachModFile(Consumer<IModFile> fileConsumer)
|
||||||
|
{
|
||||||
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,11 +227,13 @@ public class ModList {
|
|||||||
this.sortedContainers.forEach(containerConsumer);
|
this.sortedContainers.forEach(containerConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModContainer> getLoadedMods() {
|
|
||||||
return this.sortedContainers;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
||||||
return indexedMods.values().stream().map(function);
|
return indexedMods.values().stream().map(function);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static class UncaughtModLoadingException extends ModLoadingException {
|
||||||
|
public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
|
||||||
|
super(null, stage, "fml.modloading.uncaughterror", originalException);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@
|
|||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.google.common.collect.Streams;
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||||
@@ -32,6 +33,8 @@ import java.util.function.BiConsumer;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.CORE;
|
import static net.minecraftforge.fml.Logging.CORE;
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
@@ -71,53 +74,49 @@ import static net.minecraftforge.fml.Logging.LOADING;
|
|||||||
* and completes the mod loading sequence.</dd>
|
* and completes the mod loading sequence.</dd>
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
public class ModLoader {
|
public class ModLoader
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
private static ModLoader INSTANCE;
|
||||||
private final LoadingModList loadingModList;
|
private final LoadingModList loadingModList;
|
||||||
|
|
||||||
private final List<ModLoadingException> loadingExceptions;
|
private final List<ModLoadingException> loadingExceptions;
|
||||||
private final Set<IModInfo> erroredModInfos;
|
|
||||||
private final List<ModLoadingWarning> loadingWarnings;
|
private final List<ModLoadingWarning> loadingWarnings;
|
||||||
private final ModStateManager stateManager;
|
private final ModStateManager stateManager;
|
||||||
private static boolean loadingStateValid;
|
private boolean loadingStateValid;
|
||||||
private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
|
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
||||||
|
private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
|
||||||
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
||||||
private ModList modList;
|
private ModList modList;
|
||||||
|
|
||||||
private ModLoader() {
|
private ModLoader()
|
||||||
|
{
|
||||||
|
INSTANCE = this;
|
||||||
this.loadingModList = FMLLoader.getLoadingModList();
|
this.loadingModList = FMLLoader.getLoadingModList();
|
||||||
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
||||||
.flatMap(ModLoadingException::fromEarlyException)
|
.flatMap(ModLoadingException::fromEarlyException)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
||||||
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (this.loadingExceptions.isEmpty()) {
|
|
||||||
this.erroredModInfos = Collections.emptySet();
|
|
||||||
} else {
|
|
||||||
this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
|
|
||||||
this.erroredModInfos.addAll(this.loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
|
|
||||||
}
|
|
||||||
this.loadingModList.getModFiles().stream()
|
this.loadingModList.getModFiles().stream()
|
||||||
.filter(ModFileInfo::missingLicense)
|
.filter(ModFileInfo::missingLicense)
|
||||||
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
|
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
|
||||||
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
|
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
|
||||||
.forEach(this.loadingExceptions::add);
|
.forEach(this.loadingExceptions::add);
|
||||||
this.stateManager = new ModStateManager();
|
this.stateManager = new ModStateManager();
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
|
||||||
CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
|
CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
|
||||||
CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
|
CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String computeLanguageList() {
|
private String computeLanguageList() {
|
||||||
return "\n" + FMLLoader.getLanguageLoadingProvider()
|
return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
.applyForEach(lp -> lp.name() + "@" + lp.getClass().getPackage().getImplementationVersion())
|
|
||||||
.collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String computeModLauncherServiceList() {
|
private String computeModLauncherServiceList() {
|
||||||
final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
|
final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
|
||||||
return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
|
return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
|
||||||
" "+mod.getOrDefault("name", "missing")+
|
" "+mod.getOrDefault("name", "missing")+
|
||||||
@@ -126,13 +125,9 @@ public class ModLoader {
|
|||||||
collect(Collectors.joining("\n\t\t","\t\t",""));
|
collect(Collectors.joining("\n\t\t","\t\t",""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModLoader get() {
|
public static ModLoader get()
|
||||||
return LazyInit.INSTANCE;
|
{
|
||||||
}
|
return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
|
||||||
|
|
||||||
private static final class LazyInit {
|
|
||||||
private static final ModLoader INSTANCE = new ModLoader();
|
|
||||||
private LazyInit() {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -149,21 +144,21 @@ public class ModLoader {
|
|||||||
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
|
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
|
||||||
loadingModList.getMods());
|
loadingModList.getMods());
|
||||||
if (!this.loadingExceptions.isEmpty()) {
|
if (!this.loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
|
List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
|
||||||
.map(ModInfo::getForgeFeatures)
|
.map(ModInfo::getForgeFeatures)
|
||||||
.flatMap(List::stream)
|
.flatMap(Collection::stream)
|
||||||
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
|
.filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
if (!failedBounds.isEmpty()) {
|
if (!failedBounds.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(failedBounds.stream()
|
throw new LoadingFailedException(failedBounds.stream()
|
||||||
@@ -171,67 +166,38 @@ public class ModLoader {
|
|||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final var modContainers = new HashMap<String, ModContainer>();
|
final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
|
||||||
for (var file : loadingModList.getModFiles()) {
|
.map(ModFileInfo::getFile)
|
||||||
var containers = this.buildMods(file.getFile());
|
.map(this::buildMods)
|
||||||
for (var container : containers)
|
.<ModContainer>mapMulti(Iterable::forEach)
|
||||||
modContainers.put(container.getModId(), container);
|
.toList();
|
||||||
}
|
|
||||||
|
|
||||||
if (!loadingExceptions.isEmpty()) {
|
if (!loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
|
modList.setLoadedMods(modContainers);
|
||||||
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
|
|
||||||
for (var mod : modContainers.values()) {
|
|
||||||
for (var dep : mod.getModInfo().getDependencies()) {
|
|
||||||
var target = modContainers.get(dep.getModId());
|
|
||||||
if (target == null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
switch (dep.getOrdering()) {
|
|
||||||
case AFTER:
|
|
||||||
mod.dependencies.add(target);
|
|
||||||
break;
|
|
||||||
case BEFORE:
|
|
||||||
target.dependencies.add(mod);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
modList.setLoadedMods(modContainers.values().stream().toList());
|
|
||||||
this.modList = modList;
|
this.modList = modList;
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
|
||||||
}
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
|
var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
|
||||||
}
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
|
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
|
||||||
for (IModLoadingState mls : stateList) {
|
stateList.forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress));
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
|
||||||
}
|
|
||||||
statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
|
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,15 +206,10 @@ public class ModLoader {
|
|||||||
LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
|
LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
progressBar.label(progressBar.name() + " working");
|
progressBar.label(progressBar.name()+ " working");
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
|
state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker));
|
||||||
var inlineRunnable = state.inlineRunnable().orElse(null);
|
state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
|
||||||
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
|
|
||||||
|
|
||||||
var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
|
|
||||||
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
|
|
||||||
|
|
||||||
completedStates.add(state);
|
completedStates.add(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -260,12 +221,10 @@ public class ModLoader {
|
|||||||
pb.complete();
|
pb.complete();
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
||||||
while (!transition.isDone()) {
|
while (!transition.isDone()) {
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
transition.join();
|
transition.join();
|
||||||
} catch (CompletionException e) {
|
} catch (CompletionException e) {
|
||||||
@@ -275,38 +234,36 @@ public class ModLoader {
|
|||||||
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
||||||
if (hasNotModLoadingEx) {
|
if (hasNotModLoadingEx) {
|
||||||
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
||||||
.filter(ModLoadingException.class::isInstance)
|
.filter(ModLoadingException.class::isInstance)
|
||||||
.map(ModLoadingException.class::cast)
|
.map(ModLoadingException.class::cast)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
||||||
statusConsumer.accept("ERROR DURING MOD LOADING");
|
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
||||||
throw new LoadingFailedException(modLoadingExceptions);
|
throw new LoadingFailedException(modLoadingExceptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ModContainer> buildMods(final IModFile modFile) {
|
private List<ModContainer> buildMods(final IModFile modFile)
|
||||||
final Map<String, IModInfo> modInfoMap = new HashMap<>();
|
{
|
||||||
for (var mod : modFile.getModFileInfo().getMods())
|
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
||||||
modInfoMap.put(mod.getModId(), mod);
|
|
||||||
|
|
||||||
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
||||||
final List<ModContainer> containers = new ArrayList<>();
|
final List<ModContainer> containers = modFile.getScanResult().getTargets()
|
||||||
for (var entry : modFile.getScanResult().getTargets().entrySet()) {
|
.entrySet()
|
||||||
var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
|
.stream()
|
||||||
if (container != null)
|
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
|
||||||
containers.add(container);
|
.filter(Objects::nonNull)
|
||||||
}
|
.toList();
|
||||||
|
|
||||||
if (containers.size() != modInfoMap.size()) {
|
if (containers.size() != modInfoMap.size()) {
|
||||||
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
||||||
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
||||||
|
|
||||||
LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
|
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
|
||||||
modFile.getFilePath(),
|
modFile.getFilePath(),
|
||||||
containers.size(), containerIds,
|
containers.size(), containerIds,
|
||||||
modInfoMap.size(), modIds);
|
modInfoMap.size(), modIds);
|
||||||
@@ -321,20 +278,17 @@ public class ModLoader {
|
|||||||
|
|
||||||
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove errored mod containers
|
// remove errored mod containers
|
||||||
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
|
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
||||||
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
|
|
||||||
) {
|
|
||||||
try {
|
try {
|
||||||
IModInfo info = modInfoMap.get(modId);
|
final String modId = idToProviderEntry.getKey();
|
||||||
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
||||||
if (info == null)
|
IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
|
||||||
throw new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId);
|
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
||||||
|
orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
|
||||||
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
|
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
|
||||||
} catch (ModLoadingException mle) {
|
} catch (ModLoadingException mle) {
|
||||||
// exceptions are caught and added to the error list for later handling
|
// exceptions are caught and added to the error list for later handling
|
||||||
@@ -349,7 +303,7 @@ public class ModLoader {
|
|||||||
* and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
|
* and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
|
||||||
*/
|
*/
|
||||||
public static boolean isLoadingStateValid() {
|
public static boolean isLoadingStateValid() {
|
||||||
return loadingStateValid;
|
return get().loadingStateValid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasCompletedState(final String stateName) {
|
public boolean hasCompletedState(final String stateName) {
|
||||||
@@ -372,7 +326,6 @@ public class ModLoader {
|
|||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
@@ -381,15 +334,9 @@ public class ModLoader {
|
|||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
||||||
postEventWithWrapInModOrder(event,
|
postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
||||||
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
|
||||||
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
@@ -402,11 +349,13 @@ public class ModLoader {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModLoadingWarning> getWarnings() {
|
public List<ModLoadingWarning> getWarnings()
|
||||||
|
{
|
||||||
return ImmutableList.copyOf(this.loadingWarnings);
|
return ImmutableList.copyOf(this.loadingWarnings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addWarning(ModLoadingWarning warning) {
|
public void addWarning(ModLoadingWarning warning)
|
||||||
|
{
|
||||||
this.loadingWarnings.add(warning);
|
this.loadingWarnings.add(warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,52 +9,49 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.config.IConfigSpec;
|
import net.minecraftforge.fml.config.IConfigSpec;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class ModLoadingContext {
|
public class ModLoadingContext
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
||||||
private ModContainer activeContainer;
|
private ModContainer activeContainer;
|
||||||
private Object languageExtension;
|
private Object languageExtension;
|
||||||
|
private ModLoadingStage stage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use the context provided by your language loader in your mod's constructor
|
* @deprecated Use the context provided by your language loader in your mod's constructor.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public static ModLoadingContext get() {
|
public static ModLoadingContext get() {
|
||||||
return context.get();
|
return context.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Going to be moved to ForgeHooks for Internal use.
|
* @deprecated Going to be moved to ForgeHooks for internal use.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public void setActiveContainer(final ModContainer container) {
|
public void setActiveContainer(final ModContainer container) {
|
||||||
this.activeContainer = container;
|
this.activeContainer = container;
|
||||||
this.languageExtension = container == null ? null : container.contextExtension.get();
|
this.languageExtension = container == null ? null : container.contextExtension.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Going to be moved to ForgeHooks for Internal use.
|
* Going to be moved to ForgeHooks for internal use.
|
||||||
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
|
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public ModContainer getActiveContainer() {
|
public ModContainer getActiveContainer() {
|
||||||
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
* @deprecated Going to be moved to ForgeHooks for Internal use.
|
|
||||||
*/
|
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
|
||||||
public String getActiveNamespace() {
|
public String getActiveNamespace() {
|
||||||
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return {@link ModLoadingContext#getActiveContainer()} by default.
|
|
||||||
*/
|
|
||||||
public ModContainer getContainer() {
|
public ModContainer getContainer() {
|
||||||
return getActiveContainer();
|
return getActiveContainer();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,27 +26,20 @@ import java.util.function.ToIntFunction;
|
|||||||
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @param transition optional state transition information
|
* @param transition optional state transition information
|
||||||
*/
|
*/
|
||||||
public record ModLoadingState(
|
public record ModLoadingState(String name, String previous,
|
||||||
String name,
|
Function<ModList, String> message,
|
||||||
String previous,
|
ToIntFunction<ModList> size,
|
||||||
Function<ModList, String> message,
|
ModLoadingPhase phase,
|
||||||
ToIntFunction<ModList> size,
|
Optional<Consumer<ModList>> inlineRunnable,
|
||||||
ModLoadingPhase phase,
|
Optional<IModStateTransition> transition) implements IModLoadingState {
|
||||||
Optional<Consumer<ModList>> inlineRunnable,
|
|
||||||
Optional<IModStateTransition> transition
|
|
||||||
) implements IModLoadingState {
|
|
||||||
@Override
|
@Override
|
||||||
public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
public <T extends Event & IModBusEvent>
|
||||||
final Executor syncExecutor,
|
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
||||||
) {
|
return transition.map(t -> t.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
|
||||||
var transition = this.transition.orElse(null);
|
|
||||||
return transition == null
|
|
||||||
? Optional.empty()
|
|
||||||
: Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -56,12 +49,9 @@ public record ModLoadingState(
|
|||||||
* @param name the name of the state
|
* @param name the name of the state
|
||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
*
|
|
||||||
* @deprecated Use the builder
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
||||||
return of(name, phase).after(previous).empty();
|
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -72,13 +62,11 @@ public record ModLoadingState(
|
|||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
*
|
* @return a mod loading state with state transition information and a default message
|
||||||
* @deprecated Use the builder
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return of(name, phase).after(previous).withTransition(transition);
|
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -90,14 +78,11 @@ public record ModLoadingState(
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a custom message
|
* @return a mod loading state with state transition information and a custom message
|
||||||
*
|
|
||||||
* @deprecated Use the builder
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
public static ModLoadingState withTransition(final String name, final String previous,
|
public static ModLoadingState withTransition(final String name, final String previous,
|
||||||
final Function<ModList, String> message, final ModLoadingPhase phase,
|
final Function<ModList, String> message, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return of(name, phase).after(previous).message(message).withTransition(transition);
|
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -109,59 +94,9 @@ public record ModLoadingState(
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @return a mod loading state with an inline runnable and default message
|
* @return a mod loading state with an inline runnable and default message
|
||||||
*
|
|
||||||
* @deprecated Use the builder
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true)
|
|
||||||
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final Consumer<ModList> inline) {
|
final Consumer<ModList> inline) {
|
||||||
return of(name, phase).after(previous).withInline(inline);
|
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
|
||||||
}
|
|
||||||
|
|
||||||
public static Builder of(final String name, final ModLoadingPhase phase) {
|
|
||||||
return new Builder(name, phase);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Builder {
|
|
||||||
private final String name;
|
|
||||||
private final ModLoadingPhase phase;
|
|
||||||
private String after;
|
|
||||||
private Function<ModList, String> message = null;
|
|
||||||
private ToIntFunction<ModList> size = null;
|
|
||||||
|
|
||||||
private Builder(final String name, final ModLoadingPhase phase) {
|
|
||||||
this.name = name;
|
|
||||||
this.phase = phase;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Builder after(final ModLoadingState value) { return after(value.name()); }
|
|
||||||
public Builder after(final String value) {
|
|
||||||
this.after = value;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Builder message(final String value) { return message(ml -> value); }
|
|
||||||
public Builder message(final Function<ModList, String> value) {
|
|
||||||
this.message = value;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Builder size(final int value) { return size(ml -> value); }
|
|
||||||
public Builder size(final ToIntFunction<ModList> value) {
|
|
||||||
this.size = value;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState empty() {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState withTransition(final IModStateTransition transition) {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModLoadingState withInline(final Consumer<ModList> inline) {
|
|
||||||
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,13 +16,15 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
@SuppressWarnings("UnstableApiUsage")
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
public class ModStateManager {
|
public class ModStateManager {
|
||||||
|
static ModStateManager INSTANCE;
|
||||||
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
|
||||||
|
|
||||||
public ModStateManager() {
|
public ModStateManager() {
|
||||||
|
INSTANCE = this;
|
||||||
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
|
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
|
||||||
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
|
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
|
||||||
.map(IModStateProvider::getAllStates)
|
.map(IModStateProvider::getAllStates)
|
||||||
.flatMap(List::stream)
|
.<IModLoadingState>mapMulti(Iterable::forEach)
|
||||||
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,16 +36,14 @@ public class ModStateManager {
|
|||||||
var dummy = ModLoadingState.empty("", "", phase);
|
var dummy = ModLoadingState.empty("", "", phase);
|
||||||
nodes.forEach(graph::addNode);
|
nodes.forEach(graph::addNode);
|
||||||
graph.addNode(dummy);
|
graph.addNode(dummy);
|
||||||
for (IModLoadingState node : nodes) {
|
nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
|
||||||
graph.putEdge(lookup.getOrDefault(node.previous(), dummy), node);
|
|
||||||
}
|
|
||||||
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
|
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModLoadingState findState(final String stateName) {
|
public IModLoadingState findState(final String stateName) {
|
||||||
return stateMap.values()
|
return stateMap.values()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap(List::stream)
|
.flatMap(Collection::stream)
|
||||||
.filter(mls -> mls.name().equals(stateName))
|
.filter(mls -> mls.name().equals(stateName))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
|
.orElseThrow(() -> new IllegalArgumentException("Unknown IModLoadingState: " + stateName));
|
||||||
|
|||||||
@@ -1,181 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Forge Development LLC and contributors
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.minecraftforge.fml;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.CompletionStage;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
|
||||||
class ModStateTransitionHelper {
|
|
||||||
static final IModStateTransition NOOP = new NoopTransition();
|
|
||||||
record NoopTransition() implements IModStateTransition {
|
|
||||||
@Override
|
|
||||||
public ThreadSelector threadSelector() {
|
|
||||||
return ThreadSelector.SYNC;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
|
||||||
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
|
|
||||||
if (t.stream().noneMatch(e -> e.exception() != null)) {
|
|
||||||
return CompletableFuture.completedFuture(null);
|
|
||||||
} else {
|
|
||||||
final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
|
|
||||||
CompletableFuture<Void> cf = new CompletableFuture<>();
|
|
||||||
final RuntimeException accumulator = new RuntimeException();
|
|
||||||
cf.completeExceptionally(accumulator);
|
|
||||||
for (Throwable exception : throwables) {
|
|
||||||
if (exception instanceof CompletionException) {
|
|
||||||
exception = exception.getCause();
|
|
||||||
}
|
|
||||||
if (exception.getSuppressed().length != 0) {
|
|
||||||
for (Throwable throwable : exception.getSuppressed()) {
|
|
||||||
accumulator.addSuppressed(throwable);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
accumulator.addSuppressed(exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return cf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
record FutureResult<V>(V value, Throwable exception){}
|
|
||||||
|
|
||||||
static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
|
|
||||||
var list = new ArrayList<FutureResult<V>>(futures.size());
|
|
||||||
var results = new CompletableFuture[futures.size()];
|
|
||||||
|
|
||||||
for (var future : futures) {
|
|
||||||
int i = list.size();
|
|
||||||
list.add(null);
|
|
||||||
results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static <T extends Event & IModBusEvent> void addCompletableFutureTaskForModDispatch(
|
|
||||||
final IModStateTransition transition,
|
|
||||||
final Executor executor,
|
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final EventGenerator<T> eventGenerator,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
|
|
||||||
) {
|
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
|
||||||
if (preDispatchHook != null)
|
|
||||||
completableFutures.add(preDispatchHook);
|
|
||||||
|
|
||||||
var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
|
|
||||||
for (var mod : ModList.get().getLoadedMods()) {
|
|
||||||
|
|
||||||
CompletableFuture<Void> parent = null;
|
|
||||||
if (mod.dependencies.isEmpty()) {
|
|
||||||
parent = CompletableFuture.allOf();
|
|
||||||
} else {
|
|
||||||
var deps = new CompletableFuture[mod.dependencies.size()];
|
|
||||||
int idx = 0;
|
|
||||||
for (var depContainer : mod.dependencies) {
|
|
||||||
var future = modFutures.get(depContainer.getModId());
|
|
||||||
if (future == null)
|
|
||||||
throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
|
|
||||||
deps[idx++] = future;
|
|
||||||
}
|
|
||||||
parent = CompletableFuture.allOf(deps);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
var dispatch = parent
|
|
||||||
.thenRunAsync(() -> {
|
|
||||||
ModLoadingContext.get().setActiveContainer(mod);
|
|
||||||
var handler = mod.activityMap.get(mod.modLoadingStage);
|
|
||||||
if (handler != null)
|
|
||||||
handler.run();
|
|
||||||
mod.acceptEvent(eventGenerator.apply(mod));
|
|
||||||
}, executor)
|
|
||||||
.whenComplete((mc, exception) -> {
|
|
||||||
mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
|
|
||||||
progressBar.increment();
|
|
||||||
ModLoadingContext.get().setActiveContainer(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modFutures.put(mod.getModId(), dispatch);
|
|
||||||
}
|
|
||||||
|
|
||||||
var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
|
|
||||||
completableFutures.add(dispatch);
|
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
|
||||||
if (postDispatchHook != null)
|
|
||||||
completableFutures.add(postDispatchHook);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static <T extends Event & IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
|
|
||||||
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
|
|
||||||
return hookTyped.apply(executor, eventGenerator);
|
|
||||||
}
|
|
||||||
|
|
||||||
static <T extends Event & IModBusEvent> CompletableFuture<Void> build(
|
|
||||||
final IModStateTransition transition,
|
|
||||||
final String name,
|
|
||||||
final Executor syncExecutor,
|
|
||||||
final Executor parallelExecutor,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
|
||||||
) {
|
|
||||||
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
|
||||||
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
|
|
||||||
|
|
||||||
@SuppressWarnings({ "removal", "unchecked" })
|
|
||||||
var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
|
|
||||||
for (int x = 0; x < events.size(); x++) {
|
|
||||||
var gen = events.get(x);
|
|
||||||
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
|
|
||||||
? transition.nextModLoadingStage()
|
|
||||||
: ModLoadingStage::currentState;
|
|
||||||
addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
|
|
||||||
}
|
|
||||||
|
|
||||||
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
|
||||||
final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::completableFutureFromExceptionList);
|
|
||||||
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
|
||||||
.thenApplyAsync(n -> {
|
|
||||||
progressBar.label(progressBar.name() + ": dispatching " + name);
|
|
||||||
return null;
|
|
||||||
}, parallelExecutor)
|
|
||||||
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
|
||||||
.thenApply(r -> {
|
|
||||||
postSyncTask.apply(syncExecutor);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@ import static net.minecraftforge.fml.Logging.LOADING;
|
|||||||
public class ModWorkManager {
|
public class ModWorkManager {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
|
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
|
||||||
|
|
||||||
public interface DrivenExecutor extends Executor {
|
public interface DrivenExecutor extends Executor {
|
||||||
boolean selfDriven();
|
boolean selfDriven();
|
||||||
boolean driveOne();
|
boolean driveOne();
|
||||||
@@ -34,11 +33,8 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private static class SyncExecutor implements DrivenExecutor {
|
||||||
private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
|
private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>();
|
||||||
public SyncExecutor() {
|
|
||||||
this(new ConcurrentLinkedDeque<>());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean driveOne() {
|
public boolean driveOne() {
|
||||||
@@ -60,7 +56,13 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
|
private static class WrappingExecutor implements DrivenExecutor {
|
||||||
|
private final Executor wrapped;
|
||||||
|
|
||||||
|
public WrappingExecutor(final Executor executor) {
|
||||||
|
this.wrapped = executor;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean selfDriven() {
|
public boolean selfDriven() {
|
||||||
return true;
|
return true;
|
||||||
@@ -77,9 +79,11 @@ public class ModWorkManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final SyncExecutor syncExecutor = new SyncExecutor();
|
private static SyncExecutor syncExecutor;
|
||||||
|
|
||||||
public static DrivenExecutor syncExecutor() {
|
public static DrivenExecutor syncExecutor() {
|
||||||
|
if (syncExecutor == null)
|
||||||
|
syncExecutor = new SyncExecutor();
|
||||||
return syncExecutor;
|
return syncExecutor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,8 +91,14 @@ public class ModWorkManager {
|
|||||||
return new WrappingExecutor(executor);
|
return new WrappingExecutor(executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static ForkJoinPool parallelThreadPool;
|
||||||
public static Executor parallelExecutor() {
|
public static Executor parallelExecutor() {
|
||||||
return LazyInit.PARALLEL_EXECUTOR;
|
if (parallelThreadPool == null) {
|
||||||
|
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
|
||||||
|
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
|
||||||
|
parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
|
||||||
|
}
|
||||||
|
return parallelThreadPool;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
|
||||||
@@ -99,14 +109,4 @@ public class ModWorkManager {
|
|||||||
return thread;
|
return thread;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class LazyInit {
|
|
||||||
private LazyInit() {}
|
|
||||||
private static final ForkJoinPool PARALLEL_EXECUTOR;
|
|
||||||
|
|
||||||
static {
|
|
||||||
final int loadingThreadCount = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.MAX_THREADS);
|
|
||||||
LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
|
|
||||||
PARALLEL_EXECUTOR = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ public final class OptionalMod<T>
|
|||||||
return new OptionalMod<>(modId);
|
return new OptionalMod<>(modId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final OptionalMod<?> EMPTY = new OptionalMod<>(true);
|
private static OptionalMod<?> EMPTY = new OptionalMod<>(true);
|
||||||
private static <T> OptionalMod<T> empty() {
|
private static <T> OptionalMod<T> empty() {
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
OptionalMod<T> t = (OptionalMod<T>) EMPTY;
|
OptionalMod<T> t = (OptionalMod<T>) EMPTY;
|
||||||
@@ -213,8 +213,8 @@ public final class OptionalMod<T>
|
|||||||
public boolean equals(Object obj)
|
public boolean equals(Object obj)
|
||||||
{
|
{
|
||||||
if (this == obj) return true;
|
if (this == obj) return true;
|
||||||
if (obj instanceof OptionalMod<?> optionalMod) {
|
if (obj instanceof OptionalMod) {
|
||||||
return Objects.equals(optionalMod.modId, modId);
|
return Objects.equals(((OptionalMod)obj).modId, modId);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.apache.commons.io.FilenameUtils;
|
import org.apache.commons.io.FilenameUtils;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -26,66 +25,9 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
|
|||||||
|
|
||||||
public class ConfigFileTypeHandler {
|
public class ConfigFileTypeHandler {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
|
||||||
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
||||||
|
|
||||||
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
|
|
||||||
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
|
|
||||||
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
|
|
||||||
|
|
||||||
private final @Nullable ModConfig.Type type;
|
|
||||||
private @Nullable FileWatcher watcher;
|
|
||||||
|
|
||||||
// exists for bin compat
|
|
||||||
public ConfigFileTypeHandler() {
|
|
||||||
this(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
|
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the handler for the given {@link ModConfig.Type}.
|
|
||||||
*
|
|
||||||
* @param type The type to get the handler for
|
|
||||||
* @return The handler
|
|
||||||
*/
|
|
||||||
static ConfigFileTypeHandler get(ModConfig.Type type) {
|
|
||||||
return switch (type) {
|
|
||||||
case CLIENT -> CLIENT;
|
|
||||||
case COMMON -> COMMON;
|
|
||||||
case SERVER -> SERVER;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
|
|
||||||
*
|
|
||||||
* @return The watcher
|
|
||||||
*
|
|
||||||
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
|
|
||||||
*/
|
|
||||||
FileWatcher getWatcher() {
|
|
||||||
if (this.watcher == null) {
|
|
||||||
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
|
|
||||||
this.watcher = new FileWatcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.watcher;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
|
|
||||||
* {@link FileWatcher#stop()}.
|
|
||||||
*/
|
|
||||||
void stopWatcher() {
|
|
||||||
if (this.watcher == null) return;
|
|
||||||
|
|
||||||
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
|
|
||||||
this.watcher.stop();
|
|
||||||
this.watcher = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
||||||
return (c) -> {
|
return (c) -> {
|
||||||
final Path configPath = configBasePath.resolve(c.getFileName());
|
final Path configPath = configBasePath.resolve(c.getFileName());
|
||||||
@@ -95,7 +37,7 @@ public class ConfigFileTypeHandler {
|
|||||||
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
||||||
writingMode(WritingMode.REPLACE).
|
writingMode(WritingMode.REPLACE).
|
||||||
build();
|
build();
|
||||||
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -104,9 +46,13 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
||||||
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
try {
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
|
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException("Couldn't watch config file", e);
|
||||||
|
}
|
||||||
return configData;
|
return configData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -114,16 +60,14 @@ public class ConfigFileTypeHandler {
|
|||||||
public void unload(Path configBasePath, ModConfig config) {
|
public void unload(Path configBasePath, ModConfig config) {
|
||||||
Path configPath = configBasePath.resolve(config.getFileName());
|
Path configPath = configBasePath.resolve(config.getFileName());
|
||||||
try {
|
try {
|
||||||
this.getWatcher().removeWatch(configPath);
|
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
|
||||||
if (!Files.isDirectory(file.getParent())) {
|
Files.createDirectories(file.getParent());
|
||||||
Files.createDirectories(file.getParent());
|
|
||||||
}
|
|
||||||
Path p = defaultConfigPath.resolve(modConfig.getFileName());
|
Path p = defaultConfigPath.resolve(modConfig.getFileName());
|
||||||
if (Files.exists(p)) {
|
if (Files.exists(p)) {
|
||||||
LOGGER.info(CONFIG, "Loading default config file from path {}", p);
|
LOGGER.info(CONFIG, "Loading default config file from path {}", p);
|
||||||
@@ -167,16 +111,17 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
private static class ConfigWatcher implements Runnable {
|
||||||
public String toString() {
|
private final ModConfig modConfig;
|
||||||
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
private final CommentedFileConfig commentedFileConfig;
|
||||||
}
|
private final ClassLoader realClassLoader;
|
||||||
|
|
||||||
|
ConfigWatcher(final ModConfig modConfig, final CommentedFileConfig commentedFileConfig, final ClassLoader classLoader) {
|
||||||
|
this.modConfig = modConfig;
|
||||||
|
this.commentedFileConfig = commentedFileConfig;
|
||||||
|
this.realClassLoader = classLoader;
|
||||||
|
}
|
||||||
|
|
||||||
private record ConfigWatcher(
|
|
||||||
ModConfig modConfig,
|
|
||||||
CommentedFileConfig commentedFileConfig,
|
|
||||||
ClassLoader realClassLoader
|
|
||||||
) implements Runnable {
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
// Force the regular classloader onto the special thread
|
// Force the regular classloader onto the special thread
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ package net.minecraftforge.fml.config;
|
|||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.fml.DistExecutor;
|
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
@@ -50,32 +47,15 @@ public class ConfigTracker {
|
|||||||
|
|
||||||
public void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void loadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
LOGGER.debug(CONFIG, "Loading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
|
||||||
openConfig(config, configBasePath);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: [FML] This is only called for the server (outside of forceUnload)
|
|
||||||
// rethink config implementation for eventual FML rewrite
|
|
||||||
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
|
||||||
closeConfig(config, configBasePath);
|
|
||||||
}
|
|
||||||
ConfigFileTypeHandler.get(type).stopWatcher();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is a better way to do this, please tell me. Because this is FUCKED
|
private void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
public void forceUnload() {
|
|
||||||
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
|
|
||||||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
|
|
||||||
this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
|
|
||||||
|
|
||||||
// just in case server watcher is still alive somehow...
|
|
||||||
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
|
||||||
LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
||||||
final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
|
final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
|
||||||
config.setConfigData(configData);
|
config.setConfigData(configData);
|
||||||
@@ -83,7 +63,7 @@ public class ConfigTracker {
|
|||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void closeConfig(final ModConfig config, final Path configBasePath) {
|
private void closeConfig(final ModConfig config, final Path configBasePath) {
|
||||||
if (config.getConfigData() != null) {
|
if (config.getConfigData() != null) {
|
||||||
LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
|
||||||
// stop the filewatcher before we save the file and close it, so reload doesn't fire
|
// stop the filewatcher before we save the file and close it, so reload doesn't fire
|
||||||
|
|||||||
@@ -24,13 +24,14 @@ public class ModConfig
|
|||||||
private final ModContainer container;
|
private final ModContainer container;
|
||||||
private final ConfigFileTypeHandler configHandler;
|
private final ConfigFileTypeHandler configHandler;
|
||||||
private CommentedConfig configData;
|
private CommentedConfig configData;
|
||||||
|
private Callable<Void> saveHandler;
|
||||||
|
|
||||||
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
|
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer container, final String fileName) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.spec = spec;
|
this.spec = spec;
|
||||||
this.fileName = fileName;
|
this.fileName = fileName;
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.configHandler = ConfigFileTypeHandler.get(type);
|
this.configHandler = ConfigFileTypeHandler.TOML;
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.INSTANCE.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+21
-27
@@ -22,7 +22,9 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.Desktop;
|
||||||
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
@@ -85,7 +87,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
private ScheduledFuture<?> initializationFuture;
|
private ScheduledFuture<?> initializationFuture;
|
||||||
|
|
||||||
private PerformanceInfo performanceInfo;
|
private PerformanceInfo performanceInfo;
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private ScheduledFuture<?> performanceTick;
|
private ScheduledFuture<?> performanceTick;
|
||||||
// The GL ID of the window. Used for all operations
|
// The GL ID of the window. Used for all operations
|
||||||
private long window;
|
private long window;
|
||||||
@@ -258,11 +259,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
||||||
for (var itr = this.elements.iterator(); itr.hasNext(); ) {
|
this.elements.removeIf(element -> !element.render(context, framecount));
|
||||||
var element = itr.next();
|
|
||||||
if (!element.render(context, framecount))
|
|
||||||
itr.remove();
|
|
||||||
}
|
|
||||||
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
||||||
framecount++;
|
framecount++;
|
||||||
}
|
}
|
||||||
@@ -305,6 +302,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void crashElegantly(String errorDetails) {
|
private void crashElegantly(String errorDetails) {
|
||||||
|
String qrText;
|
||||||
|
try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
|
||||||
|
qrText = is.lines().collect(Collectors.joining("\n"));
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
qrText = "";
|
||||||
|
}
|
||||||
|
|
||||||
StringBuilder msgBuilder = new StringBuilder(2000);
|
StringBuilder msgBuilder = new StringBuilder(2000);
|
||||||
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
||||||
msgBuilder.append("\n\n");
|
msgBuilder.append("\n\n");
|
||||||
@@ -403,13 +407,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
if (showHelpLog && versidx == 0) {
|
if (showHelpLog && versidx == 0) {
|
||||||
LOGGER.info("""
|
LOGGER.info("""
|
||||||
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
||||||
|
|
||||||
Possible solutions:
|
Possible solutions:
|
||||||
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
||||||
B) Check for driver updates on the graphics brand's website
|
B) Check for driver updates on the graphics brand's website
|
||||||
C) Try reinstalling your graphics drivers
|
C) Try reinstalling your graphics drivers
|
||||||
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
||||||
|
|
||||||
You can safely ignore this message if the game starts up successfully.""");
|
You can safely ignore this message if the game starts up successfully.""");
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
||||||
@@ -493,6 +497,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void badWindowHandler(final int code, final long desc) {
|
||||||
|
LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
|
||||||
|
}
|
||||||
|
|
||||||
private void winResize(long window, int width, int height) {
|
private void winResize(long window, int width, int height) {
|
||||||
if (window == this.window && width != 0 && height != 0) {
|
if (window == this.window && width != 0 && height != 0) {
|
||||||
this.winWidth = width;
|
this.winWidth = width;
|
||||||
@@ -604,25 +612,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
final var FORGE_MODULE = "net.minecraftforge.forge";
|
var fm = layer.findModule("forge").orElseThrow();
|
||||||
var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
|
getClass().getModule().addReads(fm);
|
||||||
if (forge_module == null)
|
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
|
||||||
throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
|
loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
|
||||||
|
|
||||||
getClass().getModule().addReads(forge_module);
|
|
||||||
|
|
||||||
|
|
||||||
var clz = Class.forName(forge_module, "net.minecraftforge.client.loading.ForgeLoadingOverlay");
|
|
||||||
|
|
||||||
for (var mtd : clz.getDeclaredMethods()) {
|
|
||||||
if (Modifier.isStatic(mtd.getModifiers()) && "newInstance".equals(mtd.getName())) {
|
|
||||||
this.loadingOverlay = mtd;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (loadingOverlay == null)
|
|
||||||
throw new IllegalStateException("Could not find static newInstace method in " + clz.getName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getFramebufferTextureId() {
|
public int getFramebufferTextureId() {
|
||||||
@@ -641,6 +634,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
||||||
|
// this.elements.get(0).retire(framecount + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import org.lwjgl.stb.STBTTFontinfo;
|
|||||||
import org.lwjgl.stb.STBTTPackContext;
|
import org.lwjgl.stb.STBTTPackContext;
|
||||||
import org.lwjgl.stb.STBTTPackRange;
|
import org.lwjgl.stb.STBTTPackRange;
|
||||||
import org.lwjgl.stb.STBTTPackedchar;
|
import org.lwjgl.stb.STBTTPackedchar;
|
||||||
|
import org.lwjgl.system.MemoryStack;
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
@@ -23,7 +25,7 @@ public class SimpleFont {
|
|||||||
private final int lineSpacing;
|
private final int lineSpacing;
|
||||||
private final int descent;
|
private final int descent;
|
||||||
private final int GLYPH_COUNT = 127-32;
|
private final int GLYPH_COUNT = 127-32;
|
||||||
private final Glyph[] glyphs;
|
private Glyph[] glyphs;
|
||||||
|
|
||||||
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
||||||
Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
|
Pos loadQuad(Pos pos, int colour, SimpleBufferBuilder bb) {
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ dependencies {
|
|||||||
implementation(libs.jimfs)
|
implementation(libs.jimfs)
|
||||||
|
|
||||||
implementation(libs.log4j.core)
|
implementation(libs.log4j.core)
|
||||||
annotationProcessor(libs.bundles.log4j)
|
annotationProcessor(libs.log4j.core)
|
||||||
|
|
||||||
testCompileOnly(libs.nulls)
|
testCompileOnly(libs.nulls)
|
||||||
testRuntimeOnly(libs.bootstrap)
|
testRuntimeOnly(libs.bootstrap)
|
||||||
|
|||||||
+25
-11
@@ -49,7 +49,8 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
||||||
|
{
|
||||||
if (isEmpty)
|
if (isEmpty)
|
||||||
return NAY;
|
return NAY;
|
||||||
|
|
||||||
@@ -61,33 +62,43 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
||||||
if (CAP_INJECT.equals(classNode.name)) {
|
{
|
||||||
for (MethodNode mtd : classNode.methods) {
|
if (CAP_INJECT.equals(classNode.name))
|
||||||
if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc)) {
|
{
|
||||||
|
for (MethodNode mtd : classNode.methods)
|
||||||
|
{
|
||||||
|
if (FUNC_NAME.equals(mtd.name) && FUNC_DESC.equals(mtd.desc))
|
||||||
|
{
|
||||||
mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
|
mtd.access &= ~Opcodes.ACC_FINAL; // We have it final in code so people don't override it, cuz that'd be stupid, and make our transformer more complicated.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ComputeFlags.SIMPLE_REWRITE;
|
return ComputeFlags.SIMPLE_REWRITE;
|
||||||
} else if (CAP_INJECT.equals(classNode.superName)) {
|
}
|
||||||
|
else if (CAP_INJECT.equals(classNode.superName))
|
||||||
|
{
|
||||||
Holder cls = new Holder();
|
Holder cls = new Holder();
|
||||||
|
|
||||||
SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
|
SignatureReader reader = new SignatureReader(classNode.signature); // Having a node version of this would probably be useful.
|
||||||
reader.accept(new SignatureVisitor(Opcodes.ASM9) {
|
reader.accept(new SignatureVisitor(Opcodes.ASM9)
|
||||||
|
{
|
||||||
final Deque<String> stack = new ArrayDeque<>();
|
final Deque<String> stack = new ArrayDeque<>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitClassType(final String name) {
|
public void visitClassType(final String name)
|
||||||
|
{
|
||||||
stack.push(name);
|
stack.push(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitInnerClassType(final String name) {
|
public void visitInnerClassType(final String name)
|
||||||
|
{
|
||||||
stack.push(stack.pop() + '$' + name);
|
stack.push(stack.pop() + '$' + name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitEnd() {
|
public void visitEnd()
|
||||||
|
{
|
||||||
var val = stack.pop();
|
var val = stack.pop();
|
||||||
if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
|
if (!stack.isEmpty() && CAP_INJECT.equals(stack.peek()))
|
||||||
cls.value = val;
|
cls.value = val;
|
||||||
@@ -102,7 +113,9 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
mtd.visitInsn(Opcodes.ARETURN);
|
mtd.visitInsn(Opcodes.ARETURN);
|
||||||
mtd.visitEnd();
|
mtd.visitEnd();
|
||||||
return ComputeFlags.COMPUTE_MAXS;
|
return ComputeFlags.COMPUTE_MAXS;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -110,4 +123,5 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
private static final class Holder {
|
private static final class Holder {
|
||||||
String value;
|
String value;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+2
-2
@@ -35,7 +35,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
|
new VanillaObjectHolderData("net.minecraft.world.effect.MobEffects", "mob_effect", "net.minecraft.world.effect.MobEffect"),
|
||||||
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
||||||
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
||||||
).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
||||||
private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
|
private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
|
||||||
.map(it -> it.replace('.', '/'))
|
.map(it -> it.replace('.', '/'))
|
||||||
.collect(Collectors.toUnmodifiableSet());
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
@@ -73,7 +73,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
return YAY;
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean hasHolder(List<AnnotationNode> lst) {
|
private boolean hasHolder(List<AnnotationNode> lst) {
|
||||||
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
|
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ public class FMLConfig
|
|||||||
EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
|
EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?"),
|
||||||
EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
|
EARLY_WINDOW_SHOW_CPU("earlyWindowShowCPU", Boolean.FALSE, "Whether to show CPU usage stats in early window"),
|
||||||
EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
|
EARLY_WINDOW_LOG_HELP_MSG("earlyWindowLogHelpMessage", Boolean.TRUE, "Whether to log a help message on first attempt, to aid troubleshooting. This setting should automatically disable itself after a successful launch"),
|
||||||
|
DETECT_NON_FORGE_MODS_TOML("detectNonForgeModsToml", Boolean.TRUE, "Attempt to detect non-Forge mods from their mods.toml to show a friendlier error message. This is a best-effort feature - disable if it causes issues."),
|
||||||
;
|
;
|
||||||
|
|
||||||
private final String entry;
|
private final String entry;
|
||||||
|
|||||||
@@ -17,9 +17,11 @@ import net.minecraftforge.api.distmarker.Dist;
|
|||||||
import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
|
import net.minecraftforge.fml.loading.targets.CommonLaunchHandler;
|
||||||
import net.minecraftforge.forgespi.Environment;
|
import net.minecraftforge.forgespi.Environment;
|
||||||
import net.minecraftforge.forgespi.coremod.ICoreModProvider;
|
import net.minecraftforge.forgespi.coremod.ICoreModProvider;
|
||||||
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -34,6 +36,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
|
|||||||
public class FMLLoader {
|
public class FMLLoader {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static AccessTransformerService accessTransformer;
|
private static AccessTransformerService accessTransformer;
|
||||||
|
private static ModDiscoverer modDiscoverer;
|
||||||
private static ICoreModProvider coreModProvider;
|
private static ICoreModProvider coreModProvider;
|
||||||
private static LanguageLoadingProvider languageLoadingProvider;
|
private static LanguageLoadingProvider languageLoadingProvider;
|
||||||
private static Dist dist;
|
private static Dist dist;
|
||||||
@@ -54,12 +57,15 @@ public class FMLLoader {
|
|||||||
LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
|
LOGGER.debug(CORE, "Detected version data : {}", versionInfo);
|
||||||
LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
|
LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion());
|
||||||
|
|
||||||
|
// Allows us to communicate properties with other services through ModLauncher
|
||||||
|
setupBlackboardKeys();
|
||||||
|
|
||||||
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
checkPackage(ITransformationService.class, "4.0", "ModLauncher");
|
||||||
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer");
|
||||||
/*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus");
|
/*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus");
|
||||||
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner");
|
||||||
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
|
coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod");
|
||||||
LOGGER.debug(CORE, "FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
|
LOGGER.debug(CORE,"FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING"));
|
||||||
checkPackage(Environment.class, "2.0", "ForgeSPI");
|
checkPackage(Environment.class, "2.0", "ForgeSPI");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -71,15 +77,14 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
|
private static <T> T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException {
|
||||||
var plugin = env.findLaunchPlugin(id).orElse(null);
|
@SuppressWarnings("unchecked")
|
||||||
if (plugin == null) {
|
var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> {
|
||||||
LOGGER.error(CORE, "{} library is missing, we need this to run", name);
|
LOGGER.error(CORE, "{} library is missing, we need this to run", name);
|
||||||
throw new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
|
return new IncompatibleEnvironmentException("Missing " + name + ", cannot run");
|
||||||
}
|
});
|
||||||
checkPackage(plugin.getClass(), version, name);
|
checkPackage(plugin.getClass(), version, name);
|
||||||
return (T) plugin;
|
return plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
|
private static void checkPackage(Class<?> cls, String version, String name) throws IncompatibleEnvironmentException {
|
||||||
@@ -118,6 +123,12 @@ public class FMLLoader {
|
|||||||
return providers.get(0);
|
return providers.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
arguments.put("launchTarget", launchTarget);
|
arguments.put("launchTarget", launchTarget);
|
||||||
@@ -135,20 +146,20 @@ public class FMLLoader {
|
|||||||
}
|
}
|
||||||
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
commonLaunchHandler = (CommonLaunchHandler)launchHandler.get();
|
||||||
launchHandlerName = launchHandler.get().name();
|
launchHandlerName = launchHandler.get().name();
|
||||||
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Path.of(".").toAbsolutePath());
|
gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());
|
||||||
|
|
||||||
naming = commonLaunchHandler.getNaming();
|
naming = commonLaunchHandler.getNaming();
|
||||||
dist = commonLaunchHandler.getDist();
|
dist = commonLaunchHandler.getDist();
|
||||||
production = commonLaunchHandler.isProduction();
|
production = commonLaunchHandler.isProduction();
|
||||||
|
|
||||||
accessTransformer.getExtension().accept(Map.entry(naming, "srg"));
|
accessTransformer.getExtension().accept(Pair.of(naming, "srg"));
|
||||||
|
|
||||||
runtimeDistCleaner.getExtension().accept(dist);
|
runtimeDistCleaner.getExtension().accept(dist);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
|
public static List<ITransformationService.Resource> beginModScan(final Map<String,?> arguments) {
|
||||||
LOGGER.debug(SCAN,"Scanning for Mod Locators");
|
LOGGER.debug(SCAN,"Scanning for Mod Locators");
|
||||||
var modDiscoverer = new ModDiscoverer(arguments);
|
modDiscoverer = new ModDiscoverer(arguments);
|
||||||
modValidator = modDiscoverer.discoverMods();
|
modValidator = modDiscoverer.discoverMods();
|
||||||
var pluginResources = modValidator.getPluginResources();
|
var pluginResources = modValidator.getPluginResources();
|
||||||
return List.of(pluginResources);
|
return List.of(pluginResources);
|
||||||
@@ -170,6 +181,10 @@ public class FMLLoader {
|
|||||||
return languageLoadingProvider;
|
return languageLoadingProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static ModDiscoverer getModDiscoverer() {
|
||||||
|
return modDiscoverer;
|
||||||
|
}
|
||||||
|
|
||||||
public static CommonLaunchHandler getLaunchHandler() {
|
public static CommonLaunchHandler getLaunchHandler() {
|
||||||
return commonLaunchHandler;
|
return commonLaunchHandler;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
|||||||
|
|
||||||
public class FMLServiceProvider implements ITransformationService {
|
public class FMLServiceProvider implements ITransformationService {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final Map<String, Object> arguments = new HashMap<>();
|
private Map<String, Object> arguments;
|
||||||
|
|
||||||
public FMLServiceProvider() {
|
public FMLServiceProvider() {
|
||||||
var markers = System.getProperty("forge.logging.markers", "").split(",");
|
var markers = System.getProperty("forge.logging.markers", "").split(",");
|
||||||
@@ -45,6 +45,7 @@ public class FMLServiceProvider implements ITransformationService {
|
|||||||
FMLConfig.load();
|
FMLConfig.load();
|
||||||
LOGGER.debug(CORE, "Preparing ModFile");
|
LOGGER.debug(CORE, "Preparing ModFile");
|
||||||
environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
|
environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new);
|
||||||
|
arguments = new HashMap<>();
|
||||||
LOGGER.debug(CORE, "Preparing launch handler");
|
LOGGER.debug(CORE, "Preparing launch handler");
|
||||||
FMLLoader.setupLaunchHandler(environment, arguments);
|
FMLLoader.setupLaunchHandler(environment, arguments);
|
||||||
FMLEnvironment.setupInteropEnvironment(environment);
|
FMLEnvironment.setupInteropEnvironment(environment);
|
||||||
@@ -67,6 +68,14 @@ public class FMLServiceProvider implements ITransformationService {
|
|||||||
FMLLoader.onInitialLoad(environment, otherServices);
|
FMLLoader.onInitialLoad(environment, otherServices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void argumentValues(OptionResult option) {
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
@SuppressWarnings("rawtypes")
|
||||||
@Override
|
@Override
|
||||||
public @NotNull List<ITransformer> transformers() {
|
public @NotNull List<ITransformer> transformers() {
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("net.minecraftforge.forge");
|
var fm = layer.findModule("forge");
|
||||||
if (fm.isPresent()) {
|
if (fm.isPresent()) {
|
||||||
getClass().getModule().addReads(fm.get());
|
getClass().getModule().addReads(fm.get());
|
||||||
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
||||||
|
|||||||
@@ -5,25 +5,31 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
|
||||||
|
import java.net.URL;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.NoSuchElementException;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
||||||
* loading package</em>
|
* loading package</em>
|
||||||
*/
|
*/
|
||||||
public class LoadingModList {
|
public class LoadingModList
|
||||||
|
{
|
||||||
private static LoadingModList INSTANCE;
|
private static LoadingModList INSTANCE;
|
||||||
private final List<ModFileInfo> modFiles;
|
private final List<ModFileInfo> modFiles;
|
||||||
private final List<ModInfo> sortedList;
|
private final List<ModInfo> sortedList;
|
||||||
@@ -31,14 +37,15 @@ public class LoadingModList {
|
|||||||
private final List<EarlyLoadingException> preLoadErrors;
|
private final List<EarlyLoadingException> preLoadErrors;
|
||||||
private List<IModFile> brokenFiles;
|
private List<IModFile> brokenFiles;
|
||||||
|
|
||||||
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
||||||
|
{
|
||||||
this.modFiles = modFiles.stream()
|
this.modFiles = modFiles.stream()
|
||||||
.map(ModFile::getModFileInfo)
|
.map(ModFile::getModFileInfo)
|
||||||
.map(ModFileInfo.class::cast)
|
.map(ModFileInfo.class::cast)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
this.sortedList = sortedList.stream()
|
this.sortedList = sortedList.stream()
|
||||||
.map(ModInfo.class::cast)
|
.map(ModInfo.class::cast)
|
||||||
.toList();
|
.collect(Collectors.toList());
|
||||||
this.fileById = this.modFiles.stream()
|
this.fileById = this.modFiles.stream()
|
||||||
.map(ModFileInfo::getMods)
|
.map(ModFileInfo::getMods)
|
||||||
.flatMap(Collection::stream)
|
.flatMap(Collection::stream)
|
||||||
@@ -47,18 +54,21 @@ public class LoadingModList {
|
|||||||
this.preLoadErrors = new ArrayList<>();
|
this.preLoadErrors = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
|
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
|
||||||
|
{
|
||||||
INSTANCE = new LoadingModList(modFiles, sortedList);
|
INSTANCE = new LoadingModList(modFiles, sortedList);
|
||||||
if (earlyLoadingException != null)
|
if (earlyLoadingException != null)
|
||||||
|
{
|
||||||
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
||||||
|
}
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList get() {
|
public static LoadingModList get() {
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
public void addCoreMods()
|
||||||
public void addCoreMods() {
|
{
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFileInfo::getFile)
|
.map(ModFileInfo::getFile)
|
||||||
.map(ModFile::getCoreMods)
|
.map(ModFile::getCoreMods)
|
||||||
@@ -66,28 +76,28 @@ public class LoadingModList {
|
|||||||
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addAccessTransformers() {
|
public void addAccessTransformers()
|
||||||
for (ModFileInfo modFile : modFiles) {
|
{
|
||||||
ModFile mod = modFile.getFile();
|
modFiles.stream()
|
||||||
var at = mod.getAccessTransformer().orElse(null);
|
.map(ModFileInfo::getFile)
|
||||||
if (at != null) {
|
.forEach(mod -> mod.getAccessTransformer().ifPresent(path -> FMLLoader.addAccessTransformer(path, mod)));
|
||||||
FMLLoader.addAccessTransformer(at, mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
|
public void addForScanning(BackgroundScanHandler backgroundScanHandler)
|
||||||
|
{
|
||||||
backgroundScanHandler.setLoadingModList(this);
|
backgroundScanHandler.setLoadingModList(this);
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFileInfo::getFile)
|
.map(ModFileInfo::getFile)
|
||||||
.forEach(backgroundScanHandler::submitForScanning);
|
.forEach(backgroundScanHandler::submitForScanning);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileInfo> getModFiles() {
|
public List<ModFileInfo> getModFiles()
|
||||||
|
{
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Path findResource(final String className) {
|
public Path findResource(final String className)
|
||||||
|
{
|
||||||
for (ModFileInfo mf : modFiles) {
|
for (ModFileInfo mf : modFiles) {
|
||||||
final Path resource = mf.getFile().findResource(className);
|
final Path resource = mf.getFile().findResource(className);
|
||||||
if (Files.exists(resource)) return resource;
|
if (Files.exists(resource)) return resource;
|
||||||
@@ -95,11 +105,55 @@ public class LoadingModList {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModFileInfo getModFileById(String modid) {
|
public Enumeration<URL> findAllURLsForResource(final String resName) {
|
||||||
|
final String resourceName;
|
||||||
|
// strip a leading slash
|
||||||
|
if (resName.startsWith("/")) {
|
||||||
|
resourceName = resName.substring(1);
|
||||||
|
} else {
|
||||||
|
resourceName = resName;
|
||||||
|
}
|
||||||
|
return new Enumeration<URL>() {
|
||||||
|
private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
|
||||||
|
private URL next;
|
||||||
|
@Override
|
||||||
|
public boolean hasMoreElements() {
|
||||||
|
if (next!=null) return true;
|
||||||
|
next = findNextURL();
|
||||||
|
return next != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public URL nextElement() {
|
||||||
|
if (next == null) {
|
||||||
|
next = findNextURL();
|
||||||
|
if (next == null) throw new NoSuchElementException();
|
||||||
|
}
|
||||||
|
URL result = next;
|
||||||
|
next = null;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private URL findNextURL() {
|
||||||
|
while (modFileIterator.hasNext()) {
|
||||||
|
final ModFileInfo next = modFileIterator.next();
|
||||||
|
final Path resource = next.getFile().findResource(resourceName);
|
||||||
|
if (Files.exists(resource)) {
|
||||||
|
return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModFileInfo getModFileById(String modid)
|
||||||
|
{
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModInfo> getMods() {
|
public List<ModInfo> getMods()
|
||||||
|
{
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class MCPNamingService implements INameMappingService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map.Entry<String, String> understanding() {
|
public Map.Entry<String, String> understanding() {
|
||||||
return Map.entry("srg", "mcp");
|
return Pair.of("srg", "mcp");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -77,7 +77,7 @@ public class MCPNamingService implements INameMappingService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
|
private static void loadMappings(final String mappingFileName, BiConsumer<String, String> mapStore) {
|
||||||
URL path = MCPNamingService.class.getClassLoader().getResource(mappingFileName);
|
URL path = ClassLoader.getSystemResource(mappingFileName); //We EXPLICITLY go through the SystemClassLoader here because this is dev-time only. And will be on the root classpath.
|
||||||
if (path == null)
|
if (path == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public class MavenCoordinateResolver {
|
|||||||
(!extension.isEmpty() ? "." + extension : ".jar");
|
(!extension.isEmpty() ? "." + extension : ".jar");
|
||||||
|
|
||||||
String[] groups = groupId.split("\\.");
|
String[] groups = groupId.split("\\.");
|
||||||
Path result = Path.of(groups[0]);
|
Path result = Paths.get(groups[0]);
|
||||||
for (int i = 1; i < groups.length; i++) {
|
for (int i = 1; i < groups.length; i++) {
|
||||||
result = result.resolve(groups[i]);
|
result = result.resolve(groups[i]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.google.common.graph.GraphBuilder;
|
import com.google.common.graph.GraphBuilder;
|
||||||
import com.google.common.graph.MutableGraph;
|
import com.google.common.graph.MutableGraph;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
@@ -20,250 +20,229 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
import static java.util.stream.Collectors.*;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class ModSorter {
|
public class ModSorter
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private final UniqueModListBuilder uniqueModListBuilder;
|
||||||
|
private List<ModFile> modFiles;
|
||||||
|
private List<ModInfo> sortedList;
|
||||||
|
private Map<String, IModInfo> modIdNameLookup;
|
||||||
|
private List<ModFile> systemMods;
|
||||||
|
|
||||||
private record State(List<ModFile> files, List<ModInfo> mods) {}
|
private ModSorter(final List<ModFile> modFiles)
|
||||||
|
{
|
||||||
private ModSorter() {}
|
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
||||||
|
}
|
||||||
@SuppressWarnings("removal")
|
|
||||||
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
|
|
||||||
State systemMods = detectSystemMods(mods);
|
|
||||||
List<ModFile> modFiles;
|
|
||||||
|
|
||||||
|
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
||||||
|
{
|
||||||
|
final ModSorter ms = new ModSorter(mods);
|
||||||
try {
|
try {
|
||||||
modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
|
ms.buildUniqueList();
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
// We cannot build any list with duped mods. We have to abort immediately and report it
|
// We cannot build any list with duped mods. We have to abort immediately and report it
|
||||||
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
||||||
// So all this is really doing is wasting time.
|
// So all this is really doing is wasting time.
|
||||||
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
||||||
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
var named = new HashMap<String, ModInfo>();
|
|
||||||
for (var file : modFiles) {
|
|
||||||
for (var info : file.getModInfos())
|
|
||||||
named.put(info.getModId(), (ModInfo)info);
|
|
||||||
}
|
|
||||||
|
|
||||||
// try and validate dependencies
|
// try and validate dependencies
|
||||||
final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
|
||||||
|
|
||||||
// if we miss one or the other, we abort now
|
// if we miss one or the other, we abort now
|
||||||
if (!failedList.isEmpty()) {
|
if (!failedList.isEmpty()) {
|
||||||
return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).collect(toList()), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, lets try and sort the modlist and proceed
|
// Otherwise, lets try and sort the modlist and proceed
|
||||||
|
EarlyLoadingException earlyLoadingException = null;
|
||||||
try {
|
try {
|
||||||
var sorted = sort(modFiles, named);
|
ms.sort();
|
||||||
return LoadingModList.of(sorted.files(), sorted.mods(), null);
|
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
// The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
|
earlyLoadingException = e;
|
||||||
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
|
||||||
}
|
}
|
||||||
|
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
|
private void sort()
|
||||||
final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
|
{
|
||||||
|
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
||||||
|
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
||||||
|
AtomicInteger counter = new AtomicInteger();
|
||||||
|
Map<ModFileInfo, Integer> infos = modFiles.stream()
|
||||||
|
.map(ModFile::getModFileInfo)
|
||||||
|
.filter(ModFileInfo.class::isInstance)
|
||||||
|
.map(ModFileInfo.class::cast)
|
||||||
|
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
||||||
|
infos.keySet().forEach(graph::addNode);
|
||||||
|
modFiles.stream()
|
||||||
|
.map(ModFile::getModInfos)
|
||||||
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
|
.map(IModInfo::getDependencies)
|
||||||
|
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
|
||||||
|
.forEach(dep -> addDependency(graph, dep));
|
||||||
|
|
||||||
int counter = 0;
|
final List<ModFileInfo> sorted;
|
||||||
var infos = new HashMap<ModInfo, Integer>();
|
try
|
||||||
for (var file : modFiles) {
|
{
|
||||||
if (file.getModFileInfo() instanceof ModFileInfo info) {
|
|
||||||
for (var imod : info.getMods()) {
|
|
||||||
var mod = (ModInfo)imod;
|
|
||||||
infos.put(mod, counter++);
|
|
||||||
graph.addNode(mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var file : modFiles) {
|
|
||||||
for (var info : file.getModInfos()) {
|
|
||||||
for (var dep : info.getDependencies()) {
|
|
||||||
// Ordering isn't effected by sides, should it be?
|
|
||||||
//if (!dep.getSide().isCorrectSide())
|
|
||||||
// continue;
|
|
||||||
|
|
||||||
var target = named.get(dep.getModId());
|
|
||||||
|
|
||||||
// soft dep that doesn't exist. No edge required.
|
|
||||||
if (target == null)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var self = (ModInfo)dep.getOwner();
|
|
||||||
|
|
||||||
switch (dep.getOrdering()) {
|
|
||||||
case BEFORE -> graph.putEdge(self, target);
|
|
||||||
case AFTER -> graph.putEdge(target, self);
|
|
||||||
default -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<ModInfo> sorted;
|
|
||||||
try {
|
|
||||||
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
||||||
} catch (CyclePresentException e) {
|
}
|
||||||
Set<Set<ModInfo>> cycles = e.getCycles();
|
catch (CyclePresentException e)
|
||||||
var buf = new StringBuilder();
|
{
|
||||||
buf.append("Mod Sorting failed - Detected Cycles: \n");
|
Set<Set<ModFileInfo>> cycles = e.getCycles();
|
||||||
|
if (LOGGER.isErrorEnabled(LOADING))
|
||||||
var dataList = new ArrayList<ExceptionData>();
|
{
|
||||||
for (var cycle : cycles) {
|
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
|
||||||
buf.append("\tCycle:\n");
|
|
||||||
for (var mod : cycle) {
|
|
||||||
var modDeps = new StringBuilder()
|
|
||||||
.append(mod.getModId())
|
|
||||||
.append(' ')
|
|
||||||
.append(mod.getDependencies().stream()
|
|
||||||
.filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
|
|
||||||
.map(dep -> dep.getOrdering().name() + " " + dep.getModId())
|
|
||||||
.collect(Collectors.joining(", "))
|
|
||||||
);
|
|
||||||
dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
|
|
||||||
buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
var dataList = cycles.stream()
|
||||||
LOGGER.error(LOADING, buf.toString());
|
.<ModFileInfo>mapMulti(Iterable::forEach)
|
||||||
|
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
|
||||||
|
.map(IModInfo::getModId)
|
||||||
|
.map(list -> new ExceptionData("fml.modloading.cycle", list))
|
||||||
|
.toList();
|
||||||
throw new EarlyLoadingException("Sorting error", e, dataList);
|
throw new EarlyLoadingException("Sorting error", e, dataList);
|
||||||
}
|
}
|
||||||
|
this.sortedList = sorted.stream()
|
||||||
var files = new LinkedHashSet<ModFile>();
|
.map(ModFileInfo::getMods)
|
||||||
var list = new ArrayList<ModInfo>();
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
|
.map(ModInfo.class::cast)
|
||||||
for (var mod : sorted) {
|
.collect(toList());
|
||||||
files.add(mod.getOwningFile().getFile());
|
this.modFiles = sorted.stream()
|
||||||
list.add(mod);
|
.map(ModFileInfo::getFile)
|
||||||
}
|
.collect(toList());
|
||||||
|
|
||||||
return new State(files.stream().toList(), list);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static State detectSystemMods(final List<ModFile> modFiles) {
|
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
||||||
|
{
|
||||||
|
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
||||||
|
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
||||||
|
// soft dep that doesn't exist. Just return. No edge required.
|
||||||
|
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
|
||||||
|
if (self == target)
|
||||||
|
return; // in case a jar has two mods that have dependencies between
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case BEFORE -> topoGraph.putEdge(self, target);
|
||||||
|
case AFTER -> topoGraph.putEdge(target, self);
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buildUniqueList()
|
||||||
|
{
|
||||||
|
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
|
||||||
|
|
||||||
|
this.modFiles = uniqueModListData.modFiles();
|
||||||
|
|
||||||
|
detectSystemMods(uniqueModListData.modFilesByFirstId());
|
||||||
|
|
||||||
|
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
|
||||||
|
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
|
||||||
|
.collect(Collectors.toMap(
|
||||||
|
Map.Entry::getKey,
|
||||||
|
e -> e.getValue().get(0).getModInfos().get(0)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
|
||||||
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
||||||
var systemMods = List.of("minecraft", "forge");
|
var systemMods = List.of("minecraft", "forge");
|
||||||
LOGGER.debug("Configured system mods: {}", systemMods);
|
LOGGER.debug("Configured system mods: {}", systemMods);
|
||||||
|
|
||||||
var mods = new ArrayList<ModInfo>();
|
this.systemMods = new ArrayList<>();
|
||||||
var files = new ArrayList<ModFile>();
|
|
||||||
for (var systemMod : systemMods) {
|
for (var systemMod : systemMods) {
|
||||||
var mod = findMod(modFiles, systemMod);
|
var container = modFilesByFirstId.get(systemMod);
|
||||||
if (mod == null)
|
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);
|
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
||||||
|
|
||||||
LOGGER.debug("Found system mod: {}", systemMod);
|
|
||||||
mods.add(mod.info());
|
|
||||||
files.add(mod.file());
|
|
||||||
}
|
|
||||||
|
|
||||||
return new State(files, mods);
|
|
||||||
}
|
|
||||||
|
|
||||||
private record ModPair(ModFile file, ModInfo info) {}
|
|
||||||
private static ModPair findMod(final List<ModFile> modFiles, String name) {
|
|
||||||
for (var file : modFiles) {
|
|
||||||
for (var mod : file.getModFileInfo().getMods()) {
|
|
||||||
if (name.equals(mod.getModId()))
|
|
||||||
return new ModPair(file, (ModInfo)mod);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
|
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
||||||
final var modVersions = new HashMap<String, ArtifactVersion>();
|
{
|
||||||
final var modRequirements = new HashSet<ModVersion>();
|
final var modVersions = modFiles.stream()
|
||||||
int mandatoryRequired = 0;
|
.map(ModFile::getModInfos)
|
||||||
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
|
.collect(toMap(IModInfo::getModId, IModInfo::getVersion));
|
||||||
|
|
||||||
for (var file : files) {
|
final var modVersionDependencies = modFiles.stream()
|
||||||
for (var info : file.getModInfos()) {
|
.map(ModFile::getModInfos)
|
||||||
modVersions.put(info.getModId(), info.getVersion());
|
.<IModInfo>mapMulti(Iterable::forEach)
|
||||||
for (var dep : info.getDependencies()) {
|
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
|
||||||
if (dep.getSide().isCorrectSide()) {
|
|
||||||
if (modRequirements.add(dep) && dep.isMandatory())
|
|
||||||
mandatoryRequired++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
final var modRequirements = modVersionDependencies.values().stream()
|
||||||
|
.<IModInfo.ModVersion>mapMulti(Iterable::forEach)
|
||||||
|
.filter(mv -> mv.getSide().isCorrectSide())
|
||||||
|
.collect(toSet());
|
||||||
|
|
||||||
|
final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
||||||
|
final var missingVersions = modRequirements.stream()
|
||||||
|
.filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && this.modVersionNotContained(mv, modVersions))
|
||||||
|
.collect(toSet());
|
||||||
|
final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
||||||
|
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
|
||||||
|
|
||||||
final var missingMandatory = new HashSet<ModVersion>();
|
if (!missingVersions.isEmpty()) {
|
||||||
final var missingOptional = new HashSet<ModVersion>();
|
if (mandatoryMissing > 0) {
|
||||||
|
LOGGER.error(
|
||||||
|
LOADING,
|
||||||
|
"Missing or unsupported mandatory dependencies:\n{}",
|
||||||
|
missingVersions.stream()
|
||||||
|
.filter(IModInfo.ModVersion::isMandatory)
|
||||||
|
.map(ver -> formatDependencyError(ver, modVersions))
|
||||||
|
.collect(Collectors.joining("\n"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (missingVersions.size() - mandatoryMissing > 0) {
|
||||||
|
LOGGER.error(
|
||||||
|
LOADING,
|
||||||
|
"Unsupported installed optional dependencies:\n{}",
|
||||||
|
missingVersions.stream()
|
||||||
|
.filter(ver -> !ver.isMandatory())
|
||||||
|
.map(ver -> formatDependencyError(ver, modVersions))
|
||||||
|
.collect(Collectors.joining("\n"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
for (var dep : modRequirements) {
|
return missingVersions.stream()
|
||||||
var modId = dep.getModId();
|
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
|
||||||
var existing = modVersions.get(modId);
|
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
|
||||||
|
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
|
||||||
if (!dep.isMandatory() && existing == null)
|
.toList();
|
||||||
continue;
|
|
||||||
|
|
||||||
var range = dep.getVersionRange();
|
|
||||||
if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
|
|
||||||
(dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
|
|
||||||
}
|
}
|
||||||
|
return Collections.emptyList();
|
||||||
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
|
|
||||||
|
|
||||||
var ret = new ArrayList<ExceptionData>();
|
|
||||||
|
|
||||||
if (!missingMandatory.isEmpty()) {
|
|
||||||
LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
|
||||||
for (var mv : missingMandatory)
|
|
||||||
ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!missingOptional.isEmpty()) {
|
|
||||||
LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
|
||||||
for (var mv : missingMandatory)
|
|
||||||
ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
|
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
||||||
var ret = new ArrayList<String>();
|
{
|
||||||
for (var dep : missing) {
|
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
||||||
var installed = modVersions.get(dep.getModId());
|
return String.format(
|
||||||
ret.add(String.format(
|
|
||||||
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
||||||
dep.getModId(),
|
dependency.getModId(),
|
||||||
dep.getOwner().getModId(),
|
dependency.getOwner().getModId(),
|
||||||
dep.getVersionRange(),
|
dependency.getVersionRange(),
|
||||||
installed != null ? installed.toString() : "[MISSING]"
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
));
|
);
|
||||||
}
|
|
||||||
return String.join("\n", ret);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
|
private boolean modVersionNotContained(final IModInfo.ModVersion mv, final Map<String, ArtifactVersion> modVersions)
|
||||||
private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
|
{
|
||||||
return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
|
return !(VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod", (modId, range) -> modVersions.containsKey(modId) &&
|
||||||
|
(range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE"))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,14 @@ package net.minecraftforge.fml.loading;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import com.google.common.collect.Streams;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
@@ -22,177 +28,138 @@ import org.objectweb.asm.Type;
|
|||||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||||
import org.objectweb.asm.tree.AnnotationNode;
|
import org.objectweb.asm.tree.AnnotationNode;
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
|
import org.objectweb.asm.tree.FieldNode;
|
||||||
import org.objectweb.asm.tree.MethodNode;
|
import org.objectweb.asm.tree.MethodNode;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
|
|
||||||
public class RuntimeDistCleaner implements ILaunchPluginService {
|
public class RuntimeDistCleaner implements ILaunchPluginService
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
|
private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM");
|
||||||
private static String DIST;
|
private static String DIST;
|
||||||
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
|
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
|
||||||
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
|
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
|
||||||
private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name()
|
||||||
|
{
|
||||||
return "runtimedistcleaner";
|
return "runtimedistcleaner";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason) {
|
public int processClassWithFlags(final Phase phase, final ClassNode classNode, final Type classType, final String reason)
|
||||||
var changed = false;
|
{
|
||||||
|
AtomicBoolean changes = new AtomicBoolean();
|
||||||
var annotations = unpack(classNode.visibleAnnotations);
|
if (remove(classNode.visibleAnnotations, DIST))
|
||||||
|
{
|
||||||
if (remove(annotations, DIST)) {
|
|
||||||
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
|
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
|
||||||
throw new RuntimeException("Attempted to load class "+ classNode.name + " for invalid dist "+ DIST);
|
throw new RuntimeException("Attempted to load class "+ classNode.name + " for invalid dist "+ DIST);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!FMLEnvironment.production && !annotations.isEmpty() && hasModAnnotation(classNode.visibleAnnotations)) {
|
if (classNode.interfaces != null )
|
||||||
LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
|
{
|
||||||
throw new RuntimeException("Found @OnlyIn on @Mod class "+ classNode.name + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
|
unpack(classNode.visibleAnnotations).stream()
|
||||||
}
|
.filter(ann->Objects.equals(ann.desc, ONLYIN))
|
||||||
|
.filter(ann->ann.values.indexOf("_interface") != -1)
|
||||||
if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
|
.filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST))
|
||||||
for (var ann : annotations) {
|
.map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName())
|
||||||
if (ann.intf == null || DIST.equals(ann.side))
|
.forEach(intf -> {
|
||||||
continue;
|
if (classNode.interfaces.remove(intf)) {
|
||||||
|
LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, intf);
|
||||||
if (classNode.interfaces.remove(ann.intf)) {
|
changes.compareAndSet(false, true);
|
||||||
LOGGER.debug(DISTXFORM,"Removing Interface: {} implements {}", classNode.name, ann.intf);
|
}
|
||||||
changed = true;
|
});
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
|
//Remove Class level @OnlyIn/@OnlyIns annotations, this is important if anyone gets ambitious and tries to reflect an annotation with _interface set.
|
||||||
if (classNode.visibleAnnotations != null) {
|
if (classNode.visibleAnnotations != null) {
|
||||||
for (var itr = classNode.visibleAnnotations.iterator(); itr.hasNext(); ) {
|
Iterator<AnnotationNode> itr = classNode.visibleAnnotations.iterator();
|
||||||
var ann = itr.next();
|
while (itr.hasNext()) {
|
||||||
if (ONLYIN.equals(ann.desc) || ONLYINS.equals(ann.desc)) {
|
AnnotationNode ann = itr.next();
|
||||||
LOGGER.debug(DISTXFORM, "Removing Class Annotation: {} @{}", classNode.name, ann.desc);
|
if (Objects.equals(ann.desc, ONLYIN) || Objects.equals(ann.desc, ONLYINS)) {
|
||||||
|
LOGGER.debug(DISTXFORM,"Removing Class Annotation: {} @{}", classNode.name, ann.desc);
|
||||||
itr.remove();
|
itr.remove();
|
||||||
changed = true;
|
changes.compareAndSet(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var itr = classNode.fields.iterator(); itr.hasNext(); ) {
|
Iterator<FieldNode> fields = classNode.fields.iterator();
|
||||||
var field = itr.next();
|
while(fields.hasNext())
|
||||||
if (remove(unpack(field.visibleAnnotations), DIST)) {
|
{
|
||||||
LOGGER.debug(DISTXFORM, "Removing field: {}.{}", classNode.name, field.name);
|
FieldNode field = fields.next();
|
||||||
itr.remove();
|
if (remove(field.visibleAnnotations, DIST))
|
||||||
changed = true;
|
{
|
||||||
|
LOGGER.debug(DISTXFORM,"Removing field: {}.{}", classNode.name, field.name);
|
||||||
|
fields.remove();
|
||||||
|
changes.compareAndSet(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var lambdaGatherer = new LambdaGatherer();
|
LambdaGatherer lambdaGatherer = new LambdaGatherer();
|
||||||
for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
|
Iterator<MethodNode> methods = classNode.methods.iterator();
|
||||||
var method = itr.next();
|
while(methods.hasNext())
|
||||||
if (remove(unpack(method.visibleAnnotations), DIST)) {
|
{
|
||||||
LOGGER.debug(DISTXFORM, "Removing method: {}.{}{}", classNode.name, method.name, method.desc);
|
MethodNode method = methods.next();
|
||||||
itr.remove();
|
if (remove(method.visibleAnnotations, DIST))
|
||||||
|
{
|
||||||
|
LOGGER.debug(DISTXFORM,"Removing method: {}.{}{}", classNode.name, method.name, method.desc);
|
||||||
|
methods.remove();
|
||||||
lambdaGatherer.accept(method);
|
lambdaGatherer.accept(method);
|
||||||
changed = true;
|
changes.compareAndSet(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove dynamic synthetic lambda methods that are inside of removed methods
|
// remove dynamic synthetic lambda methods that are inside of removed methods
|
||||||
for (List<Handle> handles = lambdaGatherer.getDynamicLambdaHandles();
|
for (List<Handle> dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles();
|
||||||
!handles.isEmpty(); handles = lambdaGatherer.getDynamicLambdaHandles()) {
|
!dynamicLambdaHandles.isEmpty(); dynamicLambdaHandles = lambdaGatherer.getDynamicLambdaHandles())
|
||||||
|
{
|
||||||
lambdaGatherer = new LambdaGatherer();
|
lambdaGatherer = new LambdaGatherer();
|
||||||
for (var itr = classNode.methods.iterator(); itr.hasNext(); ) {
|
methods = classNode.methods.iterator();
|
||||||
MethodNode method = itr.next();
|
while (methods.hasNext())
|
||||||
if ((method.access & Opcodes.ACC_SYNTHETIC) == 0)
|
{
|
||||||
continue;
|
MethodNode method = methods.next();
|
||||||
|
if ((method.access & Opcodes.ACC_SYNTHETIC) == 0) continue;
|
||||||
for (var handle : handles) {
|
for (Handle dynamicLambdaHandle : dynamicLambdaHandles)
|
||||||
if (method.name.equals(handle.getName()) && method.desc.equals(handle.getDesc())) {
|
{
|
||||||
LOGGER.debug(DISTXFORM, "Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
|
if (method.name.equals(dynamicLambdaHandle.getName()) && method.desc.equals(dynamicLambdaHandle.getDesc()))
|
||||||
itr.remove();
|
{
|
||||||
|
LOGGER.debug(DISTXFORM,"Removing lambda method: {}.{}{}", classNode.name, method.name, method.desc);
|
||||||
|
methods.remove();
|
||||||
lambdaGatherer.accept(method);
|
lambdaGatherer.accept(method);
|
||||||
changed = true;
|
changes.compareAndSet(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return changes.get() ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
|
||||||
return changed ? ComputeFlags.SIMPLE_REWRITE : ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static record Target(String side, String intf) {
|
|
||||||
static Target from(final AnnotationNode node) {
|
|
||||||
var idx = node.values.indexOf("value");
|
|
||||||
var value = (String[])node.values.get(idx + 1); // Enums are stored as [Type, Value]
|
|
||||||
|
|
||||||
idx = node.values.indexOf("_interface");
|
|
||||||
if (idx == -1)
|
|
||||||
return new Target(value[1], null);
|
|
||||||
|
|
||||||
var intf = (Type)node.values.get(idx + 1);
|
|
||||||
return new Target(value[1], intf.getInternalName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unpack any OnlyIn or OnlyIns annotations to Target objects.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private static List<Target> unpack(final List<AnnotationNode> anns) {
|
private static List<AnnotationNode> unpack(final List<AnnotationNode> anns) {
|
||||||
if (anns == null || anns.isEmpty())
|
if (anns == null) return Collections.emptyList();
|
||||||
return Collections.emptyList();
|
List<AnnotationNode> ret = anns.stream().filter(ann->Objects.equals(ann.desc, ONLYIN)).collect(Collectors.toList());
|
||||||
|
anns.stream().filter(ann->Objects.equals(ann.desc, ONLYINS) && ann.values != null)
|
||||||
var ret = new ArrayList<Target>();
|
.map( ann -> (List<AnnotationNode>)ann.values.get(ann.values.indexOf("value") + 1))
|
||||||
for (var node : anns) {
|
.filter(v -> v != null)
|
||||||
if (ONLYIN.equals(node.desc))
|
.forEach(v -> v.forEach(ret::add));
|
||||||
ret.add(Target.from(node));
|
|
||||||
else if (ONLYINS.equals(node.desc)) {
|
|
||||||
if (node.values == null || node.values.isEmpty())
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int idx = node.values.indexOf("value");
|
|
||||||
if (idx == -1)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var subNodes = (List<AnnotationNode>)node.values.get(idx + 1);
|
|
||||||
if (subNodes != null) {
|
|
||||||
for (var sub : subNodes)
|
|
||||||
ret.add(Target.from(sub));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean remove(final List<Target> targets, final String side) {
|
private static boolean remove(final List<AnnotationNode> anns, final String side)
|
||||||
for (var target : targets) {
|
{
|
||||||
if (target.intf == null && !side.equals(target.side))
|
return unpack(anns).stream().
|
||||||
return true;
|
filter(ann->Objects.equals(ann.desc, ONLYIN)).
|
||||||
}
|
filter(ann->ann.values.indexOf("_interface") == -1).
|
||||||
|
anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side));
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean hasModAnnotation(final List<AnnotationNode> anns) {
|
|
||||||
if (anns == null || anns.isEmpty())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
for (var ann : anns) {
|
|
||||||
if (ann.desc.equals(MOD))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public Consumer<Dist> getExtension() {
|
public Consumer<Dist> getExtension()
|
||||||
return s -> {
|
{
|
||||||
|
return (s)-> {
|
||||||
DIST = s.name();
|
DIST = s.name();
|
||||||
LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
|
LOGGER.debug(DISTXFORM, "Configuring for Dist {}", DIST);
|
||||||
};
|
};
|
||||||
@@ -225,21 +192,23 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void accept(MethodNode method) {
|
public void accept(MethodNode method) {
|
||||||
for (var insn : method.instructions) {
|
Streams.stream(method.instructions.iterator()).
|
||||||
if (insn.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN)
|
filter(insnNode->insnNode.getType() == AbstractInsnNode.INVOKE_DYNAMIC_INSN).
|
||||||
insn.accept(this);
|
forEach(insnNode->insnNode.accept(this));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
|
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs)
|
||||||
if (META_FACTORY.equals(bsm)) {
|
{
|
||||||
var handle = (Handle)bsmArgs[1];
|
if (META_FACTORY.equals(bsm))
|
||||||
dynamicLambdaHandles.add(handle);
|
{
|
||||||
|
Handle dynamicLambdaHandle = (Handle) bsmArgs[1];
|
||||||
|
dynamicLambdaHandles.add(dynamicLambdaHandle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Handle> getDynamicLambdaHandles() {
|
public List<Handle> getDynamicLambdaHandles()
|
||||||
|
{
|
||||||
return dynamicLambdaHandles;
|
return dynamicLambdaHandles;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,17 +14,16 @@ import org.apache.commons.lang3.text.StrSubstitutor;
|
|||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
public class StringSubstitutor {
|
public class StringSubstitutor {
|
||||||
private static final Map<String, String> GLOBALS = Map.of(
|
|
||||||
"mcVersion", FMLLoader.versionInfo().mcVersion(),
|
|
||||||
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
|
|
||||||
);
|
|
||||||
|
|
||||||
public static String replace(final String in, final ModFile file) {
|
public static String replace(final String in, final ModFile file) {
|
||||||
return new StrSubstitutor(getStringLookup(file)).replace(in);
|
return new StrSubstitutor(getStringLookup(file)).replace(in);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static StrLookup<String> getStringLookup(final ModFile file) {
|
private static StrLookup<String> getStringLookup(final ModFile file) {
|
||||||
return new StrLookup<>() {
|
var globals = Map.of(
|
||||||
|
"mcVersion", FMLLoader.versionInfo().mcVersion(),
|
||||||
|
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
|
||||||
|
);
|
||||||
|
return new StrLookup<String>() {
|
||||||
@Override
|
@Override
|
||||||
public String lookup(String key) {
|
public String lookup(String key) {
|
||||||
var parts = key.split("\\.");
|
var parts = key.split("\\.");
|
||||||
@@ -33,7 +32,7 @@ public class StringSubstitutor {
|
|||||||
var pfx = parts[0];
|
var pfx = parts[0];
|
||||||
|
|
||||||
if ("global".equals(pfx))
|
if ("global".equals(pfx))
|
||||||
return GLOBALS.get(parts[1]);
|
return globals.get(parts[1]);
|
||||||
else if ("file".equals(pfx) && file != null)
|
else if ("file".equals(pfx) && file != null)
|
||||||
return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
|
return String.valueOf(file.getSubstitutionMap().get().get(parts[1]));
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -24,18 +23,16 @@ import static java.util.stream.Collectors.groupingBy;
|
|||||||
import static java.util.stream.Collectors.joining;
|
import static java.util.stream.Collectors.joining;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
public class UniqueModListBuilder
|
||||||
@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
|
{
|
||||||
public class UniqueModListBuilder {
|
|
||||||
private final static Logger LOGGER = LogUtils.getLogger();
|
private final static Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
private final List<ModFile> modFiles;
|
private final List<ModFile> modFiles;
|
||||||
|
|
||||||
public UniqueModListBuilder(final List<ModFile> modFiles) {
|
public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
|
||||||
this.modFiles = modFiles;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UniqueModListData buildUniqueList() {
|
public UniqueModListData buildUniqueList()
|
||||||
|
{
|
||||||
List<ModFile> uniqueModList;
|
List<ModFile> uniqueModList;
|
||||||
List<ModFile> uniqueLibListWithVersion;
|
List<ModFile> uniqueLibListWithVersion;
|
||||||
|
|
||||||
@@ -50,12 +47,12 @@ public class UniqueModListBuilder {
|
|||||||
|
|
||||||
// Select the newest by artifact version sorting of non-unique files thus identified
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
uniqueModList = modFilesByFirstId.entrySet().stream()
|
uniqueModList = modFilesByFirstId.entrySet().stream()
|
||||||
.map(UniqueModListBuilder::selectNewestModInfo)
|
.map(this::selectNewestModInfo)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// Select the newest by artifact version sorting of non-unique files thus identified
|
// Select the newest by artifact version sorting of non-unique files thus identified
|
||||||
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
uniqueLibListWithVersion = libFilesWithVersionByModuleName.entrySet().stream()
|
||||||
.map(UniqueModListBuilder::selectNewestModInfo)
|
.map(this::selectNewestModInfo)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// Transform to the full mod id list
|
// Transform to the full mod id list
|
||||||
@@ -78,7 +75,7 @@ public class UniqueModListBuilder {
|
|||||||
final List<String> dupedModErrors = modIds.values().stream()
|
final List<String> dupedModErrors = modIds.values().stream()
|
||||||
.filter(modInfos -> modInfos.size() > 1)
|
.filter(modInfos -> modInfos.size() > 1)
|
||||||
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
|
.map(mods -> String.format("\tMod ID: '%s' from mod files: %s",
|
||||||
mods.getFirst().getModId(),
|
mods.get(0).getModId(),
|
||||||
mods.stream()
|
mods.stream()
|
||||||
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
|
.map(modInfo -> modInfo.getOwningFile().getFile().getFileName()).collect(joining(", "))
|
||||||
)).toList();
|
)).toList();
|
||||||
@@ -94,8 +91,9 @@ public class UniqueModListBuilder {
|
|||||||
final List<String> dupedLibErrors = versionedLibIds.values().stream()
|
final List<String> dupedLibErrors = versionedLibIds.values().stream()
|
||||||
.filter(modFiles -> modFiles.size() > 1)
|
.filter(modFiles -> modFiles.size() > 1)
|
||||||
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
.map(mods -> String.format("\tLibrary: '%s' from files: %s",
|
||||||
getModId(mods.getFirst()),
|
getModId(mods.get(0)),
|
||||||
mods.stream().map(ModFile::getFileName).collect(joining(", "))
|
mods.stream()
|
||||||
|
.map(modFile -> modFile.getFileName()).collect(joining(", "))
|
||||||
)).toList();
|
)).toList();
|
||||||
|
|
||||||
if (!dupedLibErrors.isEmpty()) {
|
if (!dupedLibErrors.isEmpty()) {
|
||||||
@@ -109,23 +107,25 @@ public class UniqueModListBuilder {
|
|||||||
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
|
final Map<String, List<ModFile>> uniqueModFilesByFirstId = uniqueModList.stream()
|
||||||
.collect(groupingBy(UniqueModListBuilder::getModId));
|
.collect(groupingBy(UniqueModListBuilder::getModId));
|
||||||
|
|
||||||
final List<ModFile> loadedList = new ArrayList<>(uniqueModList);
|
final List<ModFile> loadedList = new ArrayList<>();
|
||||||
|
loadedList.addAll(uniqueModList);
|
||||||
loadedList.addAll(uniqueLibListWithVersion);
|
loadedList.addAll(uniqueLibListWithVersion);
|
||||||
|
|
||||||
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
return new UniqueModListData(loadedList, uniqueModFilesByFirstId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
private ModFile selectNewestModInfo(Map.Entry<String, List<ModFile>> fullList) {
|
||||||
List<ModFile> modInfoList = fullList.getValue();
|
List<ModFile> modInfoList = fullList.getValue();
|
||||||
if (modInfoList.size() > 1) {
|
if (modInfoList.size() > 1) {
|
||||||
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
LOGGER.debug("Found {} mods for first modid {}, selecting most recent based on version data", modInfoList.size(), fullList.getKey());
|
||||||
modInfoList.sort(Comparator.comparing(UniqueModListBuilder::getVersion).reversed());
|
modInfoList.sort(Comparator.comparing(this::getVersion).reversed());
|
||||||
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.getFirst().getFileName(), fullList.getKey(), getVersion(modInfoList.getFirst()));
|
LOGGER.debug("Selected file {} for modid {} with version {}", modInfoList.get(0).getFileName(), fullList.getKey(), this.getVersion(modInfoList.get(0)));
|
||||||
}
|
}
|
||||||
return modInfoList.get(0);
|
return modInfoList.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ArtifactVersion getVersion(final ModFile mf) {
|
private ArtifactVersion getVersion(final ModFile mf)
|
||||||
|
{
|
||||||
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) {
|
||||||
return mf.getJarVersion();
|
return mf.getJarVersion();
|
||||||
}
|
}
|
||||||
@@ -138,8 +138,9 @@ public class UniqueModListBuilder {
|
|||||||
return modFile.getSecureJar().name();
|
return modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
return modFile.getModFileInfo().getMods().get(0).getModId();
|
return modFile.getModFileInfo().moduleName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -5,53 +5,33 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
|
import net.minecraftforge.forgespi.language.MavenVersionAdapter;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
||||||
import org.apache.maven.artifact.versioning.VersionRange;
|
import org.apache.maven.artifact.versioning.VersionRange;
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
|
|
||||||
@ApiStatus.Internal // since 1.21.1, will be made non-public in a later MC version
|
|
||||||
public class VersionSupportMatrix {
|
public class VersionSupportMatrix {
|
||||||
private static final Map<String, List<ArtifactVersion>> OVERRIDE_VERSIONS;
|
private static final HashMap<String, List<ArtifactVersion>> overrideVersions = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
if ("1.21.1".equals(FMLLoader.versionInfo().mcVersion())) {
|
final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion());
|
||||||
OVERRIDE_VERSIONS = Map.ofEntries(
|
if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) {
|
||||||
// 1.21.1 is compatible with 1.21
|
// 1.19.2 is Compatible with 1.19.1
|
||||||
entry("languageloader.javafml", "51"),
|
add("languageloader.javafml", "42");
|
||||||
entry("mod.minecraft", "1.21"),
|
add("mod.minecraft", "1.19.1");
|
||||||
entry("mod.forge", "51.0.33")
|
add("mod.forge", "42.0.9");
|
||||||
);
|
|
||||||
} else {
|
|
||||||
OVERRIDE_VERSIONS = Collections.emptyMap();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private static void add(String key, String value) {
|
||||||
/**
|
overrideVersions.computeIfAbsent(key, k -> new ArrayList<>()).add(new DefaultArtifactVersion(value));
|
||||||
* @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
|
}
|
||||||
*/
|
public static <T> boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
|
||||||
@Deprecated(forRemoval = true, since = "1.21.1")
|
|
||||||
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
|
|
||||||
if (standardLookup.test(lookupId, declaredRange)) return true;
|
if (standardLookup.test(lookupId, declaredRange)) return true;
|
||||||
return testVersionSupportMatrix(declaredRange, lookupId, type);
|
List<ArtifactVersion> custom = overrideVersions.get(type + "." + lookupId);
|
||||||
}
|
return custom == null ? false : custom.stream().anyMatch(declaredRange::containsVersion);
|
||||||
|
|
||||||
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
|
|
||||||
if (OVERRIDE_VERSIONS.isEmpty()) return false;
|
|
||||||
List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);
|
|
||||||
return custom != null && custom.stream().anyMatch(declaredRange::containsVersion);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, String declaredRange) {
|
|
||||||
return Map.entry(typeAndLookupId, List.of(new DefaultArtifactVersion(declaredRange)));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map.Entry<String, List<ArtifactVersion>> entry(String typeAndLookupId, List<String> declaredRanges) {
|
|
||||||
return Map.entry(typeAndLookupId, declaredRanges.stream().map(DefaultArtifactVersion::new).map(it -> (ArtifactVersion) it).toList());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,10 @@ public class ForgeHighlight {
|
|||||||
LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
|
LOGGER.warn("Failed to invoke initializeTerminal on TCA", e);
|
||||||
}
|
}
|
||||||
if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
|
if (!TerminalConsoleAppender.isAnsiSupported() && Arrays.stream(options).noneMatch(s -> s.equals("disableAnsi=true"))) {
|
||||||
options = new String[] { options[0], "disableAnsi=true" };
|
List<String> optionList = new ArrayList<>();
|
||||||
|
optionList.add(options[0]);
|
||||||
|
optionList.add("disableAnsi=true");
|
||||||
|
options = optionList.toArray(new String[0]);
|
||||||
}
|
}
|
||||||
return HighlightConverter.newInstance(config, options);
|
return HighlightConverter.newInstance(config, options);
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-81
@@ -6,7 +6,6 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.JarMetadata;
|
import cpw.mods.jarhandling.JarMetadata;
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
@@ -19,48 +18,33 @@ import net.minecraftforge.forgespi.locating.IModProvider;
|
|||||||
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
import net.minecraftforge.forgespi.locating.ModFileLoadingException;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.module.InvalidModuleDescriptorException;
|
|
||||||
import java.lang.module.ModuleDescriptor;
|
|
||||||
import java.lang.module.ModuleDescriptor.Version;
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public abstract class AbstractModProvider implements IModProvider {
|
public abstract class AbstractModProvider implements IModProvider {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
protected static final String MODS_TOML = "META-INF/mods.toml";
|
protected static final String MODS_TOML = "META-INF/mods.toml";
|
||||||
protected static final String MODULE_INFO = "module-info.class";
|
|
||||||
|
|
||||||
protected IModLocator.ModFileOrException createMod(Path path) {
|
protected IModLocator.ModFileOrException createMod(Path path) {
|
||||||
return createMod(path, false);
|
return this.createMod(path, getDefaultJarModType());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
protected IModLocator.ModFileOrException createMod(Path path, String defaultType) {
|
||||||
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown) {
|
|
||||||
return createMod(path, ignoreUnknown, getDefaultJarModType());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
|
||||||
var mjm = new ModJarMetadata();
|
var mjm = new ModJarMetadata();
|
||||||
SecureJar sj = null;
|
var sj = SecureJar.from(
|
||||||
try {
|
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
||||||
sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
|
path
|
||||||
} catch (Throwable t) {
|
);
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage()));
|
|
||||||
}
|
|
||||||
|
|
||||||
IModFile mod;
|
IModFile mod;
|
||||||
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
||||||
@@ -70,77 +54,24 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
||||||
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
||||||
// ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
|
if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
mjm.setModFile(mod);
|
|
||||||
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
|
||||||
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
||||||
}
|
}
|
||||||
} else if (type != null) {
|
} else if (type != null) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path);
|
||||||
mod = new ModFile(sj, this, this::manifestParser, type);
|
mod = new ModFile(sj, this, this::manifestParser, type);
|
||||||
} else if (ignoreUnknown) {
|
|
||||||
return null;
|
|
||||||
} else
|
} else
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
|
||||||
|
|
||||||
|
mjm.setModFile(mod);
|
||||||
return new IModLocator.ModFileOrException(mod, null);
|
return new IModLocator.ModFileOrException(mod, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
|
|
||||||
var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
|
|
||||||
if (info != null) {
|
|
||||||
try {
|
|
||||||
var desc = ModuleDescriptor.read(info, jar::getPackages);
|
|
||||||
var all = new HashSet<>(jar.getPackages());
|
|
||||||
all.removeAll(desc.packages());
|
|
||||||
if (!all.isEmpty()) {
|
|
||||||
var missing = all.stream().sorted().collect(Collectors.joining(", "));
|
|
||||||
LOGGER.error("Invalid module-info, missing packages " + missing);
|
|
||||||
throw new ModFileLoadingException("Invalid module-info, missing packages " + missing);
|
|
||||||
} else {
|
|
||||||
return new JarMetadata() {
|
|
||||||
@Override
|
|
||||||
public String name() {
|
|
||||||
return desc.name();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String version() {
|
|
||||||
return desc.version().map(Version::toString).or(desc::rawVersion).orElse(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ModuleDescriptor descriptor() {
|
|
||||||
return desc;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch (InvalidModuleDescriptorException | IOException e) {
|
|
||||||
LOGGER.error("Failed to parse " + jar.getPrimaryPath() + " module-info", e);
|
|
||||||
throw new ModFileLoadingException("Invalid module-info: " + e.getMessage());
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
info.close();
|
|
||||||
} catch (IOException e) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (jar.moduleDataProvider().findFile(MODS_TOML).isEmpty())
|
|
||||||
return JarMetadata.from(jar, jar.getPrimaryPath());
|
|
||||||
|
|
||||||
return mjm;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected IModFileInfo manifestParser(final IModFile mod) {
|
protected IModFileInfo manifestParser(final IModFile mod) {
|
||||||
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
||||||
var license = mf.getValue("LICENSE");
|
var license = mf.getValue("LICENSE");
|
||||||
var dummy = new IConfigurable() {
|
var dummy = new IConfigurable() {
|
||||||
@Override
|
|
||||||
public <T> Optional<T> getConfigElement(String key) {
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(String... key) {
|
public <T> Optional<T> getConfigElement(String... key) {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
@@ -200,11 +131,10 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static final class Holder<T> {
|
private static final class Holder<T> {
|
||||||
private T value;
|
T value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
|
private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable {
|
||||||
@Override public <T> Optional<T> getConfigElement(final String string) { return Optional.empty(); }
|
|
||||||
@Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
|
@Override public <T> Optional<T> getConfigElement(final String... strings) { return Optional.empty(); }
|
||||||
@Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
|
@Override public List<? extends IConfigurable> getConfigList(final String... strings) { return null; }
|
||||||
@Override public List<IModInfo> getMods() { return Collections.emptyList(); }
|
@Override public List<IModInfo> getMods() { return Collections.emptyList(); }
|
||||||
|
|||||||
+5
-6
@@ -29,7 +29,6 @@ public class BackgroundScanHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final boolean DEBUG = LOGGER.isErrorEnabled(LogMarkers.SCAN);
|
|
||||||
private final ExecutorService modContentScanner;
|
private final ExecutorService modContentScanner;
|
||||||
private final List<ModFile> modFiles;
|
private final List<ModFile> modFiles;
|
||||||
private ScanStatus status;
|
private ScanStatus status;
|
||||||
@@ -56,16 +55,16 @@ public class BackgroundScanHandler
|
|||||||
}
|
}
|
||||||
status = ScanStatus.RUNNING;
|
status = ScanStatus.RUNNING;
|
||||||
ImmediateWindowHandler.updateProgress("Scanning mod candidates");
|
ImmediateWindowHandler.updateProgress("Scanning mod candidates");
|
||||||
CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
|
final CompletableFuture<ModFileScanData> future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner)
|
||||||
.whenComplete(file::setScanResult);
|
.whenComplete(file::setScanResult)
|
||||||
if (DEBUG) future = future.whenComplete((r, t) -> addCompletedFile(file, t));
|
.whenComplete((r,t)-> this.addCompletedFile(file,r,t));
|
||||||
file.setFutureScanResult(future);
|
file.setFutureScanResult(future);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addCompletedFile(final ModFile file, final Throwable throwable) {
|
private void addCompletedFile(final ModFile file, final ModFileScanData modFileScanData, final Throwable throwable) {
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
status = ScanStatus.ERRORED;
|
status = ScanStatus.ERRORED;
|
||||||
LOGGER.error(LogMarkers.SCAN, "An error occurred scanning file {}", file, throwable);
|
LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
-5
@@ -18,9 +18,9 @@ import java.io.IOException;
|
|||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.jar.Attributes;
|
import java.util.jar.Attributes;
|
||||||
@@ -28,7 +28,7 @@ import java.util.jar.JarFile;
|
|||||||
import java.util.jar.Manifest;
|
import java.util.jar.Manifest;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ClasspathLocator extends AbstractModProvider implements IModLocator {
|
public class ClasspathLocator extends AbstractModProvider implements IModLocator {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
|
private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType");
|
||||||
|
|
||||||
@@ -80,11 +80,11 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<URL> getUrls(ClassLoader cl, String resource) {
|
private List<URL> getUrls(ClassLoader cl, String resource) {
|
||||||
try {
|
try {
|
||||||
var lst = Collections.list(cl.getResources(resource));
|
var lst = Collections.list(cl.getResources(resource));
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) {
|
||||||
lst.sort(Comparator.comparing(URL::toString));
|
Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString()));
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
|
LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource);
|
||||||
for (var url : lst)
|
for (var url : lst)
|
||||||
LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
|
LOGGER.debug(LogMarkers.SCAN, "\t{}", url);
|
||||||
@@ -104,7 +104,8 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
|
|||||||
len += 2;
|
len += 2;
|
||||||
}
|
}
|
||||||
str = str.substring(0, str.length() - len);
|
str = str.substring(0, str.length() - len);
|
||||||
return Path.of(URI.create(str));
|
var path = Paths.get(URI.create(str));
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Path getPathFromResource(ClassLoader cl, String resource) {
|
private static Path getPathFromResource(ClassLoader cl, String resource) {
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import java.nio.file.Path;
|
|||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class CoreModFile implements ICoreModFile {
|
public class CoreModFile implements ICoreModFile {
|
||||||
private final Path internalPath;
|
private final Path internalPath;
|
||||||
private final ModFile file;
|
private final ModFile file;
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|||||||
+10
-10
@@ -6,6 +6,7 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException;
|
import net.minecraftforge.fml.loading.EarlyLoadingException;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
@@ -25,7 +26,6 @@ import java.nio.file.FileSystem;
|
|||||||
import java.nio.file.FileSystems;
|
import java.nio.file.FileSystems;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -51,7 +51,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
|
public List<IModFile> scanMods(Iterable<IModFile> loadedMods) {
|
||||||
final List<IModFile> sources = new ArrayList<>();
|
final List<IModFile> sources = Lists.newArrayList();
|
||||||
loadedMods.forEach(sources::add);
|
loadedMods.forEach(sources::add);
|
||||||
|
|
||||||
var dependenciesToLoad = JarSelector.detectAndSelect(
|
var dependenciesToLoad = JarSelector.detectAndSelect(
|
||||||
@@ -90,7 +90,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
|
|||||||
} else {
|
} else {
|
||||||
modType = IModFile.Type.GAMELIBRARY.name();
|
modType = IModFile.Type.GAMELIBRARY.name();
|
||||||
}
|
}
|
||||||
return Optional.of(createMod(pathInFS, false, modType).file());
|
return Optional.of(createMod(pathInFS, modType).file());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
|
LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
|
||||||
final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
|
final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName());
|
||||||
@@ -102,34 +102,34 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
|
|||||||
protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) {
|
protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies) {
|
||||||
final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
|
final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
|
||||||
.filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
|
.filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
|
||||||
.map(JarInJarDependencyLocator::buildExceptionData)
|
.map(this::buildExceptionData)
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
|
return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private static EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
|
private EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation<IModFile> entry) {
|
||||||
return new EarlyLoadingException.ExceptionData(
|
return new EarlyLoadingException.ExceptionData(
|
||||||
getErrorTranslationKey(entry),
|
getErrorTranslationKey(entry),
|
||||||
entry.identifier().group() + ":" + entry.identifier().artifact(),
|
entry.identifier().group() + ":" + entry.identifier().artifact(),
|
||||||
entry.sources()
|
entry.sources()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap(JarInJarDependencyLocator::getModWithVersionRangeStream)
|
.flatMap(this::getModWithVersionRangeStream)
|
||||||
.map(JarInJarDependencyLocator::formatError)
|
.map(this::formatError)
|
||||||
.collect(Collectors.joining(", "))
|
.collect(Collectors.joining(", "))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private static String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
|
private String getErrorTranslationKey(JarSelector.ResolutionFailureInformation<IModFile> entry) {
|
||||||
return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
|
return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
|
||||||
"fml.dependencyloading.conflictingdependencies" :
|
"fml.dependencyloading.conflictingdependencies" :
|
||||||
"fml.dependencyloading.mismatchedcontaineddependencies";
|
"fml.dependencyloading.mismatchedcontaineddependencies";
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private static Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
|
private Stream<ModWithVersionRange> getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange<IModFile> file) {
|
||||||
return file.sources()
|
return file.sources()
|
||||||
.stream()
|
.stream()
|
||||||
.map(IModFile::getModFileInfo)
|
.map(IModFile::getModFileInfo)
|
||||||
@@ -152,7 +152,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private static String formatError(ModWithVersionRange modWithVersionRange){
|
private String formatError(ModWithVersionRange modWithVersionRange){
|
||||||
return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
|
return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " +
|
||||||
RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
|
RED + modWithVersionRange.versionRange().toString() + RESET + " - " +
|
||||||
GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
|
GREEN + modWithVersionRange.artifactVersion().toString() + RESET;
|
||||||
|
|||||||
+8
-6
@@ -18,22 +18,24 @@ import java.util.List;
|
|||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class MinecraftLocator extends AbstractModProvider implements IModLocator {
|
public class MinecraftLocator extends AbstractModProvider implements IModLocator {
|
||||||
@Override
|
@Override
|
||||||
public List<IModLocator.ModFileOrException> scanMods() {
|
public List<IModLocator.ModFileOrException> scanMods() {
|
||||||
var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
|
var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
|
||||||
var paths = minecraft.toArray(Path[]::new);
|
|
||||||
|
|
||||||
// Minecraft itself.
|
// Minecraft itself.
|
||||||
var meta = new ModJarMetadata();
|
var meta = new ModJarMetadata();
|
||||||
var mcjar = SecureJar.from(jar -> meta, paths);
|
var mcjar = SecureJar.from(
|
||||||
var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
|
jar -> meta,
|
||||||
|
minecraft.toArray(Path[]::new)
|
||||||
|
);
|
||||||
|
var mc = ModFileFactory.FACTORY.build(mcjar, this, this::buildMinecraftTOML);
|
||||||
meta.setModFile(mc);
|
meta.setModFile(mc);
|
||||||
|
|
||||||
return List.of(new ModFileOrException(mc, null));
|
return List.of(new ModFileOrException(mc, null));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
|
private IModFileInfo buildMinecraftTOML(final IModFile iModFile) {
|
||||||
// We haven't changed this in years, and I can't be asked right now to special case this one file in the path.
|
// We haven't changed this in years, and I can't be asked right now to special case this one file in the path.
|
||||||
final var conf = Config.inMemory();
|
final var conf = Config.inMemory();
|
||||||
conf.set("modLoader", "minecraft");
|
conf.set("modLoader", "minecraft");
|
||||||
@@ -50,7 +52,7 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
|
|||||||
conf.set("mods", List.of(mods));
|
conf.set("mods", List.of(mods));
|
||||||
|
|
||||||
var configWrapper = new NightConfigWrapper(conf);
|
var configWrapper = new NightConfigWrapper(conf);
|
||||||
return new ModFileInfo((ModFile) iModFile, configWrapper, configWrapper::setFile);
|
return new ModFileInfo((ModFile)iModFile, configWrapper, configWrapper::setFile, List.of());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+12
-14
@@ -6,6 +6,7 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.google.common.collect.Maps;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.Launcher;
|
import cpw.mods.modlauncher.Launcher;
|
||||||
import cpw.mods.modlauncher.api.IModuleLayerManager;
|
import cpw.mods.modlauncher.api.IModuleLayerManager;
|
||||||
@@ -27,7 +28,6 @@ import org.jetbrains.annotations.ApiStatus;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.EnumMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -49,26 +49,23 @@ public class ModDiscoverer {
|
|||||||
modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
|
modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
|
||||||
dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
|
dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
|
||||||
modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
|
modLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> modLocators, sce->LOGGER.error("Failed to load mod locator list", sce)).collect(Collectors.toList());
|
||||||
for (IModLocator iModLocator : modLocatorList) {
|
modLocatorList.forEach(l->l.initArguments(arguments));
|
||||||
iModLocator.initArguments(arguments);
|
|
||||||
}
|
|
||||||
dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
|
dependencyLocatorList = ServiceLoaderUtils.streamServiceLoader(()-> dependencyLocators, sce->LOGGER.error("Failed to load dependency locator list", sce)).collect(Collectors.toList());
|
||||||
for (IDependencyLocator l : dependencyLocatorList) {
|
dependencyLocatorList.forEach(l->l.initArguments(arguments));
|
||||||
l.initArguments(arguments);
|
|
||||||
}
|
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.CORE))
|
if (LOGGER.isDebugEnabled(LogMarkers.CORE))
|
||||||
{
|
{
|
||||||
LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
|
LOGGER.debug(LogMarkers.CORE, "Found Mod Locators : {}", modLocatorList.stream()
|
||||||
.map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
|
.map(modLocator -> "(%s:%s)".formatted(modLocator.name(),
|
||||||
modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
|
modLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
|
||||||
|
}
|
||||||
|
if (LOGGER.isDebugEnabled(LogMarkers.CORE))
|
||||||
|
{
|
||||||
LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
|
LOGGER.debug(LogMarkers.CORE, "Found Dependency Locators : {}", dependencyLocatorList.stream()
|
||||||
.map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
|
.map(dependencyLocator -> "(%s:%s)".formatted(dependencyLocator.name(),
|
||||||
dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
|
dependencyLocator.getClass().getPackage().getImplementationVersion())).collect(Collectors.joining(",")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
public ModValidator discoverMods() {
|
public ModValidator discoverMods() {
|
||||||
LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
|
LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
|
||||||
List<ModFile> loadedFiles = new ArrayList<>();
|
List<ModFile> loadedFiles = new ArrayList<>();
|
||||||
@@ -129,7 +126,7 @@ public class ModDiscoverer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
|
//First processing run of the mod list. Any duplicates will cause resolution failure and dependency loading will be skipped.
|
||||||
Map<IModFile.Type, List<ModFile>> modFilesMap = new EnumMap<>(IModFile.Type.class);
|
Map<IModFile.Type, List<ModFile>> modFilesMap = Maps.newHashMap();
|
||||||
try {
|
try {
|
||||||
final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
|
final UniqueModListBuilder modsUniqueListBuilder = new UniqueModListBuilder(loadedFiles);
|
||||||
final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
|
final UniqueModListBuilder.UniqueModListData uniqueModsData = modsUniqueListBuilder.buildUniqueList();
|
||||||
@@ -137,7 +134,7 @@ public class ModDiscoverer {
|
|||||||
//Grab the temporary results.
|
//Grab the temporary results.
|
||||||
//This allows loading to continue to a base state, in case dependency loading fails.
|
//This allows loading to continue to a base state, in case dependency loading fails.
|
||||||
modFilesMap = uniqueModsData.modFiles().stream()
|
modFilesMap = uniqueModsData.modFiles().stream()
|
||||||
.collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
|
.collect(Collectors.groupingBy(IModFile::getType));
|
||||||
loadedFiles = uniqueModsData.modFiles();
|
loadedFiles = uniqueModsData.modFiles();
|
||||||
}
|
}
|
||||||
catch (EarlyLoadingException exception) {
|
catch (EarlyLoadingException exception) {
|
||||||
@@ -174,11 +171,11 @@ public class ModDiscoverer {
|
|||||||
|
|
||||||
//We now only need the mod files map, not the list.
|
//We now only need the mod files map, not the list.
|
||||||
modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
|
modFilesMap = uniqueModsAndDependenciesData.modFiles().stream()
|
||||||
.collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
|
.collect(Collectors.groupingBy(IModFile::getType));
|
||||||
} catch (EarlyLoadingException exception) {
|
} catch (EarlyLoadingException exception) {
|
||||||
LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception);
|
LOGGER.error(LogMarkers.SCAN, "Failed to build unique mod list after dependency discovery.", exception);
|
||||||
discoveryErrorData.addAll(exception.getAllData());
|
discoveryErrorData.addAll(exception.getAllData());
|
||||||
modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType, () -> new EnumMap<>(IModFile.Type.class), Collectors.toList()));
|
modFilesMap = loadedFiles.stream().collect(Collectors.groupingBy(IModFile::getType));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -193,7 +190,8 @@ public class ModDiscoverer {
|
|||||||
return validator;
|
return validator;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles) {
|
private void handleLocatedFiles(final List<ModFile> loadedFiles, final List<IModFile> locatedFiles)
|
||||||
|
{
|
||||||
var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
|
var locatedModFiles = locatedFiles.stream().filter(ModFile.class::isInstance).map(ModFile.class::cast).toList();
|
||||||
for (IModFile mf : locatedModFiles) {
|
for (IModFile mf : locatedModFiles) {
|
||||||
LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
|
LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider());
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ public class ModFile implements IModFile {
|
|||||||
private Throwable scanError;
|
private Throwable scanError;
|
||||||
private final SecureJar jar;
|
private final SecureJar jar;
|
||||||
private final Type modFileType;
|
private final Type modFileType;
|
||||||
|
private final Manifest manifest;
|
||||||
private final IModProvider provider;
|
private final IModProvider provider;
|
||||||
private IModFileInfo modFileInfo;
|
private IModFileInfo modFileInfo;
|
||||||
private ModFileScanData fileModFileScanData;
|
private ModFileScanData fileModFileScanData;
|
||||||
@@ -64,7 +65,7 @@ public class ModFile implements IModFile {
|
|||||||
this.jar = jar;
|
this.jar = jar;
|
||||||
this.parser = parser;
|
this.parser = parser;
|
||||||
|
|
||||||
var manifest = this.jar.moduleDataProvider().getManifest();
|
manifest = this.jar.moduleDataProvider().getManifest();
|
||||||
modFileType = Type.valueOf(type);
|
modFileType = Type.valueOf(type);
|
||||||
jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
|
jarVersion = Optional.ofNullable(manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)).orElse("0.0NONE");
|
||||||
this.modFileInfo = ModFileParser.readModList(this, this.parser);
|
this.modFileInfo = ModFileParser.readModList(this, this.parser);
|
||||||
|
|||||||
+75
-93
@@ -7,6 +7,8 @@ package net.minecraftforge.fml.loading.moddiscovery;
|
|||||||
|
|
||||||
import com.google.common.base.Strings;
|
import com.google.common.base.Strings;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||||
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
import net.minecraftforge.fml.loading.StringUtils;
|
import net.minecraftforge.fml.loading.StringUtils;
|
||||||
import net.minecraftforge.forgespi.language.IConfigurable;
|
import net.minecraftforge.forgespi.language.IConfigurable;
|
||||||
@@ -17,15 +19,17 @@ import org.jetbrains.annotations.ApiStatus;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import javax.security.auth.x500.X500Principal;
|
import javax.security.auth.x500.X500Principal;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.security.CodeSigner;
|
||||||
import java.security.InvalidKeyException;
|
import java.security.InvalidKeyException;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.security.NoSuchProviderException;
|
import java.security.NoSuchProviderException;
|
||||||
import java.security.SignatureException;
|
import java.security.SignatureException;
|
||||||
import java.security.cert.CertificateEncodingException;
|
import java.security.cert.Certificate;
|
||||||
import java.security.cert.CertificateException;
|
import java.security.cert.CertificateException;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -34,8 +38,10 @@ import java.util.Objects;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
public class ModFileInfo implements IModFileInfo, IConfigurable {
|
public class ModFileInfo implements IModFileInfo, IConfigurable
|
||||||
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final String MAYBE_NOT_JAVAFML_VER = "[2,)";
|
private static final String MAYBE_NOT_JAVAFML_VER = "[2,)";
|
||||||
private static final String JAVAFML = "javafml";
|
private static final String JAVAFML = "javafml";
|
||||||
@@ -43,6 +49,9 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public static final String NOT_A_FORGE_MOD_PROP = "__FORGE__not_a_forge_mod";
|
public static final String NOT_A_FORGE_MOD_PROP = "__FORGE__not_a_forge_mod";
|
||||||
|
|
||||||
|
@ApiStatus.Internal
|
||||||
|
public static final boolean DETECT_NON_FORGE_MODS_TOML = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.DETECT_NON_FORGE_MODS_TOML);
|
||||||
|
|
||||||
private final IConfigurable config;
|
private final IConfigurable config;
|
||||||
private final ModFile modFile;
|
private final ModFile modFile;
|
||||||
private final URL issueURL;
|
private final URL issueURL;
|
||||||
@@ -55,7 +64,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
private final String license;
|
private final String license;
|
||||||
private final List<String> usesServices;
|
private final List<String> usesServices;
|
||||||
|
|
||||||
ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer) {
|
ModFileInfo(final ModFile modFile, final IConfigurable config, Consumer<IModFileInfo> configFileConsumer)
|
||||||
|
{
|
||||||
this.modFile = modFile;
|
this.modFile = modFile;
|
||||||
this.config = config;
|
this.config = config;
|
||||||
configFileConsumer.accept(this);
|
configFileConsumer.accept(this);
|
||||||
@@ -69,7 +79,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
|
this.languageSpecs = new ArrayList<>(List.of(new LanguageSpec(modLoader, modLoaderVersion)));
|
||||||
|
|
||||||
// if true, this might not be a Forge mod
|
// if true, this might not be a Forge mod
|
||||||
boolean maybeNotAForgeMod = modLoader.equals(JAVAFML)
|
boolean maybeNotAForgeMod = DETECT_NON_FORGE_MODS_TOML
|
||||||
|
&& modLoader.equals(JAVAFML)
|
||||||
&& modLoaderVersion.hasRestrictions() // if loaderVersion is not "*"
|
&& modLoaderVersion.hasRestrictions() // if loaderVersion is not "*"
|
||||||
&& modLoaderVerStr.equals(MAYBE_NOT_JAVAFML_VER); // if loaderVersion is exactly "[2,)"
|
&& modLoaderVerStr.equals(MAYBE_NOT_JAVAFML_VER); // if loaderVersion is exactly "[2,)"
|
||||||
|
|
||||||
@@ -80,6 +91,10 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
.orElse(false);
|
.orElse(false);
|
||||||
this.clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
|
this.clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly")
|
||||||
.orElse(false);
|
.orElse(false);
|
||||||
|
if (this.clientSideOnly) {
|
||||||
|
// if clientSideOnly, then this is definitely a Forge mod
|
||||||
|
maybeNotAForgeMod = false;
|
||||||
|
}
|
||||||
this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
|
this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
|
||||||
.orElse(false);
|
.orElse(false);
|
||||||
this.usesServices = config.<List<String>>getConfigElement("services")
|
this.usesServices = config.<List<String>>getConfigElement("services")
|
||||||
@@ -88,10 +103,6 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
.map(StringUtils::toURL)
|
.map(StringUtils::toURL)
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
||||||
// if clientSideOnly, then this is definitely a Forge mod
|
|
||||||
if (this.clientSideOnly)
|
|
||||||
maybeNotAForgeMod = false;
|
|
||||||
|
|
||||||
if (maybeNotAForgeMod) {
|
if (maybeNotAForgeMod) {
|
||||||
// mark this file as not a Forge mod. Note: this marker may be removed later based on the mod dependencies
|
// mark this file as not a Forge mod. Note: this marker may be removed later based on the mod dependencies
|
||||||
this.properties = config.<Map<String, Object>>getConfigElement("properties")
|
this.properties = config.<Map<String, Object>>getConfigElement("properties")
|
||||||
@@ -104,14 +115,15 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
this.modFile.setFileProperties(this.properties);
|
this.modFile.setFileProperties(this.properties);
|
||||||
|
|
||||||
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
|
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
|
||||||
if (modConfigs == null || modConfigs.isEmpty())
|
if (modConfigs.isEmpty())
|
||||||
|
{
|
||||||
throw new InvalidModFileException("Missing mods list", this);
|
throw new InvalidModFileException("Missing mods list", this);
|
||||||
|
}
|
||||||
this.mods = modConfigs.stream()
|
this.mods = modConfigs.stream()
|
||||||
.map(mi -> (IModInfo) ModInfo.of(this, mi))
|
.map(mi-> (IModInfo)new ModInfo(this, mi))
|
||||||
.toList();
|
.toList();
|
||||||
|
if (LOGGER.isDebugEnabled(LogMarkers.LOADING))
|
||||||
if (LOGGER.isDebugEnabled(LogMarkers.LOADING)) {
|
{
|
||||||
LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
|
LOGGER.debug(LogMarkers.LOADING, "Found valid mod file {} with {} mods - versions {}",
|
||||||
this.modFile.getFileName(),
|
this.modFile.getFileName(),
|
||||||
this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
|
this.mods.stream().map(IModInfo::getModId).collect(Collectors.joining(",", "{", "}")),
|
||||||
@@ -125,11 +137,13 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<IModInfo> getMods() {
|
public List<IModInfo> getMods()
|
||||||
|
{
|
||||||
return mods;
|
return mods;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModFile getFile() {
|
public ModFile getFile()
|
||||||
|
{
|
||||||
return this.modFile;
|
return this.modFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,42 +153,44 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> getFileProperties() {
|
public Map<String, Object> getFileProperties()
|
||||||
|
{
|
||||||
return this.properties;
|
return this.properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean showAsResourcePack() {
|
public boolean showAsResourcePack()
|
||||||
|
{
|
||||||
return this.showAsResourcePack;
|
return this.showAsResourcePack;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isClientSideOnly() {
|
public boolean isClientSideOnly()
|
||||||
|
{
|
||||||
return this.clientSideOnly;
|
return this.clientSideOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean showAsDataPack() {
|
public boolean showAsDataPack()
|
||||||
|
{
|
||||||
return this.showAsDataPack;
|
return this.showAsDataPack;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(final String key) {
|
public <T> Optional<T> getConfigElement(final String... key)
|
||||||
|
{
|
||||||
return this.config.getConfigElement(key);
|
return this.config.getConfigElement(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(final String... key) {
|
public List<? extends IConfigurable> getConfigList(final String... key)
|
||||||
return this.config.getConfigElement(key);
|
{
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<? extends IConfigurable> getConfigList(final String... key) {
|
|
||||||
return this.config.getConfigList(key);
|
return this.config.getConfigList(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getLicense() {
|
public String getLicense()
|
||||||
|
{
|
||||||
return license;
|
return license;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,83 +199,54 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public URL getIssueURL() {
|
public URL getIssueURL()
|
||||||
|
{
|
||||||
return issueURL;
|
return issueURL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean missingLicense() {
|
public boolean missingLicense()
|
||||||
|
{
|
||||||
return Strings.isNullOrEmpty(license);
|
return Strings.isNullOrEmpty(license);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final char[] HEX = "0123456789ABCDEF".toCharArray();
|
|
||||||
public Optional<String> getCodeSigningFingerprint() {
|
public Optional<String> getCodeSigningFingerprint() {
|
||||||
var signers = this.modFile.getSecureJar().getManifestSigners();
|
var signers = this.modFile.getSecureJar().getManifestSigners();
|
||||||
if (signers == null)
|
return (signers == null ? Stream.<CodeSigner>of() : Arrays.stream(signers))
|
||||||
return Optional.empty();
|
.flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
|
||||||
|
.findFirst()
|
||||||
for (var signer : signers) {
|
.map(LamdbaExceptionUtils.rethrowFunction(Certificate::getEncoded))
|
||||||
for (var cert : signer.getSignerCertPath().getCertificates()) {
|
.map(bytes->LamdbaExceptionUtils.uncheck(()->MessageDigest.getInstance("SHA-256")).digest(bytes))
|
||||||
try {
|
.map(StringUtils::binToHex)
|
||||||
var encoded = cert.getEncoded();
|
.map(str-> String.join(":", str.split("(?<=\\G.{2})")));
|
||||||
var sha256 = MessageDigest.getInstance("SHA-256");
|
|
||||||
var digest = sha256.digest(encoded);
|
|
||||||
var buf = new StringBuilder(digest.length * 3);
|
|
||||||
for (int x = 0; x < digest.length - 1; x++) {
|
|
||||||
buf.append(HEX[(digest[x] & 0xF0) >> 4]);
|
|
||||||
buf.append(HEX[(digest[x] & 0x0F) ]);
|
|
||||||
buf.append(':');
|
|
||||||
}
|
|
||||||
buf.append(HEX[(digest[digest.length - 1] & 0xF0) >> 4]);
|
|
||||||
buf.append(HEX[(digest[digest.length - 1] & 0x0F) ]);
|
|
||||||
|
|
||||||
// We only care about the first. Should we list them all?
|
|
||||||
return Optional.of(buf.toString());
|
|
||||||
} catch (CertificateEncodingException | NoSuchAlgorithmException e) {
|
|
||||||
sneak(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<String> getTrustData() {
|
public Optional<String> getTrustData() {
|
||||||
var signers = this.modFile.getSecureJar().getManifestSigners();
|
return Arrays.stream(this.modFile.getSecureJar().getManifestSigners())
|
||||||
if (signers == null)
|
.flatMap(csa->csa.getSignerCertPath().getCertificates().stream())
|
||||||
return Optional.empty();
|
.findFirst()
|
||||||
|
.map(X509Certificate.class::cast)
|
||||||
for (var signer : signers) {
|
.map(c->{
|
||||||
for (var cert : signer.getSignerCertPath().getCertificates()) {
|
StringBuffer sb = new StringBuffer();
|
||||||
if (!(cert instanceof X509Certificate x509))
|
sb.append(c.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
|
||||||
continue;
|
boolean selfSigned = false;
|
||||||
|
try {
|
||||||
var sb = new StringBuilder();
|
c.verify(c.getPublicKey());
|
||||||
sb.append(x509.getSubjectX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
|
selfSigned = true;
|
||||||
|
} catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
|
||||||
var selfSigned = false;
|
// not self signed
|
||||||
try {
|
}
|
||||||
x509.verify(x509.getPublicKey());
|
if (selfSigned) {
|
||||||
selfSigned = true;
|
|
||||||
} catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | SignatureException | NoSuchProviderException e) {
|
|
||||||
// not self signed
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selfSigned)
|
|
||||||
sb.append(" self-signed");
|
sb.append(" self-signed");
|
||||||
else
|
} else {
|
||||||
sb.append(" signed by ").append(x509.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
|
sb.append(" signed by ").append(c.getIssuerX500Principal().getName(X500Principal.RFC2253).split(",")[0]);
|
||||||
|
};
|
||||||
return Optional.of(sb.toString());
|
return sb.toString();
|
||||||
}
|
});
|
||||||
}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String moduleName() {
|
public String moduleName() {
|
||||||
return this.modFile.getSecureJar().name();
|
return getMods().get(0).getModId();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -271,9 +258,4 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
public List<String> usesServices() {
|
public List<String> usesServices() {
|
||||||
return usesServices;
|
return usesServices;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
|
||||||
throw (E)e;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+199
-154
@@ -19,189 +19,202 @@ import org.jetbrains.annotations.ApiStatus;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.function.Supplier;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public record ModInfo(
|
public class ModInfo implements IModInfo, IConfigurable {
|
||||||
ModFileInfo getOwningFile,
|
|
||||||
IConfigurable getConfig,
|
|
||||||
|
|
||||||
String getModId,
|
|
||||||
String getNamespace,
|
|
||||||
ArtifactVersion getVersion,
|
|
||||||
|
|
||||||
String getDisplayName,
|
|
||||||
String getDescription,
|
|
||||||
Optional<String> getLogoFile,
|
|
||||||
boolean getLogoBlur,
|
|
||||||
Optional<URL> getUpdateURL,
|
|
||||||
Optional<URL> getModURL,
|
|
||||||
|
|
||||||
Holder<List<? extends ModVersion>> dependencies,
|
|
||||||
Holder<List<ForgeFeature.Bound>> forgeFeatures,
|
|
||||||
Map<String, Object> getModProperties
|
|
||||||
) implements IModInfo, IConfigurable {
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
|
private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1");
|
||||||
private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
|
private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$");
|
||||||
private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");
|
private static final Pattern VALID_NAMESPACE = Pattern.compile("^[a-z][a-z0-9_.-]{1,63}$");
|
||||||
private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*");
|
private static final Pattern VALID_VERSION = Pattern.compile("^\\d+.*");
|
||||||
|
|
||||||
public static ModInfo of(ModFileInfo owningFile, IConfigurable config) {
|
private final ModFileInfo owningFile;
|
||||||
|
private final String modId;
|
||||||
|
private final String namespace;
|
||||||
|
private final ArtifactVersion version;
|
||||||
|
private final String displayName;
|
||||||
|
private final String description;
|
||||||
|
private final Optional<String> logoFile;
|
||||||
|
private final boolean logoBlur;
|
||||||
|
private final Optional<URL> updateJSONURL;
|
||||||
|
private final List<? extends IModInfo.ModVersion> dependencies;
|
||||||
|
|
||||||
|
private final List<ForgeFeature.Bound> features;
|
||||||
|
private final Map<String,Object> properties;
|
||||||
|
private final IConfigurable config;
|
||||||
|
private final Optional<URL> modUrl;
|
||||||
|
|
||||||
|
public ModInfo(final ModFileInfo owningFile, final IConfigurable config)
|
||||||
|
{
|
||||||
|
Optional<ModFileInfo> ownFile = Optional.ofNullable(owningFile);
|
||||||
|
this.owningFile = owningFile;
|
||||||
|
this.config = config;
|
||||||
// These are sourced from the mod specific [[mod]] entry
|
// These are sourced from the mod specific [[mod]] entry
|
||||||
String modId = config.<String>getConfigElement("modId").orElse(null);
|
this.modId = config.<String>getConfigElement("modId")
|
||||||
if (modId == null)
|
.orElseThrow(() -> new InvalidModFileException("Missing modId", owningFile));
|
||||||
throw new InvalidModFileException("Missing modId", owningFile);
|
|
||||||
|
|
||||||
// verify we have a valid modid
|
// verify we have a valid modid
|
||||||
if (!VALID_MODID.matcher(modId).matches()) {
|
if (!VALID_MODID.matcher(this.modId).matches()) {
|
||||||
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), modId, VALID_MODID.pattern());
|
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid modId found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.modId, VALID_MODID.pattern());
|
||||||
throw new InvalidModFileException("Invalid modId found : " + modId, owningFile);
|
throw new InvalidModFileException("Invalid modId found : " + this.modId, owningFile);
|
||||||
}
|
}
|
||||||
|
this.namespace = config.<String>getConfigElement("namespace")
|
||||||
String namespace = config.<String>getConfigElement("namespace")
|
.orElse(this.modId);
|
||||||
.orElse(modId);
|
|
||||||
|
|
||||||
// verify our namespace is valid
|
// verify our namespace is valid
|
||||||
if (!VALID_NAMESPACE.matcher(namespace).matches()) {
|
if (!VALID_NAMESPACE.matcher(this.namespace).matches()) {
|
||||||
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", owningFile.getFile().getFilePath(), namespace, VALID_NAMESPACE.pattern());
|
LOGGER.error(LogUtils.FATAL_MARKER, "Invalid override namespace found in file {} - {} does not match the standard: {}", this.owningFile.getFile().getFilePath(), this.namespace, VALID_NAMESPACE.pattern());
|
||||||
throw new InvalidModFileException("Invalid override namespace found : " + namespace, owningFile);
|
throw new InvalidModFileException("Invalid override namespace found : " + this.namespace, owningFile);
|
||||||
}
|
}
|
||||||
|
this.version = config.<String>getConfigElement("version")
|
||||||
ArtifactVersion version = config.<String>getConfigElement("version")
|
.map(s -> StringSubstitutor.replace(s, ownFile.map(ModFileInfo::getFile).orElse(null)))
|
||||||
.map(s -> StringSubstitutor.replace(s, owningFile.getFile()))
|
|
||||||
.map(DefaultArtifactVersion::new)
|
.map(DefaultArtifactVersion::new)
|
||||||
.orElse(DEFAULT_VERSION);
|
.orElse(DEFAULT_VERSION);
|
||||||
|
|
||||||
// verify we have a valid mod version
|
// verify we have a valid mod version
|
||||||
if (!VALID_VERSION.matcher(version.toString()).matches())
|
if (!VALID_VERSION.matcher(this.version.toString()).matches()) {
|
||||||
throw new InvalidModFileException("Illegal version number specified " + version, owningFile);
|
throw new InvalidModFileException("Illegal version number specified "+this.version, this.getOwningFile());
|
||||||
|
}
|
||||||
// The remaining properties all default to sensible values and are not essential
|
// The remaining properties all default to sensible values and are not essential
|
||||||
String displayName = config.<String>getConfigElement("displayName")
|
this.displayName = config.<String>getConfigElement("displayName")
|
||||||
.orElse(modId);
|
.orElse(this.modId);
|
||||||
|
this.description = config.<String>getConfigElement("description")
|
||||||
String description = config.<String>getConfigElement("description")
|
|
||||||
.orElse("MISSING DESCRIPTION")
|
.orElse("MISSING DESCRIPTION")
|
||||||
.replace("\r\n", "\n").stripIndent();
|
.replace("\r\n", "\n").stripIndent();
|
||||||
|
this.logoFile = Optional.ofNullable(config.<String>getConfigElement("logoFile")
|
||||||
Optional<String> logoFile = Optional.ofNullable(
|
.orElseGet(() -> ownFile.flatMap(mf -> mf.<String>getConfigElement("logoFile"))
|
||||||
config.<String>getConfigElement("logoFile")
|
.orElse(null)));
|
||||||
.orElseGet(() -> owningFile.<String>getConfigElement("logoFile").orElse(null))
|
this.logoBlur = config.<Boolean>getConfigElement("logoBlur")
|
||||||
);
|
.orElseGet(() -> ownFile.flatMap(f -> f.<Boolean>getConfigElement("logoBlur"))
|
||||||
|
.orElse(true));
|
||||||
Boolean logoBlur = config.<Boolean>getConfigElement("logoBlur").orElse(null);
|
this.updateJSONURL = config.<String>getConfigElement("updateJSONURL")
|
||||||
if (logoBlur == null)
|
|
||||||
logoBlur = owningFile.<Boolean>getConfigElement("logoBlur").orElse(true);
|
|
||||||
|
|
||||||
Optional<URL> updateJSONURL = config.<String>getConfigElement("updateJSONURL")
|
|
||||||
.map(StringUtils::toURL);
|
.map(StringUtils::toURL);
|
||||||
|
this.modUrl = config.<String>getConfigElement("modUrl")
|
||||||
Optional<URL> modUrl = config.<String>getConfigElement("modUrl")
|
|
||||||
.map(StringUtils::toURL);
|
.map(StringUtils::toURL);
|
||||||
|
// These are sourced from the file rather than the mod-specific block, but with a modid tag
|
||||||
// dependencies and features are done after the constructor as they need to reference the ModInfo we are creating
|
this.dependencies = ownFile.map(mfi -> mfi.getConfigList("dependencies", this.modId))
|
||||||
List<? extends ModVersion> dependencies = Collections.emptyList();
|
.orElse(Collections.emptyList())
|
||||||
List<ForgeFeature.Bound> forgeFeatures = Collections.emptyList();
|
.stream()
|
||||||
|
.map(dep -> new ModVersion(this, dep))
|
||||||
Map<String, Object> modProperties = owningFile.<Map<String, Object>>getConfigElement("modproperties", modId)
|
.toList();
|
||||||
.map(Collections::unmodifiableMap)
|
this.features = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("features", this.modId))
|
||||||
|
.stream()
|
||||||
|
.flatMap(m->m.entrySet().stream())
|
||||||
|
.map(this::makeBound)
|
||||||
|
.toList();
|
||||||
|
this.properties = ownFile.flatMap(mfi -> mfi.<Map<String, Object>>getConfigElement("modproperties", this.modId))
|
||||||
.orElse(Collections.emptyMap());
|
.orElse(Collections.emptyMap());
|
||||||
|
|
||||||
return new ModInfo(
|
|
||||||
owningFile, config,
|
|
||||||
modId, namespace, version,
|
|
||||||
displayName, description, logoFile, logoBlur, updateJSONURL, modUrl,
|
|
||||||
new Holder<>(dependencies), new Holder<>(forgeFeatures), modProperties
|
|
||||||
).setupDependencies().setupForgeFeatures();
|
|
||||||
}
|
|
||||||
|
|
||||||
private ModInfo setupDependencies() {
|
|
||||||
var deps = getOwningFile.getConfigList("dependencies", getModId);
|
|
||||||
if (deps == null || deps.isEmpty()) {
|
|
||||||
dependencies.value = Collections.emptyList();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
var tmp = new ModVersion[deps.size()];
|
|
||||||
for (int i = 0; i < deps.size(); i++) {
|
|
||||||
tmp[i] = ModVersion.of(this, deps.get(i));
|
|
||||||
}
|
|
||||||
dependencies.value = List.of(tmp);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ModInfo setupForgeFeatures() {
|
|
||||||
var feats = getOwningFile.<Map<String, Object>>getConfigElement("features", getModId).orElse(null);
|
|
||||||
if (feats == null) {
|
|
||||||
forgeFeatures.value = Collections.emptyList();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
var tmp = new ArrayList<ForgeFeature.Bound>();
|
|
||||||
for (var entry : feats.entrySet()) {
|
|
||||||
if (!(entry.getValue() instanceof String val))
|
|
||||||
throw new InvalidModFileException("Invalid feature bound {" + entry.getValue() + "} for key {" + entry.getKey() + "} only strings are accepted", getOwningFile);
|
|
||||||
tmp.add(new ForgeFeature.Bound(entry.getKey(), val, this));
|
|
||||||
}
|
|
||||||
forgeFeatures.value = List.copyOf(tmp);
|
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(String key) {
|
public ModFileInfo getOwningFile() {
|
||||||
return getConfig.getConfigElement(key);
|
return owningFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(String... key) {
|
public String getModId() {
|
||||||
return getConfig.getConfigElement(key);
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<? extends IConfigurable> getConfigList(String... key) {
|
public String getDisplayName()
|
||||||
return null;
|
{
|
||||||
|
return this.displayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDescription()
|
||||||
|
{
|
||||||
|
return this.description;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ArtifactVersion getVersion() {
|
||||||
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<? extends IModInfo.ModVersion> getDependencies() {
|
public List<? extends IModInfo.ModVersion> getDependencies() {
|
||||||
return dependencies.value;
|
return this.dependencies;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getNamespace() {
|
||||||
|
return this.namespace;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, Object> getModProperties() {
|
||||||
|
return this.properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<URL> getUpdateURL() {
|
||||||
|
return this.updateJSONURL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<String> getLogoFile()
|
||||||
|
{
|
||||||
|
return this.logoFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean getLogoBlur()
|
||||||
|
{
|
||||||
|
return this.logoBlur;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IConfigurable getConfig() {
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<? extends ForgeFeature.Bound> getForgeFeatures() {
|
public List<? extends ForgeFeature.Bound> getForgeFeatures() {
|
||||||
return forgeFeatures.value;
|
return this.features;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class Holder<T> {
|
@Override
|
||||||
private T value;
|
public <T> Optional<T> getConfigElement(final String... key) {
|
||||||
|
return this.config.getConfigElement(key);
|
||||||
|
}
|
||||||
|
|
||||||
public Holder(T value) {
|
@Override
|
||||||
this.value = value;
|
public List<? extends IConfigurable> getConfigList(final String... key) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<URL> getModURL() {
|
||||||
|
return modUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ForgeFeature.Bound makeBound(Map.Entry<String, Object> e) {
|
||||||
|
if (e.getValue() instanceof String val) {
|
||||||
|
return new ForgeFeature.Bound(e.getKey(), val, this);
|
||||||
|
} else {
|
||||||
|
throw new InvalidModFileException("Invalid feature bound {" + e.getValue() + "} for key {" + e.getKey() + "} only strings are accepted", this.owningFile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private record ModVersion(
|
class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion {
|
||||||
Holder<IModInfo> owner,
|
private IModInfo owner;
|
||||||
|
private final String modId;
|
||||||
|
private final VersionRange versionRange;
|
||||||
|
private final boolean mandatory;
|
||||||
|
private final Ordering ordering;
|
||||||
|
private final DependencySide side;
|
||||||
|
private final Optional<URL> referralUrl;
|
||||||
|
|
||||||
String getModId,
|
public ModVersion(final IModInfo owner, final IConfigurable config) {
|
||||||
VersionRange getVersionRange,
|
this.owner = owner;
|
||||||
boolean isMandatory,
|
this.modId = config.<String>getConfigElement("modId")
|
||||||
Ordering getOrdering,
|
.orElseThrow(()->new InvalidModFileException("Missing required field modid in dependency", getOwningFile()));
|
||||||
DependencySide getSide,
|
if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && this.modId.equals("forge")) {
|
||||||
Optional<URL> getReferralURL
|
|
||||||
) implements IModInfo.ModVersion {
|
|
||||||
public static ModVersion of(IModInfo owner, IConfigurable config) {
|
|
||||||
var modId = config.<String>getConfigElement("modId").orElse(null);
|
|
||||||
if (modId == null)
|
|
||||||
throw new InvalidModFileException("Missing required field modid in dependency", owner.getOwningFile());
|
|
||||||
|
|
||||||
if (modId.equals("forge")) {
|
|
||||||
var fileProps = owner.getOwningFile().getFileProperties();
|
var fileProps = owner.getOwningFile().getFileProperties();
|
||||||
// Checking containsKey to avoid a possible exception if the property is not present (due to Collections.emptyMap())
|
// Checking containsKey to avoid a possible exception if the property is not present (due to Collections.emptyMap())
|
||||||
if (!fileProps.isEmpty() && fileProps.containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
if (!fileProps.isEmpty() && fileProps.containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
@@ -210,42 +223,74 @@ public record ModInfo(
|
|||||||
fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
|
fileProps.remove(ModFileInfo.NOT_A_FORGE_MOD_PROP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var mandatory = config.<Boolean>getConfigElement("mandatory");
|
||||||
boolean mandatory;
|
if (mandatory.isPresent()) {
|
||||||
var mandatoryValue = config.<Boolean>getConfigElement("mandatory");
|
this.mandatory = mandatory.get();
|
||||||
if (mandatoryValue.isPresent())
|
} else if (ModFileInfo.DETECT_NON_FORGE_MODS_TOML && owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
mandatory = mandatoryValue.get();
|
this.mandatory = true;
|
||||||
else if (owner.getOwningFile().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP))
|
} else {
|
||||||
mandatory = true;
|
throw new InvalidModFileException("Missing required field mandatory in dependency", getOwningFile());
|
||||||
else
|
}
|
||||||
throw new InvalidModFileException("Missing required field mandatory in dependency", owner.getOwningFile());
|
this.versionRange = config.<String>getConfigElement("versionRange")
|
||||||
|
|
||||||
var versionRange = config.<String>getConfigElement("versionRange")
|
|
||||||
.map(MavenVersionAdapter::createFromVersionSpec)
|
.map(MavenVersionAdapter::createFromVersionSpec)
|
||||||
.orElse(UNBOUNDED);
|
.orElse(UNBOUNDED);
|
||||||
var ordering = config.<String>getConfigElement("ordering")
|
this.ordering = config.<String>getConfigElement("ordering")
|
||||||
.map(Ordering::valueOf)
|
.map(Ordering::valueOf)
|
||||||
.orElse(Ordering.NONE);
|
.orElse(Ordering.NONE);
|
||||||
var side = config.<String>getConfigElement("side")
|
this.side = config.<String>getConfigElement("side")
|
||||||
.map(DependencySide::valueOf)
|
.map(DependencySide::valueOf)
|
||||||
.orElse(DependencySide.BOTH);
|
.orElse(DependencySide.BOTH);
|
||||||
var referralUrl = config.<String>getConfigElement("referralUrl")
|
this.referralUrl = config.<String>getConfigElement("referralUrl")
|
||||||
.map(StringUtils::toURL);
|
.map(StringUtils::toURL);
|
||||||
|
}
|
||||||
|
|
||||||
return new ModVersion(
|
|
||||||
new Holder<>(owner),
|
@Override
|
||||||
modId, versionRange, mandatory, ordering, side, referralUrl
|
public String getModId()
|
||||||
);
|
{
|
||||||
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IModInfo getOwner() {
|
public VersionRange getVersionRange()
|
||||||
return owner.value;
|
{
|
||||||
|
return versionRange;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setOwner(IModInfo newOwner) {
|
public boolean isMandatory()
|
||||||
owner.value = newOwner;
|
{
|
||||||
|
return mandatory;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Ordering getOrdering()
|
||||||
|
{
|
||||||
|
return ordering;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DependencySide getSide()
|
||||||
|
{
|
||||||
|
return side;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setOwner(final IModInfo owner)
|
||||||
|
{
|
||||||
|
this.owner = owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IModInfo getOwner()
|
||||||
|
{
|
||||||
|
return owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<URL> getReferralURL() {
|
||||||
|
return referralUrl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+16
-31
@@ -9,64 +9,49 @@ import cpw.mods.jarhandling.JarMetadata;
|
|||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import java.lang.module.ModuleDescriptor;
|
import java.lang.module.ModuleDescriptor;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ModJarMetadata implements JarMetadata {
|
public final class ModJarMetadata implements JarMetadata {
|
||||||
private static final String AUTOMATIC_MODULE_NAME = "Automatic-Module-Name";
|
|
||||||
private IModFile modFile;
|
private IModFile modFile;
|
||||||
private String name;
|
|
||||||
private String version;
|
|
||||||
private ModuleDescriptor descriptor;
|
private ModuleDescriptor descriptor;
|
||||||
|
|
||||||
ModJarMetadata() { }
|
ModJarMetadata() {
|
||||||
|
}
|
||||||
|
|
||||||
public void setModFile(IModFile file) {
|
public void setModFile(IModFile file) {
|
||||||
this.modFile = file;
|
this.modFile = file;
|
||||||
var mods = this.modFile.getModFileInfo().getMods();
|
|
||||||
|
|
||||||
if (!mods.isEmpty()) {
|
|
||||||
var main = mods.get(0);
|
|
||||||
this.name = main.getModId();
|
|
||||||
this.version = main.getVersion().toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
var jar = file.getSecureJar();
|
|
||||||
var aname = jar.moduleDataProvider().getManifest().getMainAttributes().getValue(AUTOMATIC_MODULE_NAME);
|
|
||||||
if (aname != null)
|
|
||||||
this.name = aname;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
return this.name;
|
return modFile.getModFileInfo().moduleName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String version() {
|
public String version() {
|
||||||
return this.version;
|
return modFile.getModFileInfo().versionString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ModuleDescriptor descriptor() {
|
public ModuleDescriptor descriptor() {
|
||||||
if (descriptor != null)
|
if (descriptor != null) return descriptor;
|
||||||
return descriptor;
|
|
||||||
|
|
||||||
var bld = ModuleDescriptor.newAutomaticModule(name())
|
var bld = ModuleDescriptor.newAutomaticModule(name())
|
||||||
.version(version())
|
.version(version())
|
||||||
.packages(modFile.getSecureJar().getPackages());
|
.packages(modFile.getSecureJar().getPackages());
|
||||||
|
modFile.getSecureJar().getProviders().stream()
|
||||||
for (var provider : modFile.getSecureJar().getProviders()) {
|
.filter(p -> !p.providers().isEmpty())
|
||||||
if (provider.providers().isEmpty())
|
.forEach(p -> bld.provides(p.serviceName(), p.providers()));
|
||||||
continue;
|
modFile.getModFileInfo().usesServices().forEach(bld::uses);
|
||||||
|
|
||||||
bld.provides(provider.serviceName(), provider.providers());
|
|
||||||
}
|
|
||||||
|
|
||||||
descriptor = bld.build();
|
descriptor = bld.build();
|
||||||
return descriptor;
|
return descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IModFile modFile() {
|
||||||
|
return modFile;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object obj) {
|
public boolean equals(Object obj) {
|
||||||
if (obj == this) return true;
|
if (obj == this) return true;
|
||||||
|
|||||||
+3
-3
@@ -64,7 +64,7 @@ public class ModValidator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private static List<ModFile> validateFiles(final List<ModFile> mods) {
|
private List<ModFile> validateFiles(final List<ModFile> mods) {
|
||||||
final List<ModFile> brokenFiles = new ArrayList<>();
|
final List<ModFile> brokenFiles = new ArrayList<>();
|
||||||
for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
|
for (Iterator<ModFile> iterator = mods.iterator(); iterator.hasNext();) {
|
||||||
ModFile modFile = iterator.next();
|
ModFile modFile = iterator.next();
|
||||||
@@ -106,8 +106,8 @@ public class ModValidator {
|
|||||||
|
|
||||||
private List<EarlyLoadingException.ExceptionData> validateLanguages() {
|
private List<EarlyLoadingException.ExceptionData> validateLanguages() {
|
||||||
List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>();
|
List<EarlyLoadingException.ExceptionData> errorData = new ArrayList<>();
|
||||||
for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext();) {
|
for (Iterator<ModFile> iterator = this.candidateMods.iterator(); iterator.hasNext(); ) {
|
||||||
var modFile = iterator.next();
|
final ModFile modFile = iterator.next();
|
||||||
try {
|
try {
|
||||||
modFile.identifyLanguage();
|
modFile.identifyLanguage();
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
|
|||||||
+5
-16
@@ -16,7 +16,6 @@ import org.slf4j.Logger;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@@ -43,21 +42,11 @@ public class ModsFolderLocator extends AbstractModProvider implements IModLocato
|
|||||||
public List<IModLocator.ModFileOrException> scanMods() {
|
public List<IModLocator.ModFileOrException> scanMods() {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
|
LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder);
|
||||||
var excluded = ModDirTransformerDiscoverer.allExcluded();
|
var excluded = ModDirTransformerDiscoverer.allExcluded();
|
||||||
try {
|
try (var stream = Files.list(this.modFolder)) {
|
||||||
var ret = new ArrayList<IModLocator.ModFileOrException>();
|
return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX))
|
||||||
var files = Files.list(this.modFolder).toList();
|
.sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT)))
|
||||||
for (var file : files) {
|
.map(this::createMod)
|
||||||
var name = file.getFileName().toString().toLowerCase(Locale.ROOT);
|
.toList();
|
||||||
if (excluded.contains(file) || !name.endsWith(SUFFIX))
|
|
||||||
continue;
|
|
||||||
var mod = this.createMod(file, true);
|
|
||||||
if (mod == null) {
|
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found unknown jar file {} ignoring", file);
|
|
||||||
} else {
|
|
||||||
ret.add(mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
return sneak(e);
|
return sneak(e);
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-34
@@ -6,8 +6,6 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.UnmodifiableConfig;
|
import com.electronwill.nightconfig.core.UnmodifiableConfig;
|
||||||
import com.google.common.collect.ImmutableMap;
|
|
||||||
|
|
||||||
import net.minecraftforge.forgespi.language.IConfigurable;
|
import net.minecraftforge.forgespi.language.IConfigurable;
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
|
|
||||||
@@ -18,12 +16,11 @@ import java.util.Optional;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
import static java.util.Arrays.asList;
|
import static java.util.Arrays.asList;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
final class NightConfigWrapper implements IConfigurable {
|
class NightConfigWrapper implements IConfigurable {
|
||||||
private final UnmodifiableConfig config;
|
private final UnmodifiableConfig config;
|
||||||
private IModFileInfo file;
|
private IModFileInfo file;
|
||||||
|
|
||||||
@@ -31,51 +28,35 @@ final class NightConfigWrapper implements IConfigurable {
|
|||||||
this.config = config;
|
this.config = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
private NightConfigWrapper(UnmodifiableConfig config, IModFileInfo file) {
|
NightConfigWrapper setFile(IModFileInfo file) {
|
||||||
this.config = config;
|
|
||||||
this.file = file;
|
|
||||||
}
|
|
||||||
|
|
||||||
void setFile(IModFileInfo file) {
|
|
||||||
this.file = file;
|
this.file = file;
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Optional<T> getConfigElement(String key) {
|
@SuppressWarnings("unchecked")
|
||||||
var path = List.of(key);
|
|
||||||
return Optional.ofNullable(validate(this.config.get(path), path));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T> Optional<T> getConfigElement(final String... key) {
|
public <T> Optional<T> getConfigElement(final String... key) {
|
||||||
var path = asList(key);
|
var path = asList(key);
|
||||||
return Optional.ofNullable(validate(this.config.get(path), path));
|
return this.config.getOptional(path).map(value -> {
|
||||||
}
|
if (value instanceof UnmodifiableConfig) {
|
||||||
|
return (T) ((UnmodifiableConfig) value).valueMap();
|
||||||
@SuppressWarnings("unchecked")
|
} else if (value instanceof ArrayList<?> al && al.size() > 0 && al.get(0) instanceof UnmodifiableConfig) {
|
||||||
private <T> T validate(@Nullable T value, List<String> path) {
|
throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
|
||||||
if (value instanceof UnmodifiableConfig cfg) {
|
}
|
||||||
// New Night config doesn't implement valueMap(), so do a copy.
|
return (T) value;
|
||||||
var entries = cfg.entrySet();
|
});
|
||||||
var builder = ImmutableMap.builderWithExpectedSize(entries.size());
|
|
||||||
for (var e : entries)
|
|
||||||
builder.put(e.getKey(), e.getValue());
|
|
||||||
return (T) builder.build();
|
|
||||||
} else if (value instanceof ArrayList<?> al && !al.isEmpty() && al.getFirst() instanceof UnmodifiableConfig) {
|
|
||||||
throw new InvalidModFileException("The configuration path " + path + " is invalid. I wasn't expecting a multi-object list - remove one of the [[ ]]", file);
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<? extends IConfigurable> getConfigList(final String... key) {
|
public List<? extends IConfigurable> getConfigList(final String... key) {
|
||||||
final List<String> path = asList(key);
|
final List<String> path = asList(key);
|
||||||
if (this.config.contains(path) && !(this.config.get(path) instanceof Collection)) {
|
if (this.config.contains(path) && !(this.config.get(path) instanceof Collection)) {
|
||||||
throw new InvalidModFileException("The configuration path " + path + " is invalid. Expecting a collection!", file);
|
throw new InvalidModFileException("The configuration path "+path+" is invalid. Expecting a collection!", file);
|
||||||
}
|
}
|
||||||
final Collection<UnmodifiableConfig> nestedConfigs = this.config.getOrElse(path, ArrayList::new);
|
final Collection<UnmodifiableConfig> nestedConfigs = this.config.getOrElse(path, ArrayList::new);
|
||||||
return nestedConfigs.stream()
|
return nestedConfigs.stream()
|
||||||
.map(conf -> new NightConfigWrapper(conf, file))
|
.map(NightConfigWrapper::new)
|
||||||
|
.map(cw->cw.setFile(file))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,36 +21,37 @@ import java.nio.file.Path;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
record Scanner(ModFile fileToScan, ModFileScanData result) {
|
class Scanner {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final boolean DEBUG = LOGGER.isDebugEnabled(LogMarkers.SCAN);
|
private final ModFile fileToScan;
|
||||||
|
|
||||||
public Scanner(ModFile fileToScan) {
|
public Scanner(final ModFile fileToScan) {
|
||||||
this(fileToScan, new ModFileScanData());
|
this.fileToScan = fileToScan;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModFileScanData scan() {
|
public ModFileScanData scan() {
|
||||||
|
ModFileScanData result = new ModFileScanData();
|
||||||
result.addModFileInfo(fileToScan.getModFileInfo());
|
result.addModFileInfo(fileToScan.getModFileInfo());
|
||||||
fileToScan.scanFile(this::fileVisitor);
|
fileToScan.scanFile(p -> fileVisitor(p, result));
|
||||||
final List<IModLanguageProvider> loaders = fileToScan.getLoaders();
|
final List<IModLanguageProvider> loaders = fileToScan.getLoaders();
|
||||||
if (loaders != null) {
|
if (loaders != null) {
|
||||||
for (IModLanguageProvider loader : loaders) {
|
loaders.forEach(loader -> {
|
||||||
if (DEBUG) LOGGER.debug("Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
|
LOGGER.debug(LogMarkers.SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());
|
||||||
loader.getFileVisitor().accept(result);
|
loader.getFileVisitor().accept(result);
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fileVisitor(final Path path) {
|
private void fileVisitor(final Path path, final ModFileScanData result) {
|
||||||
try (InputStream in = Files.newInputStream(path)) {
|
LOGGER.debug(LogMarkers.SCAN,"Scanning {} path {}", fileToScan, path);
|
||||||
|
try (InputStream in = Files.newInputStream(path)){
|
||||||
ModClassVisitor mcv = new ModClassVisitor();
|
ModClassVisitor mcv = new ModClassVisitor();
|
||||||
ClassReader cr = new ClassReader(in);
|
ClassReader cr = new ClassReader(in);
|
||||||
cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||||
mcv.buildData(result.getClasses(), result.getAnnotations());
|
mcv.buildData(result.getClasses(), result.getAnnotations());
|
||||||
} catch (IOException | IllegalArgumentException e) {
|
} catch (IOException | IllegalArgumentException e) {
|
||||||
// mark path bad
|
// mark path bad
|
||||||
if (DEBUG) LOGGER.warn("Failed scanning {} path {}", fileToScan, path);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,8 +24,8 @@ import java.util.function.Supplier;
|
|||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
class ArgumentList {
|
class ArgumentList {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final List<Supplier<String[]>> entries = new ArrayList<>();
|
private List<Supplier<String[]>> entries = new ArrayList<>();
|
||||||
private final Map<String, EntryValue> values = new HashMap<>();
|
private Map<String, EntryValue> values = new HashMap<>();
|
||||||
|
|
||||||
public static ArgumentList from(String... args) {
|
public static ArgumentList from(String... args) {
|
||||||
ArgumentList ret = new ArgumentList();
|
ArgumentList ret = new ArgumentList();
|
||||||
@@ -77,8 +77,8 @@ class ArgumentList {
|
|||||||
|
|
||||||
public String[] getArguments() {
|
public String[] getArguments() {
|
||||||
return entries.stream()
|
return entries.stream()
|
||||||
.flatMap(e -> Arrays.stream(e.get()))
|
.flatMap(e -> Arrays.asList(e.get()).stream())
|
||||||
.toArray(String[]::new);
|
.toArray(size -> new String[size]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasValue(String key) {
|
public boolean hasValue(String key) {
|
||||||
@@ -122,7 +122,7 @@ class ArgumentList {
|
|||||||
return ent.getValue();
|
return ent.getValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class EntryValue implements Supplier<String[]> {
|
private class EntryValue implements Supplier<String[]> {
|
||||||
private final String prefix;
|
private final String prefix;
|
||||||
private final String key;
|
private final String key;
|
||||||
private final boolean split;
|
private final boolean split;
|
||||||
|
|||||||
+1
-1
@@ -40,7 +40,7 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
|
|||||||
String username = args.get("username");
|
String username = args.get("username");
|
||||||
if (username != null) { // Replace '#' placeholders with random numbers
|
if (username != null) { // Replace '#' placeholders with random numbers
|
||||||
Matcher m = Pattern.compile("#+").matcher(username);
|
Matcher m = Pattern.compile("#+").matcher(username);
|
||||||
StringBuilder replaced = new StringBuilder();
|
StringBuffer replaced = new StringBuffer();
|
||||||
while (m.find()) {
|
while (m.find()) {
|
||||||
m.appendReplacement(replaced, getRandomNumbers(m.group().length()));
|
m.appendReplacement(replaced, getRandomNumbers(m.group().length()));
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-2
@@ -7,6 +7,7 @@ package net.minecraftforge.fml.loading.targets;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.api.ILaunchHandlerService;
|
import cpw.mods.modlauncher.api.ILaunchHandlerService;
|
||||||
|
import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
|
||||||
import cpw.mods.modlauncher.api.ServiceRunner;
|
import cpw.mods.modlauncher.api.ServiceRunner;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
@@ -18,6 +19,7 @@ import org.slf4j.Logger;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -45,6 +47,10 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
|
|
||||||
public abstract List<Path> getMinecraftPaths();
|
public abstract List<Path> getMinecraftPaths();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
|
||||||
|
}
|
||||||
|
|
||||||
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
||||||
URI uri;
|
URI uri;
|
||||||
try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) {
|
try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) {
|
||||||
@@ -73,7 +79,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
||||||
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
||||||
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
||||||
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
||||||
|
|
||||||
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
|
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
|
||||||
var mod = layer.findModule(module).orElse(null);
|
var mod = layer.findModule(module).orElse(null);
|
||||||
@@ -101,7 +107,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
len += 2;
|
len += 2;
|
||||||
}
|
}
|
||||||
str = str.substring(0, str.length() - len);
|
str = str.substring(0, str.length() - len);
|
||||||
var path = Path.of(URI.create(str));
|
var path = Paths.get(URI.create(str));
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+5
-5
@@ -9,7 +9,7 @@ import java.util.List;
|
|||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
||||||
private ForgeDevLaunchHandler(LaunchType type) {
|
private ForgeDevLaunchHandler(LaunchType type) {
|
||||||
super(type, "forge_dev_");
|
super(type, "forge_dev_");
|
||||||
}
|
}
|
||||||
@@ -33,25 +33,25 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
return List.of(filtered);
|
return List.of(filtered);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Client extends ForgeDevLaunchHandler {
|
public static class Client extends ForgeDevLaunchHandler {
|
||||||
public Client() {
|
public Client() {
|
||||||
super(CLIENT);
|
super(CLIENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeDevLaunchHandler {
|
public static class Data extends ForgeDevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Server extends ForgeDevLaunchHandler {
|
public static class Server extends ForgeDevLaunchHandler {
|
||||||
public Server() {
|
public Server() {
|
||||||
super(SERVER);
|
super(SERVER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class ServerGameTest extends ForgeDevLaunchHandler {
|
public static class ServerGameTest extends ForgeDevLaunchHandler {
|
||||||
public ServerGameTest() {
|
public ServerGameTest() {
|
||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-35
@@ -35,7 +35,7 @@ import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
|
|||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
import net.minecraftforge.forgespi.locating.IModLocator;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ForgeDevLocator extends AbstractModProvider implements IModLocator {
|
public class ForgeDevLocator extends AbstractModProvider implements IModLocator {
|
||||||
private static final String PACK_META = "pack.mcmeta";
|
private static final String PACK_META = "pack.mcmeta";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -60,7 +60,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Path> getMods() {
|
private List<Path> getMods() {
|
||||||
// Forge is an exploded directory as well
|
// Forge is an exploded directory as well
|
||||||
var minecraft = ForgeDevLaunchHandler.getPathFromResource("net/minecraft/client/Minecraft.class");
|
var minecraft = ForgeDevLaunchHandler.getPathFromResource("net/minecraft/client/Minecraft.class");
|
||||||
var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
||||||
@@ -84,31 +84,30 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Path> explodeTestMods(Path path) {
|
private List<Path> explodeTestMods(Path path) {
|
||||||
var mod = new ArrayList<Path>();
|
var mod = new ArrayList<Path>();
|
||||||
var memory = Jimfs.newFileSystem();
|
var memory = Jimfs.newFileSystem();
|
||||||
|
|
||||||
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
||||||
var packages = findTestModPackages(path);
|
var packages = findTestModPackages(path);
|
||||||
for (var entry : packages.entrySet()) {
|
for (var entry : packages.entrySet()) {
|
||||||
var pkg = entry.getKey() + '/';
|
var pkg = entry.getKey();
|
||||||
var modids = entry.getValue();
|
var modids = entry.getValue();
|
||||||
|
|
||||||
// Find resource directories for every mod in this group
|
// Find resource directories for every mod in this group
|
||||||
var paths = new LinkedHashSet<Path>();
|
var resourcePaths = new LinkedHashSet<Path>();
|
||||||
for (var modid : modids) {
|
for (var modid : modids) {
|
||||||
var rsc = path.resolve(modid);
|
var rsc = path.resolve(modid);
|
||||||
if (Files.exists(rsc))
|
if (Files.exists(rsc))
|
||||||
paths.add(rsc);
|
resourcePaths.add(rsc);
|
||||||
}
|
}
|
||||||
|
|
||||||
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
||||||
buildModsToml(paths, modids, root);
|
buildModsToml(resourcePaths, modids, root);
|
||||||
buildPackMeta(paths, root);
|
buildPackMeta(resourcePaths, root);
|
||||||
moveModuleInfo(paths, root);
|
|
||||||
|
|
||||||
if (Files.exists(root))
|
if (Files.exists(root))
|
||||||
paths.add(root);
|
resourcePaths.add(root);
|
||||||
|
|
||||||
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
||||||
var classes = UnionHelper.newFileSystem(
|
var classes = UnionHelper.newFileSystem(
|
||||||
@@ -122,10 +121,14 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}, new Path[] { path }
|
}, new Path[] { path }
|
||||||
);
|
);
|
||||||
|
|
||||||
paths.addFirst(classes.getRootDirectories().iterator().next());
|
// And we want the resources, and none of the classes, just in case things get kinda fucky and somehow a package overlaps a sub package {shading?}
|
||||||
|
var resources = UnionHelper.newFileSystem((name, base) -> !name.endsWith(".class"), resourcePaths.toArray(Path[]::new));
|
||||||
|
|
||||||
// Union of unions, Yay!
|
// Union of unions, Yay!
|
||||||
var union = UnionHelper.newFileSystem(null, paths.stream().toArray(Path[]::new));
|
var union = UnionHelper.newFileSystem(null, new Path[] {
|
||||||
|
classes.getRootDirectories().iterator().next(),
|
||||||
|
resources.getRootDirectories().iterator().next()
|
||||||
|
});
|
||||||
mod.add(union.getRootDirectories().iterator().next());
|
mod.add(union.getRootDirectories().iterator().next());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +137,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
|
|
||||||
// Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
|
// Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories,
|
||||||
// I could make it merge all the way up, but I think this would be fine.
|
// I could make it merge all the way up, but I think this would be fine.
|
||||||
private static Map<String, Set<String>> findTestModPackages(Path path) {
|
private Map<String, Set<String>> findTestModPackages(Path path) {
|
||||||
var mods = new HashMap<String, Set<String>>();
|
var mods = new HashMap<String, Set<String>>();
|
||||||
try (var files = Files.walk(path)) {
|
try (var files = Files.walk(path)) {
|
||||||
var classes = files
|
var classes = files
|
||||||
@@ -187,7 +190,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Builds or update the mods.toml file for all @Mods in this package
|
// Builds or update the mods.toml file for all @Mods in this package
|
||||||
private static void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
|
private void buildModsToml(Set<Path> resources, Set<String> modids, Path root) {
|
||||||
var toml = resources.stream()
|
var toml = resources.stream()
|
||||||
.map(p -> p.resolve(MODS_TOML))
|
.map(p -> p.resolve(MODS_TOML))
|
||||||
.filter(Files::exists)
|
.filter(Files::exists)
|
||||||
@@ -223,7 +226,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (var modid : modids) {
|
for (var modid : modids) {
|
||||||
if (modlist.stream().noneMatch(c -> modid.equals(c.get("modId")))) {
|
if (!modlist.stream().anyMatch(c -> modid.equals(c.get("modId")))) {
|
||||||
modified = true;
|
modified = true;
|
||||||
var tmp = Config.inMemory();
|
var tmp = Config.inMemory();
|
||||||
tmp.set("modId", modid);
|
tmp.set("modId", modid);
|
||||||
@@ -245,7 +248,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
|
// This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there.
|
||||||
private static void buildPackMeta(Set<Path> paths, Path root) {
|
private void buildPackMeta(Set<Path> paths, Path root) {
|
||||||
var existing = paths.stream()
|
var existing = paths.stream()
|
||||||
.map(p -> p.resolve(PACK_META))
|
.map(p -> p.resolve(PACK_META))
|
||||||
.filter(Files::exists)
|
.filter(Files::exists)
|
||||||
@@ -271,25 +274,6 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void moveModuleInfo(Set<Path> paths, Path root) {
|
|
||||||
var existing = paths.stream()
|
|
||||||
.map(p -> p.resolve("module-info.dat"))
|
|
||||||
.filter(Files::exists)
|
|
||||||
.findFirst()
|
|
||||||
.orElse(null);
|
|
||||||
|
|
||||||
if (existing == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var target = root.resolve("module-info.class");
|
|
||||||
try {
|
|
||||||
Files.createDirectories(target.getParent());
|
|
||||||
Files.copy(existing, target);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new IllegalStateException("Failed to copy module-info.dat to memory: " + target, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
||||||
throw (E)e;
|
throw (E)e;
|
||||||
|
|||||||
+4
-4
@@ -10,15 +10,15 @@ import java.util.List;
|
|||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
|
abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
|
||||||
protected ForgeProdLaunchHandler(LaunchType type) {
|
protected ForgeProdLaunchHandler(LaunchType type) {
|
||||||
super(type, "forge_");
|
super(type, "forge_");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public String getNaming() { return "mcp"; }
|
@Override public String getNaming() { return "srg"; }
|
||||||
@Override public boolean isProduction() { return true; }
|
@Override public boolean isProduction() { return true; }
|
||||||
|
|
||||||
public static final class Client extends ForgeProdLaunchHandler {
|
public static class Client extends ForgeProdLaunchHandler {
|
||||||
public Client() {
|
public Client() {
|
||||||
super(CLIENT);
|
super(CLIENT);
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@ sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Server extends ForgeProdLaunchHandler {
|
public static class Server extends ForgeProdLaunchHandler {
|
||||||
public Server() {
|
public Server() {
|
||||||
super(SERVER);
|
super(SERVER);
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-5
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.ApiStatus;
|
|||||||
import cpw.mods.jarhandling.SecureJar;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
||||||
private ForgeUserdevLaunchHandler(LaunchType type) {
|
private ForgeUserdevLaunchHandler(LaunchType type) {
|
||||||
super(type, "forge_userdev_");
|
super(type, "forge_userdev_");
|
||||||
}
|
}
|
||||||
@@ -33,25 +33,25 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
return List.of(minecraft);
|
return List.of(minecraft);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Client extends ForgeUserdevLaunchHandler {
|
public static class Client extends ForgeUserdevLaunchHandler {
|
||||||
public Client() {
|
public Client() {
|
||||||
super(CLIENT);
|
super(CLIENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeUserdevLaunchHandler {
|
public static class Data extends ForgeUserdevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class Server extends ForgeUserdevLaunchHandler {
|
public static class Server extends ForgeUserdevLaunchHandler {
|
||||||
public Server() {
|
public Server() {
|
||||||
super(SERVER);
|
super(SERVER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class ServerGameTest extends ForgeUserdevLaunchHandler {
|
public static class ServerGameTest extends ForgeUserdevLaunchHandler {
|
||||||
public ServerGameTest() {
|
public ServerGameTest() {
|
||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
|
|||||||
import net.minecraftforge.forgespi.locating.IModLocator;
|
import net.minecraftforge.forgespi.locating.IModLocator;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ForgeUserdevLocator extends AbstractModProvider implements IModLocator {
|
public class ForgeUserdevLocator extends AbstractModProvider implements IModLocator {
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
return "forge_userdev_locator";
|
return "forge_userdev_locator";
|
||||||
|
|||||||
+2
-1
@@ -25,7 +25,7 @@ import java.util.Set;
|
|||||||
*/
|
*/
|
||||||
public class StronglyConnectedComponentDetector<T> {
|
public class StronglyConnectedComponentDetector<T> {
|
||||||
private final Graph<T> graph;
|
private final Graph<T> graph;
|
||||||
private final Map<T, Integer> ids = new HashMap<>();
|
private Map<T, Integer> ids;
|
||||||
private T[] elements;
|
private T[] elements;
|
||||||
private int[] dfn;
|
private int[] dfn;
|
||||||
private int[] low;
|
private int[] low;
|
||||||
@@ -49,6 +49,7 @@ public class StronglyConnectedComponentDetector<T> {
|
|||||||
private void calculate() {
|
private void calculate() {
|
||||||
components = new HashSet<>();
|
components = new HashSet<>();
|
||||||
int t = 0;
|
int t = 0;
|
||||||
|
ids = new HashMap<>();
|
||||||
Set<T> nodes = graph.nodes();
|
Set<T> nodes = graph.nodes();
|
||||||
elements = (T[]) new Object[nodes.size()];
|
elements = (T[]) new Object[nodes.size()];
|
||||||
for (T node : nodes) {
|
for (T node : nodes) {
|
||||||
|
|||||||
+5
-10
@@ -4,14 +4,9 @@ org.gradle.jvmargs=-Xmx3G
|
|||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
JAVA_VERSION=21
|
JAVA_VERSION=17
|
||||||
MC_VERSION=1.21.3
|
MC_VERSION=1.20.4
|
||||||
MC_NEXT_VERSION=1.22
|
MC_NEXT_VERSION=1.21
|
||||||
MCP_VERSION=20241025.112443
|
MCP_VERSION=20231207.112700
|
||||||
MAPPING_CHANNEL=official
|
MAPPING_CHANNEL=official
|
||||||
MAPPING_VERSION=1.21.3
|
MAPPING_VERSION=1.20.4
|
||||||
|
|
||||||
// Set to true before the first build of a new MC version, so we don't do compatibility checks
|
|
||||||
CHECK_COMPATIBILITY=false
|
|
||||||
// Set to true to allow for fuzzy patching. Useful during updateing
|
|
||||||
UPDATING=false
|
|
||||||
Vendored
BIN
Binary file not shown.
Vendored
+10
-10
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ dependencies {
|
|||||||
compileOnly(libs.nulls)
|
compileOnly(libs.nulls)
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
implementation(libs.unsafe)
|
|
||||||
implementation(libs.securemodules)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
@@ -59,7 +57,7 @@ publishing {
|
|||||||
license PomUtils.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|||||||
-12
@@ -6,7 +6,6 @@
|
|||||||
package net.minecraftforge.fml.javafmlmod;
|
package net.minecraftforge.fml.javafmlmod;
|
||||||
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
import net.minecraftforge.fml.Logging;
|
import net.minecraftforge.fml.Logging;
|
||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
@@ -20,7 +19,6 @@ import org.apache.logging.log4j.LogManager;
|
|||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.objectweb.asm.Type;
|
import org.objectweb.asm.Type;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -34,7 +32,6 @@ public class AutomaticEventSubscriber {
|
|||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
|
private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
|
||||||
private static final Type MOD_TYPE = Type.getType(Mod.class);
|
private static final Type MOD_TYPE = Type.getType(Mod.class);
|
||||||
private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);
|
|
||||||
|
|
||||||
public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) {
|
public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) {
|
||||||
if (scanData == null) return;
|
if (scanData == null) return;
|
||||||
@@ -44,11 +41,6 @@ public class AutomaticEventSubscriber {
|
|||||||
.filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
|
.filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
var onlyIns = FMLEnvironment.production ? Collections.emptySet() : scanData.getAnnotations().stream()
|
|
||||||
.filter(data -> ONLY_IN_TYPE.equals(data.annotationType()))
|
|
||||||
.map(data -> data.clazz().getClassName())
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
|
|
||||||
var modids = scanData.getAnnotations().stream()
|
var modids = scanData.getAnnotations().stream()
|
||||||
.filter(data -> MOD_TYPE.equals(data.annotationType()))
|
.filter(data -> MOD_TYPE.equals(data.annotationType()))
|
||||||
.collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
|
.collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
|
||||||
@@ -57,10 +49,6 @@ public class AutomaticEventSubscriber {
|
|||||||
var defaultBus = new EnumData(null, "FORGE");
|
var defaultBus = new EnumData(null, "FORGE");
|
||||||
|
|
||||||
for (var data : targets) {
|
for (var data : targets) {
|
||||||
if (!FMLEnvironment.production && onlyIns.contains(data.clazz().getClassName())) {
|
|
||||||
throw new RuntimeException("Found @OnlyIn on @EventBusSubscriber class " + data.clazz().getClassName() + " - this is not allowed as it causes crashes. Remove the OnlyIn and set value=Dist.CLIENT in the EventBusSubscriber annotation instead");
|
|
||||||
}
|
|
||||||
|
|
||||||
var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
|
var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
|
||||||
modId = value(data, "modid", modId);
|
modId = value(data, "modid", modId);
|
||||||
|
|
||||||
|
|||||||
+15
-2
@@ -31,8 +31,21 @@ public class FMLJavaModLanguageProvider implements IModLanguageProvider
|
|||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|
||||||
private record FMLModTarget(String className, String modId) implements IModLanguageProvider.IModLanguageLoader {
|
private static class FMLModTarget implements IModLanguageProvider.IModLanguageLoader {
|
||||||
private static final Logger LOGGER = FMLJavaModLanguageProvider.LOGGER;
|
private static final Logger LOGGER = FMLJavaModLanguageProvider.LOGGER;
|
||||||
|
private final String className;
|
||||||
|
private final String modId;
|
||||||
|
|
||||||
|
private FMLModTarget(String className, String modId)
|
||||||
|
{
|
||||||
|
this.className = className;
|
||||||
|
this.modId = modId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getModId()
|
||||||
|
{
|
||||||
|
return modId;
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
@@ -81,7 +94,7 @@ public class FMLJavaModLanguageProvider implements IModLanguageProvider
|
|||||||
.filter(ad -> ad.annotationType().equals(MODANNOTATION))
|
.filter(ad -> ad.annotationType().equals(MODANNOTATION))
|
||||||
.peek(ad -> LOGGER.debug(SCAN, "Found @Mod class {} with id {}", ad.clazz().getClassName(), ad.annotationData().get("value")))
|
.peek(ad -> LOGGER.debug(SCAN, "Found @Mod class {} with id {}", ad.clazz().getClassName(), ad.annotationData().get("value")))
|
||||||
.map(ad -> new FMLModTarget(ad.clazz().getClassName(), (String)ad.annotationData().get("value")))
|
.map(ad -> new FMLModTarget(ad.clazz().getClassName(), (String)ad.annotationData().get("value")))
|
||||||
.collect(Collectors.toMap(FMLModTarget::modId, Function.identity(), (a,b)->a));
|
.collect(Collectors.toMap(FMLModTarget::getModId, Function.identity(), (a,b)->a));
|
||||||
scanResult.addLanguageLoader(modTargetMap);
|
scanResult.addLanguageLoader(modTargetMap);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-7
@@ -8,9 +8,6 @@ package net.minecraftforge.fml.javafmlmod;
|
|||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
import net.minecraftforge.fml.ModLoadingContext;
|
import net.minecraftforge.fml.ModLoadingContext;
|
||||||
|
|
||||||
/**
|
|
||||||
* Use the context provided by your language loader in your mod's constructor
|
|
||||||
*/
|
|
||||||
public class FMLJavaModLoadingContext extends ModLoadingContext
|
public class FMLJavaModLoadingContext extends ModLoadingContext
|
||||||
{
|
{
|
||||||
private final FMLModContainer container;
|
private final FMLModContainer container;
|
||||||
@@ -27,9 +24,6 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
|
|||||||
return container.getEventBus();
|
return container.getEventBus();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return {@link FMLModContainer} by default.
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public FMLModContainer getContainer() {
|
public FMLModContainer getContainer() {
|
||||||
return container;
|
return container;
|
||||||
@@ -41,7 +35,7 @@ public class FMLJavaModLoadingContext extends ModLoadingContext
|
|||||||
*
|
*
|
||||||
* @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
|
* @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since="1.21.1")
|
@Deprecated(forRemoval = true, since = "1.21.1")
|
||||||
public static FMLJavaModLoadingContext get() {
|
public static FMLJavaModLoadingContext get() {
|
||||||
return ModLoadingContext.get().extension();
|
return ModLoadingContext.get().extension();
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-88
@@ -13,24 +13,18 @@ import net.minecraftforge.eventbus.api.IEventListener;
|
|||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.ModLoadingException;
|
import net.minecraftforge.fml.ModLoadingException;
|
||||||
import net.minecraftforge.fml.ModLoadingStage;
|
import net.minecraftforge.fml.ModLoadingStage;
|
||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
import net.minecraftforge.unsafe.UnsafeHacks;
|
|
||||||
|
|
||||||
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.logging.log4j.Marker;
|
import org.apache.logging.log4j.Marker;
|
||||||
import org.apache.logging.log4j.MarkerManager;
|
import org.apache.logging.log4j.MarkerManager;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.jar.Attributes;
|
import java.util.Optional;
|
||||||
|
|
||||||
public class FMLModContainer extends ModContainer {
|
public class FMLModContainer extends ModContainer {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
@@ -46,89 +40,23 @@ public class FMLModContainer extends ModContainer {
|
|||||||
LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
|
LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className);
|
||||||
this.scanResults = modFileScanResults;
|
this.scanResults = modFileScanResults;
|
||||||
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
||||||
this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
||||||
|
this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
|
||||||
this.contextExtension = () -> context;
|
this.contextExtension = () -> context;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var moduleName = info.getOwningFile().moduleName();
|
var moduleName = info.getOwningFile().moduleName();
|
||||||
var module = gameLayer.findModule(moduleName)
|
var module = gameLayer.findModule(moduleName)
|
||||||
.orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer));
|
.orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer));
|
||||||
|
|
||||||
openModules(gameLayer, module, info.getOwningFile().getFile().getSecureJar());
|
|
||||||
|
|
||||||
modClass = Class.forName(module, className);
|
modClass = Class.forName(module, className);
|
||||||
LOGGER.debug(LOADING,"Loaded modclass {}/{} with {}", modClass.getModule().getName(), modClass.getName(), modClass.getClassLoader());
|
LOGGER.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader());
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
LOGGER.error(LOADING, "Failed to load class {}", className, e);
|
LOGGER.error(LOADING, "Failed to load class {}", className, e);
|
||||||
throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e);
|
throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
|
||||||
* <pre>
|
|
||||||
* Reads the Add-Exports and Add-Opens attributes (see note) from a mod file and
|
|
||||||
* attempts to apply them. This differers from the JEP in two significant ways:
|
|
||||||
* 1) Instead of opening things to ALL-UNNAMED it instead only opens to the
|
|
||||||
* mod's module itself. Because I don't want other mods accidently relying
|
|
||||||
* on transitive behavior
|
|
||||||
* 2) It is read from all mods not just the executable jars.
|
|
||||||
*
|
|
||||||
* From <a href = "https://openjdk.org/jeps/261">JEP 261: Module System</a>
|
|
||||||
*
|
|
||||||
* Two new JDK-specific JAR-file manifest attributes are defined to correspond
|
|
||||||
* to the --add-exports and --add-opens command-line options:
|
|
||||||
* Add-Exports: <module>/<package>( <module>/<package>)*
|
|
||||||
* Add-Opens: <module>/<package>( <module>/<package>)*
|
|
||||||
*
|
|
||||||
* The value of each attribute is a space-separated list of slash-separated
|
|
||||||
* module-name/package-name pairs. A >module</>package< pair in
|
|
||||||
* the value of an Add-Exports attribute has the same meaning as the
|
|
||||||
* command-line option --add-exports >module</>package<=ALL-UNNAMED.
|
|
||||||
*
|
|
||||||
* A >module</>package< pair in the value of an Add-Opens attribute has the
|
|
||||||
* same meaning as the command-line option --add-opens >module</>package<=ALL-UNNAMED.
|
|
||||||
*
|
|
||||||
* Each attribute can occur at most once, in the main section of a MANIFEST.MF file.
|
|
||||||
* A particular pair can be listed more than once. If a specified module was not
|
|
||||||
* resolved, or if a specified package does not exist, then the corresponding pair
|
|
||||||
* is ignored.
|
|
||||||
*/
|
|
||||||
private static void openModules(ModuleLayer layer, Module self, SecureJar jar) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
|
||||||
var manifest = jar.moduleDataProvider().getManifest().getMainAttributes();
|
|
||||||
addOpenOrExports(layer, self, true, manifest);
|
|
||||||
addOpenOrExports(layer, self, false, manifest);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void addOpenOrExports(ModuleLayer layer, Module self, boolean open, Attributes attrs) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
|
||||||
var key = open ? "Add-Opens" : "Add-Exports";
|
|
||||||
var entry = attrs.getValue(key);
|
|
||||||
if (entry == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (var pair : entry.split(" ")) {
|
|
||||||
var pts = pair.trim().split("/");
|
|
||||||
if (pts.length == 2) {
|
|
||||||
var target = layer.findModule(pts[0]).orElse(null);
|
|
||||||
if (target == null || !target.getDescriptor().packages().contains(pts[1]))
|
|
||||||
continue;
|
|
||||||
addOpenOrExport(target, pts[1], self, open);
|
|
||||||
} else {
|
|
||||||
LOGGER.warn(LOADING, "Invalid {} entry in {}: {}", key, self.getName(), pair);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Method implAddExportsOrOpens;
|
|
||||||
private static void addOpenOrExport(Module target, String pkg, Module reader, boolean open) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
|
||||||
if (implAddExportsOrOpens == null) {
|
|
||||||
implAddExportsOrOpens = Module.class.getDeclaredMethod("implAddExportsOrOpens", String.class, Module.class, boolean.class, boolean.class);
|
|
||||||
UnsafeHacks.setAccessible(implAddExportsOrOpens);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOGGER.info(LOADING, "{} {}/{} to {}", open ? "Opening" : "Exporting", target.getName(), pkg, reader.getName());
|
|
||||||
implAddExportsOrOpens.invoke(target, pkg, reader, open, /*syncVM*/true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
|
|
||||||
LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
|
LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,14 +116,4 @@ public class FMLModContainer extends ModContainer {
|
|||||||
throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
|
throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void dispatchConfigEvent(IConfigEvent event) {
|
|
||||||
this.eventBus.post(event.self());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "FMLModContainer[" + this.getModInfo().getModId() + ", " + this.getClass().getName() + "]";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+8
-1
@@ -21,12 +21,14 @@ import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
|||||||
public class LowCodeModContainer extends ModContainer
|
public class LowCodeModContainer extends ModContainer
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final Object modInstance;
|
private final ModFileScanData scanResults;
|
||||||
|
private Object modInstance;
|
||||||
|
|
||||||
public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
|
public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
|
||||||
{
|
{
|
||||||
super(info);
|
super(info);
|
||||||
LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId());
|
LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId());
|
||||||
|
this.scanResults = modFileScanResults;
|
||||||
this.modInstance = new Object();
|
this.modInstance = new Object();
|
||||||
this.contextExtension = () -> null;
|
this.contextExtension = () -> null;
|
||||||
this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
|
this.extensionPoints.remove(IExtensionPoint.DisplayTest.class);
|
||||||
@@ -43,4 +45,9 @@ public class LowCodeModContainer extends ModContainer
|
|||||||
{
|
{
|
||||||
return modInstance;
|
return modInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected <T extends Event & IModBusEvent> void acceptEvent(final T e)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.mclanguageprovider;
|
package net.minecraftforge.fml.mclanguageprovider;
|
||||||
|
|
||||||
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.forgespi.language.ILifecycleEvent;
|
import net.minecraftforge.forgespi.language.ILifecycleEvent;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
import net.minecraftforge.forgespi.language.IModLanguageProvider;
|
||||||
@@ -14,11 +15,14 @@ import org.apache.logging.log4j.Logger;
|
|||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
|
import net.minecraftforge.forgespi.language.IModLanguageProvider.IModLanguageLoader;
|
||||||
|
|
||||||
public class MinecraftModLanguageProvider implements IModLanguageProvider {
|
public class MinecraftModLanguageProvider implements IModLanguageProvider {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+15
-10
@@ -2,7 +2,7 @@ plugins {
|
|||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'idea'
|
id 'idea'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
|
id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
|
||||||
}
|
}
|
||||||
|
|
||||||
version = mod_version
|
version = mod_version
|
||||||
@@ -12,8 +12,8 @@ base {
|
|||||||
archivesName = mod_id
|
archivesName = mod_id
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21.
|
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
|
|
||||||
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
|
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
|
||||||
minecraft {
|
minecraft {
|
||||||
@@ -31,9 +31,6 @@ minecraft {
|
|||||||
// Use non-default mappings at your own risk. They may not always work.
|
// Use non-default mappings at your own risk. They may not always work.
|
||||||
// Simply re-run your setup task after changing the mappings to update your workspace.
|
// Simply re-run your setup task after changing the mappings to update your workspace.
|
||||||
mappings channel: mapping_channel, version: mapping_version
|
mappings channel: mapping_channel, version: mapping_version
|
||||||
|
|
||||||
// Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
|
|
||||||
reobf = false
|
|
||||||
|
|
||||||
// When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
|
// When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
|
||||||
// In most cases, it is not necessary to enable.
|
// In most cases, it is not necessary to enable.
|
||||||
@@ -127,11 +124,11 @@ dependencies {
|
|||||||
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
|
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
|
||||||
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
||||||
|
|
||||||
// Example mod dependency with JEI
|
// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
|
||||||
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
|
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
|
||||||
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
|
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
|
||||||
// compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
|
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
|
||||||
// runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
|
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
|
||||||
|
|
||||||
// Example mod dependency using a mod jar from ./libs with a flat dir repository
|
// Example mod dependency using a mod jar from ./libs with a flat dir repository
|
||||||
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
|
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
|
||||||
@@ -174,8 +171,16 @@ tasks.named('jar', Jar).configure {
|
|||||||
'Implementation-Vendor' : mod_authors
|
'Implementation-Vendor' : mod_authors
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This is the preferred method to reobfuscate your jar file
|
||||||
|
finalizedBy 'reobfJar'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
|
||||||
|
// tasks.named('publish').configure {
|
||||||
|
// dependsOn 'reobfJar'
|
||||||
|
// }
|
||||||
|
|
||||||
// Example configuration to allow publishing using the maven-publish plugin
|
// Example configuration to allow publishing using the maven-publish plugin
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
|
|||||||
+9
-5
@@ -8,6 +8,7 @@ import net.minecraftforge.fml.common.Mod;
|
|||||||
import net.minecraftforge.fml.event.config.ModConfigEvent;
|
import net.minecraftforge.fml.event.config.ModConfigEvent;
|
||||||
import net.minecraftforge.registries.ForgeRegistries;
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -15,7 +16,8 @@ import java.util.stream.Collectors;
|
|||||||
// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
|
// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
|
||||||
// Demonstrates how to use Forge's config APIs
|
// Demonstrates how to use Forge's config APIs
|
||||||
@Mod.EventBusSubscriber(modid = ExampleMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
|
@Mod.EventBusSubscriber(modid = ExampleMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
|
||||||
public class Config {
|
public class Config
|
||||||
|
{
|
||||||
private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
|
private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
|
||||||
|
|
||||||
private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
|
private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
|
||||||
@@ -42,19 +44,21 @@ public class Config {
|
|||||||
public static String magicNumberIntroduction;
|
public static String magicNumberIntroduction;
|
||||||
public static Set<Item> items;
|
public static Set<Item> items;
|
||||||
|
|
||||||
private static boolean validateItemName(final Object obj) {
|
private static boolean validateItemName(final Object obj)
|
||||||
return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(ResourceLocation.tryParse(itemName));
|
{
|
||||||
|
return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
static void onLoad(final ModConfigEvent event) {
|
static void onLoad(final ModConfigEvent event)
|
||||||
|
{
|
||||||
logDirtBlock = LOG_DIRT_BLOCK.get();
|
logDirtBlock = LOG_DIRT_BLOCK.get();
|
||||||
magicNumber = MAGIC_NUMBER.get();
|
magicNumber = MAGIC_NUMBER.get();
|
||||||
magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
|
magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
|
||||||
|
|
||||||
// convert the list of strings into a set of items
|
// convert the list of strings into a set of items
|
||||||
items = ITEM_STRINGS.get().stream()
|
items = ITEM_STRINGS.get().stream()
|
||||||
.map(itemName -> ForgeRegistries.ITEMS.getValue(ResourceLocation.tryParse(itemName)))
|
.map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+18
-27
@@ -30,7 +30,8 @@ import org.slf4j.Logger;
|
|||||||
|
|
||||||
// The value here should match an entry in the META-INF/mods.toml file
|
// The value here should match an entry in the META-INF/mods.toml file
|
||||||
@Mod(ExampleMod.MODID)
|
@Mod(ExampleMod.MODID)
|
||||||
public class ExampleMod {
|
public class ExampleMod
|
||||||
|
{
|
||||||
// Define mod id in a common place for everything to reference
|
// Define mod id in a common place for everything to reference
|
||||||
public static final String MODID = "examplemod";
|
public static final String MODID = "examplemod";
|
||||||
// Directly reference a slf4j logger
|
// Directly reference a slf4j logger
|
||||||
@@ -43,29 +44,13 @@ public class ExampleMod {
|
|||||||
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
|
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
|
||||||
|
|
||||||
// Creates a new Block with the id "examplemod:example_block", combining the namespace and path
|
// Creates a new Block with the id "examplemod:example_block", combining the namespace and path
|
||||||
public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block",
|
public static final RegistryObject<Block> EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE)));
|
||||||
() -> new Block(BlockBehaviour.Properties.of()
|
|
||||||
.setId(BLOCKS.key("example_block"))
|
|
||||||
.mapColor(MapColor.STONE)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
|
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
|
||||||
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block",
|
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));
|
||||||
() -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().setId(ITEMS.key("example_block")))
|
|
||||||
);
|
|
||||||
|
|
||||||
// Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
|
// Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
|
||||||
public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item",
|
public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
|
||||||
() -> new Item(new Item.Properties()
|
.alwaysEat().nutrition(1).saturationMod(2f).build())));
|
||||||
.setId(ITEMS.key("example_item"))
|
|
||||||
.food(new FoodProperties.Builder()
|
|
||||||
.alwaysEdible()
|
|
||||||
.nutrition(1)
|
|
||||||
.saturationModifier(2f)
|
|
||||||
.build()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
// Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
|
// Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
|
||||||
public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
|
public static final RegistryObject<CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
|
||||||
@@ -75,7 +60,8 @@ public class ExampleMod {
|
|||||||
output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
|
output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
|
||||||
}).build());
|
}).build());
|
||||||
|
|
||||||
public ExampleMod(FMLJavaModLoadingContext context) {
|
public ExampleMod(FMLJavaModLoadingContext context)
|
||||||
|
{
|
||||||
IEventBus modEventBus = context.getModEventBus();
|
IEventBus modEventBus = context.getModEventBus();
|
||||||
|
|
||||||
// Register the commonSetup method for modloading
|
// Register the commonSetup method for modloading
|
||||||
@@ -98,7 +84,8 @@ public class ExampleMod {
|
|||||||
context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
|
context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void commonSetup(final FMLCommonSetupEvent event) {
|
private void commonSetup(final FMLCommonSetupEvent event)
|
||||||
|
{
|
||||||
// Some common setup code
|
// Some common setup code
|
||||||
LOGGER.info("HELLO FROM COMMON SETUP");
|
LOGGER.info("HELLO FROM COMMON SETUP");
|
||||||
|
|
||||||
@@ -111,23 +98,27 @@ public class ExampleMod {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add the example block item to the building blocks tab
|
// Add the example block item to the building blocks tab
|
||||||
private void addCreative(BuildCreativeModeTabContentsEvent event) {
|
private void addCreative(BuildCreativeModeTabContentsEvent event)
|
||||||
|
{
|
||||||
if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS)
|
if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS)
|
||||||
event.accept(EXAMPLE_BLOCK_ITEM);
|
event.accept(EXAMPLE_BLOCK_ITEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
// You can use SubscribeEvent and let the Event Bus discover methods to call
|
// You can use SubscribeEvent and let the Event Bus discover methods to call
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(ServerStartingEvent event) {
|
public void onServerStarting(ServerStartingEvent event)
|
||||||
|
{
|
||||||
// Do something when the server starts
|
// Do something when the server starts
|
||||||
LOGGER.info("HELLO from server starting");
|
LOGGER.info("HELLO from server starting");
|
||||||
}
|
}
|
||||||
|
|
||||||
// You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
|
// You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
|
||||||
@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
||||||
public static class ClientModEvents {
|
public static class ClientModEvents
|
||||||
|
{
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onClientSetup(FMLClientSetupEvent event) {
|
public static void onClientSetup(FMLClientSetupEvent event)
|
||||||
|
{
|
||||||
// Some client setup code
|
// Some client setup code
|
||||||
LOGGER.info("HELLO FROM CLIENT SETUP");
|
LOGGER.info("HELLO FROM CLIENT SETUP");
|
||||||
LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
|
LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
|
||||||
@@ -1,48 +1,56 @@
|
|||||||
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
@@ -96,7 +_,10 @@
|
@@ -113,7 +_,10 @@
|
||||||
GlStateManager._texParameter(3553, 34892, 0);
|
GlStateManager._texParameter(3553, 34892, 0);
|
||||||
GlStateManager._texParameter(3553, 10242, 33071);
|
GlStateManager._texParameter(3553, 10242, 33071);
|
||||||
GlStateManager._texParameter(3553, 10243, 33071);
|
GlStateManager._texParameter(3553, 10243, 33071);
|
||||||
+ if (!stencilEnabled)
|
+ if (!stencilEnabled)
|
||||||
GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
|
GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, (IntBuffer)null);
|
||||||
+ else
|
+ else
|
||||||
+ GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
|
+ GlStateManager._texImage2D(3553, 0, org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8, this.width, this.height, 0, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL, org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setFilterMode(9728, true);
|
this.setFilterMode(9728);
|
||||||
@@ -108,6 +_,7 @@
|
@@ -124,7 +_,14 @@
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
|
||||||
if (this.useDepth) {
|
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
if (this.useDepth) {
|
||||||
+ if (stencilEnabled) GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
+ if(!stencilEnabled)
|
||||||
}
|
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
||||||
|
+ else if(net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
|
||||||
|
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
||||||
|
+ } else {
|
||||||
|
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
|
||||||
|
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
this.checkStatus();
|
this.checkStatus();
|
||||||
@@ -229,5 +_,26 @@
|
@@ -292,4 +_,27 @@
|
||||||
|
public int getDepthTextureId() {
|
||||||
public int getDepthTextureId() {
|
return this.depthBufferId;
|
||||||
return this.depthBufferId;
|
}
|
||||||
+ }
|
|
||||||
+
|
+
|
||||||
+ private boolean stencilEnabled = false;
|
+ /*================================ FORGE START ================================================*/
|
||||||
+ /**
|
+ private boolean stencilEnabled = false;
|
||||||
+ * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
|
+ /**
|
||||||
+ * Modders must call this directly to set things up.
|
+ * Attempts to enable 8 bits of stencil buffer on this FrameBuffer.
|
||||||
+ * This is to prevent the default cause where graphics cards do not support stencil bits.
|
+ * Modders must call this directly to set things up.
|
||||||
+ * <b>Make sure to call this on the main render thread!</b>
|
+ * This is to prevent the default cause where graphics cards do not support stencil bits.
|
||||||
+ */
|
+ * <b>Make sure to call this on the main render thread!</b>
|
||||||
+ public void enableStencil() {
|
+ */
|
||||||
+ if (stencilEnabled) return;
|
+ public void enableStencil() {
|
||||||
+ stencilEnabled = true;
|
+ if(stencilEnabled) return;
|
||||||
+ this.resize(viewWidth, viewHeight);
|
+ stencilEnabled = true;
|
||||||
+ }
|
+ this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Returns wither or not this FBO has been successfully initialized with stencil bits.
|
+ * Returns wither or not this FBO has been successfully initialized with stencil bits.
|
||||||
+ * If not, and a modder wishes it to be, they must call enableStencil.
|
+ * If not, and a modder wishes it to be, they must call enableStencil.
|
||||||
+ */
|
+ */
|
||||||
+ public boolean isStencilEnabled() {
|
+ public boolean isStencilEnabled() {
|
||||||
+ return this.stencilEnabled;
|
+ return this.stencilEnabled;
|
||||||
}
|
+ }
|
||||||
|
+ /*================================ FORGE END ================================================*/
|
||||||
}
|
}
|
||||||
@@ -1,32 +1,19 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
@@ -94,6 +_,11 @@
|
@@ -501,9 +_,16 @@
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public static boolean _isBlendEnabled() {
|
}
|
||||||
+ RenderSystem.assertOnRenderThread();
|
|
||||||
+ return BLEND.mode.enabled;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static void _disableBlend() {
|
|
||||||
RenderSystem.assertOnRenderThread();
|
|
||||||
BLEND.mode.disable();
|
|
||||||
@@ -519,9 +_,17 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Stores the last values sent into glMultiTexCoord2f */
|
+ /* Stores the last values sent into glMultiTexCoord2f */
|
||||||
+ public static float lastBrightnessX = 0.0f;
|
+ public static float lastBrightnessX = 0.0f;
|
||||||
+ public static float lastBrightnessY = 0.0f;
|
+ public static float lastBrightnessY = 0.0f;
|
||||||
+
|
public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
|
||||||
public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
|
RenderSystem.assertOnRenderThreadOrInit();
|
||||||
RenderSystem.assertOnRenderThreadOrInit();
|
GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
|
||||||
GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
|
+ if (p_84161_ == GL13.GL_TEXTURE1) {
|
||||||
+ if (p_84161_ == GL13.GL_TEXTURE1) {
|
+ lastBrightnessX = p_84162_;
|
||||||
+ lastBrightnessX = p_84162_;
|
+ lastBrightnessY = p_84163_;
|
||||||
+ lastBrightnessY = p_84163_;
|
+ }
|
||||||
+ }
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
|
public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
|
||||||
@@ -1,30 +1,28 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/Window.java
|
--- a/com/mojang/blaze3d/platform/Window.java
|
||||||
+++ b/com/mojang/blaze3d/platform/Window.java
|
+++ b/com/mojang/blaze3d/platform/Window.java
|
||||||
@@ -88,7 +_,8 @@
|
@@ -81,7 +_,8 @@
|
||||||
GLFW.glfwWindowHint(139267, 2);
|
GLFW.glfwWindowHint(139267, 2);
|
||||||
GLFW.glfwWindowHint(139272, 204801);
|
GLFW.glfwWindowHint(139272, 204801);
|
||||||
GLFW.glfwWindowHint(139270, 1);
|
GLFW.glfwWindowHint(139270, 1);
|
||||||
- this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
|
- this.window = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L);
|
||||||
+ this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
|
+ this.window = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L);
|
||||||
+ if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
|
+ if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
|
||||||
if (monitor != null) {
|
if (monitor != null) {
|
||||||
VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
||||||
this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
|
this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
|
||||||
@@ -100,6 +_,7 @@
|
@@ -93,6 +_,7 @@
|
||||||
this.windowedX = this.x = aint1[0];
|
this.windowedX = this.x = aint1[0];
|
||||||
this.windowedY = this.y = aint[0];
|
this.windowedY = this.y = aint[0];
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
GLFW.glfwMakeContextCurrent(this.window);
|
GLFW.glfwMakeContextCurrent(this.window);
|
||||||
GL.createCapabilities();
|
GL.createCapabilities();
|
||||||
@@ -267,6 +_,9 @@
|
@@ -242,6 +_,7 @@
|
||||||
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
||||||
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
||||||
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
||||||
+ if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
|
+ if (this.framebufferHeight == 0 || this.framebufferWidth==0) net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w->this.framebufferWidth=w, h->this.framebufferHeight=h);
|
||||||
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
|
}
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onResize(long p_85428_, int p_85429_, int p_85430_) {
|
private void onResize(long p_85428_, int p_85429_, int p_85430_) {
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
--- a/com/mojang/blaze3d/systems/RenderSystem.java
|
|
||||||
+++ b/com/mojang/blaze3d/systems/RenderSystem.java
|
|
||||||
@@ -196,6 +_,11 @@
|
|
||||||
GlStateManager._depthMask(p_69459_);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public static boolean isBlendEnabled() {
|
|
||||||
+ assertOnRenderThread();
|
|
||||||
+ return GlStateManager._isBlendEnabled();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static void enableBlend() {
|
|
||||||
assertOnRenderThread();
|
|
||||||
GlStateManager._enableBlend();
|
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
--- a/com/mojang/blaze3d/vertex/BufferBuilder.java
|
||||||
|
+++ b/com/mojang/blaze3d/vertex/BufferBuilder.java
|
||||||
|
@@ -477,4 +_,14 @@
|
||||||
|
this.sorting = p_277855_;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Forge start
|
||||||
|
+ public void putBulkData(ByteBuffer buffer) {
|
||||||
|
+ ensureCapacity(buffer.limit() + this.format.getVertexSize());
|
||||||
|
+ this.buffer.position(this.nextElementByte);
|
||||||
|
+ this.buffer.put(buffer);
|
||||||
|
+ this.buffer.position(0);
|
||||||
|
+ this.vertices += buffer.limit() / this.format.getVertexSize();
|
||||||
|
+ this.nextElementByte += buffer.limit();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
@@ -14,7 +_,7 @@
|
@@ -11,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Quaternionf;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class PoseStack {
|
-public class PoseStack {
|
||||||
+public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
|
+public class PoseStack implements net.minecraftforge.client.extensions.IForgePoseStack {
|
||||||
private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), p_85848_ -> {
|
private final Deque<PoseStack.Pose> poseStack = Util.make(Queues.newArrayDeque(), (p_85848_) -> {
|
||||||
Matrix4f matrix4f = new Matrix4f();
|
Matrix4f matrix4f = new Matrix4f();
|
||||||
Matrix3f matrix3f = new Matrix3f();
|
Matrix3f matrix3f = new Matrix3f();
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
|
||||||
|
+++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
|
||||||
|
@@ -46,7 +_,7 @@
|
||||||
|
|
||||||
|
public void endVertex() {
|
||||||
|
Vector3f vector3f = this.normalInversePose.transform(new Vector3f(this.nx, this.ny, this.nz));
|
||||||
|
- Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
|
||||||
|
+ Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
|
||||||
|
Vector4f vector4f = this.cameraInversePose.transform(new Vector4f(this.x, this.y, this.z, 1.0F));
|
||||||
|
vector4f.rotateY((float)Math.PI);
|
||||||
|
vector4f.rotateX((-(float)Math.PI / 2F));
|
||||||
@@ -1,23 +1,38 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -14,7 +_,7 @@
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public interface VertexConsumer {
|
-public interface VertexConsumer {
|
||||||
+public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
|
+public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
|
||||||
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
|
VertexConsumer vertex(double p_85945_, double p_85946_, double p_85947_);
|
||||||
|
|
||||||
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
|
VertexConsumer color(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
|
||||||
@@ -133,9 +_,11 @@
|
@@ -64,6 +_,10 @@
|
||||||
|
}
|
||||||
|
|
||||||
int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
|
default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, int[] p_86002_, int p_86003_, boolean p_86004_) {
|
||||||
int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
|
+ putBulkData(p_85996_, p_85997_, p_85998_, p_85999_, p_86000_, p_86001_, 1, p_86002_, p_86003_, p_86004_);
|
||||||
+ k1 = applyBakedLighting(k1, bytebuffer);
|
+ }
|
||||||
float f10 = bytebuffer.getFloat(16);
|
+
|
||||||
float f9 = bytebuffer.getFloat(20);
|
+ default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, float alpha, int[] p_86002_, int p_86003_, boolean p_86004_) {
|
||||||
Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
|
float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
|
||||||
+ applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
|
int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
|
||||||
this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), j1, f10, f9, p_85993_, k1, vector3f.x(), vector3f.y(), vector3f.z());
|
int[] aint1 = p_85997_.getVertices();
|
||||||
|
@@ -99,11 +_,13 @@
|
||||||
|
f5 = afloat[k] * p_86001_;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
- int l = aint[k];
|
||||||
|
+ int l = applyBakedLighting(p_86002_[k], bytebuffer);
|
||||||
|
float f9 = bytebuffer.getFloat(16);
|
||||||
|
float f10 = bytebuffer.getFloat(20);
|
||||||
|
Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
|
||||||
|
- this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
|
||||||
|
+ applyBakedNormals(vector3f, bytebuffer, p_85996_.normal());
|
||||||
|
+ float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
|
||||||
|
+ this.vertex(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,41 +1,14 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
@@ -14,7 +_,7 @@
|
@@ -176,4 +_,11 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
return i;
|
||||||
|
}
|
||||||
@OnlyIn(Dist.CLIENT)
|
}
|
||||||
-public class VertexFormat {
|
|
||||||
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
|
|
||||||
public static final int UNKNOWN_ELEMENT = -1;
|
|
||||||
private final List<VertexFormatElement> elements;
|
|
||||||
private final List<String> names;
|
|
||||||
@@ -23,6 +_,7 @@
|
|
||||||
private final int[] offsetsByElement = new int[32];
|
|
||||||
@Nullable
|
|
||||||
private VertexBuffer immediateDrawVertexBuffer;
|
|
||||||
+ private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
|
|
||||||
|
|
||||||
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
|
||||||
this.elements = p_343616_;
|
|
||||||
@@ -35,6 +_,11 @@
|
|
||||||
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
|
||||||
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
|
||||||
}
|
|
||||||
+
|
+
|
||||||
+ ImmutableMap.Builder<String, VertexFormatElement> elements = ImmutableMap.builder();
|
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
||||||
+ for (int i = 0; i < p_343616_.size(); i++)
|
+ public int getOffset(int index) { return offsets.getInt(index); }
|
||||||
+ elements.put(p_345241_.get(i), p_343616_.get(i));
|
+ public boolean hasPosition() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.POSITION); }
|
||||||
+ this.elementMapping = elements.buildOrThrow();
|
+ public boolean hasNormal() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.NORMAL); }
|
||||||
}
|
+ public boolean hasColor() { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.COLOR); }
|
||||||
|
+ public boolean hasUV(int which) { return elements.stream().anyMatch(e -> e.getUsage() == VertexFormatElement.Usage.UV && e.getIndex() == which); }
|
||||||
public static VertexFormat.Builder builder() {
|
}
|
||||||
@@ -141,6 +_,9 @@
|
|
||||||
|
|
||||||
return vertexbuffer;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
|
||||||
+ public int getOffset(int index) { return offsetsByElement[index]; }
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public static class Builder {
|
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
--- a/com/mojang/blaze3d/vertex/VertexFormatElement.java
|
||||||
|
+++ b/com/mojang/blaze3d/vertex/VertexFormatElement.java
|
||||||
|
@@ -90,6 +_,10 @@
|
||||||
|
this.usage.clearBufferState(this.index, p_166964_);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public int getElementCount() {
|
||||||
|
+ return count;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public static enum Type {
|
||||||
|
FLOAT(4, "Float", 5126),
|
||||||
@@ -1,31 +1,31 @@
|
|||||||
--- a/com/mojang/math/Transformation.java
|
--- a/com/mojang/math/Transformation.java
|
||||||
+++ b/com/mojang/math/Transformation.java
|
+++ b/com/mojang/math/Transformation.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -13,7 +_,7 @@
|
||||||
import org.joml.Quaternionf;
|
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
|
import org.joml.Vector3fc;
|
||||||
|
|
||||||
-public final class Transformation {
|
-public final class Transformation {
|
||||||
+public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
|
+public final class Transformation implements net.minecraftforge.common.extensions.IForgeTransformation {
|
||||||
private final Matrix4f matrix;
|
private final Matrix4f matrix;
|
||||||
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
|
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create((p_269604_) -> {
|
||||||
p_269604_ -> p_269604_.group(
|
return p_269604_.group(ExtraCodecs.VECTOR3F.fieldOf("translation").forGetter((p_269599_) -> {
|
||||||
@@ -169,5 +_,19 @@
|
@@ -156,6 +_,19 @@
|
||||||
vector3f1.lerp(p_175938_.getScale(), p_175939_);
|
public int hashCode() {
|
||||||
quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
|
return Objects.hash(this.matrix);
|
||||||
return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
|
}
|
||||||
+ }
|
|
||||||
+
|
+
|
||||||
+ private Matrix3f normalTransform = null;
|
+ private Matrix3f normalTransform = null;
|
||||||
+ public Matrix3f getNormalMatrix() {
|
+ public Matrix3f getNormalMatrix() {
|
||||||
+ checkNormalTransform();
|
+ checkNormalTransform();
|
||||||
+ return normalTransform;
|
+ return normalTransform;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
+ private void checkNormalTransform() {
|
+ private void checkNormalTransform() {
|
||||||
+ if (normalTransform == null) {
|
+ if (normalTransform == null) {
|
||||||
+ normalTransform = new Matrix3f(matrix);
|
+ normalTransform = new Matrix3f(matrix);
|
||||||
+ normalTransform.invert();
|
+ normalTransform.invert();
|
||||||
+ normalTransform.transpose();
|
+ normalTransform.transpose();
|
||||||
+ }
|
+ }
|
||||||
}
|
+ }
|
||||||
}
|
|
||||||
|
public Transformation slerp(Transformation p_175938_, float p_175939_) {
|
||||||
|
Vector3f vector3f = this.getTranslation();
|
||||||
+7
-7
@@ -1,9 +1,10 @@
|
|||||||
--- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
|
--- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
|
||||||
+++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
|
+++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
|
||||||
@@ -71,6 +_,15 @@
|
@@ -61,6 +_,15 @@
|
||||||
}
|
return Component.empty().append(this.lines.title).append(": ").append(this.lines.detail);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
+ @Override
|
||||||
+ public boolean keyPressed(int key, int scanCode, int modifiers) {
|
+ public boolean keyPressed(int key, int scanCode, int modifiers) {
|
||||||
+ if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
|
+ if (key == org.lwjgl.glfw.GLFW.GLFW_KEY_ESCAPE) {
|
||||||
+ minecraft.setScreen(this.nextScreen);
|
+ minecraft.setScreen(this.nextScreen);
|
||||||
@@ -12,7 +13,6 @@
|
|||||||
+ return super.keyPressed(key, scanCode, modifiers);
|
+ return super.keyPressed(key, scanCode, modifiers);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ @Override
|
public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
|
||||||
public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) {
|
super.render(p_283497_, p_88680_, p_88681_, p_88682_);
|
||||||
super.render(p_283497_, p_88680_, p_88681_, p_88682_);
|
p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
|
||||||
p_283497_.drawCenteredString(this.font, this.lines.title, this.width / 2, 80, -1);
|
|
||||||
@@ -1,48 +1,48 @@
|
|||||||
--- a/net/minecraft/CrashReport.java
|
--- a/net/minecraft/CrashReport.java
|
||||||
+++ b/net/minecraft/CrashReport.java
|
+++ b/net/minecraft/CrashReport.java
|
||||||
@@ -58,14 +_,9 @@
|
@@ -59,14 +_,9 @@
|
||||||
if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
|
if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
|
||||||
p_127520_.append("-- Head --\n");
|
p_127520_.append("-- Head --\n");
|
||||||
p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
|
p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
|
||||||
- p_127520_.append("Stacktrace:\n");
|
- p_127520_.append("Stacktrace:\n");
|
||||||
-
|
|
||||||
- for (StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
|
|
||||||
- p_127520_.append("\t").append("at ").append(stacktraceelement);
|
|
||||||
- p_127520_.append("\n");
|
|
||||||
- }
|
|
||||||
-
|
-
|
||||||
|
- for(StackTraceElement stacktraceelement : this.uncategorizedStackTrace) {
|
||||||
|
- p_127520_.append("\t").append("at ").append((Object)stacktraceelement);
|
||||||
- p_127520_.append("\n");
|
- p_127520_.append("\n");
|
||||||
+ p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
|
- }
|
||||||
+ p_127520_.append("Stacktrace:");
|
|
||||||
+ p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (CrashReportCategory crashreportcategory : this.details) {
|
|
||||||
@@ -73,6 +_,7 @@
|
|
||||||
p_127520_.append("\n\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
+ net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
|
|
||||||
this.systemReport.appendToCrashReportString(p_127520_);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -92,18 +_,7 @@
|
|
||||||
throwable.setStackTrace(this.exception.getStackTrace());
|
|
||||||
}
|
|
||||||
|
|
||||||
- String s;
|
|
||||||
- try {
|
|
||||||
- stringwriter = new StringWriter();
|
|
||||||
- printwriter = new PrintWriter(stringwriter);
|
|
||||||
- throwable.printStackTrace(printwriter);
|
|
||||||
- s = stringwriter.toString();
|
|
||||||
- } finally {
|
|
||||||
- IOUtils.closeQuietly((Writer)stringwriter);
|
|
||||||
- IOUtils.closeQuietly((Writer)printwriter);
|
|
||||||
- }
|
|
||||||
-
|
-
|
||||||
- return s;
|
- p_127520_.append("\n");
|
||||||
+ return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
|
+ p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
|
||||||
}
|
+ p_127520_.append("Stacktrace:");
|
||||||
|
+ p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
|
||||||
|
}
|
||||||
|
|
||||||
public String getFriendlyReport(ReportType p_343869_, List<String> p_342487_) {
|
for(CrashReportCategory crashreportcategory : this.details) {
|
||||||
|
@@ -74,6 +_,7 @@
|
||||||
|
p_127520_.append("\n\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
+ net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
|
||||||
|
this.systemReport.appendToCrashReportString(p_127520_);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -93,18 +_,7 @@
|
||||||
|
throwable.setStackTrace(this.exception.getStackTrace());
|
||||||
|
}
|
||||||
|
|
||||||
|
- String s;
|
||||||
|
- try {
|
||||||
|
- stringwriter = new StringWriter();
|
||||||
|
- printwriter = new PrintWriter(stringwriter);
|
||||||
|
- throwable.printStackTrace(printwriter);
|
||||||
|
- s = stringwriter.toString();
|
||||||
|
- } finally {
|
||||||
|
- IOUtils.closeQuietly((Writer)stringwriter);
|
||||||
|
- IOUtils.closeQuietly((Writer)printwriter);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return s;
|
||||||
|
+ return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getFriendlyReport() {
|
||||||
@@ -1,37 +1,38 @@
|
|||||||
--- a/net/minecraft/CrashReportCategory.java
|
--- a/net/minecraft/CrashReportCategory.java
|
||||||
+++ b/net/minecraft/CrashReportCategory.java
|
+++ b/net/minecraft/CrashReportCategory.java
|
||||||
@@ -112,8 +_,10 @@
|
@@ -102,8 +_,10 @@
|
||||||
if (astacktraceelement.length <= 0) {
|
if (astacktraceelement.length <= 0) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
- this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
|
- this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_];
|
||||||
- System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
|
- System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length);
|
||||||
+ int len = astacktraceelement.length - 3 - p_128149_;
|
+ int len = astacktraceelement.length - 3 - p_128149_;
|
||||||
+ if (len <= 0) len = astacktraceelement.length;
|
+ if (len <= 0) len = astacktraceelement.length;
|
||||||
+ this.stackTrace = new StackTraceElement[len];
|
+ this.stackTrace = new StackTraceElement[len];
|
||||||
+ System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
|
+ System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length);
|
||||||
return this.stackTrace.length;
|
return this.stackTrace.length;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,16 +_,16 @@
|
@@ -147,17 +_,17 @@
|
||||||
|
|
||||||
if (this.stackTrace != null && this.stackTrace.length > 0) {
|
if (this.stackTrace != null && this.stackTrace.length > 0) {
|
||||||
p_128169_.append("\nStacktrace:");
|
p_128169_.append("\nStacktrace:");
|
||||||
-
|
-
|
||||||
- for (StackTraceElement stacktraceelement : this.stackTrace) {
|
- for(StackTraceElement stacktraceelement : this.stackTrace) {
|
||||||
- p_128169_.append("\n\tat ");
|
- p_128169_.append("\n\tat ");
|
||||||
- p_128169_.append(stacktraceelement);
|
- p_128169_.append((Object)stacktraceelement);
|
||||||
- }
|
- }
|
||||||
+ p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
|
+ p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public StackTraceElement[] getStacktrace() {
|
}
|
||||||
return this.stackTrace;
|
|
||||||
+ }
|
public StackTraceElement[] getStacktrace() {
|
||||||
|
return this.stackTrace;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ public void applyStackTrace(Throwable t) {
|
+ public void applyStackTrace(Throwable t) {
|
||||||
+ this.stackTrace = t.getStackTrace();
|
+ this.stackTrace = t.getStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
|
public static void populateBlockDetails(CrashReportCategory p_178951_, LevelHeightAccessor p_178952_, BlockPos p_178953_, @Nullable BlockState p_178954_) {
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
--- a/net/minecraft/SharedConstants.java
|
--- a/net/minecraft/SharedConstants.java
|
||||||
+++ b/net/minecraft/SharedConstants.java
|
+++ b/net/minecraft/SharedConstants.java
|
||||||
@@ -170,6 +_,7 @@
|
@@ -215,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
+ if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
|
+ if (System.getProperty("io.netty.leakDetection.level") == null) // Forge: allow level to be manually specified
|
||||||
ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
|
ResourceLeakDetector.setLevel(NETTY_LEAK_DETECTION);
|
||||||
CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
|
CommandSyntaxException.ENABLE_COMMAND_STACK_TRACES = false;
|
||||||
CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
|
CommandSyntaxException.BUILT_IN_EXCEPTIONS = new BrigadierExceptions();
|
||||||
@@ -1,11 +1,23 @@
|
|||||||
--- a/net/minecraft/Util.java
|
--- a/net/minecraft/Util.java
|
||||||
+++ b/net/minecraft/Util.java
|
+++ b/net/minecraft/Util.java
|
||||||
@@ -264,7 +_,7 @@
|
@@ -180,6 +_,11 @@
|
||||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
return 255;
|
||||||
.getChoiceType(p_137552_, p_137553_);
|
}
|
||||||
} catch (IllegalArgumentException illegalargumentexception) {
|
|
||||||
- LOGGER.error("No data fixer registered for {}", p_137553_);
|
+ // We add these inner classes to compensate for Mojang's missing inner classes and shift the anonymous class index.
|
||||||
+ LOGGER.debug("No data fixer registered for {}", p_137553_);
|
+ // This allows us to obfuscate subsequent anonymous inner classes correctly.
|
||||||
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
+ @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT1 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
|
||||||
throw illegalargumentexception;
|
+ @SuppressWarnings("unused") private static java.util.function.LongSupplier INNER_CLASS_SHIFT2 = new java.util.function.LongSupplier() { public long getAsLong() { return 0; } };
|
||||||
}
|
+
|
||||||
|
public static ExecutorService backgroundExecutor() {
|
||||||
|
return BACKGROUND_EXECUTOR;
|
||||||
|
}
|
||||||
|
@@ -254,7 +_,7 @@
|
||||||
|
try {
|
||||||
|
type = DataFixers.getDataFixer().getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion())).getChoiceType(p_137552_, p_137553_);
|
||||||
|
} catch (IllegalArgumentException illegalargumentexception) {
|
||||||
|
- LOGGER.error("No data fixer registered for {}", (Object)p_137553_);
|
||||||
|
+ LOGGER.debug("No data fixer registered for {}", (Object)p_137553_);
|
||||||
|
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
||||||
|
throw illegalargumentexception;
|
||||||
|
}
|
||||||
Loaded 100 of 2265 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user