mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ccfaf4812 | ||
|
|
3ed3d2b9cf | ||
|
|
3d374fe732 | ||
|
|
a02f3f9841 | ||
|
|
c5e462f7d2 | ||
|
|
d1f79d6655 | ||
|
|
9d5e81b1a9 | ||
|
|
a1c275df46 | ||
|
|
4ef7fe8bd8 | ||
|
|
ce8838e721 | ||
|
|
b7e2593d48 | ||
|
|
33d177f02e | ||
|
|
5d2186df63 | ||
|
|
77af36b807 | ||
|
|
54eeca0aed | ||
|
|
3de0566425 | ||
|
|
a5ebf3b645 | ||
|
|
63d0496cc4 | ||
|
|
31f623e794 | ||
|
|
eb001a6382 | ||
|
|
504dcad849 | ||
|
|
81f7f029c3 | ||
|
|
207c1997c9 | ||
|
|
e348ae5b84 | ||
|
|
0f3b8ee830 | ||
|
|
b4b6e48a7a | ||
|
|
d50a3b5ab7 | ||
|
|
88904a1d09 | ||
|
|
b864faf0ef | ||
|
|
c97eabc0c4 | ||
|
|
6ae39c8597 | ||
|
|
dcafb4f633 | ||
|
|
1ea7ce9831 | ||
|
|
674f2efd54 | ||
|
|
02e82c672d | ||
|
|
b25f6e3a7c | ||
|
|
e69b07a54a | ||
|
|
79efe2ac36 | ||
|
|
464483db5b | ||
|
|
f49adb285f | ||
|
|
55862dfd1d | ||
|
|
124b9bd8d3 | ||
|
|
bae3915728 | ||
|
|
b3c2c62c7e | ||
|
|
68698d70c1 | ||
|
|
d55dee9394 | ||
|
|
2d114f2719 | ||
|
|
3e6583af01 | ||
|
|
762f6a7d78 | ||
|
|
3c5a534b7a | ||
|
|
bc62d1693a | ||
|
|
554ead8d4a | ||
|
|
ec5ac91389 | ||
|
|
f63813d929 | ||
|
|
5d4825ac4b | ||
|
|
3024ef7707 | ||
|
|
0d3b488728 | ||
|
|
a01012f20c | ||
|
|
d4e3ef4a22 | ||
|
|
d7293a78dc | ||
|
|
8e4e02e258 | ||
|
|
2f5a6fee48 | ||
|
|
0e74886f8d | ||
|
|
07977ba242 | ||
|
|
a894c244fe | ||
|
|
cf32a799a4 | ||
|
|
0fda1d9393 | ||
|
|
c7f0acbe38 | ||
|
|
9c06c20023 | ||
|
|
041084d1da | ||
|
|
e643d0a11f | ||
|
|
5efb8d3f12 | ||
|
|
70537542d1 | ||
|
|
bd4b059c2b | ||
|
|
e0d2c68c5b | ||
|
|
86d4bda32e | ||
|
|
98b90f26bc | ||
|
|
4e7c471fa3 | ||
|
|
ec6f9fc6e7 | ||
|
|
427fef1d4b | ||
|
|
83594b0b0a | ||
|
|
b76064e57a | ||
|
|
b2bf70c7f1 | ||
|
|
384286a453 | ||
|
|
d93b7db69a | ||
|
|
bdbde4bb0f | ||
|
|
e2a68ad903 | ||
|
|
46cfe50108 | ||
|
|
4b423a3087 | ||
|
|
7d0b07e858 | ||
|
|
40220600b0 | ||
|
|
0c7a0e927c | ||
|
|
60e8157b9a | ||
|
|
b8f5e4553b | ||
|
|
de587eb50a |
No files matched your search
@@ -3,6 +3,7 @@
|
|||||||
*.patch text eol=lf
|
*.patch text eol=lf
|
||||||
*.java text eol=lf
|
*.java text eol=lf
|
||||||
*.gradle text eol=crlf
|
*.gradle text eol=crlf
|
||||||
|
**/MANIFEST.MF text eol=crlf
|
||||||
*.png binary
|
*.png binary
|
||||||
*.gif binary
|
*.gif binary
|
||||||
*.exe binary
|
*.exe binary
|
||||||
|
|||||||
@@ -41,3 +41,8 @@ src/*/generated/**/.cache/
|
|||||||
|
|
||||||
/ForgeRoot.ipr
|
/ForgeRoot.ipr
|
||||||
/ForgeRoot.iws
|
/ForgeRoot.iws
|
||||||
|
|
||||||
|
# APT stuff
|
||||||
|
/*/.gitignore
|
||||||
|
/*/.factorypath
|
||||||
|
/*/.apt_generated/
|
||||||
+19
-3
@@ -3,6 +3,7 @@ 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
|
||||||
|
|
||||||
@@ -12,13 +13,19 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
abstract Property<Closure<Boolean>> getPredicate()
|
||||||
|
|
||||||
private final Set<String> matches = new HashSet<>()
|
private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
|
||||||
|
|
||||||
@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)) {
|
||||||
matches.add(parent.name)
|
var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
|
||||||
|
|
||||||
|
// only add non-synthetic methods
|
||||||
|
if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
|
||||||
|
methods.add(node.name + node.desc)
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,6 +34,15 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
@Override
|
@Override
|
||||||
protected Object getData() {
|
protected Object getData() {
|
||||||
return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
var array = new ArrayList<Object>()
|
||||||
|
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.') }()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+51
-18
@@ -92,18 +92,18 @@ 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.3'
|
||||||
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'
|
final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.1.1: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 {
|
installerextra {
|
||||||
extendsFrom(bootstrap)
|
extendsFrom(bootstrap)
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
api.extendsFrom(installer)
|
api.extendsFrom(installer)
|
||||||
}
|
}
|
||||||
@@ -117,9 +117,9 @@ dependencies {
|
|||||||
bootstrap(libs.securemodules) // Has Union file system in it
|
bootstrap(libs.securemodules) // Has Union file system in it
|
||||||
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) { version { strictly '5.0.4' } }
|
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)
|
||||||
@@ -209,7 +209,6 @@ patcher {
|
|||||||
'--all',
|
'--all',
|
||||||
'--validate',
|
'--validate',
|
||||||
'--output', rootProject.file('src/main/generated/'),
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
'--validate',
|
|
||||||
'--existing', sourceSets.main.resources.srcDirs[0],
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
'--assetsDir', downloadAssets.output,
|
'--assetsDir', downloadAssets.output,
|
||||||
'--assetIndex', "{asset_index}"
|
'--assetIndex', "{asset_index}"
|
||||||
@@ -227,6 +226,30 @@ patcher {
|
|||||||
'--assetsDir', downloadAssets.output,
|
'--assetsDir', downloadAssets.output,
|
||||||
'--assetIndex', "{asset_index}"
|
'--assetIndex', "{asset_index}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
forge_client_data {
|
||||||
|
args '--launchTarget', 'forge_dev_client_data',
|
||||||
|
'--mod', 'forge',
|
||||||
|
'--all',
|
||||||
|
'--output', rootProject.file('src/main/generated/'),
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--assetsDir', downloadAssets.output,
|
||||||
|
'--assetIndex', "{asset_index}"
|
||||||
|
}
|
||||||
|
|
||||||
|
forge_client_data_test {
|
||||||
|
source sourceSets.test
|
||||||
|
args '--launchTarget', 'forge_dev',
|
||||||
|
'--launchEntry', 'minecraft/net.minecraft.client.data.Main',
|
||||||
|
'--launchData',
|
||||||
|
'--mod', '.+',
|
||||||
|
'--all',
|
||||||
|
'--output', rootProject.file('src/test/generated/'),
|
||||||
|
'--existing', sourceSets.main.resources.srcDirs[0],
|
||||||
|
'--existing', sourceSets.test.resources.srcDirs[0],
|
||||||
|
'--assetsDir', downloadAssets.output,
|
||||||
|
'--assetIndex', "{asset_index}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,11 +291,11 @@ tasks.register('downloadCrowdin', Download) {
|
|||||||
tasks.userdevConfig.configure {
|
tasks.userdevConfig.configure {
|
||||||
configurations.installer.allDependencies.forEach {
|
configurations.installer.allDependencies.forEach {
|
||||||
def dep = it.toString()
|
def dep = it.toString()
|
||||||
if (it instanceof ProjectDependency)
|
if (it instanceof ProjectDependency)
|
||||||
dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
|
dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version"
|
||||||
libraries.add(dep)
|
libraries.add(dep)
|
||||||
}
|
}
|
||||||
|
|
||||||
inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
|
inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
@@ -284,6 +307,13 @@ tasks.userdevConfig.configure {
|
|||||||
args '--assetsDir', '{assets_root}'
|
args '--assetsDir', '{assets_root}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clientData {
|
||||||
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
|
args '--launchTarget', "forge_userdev_client_data"
|
||||||
|
args '--assetIndex', '{asset_index}'
|
||||||
|
args '--assetsDir', '{assets_root}'
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
environment 'MCP_MAPPINGS', '{mcp_mappings}'
|
||||||
property 'forge.enableGameTest', 'true'
|
property 'forge.enableGameTest', 'true'
|
||||||
@@ -381,13 +411,13 @@ tasks.register('extractInheritance', ExtractInheritance) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
||||||
jar = createJoinedSRG.output
|
jar = createClientOfficial.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.
|
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
||||||
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
||||||
&& insn.name == 'm_6518_'
|
&& insn.name == 'finalizeSpawn'
|
||||||
&& 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/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -493,7 +523,7 @@ tasks.register('serverShimJar', Jar) {
|
|||||||
from {
|
from {
|
||||||
zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
|
zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' }
|
||||||
}
|
}
|
||||||
|
|
||||||
attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
|
attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' '))
|
||||||
}
|
}
|
||||||
archiveClassifier = 'shim'
|
archiveClassifier = 'shim'
|
||||||
@@ -586,7 +616,7 @@ tasks.register('checkJarCompatibility', CheckJarCompatibility) {
|
|||||||
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output })
|
||||||
|
|
||||||
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
inputJar = project.tasks.named('reobfJar').flatMap { it.output }
|
||||||
|
|
||||||
commonLibraries.from(project.configurations.minecraftImplementation)
|
commonLibraries.from(project.configurations.minecraftImplementation)
|
||||||
commonLibraries.from(project.configurations.installer)
|
commonLibraries.from(project.configurations.installer)
|
||||||
}
|
}
|
||||||
@@ -607,11 +637,11 @@ tasks.register('launcherJson', LauncherJson).configure {
|
|||||||
|
|
||||||
tasks.register('installerJson', InstallerJson) {
|
tasks.register('installerJson', InstallerJson) {
|
||||||
icon = rootProject.file('icon.ico')
|
icon = rootProject.file('icon.ico')
|
||||||
|
|
||||||
// Json to install into the client's launcher
|
// Json to install into the client's launcher
|
||||||
dependsOn(launcherJson)
|
dependsOn(launcherJson)
|
||||||
input.from(launcherJson.output)
|
input.from(launcherJson.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)
|
||||||
@@ -923,6 +953,9 @@ 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/'
|
||||||
@@ -1056,7 +1089,7 @@ publishing {
|
|||||||
license gradleutils.pom.Licenses.LGPLv2_1
|
license gradleutils.pom.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-1
@@ -44,7 +44,7 @@ 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.
|
options.forkOptions.jvmArgs += '-Xmx6G' // 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
|
||||||
@@ -75,3 +75,11 @@ eclipse {
|
|||||||
// Run when importing the project
|
// Run when importing the project
|
||||||
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
||||||
}
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
// IntelliJ IDEA does not do this by itself anymore...
|
||||||
|
downloadJavadoc = true
|
||||||
|
downloadSources = true
|
||||||
|
}
|
||||||
|
}
|
||||||
+31
-6
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[][Download]
|
[][Download]
|
||||||
[][Download] [][Discord] [][Patreon]
|
)][Download] [][Discord] [][Patreon]
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
|
|
||||||
| Version | Support |
|
| Version | Support |
|
||||||
|---------| ------------- |
|
|--------------|-----------------------------|
|
||||||
| 1.20.x | Active |
|
| All versions | [Supported][Support-Policy] |
|
||||||
| 1.19.x | Legacy |
|
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
|
|
||||||
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
|
## Required Java Versions
|
||||||
|
|
||||||
|
We require the version of Java that Minecraft requires, which is currently:
|
||||||
|
|
||||||
|
| Minecraft | Java |
|
||||||
|
|---------------|-------------------|
|
||||||
|
| 1.20.6+ | [21][Adoptium-21] |
|
||||||
|
| 1.18 - 1.20.4 | [17][Adoptium-17] |
|
||||||
|
| 1.17.1 | [16][Adoptium-16] |
|
||||||
|
| 1.16.5- | [8][Adoptium-8] |
|
||||||
|
|
||||||
|
**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
|
||||||
|
|
||||||
# Creating Mods
|
# Creating Mods
|
||||||
|
|
||||||
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
||||||
@@ -58,13 +70,25 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
to use and modify. However, it costs money to run such a large project as this, so please consider
|
to use and modify. However, it costs money to run such a large project as this, so please consider
|
||||||
[becoming a patron][Patreon].*
|
[becoming a patron][Patreon].*
|
||||||
|
|
||||||
|
### Thanks
|
||||||
|
[](https://www.yourkit.com/)
|
||||||
|
|
||||||
|
YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
|
||||||
|
|
||||||
[Contributing]: ./CONTRIBUTING.md
|
[Contributing]: ./CONTRIBUTING.md
|
||||||
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
|
||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
|
|
||||||
|
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
|
||||||
|
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
|
||||||
|
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
|
||||||
|
[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
|
||||||
|
[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
|
||||||
|
|
||||||
[Forum]: https://forums.minecraftforge.net/
|
[Forum]: https://forums.minecraftforge.net/
|
||||||
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
||||||
|
[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
|
||||||
|
|
||||||
[Discord]: https://discord.minecraftforge.net/
|
[Discord]: https://discord.minecraftforge.net/
|
||||||
|
|
||||||
@@ -74,3 +98,4 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
|
||||||
|
|
||||||
[Patreon]: https://www.patreon.com/LexManos
|
[Patreon]: https://www.patreon.com/LexManos
|
||||||
|
[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/
|
||||||
@@ -25,7 +25,18 @@ import java.util.function.Supplier;
|
|||||||
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
|
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
|
||||||
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
|
*
|
||||||
|
* @deprecated Historically, this allowed for safe execution of code on the correct side by exploiting a low-level
|
||||||
|
* detail in Java 8, but in newer versions a simple if check is enough.
|
||||||
|
* <br>
|
||||||
|
* For example:
|
||||||
|
* <pre>{@code
|
||||||
|
* if (FMLEnvironment.dist.isClient()) {
|
||||||
|
* // client code here
|
||||||
|
* }
|
||||||
|
* }</pre>
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public final class DistExecutor
|
public final class DistExecutor
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|||||||
@@ -68,13 +68,15 @@ 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>
|
default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar) {
|
final ProgressMeter progressBar
|
||||||
|
) {
|
||||||
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e),
|
e -> CompletableFuture.completedFuture(null),
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e));
|
e -> CompletableFuture.completedFuture(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ 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;
|
||||||
@@ -18,103 +16,67 @@ 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;
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
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 new NoopTransition();
|
return ModStateTransitionHelper.NOOP;
|
||||||
}
|
}
|
||||||
|
|
||||||
default <T extends Event & IModBusEvent>
|
default CompletableFuture<Void> build(
|
||||||
CompletableFuture<Void> build(final String name,
|
final String name,
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
) {
|
||||||
|
return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
|
||||||
this.eventFunctionStream().get()
|
|
||||||
.map(f -> (EventGenerator<T>) f)
|
|
||||||
.reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
|
|
||||||
.ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
|
|
||||||
|
|
||||||
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
|
||||||
final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
|
|
||||||
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
|
||||||
.thenApplyAsync(n -> {
|
|
||||||
progressBar.label(progressBar.name() + ": dispatching "+name);
|
|
||||||
return null;
|
|
||||||
}, parallelExecutor)
|
|
||||||
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
|
||||||
.thenApply(r -> {
|
|
||||||
postSyncTask.apply(syncExecutor);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
||||||
return ModLoadingStage::nextState;
|
return ModLoadingStage::nextState;
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T extends Event & IModBusEvent>
|
/**
|
||||||
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
|
* This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
|
||||||
final Executor parallelExecutor,
|
* ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
*/
|
||||||
final ProgressMeter progressBar,
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
final EventGenerator<T> eventGenerator,
|
default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
|
return () -> Stream.ofNullable(eventFunction());
|
||||||
final EventGenerator<T> nextGenerator) {
|
}
|
||||||
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
|
|
||||||
|
@Nullable
|
||||||
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
|
default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
|
||||||
completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
|
return null;
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -9,18 +9,15 @@ 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.HashMap;
|
import java.util.HashSet;
|
||||||
import java.util.IdentityHashMap;
|
import java.util.IdentityHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.Set;
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
@@ -33,13 +30,8 @@ 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;
|
||||||
@@ -48,11 +40,14 @@ public abstract class ModContainer
|
|||||||
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
||||||
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
||||||
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
final Set<ModContainer> dependencies = new HashSet<>();
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
@@ -82,58 +77,35 @@ public abstract class ModContainer
|
|||||||
/**
|
/**
|
||||||
* Errored container state, used for filtering. Does nothing.
|
* Errored container state, used for filtering. Does nothing.
|
||||||
*/
|
*/
|
||||||
ModContainer()
|
ModContainer() {
|
||||||
{
|
|
||||||
this.modLoadingStage = ModLoadingStage.ERROR;
|
this.modLoadingStage = ModLoadingStage.ERROR;
|
||||||
modId = "BROKEN";
|
modId = "BROKEN";
|
||||||
namespace = "BROKEN";
|
namespace = "BROKEN";
|
||||||
modInfo = null;
|
modInfo = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the modid for this mod
|
* @return the modid for this mod
|
||||||
*/
|
*/
|
||||||
public final String getModId()
|
public final String getModId() {
|
||||||
{
|
|
||||||
return modId;
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the resource prefix for the mod
|
* @return the resource prefix for the mod
|
||||||
*/
|
*/
|
||||||
public final String getNamespace()
|
public final String getNamespace() {
|
||||||
{
|
|
||||||
return namespace;
|
return namespace;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The current loading stage for this mod
|
* @return The current loading stage for this mod
|
||||||
*/
|
*/
|
||||||
public ModLoadingStage getCurrentState()
|
public ModLoadingStage getCurrentState() {
|
||||||
{
|
|
||||||
return modLoadingStage;
|
return modLoadingStage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
|
public IModInfo getModInfo() {
|
||||||
final ModContainer target,
|
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
|
|
||||||
final Executor executor) {
|
|
||||||
return CompletableFuture
|
|
||||||
.runAsync(() -> {
|
|
||||||
ModLoadingContext.get().setActiveContainer(target);
|
|
||||||
target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
|
|
||||||
target.acceptEvent(eventGenerator.apply(target));
|
|
||||||
}, executor)
|
|
||||||
.whenComplete((mc, exception) -> {
|
|
||||||
target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
|
|
||||||
progressBar.increment();
|
|
||||||
ModLoadingContext.get().setActiveContainer(null);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public IModInfo getModInfo()
|
|
||||||
{
|
|
||||||
return modInfo;
|
return modInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,8 +114,7 @@ public abstract class ModContainer
|
|||||||
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
||||||
{
|
|
||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,6 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -15,21 +12,15 @@ 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.AbstractMap;
|
import java.util.Collections;
|
||||||
import java.util.ArrayList;
|
|
||||||
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.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;
|
||||||
@@ -43,20 +34,21 @@ public class ModList {
|
|||||||
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, ModFileInfo> fileById;
|
private final Map<String, IModFileInfo> 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).map(ModFileInfo.class::cast).collect(Collectors.toList());
|
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
|
||||||
this.sortedList = sortedList.stream().
|
this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
|
||||||
map(ModInfo.class::cast).
|
var byId = new HashMap<String, IModFileInfo>();
|
||||||
collect(Collectors.toList());
|
for (var file : this.modFiles) {
|
||||||
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
|
for (var mod : file.getMods())
|
||||||
map(ModInfo.class::cast).
|
byId.put(mod.getModId(), mod.getOwningFile());
|
||||||
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
}
|
||||||
|
this.fileById = Collections.unmodifiableMap(byId);
|
||||||
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,54 +87,9 @@ public class ModList {
|
|||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
<T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
|
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
|
|
||||||
return executor -> gather(
|
|
||||||
this.mods.stream()
|
|
||||||
.map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
|
|
||||||
.toList()
|
|
||||||
).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
|
|
||||||
}
|
|
||||||
static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
|
|
||||||
if (t.stream().noneMatch(e->e.getValue()!=null)) {
|
|
||||||
return CompletableFuture.completedFuture(null);
|
|
||||||
} else {
|
|
||||||
final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
|
|
||||||
CompletableFuture<Void> cf = new CompletableFuture<>();
|
|
||||||
final RuntimeException accumulator = new RuntimeException();
|
|
||||||
cf.completeExceptionally(accumulator);
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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()];
|
|
||||||
for (var future : futures) {
|
|
||||||
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) {
|
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()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,6 +148,10 @@ 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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
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;
|
||||||
@@ -33,8 +32,6 @@ import java.util.function.BiConsumer;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.CORE;
|
import static net.minecraftforge.fml.Logging.CORE;
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
@@ -74,8 +71,7 @@ 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 final LoadingModList loadingModList;
|
private final LoadingModList loadingModList;
|
||||||
|
|
||||||
@@ -84,17 +80,15 @@ public class ModLoader
|
|||||||
private final List<ModLoadingWarning> loadingWarnings;
|
private final List<ModLoadingWarning> loadingWarnings;
|
||||||
private final ModStateManager stateManager;
|
private final ModStateManager stateManager;
|
||||||
private static boolean loadingStateValid;
|
private static boolean loadingStateValid;
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
|
||||||
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() {
|
||||||
{
|
|
||||||
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)
|
||||||
.collect(Collectors.toList());
|
.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());
|
||||||
@@ -156,7 +150,7 @@ public class ModLoader
|
|||||||
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.getFirst());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.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);
|
||||||
@@ -169,7 +163,7 @@ public class ModLoader
|
|||||||
|
|
||||||
if (!failedBounds.isEmpty()) {
|
if (!failedBounds.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.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()
|
||||||
@@ -177,19 +171,42 @@ public class ModLoader
|
|||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
|
final var modContainers = new HashMap<String, ModContainer>();
|
||||||
.map(ModFileInfo::getFile)
|
for (var file : loadingModList.getModFiles()) {
|
||||||
.map(this::buildMods)
|
var containers = this.buildMods(file.getFile());
|
||||||
.flatMap(List::stream)
|
for (var container : containers)
|
||||||
.toList();
|
modContainers.put(container.getModId(), container);
|
||||||
|
}
|
||||||
|
|
||||||
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.getFirst());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.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(this.modList)).sum());
|
||||||
@@ -214,7 +231,7 @@ public class ModLoader
|
|||||||
for (IModLoadingState mls : stateList) {
|
for (IModLoadingState mls : stateList) {
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,10 +260,12 @@ 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) {
|
||||||
@@ -256,36 +275,38 @@ public class ModLoader
|
|||||||
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
||||||
if (hasNotModLoadingEx) {
|
if (hasNotModLoadingEx) {
|
||||||
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
||||||
.filter(ModLoadingException.class::isInstance)
|
.filter(ModLoadingException.class::isInstance)
|
||||||
.map(ModLoadingException.class::cast)
|
.map(ModLoadingException.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.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<>();
|
||||||
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
for (var mod : modFile.getModFileInfo().getMods())
|
||||||
|
modInfoMap.put(mod.getModId(), mod);
|
||||||
|
|
||||||
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
||||||
final List<ModContainer> containers = modFile.getScanResult().getTargets()
|
final List<ModContainer> containers = new ArrayList<>();
|
||||||
.entrySet()
|
for (var entry : modFile.getScanResult().getTargets().entrySet()) {
|
||||||
.stream()
|
var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
|
||||||
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
|
if (container != null)
|
||||||
.filter(Objects::nonNull)
|
containers.add(container);
|
||||||
.toList();
|
}
|
||||||
|
|
||||||
if (containers.size() != modInfoMap.size()) {
|
if (containers.size() != modInfoMap.size()) {
|
||||||
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
||||||
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
||||||
|
|
||||||
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
|
LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
|
||||||
modFile.getFilePath(),
|
modFile.getFilePath(),
|
||||||
containers.size(), containerIds,
|
containers.size(), containerIds,
|
||||||
modInfoMap.size(), modIds);
|
modInfoMap.size(), modIds);
|
||||||
@@ -300,15 +321,15 @@ 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, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
|
||||||
|
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
final String modId = idToProviderEntry.getKey();
|
|
||||||
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
|
||||||
|
|
||||||
IModInfo info = modInfoMap.get(modId);
|
IModInfo info = modInfoMap.get(modId);
|
||||||
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
||||||
if (info == null)
|
if (info == null)
|
||||||
@@ -351,6 +372,7 @@ 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());
|
||||||
@@ -359,9 +381,15 @@ 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, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
postEventWithWrapInModOrder(event,
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
public <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());
|
||||||
@@ -374,13 +402,11 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,19 +26,23 @@ import java.util.function.ToIntFunction;
|
|||||||
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @param transition optional state transition information
|
* @param transition optional state transition information
|
||||||
*/
|
*/
|
||||||
public record ModLoadingState(String name, String previous,
|
public record ModLoadingState(
|
||||||
Function<ModList, String> message,
|
String name,
|
||||||
ToIntFunction<ModList> size,
|
String previous,
|
||||||
ModLoadingPhase phase,
|
Function<ModList, String> message,
|
||||||
Optional<Consumer<ModList>> inlineRunnable,
|
ToIntFunction<ModList> size,
|
||||||
Optional<IModStateTransition> transition) implements IModLoadingState {
|
ModLoadingPhase phase,
|
||||||
|
Optional<Consumer<ModList>> inlineRunnable,
|
||||||
|
Optional<IModStateTransition> transition
|
||||||
|
) implements IModLoadingState {
|
||||||
@Override
|
@Override
|
||||||
public <T extends Event & IModBusEvent>
|
public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
|
) {
|
||||||
var transition = this.transition.orElse(null);
|
var transition = this.transition.orElse(null);
|
||||||
return transition == null
|
return transition == null
|
||||||
? Optional.empty()
|
? Optional.empty()
|
||||||
@@ -52,9 +56,12 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param name the name of the state
|
* @param name the name of the state
|
||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
||||||
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
|
return of(name, phase).after(previous).empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -65,11 +72,13 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a default message
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -81,11 +90,14 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a custom message
|
* @return a mod loading state with state transition information and a custom message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous,
|
public static ModLoadingState withTransition(final String name, final String previous,
|
||||||
final Function<ModList, String> message, final ModLoadingPhase phase,
|
final Function<ModList, String> message, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).message(message).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -97,9 +109,59 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @return a mod loading state with an inline runnable and default message
|
* @return a mod loading state with an inline runnable and default message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final Consumer<ModList> inline) {
|
final Consumer<ModList> inline) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
|
return of(name, phase).after(previous).withInline(inline);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder of(final String name, final ModLoadingPhase phase) {
|
||||||
|
return new Builder(name, phase);
|
||||||
|
}
|
||||||
|
|
||||||
|
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());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
/*
|
||||||
|
* 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.apache.commons.io.FilenameUtils;
|
import org.apache.commons.io.FilenameUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -25,9 +26,66 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
|
|||||||
|
|
||||||
public class ConfigFileTypeHandler {
|
public class ConfigFileTypeHandler {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
static final ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
|
|
||||||
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
||||||
|
|
||||||
|
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
|
||||||
|
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
|
||||||
|
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
|
||||||
|
|
||||||
|
private final @Nullable ModConfig.Type type;
|
||||||
|
private @Nullable FileWatcher watcher;
|
||||||
|
|
||||||
|
// exists for bin compat
|
||||||
|
public ConfigFileTypeHandler() {
|
||||||
|
this(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the handler for the given {@link ModConfig.Type}.
|
||||||
|
*
|
||||||
|
* @param type The type to get the handler for
|
||||||
|
* @return The handler
|
||||||
|
*/
|
||||||
|
static ConfigFileTypeHandler get(ModConfig.Type type) {
|
||||||
|
return switch (type) {
|
||||||
|
case CLIENT -> CLIENT;
|
||||||
|
case COMMON -> COMMON;
|
||||||
|
case SERVER -> SERVER;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
|
||||||
|
*
|
||||||
|
* @return The watcher
|
||||||
|
*
|
||||||
|
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
|
||||||
|
*/
|
||||||
|
FileWatcher getWatcher() {
|
||||||
|
if (this.watcher == null) {
|
||||||
|
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
|
||||||
|
this.watcher = new FileWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.watcher;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
|
||||||
|
* {@link FileWatcher#stop()}.
|
||||||
|
*/
|
||||||
|
void stopWatcher() {
|
||||||
|
if (this.watcher == null) return;
|
||||||
|
|
||||||
|
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
|
||||||
|
this.watcher.stop();
|
||||||
|
this.watcher = null;
|
||||||
|
}
|
||||||
|
|
||||||
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
||||||
return (c) -> {
|
return (c) -> {
|
||||||
final Path configPath = configBasePath.resolve(c.getFileName());
|
final Path configPath = configBasePath.resolve(c.getFileName());
|
||||||
@@ -37,7 +95,7 @@ public class ConfigFileTypeHandler {
|
|||||||
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
||||||
writingMode(WritingMode.REPLACE).
|
writingMode(WritingMode.REPLACE).
|
||||||
build();
|
build();
|
||||||
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -46,9 +104,9 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
||||||
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
|
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
||||||
return configData;
|
return configData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -56,9 +114,9 @@ public class ConfigFileTypeHandler {
|
|||||||
public void unload(Path configBasePath, ModConfig config) {
|
public void unload(Path configBasePath, ModConfig config) {
|
||||||
Path configPath = configBasePath.resolve(config.getFileName());
|
Path configPath = configBasePath.resolve(config.getFileName());
|
||||||
try {
|
try {
|
||||||
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
this.getWatcher().removeWatch(configPath);
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,6 +167,11 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
||||||
|
}
|
||||||
|
|
||||||
private record ConfigWatcher(
|
private record ConfigWatcher(
|
||||||
ModConfig modConfig,
|
ModConfig modConfig,
|
||||||
CommentedFileConfig commentedFileConfig,
|
CommentedFileConfig commentedFileConfig,
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ 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;
|
||||||
@@ -52,11 +55,24 @@ public class ConfigTracker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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)) {
|
for (ModConfig config : this.configSets.get(type)) {
|
||||||
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
|
||||||
|
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) {
|
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class ModConfig
|
|||||||
this.spec = spec;
|
this.spec = spec;
|
||||||
this.fileName = fileName;
|
this.fileName = fileName;
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.configHandler = ConfigFileTypeHandler.TOML;
|
this.configHandler = ConfigFileTypeHandler.get(type);
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.INSTANCE.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+30
-16
@@ -90,7 +90,12 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
// The GL ID of the window. Used for all operations
|
// The GL ID of the window. Used for all operations
|
||||||
private long window;
|
private long window;
|
||||||
// The thread that contains and ticks the window while Forge is loading mods
|
// The thread that contains and ticks the window while Forge is loading mods
|
||||||
private ScheduledExecutorService renderScheduler;
|
private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
||||||
|
final var thread = Executors.defaultThreadFactory().newThread(r);
|
||||||
|
thread.setName("EarlyDisplay");
|
||||||
|
thread.setDaemon(true);
|
||||||
|
return thread;
|
||||||
|
});
|
||||||
private int fbWidth;
|
private int fbWidth;
|
||||||
private int fbHeight;
|
private int fbHeight;
|
||||||
private int fbScale;
|
private int fbScale;
|
||||||
@@ -149,7 +154,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED);
|
||||||
|
|
||||||
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion));
|
StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion()));
|
||||||
performanceInfo = new PerformanceInfo();
|
performanceInfo = new PerformanceInfo();
|
||||||
return start(mcVersion, forgeVersion);
|
return start(mcVersion, forgeVersion);
|
||||||
}
|
}
|
||||||
@@ -238,7 +243,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
var date = Calendar.getInstance();
|
var date = Calendar.getInstance();
|
||||||
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1))
|
||||||
this.elements.add(0, RenderElement.squir());
|
this.elements.addFirst(RenderElement.squir());
|
||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
@@ -287,12 +292,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
* Start the window and Render Thread; we're ready to go.
|
* Start the window and Render Thread; we're ready to go.
|
||||||
*/
|
*/
|
||||||
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
|
||||||
renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
|
|
||||||
final var thread = Executors.defaultThreadFactory().newThread(r);
|
|
||||||
thread.setName("EarlyDisplay");
|
|
||||||
thread.setDaemon(true);
|
|
||||||
return thread;
|
|
||||||
});
|
|
||||||
initWindow(mcVersion);
|
initWindow(mcVersion);
|
||||||
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
|
||||||
return this::periodicTick;
|
return this::periodicTick;
|
||||||
@@ -304,7 +303,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
return this.glVersion;
|
return this.glVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void crashElegantly(String errorDetails) {
|
private static void crashElegantly(String errorDetails) {
|
||||||
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");
|
||||||
@@ -512,7 +511,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
this.winY = y;
|
this.winY = y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
private static void handleLastGLFWError(BiConsumer<Integer, String> handler) {
|
||||||
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
try (MemoryStack memorystack = MemoryStack.stackPush()) {
|
||||||
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
PointerBuffer pointerbuffer = memorystack.mallocPointer(1);
|
||||||
int error = glfwGetError(pointerbuffer);
|
int error = glfwGetError(pointerbuffer);
|
||||||
@@ -604,10 +603,25 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge").orElseThrow();
|
final var FORGE_MODULE = "net.minecraftforge.forge";
|
||||||
getClass().getModule().addReads(fm);
|
var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
|
||||||
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
|
if (forge_module == null)
|
||||||
loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
|
throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
|
||||||
|
|
||||||
|
getClass().getModule().addReads(forge_module);
|
||||||
|
|
||||||
|
|
||||||
|
var clz = Class.forName(forge_module, "net.minecraftforge.client.loading.ForgeLoadingOverlay");
|
||||||
|
|
||||||
|
for (var mtd : clz.getDeclaredMethods()) {
|
||||||
|
if (Modifier.isStatic(mtd.getModifiers()) && "newInstance".equals(mtd.getName())) {
|
||||||
|
this.loadingOverlay = mtd;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadingOverlay == null)
|
||||||
|
throw new IllegalStateException("Could not find static newInstace method in " + clz.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getFramebufferTextureId() {
|
public int getFramebufferTextureId() {
|
||||||
@@ -625,7 +639,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
this.elements.addFirst(RenderElement.mojang(textureId, framecount));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|||||||
+4
-5
@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
|
|||||||
import java.lang.management.MemoryUsage;
|
import java.lang.management.MemoryUsage;
|
||||||
|
|
||||||
public class PerformanceInfo {
|
public class PerformanceInfo {
|
||||||
|
private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
|
||||||
|
|
||||||
private final boolean showCPUUsage;
|
private final boolean showCPUUsage;
|
||||||
private final OperatingSystemMXBean osBean;
|
private final OperatingSystemMXBean osBean;
|
||||||
private final MemoryMXBean memoryBean;
|
|
||||||
|
|
||||||
private float memory;
|
private float memory;
|
||||||
private String text;
|
private String text;
|
||||||
@@ -24,15 +24,14 @@ public class PerformanceInfo {
|
|||||||
PerformanceInfo() {
|
PerformanceInfo() {
|
||||||
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
||||||
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
||||||
memoryBean = ManagementFactory.getMemoryMXBean();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void update() {
|
void update() {
|
||||||
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
|
final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
|
||||||
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
||||||
|
|
||||||
if (!showCPUUsage) {
|
if (!showCPUUsage) {
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
|
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ public class PerformanceInfo {
|
|||||||
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
|
text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
|
||||||
}
|
}
|
||||||
|
|
||||||
String text() {
|
String text() {
|
||||||
|
|||||||
+30
-39
@@ -22,8 +22,8 @@ public class RenderElement {
|
|||||||
static int globalAlpha = 255;
|
static int globalAlpha = 255;
|
||||||
private int retireCount;
|
private int retireCount;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
interface Renderer {
|
interface Renderer {
|
||||||
|
|
||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int frame);
|
||||||
|
|
||||||
default Renderer then(Renderer r) {
|
default Renderer then(Renderer r) {
|
||||||
@@ -38,6 +38,9 @@ public class RenderElement {
|
|||||||
interface TextureRenderer {
|
interface TextureRenderer {
|
||||||
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
interface Initializer extends Supplier<Renderer> {}
|
interface Initializer extends Supplier<Renderer> {}
|
||||||
|
|
||||||
@@ -56,11 +59,18 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public RenderElement(final Initializer rendererInitializer) {
|
public RenderElement(final Initializer rendererInitializer) {
|
||||||
this.bb = new SimpleBufferBuilder(1);
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
this.renderer = rendererInitializer.get();
|
this.renderer = rendererInitializer.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RenderElement(Renderer renderer) {
|
||||||
|
this.bb = new SimpleBufferBuilder(1);
|
||||||
|
this.renderer = renderer;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean render(DisplayContext ctx, int count) {
|
public boolean render(DisplayContext ctx, int count) {
|
||||||
this.renderer.accept(bb, ctx, count);
|
this.renderer.accept(bb, ctx, count);
|
||||||
return this.retireCount == 0 || this.retireCount < count;
|
return this.retireCount == 0 || this.retireCount < count;
|
||||||
@@ -75,7 +85,7 @@ public class RenderElement {
|
|||||||
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
List<SimpleFont.DisplayText> texts = new ArrayList<>();
|
||||||
for (int i = messages.size() - 1; i >= 0; i--) {
|
for (int i = messages.size() - 1; i >= 0; i--) {
|
||||||
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
final StartupNotificationManager.AgeMessage pair = messages.get(i);
|
||||||
final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f);
|
||||||
if (fade <0.01f) continue;
|
if (fade <0.01f) continue;
|
||||||
Message msg = pair.message();
|
Message msg = pair.message();
|
||||||
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF;
|
||||||
@@ -84,19 +94,9 @@ public class RenderElement {
|
|||||||
|
|
||||||
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
font.generateVerticesForTexts(10, context.scaledHeight() - texts.size() * font.lineSpacing() + font.descent() - 10, bb, texts.toArray(SimpleFont.DisplayText[]::new));
|
||||||
}
|
}
|
||||||
public static RenderElement monag() {
|
|
||||||
return new RenderElement(RenderElement.initializeTexture("monagstudios.png", 45000, 4, (bb, ctx, sz, frame) -> {
|
|
||||||
var size = 256;
|
|
||||||
var x0 = (ctx.width() - 2 * size) / 2;
|
|
||||||
var y0 = 64;
|
|
||||||
QuadHelper.loadQuad(bb, x0, x0+size, y0, y0+size/2f, 0f, 1f, 0f, 0.5f, 0xFFFFFFFF);
|
|
||||||
QuadHelper.loadQuad(bb, x0+size, x0+2*size, y0, y0+size/2f, 0f, 1f, 0.5f, 1f, 0xFFFFFFFF);
|
|
||||||
}));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RenderElement mojang(final int textureId, final int frameStart) {
|
public static RenderElement mojang(final int textureId, final int frameStart) {
|
||||||
return new RenderElement(()->(bb, ctx, frame) -> {
|
return new RenderElement((bb, ctx, frame) -> {
|
||||||
var size = 256 * ctx.scale();
|
var size = 256 * ctx.scale();
|
||||||
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
var x0 = (ctx.scaledWidth() - 2 * size) / 2;
|
||||||
var y0 = 64 * ctx.scale() + 32;
|
var y0 = 64 * ctx.scale() + 32;
|
||||||
@@ -148,11 +148,11 @@ public class RenderElement {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
public static RenderElement progressBars(SimpleFont font) {
|
public static RenderElement progressBars(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RenderElement performanceBar(SimpleFont font) {
|
public static RenderElement performanceBar(SimpleFont font) {
|
||||||
return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) {
|
||||||
@@ -187,10 +187,10 @@ public class RenderElement {
|
|||||||
}
|
}
|
||||||
private static float[] indeterminateBar(int frame, boolean isActive) {
|
private static float[] indeterminateBar(int frame, boolean isActive) {
|
||||||
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
if (RenderElement.globalAlpha != 0xFF || !isActive) {
|
||||||
return new float[] {0f,1f};
|
return new float[] { 0f, 1f };
|
||||||
} else {
|
} else {
|
||||||
var progress = frame % 100;
|
int progress = frame % 100;
|
||||||
return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)};
|
return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,8 +249,8 @@ public class RenderElement {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) {
|
||||||
return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
return (bb, context, frame) -> renderText(font, textGenerator, bb, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) {
|
||||||
@@ -264,14 +264,13 @@ public class RenderElement {
|
|||||||
private static TextGenerator text(int x, int y, String text, int colour) {
|
private static TextGenerator text(int x, int y, String text, int colour) {
|
||||||
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour));
|
||||||
}
|
}
|
||||||
private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
|
||||||
return ()->{
|
private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) {
|
||||||
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
return (bb, ctx, frame) -> {
|
return (bb, ctx, frame) -> {
|
||||||
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET);
|
||||||
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE);
|
||||||
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
renderTexture(bb, ctx, frame, imgSize, positionAndColour);
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,21 +280,13 @@ public class RenderElement {
|
|||||||
bb.draw();
|
bb.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(since = "1.21.5", forRemoval = true)
|
||||||
public static float clamp(float num, float min, float max) {
|
public static float clamp(float num, float min, float max) {
|
||||||
if (num < min) {
|
return Math.clamp(num, min, max);
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int clamp(int num, int min, int max) {
|
public static int clamp(int num, int min, int max) {
|
||||||
if (num < min) {
|
return Math.min(max, Math.max(num, min));
|
||||||
return min;
|
|
||||||
} else {
|
|
||||||
return Math.min(num, max);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int hsvToRGB(float hue, float saturation, float value) {
|
public static int hsvToRGB(float hue, float saturation, float value) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class SimpleFont {
|
|||||||
private final int textureNumber;
|
private final int textureNumber;
|
||||||
private final int lineSpacing;
|
private final int lineSpacing;
|
||||||
private final int descent;
|
private final int descent;
|
||||||
private final int GLYPH_COUNT = 127-32;
|
private static final int GLYPH_COUNT = 127 - 32;
|
||||||
private final Glyph[] glyphs;
|
private final Glyph[] glyphs;
|
||||||
|
|
||||||
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
private record Glyph(char c, int charwidth, int[] pos, float[] uv) {
|
||||||
@@ -120,7 +120,7 @@ public class SimpleFont {
|
|||||||
case '\n', '\t' -> 0;
|
case '\n', '\t' -> 0;
|
||||||
case ' ' -> glyphs[0].charwidth();
|
case ' ' -> glyphs[0].charwidth();
|
||||||
default -> {
|
default -> {
|
||||||
if (c - 32 < this.GLYPH_COUNT && c > 32) {
|
if (c - 32 < GLYPH_COUNT && c > 32) {
|
||||||
yield this.glyphs[c - 32].charwidth();
|
yield this.glyphs[c - 32].charwidth();
|
||||||
} else {
|
} else {
|
||||||
yield 0;
|
yield 0;
|
||||||
@@ -151,7 +151,7 @@ public class SimpleFont {
|
|||||||
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx());
|
||||||
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx());
|
||||||
default -> {
|
default -> {
|
||||||
if (c-32 < font.GLYPH_COUNT && c > 32) {
|
if (c-32 < GLYPH_COUNT && c > 32) {
|
||||||
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb);
|
||||||
}
|
}
|
||||||
yield pos;
|
yield pos;
|
||||||
|
|||||||
+21
-1
@@ -5,6 +5,7 @@ plugins {
|
|||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.licenser'
|
id 'net.minecraftforge.licenser'
|
||||||
id 'net.minecraftforge.gradleutils'
|
id 'net.minecraftforge.gradleutils'
|
||||||
|
alias(libs.plugins.apt)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: rootProject.file('build_shared.gradle')
|
apply from: rootProject.file('build_shared.gradle')
|
||||||
@@ -36,6 +37,7 @@ dependencies {
|
|||||||
implementation(libs.terminalconsoleappender)
|
implementation(libs.terminalconsoleappender)
|
||||||
implementation(libs.jimfs)
|
implementation(libs.jimfs)
|
||||||
|
|
||||||
|
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
|
||||||
implementation(libs.log4j.core)
|
implementation(libs.log4j.core)
|
||||||
annotationProcessor(libs.bundles.log4j)
|
annotationProcessor(libs.bundles.log4j)
|
||||||
|
|
||||||
@@ -85,7 +87,7 @@ publishing {
|
|||||||
license PomUtils.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
@@ -102,5 +104,23 @@ tasks.register('writeForgeVersionJson') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('generateResources').configure {
|
tasks.named('generateResources').configure {
|
||||||
|
dependsOn('eclipseJdt')
|
||||||
|
dependsOn('eclipseJdtApt')
|
||||||
|
dependsOn('eclipseFactorypath')
|
||||||
dependsOn('writeForgeVersionJson')
|
dependsOn('writeForgeVersionJson')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
eclipse {
|
||||||
|
classpath {
|
||||||
|
// We need to set the default output directory for the log4j annotation processor
|
||||||
|
// Ideally we'd just set the value, but the eclipse plugin deduplicates the output directories
|
||||||
|
// So we have to do a hacky whenMerged
|
||||||
|
//defaultOutputDir = file('bin/main')
|
||||||
|
file.whenMerged {
|
||||||
|
entries.each { entry ->
|
||||||
|
if (entry.kind == 'output' && entry.hasProperty('path'))
|
||||||
|
entry.path = 'bin/main'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+8
-1
@@ -50,7 +50,14 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
return isEmpty ? NAY : YAY;
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+24
-3
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
|
|||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -35,6 +36,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
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.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
||||||
|
private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
|
||||||
|
.map(it -> it.replace('.', '/'))
|
||||||
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
||||||
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
||||||
|
|
||||||
@@ -47,9 +51,26 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
// Let's skip processing classes that definitely don't have object holders
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
|
||||||
|
// Forge classes that aren't in the debug package (that package is used for tests)
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// Vanilla classes that don't have object holders
|
||||||
|
if (internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
|
||||||
|
if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean hasHolder(List<AnnotationNode> lst) {
|
private static boolean hasHolder(List<AnnotationNode> lst) {
|
||||||
|
|||||||
@@ -48,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -59,15 +65,14 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
|
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
|
||||||
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
Type array = Type.getType("[" + classType.getDescriptor());
|
Type array = Type.getType("[" + classType.getDescriptor());
|
||||||
String arrayDesc = array.getDescriptor();
|
String arrayDesc = array.getDescriptor();
|
||||||
|
|
||||||
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
||||||
|
|
||||||
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Static methods named "create" with first argument as a string
|
//Static methods named "create" with first argument as a string
|
||||||
List<MethodNode> candidates = classNode.methods.stream()
|
List<MethodNode> candidates = classNode.methods.stream()
|
||||||
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
||||||
|
|||||||
@@ -6,14 +6,13 @@
|
|||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
public class BackgroundWaiter {
|
public class BackgroundWaiter {
|
||||||
private static final ExecutorService runner = Executors.newSingleThreadExecutor();
|
|
||||||
|
|
||||||
public static void runAndTick(Runnable r, Runnable tick) {
|
public static void runAndTick(Runnable r, Runnable tick) {
|
||||||
|
var runner = Executors.newSingleThreadExecutor();
|
||||||
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
ImmediateWindowHandler.updateProgress("Loading bootstrap resources");
|
||||||
final Future<?> work = runner.submit(r);
|
final Future<?> work = runner.submit(r);
|
||||||
do {
|
do {
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading;
|
|||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import cpw.mods.modlauncher.api.*;
|
import cpw.mods.modlauncher.api.*;
|
||||||
import joptsimple.OptionSpecBuilder;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.Environment;
|
import net.minecraftforge.forgespi.Environment;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -19,7 +18,6 @@ import java.util.List;
|
|||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
import static net.minecraftforge.fml.loading.LogMarkers.CORE;
|
||||||
|
|
||||||
public class FMLServiceProvider implements ITransformationService {
|
public class FMLServiceProvider implements ITransformationService {
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge");
|
var fm = layer.findModule("net.minecraftforge.forge");
|
||||||
if (fm.isPresent()) {
|
if (fm.isPresent()) {
|
||||||
getClass().getModule().addReads(fm.get());
|
getClass().getModule().addReads(fm.get());
|
||||||
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
||||||
|
|||||||
@@ -5,31 +5,25 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -37,15 +31,14 @@ 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)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
this.sortedList = sortedList.stream()
|
this.sortedList = sortedList.stream()
|
||||||
.map(ModInfo.class::cast)
|
.map(ModInfo.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
this.fileById = this.modFiles.stream()
|
this.fileById = this.modFiles.stream()
|
||||||
.map(ModFileInfo::getMods)
|
.map(ModFileInfo::getMods)
|
||||||
.flatMap(Collection::stream)
|
.flatMap(Collection::stream)
|
||||||
@@ -54,21 +47,18 @@ 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)
|
||||||
@@ -76,8 +66,7 @@ public class LoadingModList
|
|||||||
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addAccessTransformers()
|
public void addAccessTransformers() {
|
||||||
{
|
|
||||||
for (ModFileInfo modFile : modFiles) {
|
for (ModFileInfo modFile : modFiles) {
|
||||||
ModFile mod = modFile.getFile();
|
ModFile mod = modFile.getFile();
|
||||||
var at = mod.getAccessTransformer().orElse(null);
|
var at = mod.getAccessTransformer().orElse(null);
|
||||||
@@ -87,21 +76,18 @@ public class LoadingModList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
@@ -109,55 +95,11 @@ public class LoadingModList
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Enumeration<URL> findAllURLsForResource(final String resName) {
|
public ModFileInfo getModFileById(String modid) {
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.google.common.graph.GraphBuilder;
|
import com.google.common.graph.GraphBuilder;
|
||||||
import com.google.common.graph.MutableGraph;
|
import com.google.common.graph.MutableGraph;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
@@ -20,235 +20,250 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collection;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static java.util.stream.Collectors.*;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class ModSorter
|
public class ModSorter {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final UniqueModListBuilder uniqueModListBuilder;
|
|
||||||
private List<ModFile> modFiles;
|
|
||||||
private List<ModInfo> sortedList;
|
|
||||||
private Map<String, IModInfo> modIdNameLookup;
|
|
||||||
private List<ModFile> systemMods;
|
|
||||||
|
|
||||||
private ModSorter(final List<ModFile> modFiles)
|
private record State(List<ModFile> files, List<ModInfo> mods) {}
|
||||||
{
|
|
||||||
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
private ModSorter() {}
|
||||||
}
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
|
||||||
|
State systemMods = detectSystemMods(mods);
|
||||||
|
List<ModFile> modFiles;
|
||||||
|
|
||||||
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
|
||||||
{
|
|
||||||
final ModSorter ms = new ModSorter(mods);
|
|
||||||
try {
|
try {
|
||||||
ms.buildUniqueList();
|
modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
// We cannot build any list with duped mods. We have to abort immediately and report it
|
// We cannot build any list with duped mods. We have to abort immediately and report it
|
||||||
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
||||||
// So all this is really doing is wasting time.
|
// So all this is really doing is wasting time.
|
||||||
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), e);
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var named = new HashMap<String, ModInfo>();
|
||||||
|
for (var file : modFiles) {
|
||||||
|
for (var info : file.getModInfos())
|
||||||
|
named.put(info.getModId(), (ModInfo)info);
|
||||||
|
}
|
||||||
|
|
||||||
// try and validate dependencies
|
// try and validate dependencies
|
||||||
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
|
||||||
|
|
||||||
// if we miss one or the other, we abort now
|
// if we miss one or the other, we abort now
|
||||||
if (!failedList.isEmpty()) {
|
if (!failedList.isEmpty()) {
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, lets try and sort the modlist and proceed
|
// Otherwise, lets try and sort the modlist and proceed
|
||||||
EarlyLoadingException earlyLoadingException = null;
|
|
||||||
try {
|
try {
|
||||||
ms.sort();
|
var sorted = sort(modFiles, named);
|
||||||
|
return LoadingModList.of(sorted.files(), sorted.mods(), null);
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
earlyLoadingException = e;
|
// The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
|
||||||
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
||||||
}
|
}
|
||||||
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sort()
|
private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
|
||||||
{
|
final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
|
||||||
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
|
||||||
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
|
||||||
AtomicInteger counter = new AtomicInteger();
|
|
||||||
Map<ModFileInfo, Integer> infos = modFiles.stream()
|
|
||||||
.map(ModFile::getModFileInfo)
|
|
||||||
.filter(ModFileInfo.class::isInstance)
|
|
||||||
.map(ModFileInfo.class::cast)
|
|
||||||
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
|
||||||
infos.keySet().forEach(graph::addNode);
|
|
||||||
modFiles.stream()
|
|
||||||
.map(ModFile::getModInfos)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.map(IModInfo::getDependencies)
|
|
||||||
.<IModInfo.ModVersion>flatMap(List::stream)
|
|
||||||
.forEach(dep -> addDependency(graph, dep));
|
|
||||||
|
|
||||||
final List<ModFileInfo> sorted;
|
int counter = 0;
|
||||||
try
|
var infos = new HashMap<ModInfo, Integer>();
|
||||||
{
|
for (var file : modFiles) {
|
||||||
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
if (file.getModFileInfo() instanceof ModFileInfo info) {
|
||||||
}
|
for (var imod : info.getMods()) {
|
||||||
catch (CyclePresentException e)
|
var mod = (ModInfo)imod;
|
||||||
{
|
infos.put(mod, counter++);
|
||||||
Set<Set<ModFileInfo>> cycles = e.getCycles();
|
graph.addNode(mod);
|
||||||
if (LOGGER.isErrorEnabled(LOADING))
|
}
|
||||||
{
|
|
||||||
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
|
|
||||||
}
|
}
|
||||||
var dataList = cycles.stream()
|
}
|
||||||
.flatMap(Set::stream)
|
|
||||||
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
|
for (var file : modFiles) {
|
||||||
.map(IModInfo::getModId)
|
for (var info : file.getModInfos()) {
|
||||||
.map(list -> new ExceptionData("fml.modloading.cycle", list))
|
for (var dep : info.getDependencies()) {
|
||||||
.toList();
|
// Ordering isn't effected by sides, should it be?
|
||||||
|
//if (!dep.getSide().isCorrectSide())
|
||||||
|
// continue;
|
||||||
|
|
||||||
|
var target = named.get(dep.getModId());
|
||||||
|
|
||||||
|
// soft dep that doesn't exist. No edge required.
|
||||||
|
if (target == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var self = (ModInfo)dep.getOwner();
|
||||||
|
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case BEFORE -> graph.putEdge(self, target);
|
||||||
|
case AFTER -> graph.putEdge(target, self);
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ModInfo> sorted;
|
||||||
|
try {
|
||||||
|
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
||||||
|
} catch (CyclePresentException e) {
|
||||||
|
Set<Set<ModInfo>> cycles = e.getCycles();
|
||||||
|
var buf = new StringBuilder();
|
||||||
|
buf.append("Mod Sorting failed - Detected Cycles: \n");
|
||||||
|
|
||||||
|
var dataList = new ArrayList<ExceptionData>();
|
||||||
|
for (var cycle : cycles) {
|
||||||
|
buf.append("\tCycle:\n");
|
||||||
|
for (var mod : cycle) {
|
||||||
|
var modDeps = new StringBuilder()
|
||||||
|
.append(mod.getModId())
|
||||||
|
.append(' ')
|
||||||
|
.append(mod.getDependencies().stream()
|
||||||
|
.filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
|
||||||
|
.map(dep -> dep.getOrdering().name() + " " + dep.getModId())
|
||||||
|
.collect(Collectors.joining(", "))
|
||||||
|
);
|
||||||
|
dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
|
||||||
|
buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.error(LOADING, buf.toString());
|
||||||
|
|
||||||
throw new EarlyLoadingException("Sorting error", e, dataList);
|
throw new EarlyLoadingException("Sorting error", e, dataList);
|
||||||
}
|
}
|
||||||
this.sortedList = sorted.stream()
|
|
||||||
.map(ModFileInfo::getMods)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.map(ModInfo.class::cast)
|
|
||||||
.collect(toList());
|
|
||||||
this.modFiles = sorted.stream()
|
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.collect(toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
var files = new LinkedHashSet<ModFile>();
|
||||||
{
|
var list = new ArrayList<ModInfo>();
|
||||||
final 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;
|
|
||||||
|
|
||||||
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
for (var mod : sorted) {
|
||||||
if (self == target)
|
files.add(mod.getOwningFile().getFile());
|
||||||
return; // in case a jar has two mods that have dependencies between
|
list.add(mod);
|
||||||
|
|
||||||
switch (dep.getOrdering()) {
|
|
||||||
case BEFORE -> topoGraph.putEdge(self, target);
|
|
||||||
case AFTER -> topoGraph.putEdge(target, self);
|
|
||||||
default -> {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files.stream().toList(), list);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buildUniqueList()
|
private static State detectSystemMods(final List<ModFile> modFiles) {
|
||||||
{
|
|
||||||
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
|
|
||||||
|
|
||||||
this.modFiles = uniqueModListData.modFiles();
|
|
||||||
|
|
||||||
detectSystemMods(uniqueModListData.modFilesByFirstId());
|
|
||||||
|
|
||||||
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
|
|
||||||
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
|
|
||||||
.collect(Collectors.toMap(
|
|
||||||
Map.Entry::getKey,
|
|
||||||
e -> e.getValue().get(0).getModInfos().get(0)
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
|
|
||||||
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
||||||
var systemMods = List.of("minecraft", "forge");
|
var systemMods = List.of("minecraft", "forge");
|
||||||
LOGGER.debug("Configured system mods: {}", systemMods);
|
LOGGER.debug("Configured system mods: {}", systemMods);
|
||||||
|
|
||||||
this.systemMods = new ArrayList<>();
|
var mods = new ArrayList<ModInfo>();
|
||||||
|
var files = new ArrayList<ModFile>();
|
||||||
for (var systemMod : systemMods) {
|
for (var systemMod : systemMods) {
|
||||||
var container = modFilesByFirstId.get(systemMod);
|
var mod = findMod(modFiles, systemMod);
|
||||||
if (container != null && !container.isEmpty()) {
|
if (mod == null)
|
||||||
LOGGER.debug("Found system mod: {}", systemMod);
|
|
||||||
this.systemMods.add(container.getFirst());
|
|
||||||
} else {
|
|
||||||
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
||||||
}
|
|
||||||
|
LOGGER.debug("Found system mod: {}", systemMod);
|
||||||
|
mods.add(mod.info());
|
||||||
|
files.add(mod.file());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files, mods);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
private record ModPair(ModFile file, ModInfo info) {}
|
||||||
{
|
private static ModPair findMod(final List<ModFile> modFiles, String name) {
|
||||||
final var modVersions = modFiles.stream()
|
for (var file : modFiles) {
|
||||||
.map(ModFile::getModInfos)
|
for (var mod : file.getModFileInfo().getMods()) {
|
||||||
.flatMap(List::stream)
|
if (name.equals(mod.getModId()))
|
||||||
.collect(toMap(IModInfo::getModId, IModInfo::getVersion));
|
return new ModPair(file, (ModInfo)mod);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
final var modVersionDependencies = modFiles.stream()
|
private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
|
||||||
.map(ModFile::getModInfos)
|
final var modVersions = new HashMap<String, ArtifactVersion>();
|
||||||
.flatMap(List::stream)
|
final var modRequirements = new HashSet<ModVersion>();
|
||||||
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
|
int mandatoryRequired = 0;
|
||||||
|
|
||||||
final var modRequirements = modVersionDependencies.values().stream()
|
for (var file : files) {
|
||||||
.<IModInfo.ModVersion>flatMap(List::stream)
|
for (var info : file.getModInfos()) {
|
||||||
.filter(mv -> mv.getSide().isCorrectSide())
|
modVersions.put(info.getModId(), info.getVersion());
|
||||||
.collect(toSet());
|
for (var dep : info.getDependencies()) {
|
||||||
|
if (dep.getSide().isCorrectSide()) {
|
||||||
|
if (modRequirements.add(dep) && dep.isMandatory())
|
||||||
|
mandatoryRequired++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
||||||
final var missingVersions = modRequirements.stream()
|
|
||||||
.filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && !modVersionContained(mv, modVersions))
|
|
||||||
.collect(toSet());
|
|
||||||
final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
|
|
||||||
|
|
||||||
if (!missingVersions.isEmpty()) {
|
final var missingMandatory = new HashSet<ModVersion>();
|
||||||
if (mandatoryMissing > 0) {
|
final var missingOptional = new HashSet<ModVersion>();
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Missing or unsupported mandatory dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(IModInfo.ModVersion::isMandatory)
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (missingVersions.size() - mandatoryMissing > 0) {
|
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Unsupported installed optional dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(ver -> !ver.isMandatory())
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return missingVersions.stream()
|
for (var dep : modRequirements) {
|
||||||
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
|
var modId = dep.getModId();
|
||||||
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
|
var existing = modVersions.get(modId);
|
||||||
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
|
|
||||||
.toList();
|
if (!dep.isMandatory() && existing == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var range = dep.getVersionRange();
|
||||||
|
if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
|
||||||
|
(dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
|
||||||
}
|
}
|
||||||
return Collections.emptyList();
|
|
||||||
|
|
||||||
|
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
|
||||||
|
|
||||||
|
var ret = new ArrayList<ExceptionData>();
|
||||||
|
|
||||||
|
if (!missingMandatory.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!missingOptional.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
|
||||||
{
|
var ret = new ArrayList<String>();
|
||||||
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
for (var dep : missing) {
|
||||||
return String.format(
|
var installed = modVersions.get(dep.getModId());
|
||||||
|
ret.add(String.format(
|
||||||
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
||||||
dependency.getModId(),
|
dep.getModId(),
|
||||||
dependency.getOwner().getModId(),
|
dep.getOwner().getModId(),
|
||||||
dependency.getVersionRange(),
|
dep.getVersionRange(),
|
||||||
installed != null ? installed.toString() : "[MISSING]"
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
);
|
));
|
||||||
|
}
|
||||||
|
return String.join("\n", ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean modVersionContained(IModInfo.ModVersion mv, Map<String, ArtifactVersion> modVersions) {
|
private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
|
||||||
var modId = mv.getModId();
|
private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
|
||||||
var range = mv.getVersionRange();
|
return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
|
||||||
if (modVersions.containsKey(modId)
|
|
||||||
&& (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE")))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
return VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,21 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
return "runtimedistcleaner";
|
return "runtimedistcleaner";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
||||||
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
|
}
|
||||||
|
|
||||||
@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;
|
var changed = false;
|
||||||
@@ -198,14 +213,6 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final EnumSet<Phase> YAY = EnumSet.of(Phase.AFTER);
|
|
||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
|
||||||
return isEmpty ? NAY : YAY;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class LambdaGatherer extends MethodVisitor {
|
private static class LambdaGatherer extends MethodVisitor {
|
||||||
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
|
||||||
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
"java/lang/invoke/LambdaMetafactory", "metafactory",
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -23,16 +24,18 @@ import static java.util.stream.Collectors.groupingBy;
|
|||||||
import static java.util.stream.Collectors.joining;
|
import static java.util.stream.Collectors.joining;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class UniqueModListBuilder
|
@ApiStatus.Internal
|
||||||
{
|
@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
|
||||||
|
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) {this.modFiles = modFiles;}
|
public UniqueModListBuilder(final List<ModFile> modFiles) {
|
||||||
|
this.modFiles = modFiles;
|
||||||
|
}
|
||||||
|
|
||||||
public UniqueModListData buildUniqueList()
|
public UniqueModListData buildUniqueList() {
|
||||||
{
|
|
||||||
List<ModFile> uniqueModList;
|
List<ModFile> uniqueModList;
|
||||||
List<ModFile> uniqueLibListWithVersion;
|
List<ModFile> uniqueLibListWithVersion;
|
||||||
|
|
||||||
@@ -135,9 +138,8 @@ public class UniqueModListBuilder
|
|||||||
return modFile.getSecureJar().name();
|
return modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
return modFile.getModFileInfo().moduleName();
|
return modFile.getModFileInfo().getMods().get(0).getModId();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -18,9 +18,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
* A wrapper for {@link HighlightConverter} that auto-disables ANSI when the terminal doesn't support it.
|
||||||
|
|||||||
+62
-7
@@ -6,6 +6,7 @@
|
|||||||
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;
|
||||||
@@ -22,19 +23,25 @@ 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 createMod(path, false);
|
||||||
@@ -48,10 +55,12 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
@Nullable
|
@Nullable
|
||||||
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
||||||
var mjm = new ModJarMetadata();
|
var mjm = new ModJarMetadata();
|
||||||
var sj = SecureJar.from(
|
SecureJar sj = null;
|
||||||
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
try {
|
||||||
path
|
sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
|
||||||
);
|
} catch (Throwable t) {
|
||||||
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + 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);
|
||||||
@@ -61,6 +70,8 @@ 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
|
||||||
|
mjm.setModFile(mod);
|
||||||
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
||||||
@@ -73,10 +84,54 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
} 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");
|
||||||
|
|||||||
-1
@@ -9,7 +9,6 @@ import cpw.mods.modlauncher.api.LamdbaExceptionUtils.Supplier_WithExceptions;
|
|||||||
import net.minecraftforge.fml.loading.StringUtils;
|
import net.minecraftforge.fml.loading.StringUtils;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|||||||
+2
-4
@@ -22,13 +22,11 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
|
|||||||
@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(
|
var mcjar = SecureJar.from(jar -> meta, paths);
|
||||||
jar -> meta,
|
|
||||||
minecraft.toArray(Path[]::new)
|
|
||||||
);
|
|
||||||
var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
|
var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
|
||||||
meta.setModFile(mc);
|
meta.setModFile(mc);
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ public class ModDiscoverer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@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<>();
|
||||||
|
|||||||
+1
-1
@@ -259,7 +259,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String moduleName() {
|
public String moduleName() {
|
||||||
return getMods().get(0).getModId();
|
return this.modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+31
-16
@@ -9,49 +9,64 @@ 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 modFile.getModFileInfo().moduleName();
|
return this.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String version() {
|
public String version() {
|
||||||
return modFile.getModFileInfo().versionString();
|
return this.version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ModuleDescriptor descriptor() {
|
public ModuleDescriptor descriptor() {
|
||||||
if (descriptor != null) return descriptor;
|
if (descriptor != null)
|
||||||
|
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()
|
|
||||||
.filter(p -> !p.providers().isEmpty())
|
for (var provider : modFile.getSecureJar().getProviders()) {
|
||||||
.forEach(p -> bld.provides(p.serviceName(), p.providers()));
|
if (provider.providers().isEmpty())
|
||||||
modFile.getModFileInfo().usesServices().forEach(bld::uses);
|
continue;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|||||||
-1
@@ -17,7 +17,6 @@ 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.ArrayList;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ record Scanner(ModFile fileToScan, ModFileScanData result) {
|
|||||||
try (InputStream in = Files.newInputStream(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, 0);
|
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
|
||||||
|
|||||||
@@ -81,6 +81,10 @@ class ArgumentList {
|
|||||||
.toArray(String[]::new);
|
.toArray(String[]::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean has(String key) {
|
||||||
|
return this.values.containsKey(key);
|
||||||
|
}
|
||||||
|
|
||||||
public boolean hasValue(String key) {
|
public boolean hasValue(String key) {
|
||||||
return getOrDefault(key, null) != null;
|
return getOrDefault(key, null) != null;
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-4
@@ -22,6 +22,10 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
|
|||||||
super(type, prefix);
|
super(type, prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected CommonDevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override public String getNaming() { return "mcp"; }
|
@Override public String getNaming() { return "mcp"; }
|
||||||
@Override public boolean isProduction() { return false; }
|
@Override public boolean isProduction() { return false; }
|
||||||
|
|
||||||
@@ -29,13 +33,35 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
|
|||||||
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
|
||||||
super.preLaunch(arguments, layer);
|
super.preLaunch(arguments, layer);
|
||||||
|
|
||||||
|
var args = ArgumentList.from(arguments);
|
||||||
|
|
||||||
|
if (this.module == null) {
|
||||||
|
var entry = args.get("launchEntry");
|
||||||
|
if (entry == null)
|
||||||
|
throw new IllegalArgumentException("When using " + this.name() + " launch target you must specify a --launchEntry argument");
|
||||||
|
|
||||||
|
args.remove("launchEntry");
|
||||||
|
|
||||||
|
int idx = entry.indexOf('/');
|
||||||
|
if (idx == -1) {
|
||||||
|
this.module = "minecraft";
|
||||||
|
this.main = entry;
|
||||||
|
} else {
|
||||||
|
this.module = entry.substring(0, idx);
|
||||||
|
this.main = entry.substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.has("launchData")) {
|
||||||
|
args.remove("launchData");
|
||||||
|
this.isData = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (getDist().isDedicatedServer())
|
if (getDist().isDedicatedServer())
|
||||||
return arguments;
|
return args.getArguments();
|
||||||
|
|
||||||
if (isData())
|
if (isData())
|
||||||
return arguments;
|
return args.getArguments();
|
||||||
|
|
||||||
var args = ArgumentList.from(arguments);
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
+20
-9
@@ -29,17 +29,27 @@ import java.util.List;
|
|||||||
public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
||||||
protected static final Logger LOGGER = LogUtils.getLogger();
|
protected static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
protected final LaunchType type;
|
private final String name;
|
||||||
private final String prefix;
|
protected Dist dist = Dist.CLIENT;
|
||||||
|
protected boolean isData = false;
|
||||||
|
protected String module;
|
||||||
|
protected String main;
|
||||||
|
|
||||||
protected CommonLaunchHandler(LaunchType type, String prefix) {
|
protected CommonLaunchHandler(LaunchType type, String prefix) {
|
||||||
this.type = type;
|
this(prefix + type.name());
|
||||||
this.prefix = prefix;
|
this.dist = type.dist();
|
||||||
|
this.isData = type.data();
|
||||||
|
this.module = type.module();
|
||||||
|
this.main = type.main();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public String name() { return this.prefix + this.type.name(); }
|
protected CommonLaunchHandler(String name) {
|
||||||
public Dist getDist() { return this.type.dist(); }
|
this.name = name;
|
||||||
public boolean isData() { return this.type.data(); }
|
}
|
||||||
|
|
||||||
|
@Override public String name() { return this.name; }
|
||||||
|
public Dist getDist() { return this.dist; }
|
||||||
|
public boolean isData() { return this.isData; }
|
||||||
public boolean isProduction() { return false; }
|
public boolean isProduction() { return false; }
|
||||||
public abstract String getNaming();
|
public abstract String getNaming();
|
||||||
|
|
||||||
@@ -66,14 +76,15 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
|
protected ServiceRunner makeService(final String[] arguments, final ModuleLayer gameLayer) {
|
||||||
return () -> runTarget(this.type.module(), this.type.main(), arguments, gameLayer);
|
return () -> runTarget(this.module, this.main, arguments, gameLayer);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
|
protected record LaunchType(String name, String module, String main, Dist dist, boolean data) {};
|
||||||
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 CLIENT_DATA = new LaunchType("client_data", "minecraft", "net.minecraft.client.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 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", "forge", "net.minecraftforge.gametest.GameTestMain", 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 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);
|
||||||
|
|||||||
+18
-4
@@ -14,12 +14,14 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(type, "forge_dev_");
|
super(type, "forge_dev_");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ForgeDevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Path> getMinecraftPaths() {
|
public List<Path> getMinecraftPaths() {
|
||||||
|
// The client extra jar is on the classpath we can try locating it using the .mcassetsroot which vanilla uses for loading data
|
||||||
// The extra jar is on the classpath, so try and pull it out of the legacy classpath
|
var extra = getPathFromResource("assets/.mcassetsroot");
|
||||||
var legacyCP = findClassPath();
|
|
||||||
var extra = findJarOnClasspath(legacyCP, "client-extra");
|
|
||||||
// Minecraft is an exploded directory, so find it.
|
// Minecraft is an exploded directory, so find it.
|
||||||
var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
|
var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class");
|
||||||
var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class");
|
||||||
@@ -39,6 +41,12 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class ClientData extends ForgeDevLaunchHandler {
|
||||||
|
public ClientData() {
|
||||||
|
super(CLIENT_DATA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeDevLaunchHandler {
|
public static final class Data extends ForgeDevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
@@ -56,4 +64,10 @@ sealed abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class Custom extends ForgeDevLaunchHandler {
|
||||||
|
public Custom() {
|
||||||
|
super("forge_dev");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+28
-12
@@ -91,23 +91,24 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
// 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 resourcePaths = new LinkedHashSet<Path>();
|
var paths = 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))
|
||||||
resourcePaths.add(rsc);
|
paths.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(resourcePaths, modids, root);
|
buildModsToml(paths, modids, root);
|
||||||
buildPackMeta(resourcePaths, root);
|
buildPackMeta(paths, root);
|
||||||
|
moveModuleInfo(paths, root);
|
||||||
|
|
||||||
if (Files.exists(root))
|
if (Files.exists(root))
|
||||||
resourcePaths.add(root);
|
paths.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(
|
||||||
@@ -121,14 +122,10 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}, new Path[] { path }
|
}, new Path[] { path }
|
||||||
);
|
);
|
||||||
|
|
||||||
// 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?}
|
paths.addFirst(classes.getRootDirectories().iterator().next());
|
||||||
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, new Path[] {
|
var union = UnionHelper.newFileSystem(null, paths.stream().toArray(Path[]::new));
|
||||||
classes.getRootDirectories().iterator().next(),
|
|
||||||
resources.getRootDirectories().iterator().next()
|
|
||||||
});
|
|
||||||
mod.add(union.getRootDirectories().iterator().next());
|
mod.add(union.getRootDirectories().iterator().next());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,6 +271,25 @@ 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;
|
||||||
|
|||||||
+17
-4
@@ -8,17 +8,18 @@ package net.minecraftforge.fml.loading.targets;
|
|||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
import net.minecraftforge.fml.loading.FMLLoader;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.BiPredicate;
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
||||||
private ForgeUserdevLaunchHandler(LaunchType type) {
|
private ForgeUserdevLaunchHandler(LaunchType type) {
|
||||||
super(type, "forge_userdev_");
|
super(type, "forge_userdev_");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ForgeUserdevLaunchHandler(String name) {
|
||||||
|
super(name);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Path> getMinecraftPaths() {
|
public List<Path> getMinecraftPaths() {
|
||||||
var legacyCP = findClassPath();
|
var legacyCP = findClassPath();
|
||||||
@@ -26,7 +27,7 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
|
|
||||||
// Minecraft is extra jar {resources} + forge jar {patches}
|
// Minecraft is extra jar {resources} + forge jar {patches}
|
||||||
// The MC extra and forge jars are on the classpath, so try and pull them out
|
// The MC extra and forge jars are on the classpath, so try and pull them out
|
||||||
var extra = findJarOnClasspath(legacyCP, "client-extra");
|
var extra = findJarOnClasspath(legacyCP, "client-extra"); // This should be "client-" + vers.mcAndMCPVersion() + "-extra" but FG6 qwerks
|
||||||
var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
|
var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion());
|
||||||
// We need to filter the forge jar to just MC code
|
// We need to filter the forge jar to just MC code
|
||||||
var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
|
var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge);
|
||||||
@@ -39,6 +40,12 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class ClientData extends ForgeUserdevLaunchHandler {
|
||||||
|
public ClientData() {
|
||||||
|
super(CLIENT_DATA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static final class Data extends ForgeUserdevLaunchHandler {
|
public static final class Data extends ForgeUserdevLaunchHandler {
|
||||||
public Data() {
|
public Data() {
|
||||||
super(DATA);
|
super(DATA);
|
||||||
@@ -56,4 +63,10 @@ sealed abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler {
|
|||||||
super(SERVER_GAMETEST);
|
super(SERVER_GAMETEST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class Custom extends ForgeUserdevLaunchHandler {
|
||||||
|
public Custom() {
|
||||||
|
super("forge_userdev");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
@@ -4,12 +4,16 @@ net.minecraftforge.fml.loading.targets.ForgeProdLaunchHandler$Server
|
|||||||
|
|
||||||
# Mod Developers
|
# Mod Developers
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Client
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ClientData
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Custom
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Data
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$Server
|
||||||
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest
|
net.minecraftforge.fml.loading.targets.ForgeUserdevLaunchHandler$ServerGameTest
|
||||||
|
|
||||||
#Working on Forge itself
|
#Working on Forge itself
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Client
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ClientData
|
||||||
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Custom
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Data
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$Server
|
||||||
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest
|
net.minecraftforge.fml.loading.targets.ForgeDevLaunchHandler$ServerGameTest
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
SPDX-License-Identifier: LGPL-2.1-only
|
SPDX-License-Identifier: LGPL-2.1-only
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
|
<Configuration status="warn" shutdownHook="disable">
|
||||||
<filters>
|
<filters>
|
||||||
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
|
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
|
||||||
<MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
|
<MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/>
|
||||||
|
|||||||
+7
-7
@@ -1,17 +1,17 @@
|
|||||||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
||||||
# This is required to provide enough memory for the Minecraft decompilation process.
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx6G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
JAVA_VERSION=21
|
JAVA_VERSION=21
|
||||||
MC_VERSION=1.21.3
|
MC_VERSION=1.21.5
|
||||||
MC_NEXT_VERSION=1.22
|
MC_NEXT_VERSION=1.22
|
||||||
MCP_VERSION=20241025.112443
|
MCP_VERSION=20250325.155543
|
||||||
MAPPING_CHANNEL=official
|
MAPPING_CHANNEL=official
|
||||||
MAPPING_VERSION=1.21.3
|
MAPPING_VERSION=1.21.5
|
||||||
|
|
||||||
// Set to true before the first build of a new MC version, so we don't do compatibility checks
|
# Set to true before the first build of a new MC version, so we don't do compatibility checks
|
||||||
CHECK_COMPATIBILITY=false
|
CHECK_COMPATIBILITY=false
|
||||||
// Set to true to allow for fuzzy patching. Useful during updateing
|
# Set to true to allow for fuzzy patching. Useful during updateing
|
||||||
UPDATING=false
|
UPDATING=false
|
||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -130,10 +131,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -198,11 +202,11 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
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.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
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.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ 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 {
|
||||||
@@ -57,7 +59,7 @@ publishing {
|
|||||||
license PomUtils.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|||||||
+86
-3
@@ -13,18 +13,24 @@ 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.Optional;
|
import java.util.jar.Attributes;
|
||||||
|
|
||||||
public class FMLModContainer extends ModContainer {
|
public class FMLModContainer extends ModContainer {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
@@ -41,20 +47,87 @@ public class FMLModContainer extends ModContainer {
|
|||||||
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(FMLModContainer::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.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader());
|
LOGGER.debug(LOADING,"Loaded modclass {}/{} with {}", modClass.getModule().getName(), 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <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) {
|
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));
|
||||||
}
|
}
|
||||||
@@ -115,4 +188,14 @@ 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() + "]";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+35
-23
@@ -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.36,6.2)'
|
||||||
}
|
}
|
||||||
|
|
||||||
version = mod_version
|
version = mod_version
|
||||||
@@ -22,17 +22,13 @@ minecraft {
|
|||||||
// official MCVersion Official field/method names from Mojang mapping files
|
// official MCVersion Official field/method names from Mojang mapping files
|
||||||
// parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official
|
// parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official
|
||||||
//
|
//
|
||||||
// You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
|
|
||||||
// See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
|
|
||||||
//
|
|
||||||
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
|
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
|
||||||
// Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
|
// Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
|
||||||
//
|
//
|
||||||
// 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.
|
// Forge 1.20.6 and newer use official mappings at runtime, so we shouldn't reobf from official to SRG
|
||||||
reobf = false
|
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.
|
||||||
@@ -50,8 +46,7 @@ minecraft {
|
|||||||
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
|
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
|
||||||
// generateRunFolders = true
|
// generateRunFolders = true
|
||||||
|
|
||||||
// This property enables access transformers for use in development.
|
// This property enables access transformers for use in development, applied to the Minecraft artifact.
|
||||||
// They will be applied to the Minecraft artifact.
|
|
||||||
// The access transformer file can be anywhere in the project.
|
// The access transformer file can be anywhere in the project.
|
||||||
// However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
|
// However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
|
||||||
// This default location is a best practice to automatically put the file in the right place in the final jar.
|
// This default location is a best practice to automatically put the file in the right place in the final jar.
|
||||||
@@ -65,17 +60,15 @@ minecraft {
|
|||||||
configureEach {
|
configureEach {
|
||||||
workingDirectory project.file('run')
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
// Recommended logging data for a userdev environment
|
// Optional additional logging. The markers can be added/remove as needed, separated by commas.
|
||||||
// The markers can be added/remove as needed separated by commas.
|
|
||||||
// "SCAN": For mods scan.
|
// "SCAN": For mods scan.
|
||||||
// "REGISTRIES": For firing of registry events.
|
// "REGISTRIES": For firing of registry events.
|
||||||
// "REGISTRYDUMP": For getting the contents of all registries.
|
// "REGISTRYDUMP": For getting the contents of all registries.
|
||||||
property 'forge.logging.markers', 'REGISTRIES'
|
// property 'forge.logging.markers', 'REGISTRIES'
|
||||||
|
|
||||||
// Recommended logging level for the console
|
|
||||||
// You can set various levels here.
|
|
||||||
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
|
|
||||||
property 'forge.logging.console.level', 'debug'
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
|
// arg "-mixin.config=${mod_id}.mixins.json"
|
||||||
}
|
}
|
||||||
|
|
||||||
client {
|
client {
|
||||||
@@ -110,7 +103,26 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// Put repositories for dependencies here
|
// Put repositories for dependencies here
|
||||||
// ForgeGradle automatically adds the Forge maven and Maven Central for you
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
name = 'Forge'
|
||||||
|
url = 'https://maven.minecraftforge.net'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = 'Minecraft libraries'
|
||||||
|
url = 'https://libraries.minecraft.net'
|
||||||
|
}
|
||||||
|
exclusiveContent {
|
||||||
|
forRepository {
|
||||||
|
maven {
|
||||||
|
name = 'Sponge'
|
||||||
|
url = 'https://repo.spongepowered.org/repository/maven-public'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
filter {
|
||||||
|
includeGroupAndSubgroups('org.spongepowered')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
|
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
|
||||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
|
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
|
||||||
@@ -141,16 +153,13 @@ dependencies {
|
|||||||
// For more info:
|
// For more info:
|
||||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||||
|
|
||||||
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
|
|
||||||
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This block of code expands all declared replace properties in the specified resource targets.
|
// This block of code expands all declared replace properties in the specified resource targets.
|
||||||
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
|
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
|
||||||
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
|
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
|
||||||
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
|
||||||
tasks.named('processResources', ProcessResources).configure {
|
tasks.named('processResources', ProcessResources) {
|
||||||
var replaceProperties = [
|
var replaceProperties = [
|
||||||
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
|
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
|
||||||
forge_version: forge_version, forge_version_range: forge_version_range,
|
forge_version: forge_version, forge_version_range: forge_version_range,
|
||||||
@@ -166,7 +175,7 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Example for how to get properties into the manifest for reading at runtime.
|
// Example for how to get properties into the manifest for reading at runtime.
|
||||||
tasks.named('jar', Jar).configure {
|
tasks.named('jar', Jar) {
|
||||||
manifest {
|
manifest {
|
||||||
attributes([
|
attributes([
|
||||||
'Specification-Title' : mod_id,
|
'Specification-Title' : mod_id,
|
||||||
@@ -176,6 +185,7 @@ tasks.named('jar', Jar).configure {
|
|||||||
'Implementation-Version' : project.jar.archiveVersion,
|
'Implementation-Version' : project.jar.archiveVersion,
|
||||||
'Implementation-Vendor' : mod_authors
|
'Implementation-Vendor' : mod_authors
|
||||||
])
|
])
|
||||||
|
// attributes['MixinConfigs'] = "${mod_id}.mixins.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,6 +207,9 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IntelliJ no longer downloads javadocs and sources by default, this tells Gradle to force IntelliJ to do it.
|
||||||
|
idea.module { downloadJavadoc = downloadSources = true }
|
||||||
|
|
||||||
eclipse {
|
eclipse {
|
||||||
// Run everytime eclipse builds the code
|
// Run everytime eclipse builds the code
|
||||||
//autoBuildTasks genEclipseRuns
|
//autoBuildTasks genEclipseRuns
|
||||||
@@ -204,8 +217,7 @@ eclipse {
|
|||||||
synchronizationTasks 'genEclipseRuns'
|
synchronizationTasks 'genEclipseRuns'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge the resources and classes into the same directory.
|
// Merge the resources and classes into the same directory, because Java expects modules to be in a single directory.
|
||||||
// This is done because java expects modules to be in a single directory.
|
|
||||||
// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
|
// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
|
||||||
// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
|
// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
|
||||||
sourceSets.each {
|
sourceSets.each {
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
# Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
|
||||||
# This is required to provide enough memory for the Minecraft decompilation process.
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx5G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
|
# In the case that Gradle needs to fork to recompile, this will set the memory for that process.
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.recompile.fork=true
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.recompile.fork.args=-Xmx5G
|
||||||
|
|
||||||
|
# Opts-out of ForgeGradle automatically adding mavenCentral(), Forge's maven and MC libs maven to the repositories block
|
||||||
|
systemProp.net.minecraftforge.gradle.repo.attach=false
|
||||||
|
|
||||||
|
|
||||||
## Environment Properties
|
## Environment Properties
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -9,5 +9,5 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
|
||||||
|
@@ -109,6 +_,9 @@
|
||||||
|
GlStateManager._colorMask(true, true, true, true);
|
||||||
|
GlStateManager._clear(16384);
|
||||||
|
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
|
||||||
|
+ // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
|
||||||
|
+ if (p_394273_.isStencilEnabled())
|
||||||
|
+ GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0);
|
||||||
|
GlStateManager._glBindFramebuffer(36160, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlDebug.java
|
||||||
|
@@ -23,6 +_,14 @@
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public class GlDebug {
|
||||||
|
+ /**
|
||||||
|
+ * TODO: [Forge][Rendering][VEN] Expose this in the configs
|
||||||
|
+ * <p>
|
||||||
|
+ * Will enable synchronous OpenGL debug logging, which means the message will be sent from the call that
|
||||||
|
+ * would have caused the error. Additionally, enables printing a stacktrace when and where this occurs.
|
||||||
|
+ */
|
||||||
|
+ private static final boolean PRINT_STACKTRACE_ON_ERROR = Boolean.getBoolean("forge.printGLStackOnError");
|
||||||
|
+
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static final int CIRCULAR_LOG_SIZE = 10;
|
||||||
|
private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10);
|
||||||
|
@@ -105,6 +_,8 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.info("OpenGL debug message: {}", gldebug$logentry);
|
||||||
|
+ // TODO: [VEN] Trim the stack trace
|
||||||
|
+ if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getLastOpenGlDebugMessages() {
|
||||||
|
@@ -121,6 +_,7 @@
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public static GlDebug enableDebugCallback(int p_394351_, boolean p_393026_, Set<String> p_393339_) {
|
||||||
|
+ p_393026_ |= PRINT_STACKTRACE_ON_ERROR;
|
||||||
|
if (p_394351_ <= 0) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlDevice.java
|
||||||
|
@@ -80,11 +_,25 @@
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GpuTexture createTexture(@Nullable Supplier<String> p_397830_, TextureFormat p_394839_, int p_394481_, int p_391831_, int p_395609_) {
|
||||||
|
- return this.createTexture(this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394839_, p_394481_, p_391831_, p_395609_);
|
||||||
|
+ return this.createTexture(p_397830_, p_394839_, p_394481_, p_391831_, p_395609_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** @see GpuDevice#createTexture(Supplier, TextureFormat, int, int, int, boolean) */
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(@Nullable Supplier<String> p_397830_, TextureFormat p_394839_, int p_394481_, int p_391831_, int p_395609_, boolean stencil) {
|
||||||
|
+ return this.createTexture(this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394839_, p_394481_, p_391831_, p_395609_, stencil);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GpuTexture createTexture(@Nullable String p_394142_, TextureFormat p_394951_, int p_395535_, int p_393944_, int p_392329_) {
|
||||||
|
+ return this.createTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /** @see GpuDevice#createTexture(String, TextureFormat, int, int, int, boolean) */
|
||||||
|
+ @Override
|
||||||
|
+ public GpuTexture createTexture(@Nullable String p_394142_, TextureFormat p_394951_, int p_395535_, int p_393944_, int p_392329_, boolean stencil) {
|
||||||
|
+ // Forge: stencil rendering is only for depth
|
||||||
|
+ stencil &= p_394951_.hasDepthAspect();
|
||||||
|
if (p_392329_ < 1) {
|
||||||
|
throw new IllegalArgumentException("mipLevels must be at least 1");
|
||||||
|
} else {
|
||||||
|
@@ -106,11 +_,14 @@
|
||||||
|
GlStateManager._texImage2D(
|
||||||
|
3553,
|
||||||
|
j,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
|
||||||
|
GlConst.toGlInternalId(p_394951_),
|
||||||
|
p_395535_ >> j,
|
||||||
|
p_393944_ >> j,
|
||||||
|
0,
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL :
|
||||||
|
GlConst.toGlExternalId(p_394951_),
|
||||||
|
+ stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV :
|
||||||
|
GlConst.toGlType(p_394951_),
|
||||||
|
null
|
||||||
|
);
|
||||||
|
@@ -122,7 +_,7 @@
|
||||||
|
} else if (k != 0) {
|
||||||
|
throw new IllegalStateException("OpenGL error " + k);
|
||||||
|
} else {
|
||||||
|
- GlTexture gltexture = new GlTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, i);
|
||||||
|
+ GlTexture gltexture = new GlTexture(p_394142_, p_394951_, p_395535_, p_393944_, p_392329_, i, stencil);
|
||||||
|
this.debugLabels.applyLabel(gltexture);
|
||||||
|
return gltexture;
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlStateManager.java
|
||||||
|
@@ -90,6 +_,11 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public static boolean _isBlendEnabled() {
|
||||||
|
+ RenderSystem.assertOnRenderThread();
|
||||||
|
+ return BLEND.mode.enabled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public static void _disableBlend() {
|
||||||
|
RenderSystem.assertOnRenderThread();
|
||||||
|
BLEND.mode.disable();
|
||||||
|
@@ -411,9 +_,17 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Stores the last values sent into glMultiTexCoord2f */
|
||||||
|
+ public static float lastBrightnessX = 0.0f;
|
||||||
|
+ public static float lastBrightnessY = 0.0f;
|
||||||
|
+
|
||||||
|
public static void _texParameter(int p_393876_, int p_397998_, int p_396741_) {
|
||||||
|
RenderSystem.assertOnRenderThread();
|
||||||
|
GL11.glTexParameteri(p_393876_, p_397998_, p_396741_);
|
||||||
|
+ if (p_393876_ == GL13.GL_TEXTURE1) {
|
||||||
|
+ lastBrightnessX = p_397998_;
|
||||||
|
+ lastBrightnessY = p_396741_;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int _getTexLevelParameter(int p_393352_, int p_397204_, int p_396319_) {
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
--- a/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/opengl/GlTexture.java
|
||||||
|
@@ -18,8 +_,13 @@
|
||||||
|
protected boolean modesDirty = true;
|
||||||
|
|
||||||
|
protected GlTexture(String p_393950_, TextureFormat p_392837_, int p_394590_, int p_391379_, int p_391947_, int p_396659_) {
|
||||||
|
+ this(p_393950_, p_392837_, p_394590_, p_391379_, p_391947_, p_396659_, false);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected GlTexture(String p_393950_, TextureFormat p_392837_, int p_394590_, int p_391379_, int p_391947_, int p_396659_, boolean stencil) {
|
||||||
|
super(p_393950_, p_392837_, p_394590_, p_391379_, p_391947_);
|
||||||
|
this.id = p_396659_;
|
||||||
|
+ this.stencilEnabled = stencil;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -86,5 +_,15 @@
|
||||||
|
public void setTextureFilter(FilterMode p_394977_, FilterMode p_397175_, boolean p_393558_) {
|
||||||
|
super.setTextureFilter(p_394977_, p_397175_, p_393558_);
|
||||||
|
this.modesDirty = true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ /* FORGE START */
|
||||||
|
+
|
||||||
|
+ private final boolean stencilEnabled;
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isStencilEnabled() {
|
||||||
|
+ return this.stencilEnabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,35 +1,18 @@
|
|||||||
--- 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 @@
|
@@ -75,7 +_,7 @@
|
||||||
GlStateManager._texParameter(3553, 34892, 0);
|
this.width = p_83951_;
|
||||||
GlStateManager._texParameter(3553, 10242, 33071);
|
this.height = p_83952_;
|
||||||
GlStateManager._texParameter(3553, 10243, 33071);
|
if (this.useDepth) {
|
||||||
+ if (!stencilEnabled)
|
- this.depthTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, p_83951_, p_83952_, 1);
|
||||||
GlStateManager._texImage2D(3553, 0, 6402, this.width, this.height, 0, 6402, 5126, null);
|
+ this.depthTexture = RenderSystem.getDevice().createTexture(() -> this.label + " / Depth", TextureFormat.DEPTH32, p_83951_, p_83952_, 1, this.stencilEnabled);
|
||||||
+ else
|
this.depthTexture.setTextureFilter(FilterMode.NEAREST, false);
|
||||||
+ 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.depthTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
|
||||||
}
|
}
|
||||||
|
@@ -134,5 +_,26 @@
|
||||||
this.setFilterMode(9728, true);
|
@Nullable
|
||||||
@@ -106,8 +_,13 @@
|
public GpuTexture getDepthTexture() {
|
||||||
GlStateManager._texImage2D(3553, 0, 32856, this.width, this.height, 0, 6408, 5121, null);
|
return this.depthTexture;
|
||||||
GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
|
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
|
||||||
- if (this.useDepth) {
|
|
||||||
+ if (this.useDepth && !stencilEnabled) {
|
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
|
||||||
+ } else if(this.useDepth && 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 if (this.useDepth) {
|
|
||||||
+ 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();
|
|
||||||
@@ -229,5 +_,26 @@
|
|
||||||
|
|
||||||
public int getDepthTextureId() {
|
|
||||||
return this.depthBufferId;
|
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private boolean stencilEnabled = false;
|
+ private boolean stencilEnabled = false;
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
|
||||||
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
|
||||||
@@ -519,9 +_,17 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Stores the last values sent into glMultiTexCoord2f */
|
|
||||||
+ public static float lastBrightnessX = 0.0f;
|
|
||||||
+ public static float lastBrightnessY = 0.0f;
|
|
||||||
+
|
|
||||||
public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) {
|
|
||||||
RenderSystem.assertOnRenderThreadOrInit();
|
|
||||||
GL11.glTexParameterf(p_84161_, p_84162_, p_84163_);
|
|
||||||
+ if (p_84161_ == GL13.GL_TEXTURE1) {
|
|
||||||
+ lastBrightnessX = p_84162_;
|
|
||||||
+ lastBrightnessY = p_84163_;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) {
|
|
||||||
@@ -16,9 +16,9 @@
|
|||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
GLFW.glfwMakeContextCurrent(this.window);
|
this.setMode();
|
||||||
GL.createCapabilities();
|
this.refreshFramebufferSize();
|
||||||
@@ -267,6 +_,9 @@
|
@@ -266,6 +_,9 @@
|
||||||
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;
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
--- a/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
|
+++ b/com/mojang/blaze3d/systems/GpuDevice.java
|
||||||
|
@@ -25,7 +_,17 @@
|
||||||
|
|
||||||
|
GpuTexture createTexture(@Nullable Supplier<String> p_394357_, TextureFormat p_395807_, int p_395623_, int p_395802_, int p_396157_);
|
||||||
|
|
||||||
|
+ /** Forge: same as {@link #createTexture(Supplier, TextureFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable Supplier<String> p_394357_, TextureFormat p_395807_, int p_395623_, int p_395802_, int p_396157_, boolean stencil) {
|
||||||
|
+ return this.createTexture(p_394357_, p_395807_, p_395623_, p_395802_, p_396157_);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
GpuTexture createTexture(@Nullable String p_391798_, TextureFormat p_393333_, int p_391800_, int p_395600_, int p_394065_);
|
||||||
|
+
|
||||||
|
+ /** Forge: same as {@link #createTexture(String, TextureFormat, int, int, int)} but with stencil support */
|
||||||
|
+ default GpuTexture createTexture(@Nullable String p_391798_, TextureFormat p_393333_, int p_391800_, int p_395600_, int p_394065_, boolean stencil) {
|
||||||
|
+ return this.createTexture(p_391798_, p_393333_, p_391800_, p_395600_, p_394065_);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
GpuBuffer createBuffer(@Nullable Supplier<String> p_395215_, BufferType p_392847_, BufferUsage p_391478_, int p_397054_);
|
||||||
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
+++ b/com/mojang/blaze3d/textures/GpuTexture.java
|
||||||
|
@@ -6,7 +_,7 @@
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@DontObfuscate
|
||||||
|
-public abstract class GpuTexture implements AutoCloseable {
|
||||||
|
+public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
|
||||||
|
private final TextureFormat format;
|
||||||
|
private final int width;
|
||||||
|
private final int height;
|
||||||
@@ -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 @@
|
@@ -15,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3fc;
|
||||||
|
|
||||||
@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 List<PoseStack.Pose> poses = new ArrayList<>(16);
|
||||||
Matrix4f matrix4f = new Matrix4f();
|
private int lastIndex;
|
||||||
Matrix3f matrix3f = new Matrix3f();
|
|
||||||
@@ -1,23 +1,23 @@
|
|||||||
--- 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 @@
|
@@ -20,7 +_,7 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
@DontObfuscate
|
||||||
-public class VertexFormat {
|
-public class VertexFormat {
|
||||||
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
|
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
|
||||||
public static final int UNKNOWN_ELEMENT = -1;
|
public static final int UNKNOWN_ELEMENT = -1;
|
||||||
private final List<VertexFormatElement> elements;
|
private final List<VertexFormatElement> elements;
|
||||||
private final List<String> names;
|
private final List<String> names;
|
||||||
@@ -23,6 +_,7 @@
|
@@ -31,6 +_,7 @@
|
||||||
private final int[] offsetsByElement = new int[32];
|
private GpuBuffer immediateDrawVertexBuffer;
|
||||||
@Nullable
|
@Nullable
|
||||||
private VertexBuffer immediateDrawVertexBuffer;
|
private GpuBuffer immediateDrawIndexBuffer;
|
||||||
+ private final com.google.common.collect.ImmutableMap<String, VertexFormatElement> elementMapping;
|
+ 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_) {
|
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
||||||
this.elements = p_343616_;
|
this.elements = p_343616_;
|
||||||
@@ -35,6 +_,11 @@
|
@@ -43,6 +_,11 @@
|
||||||
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
||||||
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
||||||
}
|
}
|
||||||
@@ -29,13 +29,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static VertexFormat.Builder builder() {
|
public static VertexFormat.Builder builder() {
|
||||||
@@ -141,6 +_,9 @@
|
@@ -146,6 +_,9 @@
|
||||||
|
|
||||||
return vertexbuffer;
|
return this.immediateDrawIndexBuffer;
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
+ public ImmutableMap<String, VertexFormatElement> getElementMapping() { return elementMapping; }
|
||||||
+ public int getOffset(int index) { return offsetsByElement[index]; }
|
+ public int getOffset(int index) { return offsetsByElement[index]; }
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
public static class Builder {
|
@DontObfuscate
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
--- 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 @@
|
@@ -14,7 +_,7 @@
|
||||||
import org.joml.Quaternionf;
|
import org.joml.Quaternionf;
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
-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 Matrix4fc matrix;
|
||||||
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
|
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create(
|
||||||
p_269604_ -> p_269604_.group(
|
p_269604_ -> p_269604_.group(
|
||||||
@@ -169,5 +_,19 @@
|
@@ -174,5 +_,19 @@
|
||||||
vector3f1.lerp(p_175938_.getScale(), p_175939_);
|
vector3f1.lerp(p_175938_.getScale(), p_175939_);
|
||||||
quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
|
quaternionf1.slerp(p_175938_.getRightRotation(), p_175939_);
|
||||||
return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
|
return new Transformation(vector3f, quaternionf, vector3f1, quaternionf1);
|
||||||
|
|||||||
@@ -34,4 +34,4 @@
|
|||||||
+ 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_, BlockState p_178954_) {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/SharedConstants.java
|
--- a/net/minecraft/SharedConstants.java
|
||||||
+++ b/net/minecraft/SharedConstants.java
|
+++ b/net/minecraft/SharedConstants.java
|
||||||
@@ -170,6 +_,7 @@
|
@@ -171,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/Util.java
|
--- a/net/minecraft/Util.java
|
||||||
+++ b/net/minecraft/Util.java
|
+++ b/net/minecraft/Util.java
|
||||||
@@ -264,7 +_,7 @@
|
@@ -268,7 +_,7 @@
|
||||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
||||||
.getChoiceType(p_137552_, p_137553_);
|
.getChoiceType(p_137552_, p_137553_);
|
||||||
} catch (IllegalArgumentException illegalargumentexception) {
|
} catch (IllegalArgumentException illegalargumentexception) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/advancements/Advancement.java
|
--- a/net/minecraft/advancements/Advancement.java
|
||||||
+++ b/net/minecraft/advancements/Advancement.java
|
+++ b/net/minecraft/advancements/Advancement.java
|
||||||
@@ -214,7 +_,11 @@
|
@@ -226,7 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
|
public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/advancements/AdvancementRewards.java
|
--- a/net/minecraft/advancements/AdvancementRewards.java
|
||||||
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
||||||
@@ -41,6 +_,7 @@
|
@@ -40,6 +_,7 @@
|
||||||
LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
|
LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
|
||||||
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
||||||
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Camera.java
|
--- a/net/minecraft/client/Camera.java
|
||||||
+++ b/net/minecraft/client/Camera.java
|
+++ b/net/minecraft/client/Camera.java
|
||||||
@@ -120,9 +_,13 @@
|
@@ -118,9 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setRotation(float p_90573_, float p_90574_) {
|
protected void setRotation(float p_90573_, float p_90574_) {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
FORWARDS.rotate(this.rotation, this.forwards);
|
FORWARDS.rotate(this.rotation, this.forwards);
|
||||||
UP.rotate(this.rotation, this.up);
|
UP.rotate(this.rotation, this.up);
|
||||||
LEFT.rotate(this.rotation, this.left);
|
LEFT.rotate(this.rotation, this.left);
|
||||||
@@ -238,6 +_,13 @@
|
@@ -236,6 +_,13 @@
|
||||||
|
|
||||||
public float getPartialTickTime() {
|
public float getPartialTickTime() {
|
||||||
return this.partialTickTime;
|
return this.partialTickTime;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/KeyMapping.java
|
--- a/net/minecraft/client/KeyMapping.java
|
||||||
+++ b/net/minecraft/client/KeyMapping.java
|
+++ b/net/minecraft/client/KeyMapping.java
|
||||||
@@ -14,9 +_,9 @@
|
@@ -15,9 +_,9 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
private static final Set<String> CATEGORIES = Sets.newHashSet();
|
private static final Set<String> CATEGORIES = Sets.newHashSet();
|
||||||
public static final String CATEGORY_MOVEMENT = "key.categories.movement";
|
public static final String CATEGORY_MOVEMENT = "key.categories.movement";
|
||||||
public static final String CATEGORY_MISC = "key.categories.misc";
|
public static final String CATEGORY_MISC = "key.categories.misc";
|
||||||
@@ -42,14 +_,14 @@
|
@@ -43,14 +_,14 @@
|
||||||
private int clickCount;
|
private int clickCount;
|
||||||
|
|
||||||
public static void click(InputConstants.Key p_90836_) {
|
public static void click(InputConstants.Key p_90836_) {
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
if (keymapping != null) {
|
if (keymapping != null) {
|
||||||
keymapping.setDown(p_90839_);
|
keymapping.setDown(p_90839_);
|
||||||
}
|
}
|
||||||
@@ -100,7 +_,7 @@
|
@@ -101,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDown() {
|
public boolean isDown() {
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getCategory() {
|
public String getCategory() {
|
||||||
@@ -136,7 +_,16 @@
|
@@ -137,7 +_,16 @@
|
||||||
public int compareTo(KeyMapping p_90841_) {
|
public int compareTo(KeyMapping p_90841_) {
|
||||||
return this.category.equals(p_90841_.category)
|
return this.category.equals(p_90841_.category)
|
||||||
? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
|
? I18n.get(this.name).compareTo(I18n.get(p_90841_.name))
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Supplier<Component> createNameSupplier(String p_90843_) {
|
public static Supplier<Component> createNameSupplier(String p_90843_) {
|
||||||
@@ -145,6 +_,20 @@
|
@@ -146,6 +_,20 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean same(KeyMapping p_90851_) {
|
public boolean same(KeyMapping p_90851_) {
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
return this.key.equals(p_90851_.key);
|
return this.key.equals(p_90851_.key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,11 +_,13 @@
|
@@ -164,11 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Component getTranslatedKeyMessage() {
|
public Component getTranslatedKeyMessage() {
|
||||||
@@ -92,10 +92,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String saveString() {
|
public String saveString() {
|
||||||
@@ -176,5 +_,88 @@
|
@@ -182,5 +_,88 @@
|
||||||
|
@Nullable
|
||||||
public void setDown(boolean p_90846_) {
|
public static KeyMapping get(String p_378660_) {
|
||||||
this.isDown = p_90846_;
|
return ALL.get(p_378660_);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
|
+ private net.minecraftforge.client.settings.KeyModifier keyModifierDefault = net.minecraftforge.client.settings.KeyModifier.NONE;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/KeyboardHandler.java
|
--- a/net/minecraft/client/KeyboardHandler.java
|
||||||
+++ b/net/minecraft/client/KeyboardHandler.java
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
||||||
@@ -424,12 +_,12 @@
|
@@ -431,12 +_,12 @@
|
||||||
if (screen != null) {
|
if (screen != null) {
|
||||||
try {
|
try {
|
||||||
if (p_90897_ != 1 && p_90897_ != 2) {
|
if (p_90897_ != 1 && p_90897_ != 2) {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -505,6 +_,7 @@
|
@@ -495,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -514,10 +_,10 @@
|
@@ -504,10 +_,10 @@
|
||||||
if (screen != null && this.minecraft.getOverlay() == null) {
|
if (screen != null && this.minecraft.getOverlay() == null) {
|
||||||
try {
|
try {
|
||||||
if (Character.isBmpCodePoint(p_90891_)) {
|
if (Character.isBmpCodePoint(p_90891_)) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Minecraft.java
|
--- a/net/minecraft/client/Minecraft.java
|
||||||
+++ b/net/minecraft/client/Minecraft.java
|
+++ b/net/minecraft/client/Minecraft.java
|
||||||
@@ -253,7 +_,7 @@
|
@@ -248,7 +_,7 @@
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
static Minecraft instance;
|
static Minecraft instance;
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
||||||
@@ -433,7 +_,6 @@
|
@@ -426,7 +_,6 @@
|
||||||
}
|
}
|
||||||
}, Util.nonCriticalIoPool());
|
}, Util.nonCriticalIoPool());
|
||||||
LOGGER.info("Setting user: {}", this.user.getName());
|
LOGGER.info("Setting user: {}", this.user.getName());
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
this.demo = p_91084_.game.demo;
|
this.demo = p_91084_.game.demo;
|
||||||
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
||||||
this.allowsChat = !p_91084_.game.disableChat;
|
this.allowsChat = !p_91084_.game.disableChat;
|
||||||
@@ -480,15 +_,15 @@
|
@@ -478,10 +_,9 @@
|
||||||
LOGGER.error("Couldn't set icon", (Throwable)ioexception);
|
LOGGER.error("Couldn't set icon", (Throwable)ioexception);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,24 +26,26 @@
|
|||||||
- this.mouseHandler.setup(this.window.getWindow());
|
- this.mouseHandler.setup(this.window.getWindow());
|
||||||
this.keyboardHandler = new KeyboardHandler(this);
|
this.keyboardHandler = new KeyboardHandler(this);
|
||||||
- this.keyboardHandler.setup(this.window.getWindow());
|
- this.keyboardHandler.setup(this.window.getWindow());
|
||||||
RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
|
RenderSystem.initRenderer(
|
||||||
|
this.window.getWindow(),
|
||||||
|
this.options.glDebugVerbosity,
|
||||||
|
@@ -492,6 +_,7 @@
|
||||||
|
LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
|
||||||
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
|
|
||||||
this.mainRenderTarget.clear();
|
|
||||||
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
||||||
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
||||||
this.resourcePackRepository.reload();
|
this.resourcePackRepository.reload();
|
||||||
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
||||||
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
|
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
|
||||||
@@ -562,6 +_,7 @@
|
@@ -570,6 +_,7 @@
|
||||||
);
|
this.blockEntityRenderDispatcher = new BlockEntityRenderDispatcher(this.font, this.modelManager.entityModels(), this.blockRenderer, this.itemModelResolver, this.itemRenderer, this.entityRenderDispatcher);
|
||||||
this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
|
this.resourceManager.registerReloadListener(this.blockEntityRenderDispatcher);
|
||||||
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
||||||
this.resourceManager.registerReloadListener(this.particleEngine);
|
this.resourceManager.registerReloadListener(this.particleEngine);
|
||||||
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
||||||
this.resourceManager.registerReloadListener(this.paintingTextures);
|
this.resourceManager.registerReloadListener(this.paintingTextures);
|
||||||
@@ -577,6 +_,9 @@
|
@@ -585,6 +_,9 @@
|
||||||
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
||||||
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
||||||
this.gui = new Gui(this);
|
this.gui = new Gui(this);
|
||||||
@@ -51,17 +53,17 @@
|
|||||||
+ this.mouseHandler.setup(this.window.getWindow());
|
+ this.mouseHandler.setup(this.window.getWindow());
|
||||||
+ this.keyboardHandler.setup(this.window.getWindow());
|
+ this.keyboardHandler.setup(this.window.getWindow());
|
||||||
this.debugRenderer = new DebugRenderer(this);
|
this.debugRenderer = new DebugRenderer(this);
|
||||||
RealmsClient realmsclient = RealmsClient.create(this);
|
RealmsClient realmsclient = RealmsClient.getOrCreate(this);
|
||||||
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
||||||
@@ -600,6 +_,7 @@
|
@@ -618,6 +_,7 @@
|
||||||
this.options.fullscreen().set(this.window.isFullscreen());
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
|
||||||
this.window.updateVsync(this.options.enableVsync().get());
|
this.window.updateVsync(this.options.enableVsync().get());
|
||||||
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
||||||
this.window.setDefaultErrorCallback();
|
this.window.setDefaultErrorCallback();
|
||||||
@@ -620,16 +_,17 @@
|
@@ -639,16 +_,17 @@
|
||||||
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
||||||
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
||||||
this.setOverlay(
|
this.setOverlay(
|
||||||
@@ -69,20 +71,20 @@
|
|||||||
- this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
- this, reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
||||||
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
|
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(
|
||||||
+ () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
+ () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> {
|
||||||
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
if (SharedConstants.IS_RUNNING_IN_IDE) {
|
||||||
this.selfTest();
|
this.selfTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.reloadStateTracker.finishReload();
|
this.reloadStateTracker.finishReload();
|
||||||
this.onResourceLoadFinished(minecraft$gameloadcookie);
|
this.onResourceLoadFinished(minecraft$gameloadcookie);
|
||||||
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
|
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
|
||||||
}), false
|
}), false
|
||||||
- )
|
- )
|
||||||
+ ).get()
|
+ ).get()
|
||||||
);
|
);
|
||||||
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
|
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
|
||||||
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
||||||
@@ -724,6 +_,7 @@
|
@@ -746,6 +_,7 @@
|
||||||
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
||||||
if (checkModStatus().shouldReportAsModified()) {
|
if (checkModStatus().shouldReportAsModified()) {
|
||||||
stringbuilder.append("*");
|
stringbuilder.append("*");
|
||||||
@@ -90,7 +92,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
stringbuilder.append(" ");
|
stringbuilder.append(" ");
|
||||||
@@ -747,6 +_,8 @@
|
@@ -769,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
||||||
@@ -99,7 +101,7 @@
|
|||||||
return p_193587_.user.user.getType() != User.Type.MSA
|
return p_193587_.user.user.getType() != User.Type.MSA
|
||||||
? UserApiService.OFFLINE
|
? UserApiService.OFFLINE
|
||||||
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
||||||
@@ -757,7 +_,7 @@
|
@@ -779,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
||||||
@@ -108,7 +110,7 @@
|
|||||||
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
||||||
} else {
|
} else {
|
||||||
Util.throwAsRuntime(p_91240_);
|
Util.throwAsRuntime(p_91240_);
|
||||||
@@ -1043,12 +_,6 @@
|
@@ -1065,12 +_,6 @@
|
||||||
LOGGER.error("setScreen called from non-game thread");
|
LOGGER.error("setScreen called from non-game thread");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,7 +123,7 @@
|
|||||||
if (p_91153_ == null && this.clientLevelTeardownInProgress) {
|
if (p_91153_ == null && this.clientLevelTeardownInProgress) {
|
||||||
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
||||||
} else {
|
} else {
|
||||||
@@ -1062,6 +_,23 @@
|
@@ -1084,6 +_,23 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,7 +147,15 @@
|
|||||||
this.screen = p_91153_;
|
this.screen = p_91153_;
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.added();
|
this.screen.added();
|
||||||
@@ -1215,9 +_,11 @@
|
@@ -1168,6 +_,7 @@
|
||||||
|
FreeTypeUtil.destroy();
|
||||||
|
Util.shutdownExecutors();
|
||||||
|
RenderSystem.getDevice().close();
|
||||||
|
+ net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload();
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
LOGGER.error("Shutdown failure!", throwable);
|
||||||
|
throw throwable;
|
||||||
|
@@ -1237,9 +_,11 @@
|
||||||
this.mouseHandler.handleAccumulatedMovement();
|
this.mouseHandler.handleAccumulatedMovement();
|
||||||
profilerfiller.pop();
|
profilerfiller.pop();
|
||||||
if (!this.noRender) {
|
if (!this.noRender) {
|
||||||
@@ -157,8 +167,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
profilerfiller.push("blit");
|
profilerfiller.push("blit");
|
||||||
@@ -1339,10 +_,12 @@
|
@@ -1363,10 +_,12 @@
|
||||||
this.window.setGuiScale((double)i);
|
this.window.setGuiScale(i);
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
+ net.minecraftforge.client.ForgeHooksClient.resizeGuiLayers(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
@@ -170,7 +180,7 @@
|
|||||||
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mouseHandler.setIgnoreFirstMove();
|
this.mouseHandler.setIgnoreFirstMove();
|
||||||
}
|
}
|
||||||
@@ -1483,6 +_,7 @@
|
@@ -1504,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
@@ -178,7 +188,7 @@
|
|||||||
this.running = false;
|
this.running = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1511,10 +_,18 @@
|
@@ -1532,10 +_,18 @@
|
||||||
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
@@ -200,7 +210,7 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1542,6 +_,8 @@
|
@@ -1563,6 +_,8 @@
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
@@ -209,7 +219,7 @@
|
|||||||
switch (this.hitResult.getType()) {
|
switch (this.hitResult.getType()) {
|
||||||
case ENTITY:
|
case ENTITY:
|
||||||
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
||||||
@@ -1549,7 +_,7 @@
|
@@ -1570,7 +_,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
@@ -218,7 +228,7 @@
|
|||||||
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
||||||
if (this.level.getBlockState(blockpos).isAir()) {
|
if (this.level.getBlockState(blockpos).isAir()) {
|
||||||
flag = true;
|
flag = true;
|
||||||
@@ -1562,8 +_,10 @@
|
@@ -1583,8 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.player.resetAttackStrengthTicker();
|
this.player.resetAttackStrengthTicker();
|
||||||
@@ -229,7 +239,7 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
@@ -1579,6 +_,12 @@
|
@@ -1600,6 +_,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
for (InteractionHand interactionhand : InteractionHand.values()) {
|
for (InteractionHand interactionhand : InteractionHand.values()) {
|
||||||
@@ -242,7 +252,7 @@
|
|||||||
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
||||||
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
||||||
return;
|
return;
|
||||||
@@ -1599,7 +_,7 @@
|
@@ -1620,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
|
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
|
||||||
@@ -251,16 +261,16 @@
|
|||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1611,7 +_,7 @@
|
@@ -1632,7 +_,7 @@
|
||||||
int i = itemstack.getCount();
|
int i = itemstack.getCount();
|
||||||
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
||||||
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
|
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
|
||||||
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
|
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
|
||||||
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
||||||
@@ -1627,6 +_,9 @@
|
@@ -1648,6 +_,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,7 +280,7 @@
|
|||||||
if (!itemstack.isEmpty()
|
if (!itemstack.isEmpty()
|
||||||
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
|
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
|
||||||
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
@@ -1656,6 +_,8 @@
|
@@ -1677,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
ProfilerFiller profilerfiller = Profiler.get();
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
@@ -279,7 +289,7 @@
|
|||||||
profilerfiller.push("gui");
|
profilerfiller.push("gui");
|
||||||
this.chatListener.tick();
|
this.chatListener.tick();
|
||||||
this.gui.tick(this.pause);
|
this.gui.tick(this.pause);
|
||||||
@@ -1745,6 +_,7 @@
|
@@ -1766,6 +_,7 @@
|
||||||
|
|
||||||
this.tutorial.tick();
|
this.tutorial.tick();
|
||||||
|
|
||||||
@@ -287,7 +297,7 @@
|
|||||||
try {
|
try {
|
||||||
this.level.tick(() -> true);
|
this.level.tick(() -> true);
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -1758,6 +_,7 @@
|
@@ -1779,6 +_,7 @@
|
||||||
|
|
||||||
throw new ReportedException(crashreport1);
|
throw new ReportedException(crashreport1);
|
||||||
}
|
}
|
||||||
@@ -295,7 +305,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
profilerfiller.popPush("animateTick");
|
profilerfiller.popPush("animateTick");
|
||||||
@@ -1782,6 +_,7 @@
|
@@ -1803,6 +_,7 @@
|
||||||
profilerfiller.popPush("keyboard");
|
profilerfiller.popPush("keyboard");
|
||||||
this.keyboardHandler.tick();
|
this.keyboardHandler.tick();
|
||||||
profilerfiller.pop();
|
profilerfiller.pop();
|
||||||
@@ -303,7 +313,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isLevelRunningNormally() {
|
private boolean isLevelRunningNormally() {
|
||||||
@@ -1983,6 +_,7 @@
|
@@ -2003,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
||||||
@@ -311,7 +321,7 @@
|
|||||||
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
||||||
this.level = p_91157_;
|
this.level = p_91157_;
|
||||||
this.updateLevelInEngines(p_91157_);
|
this.updateLevelInEngines(p_91157_);
|
||||||
@@ -2020,6 +_,7 @@
|
@@ -2040,6 +_,7 @@
|
||||||
IntegratedServer integratedserver = this.singleplayerServer;
|
IntegratedServer integratedserver = this.singleplayerServer;
|
||||||
this.singleplayerServer = null;
|
this.singleplayerServer = null;
|
||||||
this.gameRenderer.resetData();
|
this.gameRenderer.resetData();
|
||||||
@@ -319,7 +329,7 @@
|
|||||||
this.gameMode = null;
|
this.gameMode = null;
|
||||||
this.narrator.clear();
|
this.narrator.clear();
|
||||||
this.clientLevelTeardownInProgress = true;
|
this.clientLevelTeardownInProgress = true;
|
||||||
@@ -2027,6 +_,7 @@
|
@@ -2047,6 +_,7 @@
|
||||||
try {
|
try {
|
||||||
this.updateScreenAndTick(p_335030_);
|
this.updateScreenAndTick(p_335030_);
|
||||||
if (this.level != null) {
|
if (this.level != null) {
|
||||||
@@ -327,7 +337,7 @@
|
|||||||
if (integratedserver != null) {
|
if (integratedserver != null) {
|
||||||
ProfilerFiller profilerfiller = Profiler.get();
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
profilerfiller.push("waitForServer");
|
profilerfiller.push("waitForServer");
|
||||||
@@ -2040,6 +_,7 @@
|
@@ -2060,6 +_,7 @@
|
||||||
|
|
||||||
this.gui.onDisconnected();
|
this.gui.onDisconnected();
|
||||||
this.isLocalServer = false;
|
this.isLocalServer = false;
|
||||||
@@ -335,40 +345,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.level = null;
|
this.level = null;
|
||||||
@@ -2187,6 +_,7 @@
|
@@ -2207,6 +_,7 @@
|
||||||
|
|
||||||
private void pickBlock() {
|
private void pickBlock() {
|
||||||
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInput(2, this.options.keyPickItem, InteractionHand.MAIN_HAND).isCanceled()) return;
|
||||||
boolean flag = this.player.getAbilities().instabuild;
|
boolean flag = Screen.hasControlDown();
|
||||||
BlockEntity blockentity = null;
|
switch (this.hitResult) {
|
||||||
HitResult.Type hitresult$type = this.hitResult.getType();
|
case BlockHitResult blockhitresult:
|
||||||
@@ -2199,7 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Block block = blockstate.getBlock();
|
|
||||||
- itemstack = block.getCloneItemStack(this.level, blockpos, blockstate);
|
|
||||||
+ itemstack = blockstate.getCloneItemStack(this.hitResult, this.level, blockpos, this.player);
|
|
||||||
if (itemstack.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -2213,7 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Entity entity = ((EntityHitResult)this.hitResult).getEntity();
|
|
||||||
- itemstack = entity.getPickResult();
|
|
||||||
+ itemstack = entity.getPickedResult(this.hitResult);
|
|
||||||
if (itemstack == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -2818,6 +_,10 @@
|
|
||||||
@Nullable
|
|
||||||
public static String getLauncherBrand() {
|
|
||||||
return System.getProperty("minecraft.launcher.brand");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public ItemColors getItemColors() {
|
|
||||||
+ return this.itemColors;
|
|
||||||
}
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/MouseHandler.java
|
--- a/net/minecraft/client/MouseHandler.java
|
||||||
+++ b/net/minecraft/client/MouseHandler.java
|
+++ b/net/minecraft/client/MouseHandler.java
|
||||||
@@ -85,6 +_,7 @@
|
@@ -90,6 +_,7 @@
|
||||||
this.activeButton = -1;
|
this.activeButton = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
if (this.minecraft.getOverlay() == null) {
|
if (this.minecraft.getOverlay() == null) {
|
||||||
if (this.minecraft.screen == null) {
|
if (this.minecraft.screen == null) {
|
||||||
if (!this.mouseGrabbed && flag) {
|
if (!this.mouseGrabbed && flag) {
|
||||||
@@ -98,7 +_,7 @@
|
@@ -103,7 +_,7 @@
|
||||||
screen.afterMouseAction();
|
screen.afterMouseAction();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Throwable throwable1) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -112,7 +_,7 @@
|
@@ -116,7 +_,7 @@
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@@ -26,18 +26,18 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
@@ -147,6 +_,7 @@
|
@@ -150,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onScroll(long p_91527_, double p_91528_, double p_91529_) {
|
public void fillMousePositionDetails(CrashReportCategory p_398230_, Window p_398216_) {
|
||||||
@@ -160,7 +_,9 @@
|
@@ -189,7 +_,9 @@
|
||||||
if (this.minecraft.screen != null) {
|
if (this.minecraft.screen != null) {
|
||||||
double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
|
double d3 = this.getScaledXPos(this.minecraft.getWindow());
|
||||||
double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d4 = this.getScaledYPos(this.minecraft.getWindow());
|
||||||
- this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
|
- this.minecraft.screen.mouseScrolled(d3, d4, d1, d2);
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPre(this.minecraft.screen, d3, d4, d1, d2)) return;
|
||||||
+ if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
|
+ if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return;
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
this.minecraft.screen.afterMouseAction();
|
this.minecraft.screen.afterMouseAction();
|
||||||
} else if (this.minecraft.player != null) {
|
} else if (this.minecraft.player != null) {
|
||||||
Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
|
Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
|
||||||
@@ -169,6 +_,7 @@
|
@@ -198,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
|
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
|
||||||
@@ -53,8 +53,8 @@
|
|||||||
if (this.minecraft.player.isSpectator()) {
|
if (this.minecraft.player.isSpectator()) {
|
||||||
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
||||||
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
|
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
|
||||||
@@ -274,7 +_,7 @@
|
@@ -303,7 +_,7 @@
|
||||||
double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d5 = getScaledYPos(window, this.accumulatedDY);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
- screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
|
- screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
|
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
|
||||||
screen.fillCrashDetails(crashreport1);
|
screen.fillCrashDetails(crashreport1);
|
||||||
@@ -349,6 +_,14 @@
|
@@ -393,6 +_,14 @@
|
||||||
|
|
||||||
public double ypos() {
|
public double ypos() {
|
||||||
return this.ypos;
|
return this.ypos;
|
||||||
|
|||||||
@@ -1,16 +1,24 @@
|
|||||||
--- a/net/minecraft/client/Options.java
|
--- a/net/minecraft/client/Options.java
|
||||||
+++ b/net/minecraft/client/Options.java
|
+++ b/net/minecraft/client/Options.java
|
||||||
@@ -698,7 +_,8 @@
|
@@ -668,7 +_,8 @@
|
||||||
},
|
},
|
||||||
new OptionInstance.LazyEnum<>(
|
new OptionInstance.LazyEnum<>(
|
||||||
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
||||||
- p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
- p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
||||||
+ // FORGE: fix incorrect string comparison - PR #8767
|
+ // FORGE: fix incorrect string comparison - PR #8767
|
||||||
+ p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
+ p_232011_ -> Minecraft.getInstance().isRunning() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
|
||||||
? Optional.empty()
|
? Optional.empty()
|
||||||
: Optional.of(p_232011_),
|
: Optional.of(p_232011_),
|
||||||
Codec.STRING
|
Codec.STRING
|
||||||
@@ -1079,6 +_,7 @@
|
@@ -683,6 +_,7 @@
|
||||||
|
public boolean onboardAccessibility = true;
|
||||||
|
public boolean syncWrites;
|
||||||
|
public boolean startedCleanly = true;
|
||||||
|
+ private final Map<String, String> unknownKeys = new java.util.HashMap<>();
|
||||||
|
|
||||||
|
public OptionInstance<Boolean> darkMojangStudiosBackground() {
|
||||||
|
return this.darkMojangStudiosBackground;
|
||||||
|
@@ -1050,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Options(Minecraft p_92138_, File p_92139_) {
|
public Options(Minecraft p_92138_, File p_92139_) {
|
||||||
@@ -18,15 +26,16 @@
|
|||||||
this.minecraft = p_92138_;
|
this.minecraft = p_92138_;
|
||||||
this.optionsFile = new File(p_92139_, "options.txt");
|
this.optionsFile = new File(p_92139_, "options.txt");
|
||||||
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
||||||
@@ -1210,12 +_,22 @@
|
@@ -1181,15 +_,28 @@
|
||||||
p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
|
|
||||||
this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
|
this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
|
||||||
p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
|
p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
|
||||||
+ processOptionsForge(p_168428_);
|
this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly);
|
||||||
|
+ processOptionsKeysOnly(p_168428_);
|
||||||
|
+ processOptionsEnd(p_168428_);
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
+ // FORGE: split off to allow reloading options after mod loading is done
|
+ // FORGE: split off to allow reloading keys after mod loading is done
|
||||||
+ private void processOptionsForge(Options.FieldAccess p_168428_) {
|
+ private void processOptionsKeysOnly(Options.FieldAccess p_168428_) {
|
||||||
for (KeyMapping keymapping : this.keyMappings) {
|
for (KeyMapping keymapping : this.keyMappings) {
|
||||||
- String s = keymapping.saveString();
|
- String s = keymapping.saveString();
|
||||||
+ String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
|
+ String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : "");
|
||||||
@@ -41,8 +50,13 @@
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
+ }
|
||||||
|
|
||||||
@@ -1233,6 +_,10 @@
|
+ private void processOptionsEnd(Options.FieldAccess p_168428_) {
|
||||||
|
for (SoundSource soundsource : SoundSource.values()) {
|
||||||
|
p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource));
|
||||||
|
}
|
||||||
|
@@ -1204,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void load() {
|
public void load() {
|
||||||
@@ -53,17 +67,60 @@
|
|||||||
try {
|
try {
|
||||||
if (!this.optionsFile.exists()) {
|
if (!this.optionsFile.exists()) {
|
||||||
return;
|
return;
|
||||||
@@ -1260,7 +_,8 @@
|
@@ -1228,7 +_,8 @@
|
||||||
}
|
this.graphicsMode.set(isTrue(optional.get()) ? GraphicsStatus.FANCY : GraphicsStatus.FAST);
|
||||||
}
|
}
|
||||||
|
|
||||||
- this.processOptions(
|
- this.processOptions(
|
||||||
+ java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsForge : this::processOptions;
|
+ java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions;
|
||||||
+ processor.accept(
|
+ processor.accept(
|
||||||
new Options.FieldAccess() {
|
new Options.FieldAccess() {
|
||||||
@Nullable
|
@Nullable
|
||||||
private String getValueOrNull(String p_168459_) {
|
private String getValue(String p_394210_) {
|
||||||
@@ -1451,6 +_,7 @@
|
@@ -1310,6 +_,17 @@
|
||||||
|
);
|
||||||
|
compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_);
|
||||||
|
KeyMapping.resetMapping();
|
||||||
|
+
|
||||||
|
+ if (limited) {
|
||||||
|
+ this.unknownKeys.clear();
|
||||||
|
+ } else {
|
||||||
|
+ var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet());
|
||||||
|
+ for (var entry : compoundtag1.entrySet()) {
|
||||||
|
+ if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey()))
|
||||||
|
+ this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
} catch (Exception exception) {
|
||||||
|
LOGGER.error("Failed to load options", (Throwable)exception);
|
||||||
|
}
|
||||||
|
@@ -1337,9 +_,11 @@
|
||||||
|
public void save() {
|
||||||
|
try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
|
||||||
|
printwriter.println("version:" + SharedConstants.getCurrentVersion().getDataVersion().getVersion());
|
||||||
|
+ var seen = new java.util.HashSet<String>();
|
||||||
|
this.processOptions(
|
||||||
|
new Options.FieldAccess() {
|
||||||
|
public void writePrefix(String p_168491_) {
|
||||||
|
+ seen.add(p_168491_);
|
||||||
|
printwriter.print(p_168491_);
|
||||||
|
printwriter.print(':');
|
||||||
|
}
|
||||||
|
@@ -1395,6 +_,12 @@
|
||||||
|
if (s != null) {
|
||||||
|
printwriter.println("fullscreenResolution:" + s);
|
||||||
|
}
|
||||||
|
+ // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config.
|
||||||
|
+ for (var entry : this.unknownKeys.entrySet()) {
|
||||||
|
+ if (!seen.contains(entry.getKey()))
|
||||||
|
+ printwriter.println(entry.getKey() + ":" + entry.getValue());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
} catch (Exception exception) {
|
||||||
|
LOGGER.error("Failed to save options", (Throwable)exception);
|
||||||
|
}
|
||||||
|
@@ -1433,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastOptions() {
|
public void broadcastOptions() {
|
||||||
@@ -71,7 +128,7 @@
|
|||||||
if (this.minecraft.player != null) {
|
if (this.minecraft.player != null) {
|
||||||
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
|
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
|
||||||
}
|
}
|
||||||
@@ -1564,6 +_,23 @@
|
@@ -1546,6 +_,23 @@
|
||||||
|
|
||||||
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
||||||
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
||||||
|
|||||||
@@ -1,30 +1,32 @@
|
|||||||
--- a/net/minecraft/client/Screenshot.java
|
--- a/net/minecraft/client/Screenshot.java
|
||||||
+++ b/net/minecraft/client/Screenshot.java
|
+++ b/net/minecraft/client/Screenshot.java
|
||||||
@@ -54,14 +_,24 @@
|
@@ -43,6 +_,13 @@
|
||||||
file2 = new File(file1, p_92307_);
|
file2 = new File(file1, p_92297_);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(nativeimage, file2);
|
+ var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenshot(p_389141_, file2);
|
||||||
+ if (event.isCanceled()) {
|
+ if (event.isCanceled()) {
|
||||||
+ p_92311_.accept(event.getCancelMessage());
|
+ p_92301_.accept(event.getCancelMessage());
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+ final File target = event.getScreenshotFile();
|
+ final File target = event.getScreenshotFile();
|
||||||
+
|
+
|
||||||
Util.ioPool()
|
Util.ioPool()
|
||||||
.execute(
|
.execute(
|
||||||
() -> {
|
() -> {
|
||||||
try {
|
@@ -50,10 +_,13 @@
|
||||||
- nativeimage.writeToFile(file2);
|
NativeImage $$4x = p_389141_;
|
||||||
- Component component = Component.literal(file2.getName())
|
|
||||||
+ nativeimage.writeToFile(target);
|
try {
|
||||||
+ Component component = Component.literal(target.getName())
|
- p_389141_.writeToFile(file2);
|
||||||
.withStyle(ChatFormatting.UNDERLINE)
|
- Component component = Component.literal(file2.getName())
|
||||||
- .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, file2.getAbsolutePath())));
|
+ p_389141_.writeToFile(target);
|
||||||
+ .withStyle(p_168608_ -> p_168608_.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, target.getAbsolutePath())));
|
+ Component component = Component.literal(target.getName())
|
||||||
+ if (event.getResultMessage() != null)
|
.withStyle(ChatFormatting.UNDERLINE)
|
||||||
+ p_92311_.accept(event.getResultMessage());
|
.withStyle(p_389149_ -> p_389149_.withClickEvent(new ClickEvent.OpenFile(file2.getAbsoluteFile())));
|
||||||
+ else
|
+ if (event.getResultMessage() != null)
|
||||||
p_92311_.accept(Component.translatable("screenshot.success", component));
|
+ p_92301_.accept(event.getResultMessage());
|
||||||
} catch (Exception exception) {
|
+ else
|
||||||
LOGGER.warn("Couldn't save screenshot", (Throwable)exception);
|
p_92301_.accept(Component.translatable("screenshot.success", component));
|
||||||
|
} catch (Throwable throwable1) {
|
||||||
|
if (p_389141_ != null) {
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
--- a/net/minecraft/client/color/block/BlockColors.java
|
--- a/net/minecraft/client/color/block/BlockColors.java
|
||||||
+++ b/net/minecraft/client/color/block/BlockColors.java
|
+++ b/net/minecraft/client/color/block/BlockColors.java
|
||||||
@@ -29,7 +_,8 @@
|
@@ -30,7 +_,8 @@
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public class BlockColors {
|
|
||||||
private static final int DEFAULT = -1;
|
private static final int DEFAULT = -1;
|
||||||
|
public static final int LILY_PAD_IN_WORLD = -14647248;
|
||||||
|
public static final int LILY_PAD_DEFAULT = -9321636;
|
||||||
- private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
|
- private final IdMapper<BlockColor> blockColors = new IdMapper<>(32);
|
||||||
+ // Forge: Use registry delegate as non-Vanilla block ids are not constant
|
+ // Forge: Use registry delegate as non-Vanilla block ids are not constant
|
||||||
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
|
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Block>, BlockColor> blockColors = new java.util.HashMap<>(32);
|
||||||
private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
|
private final Map<Block, Set<Property<?>>> coloringStates = Maps.newHashMap();
|
||||||
|
|
||||||
public static BlockColors createDefault() {
|
public static BlockColors createDefault() {
|
||||||
@@ -91,11 +_,12 @@
|
@@ -95,11 +_,12 @@
|
||||||
}, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
}, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
||||||
blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
blockcolors.addColoringState(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
|
||||||
blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
|
blockcolors.register((p_92596_, p_92597_, p_92598_, p_92599_) -> p_92597_ != null && p_92598_ != null ? -14647248 : -9321636, Blocks.LILY_PAD);
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
if (blockcolor != null) {
|
if (blockcolor != null) {
|
||||||
return blockcolor.getColor(p_92583_, null, null, 0);
|
return blockcolor.getColor(p_92583_, null, null, 0);
|
||||||
} else {
|
} else {
|
||||||
@@ -105,13 +_,15 @@
|
@@ -109,13 +_,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
|
public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
--- a/net/minecraft/client/color/item/ItemColors.java
|
|
||||||
+++ b/net/minecraft/client/color/item/ItemColors.java
|
|
||||||
@@ -26,7 +_,8 @@
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public class ItemColors {
|
|
||||||
private static final int DEFAULT = -1;
|
|
||||||
- private final IdMapper<ItemColor> itemColors = new IdMapper<>(32);
|
|
||||||
+ // Forge: Use registry delegate as non-Vanilla item ids are not constant
|
|
||||||
+ private final java.util.Map<net.minecraft.core.Holder.Reference<Item>, ItemColor> itemColors = new java.util.HashMap<>(32);
|
|
||||||
|
|
||||||
public static ItemColors createDefault(BlockColors p_92684_) {
|
|
||||||
ItemColors itemcolors = new ItemColors();
|
|
||||||
@@ -101,17 +_,20 @@
|
|
||||||
(p_357654_, p_357655_) -> p_357655_ == 0 ? -1 : ARGB.opaque(p_357654_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
|
|
||||||
Items.FILLED_MAP
|
|
||||||
);
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
|
|
||||||
return itemcolors;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getColor(ItemStack p_92677_, int p_92678_) {
|
|
||||||
- ItemColor itemcolor = this.itemColors.byId(BuiltInRegistries.ITEM.getId(p_92677_.getItem()));
|
|
||||||
+ ItemColor itemcolor = this.itemColors.get(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(p_92677_.getItem()));
|
|
||||||
return itemcolor == null ? -1 : itemcolor.getColor(p_92677_, p_92678_);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Item} */
|
|
||||||
+ @Deprecated
|
|
||||||
public void register(ItemColor p_92690_, ItemLike... p_92691_) {
|
|
||||||
for (ItemLike itemlike : p_92691_) {
|
|
||||||
- this.itemColors.addMapping(p_92690_, Item.getId(itemlike.asItem()));
|
|
||||||
+ this.itemColors.put(net.minecraftforge.registries.ForgeRegistries.ITEMS.getDelegateOrThrow(itemlike.asItem()), p_92690_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
--- a/net/minecraft/client/data/Main.java
|
||||||
|
+++ b/net/minecraft/client/data/Main.java
|
||||||
|
@@ -30,13 +_,18 @@
|
||||||
|
OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
|
||||||
|
OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
|
||||||
|
OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
|
||||||
|
+ OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg();
|
||||||
|
+ var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true);
|
||||||
|
OptionSet optionset = optionparser.parse(p_375526_);
|
||||||
|
- if (!optionset.has(optionspec) && optionset.hasOptions()) {
|
||||||
|
+ if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) {
|
||||||
|
+ var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList();
|
||||||
|
Path path = Paths.get(optionspec3.value(optionset));
|
||||||
|
boolean flag = optionset.has(optionspec2);
|
||||||
|
boolean flag1 = flag || optionset.has(optionspec1);
|
||||||
|
Bootstrap.bootStrap();
|
||||||
|
ClientBootstrap.bootstrap();
|
||||||
|
+ if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true))
|
||||||
|
+ return;
|
||||||
|
DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
|
||||||
|
addClientProviders(datagenerator, flag1);
|
||||||
|
datagenerator.run();
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
--- a/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
|
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java
|
||||||
|
@@ -852,6 +_,9 @@
|
||||||
|
this.declareCustomModelItem(Items.COD);
|
||||||
|
this.declareCustomModelItem(Items.FEATHER);
|
||||||
|
this.declareCustomModelItem(Items.LEAD);
|
||||||
|
+ // moved from validate to here, because it's just vanilla default blocks
|
||||||
|
+ if (this.itemModelOutput instanceof ModelProvider.ItemInfoCollector collector)
|
||||||
|
+ collector.generateDefaultBlockModels();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
--- a/net/minecraft/client/data/models/ModelProvider.java
|
||||||
|
+++ b/net/minecraft/client/data/models/ModelProvider.java
|
||||||
|
@@ -45,11 +_,11 @@
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<?> run(CachedOutput p_376268_) {
|
||||||
|
- ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector();
|
||||||
|
- ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector();
|
||||||
|
+ ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems);
|
||||||
|
+ ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
|
||||||
|
ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector();
|
||||||
|
- new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
- new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
+ getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
+ getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run();
|
||||||
|
modelprovider$blockstategeneratorcollector.validate();
|
||||||
|
modelprovider$iteminfocollector.finalizeAndValidate();
|
||||||
|
return CompletableFuture.allOf(
|
||||||
|
@@ -59,6 +_,22 @@
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ protected Stream<Block> getKnownBlocks() {
|
||||||
|
+ return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected Stream<Item> getKnownItems() {
|
||||||
|
+ return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected BlockModelGenerators getBlockModelGenerators(BlockStateGeneratorCollector blocks, ItemInfoCollector items, SimpleModelCollector models) {
|
||||||
|
+ return new BlockModelGenerators(blocks, items, models);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ protected ItemModelGenerators getItemModelGenerators(ItemInfoCollector items, SimpleModelCollector models) {
|
||||||
|
+ return new ItemModelGenerators(items, models);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public final String getName() {
|
||||||
|
return "Model Definitions";
|
||||||
|
@@ -67,6 +_,15 @@
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
|
||||||
|
private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
|
||||||
|
+ private final Supplier<Stream<Block>> known;
|
||||||
|
+
|
||||||
|
+ public BlockStateGeneratorCollector() {
|
||||||
|
+ this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().location().getNamespace())));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) {
|
||||||
|
+ this.known = known;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
public void accept(BlockModelDefinitionGenerator p_393399_) {
|
||||||
|
Block block = p_393399_.block();
|
||||||
|
@@ -77,7 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void validate() {
|
||||||
|
- Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true);
|
||||||
|
+ Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder);
|
||||||
|
List<ResourceLocation> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value()))
|
||||||
|
.map(p_378200_ -> p_378200_.key().location())
|
||||||
|
.toList();
|
||||||
|
@@ -97,6 +_,15 @@
|
||||||
|
public static class ItemInfoCollector implements ItemModelOutput {
|
||||||
|
private final Map<Item, ClientItem> itemInfos = new HashMap<>();
|
||||||
|
private final Map<Item, Item> copies = new HashMap<>();
|
||||||
|
+ private final Supplier<Stream<Item>> known;
|
||||||
|
+
|
||||||
|
+ public ItemInfoCollector() {
|
||||||
|
+ this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().location().getNamespace())));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public ItemInfoCollector(Supplier<Stream<Item>> known) {
|
||||||
|
+ this.known = known;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void accept(Item p_376450_, ItemModel.Unbaked p_378513_) {
|
||||||
|
@@ -115,7 +_,7 @@
|
||||||
|
this.copies.put(p_376965_, p_377438_);
|
||||||
|
}
|
||||||
|
|
||||||
|
- public void finalizeAndValidate() {
|
||||||
|
+ public void generateDefaultBlockModels() {
|
||||||
|
BuiltInRegistries.ITEM.forEach(p_378629_ -> {
|
||||||
|
if (!this.copies.containsKey(p_378629_)) {
|
||||||
|
if (p_378629_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) {
|
||||||
|
@@ -124,6 +_,8 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
+ }
|
||||||
|
+ public void finalizeAndValidate() {
|
||||||
|
this.copies.forEach((p_376289_, p_375718_) -> {
|
||||||
|
ClientItem clientitem = this.itemInfos.get(p_375718_);
|
||||||
|
if (clientitem == null) {
|
||||||
|
@@ -132,8 +_,8 @@
|
||||||
|
this.register(p_376289_, clientitem);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
- List<ResourceLocation> list = BuiltInRegistries.ITEM
|
||||||
|
- .listElements()
|
||||||
|
+ List<ResourceLocation> list = known.get()
|
||||||
|
+ .map(item -> item.builtInRegistryHolder())
|
||||||
|
.filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value()))
|
||||||
|
.map(p_378591_ -> p_378591_.key().location())
|
||||||
|
.toList();
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
--- a/net/minecraft/client/gui/Font.java
|
--- a/net/minecraft/client/gui/Font.java
|
||||||
+++ b/net/minecraft/client/gui/Font.java
|
+++ b/net/minecraft/client/gui/Font.java
|
||||||
@@ -33,7 +_,7 @@
|
@@ -32,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
-public class Font {
|
-public class Font {
|
||||||
+public class Font implements net.minecraftforge.client.extensions.IForgeFont {
|
+public class Font implements net.minecraftforge.client.extensions.IForgeFont {
|
||||||
private static final float EFFECT_DEPTH = 0.01F;
|
private static final float EFFECT_DEPTH = 0.01F;
|
||||||
private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
|
public static final float SHADOW_DEPTH = 0.03F;
|
||||||
public static final int ALPHA_CUTOFF = 8;
|
public static final int NO_SHADOW = 0;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/Gui.java
|
--- a/net/minecraft/client/gui/Gui.java
|
||||||
+++ b/net/minecraft/client/gui/Gui.java
|
+++ b/net/minecraft/client/gui/Gui.java
|
||||||
@@ -147,7 +_,7 @@
|
@@ -148,7 +_,7 @@
|
||||||
public float vignetteBrightness = 1.0F;
|
public float vignetteBrightness = 1.0F;
|
||||||
private int toolHighlightTimer;
|
private int toolHighlightTimer;
|
||||||
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
||||||
@@ -9,16 +9,50 @@
|
|||||||
private final SubtitleOverlay subtitleOverlay;
|
private final SubtitleOverlay subtitleOverlay;
|
||||||
private final SpectatorGui spectatorGui;
|
private final SpectatorGui spectatorGui;
|
||||||
private final PlayerTabOverlay tabList;
|
private final PlayerTabOverlay tabList;
|
||||||
@@ -345,7 +_,7 @@
|
@@ -168,7 +_,7 @@
|
||||||
|
private int lastBubblePopSoundPlayed;
|
||||||
|
private float autosaveIndicatorValue;
|
||||||
|
private float lastAutosaveIndicatorValue;
|
||||||
|
- private final LayeredDraw layers = new LayeredDraw();
|
||||||
|
+ private final LayeredDraw layers = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.VANILLA_ROOT, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.COMBINE_LIST);
|
||||||
|
private float scopeScale;
|
||||||
|
|
||||||
|
public Gui(Minecraft p_330021_) {
|
||||||
|
@@ -180,14 +_,14 @@
|
||||||
|
this.bossOverlay = new BossHealthOverlay(p_330021_);
|
||||||
|
this.subtitleOverlay = new SubtitleOverlay(p_330021_);
|
||||||
|
this.resetTitleTimes();
|
||||||
|
- LayeredDraw layereddraw = new LayeredDraw()
|
||||||
|
+ LayeredDraw layereddraw = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_SLEEP_STACK, net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.PRE_LIST)
|
||||||
|
.add(this::renderCameraOverlays)
|
||||||
|
.add(this::renderCrosshair)
|
||||||
|
.add(this::renderHotbarAndDecorations)
|
||||||
|
.add(this::renderExperienceLevel)
|
||||||
|
.add(this::renderEffects)
|
||||||
|
.add((p_325313_, p_342678_) -> this.bossOverlay.render(p_325313_));
|
||||||
|
- LayeredDraw layereddraw1 = new LayeredDraw()
|
||||||
|
+ LayeredDraw layereddraw1 = new net.minecraftforge.client.gui.overlay.ForgeLayeredDraw(net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_SLEEP_STACK,net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.POST_LIST)
|
||||||
|
.add(this::renderDemoOverlay)
|
||||||
|
.add((p_325315_, p_344521_) -> {
|
||||||
|
if (this.debugOverlay.showDebugScreen()) {
|
||||||
|
@@ -204,6 +_,7 @@
|
||||||
|
.add(layereddraw, () -> !p_330021_.options.hideGui)
|
||||||
|
.add(this::renderSleepOverlay)
|
||||||
|
.add(layereddraw1, () -> !p_330021_.options.hideGui);
|
||||||
|
+ ((net.minecraftforge.client.gui.overlay.ForgeLayeredDraw) layers).resolveLayers();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void resetTitleTimes() {
|
||||||
|
@@ -347,7 +_,7 @@
|
||||||
Window window = this.minecraft.getWindow();
|
Window window = this.minecraft.getWindow();
|
||||||
int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
|
int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
|
||||||
int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
|
int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
|
||||||
- this.chat.render(p_329202_, this.tickCount, i, j, false);
|
- this.chat.render(p_329202_, this.tickCount, i, j, false);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
|
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,6 +_,8 @@
|
@@ -445,6 +_,8 @@
|
||||||
|
|
||||||
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
||||||
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
||||||
@@ -27,7 +61,7 @@
|
|||||||
if (mobeffectinstance.showIcon()) {
|
if (mobeffectinstance.showIcon()) {
|
||||||
int k = p_282812_.guiWidth();
|
int k = p_282812_.guiWidth();
|
||||||
int l = 1;
|
int l = 1;
|
||||||
@@ -473,6 +_,7 @@
|
@@ -475,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,7 +69,7 @@
|
|||||||
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
||||||
int l1 = k;
|
int l1 = k;
|
||||||
int k1 = l;
|
int k1 = l;
|
||||||
@@ -623,6 +_,10 @@
|
@@ -625,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
||||||
@@ -46,7 +80,7 @@
|
|||||||
Profiler.get().push("selectedItemName");
|
Profiler.get().push("selectedItemName");
|
||||||
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
||||||
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
||||||
@@ -630,9 +_,13 @@
|
@@ -632,9 +_,13 @@
|
||||||
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +96,7 @@
|
|||||||
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
||||||
k += 14;
|
k += 14;
|
||||||
}
|
}
|
||||||
@@ -643,7 +_,7 @@
|
@@ -645,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (l > 0) {
|
if (l > 0) {
|
||||||
@@ -71,8 +105,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1152,7 +_,7 @@
|
@@ -1154,7 +_,7 @@
|
||||||
ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
|
ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
|
||||||
if (itemstack.isEmpty()) {
|
if (itemstack.isEmpty()) {
|
||||||
this.toolHighlightTimer = 0;
|
this.toolHighlightTimer = 0;
|
||||||
- } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
|
- } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/GuiGraphics.java
|
--- a/net/minecraft/client/gui/GuiGraphics.java
|
||||||
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
||||||
@@ -53,7 +_,7 @@
|
@@ -52,7 +_,7 @@
|
||||||
import org.joml.Vector2ic;
|
import org.joml.Vector2ic;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
public static final float MAX_GUI_Z = 10000.0F;
|
public static final float MAX_GUI_Z = 10000.0F;
|
||||||
public static final float MIN_GUI_Z = -10000.0F;
|
public static final float MIN_GUI_Z = -10000.0F;
|
||||||
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
||||||
@@ -227,6 +_,11 @@
|
@@ -229,6 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
|
public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
return p_281896_ == null
|
return p_281896_ == null
|
||||||
? 0
|
? 0
|
||||||
: p_283343_.drawInBatch(
|
: p_283343_.drawInBatch(
|
||||||
@@ -248,6 +_,11 @@
|
@@ -250,6 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
|
public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
|
||||||
@@ -31,9 +31,9 @@
|
|||||||
+ // Forge: Add float variant for x,y coordinates
|
+ // Forge: Add float variant for x,y coordinates
|
||||||
+ public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
|
+ public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
|
||||||
return p_282636_.drawInBatch(
|
return p_282636_.drawInBatch(
|
||||||
p_281596_,
|
p_281596_, p_281586_, p_282816_, p_281743_, p_282394_, this.pose.last().pose(), this.bufferSource, Font.DisplayMode.NORMAL, 0, 15728880
|
||||||
(float)p_281586_,
|
);
|
||||||
@@ -872,6 +_,7 @@
|
@@ -850,6 +_,7 @@
|
||||||
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
||||||
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
||||||
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
|
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
|
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
|
||||||
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
|
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport);
|
||||||
@@ -892,13 +_,24 @@
|
@@ -870,13 +_,24 @@
|
||||||
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
|
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
|
||||||
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
|
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
|
||||||
this.pose.popPose();
|
this.pose.popPose();
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
|
public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
|
||||||
@@ -908,8 +_,7 @@
|
@@ -886,8 +_,7 @@
|
||||||
public void renderTooltip(
|
public void renderTooltip(
|
||||||
Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
|
Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
|
||||||
) {
|
) {
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
|
this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -922,7 +_,22 @@
|
@@ -900,7 +_,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
|
public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
|
public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
|
||||||
@@ -964,11 +_,13 @@
|
@@ -942,11 +_,13 @@
|
||||||
@Nullable ResourceLocation p_368234_
|
@Nullable ResourceLocation p_368234_
|
||||||
) {
|
) {
|
||||||
if (!p_282615_.isEmpty()) {
|
if (!p_282615_.isEmpty()) {
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
if (k > i) {
|
if (k > i) {
|
||||||
i = k;
|
i = k;
|
||||||
}
|
}
|
||||||
@@ -978,18 +_,19 @@
|
@@ -956,18 +_,19 @@
|
||||||
|
|
||||||
int i2 = i;
|
int i2 = i;
|
||||||
int j2 = j;
|
int j2 = j;
|
||||||
@@ -138,7 +138,7 @@
|
|||||||
k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
|
k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -997,7 +_,7 @@
|
@@ -975,7 +_,7 @@
|
||||||
|
|
||||||
for (int k2 = 0; k2 < p_282615_.size(); k2++) {
|
for (int k2 = 0; k2 < p_282615_.size(); k2++) {
|
||||||
ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
|
ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
|
||||||
@@ -147,8 +147,8 @@
|
|||||||
k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
|
k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1054,6 +_,10 @@
|
@@ -1030,6 +_,10 @@
|
||||||
}
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
@@ -259,6 +_,25 @@
|
@@ -250,6 +_,25 @@
|
||||||
this.focused = p_93693_;
|
this.focused = p_93693_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
--- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
+++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
||||||
@@ -105,9 +_,9 @@
|
@@ -134,9 +_,9 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
private CompletableFuture<LevelChunk> serverChunk;
|
private CompletableFuture<LevelChunk> serverChunk;
|
||||||
private boolean renderDebug;
|
private boolean renderDebug;
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
private final LocalSampleLogger frameTimeLogger = new LocalSampleLogger(1);
|
private final LocalSampleLogger frameTimeLogger = new LocalSampleLogger(1);
|
||||||
private final LocalSampleLogger tickTimeLogger = new LocalSampleLogger(TpsDebugDimensions.values().length);
|
private final LocalSampleLogger tickTimeLogger = new LocalSampleLogger(TpsDebugDimensions.values().length);
|
||||||
private final LocalSampleLogger pingLogger = new LocalSampleLogger(1);
|
private final LocalSampleLogger pingLogger = new LocalSampleLogger(1);
|
||||||
@@ -135,14 +_,18 @@
|
@@ -179,14 +_,18 @@
|
||||||
this.clientChunk = null;
|
this.clientChunk = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
this.profilerPieChart.setBottomOffset(10);
|
this.profilerPieChart.setBottomOffset(10);
|
||||||
if (this.renderFpsCharts) {
|
if (this.renderFpsCharts) {
|
||||||
int i = p_281427_.guiWidth();
|
int i = p_281427_.guiWidth();
|
||||||
@@ -155,7 +_,9 @@
|
@@ -199,7 +_,9 @@
|
||||||
|
|
||||||
this.profilerPieChart.setBottomOffset(this.tpsChart.getFullHeight());
|
this.profilerPieChart.setBottomOffset(this.tpsChart.getFullHeight());
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
if (this.renderNetworkCharts) {
|
if (this.renderNetworkCharts) {
|
||||||
int l = p_281427_.guiWidth();
|
int l = p_281427_.guiWidth();
|
||||||
int i1 = l / 2;
|
int i1 = l / 2;
|
||||||
@@ -171,12 +_,22 @@
|
@@ -215,12 +_,22 @@
|
||||||
try (Zone zone = profilerfiller.zone("profilerPie")) {
|
try (Zone zone = profilerfiller.zone("profilerPie")) {
|
||||||
this.profilerPieChart.render(p_281427_);
|
this.profilerPieChart.render(p_281427_);
|
||||||
}
|
}
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
list.add("");
|
list.add("");
|
||||||
boolean flag = this.minecraft.getSingleplayerServer() != null;
|
boolean flag = this.minecraft.getSingleplayerServer() != null;
|
||||||
list.add(
|
list.add(
|
||||||
@@ -190,11 +_,18 @@
|
@@ -234,11 +_,18 @@
|
||||||
+ (this.renderNetworkCharts ? " visible" : " hidden")
|
+ (this.renderNetworkCharts ? " visible" : " hidden")
|
||||||
);
|
);
|
||||||
list.add("For help: press F3 + Q");
|
list.add("For help: press F3 + Q");
|
||||||
@@ -90,7 +90,7 @@
|
|||||||
this.renderLines(p_281261_, list, false);
|
this.renderLines(p_281261_, list, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -543,6 +_,7 @@
|
@@ -592,6 +_,7 @@
|
||||||
list.add("");
|
list.add("");
|
||||||
list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
|
list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
|
||||||
list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
|
list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/toasts/ToastManager.java
|
--- a/net/minecraft/client/gui/components/toasts/ToastManager.java
|
||||||
+++ b/net/minecraft/client/gui/components/toasts/ToastManager.java
|
+++ b/net/minecraft/client/gui/components/toasts/ToastManager.java
|
||||||
@@ -107,6 +_,7 @@
|
@@ -127,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addToast(Toast p_360768_) {
|
public void addToast(Toast p_360768_) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/LoadingOverlay.java
|
--- a/net/minecraft/client/gui/screens/LoadingOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
|
+++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
|
||||||
@@ -62,6 +_,8 @@
|
@@ -61,6 +_,8 @@
|
||||||
return p_169325_ & 16777215 | p_169326_ << 24;
|
return p_169325_ & 16777215 | p_169326_ << 24;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9,17 +9,17 @@
|
|||||||
@Override
|
@Override
|
||||||
public void render(GuiGraphics p_281839_, int p_282704_, int p_283650_, float p_283394_) {
|
public void render(GuiGraphics p_281839_, int p_282704_, int p_283650_, float p_283394_) {
|
||||||
int i = p_281839_.guiWidth();
|
int i = p_281839_.guiWidth();
|
||||||
@@ -100,6 +_,7 @@
|
@@ -95,6 +_,7 @@
|
||||||
f2 = 1.0F;
|
f2 = 1.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (renderContents(p_281839_, f2)) {
|
+ if (renderContents(p_281839_, f2)) {
|
||||||
int k2 = (int)((double)p_281839_.guiWidth() * 0.5);
|
int l2 = (int)(p_281839_.guiWidth() * 0.5);
|
||||||
int l2 = (int)((double)p_281839_.guiHeight() * 0.5);
|
int i1 = (int)(p_281839_.guiHeight() * 0.5);
|
||||||
double d1 = Math.min((double)p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
|
double d0 = Math.min(p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
|
||||||
@@ -115,12 +_,14 @@
|
@@ -110,12 +_,14 @@
|
||||||
if (f < 1.0F) {
|
if (f < 1.0F) {
|
||||||
this.drawProgressBar(p_281839_, i / 2 - j1, l1 - 5, i / 2 + j1, l1 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
|
this.drawProgressBar(p_281839_, i / 2 - k1, i2 - 5, i / 2 + k1, i2 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
try {
|
try {
|
||||||
this.reload.checkExceptions();
|
this.reload.checkExceptions();
|
||||||
this.onFinish.accept(Optional.empty());
|
this.onFinish.accept(Optional.empty());
|
||||||
@@ -128,7 +_,6 @@
|
@@ -123,7 +_,6 @@
|
||||||
this.onFinish.accept(Optional.of(throwable));
|
this.onFinish.accept(Optional.of(throwable));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/Screen.java
|
--- a/net/minecraft/client/gui/screens/Screen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/Screen.java
|
+++ b/net/minecraft/client/gui/screens/Screen.java
|
||||||
@@ -200,7 +_,7 @@
|
@@ -197,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClose() {
|
public void onClose() {
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void renderBlurredBackground() {
|
protected void renderBlurredBackground() {
|
||||||
@@ -454,6 +_,19 @@
|
@@ -453,6 +_,19 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onFilesDrop(List<Path> p_96591_) {
|
public void onFilesDrop(List<Path> p_96591_) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/TitleScreen.java
|
--- a/net/minecraft/client/gui/screens/TitleScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/TitleScreen.java
|
+++ b/net/minecraft/client/gui/screens/TitleScreen.java
|
||||||
@@ -60,6 +_,7 @@
|
@@ -58,6 +_,7 @@
|
||||||
private boolean fading;
|
private boolean fading;
|
||||||
private long fadeInStart;
|
private long fadeInStart;
|
||||||
private final LogoRenderer logoRenderer;
|
private final LogoRenderer logoRenderer;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public TitleScreen() {
|
public TitleScreen() {
|
||||||
this(false);
|
this(false);
|
||||||
@@ -115,11 +_,15 @@
|
@@ -111,11 +_,15 @@
|
||||||
int j = this.width - i - 2;
|
int j = this.width - i - 2;
|
||||||
int k = 24;
|
int k = 24;
|
||||||
int l = this.height / 4 + 48;
|
int l = this.height / 4 + 48;
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
l = this.createTestWorldButton(l, 24);
|
l = this.createTestWorldButton(l, 24);
|
||||||
SpriteIconButton spriteiconbutton = this.addRenderableWidget(
|
SpriteIconButton spriteiconbutton = this.addRenderableWidget(
|
||||||
@@ -184,7 +_,7 @@
|
@@ -180,7 +_,7 @@
|
||||||
}).bounds(this.width / 2 - 100, i = p_96764_ + p_96765_, 200, 20).tooltip(tooltip).build()).active = flag;
|
}).bounds(this.width / 2 - 100, i = p_96764_ + p_96765_, 200, 20).tooltip(tooltip).build()).active = flag;
|
||||||
this.addRenderableWidget(
|
this.addRenderableWidget(
|
||||||
Button.builder(Component.translatable("menu.online"), p_325369_ -> this.minecraft.setScreen(new RealmsMainScreen(this)))
|
Button.builder(Component.translatable("menu.online"), p_325369_ -> this.minecraft.setScreen(new RealmsMainScreen(this)))
|
||||||
@@ -33,25 +33,17 @@
|
|||||||
.tooltip(tooltip)
|
.tooltip(tooltip)
|
||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
@@ -293,6 +_,7 @@
|
@@ -304,10 +_,18 @@
|
||||||
if ((i & -67108864) != 0) {
|
|
||||||
super.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
|
||||||
this.logoRenderer.renderLogo(p_282860_, this.width, f);
|
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, p_282860_, this.font, this.width, this.height, i);
|
|
||||||
if (this.splash != null && !this.minecraft.options.hideSplashTexts().get()) {
|
|
||||||
this.splash.render(p_282860_, this.width, this.font, i);
|
|
||||||
}
|
|
||||||
@@ -308,10 +_,18 @@
|
|
||||||
s = s + I18n.get("menu.modded");
|
s = s + I18n.get("menu.modded");
|
||||||
}
|
}
|
||||||
|
|
||||||
- p_282860_.drawString(this.font, s, 2, this.height - 10, 16777215 | i);
|
- p_282860_.drawString(this.font, s, 2, this.height - 10, 16777215 | i);
|
||||||
+ net.minecraftforge.internal.BrandingControl.forEachLine(true, true, (brd, brdline) ->
|
+ net.minecraftforge.internal.BrandingControl.forEachLine(true, true, (brd, brdline) ->
|
||||||
+ p_282860_.drawString(this.font, brd, 2, this.height - ( 10 + brdline * (this.font.lineHeight + 1)), 16777215 | i)
|
+ p_282860_.drawString(this.font, brd, 2, this.height - ( 10 + brdline * (this.font.lineHeight + 1)), 16777215 | i)
|
||||||
+ );
|
+ );
|
||||||
+
|
+
|
||||||
+ net.minecraftforge.internal.BrandingControl.forEachAboveCopyrightLine((brd, brdline) ->
|
+ net.minecraftforge.internal.BrandingControl.forEachAboveCopyrightLine((brd, brdline) ->
|
||||||
+ p_282860_.drawString(this.font, brd, this.width - font.width(brd), this.height - (10 + (brdline + 1) * ( this.font.lineHeight + 1)), 16777215 | i)
|
+ p_282860_.drawString(this.font, brd, this.width - font.width(brd), this.height - (10 + (brdline + 1) * ( this.font.lineHeight + 1)), 16777215 | i)
|
||||||
+ );
|
+ );
|
||||||
+
|
+
|
||||||
if (this.realmsNotificationsEnabled() && f >= 1.0F) {
|
if (this.realmsNotificationsEnabled() && f >= 1.0F) {
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
@@ -38,6 +_,7 @@
|
@@ -39,6 +_,7 @@
|
||||||
private int maxY = Integer.MIN_VALUE;
|
private int maxY = Integer.MIN_VALUE;
|
||||||
private float fade;
|
private float fade;
|
||||||
private boolean centered;
|
private boolean centered;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public AdvancementTab(
|
public AdvancementTab(
|
||||||
Minecraft p_97145_, AdvancementsScreen p_97146_, AdvancementTabType p_97147_, int p_97148_, AdvancementNode p_297568_, DisplayInfo p_97150_
|
Minecraft p_97145_, AdvancementsScreen p_97146_, AdvancementTabType p_97147_, int p_97148_, AdvancementNode p_297568_, DisplayInfo p_97150_
|
||||||
@@ -54,6 +_,15 @@
|
@@ -55,6 +_,15 @@
|
||||||
this.addWidget(this.root, p_297568_.holder());
|
this.addWidget(this.root, p_297568_.holder());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
public AdvancementTabType getType() {
|
public AdvancementTabType getType() {
|
||||||
return this.type;
|
return this.type;
|
||||||
}
|
}
|
||||||
@@ -147,8 +_,8 @@
|
@@ -148,8 +_,8 @@
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
for (AdvancementTabType advancementtabtype : AdvancementTabType.values()) {
|
for (AdvancementTabType advancementtabtype : AdvancementTabType.values()) {
|
||||||
|
|||||||
+1
-1
@@ -55,6 +55,6 @@
|
|||||||
if (this.tabs.size() > 1) {
|
if (this.tabs.size() > 1) {
|
||||||
for (AdvancementTab advancementtab : this.tabs.values()) {
|
for (AdvancementTab advancementtab : this.tabs.values()) {
|
||||||
+ if (advancementtab.getPage() == tabPage)
|
+ if (advancementtab.getPage() == tabPage)
|
||||||
if (advancementtab.isMouseOver(p_281519_, p_283371_, (double)p_283556_, (double)p_282458_)) {
|
if (advancementtab.isMouseOver(p_281519_, p_283371_, p_283556_, p_282458_)) {
|
||||||
p_282784_.renderTooltip(this.font, advancementtab.getTitle(), p_283556_, p_282458_);
|
p_282784_.renderTooltip(this.font, advancementtab.getTitle(), p_283556_, p_282458_);
|
||||||
}
|
}
|
||||||
Loaded 100 of 1039 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user