Compare commits

..
31 Commits
Author SHA1 Message Date
LexManos 211d3aa692 26.1.2 RB 1 2026-07-27 13:34:36 -07:00
LexManos 88bb2217e5 Fix ModList screen selection getting out of sync. Closes #10855 2026-07-27 13:26:59 -07:00
LexManos 278bdfc132 Bump Dependencies, Notably ASM for Java 27 support 2026-07-27 13:24:33 -07:00
Matt 66d4d888eb Add DeltaTracker (partialTick) context to PassDefinitions (#10848) 2026-07-21 11:34:01 -07:00
Meme Man ee1e695124 Update equality check for RegistryObject to include RegistryObject#key. (#10859) 2026-07-21 10:44:44 -07:00
zznty 6435274d1e Handle glfw window pos errors gracefully for wayland (#10852) 2026-07-18 14:36:59 -07:00
6c3729d6e9 ForgeDev 7 (#10821)
Co-authored-by: LexManos <[email protected]>
Co-authored-by: Jonathing <[email protected]>
2026-06-28 13:21:48 -07:00
Matt 6a702686db Toml parsing errors are now visible in the latest log. (#10825) 2026-06-18 11:09:43 -07:00
Matt d3476f3f80 [26.1.2] Split hotbar rendering into components, allow replacing renders (#10824) 2026-06-09 11:21:51 -07:00
LexManos 6665cdcf4e Fix misaligned ClientLevel load patch 2026-05-04 09:26:36 -07:00
LexManos d9665f6447 Fix IForgeBlockStateModel#getModelData is never called Fixes #10817 2026-05-02 16:48:24 -07:00
LexManos ec73fd5240 Fix base bucket model not being flipped for gasses. Closes #10814 2026-04-27 10:45:07 -07:00
LexManos 3bbdbacb81 Fix being considered in water when not. Closes #10813 2026-04-23 14:36:51 -07:00
Paint_Ninja 478d8b3f18 Add c:bars/copper and c:bars/iron tags (#10810) 2026-04-15 22:20:21 +01:00
Paint_Ninja 03f928a3de Add c:foods/dough tag (#10811) 2026-04-15 22:19:57 +01:00
Paint_Ninja 4834f16aef Add c:drink_containing/bottle and c:drink_containing/bucket (#10812) 2026-04-15 22:19:44 +01:00
LexManos 7846d25606 Copy fluid and lava still textures to Item atlas for DynamicFluidContainerModel. Fixes #10809 2026-04-12 12:53:34 -07:00
LexManos 77cb0c5c4e 26.1.2 2026-04-09 10:16:29 -07:00
Paint_Ninja 5e421e8b8b Add c:tools/trident item tag, update contents of c:tools/melee_weapon, remove c:tools/spear (#10808)
- Breaking change: `c:tools/spear` has been renamed to `c:tools/trident` to match other loaders
- The contents of the `c:tools/melee_weapon` tag now includes spears
2026-04-08 20:26:14 +01:00
LexManos 5f37e8af53 Work around 3rd party launchers who build incorrect classpaths Closes #10797 2026-04-03 09:31:40 -07:00
LexManos 5ab792f1d7 26.1.1 2026-04-01 10:40:56 -07:00
LexManos 38ebbf189c Fix arrows not being used correctly. 2026-03-29 15:44:31 -07:00
LexManos f247eebd55 Fix dyed Items are not rendered with color. Closes #10799 2026-03-29 02:21:41 -07:00
LexManos 555989cf10 Fix not remembering experimental warning confirmation 2026-03-29 02:20:50 -07:00
LexManos 49fe93b1b5 Fix incorrect argument passed to LootTableLoadEvent 2026-03-29 02:19:17 -07:00
LexManos 48167e93b4 Update MCPConfig to fix local variable names 2026-03-28 23:28:36 -07:00
LexManos 2bd132a6f8 Fix not regaining air bubbles. Closes #10798 2026-03-27 16:05:55 -07:00
LexManos b8168a12df Fix misaligned PlayerTick hook. Closes #10796 2026-03-25 18:35:02 -07:00
LexManos df271e0265 Fix loop in LoadingErrorScreen Closes #10795 2026-03-25 10:30:27 -07:00
LexManos d7687a72d5 Fix MDK by bumping to FG 7.0.17 2026-03-24 21:14:22 -07:00
LexManosandPaint_Ninja 047e5fe252 26.1 Update
Minecraft is now Unobfuscated and requires Java 25
Lots of changes/code cleanup.
See https://github.com/MinecraftForge/MinecraftForge-Experimental/tree/26.1-dev for non-squashed commits.

Co-authored-by: Paint_Ninja <[email protected]>
2026-03-24 14:07:41 -07:00
1600 changed files with 14056 additions and 18725 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ name: Publish
on: on:
push: push:
branches: [ '1.21.11' ] branches: [ '26.1.2' ]
permissions: permissions:
contents: read contents: read
+1
View File
@@ -51,6 +51,7 @@ src/*/generated/**/.cache/
/*/.gitignore /*/.gitignore
/*/.factorypath /*/.factorypath
/*/.apt_generated/ /*/.apt_generated/
/fmlcore/logs/
/lib/ /lib/
/_actual/ /_actual/
/runs/ /runs/
+129 -209
View File
@@ -10,7 +10,6 @@ plugins {
alias libs.plugins.gradleutils alias libs.plugins.gradleutils
alias libs.plugins.gitversion alias libs.plugins.gitversion
alias libs.plugins.changelog alias libs.plugins.changelog
alias libs.plugins.renamer
alias libs.plugins.jarsigner alias libs.plugins.jarsigner
id 'net.minecraftforge.forgedev' id 'net.minecraftforge.forgedev'
id 'net.minecraftforge.forge.build.convention' id 'net.minecraftforge.forge.build.convention'
@@ -40,20 +39,11 @@ fdtools {
javaLauncher = javaToolchains.launcherFor(java.toolchain) javaLauncher = javaToolchains.launcherFor(java.toolchain)
} }
} }
renamerTools {
configure('classes') {
artifact = buildLibs.renamer.get().toString() + ':all'
}
configure('srg2source') {
version = buildLibs.srg2source.get().version
javaLauncher = javaToolchains.launcherFor(java.toolchain)
}
}
/* This is used for debugging, comparing all published artifacts against actual production /* This is used for debugging, comparing all published artifacts against actual production
forgedev.validatePublish { forgedev.validatePublish {
task { task {
baseBranch = 'upstream/1.21.11' baseBranch = 'upstream/26.1.2'
versionPrefix = minecraftVersion versionPrefix = minecraftVersion
} }
} }
@@ -63,8 +53,6 @@ final minecraftFiles = forgedev.minecraftFiles(minecraftVersion)
final mcpBase = forgedev.mcpBase { final mcpBase = forgedev.mcpBase {
mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}" mcpVersion = "${minecraftVersion}-${project.ext.mcpVersion}"
mappingChannel = mappingsChannel
mappingVersion = mappingsVersion
accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg') accessTransformers.from file('src/main/resources/META-INF/accesstransformer.cfg')
sideAnnotationStrippers.from file('src/main/resources/forge.sas') sideAnnotationStrippers.from file('src/main/resources/forge.sas')
} }
@@ -127,15 +115,10 @@ configurations {
extendsFrom(bootstrap) extendsFrom(bootstrap)
} }
register('installerextra') {
transitive = false
extendsFrom(bootstrap)
}
named('api') { named('api') {
extendsFrom(installer) extendsFrom(installer)
} }
named('implementation') { named('implementation') {
// Inherit vanilla Minecraft's dependencies // Inherit vanilla Minecraft's dependencies
extendsFrom(mcpBase.dependencyConfiguration) extendsFrom(mcpBase.dependencyConfiguration)
@@ -179,14 +162,7 @@ dependencies {
installer projects.lowcodelanguage installer projects.lowcodelanguage
installer projects.mclanguage installer projects.mclanguage
installer projects.forgeTransformers installer projects.forgeTransformers
// Remove when we bump to a version with no srg names, as this is needed to map srg->official at runtimes
installerextra("de.oceanlabs.mcp:mcp_config:${mcpBase.mcpVersion.get().toString()}:srg2off")
// Get the zip file with csv's of srg->mapepd for Runtime SRG->Mapped reflection remapping
// This is also only needed during dev time, and automatically added to the dep list by Mavenizer for userdev
// We shouldn't need this anymore now that we use runtime official mappings, but some of our code still references SRG names via reflection at dev time
runtimeOnly files(mcpBase.mappingZip)
runtimeOnly files(mcpBase.extra) runtimeOnly files(mcpBase.extra)
runtimeOnly libs.bootstrap runtimeOnly libs.bootstrap
@@ -196,8 +172,8 @@ dependencies {
} }
final EXTRA_TXTS = [ final EXTRA_TXTS = [
file('LICENSE.txt'), file('LICENSE.txt'),
changelog.task.flatMap(task -> task.outputFile) changelog.task.flatMap(task -> task.outputFile)
] ]
forgedev.runs { forgedev.runs {
configureEach { configureEach {
@@ -206,7 +182,7 @@ forgedev.runs {
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap' mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
args '--gameDir', '.' args '--gameDir', '.'
jvmArgs '-Djava.net.preferIPv6Addresses=system' jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
systemProperty 'bsl.debug', 'true' systemProperty 'bsl.debug', 'true'
systemProperty 'terminal.jline', 'true' systemProperty 'terminal.jline', 'true'
@@ -223,13 +199,13 @@ forgedev.runs {
systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll' systemProperty 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll'
args '--launchTarget', 'forge_dev_client', args '--launchTarget', 'forge_dev_client',
'--username', 'Dev', '--username', 'Dev',
'--version', project.name, '--version', project.name,
'--accessToken', '0', '--accessToken', '0',
'--userType', 'mojang', '--userType', 'mojang',
'--versionType', 'release', '--versionType', 'release',
'--assetsDir', '{assets_root}', '--assetsDir', '{assets_root}',
'--assetIndex', '{asset_index}' '--assetIndex', '{asset_index}'
} }
} }
@@ -249,20 +225,20 @@ forgedev.runs {
create('data') { create('data') {
options { options {
args '--launchTarget', 'forge_dev_data', args '--launchTarget', 'forge_dev_data',
'--all', '--all',
'--existing', sourceSets.main.resources.srcDirs[0], '--existing', sourceSets.main.resources.srcDirs[0],
'--assetsDir', '{assets_root}', '--assetsDir', '{assets_root}',
'--assetIndex', '{asset_index}' '--assetIndex', '{asset_index}'
with(sourceSets.main) { with(sourceSets.main) {
args '--mod', 'forge', args '--mod', 'forge',
'--output', rootProject.file('src/main/generated/') '--output', rootProject.file('src/main/generated/')
} }
with(sourceSets.test) { with(sourceSets.test) {
args '--mod', '.+', args '--mod', '.+',
'--existing', sourceSets.test.resources.srcDirs[0], '--existing', sourceSets.test.resources.srcDirs[0],
'--output', rootProject.file('src/test/generated/') '--output', rootProject.file('src/test/generated/')
} }
} }
} }
@@ -270,24 +246,24 @@ forgedev.runs {
create('clientData') { create('clientData') {
options { options {
args '--all', args '--all',
'--existing', sourceSets.main.resources.srcDirs[0], '--existing', sourceSets.main.resources.srcDirs[0],
'--assetsDir', '{assets_root}', '--assetsDir', '{assets_root}',
'--assetIndex', '{asset_index}' '--assetIndex', '{asset_index}'
with(sourceSets.main) { with(sourceSets.main) {
args '--launchTarget', 'forge_dev_client_data', args '--launchTarget', 'forge_dev_client_data',
'--mod', 'forge', '--mod', 'forge',
'--output', rootProject.file('src/main/generated/'), '--output', rootProject.file('src/main/generated/'),
'--mod', 'forge' '--mod', 'forge'
} }
with(sourceSets.test) { with(sourceSets.test) {
args '--launchTarget', 'forge_dev', args '--launchTarget', 'forge_dev',
'--launchEntry', 'minecraft/net.minecraft.client.data.Main', '--launchEntry', 'minecraft/net.minecraft.client.data.Main',
'--launchData', '--launchData',
'--mod', '.+', '--mod', '.+',
'--existing', sourceSets.test.resources.srcDirs[0], '--existing', sourceSets.test.resources.srcDirs[0],
'--output', rootProject.file('src/test/generated/') '--output', rootProject.file('src/test/generated/')
} }
} }
} }
@@ -303,7 +279,6 @@ final serverShim = forgedev.shim {
} }
classpath { classpath {
libraries configurations.installer libraries configurations.installer
libraries configurations.installerextra
library tasks.named('universalJar', Jar) library tasks.named('universalJar', Jar)
library forgedev.binaryPatches('server').apply, 'server' library forgedev.binaryPatches('server').apply, 'server'
serverBundle.fileProvider(minecraftFiles.server) serverBundle.fileProvider(minecraftFiles.server)
@@ -315,7 +290,7 @@ final serverShim = forgedev.shim {
} }
final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') { final finalizeSpawn = forgedev.methodCallFinder('findFinalizeSpawnTargets') {
jar = tasks.named('renameClientOfficial').flatMap{ it.output } //.fileProvider(mcpBase.classes) jar.fileProvider(mcpBase.classes)
output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json') output = rootProject.file('forge-transformers/src/main/resources/coremods/finalize_spawn_targets.json')
blacklist 'net/minecraft/world/level/BaseSpawner' // Ignore this class as we special case it. blacklist 'net/minecraft/world/level/BaseSpawner' // Ignore this class as we special case it.
invokeVirtual('finalizeSpawn', '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;') invokeVirtual('finalizeSpawn', '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;')
@@ -327,18 +302,16 @@ forgedev.validateDeprecations(tasks.named('jar', Jar)) {
forgedev.checks() { forgedev.checks() {
base = mcpBase base = mcpBase
ats { ats {}
mappings.fileProvider(mcpBase.map2Srg)
}
sas {} sas {}
execs { } execs {}
patches { patches {
dependsOn forgedev.patches.make dependsOn forgedev.patches.make
patchDir = forgedev.patches.patches patchDir = forgedev.patches.patches
patchesWithS2SArtifact = [ patchesWithS2SArtifact = [
'minecraft/net/minecraft/client/renderer/ViewArea.java.patch', 'minecraft/net/minecraft/client/renderer/ViewArea.java.patch',
'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch', 'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch',
] ]
} }
@@ -363,23 +336,23 @@ tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.forge' 'Automatic-Module-Name': 'net.minecraftforge.forge'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : gradleutils.vendor.get(), 'Specification-Vendor' : gradleutils.vendor.get(),
'Specification-Version' : gitversion.info.tag, 'Specification-Version' : gitversion.info.tag,
'Implementation-Title' : project.group, 'Implementation-Title' : project.group,
'Implementation-Vendor' : gradleutils.vendor.get(), 'Implementation-Vendor' : gradleutils.vendor.get(),
'Implementation-Version': forgeVersion 'Implementation-Version': forgeVersion
], 'net/minecraftforge/versions/forge/') ], 'net/minecraftforge/versions/forge/')
attributes([ attributes([
'Specification-Title' : 'Minecraft', 'Specification-Title' : 'Minecraft',
'Specification-Vendor' : gradleutils.vendor.get(), 'Specification-Vendor' : gradleutils.vendor.get(),
'Specification-Version' : minecraftVersion, 'Specification-Version' : minecraftVersion,
'Implementation-Title' : 'MCP', 'Implementation-Title' : 'MCP',
'Implementation-Vendor' : gradleutils.vendor.get(), 'Implementation-Vendor' : gradleutils.vendor.get(),
'Implementation-Version': mcpVersion 'Implementation-Version': mcpVersion
], 'net/minecraftforge/versions/mcp/') ], 'net/minecraftforge/versions/mcp/')
} }
jarSigner.sign(it) jarSigner.sign(it)
@@ -394,39 +367,17 @@ final universalJar = tasks.register('universalJar', Jar) {
jarSigner.sign(it) jarSigner.sign(it)
} }
final map2Tsrg = renamer.convert('map2Tsrg', mcpBase.map2Srg) // Remove when we bump renamer to version that supports gziped files (on MC version change) final sourcesJarAll = tasks.register('sourcesJarAll', Jar) {
final reobfJar = renamer.classes('srgJar', tasks.named('jar', Jar)) { archiveClassifier = 'sources-all'
libraries.setFrom(configurations.compileClasspath) from(sourceSets.main.allJava.srcDirs)
mappings map2Tsrg
archiveClassifier = 'srg'
}
final universalJarSrg = tasks.register('universalJarSrg', Jar) {
from (zipTree(reobfJar.flatMap { it.output } )) {
exclude(forgedev.filterVanilla(mcpBase.classes))
}
manifest = universalJar.get().manifest
archiveClassifier = 'universal-srg'
jarSigner.sign(it)
}
final sourcesSrg = renamer.sources(sourceSets.main) {
apply {
archiveClassifier = 'sources-srg'
mappings mcpBase.map2Srg
excFiles.from files('src/main/resources/forge.exc')
}
extract {
mustRunAfter(forgedev.patches.apply)
}
} }
// Our sources, plus the patches we do to Vanilla Minecraft
final sourcesJar = tasks.register('sourcesJar', Jar) { final sourcesJar = tasks.register('sourcesJar', Jar) {
archiveClassifier = 'sources' archiveClassifier = 'sources'
// If we don't need to reobf we can just do this from(sourceSets.main.allJava.srcDirs - forgedev.patches.patched.asFile.get())
//from(sourceSets.main.allJava.srcDirs - forgedev.patches.patched.asFile.get()) mustRunAfter(forgedev.patches.make)
dependsOn(sourcesSrg.apply) from(forgedev.patches.patches) {
from(zipTree(sourcesSrg.apply.flatMap{ it.output })) {
exclude { forgedev.patches.patched.file(it.path).get().asFile.exists() }
}
from(forgedev.userDev.patches.flatMap{ it.output }) {
into 'patches/' into 'patches/'
} }
} }
@@ -435,7 +386,7 @@ forgedev.userDev {
base(mcpBase) base(mcpBase)
config { config {
universal universalJarSrg universal universalJar
sources sourcesJar sources sourcesJar
addLibraries(configurations.installer) addLibraries(configurations.installer)
// TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config // TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config
@@ -449,7 +400,7 @@ forgedev.userDev {
parents = [] parents = []
main = 'net.minecraftforge.bootstrap.ForgeBootstrap' main = 'net.minecraftforge.bootstrap.ForgeBootstrap'
args '--gameDir', '.' args '--gameDir', '.'
jvmArgs '-Djava.net.preferIPv6Addresses=system' jvmArgs '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders'
client = it.name.containsIgnoreCase('client') client = it.name.containsIgnoreCase('client')
environment 'MCP_MAPPINGS', '{mcp_mappings}' environment 'MCP_MAPPINGS', '{mcp_mappings}'
} }
@@ -485,40 +436,33 @@ forgedev.userDev {
} }
} }
patches { patches {
modified.setFrom(sourcesSrg.apply.flatMap{ it.output }) modified.setFrom(sourcesJarAll.flatMap { it.archiveFile })
} }
binaryPatches { binaryPatches {
patches.setFrom(forgedev.patches.apply.flatMap { it.output }) mustRunAfter(forgedev.patches.make)
dirty.setFrom(reobfJar.flatMap { it.output }) patches.setFrom(forgedev.patches.patches)
dirty.setFrom(tasks.named('jar', Jar).flatMap { it.archiveFile })
} }
} }
forgedev.userdevCompatibility(minecraftVersion) { forgedev.userdevCompatibility(minecraftVersion) {
clean = mcpBase.classesRaw clean = mcpBase.classes
dirty = reobfJar dirty = tasks.named('jar', Jar)
} }
// region Installer tasks, Not needed when we simplify the installer/remove obf // region Installer tasks, Not needed when we simplify the installer/remove obf
final renameOfficial = (side, inputProvider, mappingsProvider) -> { final clientBinPatches = forgedev.binaryPatches('client') {
renamer.classes('rename' + side + 'Official') { clean = minecraftFiles.client
additionalArgs = ['--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'] // Workaround for 3rd party launcher issues, marker needed to locate MC, store needed to fix zlib-ng issues
input.fileProvider(inputProvider) apply {
libraries = mcpBase.dependencyConfiguration store = true
mappings mappingsProvider marker = '.forge_patched_minecraft'
output = layout.buildDirectory.file("libs/rename-${side.toLowerCase()}-official.jar")
logFile = layout.buildDirectory.file("libs/rename-${side.toLowerCase()}-official.log")
} }
} }
final clientOfficial = renameOfficial('Client', minecraftFiles.client, minecraftFiles.clientMappings)
final serverOfficial = renameOfficial('Server', minecraftFiles.serverExtracted, minecraftFiles.serverMappings)
final clientBinPatches = forgedev.binaryPatches('client') {
clean = clientOfficial.flatMap { it.output }
}
final serverBinPatches = forgedev.binaryPatches('server') { final serverBinPatches = forgedev.binaryPatches('server') {
clean = serverOfficial.flatMap { it.output } clean = minecraftFiles.serverExtracted
apply { store = true }
} }
final sanitizedClientMappings = renamer.convert("cleanClientMappings", minecraftFiles.clientMappings)
final sanitizedServerMappings = renamer.convert("cleanServerMappings", minecraftFiles.serverMappings)
// endregion // endregion
forgedev.installer { forgedev.installer {
@@ -529,8 +473,6 @@ forgedev.installer {
// Add extra libraries // Add extra libraries
pack serverShim.jar // The Server executable jar IS needed to be packed, as the installer would need a spec bump in order to download it pack serverShim.jar // The Server executable jar IS needed to be packed, as the installer would need a spec bump in order to download it
pack universalJar // I don't think this is strictly needed to be packed anymore, will need to double check later pack universalJar // I don't think this is strictly needed to be packed anymore, will need to double check later
// This isn't actually needed, but its here for some reason, probably wasn't deleted when then installer process was cleaned up
library mcpBase.mcpArtifact.get()
launcherLibrary universalJar launcherLibrary universalJar
// We configure the launcher here to keep the order for easier diff, after publishing, move this to the LauncherJson configuration below // We configure the launcher here to keep the order for easier diff, after publishing, move this to the LauncherJson configuration below
@@ -539,13 +481,11 @@ forgedev.installer {
generated(clientBinPatches.apply, 'client') generated(clientBinPatches.apply, 'client')
} }
launcherLibraries configurations.installerextra
launcherLibraries configurations.installer launcherLibraries configurations.installer
final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}" final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
final installertools = tool(buildLibs.installertools) final installertools = tool(buildLibs.installertools)
final binarypatcher = tool(buildLibs.binarypatcher) final binarypatcher = tool(buildLibs.binarypatcher)
final renamer = tool(buildLibs.renamer)
jar { jar {
from(EXTRA_TXTS) from(EXTRA_TXTS)
@@ -561,8 +501,8 @@ forgedev.installer {
final argsFile = rootProject.file('server_files/args.txt') final argsFile = rootProject.file('server_files/args.txt')
final tokens = [tokens: [ final tokens = [tokens: [
SHIM_JAR_FILE: serverShim.jar.get().archiveFileName.get(), SHIM_JAR_FILE: serverShim.jar.get().archiveFileName.get(),
MAVEN_PATH: forgedev.mavenArtifact.directory MAVEN_PATH: forgedev.mavenArtifact.directory
]] ]]
from(argsFile) { from(argsFile) {
filter(tokens, ReplaceTokens) filter(tokens, ReplaceTokens)
@@ -591,74 +531,57 @@ forgedev.installer {
final projectArtifact = "${project.group}:${project.name}:${project.version}" final projectArtifact = "${project.group}:${project.name}:${project.version}"
data 'MOJMAPS', "[net.minecraft:client:${minecraftVersion}:mappings@tsrg]", "[net.minecraft:server:${minecraftVersion}:mappings@tsrg]"
data 'MOJMAPS_SHA', sanitizedClientMappings.flatMap{ it.output }, sanitizedServerMappings.flatMap{ it.output }
data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]" data 'MC_UNPACKED', "[net.minecraft:client:${minecraftVersion}]", "[net.minecraft:server:${minecraftVersion}:unpacked]"
data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted data 'MC_UNPACKED_SHA', minecraftFiles.client, minecraftFiles.serverExtracted
data 'MC_OFF', "[net.minecraft:client:${minecraftVersion}:official]", "[net.minecraft:server:${minecraftVersion}:official]"
data 'MC_OFF_SHA', clientOfficial.flatMap { it.output }, serverOfficial.flatMap { it.output }
data 'BINPATCH', '/data/client.lzma', '/data/server.lzma' data 'BINPATCH', '/data/client.lzma', '/data/server.lzma'
data 'PATCHED', "[$projectArtifact:client]", "[$projectArtifact:server]" data 'PATCHED', "[$projectArtifact:client]", "[$projectArtifact:server]"
data 'PATCHED_SHA', clientBinPatches.apply.flatMap { it.output }, serverBinPatches.apply.flatMap { it.output } data 'PATCHED_SHA', clientBinPatches.apply.flatMap { it.output }, serverBinPatches.apply.flatMap { it.output }
def rename = (side, input) -> {
step(renamer) {
sides = [side]
args = [
'--input', input,
'--output', '{MC_OFF}',
'--names', '{MOJMAPS}',
'--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs', '--reverse'
]
cache '{MC_OFF}', '{MC_OFF_SHA}'
}
}
steps = [ steps = [
extract(installertools) { extract(installertools) {
side = 'server' side = 'server'
archive '{INSTALLER}' archive '{INSTALLER}'
extract 'data/README.txt', '{ROOT}/README.txt' extract 'data/README.txt', '{ROOT}/README.txt'
extract 'data/run.sh', '{ROOT}/run.sh' extract 'data/run.sh', '{ROOT}/run.sh'
executable '{ROOT}/run.sh' executable '{ROOT}/run.sh'
extract 'data/run.bat', '{ROOT}/run.bat' extract 'data/run.bat', '{ROOT}/run.bat'
optional 'data/user_jvm_args.txt', '{ROOT}/user_jvm_args.txt' optional 'data/user_jvm_args.txt', '{ROOT}/user_jvm_args.txt'
extract 'data/unix_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/unix_args.txt" extract 'data/unix_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/unix_args.txt"
extract 'data/win_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/win_args.txt" extract 'data/win_args.txt', "{ROOT}/libraries/${forgedev.mavenArtifact.directory}/win_args.txt"
}, },
extractBundle(installertools) { extractBundle(installertools) {
side = 'server' side = 'server'
libraries() libraries()
}, },
extractBundle(installertools) { extractBundle(installertools) {
side = 'server' side = 'server'
jar '{MINECRAFT_JAR}', '{MC_UNPACKED}' jar '{MINECRAFT_JAR}', '{MC_UNPACKED}'
cache '{MC_UNPACKED}', '{MC_UNPACKED_SHA}' cache '{MC_UNPACKED}', '{MC_UNPACKED_SHA}'
}, },
step(installertools) { step(binarypatcher) {
args = [ side = 'server'
'--task', 'DOWNLOAD_MOJMAPS', args = [
'--sanitize', '--clean', '{MC_UNPACKED}',
'--version', minecraftVersion, '--output', '{PATCHED}',
'--side', '{SIDE}', '--apply', '{BINPATCH}',
'--output', '{MOJMAPS}' '--data', '--unpatched',
] '--store'
cache '{MOJMAPS}', '{MOJMAPS_SHA}' ]
}, cache '{PATCHED}', '{PATCHED_SHA}'
rename.call('server', '{MC_UNPACKED}'), },
rename.call('client', '{MINECRAFT_JAR}'), step(binarypatcher) {
step(binarypatcher) { side = 'client'
args = [ args = [
'--clean', '{MC_OFF}', '--clean', '{MINECRAFT_JAR}',
'--output', '{PATCHED}', '--output', '{PATCHED}',
'--apply', '{BINPATCH}', '--apply', '{BINPATCH}',
'--data', '--unpatched' '--data', '--unpatched',
] '--store',
cache '{PATCHED}', '{PATCHED_SHA}' '--marker', '.forge_patched_minecraft'
} ]
cache '{PATCHED}', '{PATCHED_SHA}'
}
] ]
} }
@@ -672,7 +595,7 @@ forgedev.installer {
inheritsFrom = minecraftVersion inheritsFrom = minecraftVersion
mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap' mainClass = 'net.minecraftforge.bootstrap.ForgeBootstrap'
gameArgs = [ '--launchTarget', 'forge_client' ] gameArgs = [ '--launchTarget', 'forge_client' ]
jvmArgs = [ '-Djava.net.preferIPv6Addresses=system' ] jvmArgs = [ '-Djava.net.preferIPv6Addresses=system', '-XX:+UseCompactObjectHeaders' ]
} }
} }
@@ -703,15 +626,13 @@ final mdkZip = tasks.register('mdkZip', Zip) {
exclude it exclude it
} }
filter(ReplaceTokens, tokens: [ filter(ReplaceTokens, tokens: [
FORGE_VERSION: forgeVersion, FORGE_VERSION: forgeVersion,
FORGE_GROUP: project.group, FORGE_GROUP: project.group,
FORGE_NAME: project.name, FORGE_NAME: project.name,
MC_VERSION: minecraftVersion, MC_VERSION: minecraftVersion,
MAPPING_CHANNEL: mappingsChannel, FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0],
MAPPING_VERSION: mappingsVersion, MC_NEXT_VERSION: minecraftNextVersion,
FORGE_SPEC_VERSION: gitversion.info.tag.split("\\.")[0], EVENTBUS_VERSION: libs.versions.eventbus.get()
MC_NEXT_VERSION: minecraftNextVersion,
EVENTBUS_VERSION: libs.versions.eventbus.get()
]) ])
rename 'gitignore\\.txt', '.gitignore' rename 'gitignore\\.txt', '.gitignore'
rename 'gitattributes\\.txt', '.gitattributes' rename 'gitattributes\\.txt', '.gitattributes'
@@ -813,7 +734,6 @@ publishing {
gradleutils.promote(it) gradleutils.promote(it)
artifact universalJar artifact universalJar
artifact universalJarSrg
artifact forgedev.installer.jar artifact forgedev.installer.jar
artifact mdkZip artifact mdkZip
artifact forgedev.userDev.jar artifact forgedev.userDev.jar
@@ -859,18 +779,18 @@ tasks.withType(AbstractTestTask).configureEach {
} }
// This shouldn't be needed according to the Gradle devs, as we never run these commands together. // This shouldn't be needed according to the Gradle devs, as we never run these commands together.
// But in another case of Gradle being gradle, here we are // But in another case of Gradle being gradle, here we are
[ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar' ] [ 'makePatches', 'compileJava', 'checkLicenseMain', 'updateLicenseMain', 'sourcesJar', 'sourcesJarAll' ]
.each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }} .each{ tasks.named(it).configure{ mustRunAfter forgedev.patches.apply }}
forgedev.runs.configureEach { forgedev.runs.configureEach {
run.configure { dependsOn finalizeSpawn} run.configure { dependsOn finalizeSpawn}
runTest.configure { dependsOn finalizeSpawn} runTest.configure { dependsOn finalizeSpawn}
} }
// run gradlew dependencyUpdates --no-parallel // run gradlew dependencyUpdates --no-parallel
//noinspection UnnecessaryQualifiedReference //noinspection UnnecessaryQualifiedReference
tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) { tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) {
resolutionStrategy { resolutionStrategy {
mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions
force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest
force('de.oceanlabs.mcp:mcp_config:' + bootLibs.versions.mcp) // Don't warn abou MCPConfig updates
} }
} }
+10 -8
View File
@@ -2,8 +2,8 @@
MinecraftForge MinecraftForge
============= =============
[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.21.11-&query=$.promos["1.21.11-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download] [![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=26.1.2-&query=$.promos["26.1.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.21.11-&query=$.promos["1.21.11-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo= [![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=26.1.2-&query=$.promos["26.1.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
)][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][Patreon] )][Download] [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)][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!
@@ -34,12 +34,13 @@ For support and questions, visit [the Support Forum][Support-Forum] or [the Forg
We require the version of Java that Minecraft requires, which is currently: We require the version of Java that Minecraft requires, which is currently:
| Minecraft | Java | | Minecraft | Java |
|---------------|-------------------| |------------------|-------------------|
| 1.20.6+ | [21][Adoptium-21] | | 26.1+ | [25][Adoptium-25] |
| 1.18 - 1.20.4 | [17][Adoptium-17] | | 1.20.6 - 1.21.11 | [21][Adoptium-21] |
| 1.17.1 | [16][Adoptium-16] | | 1.18 - 1.20.4 | [17][Adoptium-17] |
| 1.16.5- | [8][Adoptium-8] | | 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].** **If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
@@ -80,6 +81,7 @@ YourKit for providing us accesss to their [YourKit Java Profiler] which helps id
[Download]: https://files.minecraftforge.net/ [Download]: https://files.minecraftforge.net/
[Adoptium-25]: https://adoptium.net/temurin/releases/?version=25
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21 [Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17 [Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16 [Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
+24
View File
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
for file in $(find repo | grep --invert-match -e md5 -e sha | grep -e .jar -e .zip); do
file_path=$(realpath $file)
file_name=$(basename $file)
echo "$file_name"
files=$(unzip -l $file | awk '{print $4}')
for f in $files; do
out="_actual/$file_name/$f"
parent=$(dirname "$out")
echo $out
if [ ! -d "$parent" ]; then
mkdir -p "$parent"
fi
if [[ $f == *.class ]]; then
javap -v -p jar:file://$file_path!/$f | tail -n +4 >$out.txt
elif [[ $f != */ && $f != "Name" && $f != "----" ]]; then
unzip -o -q $file $f -d _actual/$file_name
fi
done
done
+8 -8
View File
@@ -40,16 +40,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.fmlcore', 'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
'FMLModType' : 'LIBRARY' 'FMLModType' : 'LIBRARY'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Version': '1.0', 'Implementation-Version': '1.0',
'Implementation-Vendor' : vendor 'Implementation-Vendor' : vendor
], 'net/minecraftforge/fml/') ], 'net/minecraftforge/fml/')
} }
} }
@@ -1,273 +0,0 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.fml;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.loading.FMLEnvironment;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.Serializable;
import java.lang.invoke.SerializedLambda;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.function.Supplier;
/**
* Use to execute code conditionally based on sidedness.
* <ul>
* <li>When you want to call something on one side and return a result {@link #safeCallWhenOn(Dist, Supplier)}</li>
* <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
* <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
* </ul>
*
* @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
{
private static final Logger LOGGER = LogManager.getLogger();
private DistExecutor() {}
/**
* Run the callable in the supplier only on the specified {@link Dist}.
* This method is NOT sided-safe and special care needs to be taken in code using this method that implicit class
* loading is not triggered by the Callable.
*
* This method can cause unexpected ClassNotFound exceptions.
*
* Use {@link #safeCallWhenOn(Dist, Supplier)} where possible.
*
* @param dist The dist to run on
* @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
* @param <T> The return type from the callable
* @return The callable's result
* @deprecated use {@link #safeCallWhenOn(Dist, Supplier)} instead. This remains for advanced use cases.
*/
@Deprecated
public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
return unsafeCallWhenOn(dist, toRun);
}
public static <T> T unsafeCallWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
if (dist == FMLEnvironment.dist) {
try
{
return toRun.get().call();
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
return null;
}
/**
* Call the SafeCallable when on the correct {@link Dist}.
*
* <strong>The lambda supplied here is required to be a method reference to a method defined in
* another class, otherwise an invalid SafeReferent error will be thrown</strong>
* @param dist the dist which this will run on
* @param toRun the SafeCallable to run and return the result from
* @param <T> The type of the SafeCallable
* @return the result of the SafeCallable or null if on the wrong side
*/
public static <T> T safeCallWhenOn(Dist dist, Supplier<SafeCallable<T>> toRun) {
validateSafeReferent(toRun);
return callWhenOn(dist, toRun::get);
}
/**
* Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #callWhenOn(Dist, Supplier)}.
*
* This method can cause unexpected ClassNotFound exceptions.
*
* @see #callWhenOn(Dist, Supplier)
* @param dist Dist to run this code on
* @param toRun The code to run
* @deprecated use {@link #safeRunWhenOn(Dist, Supplier)} where possible. Advanced uses only.
*/
@Deprecated
public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
unsafeRunWhenOn(dist, toRun);
}
/**
* Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #unsafeCallWhenOn(Dist, Supplier)}.
*
* This method can cause unexpected ClassNotFoundException problems in common scenarios. Understand the pitfalls of
* the way the class verifier works to load classes before using this.
*
* Use {@link #safeRunWhenOn(Dist, Supplier)} if you can.
*
* @see #unsafeCallWhenOn(Dist, Supplier)
* @param dist Dist to run this code on
* @param toRun The code to run
*/
public static void unsafeRunWhenOn(Dist dist, Supplier<Runnable> toRun) {
if (dist == FMLEnvironment.dist) {
toRun.get().run();
}
}
/**
* Call the supplied SafeRunnable when on the correct Dist.
* @param dist The dist to run on
* @param toRun The code to run
*/
public static void safeRunWhenOn(Dist dist, Supplier<SafeRunnable> toRun) {
validateSafeReferent(toRun);
if (dist == FMLEnvironment.dist) {
toRun.get().run();
}
}
/**
* Executes one of the two suppliers, based on which side is active.
*
* <p>
* Example (replacement for old SidedProxy):<br/>
* {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
*
* NOTE: the double supplier is required to avoid classloading the secondary target.
*
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
* @param <T> The common type to return
* @return The returned instance
* @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
*/
@Deprecated
public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
return unsafeRunForDist(clientTarget, serverTarget);
}
/**
* Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
* and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
* not sided. Ensure you test both sides fully to be confident in using this.
*
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
* @param <T> The common type to return
* @return The returned instance
*/
public static <T> T unsafeRunForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
switch (FMLEnvironment.dist)
{
case CLIENT:
return clientTarget.get().get();
case DEDICATED_SERVER:
return serverTarget.get().get();
default:
throw new IllegalArgumentException("UNSIDED?");
}
}
/**
* Executes one of the two suppliers, based on which side is active.
*
* <p>
* Example (replacement for old SidedProxy):<br/>
* {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
*
* NOTE: the double supplier is required to avoid classloading the secondary target.
*
* @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
* @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
* @param <T> The common type to return
* @return The returned instance
*/
public static <T> T safeRunForDist(Supplier<SafeSupplier<T>> clientTarget, Supplier<SafeSupplier<T>> serverTarget) {
validateSafeReferent(clientTarget);
validateSafeReferent(serverTarget);
switch (FMLEnvironment.dist)
{
case CLIENT:
return clientTarget.get().get();
case DEDICATED_SERVER:
return serverTarget.get().get();
default:
throw new IllegalArgumentException("UNSIDED?");
}
}
/**
* A safe referent. This will assert that it is being called via a separated class method reference. This will
* avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
*
* SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
*
* <strong>Implementations need to be defined in a separate class to the referring site, with appropriate
* visibility to be accessible at the callsite (generally, avoid private methods).</strong>
*
* <p>
* Valid:<br/>
*
* {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
*
* <p>
* Invalid:<br/>
*
* {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
*/
public interface SafeReferent {}
/**
* SafeCallable version of {@link SafeReferent}.
* @see SafeReferent
* @param <T> The return type of the Callable
*/
public interface SafeCallable<T> extends SafeReferent, Callable<T>, Serializable {}
/**
* SafeSupplier version of {@link SafeReferent}
* @param <T> The return type of the Supplier
*/
public interface SafeSupplier<T> extends SafeReferent, Supplier<T>, Serializable {}
/**
* SafeRunnable version of {@link SafeReferent}
*/
public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
private static final void validateSafeReferent(Supplier<? extends SafeReferent> safeReferentSupplier) {
if (FMLEnvironment.production) return;
final SafeReferent setter;
try {
setter = safeReferentSupplier.get();
} catch (Exception e) {
// Typically a class cast exception, just return out, expected.
return;
}
for (Class<?> cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
try {
Method m = cl.getDeclaredMethod("writeReplace");
m.setAccessible(true);
Object replacement = m.invoke(setter);
if (!(replacement instanceof SerializedLambda))
break;// custom interface implementation
SerializedLambda l = (SerializedLambda) replacement;
if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
throw new RuntimeException("Unsafe Referent usage found in safe referent method");
}
} catch (NoSuchMethodException e) {
} catch (IllegalAccessException | InvocationTargetException e) {
break;
}
}
}
}
@@ -6,13 +6,14 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import net.minecraftforge.fml.loading.progress.ProgressMeter; import net.minecraftforge.fml.loading.progress.ProgressMeter;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.ToIntFunction; import java.util.function.IntSupplier;
import java.util.function.Supplier;
/** /**
* A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states, * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
@@ -20,6 +21,7 @@ import java.util.function.ToIntFunction;
* *
* @see IModStateProvider * @see IModStateProvider
*/ */
@NullMarked
public interface IModLoadingState { public interface IModLoadingState {
/** /**
* {@return the name of this state} * {@return the name of this state}
@@ -42,19 +44,21 @@ public interface IModLoadingState {
/** /**
* {@return a function returning a human-friendly message for this state} * {@return a function returning a human-friendly message for this state}
*/ */
Function<ModList, String> message(); Supplier<String> message();
/** /**
* @return a function that computes the size of this transition based on the size of the modlist. * @return a function that computes the size of this transition based on the size of the modlist.
* Used to compute progress. * Used to compute progress.
*/ */
ToIntFunction<ModList> size(); default IntSupplier size() {
return ModList::size;
}
/** /**
* {@return an optional runnable, which runs before starting the transition from this state to the next} * {@return an optional runnable, which runs before starting the transition from this state to the next}
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function) * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
*/ */
Optional<Consumer<ModList>> inlineRunnable(); @Nullable Runnable inlineRunnable();
/** /**
* Builds the transition task for this state with a blank pre-sync and post-sync task. * Builds the transition task for this state with a blank pre-sync and post-sync task.
@@ -65,14 +69,14 @@ 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 Optional<CompletableFuture<Void>> buildTransition( default @Nullable 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.completedFuture(null), _ -> CompletableFuture.completedFuture(null),
e -> CompletableFuture.completedFuture(null) _ -> CompletableFuture.completedFuture(null)
); );
} }
@@ -87,7 +91,7 @@ public interface IModLoadingState {
* @param postSyncTask a function which returns a task to run after event post-dispatch hook * @param postSyncTask a function which returns a task to run after event post-dispatch hook
* @return a transition task for this state * @return a transition task for this state
*/ */
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor, @Nullable CompletableFuture<Void> buildTransition(final Executor syncExecutor,
final Executor parallelExecutor, final Executor parallelExecutor,
final ProgressMeter progressBar, final ProgressMeter progressBar,
final Function<Executor, CompletableFuture<Void>> preSyncTask, final Function<Executor, CompletableFuture<Void>> preSyncTask,
@@ -6,21 +6,16 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import net.minecraftforge.fml.event.IModBusEvent; import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Stream;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
import org.jetbrains.annotations.Nullable; 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. */
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
static IModStateTransition buildNoopTransition() { static IModStateTransition buildNoopTransition() {
return ModStateTransitionHelper.NOOP; return ModStateTransitionHelper.NOOP;
} }
@@ -40,15 +35,6 @@ public interface IModStateTransition {
return ModLoadingStage::nextState; return ModLoadingStage::nextState;
} }
/**
* This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
* ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
*/
@Deprecated(since = "1.21.3", forRemoval = true)
default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
return () -> Stream.ofNullable(eventFunction());
}
@Nullable @Nullable
default <T extends IModBusEvent> EventGenerator<T> eventFunction() { default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
return null; return null;
@@ -57,25 +43,9 @@ public interface IModStateTransition {
ThreadSelector threadSelector(); ThreadSelector threadSelector();
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator(); BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
/**
* 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 IModBusEvent> extends Function<ModContainer, T> { interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) { static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
return fn::apply; return fn::apply;
} }
} }
} }
@@ -5,63 +5,20 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import java.util.Iterator; import java.util.Iterator;
import java.util.Spliterator; import java.util.Spliterator;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Stream; import java.util.stream.Stream;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
public class InterModComms public final class InterModComms {
{ public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {}
public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {
/** private static final ConcurrentHashMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
* Deprecated: use {@link #senderModId()}
* @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
* Consider it unreliable.
*/
@Deprecated
public final String getSenderModId() {
return this.senderModId;
}
/**
* Deprecated: use {@link #modId()}
* @return The modid being sent to.
*/
@Deprecated
public final String getModId() {
return this.modId;
}
/**
* Deprecated: use {@link #method()}
* @return The method being sent to.
*/
@Deprecated
public final String getMethod() {
return this.method;
}
/**
* @param <T> The type of the message.
* @return A {@link Supplier} of the message.
* Use {@link #messageSupplier()}
*/
@SuppressWarnings("unchecked")
@Deprecated
public final <T> Supplier<T> getMessageSupplier() {
return (Supplier<T>) this.messageSupplier;
}
}
private static final ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
/** /**
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not. * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -72,8 +29,9 @@ public class InterModComms
* @return true if the message was enqueued for sending (the target modid is loaded) * @return true if the message was enqueued for sending (the target modid is loaded)
*/ */
public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) { public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
if (!ModList.get().isLoaded(modId)) return false; if (!ModList.isLoaded(modId)) return false;
containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing)); containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
.add(new IMCMessage(ModLoadingContext.get().getContainer().getModId(), modId, method, thing));
return true; return true;
} }
@@ -87,8 +45,9 @@ public class InterModComms
* @return true if the message was enqueued for sending (the target modid is loaded) * @return true if the message was enqueued for sending (the target modid is loaded)
*/ */
public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) { public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
if (!ModList.get().isLoaded(modId)) return false; if (!ModList.isLoaded(modId)) return false;
containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing)); containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
.add(new IMCMessage(senderModId, modId, method, thing));
return true; return true;
} }
@@ -112,7 +71,7 @@ public class InterModComms
* @return All messages * @return All messages
*/ */
public static Stream<IMCMessage> getMessages(final String modId) { public static Stream<IMCMessage> getMessages(final String modId) {
return getMessages(modId, s->Boolean.TRUE); return getMessages(modId, _ -> true);
} }
private record QueueFilteringSpliterator( private record QueueFilteringSpliterator(
@@ -136,13 +95,10 @@ public class InterModComms
} }
@Override @Override
public boolean tryAdvance(final Consumer<? super IMCMessage> action) public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
{
IMCMessage next; IMCMessage next;
do do {
{ if (!iterator.hasNext()) {
if (!iterator.hasNext())
{
return false; return false;
} }
next = this.iterator.next(); next = this.iterator.next();
@@ -157,6 +113,5 @@ public class InterModComms
public Spliterator<IMCMessage> trySplit() { public Spliterator<IMCMessage> trySplit() {
return null; return null;
} }
} }
} }
@@ -19,7 +19,6 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@@ -41,11 +40,6 @@ public abstract class ModContainer {
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>(); protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class); protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
final Set<ModContainer> dependencies = new HashSet<>(); 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();
public ModContainer(IModInfo info) { public ModContainer(IModInfo info) {
this.modId = info.getModId(); this.modId = info.getModId();
@@ -138,12 +132,7 @@ public abstract class ModContainer {
configs.put(modConfig.getType(), modConfig); configs.put(modConfig.getType(), modConfig);
} }
public void dispatchConfigEvent(IConfigEvent event) { public void dispatchConfigEvent(IConfigEvent event) {}
var handler = configHandler.orElse(null);
if (handler != null) {
handler.accept(event);
}
}
/** /**
* Does this mod match the supplied mod? * Does this mod match the supplied mod?
@@ -5,14 +5,14 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import net.minecraftforge.fml.loading.LoadingModList;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.forgespi.language.ModFileScanData; import net.minecraftforge.forgespi.language.ModFileScanData;
import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -30,33 +30,36 @@ import java.util.stream.Stream;
* Master list of all mods - game-side version. This is classloaded in the game scope and * Master list of all mods - game-side version. This is classloaded in the game scope and
* can dispatch game level events as a result. * can dispatch game level events as a result.
*/ */
public class ModList { public final class ModList {
private static ModList INSTANCE; private ModList() {}
private final List<IModFileInfo> modFiles;
private final List<IModInfo> sortedList;
private final Map<String, IModFileInfo> fileById;
private List<ModContainer> mods;
private Map<String, ModContainer> indexedMods;
private List<ModFileScanData> modFileScanData;
private List<ModContainer> sortedContainers;
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) { private static final List<IModFileInfo> MOD_FILES;
var modFileInfos = this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList(); private static final List<IModInfo> SORTED_LIST;
this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList(); private static final Map<String, IModFileInfo> FILE_BY_ID;
private static List<ModContainer> mods;
private static Map<String, ModContainer> indexedMods;
private static List<ModContainer> sortedContainers;
static {
var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
var loadingSortedList = LoadingModList.getMods();
var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
var byId = new HashMap<String, IModFileInfo>(); var byId = new HashMap<String, IModFileInfo>();
for (var file : modFileInfos) { for (var file : modFileInfos) {
for (var mod : file.getMods()) for (var mod : file.getMods())
byId.put(mod.getModId(), mod.getOwningFile()); byId.put(mod.getModId(), mod.getOwningFile());
} }
this.fileById = Map.copyOf(byId); FILE_BY_ID = Map.copyOf(byId);
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport); CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
} }
private String getModContainerState(String modId) { private static String getModContainerState(String modId) {
return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE"); return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
} }
private String fileToLine(IModFile mf) { private static String fileToLine(IModFile mf) {
var mainMod = mf.getModInfos().getFirst(); var mainMod = mf.getModInfos().getFirst();
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(), return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
mainMod.getDisplayName(), mainMod.getDisplayName(),
@@ -66,92 +69,92 @@ public class ModList {
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE")); ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
} }
private String crashReport() { private static String crashReport() {
return "\n" + applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", "")); return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
} }
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) { public static void init() {}
INSTANCE = new ModList(modFiles, sortedList);
return INSTANCE; public static List<IModFileInfo> getModFiles() {
return MOD_FILES;
} }
public static ModList get() { public static IModFileInfo getModFileById(String modid) {
return INSTANCE; return FILE_BY_ID.get(modid);
} }
public List<IModFileInfo> getModFiles() { static void setLoadedMods(final List<ModContainer> modContainers) {
return modFiles; mods = modContainers;
sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
} }
public IModFileInfo getModFileById(String modid) { static void clearLoadedMods() {
return this.fileById.get(modid); mods = List.of();
} indexedMods = Map.of();
sortedContainers = List.of();
void setLoadedMods(final List<ModContainer> modContainers) {
this.mods = modContainers;
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> Optional<T> getModObjectById(String modId) { public static <T> Optional<T> getModObjectById(String modId) {
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o); return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
} }
public Optional<? extends ModContainer> getModContainerById(String modId) { public static Optional<? extends ModContainer> getModContainerById(String modId) {
return Optional.ofNullable(this.indexedMods.get(modId)); return Optional.ofNullable(indexedMods.get(modId));
} }
public Optional<? extends ModContainer> getModContainerByObject(Object obj) { public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst(); return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
} }
public List<IModInfo> getMods() { public static List<IModInfo> getMods() {
return this.sortedList; return SORTED_LIST;
} }
public boolean isLoaded(String modTarget) { public static boolean isLoaded(String modTarget) {
return this.indexedMods.containsKey(modTarget); return indexedMods.containsKey(modTarget);
} }
public int size() { public static int size() {
return mods.size(); return mods.size();
} }
public List<ModFileScanData> getAllScanData() { public static List<ModFileScanData> getAllScanData() {
if (modFileScanData == null) { final class LazyInit {
modFileScanData = this.sortedList.stream(). private LazyInit() {}
map(IModInfo::getOwningFile). private static final List<ModFileScanData> MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
filter(Objects::nonNull). .map(IModInfo::getOwningFile)
map(IModFileInfo::getFile). .filter(Objects::nonNull)
distinct(). .map(IModFileInfo::getFile)
map(IModFile::getScanResult). .distinct()
toList(); .map(IModFile::getScanResult)
.toList();
} }
return modFileScanData; return LazyInit.MOD_FILE_SCAN_DATA;
} }
public void forEachModFile(Consumer<IModFile> fileConsumer) { public static void forEachModFile(Consumer<IModFile> fileConsumer) {
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer); MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
} }
public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) { public static <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
return modFiles.stream().map(IModFileInfo::getFile).map(function); return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
} }
public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) { public static void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
indexedMods.forEach(modContainerConsumer); indexedMods.forEach(modContainerConsumer);
} }
public void forEachModInOrder(Consumer<ModContainer> containerConsumer) { public static void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
this.sortedContainers.forEach(containerConsumer); sortedContainers.forEach(containerConsumer);
} }
public List<ModContainer> getLoadedMods() { public static List<ModContainer> getLoadedMods() {
return this.sortedContainers; return sortedContainers;
} }
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) { public static <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
return indexedMods.values().stream().map(function); return indexedMods.values().stream().map(function);
} }
} }
@@ -5,16 +5,11 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import com.google.common.collect.ImmutableList;
import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.fml.event.IModBusEvent; import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.loading.*;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.loading.ImmediateWindowHandler;
import net.minecraftforge.fml.loading.LoadingModList;
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier; import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.fml.loading.progress.ProgressMeter; import net.minecraftforge.fml.loading.progress.ProgressMeter;
import net.minecraftforge.fml.loading.progress.StartupNotificationManager; import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
@@ -71,48 +66,18 @@ import static net.minecraftforge.fml.Logging.LOADING;
* and completes the mod loading sequence.</dd> * and completes the mod loading sequence.</dd>
* </dl> * </dl>
*/ */
public class ModLoader { public final class ModLoader {
private ModLoader() {}
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private final LoadingModList loadingModList; private static final ArrayList<ModLoadingException> LOADING_EXCEPTIONS = new ArrayList<>();
private static final ArrayList<ModLoadingWarning> LOADING_WARNINGS = new ArrayList<>();
private final List<ModLoadingException> loadingExceptions; private static final Consumer<String> STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
private final Set<IModInfo> erroredModInfos; private static final HashSet<IModLoadingState> COMPLETED_STATES = new HashSet<>();
private final List<ModLoadingWarning> loadingWarnings;
private final ModStateManager stateManager;
private static boolean loadingStateValid; private static boolean loadingStateValid;
private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
private final Set<IModLoadingState> completedStates = new HashSet<>();
private ModList modList;
private ModLoader() {
var loadingModList = this.loadingModList = FMLLoader.getLoadingModList();
var loadingExceptions = this.loadingExceptions = loadingModList.getErrors().stream()
.flatMap(ModLoadingException::fromEarlyException)
.collect(Collectors.toList());
this.loadingWarnings = loadingModList.getBrokenFiles().stream()
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
.collect(Collectors.toList());
if (loadingExceptions.isEmpty()) {
this.erroredModInfos = Collections.emptySet();
} else {
this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
this.erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
}
loadingModList.getModFiles().stream()
.filter(ModFileInfo::missingLicense)
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
.forEach(this.loadingExceptions::add);
this.stateManager = new ModStateManager();
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
}
private static String computeLanguageList() { private static String computeLanguageList() {
return "\n" + FMLLoader.getLanguageLoadingProvider() return "\n" + LanguageLoadingProvider
.applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion()) .applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
.collect(Collectors.joining("\n\t\t", "\t\t", "")); .collect(Collectors.joining("\n\t\t", "\t\t", ""));
} }
@@ -126,37 +91,51 @@ public class ModLoader {
collect(Collectors.joining("\n\t\t","\t\t","")); collect(Collectors.joining("\n\t\t","\t\t",""));
} }
public static ModLoader get() {
return LazyInit.INSTANCE;
}
private static final class LazyInit {
private static final ModLoader INSTANCE = new ModLoader();
private LazyInit() {}
}
/** /**
* Run on the primary starting thread by ClientModLoader and ServerModLoader * Run on the primary starting thread by ClientModLoader and ServerModLoader
* @param syncExecutor An executor to run tasks on the main thread * @param syncExecutor An executor to run tasks on the main thread
* @param parallelExecutor An executor to run tasks on a parallel loading thread pool * @param parallelExecutor An executor to run tasks on a parallel loading thread pool
* @param periodicTask Optional periodic task to perform on the main thread while other activities run * @param periodicTask Optional periodic task to perform on the main thread while other activities run
*/ */
public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { public static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
var loadingExceptions = LoadingModList.getErrors().stream()
.flatMap(ModLoadingException::fromEarlyException)
.toList();
ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
.toList());
Set<IModInfo> erroredModInfos;
if (loadingExceptions.isEmpty()) {
erroredModInfos = Collections.emptySet();
} else {
erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
}
LoadingModList.getModFiles().stream()
.filter(ModFileInfo::missingLicense)
.filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
.map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
.forEach(LOADING_EXCEPTIONS::add);
CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version"))); ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion())); ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
loadingStateValid = true; loadingStateValid = true;
FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask); FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(), if (!LOADING_EXCEPTIONS.isEmpty()) {
loadingModList.getMods()); LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
if (!this.loadingExceptions.isEmpty()) { STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst()); ModList.clearLoadedMods();
statusConsumer.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList());
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(loadingExceptions); throw new LoadingFailedException(LOADING_EXCEPTIONS);
} }
var failedBounds = new ArrayList<ForgeFeature.Bound>(); var failedBounds = new ArrayList<ForgeFeature.Bound>();
for (var mod : loadingModList.getMods()) { for (var mod : LoadingModList.getMods()) {
for (var feature : mod.getForgeFeatures()) { for (var feature : mod.getForgeFeatures()) {
if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature)) if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
failedBounds.add(feature); failedBounds.add(feature);
@@ -165,8 +144,8 @@ 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.accept("ERROR DURING MOD LOADING"); STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList()); ModList.clearLoadedMods();
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(failedBounds.stream() throw new LoadingFailedException(failedBounds.stream()
.map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb))) .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
@@ -174,18 +153,18 @@ public class ModLoader {
} }
final var modContainers = new HashMap<String, ModContainer>(); final var modContainers = new HashMap<String, ModContainer>();
for (var file : loadingModList.getModFiles()) { for (var file : LoadingModList.getModFiles()) {
var containers = this.buildMods(file.getFile()); var containers = buildMods(file.getFile());
for (var container : containers) for (var container : containers)
modContainers.put(container.getModId(), container); modContainers.put(container.getModId(), container);
} }
if (!loadingExceptions.isEmpty()) { if (!LOADING_EXCEPTIONS.isEmpty()) {
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst()); LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
statusConsumer.accept("ERROR DURING MOD LOADING"); STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
modList.setLoadedMods(Collections.emptyList()); ModList.clearLoadedMods();
loadingStateValid = false; loadingStateValid = false;
throw new LoadingFailedException(loadingExceptions); throw new LoadingFailedException(LOADING_EXCEPTIONS);
} }
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
@@ -208,34 +187,33 @@ public class ModLoader {
} }
} }
modList.setLoadedMods(modContainers.values().stream().toList()); ModList.setLoadedMods(modContainers.values().stream().toList());
this.modList = modList; var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
var stateList = stateManager.getStates(ModLoadingPhase.GATHER); var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
for (IModLoadingState mls : stateList) { for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress); dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
} }
progress.complete(); progress.complete();
} }
public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
var stateList = stateManager.getStates(ModLoadingPhase.LOAD); var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum()); var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
for (IModLoadingState mls : stateList) { for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress); dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
} }
progress.complete(); progress.complete();
} }
public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE); var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum()); var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
for (IModLoadingState mls : stateList) { for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress); dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
} }
var modBusGroups = Set.of( var modBusGroups = Set.of(
modList.getLoadedMods().stream() ModList.getLoadedMods().stream()
.map(ModContainer::getModBusGroup) .map(ModContainer::getModBusGroup)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.toArray(BusGroup[]::new) .toArray(BusGroup[]::new)
@@ -245,11 +223,11 @@ public class ModLoader {
} }
parallelExecutor.execute(BusGroup.DEFAULT::trim); parallelExecutor.execute(BusGroup.DEFAULT::trim);
statusConsumer.accept("Mod loading complete - %d mods loaded".formatted(this.modList.size())); STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
progress.complete(); progress.complete();
} }
private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) { private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
if (!isLoadingStateValid()) { if (!isLoadingStateValid()) {
LOGGER.error("Cowardly refusing to process mod state change request from {}", state); LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
return; return;
@@ -257,25 +235,25 @@ public class ModLoader {
progressBar.label(progressBar.name() + " working"); progressBar.label(progressBar.name() + " working");
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
var inlineRunnable = state.inlineRunnable().orElse(null); var inlineRunnable = state.inlineRunnable();
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker); if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null); var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition); if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
completedStates.add(state); COMPLETED_STATES.add(state);
} }
private void handleInlineTransition(final Consumer<ModList> transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) { private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0); var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
transition.accept(this.modList); transition.run();
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
pb.complete(); pb.complete();
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
} }
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) { private static void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
while (!transition.isDone()) { while (!transition.isDone()) {
syncExecutor.drive(ticker); syncExecutor.drive(ticker);
} }
@@ -289,7 +267,7 @@ public class ModLoader {
.anyMatch(obj -> !(obj instanceof ModLoadingException)); .anyMatch(obj -> !(obj instanceof ModLoadingException));
if (hasNotModLoadingEx) { if (hasNotModLoadingEx) {
LOGGER.fatal("Encountered non-modloading exceptions!", e); LOGGER.fatal("Encountered non-modloading exceptions!", e);
statusConsumer.accept("ERROR DURING MOD LOADING"); STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
throw e; throw e;
} }
@@ -298,12 +276,12 @@ public class ModLoader {
.map(ModLoadingException.class::cast) .map(ModLoadingException.class::cast)
.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.accept("ERROR DURING MOD LOADING"); STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
throw new LoadingFailedException(modLoadingExceptions); throw new LoadingFailedException(modLoadingExceptions);
} }
} }
private List<ModContainer> buildMods(final IModFile modFile) { private static List<ModContainer> buildMods(final IModFile modFile) {
final Map<String, IModInfo> modInfoMap = new HashMap<>(); final Map<String, IModInfo> modInfoMap = new HashMap<>();
for (var mod : modFile.getModFileInfo().getMods()) for (var mod : modFile.getModFileInfo().getMods())
modInfoMap.put(mod.getModId(), mod); modInfoMap.put(mod.getModId(), mod);
@@ -333,14 +311,14 @@ public class ModLoader {
missingMods.removeAll(modIds); missingMods.removeAll(modIds);
LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods); LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath())); LOADING_EXCEPTIONS.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
} }
// remove errored mod containers // remove errored mod containers
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList(); return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
} }
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, private static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
) { ) {
try { try {
@@ -352,7 +330,7 @@ public class ModLoader {
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer()); return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
} catch (ModLoadingException mle) { } catch (ModLoadingException mle) {
// exceptions are caught and added to the error list for later handling // exceptions are caught and added to the error list for later handling
loadingExceptions.add(mle); LOADING_EXCEPTIONS.add(mle);
// return an errored container instance here, because we tried and failed building a container. // return an errored container instance here, because we tried and failed building a container.
return new ErroredModContainer(); return new ErroredModContainer();
} }
@@ -366,15 +344,8 @@ public class ModLoader {
return loadingStateValid; return loadingStateValid;
} }
/** @deprecated Use {@link #hasCompletedState(IModLoadingState)} instead */ public static boolean hasCompletedState(IModLoadingState state) {
@Deprecated(forRemoval = true) return COMPLETED_STATES.contains(state);
public boolean hasCompletedState(final String stateName) {
IModLoadingState state = stateManager.findState(stateName);
return completedStates.contains(state);
}
public boolean hasCompletedState(IModLoadingState state) {
return completedStates.contains(state);
} }
public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) { public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
@@ -382,7 +353,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event generator to a broken mod state"); LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
return; return;
} }
for (var mod : ModList.get().getLoadedMods()) for (var mod : ModList.getLoadedMods())
mod.acceptEvent(generator.apply(mod)); mod.acceptEvent(generator.apply(mod));
} }
@@ -391,7 +362,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName()); LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return; return;
} }
for (var mod : ModList.get().getLoadedMods()) for (var mod : ModList.getLoadedMods())
mod.acceptEvent(e); mod.acceptEvent(e);
} }
@@ -400,7 +371,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName()); LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return e; return e;
} }
for (var mod : ModList.get().getLoadedMods()) for (var mod : ModList.getLoadedMods())
mod.acceptEvent(e); mod.acceptEvent(e);
return e; return e;
} }
@@ -418,19 +389,19 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName()); LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return; return;
} }
for (var mod : ModList.get().getLoadedMods()) { for (var mod : ModList.getLoadedMods()) {
pre.accept(mod, e); pre.accept(mod, e);
mod.acceptEvent(e); mod.acceptEvent(e);
post.accept(mod, e); post.accept(mod, e);
} }
} }
public List<ModLoadingWarning> getWarnings() { public static List<ModLoadingWarning> getWarnings() {
return ImmutableList.copyOf(this.loadingWarnings); return List.copyOf(LOADING_WARNINGS);
} }
public void addWarning(ModLoadingWarning warning) { public static void addWarning(ModLoadingWarning warning) {
this.loadingWarnings.add(warning); LOADING_WARNINGS.add(warning);
} }
private static boolean runningDataGen = false; private static boolean runningDataGen = false;
@@ -32,24 +32,11 @@ public class ModLoadingContext {
return context.get(); return context.get();
} }
/** void setActiveContainer(final ModContainer container) {
* @deprecated Going to be moved to ForgeHooks for Internal use.
*/
@Deprecated(forRemoval = true, since="1.21.1")
public void setActiveContainer(final ModContainer container) {
this.activeContainer = container; this.activeContainer = container;
this.languageExtension = container == null ? null : container.contextExtension.get(); this.languageExtension = container == null ? null : container.contextExtension.get();
} }
/**
* Going to be moved to ForgeHooks for Internal use.
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
*/
@Deprecated(forRemoval = true, since="1.21.1")
public ModContainer getActiveContainer() {
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
}
/** /**
* @deprecated Going to be moved to ForgeHooks for Internal use. * @deprecated Going to be moved to ForgeHooks for Internal use.
*/ */
@@ -58,11 +45,10 @@ public class ModLoadingContext {
return activeContainer == null ? "minecraft" : activeContainer.getNamespace(); return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
} }
/**
* @return {@link ModLoadingContext#getActiveContainer()} by default.
*/
public ModContainer getContainer() { public ModContainer getContainer() {
return getActiveContainer(); return activeContainer == null
? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
: activeContainer;
} }
/** /**
@@ -114,8 +100,7 @@ public class ModLoadingContext {
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
if (spec.isEmpty()) if (spec.isEmpty()) {
{
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId()); LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
return; return;
@@ -125,8 +110,7 @@ public class ModLoadingContext {
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
if (spec.isEmpty()) if (spec.isEmpty()) {
{
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName); LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
return; return;
@@ -135,7 +119,6 @@ public class ModLoadingContext {
getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName)); getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T extension() { public <T> T extension() {
return (T)languageExtension; return (T)languageExtension;
@@ -6,14 +6,15 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import net.minecraftforge.fml.loading.progress.ProgressMeter; import net.minecraftforge.fml.loading.progress.ProgressMeter;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.ToIntFunction; import java.util.function.IntSupplier;
import java.util.function.Supplier;
/** /**
* Implementation of the {@link IModLoadingState} interface. * Implementation of the {@link IModLoadingState} interface.
@@ -25,27 +26,26 @@ import java.util.function.ToIntFunction;
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
* @param transition optional state transition information * @param transition optional state transition information
*/ */
@NullMarked
public record ModLoadingState( public record ModLoadingState(
String name, String name,
String previous, String previous,
Function<ModList, String> message, Supplier<String> message,
ToIntFunction<ModList> size, IntSupplier size,
ModLoadingPhase phase, ModLoadingPhase phase,
Optional<Consumer<ModList>> inlineRunnable, @Nullable Runnable inlineRunnable,
Optional<IModStateTransition> transition @Nullable IModStateTransition transition
) implements IModLoadingState { ) implements IModLoadingState {
@Override @Override
public Optional<CompletableFuture<Void>> buildTransition( public @Nullable 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); if (transition == null) return null;
return transition == null return transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
? Optional.empty()
: Optional.ofNullable(transition.build(name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask));
} }
/** /**
@@ -60,7 +60,7 @@ public record ModLoadingState(
*/ */
@Deprecated(since = "1.21.3", forRemoval = true) @Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) { public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
return new ModLoadingState(name, previous, ml -> "", ml -> 0, phase, Optional.empty(), Optional.empty()); return new ModLoadingState(name, previous, () -> "", () -> 0, phase, null, null);
} }
/** /**
@@ -94,7 +94,7 @@ public record ModLoadingState(
*/ */
@Deprecated(since = "1.21.3", forRemoval = true) @Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState withTransition(final String name, final String previous, public static ModLoadingState withTransition(final String name, final String previous,
final Function<ModList, String> message, final ModLoadingPhase phase, final Supplier<String> message, final ModLoadingPhase phase,
final IModStateTransition transition) { final IModStateTransition transition) {
return of(name, phase).after(previous).message(message).withTransition(transition); return of(name, phase).after(previous).message(message).withTransition(transition);
} }
@@ -113,7 +113,7 @@ public record ModLoadingState(
*/ */
@Deprecated(since = "1.21.3", forRemoval = true) @Deprecated(since = "1.21.3", forRemoval = true)
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase, public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
final Consumer<ModList> inline) { final Runnable inline) {
return of(name, phase).after(previous).withInline(inline); return of(name, phase).after(previous).withInline(inline);
} }
@@ -126,23 +126,23 @@ public record ModLoadingState(
return o instanceof ModLoadingState that return o instanceof ModLoadingState that
&& this.phase == that.phase && this.phase == that.phase
&& this.name.equals(that.name) && this.name.equals(that.name)
&& Objects.equals(this.previous, that.previous); && this.previous.equals(that.previous);
} }
@Override @Override
public int hashCode() { public int hashCode() {
int result = phase.hashCode(); int result = phase.hashCode();
result = 31 * result + name.hashCode(); result = 31 * result + name.hashCode();
result = 31 * result + Objects.hashCode(previous); result = 31 * result + previous.hashCode();
return result; return result;
} }
public static class Builder { public static final class Builder {
private final String name; private final String name;
private final ModLoadingPhase phase; private final ModLoadingPhase phase;
private String after; private String after = "";
private Function<ModList, String> message = null; private @Nullable Supplier<String> message = null;
private ToIntFunction<ModList> size = null; private @Nullable IntSupplier size = null;
private Builder(final String name, final ModLoadingPhase phase) { private Builder(final String name, final ModLoadingPhase phase) {
this.name = name; this.name = name;
@@ -155,28 +155,28 @@ public record ModLoadingState(
return this; return this;
} }
public Builder message(final String value) { return message(ml -> value); } public Builder message(final String value) { return message(() -> value); }
public Builder message(final Function<ModList, String> value) { public Builder message(final Supplier<String> value) {
this.message = value; this.message = value;
return this; return this;
} }
public Builder size(final int value) { return size(ml -> value); } public Builder size(final int value) { return size(() -> value); }
public Builder size(final ToIntFunction<ModList> value) { public Builder size(final IntSupplier value) {
this.size = value; this.size = value;
return this; return this;
} }
public ModLoadingState empty() { public ModLoadingState empty() {
return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty()); return new ModLoadingState(name, after, message != null ? message : () -> "", size != null ? size : () -> 0, phase, null, null);
} }
public ModLoadingState withTransition(final IModStateTransition transition) { 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)); return new ModLoadingState(name, after, message != null ? message : () -> "Processing transition " + name, size != null ? size : ModList::size, phase, null, transition);
} }
public ModLoadingState withInline(final Consumer<ModList> inline) { public ModLoadingState withInline(final Runnable inline) {
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty()); return new ModLoadingState(name, after, message != null ? message : () -> "Processing work " + name, size != null ? size : () -> 0, phase, inline, null);
} }
} }
} }
@@ -5,41 +5,27 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import com.google.common.collect.Streams;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
public class ModLoadingWarning { /**
/** * @param modInfo Mod info for mod with warning
* Mod Info for mod with warning * @param warningStage The stage where this warning was encountered
*/ * @param i18nMessage I18N message to use for display
private final IModInfo modInfo; * @param context Context for message display
/** */
* The stage where this warning was encountered public record ModLoadingWarning(IModInfo modInfo, ModLoadingStage warningStage, String i18nMessage, List<Object> context) {
*/
private final ModLoadingStage warningStage;
/**
* I18N message to use for display
*/
private final String i18nMessage;
/**
* Context for message display
*/
private final List<Object> context;
public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) { public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
this.modInfo = modInfo; this(modInfo, warningStage, i18nMessage, List.of(context));
this.warningStage = warningStage; }
this.i18nMessage = i18nMessage;
this.context = Arrays.asList(context); public ModLoadingWarning {
context = List.copyOf(context);
} }
public String formatToString() { public String formatToString() {
return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray()); return Bindings.getMessageParser().get().parseMessage(i18nMessage, Stream.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
} }
} }
@@ -15,18 +15,19 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
public class ModStateManager { public final class ModStateManager {
private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap; private ModStateManager() {}
private static final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
public ModStateManager() { static {
final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class); final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{}) stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, _ -> {})
.map(IModStateProvider::getAllStates) .map(IModStateProvider::getAllStates)
.flatMap(List::stream) .flatMap(List::stream)
.collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList())); .collect(Collectors.groupingBy(IModLoadingState::phase, () -> new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
} }
public List<IModLoadingState> getStates(final ModLoadingPhase phase) { public static List<IModLoadingState> getStates(final ModLoadingPhase phase) {
var nodes = stateMap.get(phase); var nodes = stateMap.get(phase);
var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity())); var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
@@ -40,7 +41,7 @@ public class ModStateManager {
return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList(); return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
} }
public IModLoadingState findState(final String stateName) { public static IModLoadingState findState(final String stateName) {
var result = stateMap.values() var result = stateMap.values()
.stream() .stream()
.flatMap(List::stream) .flatMap(List::stream)
@@ -24,7 +24,7 @@ import net.minecraftforge.fml.event.IModBusEvent;
import net.minecraftforge.fml.loading.progress.ProgressMeter; import net.minecraftforge.fml.loading.progress.ProgressMeter;
@ApiStatus.Internal @ApiStatus.Internal
class ModStateTransitionHelper { final class ModStateTransitionHelper {
static final IModStateTransition NOOP = new NoopTransition(); static final IModStateTransition NOOP = new NoopTransition();
record NoopTransition() implements IModStateTransition { record NoopTransition() implements IModStateTransition {
@Override @Override
@@ -62,7 +62,30 @@ class ModStateTransitionHelper {
} }
} }
record FutureResult<V>(V value, Throwable exception){} /// Same as [#completableFutureFromExceptionList(List)] but specialised for a single future
static <V> CompletionStage<Void> completableFutureFromException(FutureResult<V> t) {
if (t.exception() == null) {
return CompletableFuture.completedFuture(null);
} else {
var exception = t.exception();
CompletableFuture<Void> cf = new CompletableFuture<>();
RuntimeException accumulator = new RuntimeException();
cf.completeExceptionally(accumulator);
if (exception instanceof CompletionException) {
exception = exception.getCause();
}
if (exception.getSuppressed().length != 0) {
for (Throwable throwable : exception.getSuppressed()) {
accumulator.addSuppressed(throwable);
}
} else {
accumulator.addSuppressed(exception);
}
return cf;
}
}
record FutureResult<V>(V value, Throwable exception) {}
static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) { static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
var list = new ArrayList<FutureResult<V>>(futures.size()); var list = new ArrayList<FutureResult<V>>(futures.size());
@@ -79,22 +102,14 @@ class ModStateTransitionHelper {
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list); return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
} }
private static <T extends IModBusEvent> void addCompletableFutureTaskForModDispatch( private static <T extends IModBusEvent> CompletableFuture<Void> addCompletableFutureTaskForModDispatch(
final IModStateTransition transition,
final Executor executor, final Executor executor,
final List<CompletableFuture<Void>> completableFutures,
final ProgressMeter progressBar, final ProgressMeter progressBar,
final EventGenerator<T> eventGenerator, final EventGenerator<T> eventGenerator,
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState 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>>(); var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
for (var mod : ModList.get().getLoadedMods()) { for (var mod : ModList.getLoadedMods()) {
CompletableFuture<Void> parent = null; CompletableFuture<Void> parent = null;
if (mod.dependencies.isEmpty()) { if (mod.dependencies.isEmpty()) {
@@ -129,20 +144,7 @@ class ModStateTransitionHelper {
modFutures.put(mod.getModId(), dispatch); modFutures.put(mod.getModId(), dispatch);
} }
var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor); return gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
completableFutures.add(dispatch);
@SuppressWarnings("removal")
var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
if (postDispatchHook != null)
completableFutures.add(postDispatchHook);
}
private static <T extends IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
@SuppressWarnings("unchecked")
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
return hookTyped.apply(executor, eventGenerator);
} }
static <T extends IModBusEvent> CompletableFuture<Void> build( static <T extends IModBusEvent> CompletableFuture<Void> build(
@@ -154,31 +156,25 @@ class ModStateTransitionHelper {
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<>(); CompletableFuture<Void> future;
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor); final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
@SuppressWarnings({ "removal", "unchecked" }) final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList(); CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
for (int x = 0; x < events.size(); x++) { .thenRunAsync(() -> progressBar.label(progressBar.name() + ": dispatching " + name), parallelExecutor);
var gen = events.get(x);
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1 var eventGenerator = transition.eventFunction();
? transition.nextModLoadingStage() if (eventGenerator != null) {
: ModLoadingStage::currentState; BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = transition.nextModLoadingStage();
addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state); future = addCompletableFutureTaskForModDispatch(executor, progressBar, eventGenerator, state);
final CompletableFuture<Void> eventDispatchCF = future.handle(FutureResult::new)
.thenCompose(ModStateTransitionHelper::completableFutureFromException);
postEventDispatchCF = postEventDispatchCF.thenComposeAsync(_ -> eventDispatchCF, parallelExecutor);
} }
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor); postEventDispatchCF = postEventDispatchCF.thenRun(() -> postSyncTask.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); return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
} }
} }
@@ -14,25 +14,12 @@ import java.util.concurrent.locks.LockSupport;
import static net.minecraftforge.fml.Logging.LOADING; import static net.minecraftforge.fml.Logging.LOADING;
public class ModWorkManager { public final class ModWorkManager {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1); private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
public interface DrivenExecutor extends Executor { public sealed interface DrivenExecutor extends Executor {
boolean selfDriven(); void drive(Runnable ticker);
boolean driveOne();
default void drive(Runnable ticker) {
if (!selfDriven()) {
ticker.run();
while (true) {
if (!driveOne()) break;
}
} else {
// park for a bit so other threads can schedule
LockSupport.parkNanos(PARK_TIME);
}
}
} }
private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor { private record SyncExecutor(ConcurrentLinkedDeque<Runnable> tasks) implements DrivenExecutor {
@@ -40,8 +27,7 @@ public class ModWorkManager {
this(new ConcurrentLinkedDeque<>()); this(new ConcurrentLinkedDeque<>());
} }
@Override private boolean driveOne() {
public boolean driveOne() {
final Runnable task = tasks.pollFirst(); final Runnable task = tasks.pollFirst();
if (task != null) { if (task != null) {
task.run(); task.run();
@@ -50,31 +36,30 @@ public class ModWorkManager {
} }
@Override @Override
public boolean selfDriven() { public void execute(final Runnable command) {
return false; tasks.addLast(command);
} }
@Override @Override
public void execute(final Runnable command) { public void drive(Runnable ticker) {
tasks.addLast(command); ticker.run();
while (true) {
if (!driveOne()) break;
}
} }
} }
private record WrappingExecutor(Executor wrapped) implements DrivenExecutor { private record WrappingExecutor(Executor wrapped) implements DrivenExecutor {
@Override
public boolean selfDriven() {
return true;
}
@Override
public boolean driveOne() {
return false;
}
@Override @Override
public void execute(final Runnable command) { public void execute(final Runnable command) {
wrapped.execute(command); wrapped.execute(command);
} }
@Override
public void drive(Runnable ticker) {
// Park for a bit so other threads can schedule
LockSupport.parkNanos(PARK_TIME);
}
} }
private static final SyncExecutor syncExecutor = new SyncExecutor(); private static final SyncExecutor syncExecutor = new SyncExecutor();
@@ -43,7 +43,7 @@ public final class OptionalMod<T>
private T getValue() private T getValue()
{ {
if (!searched) { if (!searched) {
this.value = ModList.get().<T>getModObjectById(this.modId).orElse(null); this.value = ModList.<T>getModObjectById(this.modId).orElse(null);
searched = true; searched = true;
} }
return this.value; return this.value;
@@ -93,8 +93,8 @@ public class VersionChecker {
return; return;
} }
var mc = ModList.get().getModContainerById("minecraft"); var mc = ModList.getModContainerById("minecraft");
var forge = ModList.get().getModContainerById("forge"); var forge = ModList.getModContainerById("forge");
this.mcVersion = mc.get().getModInfo().getVersion().toString(); this.mcVersion = mc.get().getModInfo().getVersion().toString();
this.agent = "Java-http-client/" + System.getProperty("java.version") this.agent = "Java-http-client/" + System.getProperty("java.version")
@@ -223,7 +223,7 @@ public class VersionChecker {
// Gather a list of mods that have opted in to this update system by providing a URL. // Gather a list of mods that have opted in to this update system by providing a URL.
private static List<IModInfo> gatherMods() { private static List<IModInfo> gatherMods() {
List<IModInfo> ret = new LinkedList<>(); List<IModInfo> ret = new LinkedList<>();
for (IModInfo info : ModList.get().getMods()) { for (IModInfo info : ModList.getMods()) {
if (info.getUpdateURL().isPresent()) if (info.getUpdateURL().isPresent())
ret.add(info); ret.add(info);
} }
@@ -8,8 +8,7 @@ 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.loading.FMLEnvironment;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.Marker; import org.slf4j.Marker;
@@ -19,57 +18,54 @@ import java.nio.file.Path;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class ConfigTracker { public final class ConfigTracker {
private ConfigTracker() {}
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
static final Marker CONFIG = MarkerFactory.getMarker("CONFIG"); static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
public static final ConfigTracker INSTANCE = new ConfigTracker(); private static final ConcurrentHashMap<String, ModConfig> FILE_MAP = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, ModConfig> fileMap; private static final Map<ModConfig.Type, Set<ModConfig>> CONFIG_SETS = Map.of(
private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets; ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()),
private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod; ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()),
ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>())
);
private static final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> CONFIGS_BY_MOD = new ConcurrentHashMap<>();
private ConfigTracker() { static void trackConfig(final ModConfig config) {
this.fileMap = new ConcurrentHashMap<>(); if (FILE_MAP.containsKey(config.getFileName())) {
this.configSets = new EnumMap<>(ModConfig.Type.class); LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), FILE_MAP.get(config.getFileName()).getModId(), config.getModId());
this.configsByMod = new ConcurrentHashMap<>();
this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
// this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
}
void trackConfig(final ModConfig config) {
if (this.fileMap.containsKey(config.getFileName())) {
LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
throw new RuntimeException("Config conflict detected!"); throw new RuntimeException("Config conflict detected!");
} }
this.fileMap.put(config.getFileName(), config); FILE_MAP.put(config.getFileName(), config);
this.configSets.get(config.getType()).add(config); CONFIG_SETS.get(config.getType()).add(config);
this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config); CONFIGS_BY_MOD.computeIfAbsent(config.getModId(), _ -> new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId()); LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
} }
public void loadConfigs(ModConfig.Type type, Path configBasePath) { public static void loadConfigs(ModConfig.Type type, Path configBasePath) {
LOGGER.debug(CONFIG, "Loading configs type {}", type); LOGGER.debug(CONFIG, "Loading configs type {}", type);
for (ModConfig config : this.configSets.get(type)) { for (ModConfig config : CONFIG_SETS.get(type)) {
openConfig(config, configBasePath); openConfig(config, configBasePath);
} }
} }
// TODO: [FML] This is only called for the server (outside of forceUnload) // TODO: [FML] This is only called for the server (outside of forceUnload)
// rethink config implementation for eventual FML rewrite // rethink config implementation for eventual FML rewrite
public void unloadConfigs(ModConfig.Type type, Path configBasePath) { public static 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 : CONFIG_SETS.get(type)) {
closeConfig(config, configBasePath); closeConfig(config, configBasePath);
} }
ConfigFileTypeHandler.get(type).stopWatcher(); ConfigFileTypeHandler.get(type).stopWatcher();
} }
// If there is a better way to do this, please tell me. Because this is FUCKED // If there is a better way to do this, please tell me. Because this is FUCKED
public void forceUnload() { public static void forceUnload() {
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead // 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())); if (FMLEnvironment.dist.isClient())
this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get()); unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get());
unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
// just in case server watcher is still alive somehow... // just in case server watcher is still alive somehow...
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher(); ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
@@ -96,8 +92,8 @@ public class ConfigTracker {
} }
} }
public void loadDefaultServerConfigs() { public static void loadDefaultServerConfigs() {
configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> { CONFIG_SETS.get(ModConfig.Type.SERVER).forEach(modConfig -> {
final CommentedConfig commentedConfig = CommentedConfig.inMemory(); final CommentedConfig commentedConfig = CommentedConfig.inMemory();
modConfig.getSpec().correct(commentedConfig); modConfig.getSpec().correct(commentedConfig);
modConfig.setConfigData(commentedConfig); modConfig.setConfigData(commentedConfig);
@@ -105,16 +101,16 @@ public class ConfigTracker {
}); });
} }
public String getConfigFileName(String modId, ModConfig.Type type) { public static String getConfigFileName(String modId, ModConfig.Type type) {
return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)). return Optional.ofNullable(CONFIGS_BY_MOD.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
map(ModConfig::getFullPath).map(Object::toString).orElse(null); map(ModConfig::getFullPath).map(Object::toString).orElse(null);
} }
public Map<ModConfig.Type, Set<ModConfig>> configSets() { public static Map<ModConfig.Type, Set<ModConfig>> configSets() {
return configSets; return CONFIG_SETS;
} }
public ConcurrentHashMap<String, ModConfig> fileMap() { public static ConcurrentHashMap<String, ModConfig> fileMap() {
return fileMap; return FILE_MAP;
} }
} }
@@ -13,6 +13,7 @@ import java.util.function.Function;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public interface IConfigEvent { public interface IConfigEvent {
// TODO: [FML] Get rid of this indirection somehow
record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {} record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading, @Nullable Function<ModConfig, IConfigEvent> unloading) {}
ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get(); ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
@@ -31,7 +31,7 @@ public class ModConfig
this.fileName = fileName; this.fileName = fileName;
this.container = container; this.container = container;
this.configHandler = ConfigFileTypeHandler.get(type); this.configHandler = ConfigFileTypeHandler.get(type);
ConfigTracker.INSTANCE.trackConfig(this); ConfigTracker.trackConfig(this);
} }
public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) { public ModConfig(final Type type, final IConfigSpec<?> spec, final ModContainer activeContainer) {
@@ -40,8 +40,9 @@ public class ModConfig
private static String defaultConfigName(Type type, String modId) { private static String defaultConfigName(Type type, String modId) {
// config file name would be "forge-client.toml" and "forge-server.toml" // config file name would be "forge-client.toml" and "forge-server.toml"
return String.format(Locale.ROOT, "%s-%s.toml", modId, type.extension()); return modId + '-' + type.extension() + ".toml";
} }
public Type getType() { public Type getType() {
return type; return type;
} }
+13 -13
View File
@@ -54,10 +54,10 @@ dependencies {
// See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070) // See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070)
// We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration. // We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration.
var lwjglTestLibs = [ var lwjglTestLibs = [
dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives }, dependencies.variantOf(earlyDisplayTestLibs.lwjgl) { classifier lwjglNatives },
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.glfw) { classifier lwjglNatives }, dependencies.variantOf(earlyDisplayTestLibs.lwjgl.glfw) { classifier lwjglNatives },
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives }, dependencies.variantOf(earlyDisplayTestLibs.lwjgl.opengl) { classifier lwjglNatives },
dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives } dependencies.variantOf(earlyDisplayTestLibs.lwjgl.stb) { classifier lwjglNatives }
].with { list -> ].with { list ->
provider { list.collect { it.get() } } provider { list.collect { it.get() } }
} }
@@ -79,16 +79,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.earlydisplay', 'Automatic-Module-Name': 'net.minecraftforge.earlydisplay',
'Forge-Module-Layer' : 'boot' 'Forge-Module-Layer' : 'boot'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': '1.0' 'Implementation-Version': '1.0'
], 'net/minecraftforge/fml/earlydisplay/') ], 'net/minecraftforge/fml/earlydisplay/')
} }
} }
@@ -114,4 +114,4 @@ publishing {
} }
} }
} }
} }
@@ -46,8 +46,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.IntConsumer; import java.util.function.IntConsumer;
import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collector; import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -70,7 +68,7 @@ import static org.lwjgl.opengl.GL32C.*;
* Based on the prior ClientVisualization, with some personal touches. * Based on the prior ClientVisualization, with some personal touches.
*/ */
public class DisplayWindow implements ImmediateWindowProvider { public class DisplayWindow implements ImmediateWindowProvider {
private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}, {3,2}}; private static final int[][] GL_VERSIONS = new int[][] {{4,6}, {4,5}, {4,4}, {4,3}, {4,2}, {4,1}, {4,0}, {3,3}};
private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY"); private static final Logger LOGGER = LoggerFactory.getLogger("EARLYDISPLAY");
private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true); private final AtomicBoolean animationTimerTrigger = new AtomicBoolean(true);
@@ -314,17 +312,18 @@ public class DisplayWindow implements ImmediateWindowProvider {
LOGGER.error("ERROR DISPLAY\n"+msgBuilder); LOGGER.error("ERROR DISPLAY\n"+msgBuilder);
// we show the display on a new dedicated thread // we show the display on a new dedicated thread
Executors.newSingleThreadExecutor().submit(()-> { Executors.newSingleThreadExecutor().submit(()-> {
var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", false); var res = TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", msgBuilder.toString(), "yesno", "error", 0);
if (res) { if (res != 0) {
try { try {
Desktop.getDesktop().browse(URI.create(ERROR_URL)); Desktop.getDesktop().browse(URI.create(ERROR_URL));
} catch (IOException ioe) { } catch (IOException ioe) {
TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", false); TinyFileDialogs.tinyfd_messageBox("Minecraft: Forge", "Sadly, we couldn't open your browser.\nVisit " + ERROR_URL, "ok", "error", 0);
} }
} }
System.exit(1); System.exit(1);
}); });
} }
/** /**
* Called to initialize the window when preparing for the Render Thread. * Called to initialize the window when preparing for the Render Thread.
* *
@@ -460,7 +459,9 @@ public class DisplayWindow implements ImmediateWindowProvider {
this.winWidth = x[0]; this.winWidth = x[0];
this.winHeight = y[0]; this.winHeight = y[0];
// Setting the window position isn't supported on wayland, so check the error here
glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY); glfwSetWindowPos(window, (vidmode.width() - this.winWidth) / 2 + monitorX, (vidmode.height() - this.winHeight) / 2 + monitorY);
handleLastGLFWError();
// Attempt setting the icon // Attempt setting the icon
// int[] channels = new int[1]; // int[] channels = new int[1];
@@ -483,7 +484,10 @@ public class DisplayWindow implements ImmediateWindowProvider {
// Show the window // Show the window
glfwShowWindow(window); glfwShowWindow(window);
// Getting the window position isn't supported on wayland, so check the error here
glfwGetWindowPos(window, x, y); glfwGetWindowPos(window, x, y);
handleLastGLFWError();
this.winX = x[0]; this.winX = x[0];
this.winY = y[0]; this.winY = y[0];
glfwGetFramebufferSize(window, x, y); glfwGetFramebufferSize(window, x, y);
@@ -492,6 +496,18 @@ public class DisplayWindow implements ImmediateWindowProvider {
glfwPollEvents(); glfwPollEvents();
} }
private static void handleLastGLFWError() {
handleLastGLFWError((error, description) -> {
if (error == GLFW_FEATURE_UNAVAILABLE) {
// suppress window pos errors for unsupported platforms (wayland)
LOGGER.debug(String.format("Suppressing GLFW error: [0x%X]%s", error, description));
return;
}
throw new IllegalStateException(String.format("GLFW error: [0x%X]%s", error, description));
});
}
private void winResize(long window, int width, int height) { private void winResize(long window, int width, int height) {
if (window == this.window && width != 0 && height != 0) { if (window == this.window && width != 0 && height != 0) {
this.winWidth = width; this.winWidth = width;
@@ -529,7 +545,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
* *
* @return the Window we own. * @return the Window we own.
*/ */
public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) { public long setupMinecraftWindow(final int width, final int height, final String title, final long monitorSupplier, final Supplier<Object> backend) {
// wait for the window to actually be initialized // wait for the window to actually be initialized
try { try {
this.initializationFuture.get(30, TimeUnit.SECONDS); this.initializationFuture.get(30, TimeUnit.SECONDS);
@@ -549,11 +565,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
var renderlockticket = false; var renderlockticket = false;
do { do {
try { try {
renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS); renderlockticket = renderLock.tryAcquire(100, TimeUnit.MILLISECONDS);
if (++tries > 9) { if (++tries > 9) {
Thread.dumpStack(); Thread.dumpStack();
crashElegantly("We seem to be having trouble handing off the window, tried for 1 second"); crashElegantly("We seem to be having trouble handing off the window, tried for 1 second");
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.interrupted(); Thread.interrupted();
} }
@@ -563,7 +579,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
// Set the title to what the game wants // Set the title to what the game wants
glfwSetWindowTitle(window, title.get()); glfwSetWindowTitle(window, title);
glfwSwapInterval(0); glfwSwapInterval(0);
// Clean up our hooks // Clean up our hooks
glfwSetFramebufferSizeCallback(window, null).free(); glfwSetFramebufferSizeCallback(window, null).free();
@@ -649,4 +665,4 @@ public class DisplayWindow implements ImmediateWindowProvider {
this.context.elementShader().close(); this.context.elementShader().close();
SimpleBufferBuilder.destroy(); SimpleBufferBuilder.destroy();
} }
} }
+14 -13
View File
@@ -59,6 +59,7 @@ dependencies {
implementation(libs.accesstransformers ){ transitive = false } implementation(libs.accesstransformers ){ transitive = false }
implementation(libs.terminalconsoleappender){ transitive = false } implementation(libs.terminalconsoleappender){ transitive = false }
implementation(libs.jimfs ){ transitive = false } implementation(libs.jimfs ){ transitive = false }
implementation(libs.roimfs ){ transitive = false }
// Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated // Needed because we have a custom log4j plugin, and they removed package scanning and require a data file to be generated
implementation(libs.log4j.core ){ transitive = false } implementation(libs.log4j.core ){ transitive = false }
@@ -79,16 +80,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.fmlloader', 'Automatic-Module-Name': 'net.minecraftforge.fmlloader',
'Forge-Module-Layer' : 'boot' 'Forge-Module-Layer' : 'boot'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': forgeVersion 'Implementation-Version': forgeVersion
], 'net/minecraftforge/fml/loading/') ], 'net/minecraftforge/fml/loading/')
} }
} }
@@ -167,11 +168,11 @@ tasks.register('jarJarOptionsJson', JarJarMetadataOptions) {
tasks.named('generateResources') { tasks.named('generateResources') {
dependsOn( dependsOn(
tasks.named('eclipseJdt'), tasks.named('eclipseJdt'),
tasks.named('eclipseJdtApt'), tasks.named('eclipseJdtApt'),
tasks.named('eclipseFactorypath'), tasks.named('eclipseFactorypath'),
tasks.named('writeForgeVersionJson', WriteForgeVersionJson), tasks.named('writeForgeVersionJson', WriteForgeVersionJson),
tasks.named('jarJarOptionsJson') tasks.named('jarJarOptionsJson')
) )
} }
@@ -49,7 +49,7 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
private static final class LazyInit { private static final class LazyInit {
private LazyInit() {} private LazyInit() {}
private static final boolean ANY_MODS = LoadingModList.get().getMods().size() > 2; // 2: forge, minecraft private static final boolean ANY_MODS = LoadingModList.getMods().size() > 2; // 2: forge, minecraft
} }
@Override @Override
@@ -30,13 +30,11 @@ import java.util.function.BiFunction;
import static net.minecraftforge.fml.loading.LogMarkers.CORE; import static net.minecraftforge.fml.loading.LogMarkers.CORE;
import static net.minecraftforge.fml.loading.LogMarkers.SCAN; import static net.minecraftforge.fml.loading.LogMarkers.SCAN;
public class FMLLoader { public final class FMLLoader {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static AccessTransformerService accessTransformer; private static AccessTransformerService accessTransformer;
private static LanguageLoadingProvider languageLoadingProvider;
private static Dist dist; private static Dist dist;
private static String naming; private static String naming;
private static LoadingModList loadingModList;
private static RuntimeDistCleaner runtimeDistCleaner; private static RuntimeDistCleaner runtimeDistCleaner;
private static Path gamePath; private static Path gamePath;
private static final VersionInfo versionInfo = VersionInfo.detect(); private static final VersionInfo versionInfo = VersionInfo.detect();
@@ -151,16 +149,11 @@ public class FMLLoader {
public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) { public static List<ITransformationService.Resource> completeScan(IModuleLayerManager layerManager) {
moduleLayerManager = layerManager; moduleLayerManager = layerManager;
languageLoadingProvider = new LanguageLoadingProvider(); LanguageLoadingProvider.reload();
backgroundScanHandler = modValidator.stage2Validation(); backgroundScanHandler = modValidator.stage2Validation();
loadingModList = backgroundScanHandler.getLoadingModList();
return List.of(modValidator.getModResources()); return List.of(modValidator.getModResources());
} }
public static LanguageLoadingProvider getLanguageLoadingProvider() {
return languageLoadingProvider;
}
public static CommonLaunchHandler getLaunchHandler() { public static CommonLaunchHandler getLaunchHandler() {
return commonLaunchHandler; return commonLaunchHandler;
} }
@@ -180,10 +173,6 @@ public class FMLLoader {
progressWindowTick.run(); progressWindowTick.run();
} }
public static LoadingModList getLoadingModList() {
return loadingModList;
}
public static Path getGamePath() { public static Path getGamePath() {
return gamePath; return gamePath;
} }
@@ -51,8 +51,8 @@ public class ImmediateWindowHandler {
earlyProgress.label("Bootstrapping Minecraft"); earlyProgress.label("Bootstrapping Minecraft");
} }
public static long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) { public static long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
return provider.setupMinecraftWindow(width, height, title, monitor); return provider.setupMinecraftWindow(width, height, title, monitor, backend);
} }
public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) { public static boolean positionWindow(Optional<Object> monitor,IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) {
@@ -104,9 +104,9 @@ public class ImmediateWindowHandler {
} }
@Override @Override
public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor) { public long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend) {
try { try {
var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor); var longsupplier = (LongSupplier)NV_HANDOFF.invoke(null, width, height, title, monitor, backend);
return longsupplier.getAsLong(); return longsupplier.getAsLong();
} catch (Throwable e) { } catch (Throwable e) {
throw new IllegalStateException("How did you get here?", e); throw new IllegalStateException("How did you get here?", e);
@@ -8,8 +8,6 @@ package net.minecraftforge.fml.loading;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.IntConsumer; import java.util.function.IntConsumer;
import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@@ -66,7 +64,7 @@ public interface ImmediateWindowProvider {
* @param monitor This is the monitor it should appear on. * @param monitor This is the monitor it should appear on.
* @return The window id * @return The window id
*/ */
long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitor); long setupMinecraftWindow(final int width, final int height, final String title, final long monitor, final Supplier<Object> backend);
/** /**
* This is called after window handoff to allow us to tell Mojang about our window's position. This might give a * This is called after window handoff to allow us to tell Mojang about our window's position. This might give a
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.ServiceConfigurationError; import java.util.ServiceConfigurationError;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -28,43 +27,36 @@ import java.util.stream.Stream;
import static net.minecraftforge.fml.loading.LogMarkers.CORE; import static net.minecraftforge.fml.loading.LogMarkers.CORE;
import static net.minecraftforge.fml.loading.LogMarkers.LOADING; import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
public class LanguageLoadingProvider { public final class LanguageLoadingProvider {
public void forEach(Consumer<IModLanguageProvider> consumer) { public static void forEach(Consumer<IModLanguageProvider> consumer) {
providers.forEach(consumer); providers.forEach(consumer);
} }
public <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) { public static <T> Stream<T> applyForEach(Function<IModLanguageProvider, T> function) {
return providers.stream().map(function); return providers.stream().map(function);
} }
public void reload() { public static void reload() {
loadLanguageProviders(); loadLanguageProviders();
} }
/** This doesn't actually do anything with the argument, so just call reload(). Not sure when cpw broke that. */
@Deprecated(forRemoval = true, since = "1.20.2")
public void addAdditionalLanguages(List<ModFile> modFiles) {
reload();
}
/*==========================================================================* /*==========================================================================*
* INTERNAL SHIT * * INTERNAL *
*==========================================================================*/ *==========================================================================*/
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private final ServiceLoader<IModLanguageProvider> serviceLoader; private static final ServiceLoader<IModLanguageProvider> serviceLoader;
private final List<IModLanguageProvider> providers = new ArrayList<>(); private static final ArrayList<IModLanguageProvider> providers = new ArrayList<>();
private final Map<String, Wrapper> providersByName = new HashMap<>(); private static final HashMap<String, Wrapper> providersByName = new HashMap<>();
private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev"); private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev");
private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {} private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {}
LanguageLoadingProvider() { static {
var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow(); var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow();
serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class); serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class);
loadLanguageProviders();
} }
private void loadLanguageProviders() { private static void loadLanguageProviders() {
providers.clear(); providers.clear();
providersByName.clear(); providersByName.clear();
@@ -97,7 +89,7 @@ public class LanguageLoadingProvider {
} }
} }
public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) { public static IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) {
var consumer = mod.getFileName(); var consumer = mod.getFileName();
var wrapper = providersByName.get(language); var wrapper = providersByName.get(language);
@@ -5,118 +5,46 @@
package net.minecraftforge.fml.loading; package net.minecraftforge.fml.loading;
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo; import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import org.jetbrains.annotations.Nullable;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger; /// Master list of all mods in the loading context
public sealed interface LoadingModList permits LoadingModListImpl {
import com.mojang.logging.LogUtils; static ModFileInfo getModFileById(String modId) {
return get().fileById().get(modId);
/**
* Master list of all mods <em>in the loading context. This class cannot refer outside the
* loading package</em>
*/
public class LoadingModList {
private static final Logger LOGGER = LogUtils.getLogger();
private static LoadingModList INSTANCE;
private final List<ModFileInfo> modFiles;
private final List<ModInfo> sortedList;
private final Map<String, ModFileInfo> fileById;
private final List<EarlyLoadingException> preLoadErrors;
private List<IModFile> brokenFiles;
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
this.modFiles = modFiles.stream()
.map(ModFile::getModFileInfo)
.map(ModFileInfo.class::cast)
.toList();
this.sortedList = sortedList.stream().toList();
this.fileById = this.modFiles.stream()
.map(ModFileInfo::getMods)
.flatMap(Collection::stream)
.map(ModInfo.class::cast)
.collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
this.preLoadErrors = new ArrayList<>();
} }
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) { static List<ModFileInfo> getModFiles() {
INSTANCE = new LoadingModList(modFiles, sortedList); return get().getModFiles();
if (earlyLoadingException != null)
INSTANCE.preLoadErrors.add(earlyLoadingException);
return INSTANCE;
} }
public static LoadingModList get() { static List<ModInfo> getMods() {
return INSTANCE; return get().getMods();
} }
public void addAccessTransformers() { static @Nullable Path findResource(String className) {
var errors = new ArrayList<ExceptionData>(); for (ModFileInfo modFileInfo : get().getModFiles()) {
Path resource = modFileInfo.getFile().findResource(className);
for (ModFileInfo modFile : modFiles) {
ModFile mod = modFile.getFile();
for (var at : mod.getAccessTransformers()) {
if (!Files.exists(at)) {
var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
errors.add(new ExceptionData(message));
LOGGER.error(message);
} else
FMLLoader.addAccessTransformer(at, mod);
}
}
if (!errors.isEmpty())
preLoadErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
}
public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
backgroundScanHandler.setLoadingModList(this);
modFiles.stream()
.map(ModFileInfo::getFile)
.forEach(backgroundScanHandler::submitForScanning);
}
public List<ModFileInfo> getModFiles() {
return modFiles;
}
public Path findResource(final String className) {
for (ModFileInfo mf : modFiles) {
final Path resource = mf.getFile().findResource(className);
if (Files.exists(resource)) return resource; if (Files.exists(resource)) return resource;
} }
return null; return null;
} }
public ModFileInfo getModFileById(String modid) { static List<EarlyLoadingException> getErrors() {
return this.fileById.get(modid); return get().getErrors();
} }
public List<ModInfo> getMods() { static List<IModFile> getBrokenFiles() {
return this.sortedList; return get().getBrokenFiles();
} }
public List<EarlyLoadingException> getErrors() { private static LoadingModListImpl get() {
return preLoadErrors; return LoadingModListImpl.get();
}
public void setBrokenFiles(final List<IModFile> brokenFiles) {
this.brokenFiles = brokenFiles;
}
public List<IModFile> getBrokenFiles() {
return this.brokenFiles;
} }
} }
@@ -0,0 +1,90 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.fml.loading;
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import com.mojang.logging.LogUtils;
/**
* Master list of all mods <em>in the loading context. This class cannot refer outside the
* loading package</em>
*/
record LoadingModListImpl(
List<ModFileInfo> getModFiles,
List<ModInfo> getMods,
Map<String, ModFileInfo> fileById,
ArrayList<EarlyLoadingException> getErrors,
ArrayList<IModFile> getBrokenFiles
) implements LoadingModList {
private static final Logger LOGGER = LogUtils.getLogger();
private static ModSorter.State temp;
LoadingModListImpl(List<ModFile> modFiles, List<ModInfo> sortedList) {
var modFileInfos = modFiles.stream()
.map(ModFile::getModFileInfo)
.map(ModFileInfo.class::cast)
.toList();
sortedList = sortedList.stream().toList();
var fileById = modFileInfos.stream()
.map(ModFileInfo::getMods)
.flatMap(Collection::stream)
.map(ModInfo.class::cast)
.collect(Collectors.toUnmodifiableMap(ModInfo::getModId, ModInfo::getOwningFile));
this(modFileInfos, sortedList, fileById, new ArrayList<>(), new ArrayList<>());
}
static LoadingModListImpl init(ModSorter.State modSorterState, EarlyLoadingException earlyLoadingException) {
temp = modSorterState;
var instance = get();
if (earlyLoadingException != null)
instance.getErrors.add(earlyLoadingException);
temp = null;
instance.addAccessTransformers();
return instance;
}
static LoadingModListImpl get() {
final class LazyInit {
private LazyInit() {}
private static final LoadingModListImpl INSTANCE
= new LoadingModListImpl(LoadingModListImpl.temp.files(), LoadingModListImpl.temp.mods());
}
return LazyInit.INSTANCE;
}
private void addAccessTransformers() {
var errors = new ArrayList<ExceptionData>();
for (ModFileInfo modFile : getModFiles) {
ModFile mod = modFile.getFile();
for (var at : mod.getAccessTransformers()) {
if (!Files.exists(at)) {
var message = "Invalid mod file: " + modFile.getFile().getFileName() + ". Missing Access Transformer: " + at;
errors.add(new ExceptionData(message));
LOGGER.error(message);
} else
FMLLoader.addAccessTransformer(at, mod);
}
}
if (!errors.isEmpty())
getErrors.add(new EarlyLoadingException("Invalid Access Transformers", null, errors));
}
}
@@ -33,10 +33,10 @@ import java.util.stream.Stream;
import static net.minecraftforge.fml.loading.LogMarkers.LOADING; import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
public class ModSorter { public final class ModSorter {
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private record State(List<ModFile> files, List<ModInfo> mods) {} record State(List<ModFile> files, List<ModInfo> mods) {}
private ModSorter() {} private ModSorter() {}
@@ -52,7 +52,7 @@ public class ModSorter {
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase // Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
// So all this is really doing is wasting time. // So all this is really doing is wasting time.
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck. // But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
return LoadingModList.of(systemMods.files(), systemMods.mods(), e); return LoadingModListImpl.init(systemMods, e);
} }
var named = new HashMap<String, ModInfo>(); var named = new HashMap<String, ModInfo>();
@@ -66,15 +66,15 @@ public class ModSorter {
// if we miss one or the other, we abort now // if we miss one or the other, we abort now
if (!failedList.isEmpty()) { if (!failedList.isEmpty()) {
return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList)); return LoadingModListImpl.init(systemMods, new EarlyLoadingException("failure to validate mod list", null, failedList));
} else { } else {
// Otherwise, lets try and sort the modlist and proceed // Otherwise, lets try and sort the modlist and proceed
try { try {
var sorted = sort(modFiles, named); var sorted = sort(modFiles, named);
return LoadingModList.of(sorted.files(), sorted.mods(), null); return LoadingModListImpl.init(sorted, null);
} catch (EarlyLoadingException e) { } catch (EarlyLoadingException e) {
// The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen. // 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 LoadingModListImpl.init(systemMods, e);
} }
} }
} }
@@ -33,7 +33,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
private static String DIST; private static String DIST;
private static final String ONLYIN = Type.getDescriptor(OnlyIn.class); private static final String ONLYIN = Type.getDescriptor(OnlyIn.class);
private static final String ONLYINS = Type.getDescriptor(OnlyIns.class); private static final String ONLYINS = Type.getDescriptor(OnlyIns.class);
private static final String MOD = "Lnet/minecraftforge/fml/common/Mod;";
@Override @Override
public String name() { public String name() {
@@ -45,11 +44,17 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
@Override @Override
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) { public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
// TODO: [FML][RuntimeDistCleaner] In 26.1, only return YAY for MC classes on mod dev server
if (isEmpty) if (isEmpty)
return NAY; return NAY;
String internalName = classType.getInternalName(); String internalName = classType.getInternalName();
// Only apply to MC classes when on a dedicated server in a production environment
if (FMLEnvironment.production)
return FMLEnvironment.dist.isDedicatedServer() && isMinecraftClass(internalName) ? YAY : NAY;
// For dev time it's a bit trickier so that we can throw exceptions when someone uses @OnlyIn in their mod code,
// so that it's more obvious that the behaviour they're expecting won't work in production anymore
if (internalName.startsWith("net/minecraftforge/")) if (internalName.startsWith("net/minecraftforge/"))
return NAY; return NAY;
@@ -57,7 +62,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
if (FMLEnvironment.dist.isClient() && isMinecraftClass(internalName)) if (FMLEnvironment.dist.isClient() && isMinecraftClass(internalName))
return NAY; return NAY;
return YAY; return YAY; // mod classes might have @OnlyIn, so parse them in dev to find out and throw if they do
} }
@Override @Override
@@ -66,29 +71,14 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
var annotations = unpack(classNode.visibleAnnotations); var annotations = unpack(classNode.visibleAnnotations);
var isNonMinecraftClass = !isMinecraftClass(classNode.name); var isNonMinecraftClass = !isMinecraftClass(classNode.name);
final class LazyInit {
private LazyInit() {}
private static final boolean CAN_EXPLODE = !FMLEnvironment.production && "21.6".equals(FMLLoader.versionInfo().mcVersion());
}
if (remove(annotations, DIST)) { if (remove(annotations, DIST)) {
LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST); LOGGER.error(DISTXFORM, "Attempted to load class {} for invalid dist {}", classNode.name, DIST);
throw new RuntimeException("Attempted to load class " + classNode.name + " for invalid dist " + DIST); throw new RuntimeException("Attempted to load class " + classNode.name + " for invalid dist " + DIST);
} }
if (!annotations.isEmpty()) { if (isNonMinecraftClass && !annotations.isEmpty())
if (isNonMinecraftClass) { throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
if (LazyInit.CAN_EXPLODE)
throw new UnsupportedOperationException("Mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
else
LOGGER.warn(DISTXFORM, "Class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", classNode.name);
}
if (!FMLEnvironment.production && hasModAnnotation(classNode.visibleAnnotations)) {
LOGGER.error(DISTXFORM, "Attempted to load class {} with @Mod and @OnlyIn/@OnlyIns annotations", classNode.name);
throw new RuntimeException("Found @OnlyIn on @Mod class " + classNode.name + " - this is not allowed as it causes crashes. Remove the OnlyIn and consider setting clientSideOnly=true in the root of your mods.toml instead");
}
}
if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) { if (classNode.interfaces != null && !classNode.interfaces.isEmpty()) {
for (var ann : annotations) { for (var ann : annotations) {
@@ -121,12 +111,8 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
itr.remove(); itr.remove();
changed = true; changed = true;
if (isNonMinecraftClass) { if (isNonMinecraftClass)
if (LazyInit.CAN_EXPLODE) throw new UnsupportedOperationException("Field " + field.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
throw new UnsupportedOperationException("Field " + field.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
else
LOGGER.warn(DISTXFORM, "Field {} in class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", field.name, classNode.name);
}
} }
} }
@@ -139,12 +125,8 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
lambdaGatherer.accept(method); lambdaGatherer.accept(method);
changed = true; changed = true;
if (isNonMinecraftClass) { if (isNonMinecraftClass)
if (LazyInit.CAN_EXPLODE) throw new UnsupportedOperationException("Method " + method.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
throw new UnsupportedOperationException("Method " + method.name + " in mod class " + classNode.name + " is annotated with @OnlyIn, this is no longer supported as it slowed down startup times");
else
LOGGER.warn(DISTXFORM, "Method {} in class {} is annotated with @OnlyIn, this is deprecated and won't work in a future MC release.", method.name, classNode.name);
}
} }
} }
@@ -225,18 +207,6 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
return false; return false;
} }
private static boolean hasModAnnotation(final List<AnnotationNode> anns) {
if (anns == null || anns.isEmpty())
return false;
for (var ann : anns) {
if (ann.desc.equals(MOD))
return true;
}
return false;
}
private static boolean isMinecraftClass(final String internalName) { private static boolean isMinecraftClass(final String internalName) {
return internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"); return internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/");
} }
@@ -250,7 +220,7 @@ public final class RuntimeDistCleaner implements ILaunchPluginService {
}; };
} }
private static class LambdaGatherer extends MethodVisitor { private static final class LambdaGatherer extends MethodVisitor {
private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC, private static final Handle META_FACTORY = new Handle(Opcodes.H_INVOKESTATIC,
"java/lang/invoke/LambdaMetafactory", "metafactory", "java/lang/invoke/LambdaMetafactory", "metafactory",
"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;",
@@ -12,6 +12,7 @@ import java.util.Map;
import org.apache.commons.lang3.text.StrLookup; import org.apache.commons.lang3.text.StrLookup;
import org.apache.commons.lang3.text.StrSubstitutor; import org.apache.commons.lang3.text.StrSubstitutor;
// TODO: [FML] Remove this
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class StringSubstitutor { public class StringSubstitutor {
private static final Map<String, String> GLOBALS = Map.of( private static final Map<String, String> GLOBALS = Map.of(
@@ -115,19 +115,22 @@ public final class UniqueModListBuilder {
} }
private static ArtifactVersion getVersion(final ModFile mf) { private static ArtifactVersion getVersion(final ModFile mf) {
if (mf.getModFileInfo() == null || mf.getModInfos() == null || mf.getModInfos().isEmpty()) { List<IModInfo> modInfos;
if (mf.getModFileInfo() == null || (modInfos = mf.getModInfos()) == null || modInfos.isEmpty()) {
return mf.getJarVersion(); return mf.getJarVersion();
} }
return mf.getModInfos().getFirst().getVersion(); return modInfos.getFirst().getVersion();
} }
private static String getModId(ModFile modFile) { private static String getModId(ModFile modFile) {
if (modFile.getModFileInfo() == null || modFile.getModFileInfo().getMods().isEmpty()) { var modFileInfo = modFile.getModFileInfo();
List<IModInfo> mods;
if (modFileInfo == null || (mods = modFileInfo.getMods()).isEmpty()) {
return modFile.getSecureJar().name(); return modFile.getSecureJar().name();
} }
return modFile.getModFileInfo().getMods().getFirst().getModId(); return mods.getFirst().getModId();
} }
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {} public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
@@ -32,15 +32,6 @@ public class VersionSupportMatrix {
} }
} }
/**
* @deprecated Use {@link #testVersionSupportMatrix(VersionRange, String, String)} instead, unwrapping your BiPredicate.
*/
@Deprecated(forRemoval = true, since = "1.21.1")
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate<String, VersionRange> standardLookup) {
if (standardLookup.test(lookupId, declaredRange)) return true;
return testVersionSupportMatrix(declaredRange, lookupId, type);
}
public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) { public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type) {
if (OVERRIDE_VERSIONS.isEmpty()) return false; if (OVERRIDE_VERSIONS.isEmpty()) return false;
List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId); List<ArtifactVersion> custom = OVERRIDE_VERSIONS.get(type + "." + lookupId);
@@ -17,8 +17,7 @@ import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.concurrent.*; import java.util.concurrent.*;
public class BackgroundScanHandler public final class BackgroundScanHandler {
{
private enum ScanStatus { private enum ScanStatus {
NOT_STARTED, NOT_STARTED,
RUNNING, RUNNING,
@@ -33,7 +32,6 @@ public class BackgroundScanHandler
private final ExecutorService modContentScanner; private final ExecutorService modContentScanner;
private final List<ModFile> modFiles; private final List<ModFile> modFiles;
private ScanStatus status; private ScanStatus status;
private LoadingModList loadingModList;
public BackgroundScanHandler(final List<ModFile> modFiles) { public BackgroundScanHandler(final List<ModFile> modFiles) {
this.modFiles = modFiles; this.modFiles = modFiles;
@@ -69,16 +67,6 @@ public class BackgroundScanHandler
} }
} }
public void setLoadingModList(LoadingModList loadingModList)
{
this.loadingModList = loadingModList;
}
public LoadingModList getLoadingModList()
{
return loadingModList;
}
public void waitForScanToComplete(final Runnable ticker) { public void waitForScanToComplete(final Runnable ticker) {
boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null; boolean timeoutActive = System.getProperty("fml.disableScanTimeout") == null;
Instant deadline = Instant.now().plus(Duration.ofMinutes(10)); Instant deadline = Instant.now().plus(Duration.ofMinutes(10));
@@ -45,7 +45,7 @@ public final class ClasspathLocator extends AbstractModProvider implements IModL
// Find 'minecraft' during dev time this is also Forge. So skip it. // Find 'minecraft' during dev time this is also Forge. So skip it.
// Can return null for dedicated server as Minecraft isn't on the classpath // Can return null for dedicated server as Minecraft isn't on the classpath
// On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it. // On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it.
var minecraft = getPathFromResource(cl, "net/minecraft/obfuscate/DontObfuscate.class"); var minecraft = getPathFromResource(cl, "net/minecraft/world/item/Item.class");
var claimed = new HashSet<Path>(); var claimed = new HashSet<Path>();
var tomls = getUrls(cl, MODS_TOML); var tomls = getUrls(cl, MODS_TOML);
@@ -41,9 +41,10 @@ public final class ModDiscoverer {
@SuppressWarnings("removal") @SuppressWarnings("removal")
public static ModValidator discoverMods(Map<String, ?> arguments) { public static ModValidator discoverMods(Map<String, ?> arguments) {
Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), v->ModsFolderLocator::new); var env = Launcher.INSTANCE.environment();
Launcher.INSTANCE.environment().computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), v-> StartupNotificationManager.locatorConsumer().orElseGet(()-> s->{})); env.computePropertyIfAbsent(Environment.Keys.MODDIRECTORYFACTORY.get(), _ -> ModsFolderLocator::new);
final var moduleLayerManager = Launcher.INSTANCE.environment().findModuleLayerManager().orElseThrow(); env.computePropertyIfAbsent(Environment.Keys.PROGRESSMESSAGE.get(), _ -> StartupNotificationManager.locatorConsumer().orElse(_ -> {}));
final var moduleLayerManager = env.findModuleLayerManager().orElseThrow();
ServiceLoader<IModLocator> modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class); ServiceLoader<IModLocator> modLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IModLocator.class);
ServiceLoader<IDependencyLocator> dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class); ServiceLoader<IDependencyLocator> dependencyLocators = ServiceLoader.load(moduleLayerManager.getLayer(IModuleLayerManager.Layer.SERVICE).orElseThrow(), IDependencyLocator.class);
List<IModLocator> modLocatorList = ServiceLoaderUtils.streamWithErrorHandling(modLocators, sce -> LOGGER.error("Failed to load mod locator list", sce)).toList(); List<IModLocator> modLocatorList = ServiceLoaderUtils.streamWithErrorHandling(modLocators, sce -> LOGGER.error("Failed to load mod locator list", sce)).toList();
@@ -9,6 +9,7 @@ import com.google.common.collect.ImmutableMap;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import cpw.mods.jarhandling.SecureJar; import cpw.mods.jarhandling.SecureJar;
import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.loading.LanguageLoadingProvider;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
@@ -48,8 +49,7 @@ public class ModFile implements IModFile {
private final IModFileInfo modFileInfo; private final IModFileInfo modFileInfo;
private ModFileScanData fileModFileScanData; private ModFileScanData fileModFileScanData;
private CompletableFuture<ModFileScanData> futureScanResult; private CompletableFuture<ModFileScanData> futureScanResult;
private Path accessTransformer; private List<Path> accessTransformers = List.of();
private List<Path> accessTransformers = Collections.emptyList();
static final Attributes.Name TYPE = new Attributes.Name("FMLModType"); static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
private SecureJar.Status securityStatus; private SecureJar.Status securityStatus;
@@ -92,11 +92,6 @@ public class ModFile implements IModFile {
return modFileInfo.getMods(); return modFileInfo.getMods();
} }
@Deprecated(forRemoval = true, since = "1.21.11")
public Optional<Path> getAccessTransformer() {
return Optional.ofNullable(accessTransformer);
}
public List<Path> getAccessTransformers() { public List<Path> getAccessTransformers() {
return this.accessTransformers; return this.accessTransformers;
} }
@@ -111,7 +106,6 @@ public class ModFile implements IModFile {
if (cfg == null) { if (cfg == null) {
var path = findResource("META-INF", "accesstransformer.cfg"); var path = findResource("META-INF", "accesstransformer.cfg");
if (Files.exists(path)) { if (Files.exists(path)) {
this.accessTransformer = path;
this.accessTransformers = List.of(path); this.accessTransformers = List.of(path);
} }
} else if (!cfg.isEmpty()) { } else if (!cfg.isEmpty()) {
@@ -181,9 +175,8 @@ public class ModFile implements IModFile {
public void identifyLanguage() { public void identifyLanguage() {
var lst = new ArrayList<IModLanguageProvider>(this.modFileInfo.requiredLanguageLoaders().size()); var lst = new ArrayList<IModLanguageProvider>(this.modFileInfo.requiredLanguageLoaders().size());
var services = FMLLoader.getLanguageLoadingProvider();
for (var spec : this.modFileInfo.requiredLanguageLoaders()) { for (var spec : this.modFileInfo.requiredLanguageLoaders()) {
var service = services.findLanguage(this, spec.languageName(), spec.acceptedVersions()); var service = LanguageLoadingProvider.findLanguage(this, spec.languageName(), spec.acceptedVersions());
lst.add(service); lst.add(service);
} }
this.loaders = List.copyOf(lst); this.loaders = List.copyOf(lst);
@@ -31,7 +31,6 @@ public class ModValidator {
private final List<ModFile> candidatePlugins; private final List<ModFile> candidatePlugins;
private final List<ModFile> candidateMods; private final List<ModFile> candidateMods;
private final List<ModFile> gameLibraries; private final List<ModFile> gameLibraries;
private LoadingModList loadingModList;
private final List<IModFile> brokenFiles = new ArrayList<>(); private final List<IModFile> brokenFiles = new ArrayList<>();
private final List<EarlyLoadingException.ExceptionData> discoveryErrorData; private final List<EarlyLoadingException.ExceptionData> discoveryErrorData;
@@ -87,7 +86,7 @@ public class ModValidator {
// If any detectable error happens during the sorting process {missing deps, duplicates, // If any detectable error happens during the sorting process {missing deps, duplicates,
// This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display. // This helps prevent coremods/mixins from screwing up us displaying the error screens that the sorting/validation is trying to display.
// This won't fix them all as they are still loaded and will still apply but it might help // This won't fix them all as they are still loaded and will still apply but it might help
for (var info : this.loadingModList.getModFiles()) for (var info : LoadingModList.getModFiles())
mods.add(info.getFile().getSecureJar()); mods.add(info.getFile().getSecureJar());
// Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing // Add any game libraries, this *may* be duplicates, depending on the state of the sorting. But until I get around to re-writing
@@ -124,11 +123,12 @@ public class ModValidator {
var allErrors = new ArrayList<>(errors); var allErrors = new ArrayList<>(errors);
allErrors.addAll(this.discoveryErrorData); allErrors.addAll(this.discoveryErrorData);
loadingModList = ModSorter.sort(candidateMods, allErrors); ModSorter.sort(candidateMods, allErrors);
loadingModList.addAccessTransformers(); LoadingModList.getBrokenFiles().addAll(brokenFiles);
loadingModList.setBrokenFiles(brokenFiles); var backgroundScanHandler = new BackgroundScanHandler(candidateMods);
BackgroundScanHandler backgroundScanHandler = new BackgroundScanHandler(candidateMods); LoadingModList.getModFiles().stream()
loadingModList.addForScanning(backgroundScanHandler); .map(ModFileInfo::getFile)
.forEach(backgroundScanHandler::submitForScanning);
return backgroundScanHandler; return backgroundScanHandler;
} }
} }
@@ -25,7 +25,9 @@ sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler {
@Override @Override
public List<Path> getMinecraftPaths() { public List<Path> getMinecraftPaths() {
return List.of(getPathFromResource("net/minecraft/client/Minecraft.class")); // We use a marker because 3rd party launcher don't build their class paths correctly
// https://github.com/MinecraftForge/MinecraftForge/issues/10797
return List.of(getPathFromResource(".forge_patched_minecraft"));
} }
} }
+8 -8
View File
@@ -40,16 +40,16 @@ dependencies {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.forge.transformers', 'Automatic-Module-Name': 'net.minecraftforge.forge.transformers',
'Forge-Module-Layer' : 'boot' 'Forge-Module-Layer' : 'boot'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': forgeVersion 'Implementation-Version': forgeVersion
], 'net/minecraftforge/forge/transformers/') ], 'net/minecraftforge/forge/transformers/')
} }
} }
@@ -42,10 +42,6 @@
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;" "finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
] ]
}, },
{
"class": "net/minecraft/world/entity/animal/frog/Tadpole",
"methods": []
},
{ {
"class": "net/minecraft/world/entity/monster/Strider", "class": "net/minecraft/world/entity/monster/Strider",
"methods": [ "methods": [
@@ -83,22 +79,12 @@
"finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;" "finalizeSpawn(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;"
] ]
}, },
{
"class": "net/minecraft/world/entity/monster/zombie/ZombieVillager",
"methods": []
},
{ {
"class": "net/minecraft/world/entity/npc/CatSpawner", "class": "net/minecraft/world/entity/npc/CatSpawner",
"methods": [ "methods": [
"spawnCat(Lnet/minecraft/core/BlockPos;Lnet/minecraft/server/level/ServerLevel;Z)V" "spawnCat(Lnet/minecraft/core/BlockPos;Lnet/minecraft/server/level/ServerLevel;Z)V"
] ]
}, },
{
"class": "net/minecraft/world/entity/npc/villager/Villager",
"methods": [
"getBreedOffspring(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/AgeableMob;)Lnet/minecraft/world/entity/npc/villager/Villager;"
]
},
{ {
"class": "net/minecraft/world/entity/raid/Raid", "class": "net/minecraft/world/entity/raid/Raid",
"methods": [ "methods": [
@@ -154,9 +140,5 @@
"methods": [ "methods": [
"handleDataMarker(Ljava/lang/String;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V" "handleDataMarker(Ljava/lang/String;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V"
] ]
},
{
"class": "net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate",
"methods": []
} }
] ]
+9 -9
View File
@@ -41,16 +41,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.javafmlmod', 'Automatic-Module-Name': 'net.minecraftforge.javafmlmod',
'FMLModType' : 'LANGPROVIDER' 'FMLModType' : 'LANGPROVIDER'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': forgeVersion 'Implementation-Version': forgeVersion
], 'net/minecraftforge/fml/javafmlmod/') ], 'net/minecraftforge/fml/javafmlmod/')
} }
} }
@@ -76,4 +76,4 @@ publishing {
} }
} }
} }
} }
@@ -6,7 +6,6 @@
package net.minecraftforge.fml.javafmlmod; package net.minecraftforge.fml.javafmlmod;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.eventbus.api.bus.CancellableEventBus; import net.minecraftforge.eventbus.api.bus.CancellableEventBus;
import net.minecraftforge.eventbus.api.bus.EventBus; import net.minecraftforge.eventbus.api.bus.EventBus;
@@ -52,7 +51,6 @@ public final class AutomaticEventSubscriber {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class); private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class);
private static final Type MOD_TYPE = Type.getType(Mod.class); private static final Type MOD_TYPE = Type.getType(Mod.class);
private static final Type ONLY_IN_TYPE = Type.getType(OnlyIn.class);
private static final List<EnumData> DEFAULT_SIDES = List.of(new EnumData(null, "CLIENT"), new EnumData(null, "DEDICATED_SERVER")); private static final List<EnumData> DEFAULT_SIDES = List.of(new EnumData(null, "CLIENT"), new EnumData(null, "DEDICATED_SERVER"));
private static final EnumData DEFAULT_BUS = new EnumData(null, "BOTH"); private static final EnumData DEFAULT_BUS = new EnumData(null, "BOTH");
@@ -64,20 +62,11 @@ public final class AutomaticEventSubscriber {
.filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType())) .filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType()))
.toList(); .toList();
var onlyIns = FMLEnvironment.production ? Collections.emptySet() : scanData.getAnnotations().stream()
.filter(data -> ONLY_IN_TYPE.equals(data.annotationType()))
.map(data -> data.clazz().getClassName())
.collect(Collectors.toSet());
var modids = scanData.getAnnotations().stream() var modids = scanData.getAnnotations().stream()
.filter(data -> MOD_TYPE.equals(data.annotationType())) .filter(data -> MOD_TYPE.equals(data.annotationType()))
.collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value"))); .collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value")));
for (var data : targets) { for (var data : targets) {
if (!FMLEnvironment.production && onlyIns.contains(data.clazz().getClassName())) {
throw new RuntimeException("Found @OnlyIn on @EventBusSubscriber class " + data.clazz().getClassName() + " - this is not allowed as it causes crashes. Remove the OnlyIn and set value=Dist.CLIENT in the EventBusSubscriber annotation instead");
}
var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId()); var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId());
modId = value(data, "modid", modId); modId = value(data, "modid", modId);
+8 -8
View File
@@ -39,16 +39,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.lowcodemod', 'Automatic-Module-Name': 'net.minecraftforge.lowcodemod',
'FMLModType' : 'LANGPROVIDER' 'FMLModType' : 'LANGPROVIDER'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1.0', 'Specification-Version' : '1.0',
'Implementation-Title' : project.name, 'Implementation-Title' : project.name,
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': forgeVersion.split('\\.')[0] 'Implementation-Version': forgeVersion.split('\\.')[0]
], 'net/minecraftforge/fml/lowcodemod/') ], 'net/minecraftforge/fml/lowcodemod/')
} }
} }
+8 -8
View File
@@ -39,16 +39,16 @@ tasks.withType(JavaCompile).configureEach {
tasks.named('jar', Jar) { tasks.named('jar', Jar) {
manifest { manifest {
attributes([ attributes([
'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider', 'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider',
'FMLModType' : 'LANGPROVIDER' 'FMLModType' : 'LANGPROVIDER'
]) ])
attributes([ attributes([
'Specification-Title' : gradleutils.displayName.get(), 'Specification-Title' : gradleutils.displayName.get(),
'Specification-Vendor' : vendor, 'Specification-Vendor' : vendor,
'Specification-Version' : '1', 'Specification-Version' : '1',
'Implementation-Title' : gradleutils.displayName.get(), 'Implementation-Title' : gradleutils.displayName.get(),
'Implementation-Vendor' : vendor, 'Implementation-Vendor' : vendor,
'Implementation-Version': '1.0' 'Implementation-Version': '1.0'
], 'net/minecraftforge/fml/mclanguageprovider/') ], 'net/minecraftforge/fml/mclanguageprovider/')
} }
} }
+3 -5
View File
@@ -6,21 +6,19 @@ plugins {
id 'java' id 'java'
id 'idea' id 'idea'
id 'eclipse' id 'eclipse'
id 'net.minecraftforge.gradle' version '[7.0.3,8)' id 'net.minecraftforge.gradle' version '[7.0.17,8)'
} }
version = '1.0.0' version = '1.0.0'
group = 'com.example.examplemod' group = 'com.example.examplemod'
// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21. // Mojang ships Java 25 to end users in 26.1+, so your mod should target Java 25.
java.toolchain.languageVersion = JavaLanguageVersion.of(21) java.toolchain.languageVersion = JavaLanguageVersion.of(25)
// Include generated resources // Include generated resources
sourceSets.main.resources { srcDir 'src/generated/resources' } sourceSets.main.resources { srcDir 'src/generated/resources' }
minecraft { minecraft {
mappings channel: 'official', version: '@MC_VERSION@'
runs { runs {
configureEach { configureEach {
workingDir = layout.projectDirectory.dir('run') workingDir = layout.projectDirectory.dir('run')
+5 -7
View File
@@ -1,8 +1,6 @@
[versions] [versions]
java = "21" java = "25"
minecraft = "1.21.11" minecraft = "26.1.2"
minecraft-next = "1.22" minecraft-next = "26.2"
mcp = "20251223.124241" mcp = "20260409.101008"
mappings-channel = "official" changelog-base = "64.0"
mappings-version = "1.21.11"
changelog-base = "61.0"
@@ -1,12 +1,12 @@
--- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java --- a/com/mojang/blaze3d/opengl/GlCommandEncoder.java
+++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java +++ b/com/mojang/blaze3d/opengl/GlCommandEncoder.java
@@ -133,6 +_,9 @@ @@ -111,6 +_,9 @@
GlStateManager._colorMask(true, true, true, true); GlStateManager._colorMask(15);
GlStateManager._clear(16384); GlStateManager._clear(16384);
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0); GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, 0, 0);
+ // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D) + // Forge: if using stencil, clear it as well (3553 = GlConst.GL_TEXTURE_2D)
+ if (p_394273_.isStencilEnabled()) + if (colorTexture.isStencilEnabled())
+ GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0); + GlStateManager._glFramebufferTexture2D(GlConst.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, GlConst.GL_TEXTURE_2D, 0, 0);
GlStateManager._glBindFramebuffer(36160, 0); GlStateManager._glBindFramebuffer(36160, 0);
}
} }
@@ -0,0 +1,35 @@
--- a/com/mojang/blaze3d/opengl/GlConst.java
+++ b/com/mojang/blaze3d/opengl/GlConst.java
@@ -249,6 +_,10 @@
}
public static int toGlInternalId(final TextureFormat textureFormat) {
+ return toGlInternalId(textureFormat, false);
+ }
+ public static int toGlInternalId(final TextureFormat textureFormat, final boolean stencil) {
+ if (stencil && textureFormat.hasDepthAspect()) return org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8;
return switch (textureFormat) {
case RGBA8 -> 32856;
case RED8 -> 33321;
@@ -258,6 +_,10 @@
}
public static int toGlExternalId(final TextureFormat textureFormat) {
+ return toGlExternalId(textureFormat, false);
+ }
+ public static int toGlExternalId(final TextureFormat textureFormat, final boolean stencil) {
+ if (stencil && textureFormat.hasDepthAspect()) return org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL;
return switch (textureFormat) {
case RGBA8 -> 6408;
case RED8 -> 6403;
@@ -267,6 +_,10 @@
}
public static int toGlType(final TextureFormat textureFormat) {
+ return toGlType(textureFormat, false);
+ }
+ public static int toGlType(final TextureFormat textureFormat, boolean stencil) {
+ if (stencil && textureFormat.hasDepthAspect()) return org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
return switch (textureFormat) {
case RGBA8 -> 5121;
case RED8 -> 5121;
@@ -1,6 +1,6 @@
--- a/com/mojang/blaze3d/opengl/GlDebug.java --- a/com/mojang/blaze3d/opengl/GlDebug.java
+++ b/com/mojang/blaze3d/opengl/GlDebug.java +++ b/com/mojang/blaze3d/opengl/GlDebug.java
@@ -24,6 +_,14 @@ @@ -22,6 +_,14 @@
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class GlDebug { public class GlDebug {
@@ -15,20 +15,30 @@
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final int CIRCULAR_LOG_SIZE = 10; private static final int CIRCULAR_LOG_SIZE = 10;
private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10); private final Queue<GlDebug.LogEntry> MESSAGE_BUFFER = EvictingQueue.create(10);
@@ -105,6 +_,8 @@ @@ -103,6 +_,8 @@
} }
LOGGER.info("OpenGL debug message: {}", gldebug$logentry); LOGGER.info("OpenGL debug message: {}", entry);
+ // TODO: [VEN] Trim the stack trace + // TODO: [VEN] Trim the stack trace
+ if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug")); + if (PRINT_STACKTRACE_ON_ERROR) LOGGER.info("Trace: ", new Throwable("GlDebug"));
} }
public List<String> getLastOpenGlDebugMessages() { public List<String> getLastOpenGlDebugMessages() {
@@ -120,6 +_,7 @@ @@ -126,7 +_,7 @@
} GlDebug debug = new GlDebug();
enabledExtensions.add("GL_KHR_debug");
GL11.glEnable(37600);
- if (debugSynchronousGlLogs) {
+ if (debugSynchronousGlLogs | PRINT_STACKTRACE_ON_ERROR) {
GL11.glEnable(33346);
}
@@ -140,7 +_,7 @@
} else if (caps.GL_ARB_debug_output && GlDevice.USE_GL_ARB_debug_output) {
GlDebug debug = new GlDebug();
enabledExtensions.add("GL_ARB_debug_output");
- if (debugSynchronousGlLogs) {
+ if (debugSynchronousGlLogs | PRINT_STACKTRACE_ON_ERROR) {
GL11.glEnable(33346);
}
public static @Nullable 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 {
@@ -1,74 +1,62 @@
--- a/com/mojang/blaze3d/opengl/GlDevice.java --- a/com/mojang/blaze3d/opengl/GlDevice.java
+++ b/com/mojang/blaze3d/opengl/GlDevice.java +++ b/com/mojang/blaze3d/opengl/GlDevice.java
@@ -124,8 +_,15 @@ @@ -129,7 +_,12 @@
int p_407582_, final int depthOrLayers,
int p_408928_ final int mipLevels
) { ) {
+ return createTexture(p_397830_, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, false); - return this.createTexture(this.debugLabels.exists() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels);
+ return this.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, false);
+ } + }
+ +
+ @Override + @Override
+ public GpuTexture createTexture( + public GpuTexture createTexture(final @Nullable Supplier<String> label, @GpuTexture.Usage final int usage, final TextureFormat format, final int width, final int height, final int depthOrLayers, final int mipLevels, final boolean stencil ) {
+ @Nullable Supplier<String> p_397830_, int p_394481_, TextureFormat p_394839_, int p_391831_, int p_395609_, int p_407582_, int p_408928_, boolean stencil + return this.createTexture(this.debugLabels.exists() && label != null ? label.get() : null, usage, format, width, height, depthOrLayers, mipLevels, stencil);
+ ) {
return this.createTexture(
- this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_
+ this.debugLabels.exists() && p_397830_ != null ? p_397830_.get() : null, p_394481_, p_394839_, p_391831_, p_395609_, p_407582_, p_408928_, stencil
);
} }
@@ -133,6 +_,15 @@ @Override
public GpuTexture createTexture( @@ -142,6 +_,11 @@
@Nullable String p_394142_, @GpuTexture.Usage int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_ final int depthOrLayers,
final int mipLevels
) { ) {
+ return createTexture(p_394142_, p_395535_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, false); + return this.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, false);
+ } + }
+ +
+ @Override + @Override
+ public GpuTexture createTexture( + public GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage final int usage, final TextureFormat format, final int width, final int height, final int depthOrLayers, final int mipLevels, boolean stencil) {
+ @Nullable String p_394142_, @GpuTexture.Usage int p_395535_, TextureFormat p_394951_, int p_393944_, int p_392329_, int p_408015_, int p_406483_, boolean stencil GlStateManager.clearGlErrors();
+ ) { int id = GlStateManager._genTexture();
+ // Forge: stencil rendering is only for depth if (label == null) {
+ stencil &= p_394951_.hasDepthAspect(); @@ -171,12 +_,12 @@
if (p_406483_ < 1) {
throw new IllegalArgumentException("mipLevels must be at least 1");
} else if (p_408015_ < 1) {
@@ -183,11 +_,14 @@
GlStateManager._texImage2D(
k,
l,
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 :
GlConst.toGlInternalId(p_394951_),
p_393944_ >> l,
p_392329_ >> l,
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
);
@@ -198,11 +_,14 @@
GlStateManager._texImage2D( GlStateManager._texImage2D(
j, cubeTarget,
i1, i,
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH32F_STENCIL8 : - GlConst.toGlInternalId(format),
GlConst.toGlInternalId(p_394951_), + GlConst.toGlInternalId(format, stencil),
p_393944_ >> i1, width >> i,
p_392329_ >> i1, height >> i,
0, 0,
+ stencil ? org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL : - GlConst.toGlExternalId(format),
GlConst.toGlExternalId(p_394951_), - GlConst.toGlType(format),
+ stencil ? org.lwjgl.opengl.GL30.GL_FLOAT_32_UNSIGNED_INT_24_8_REV : + GlConst.toGlExternalId(format, stencil),
GlConst.toGlType(p_394951_), + GlConst.toGlType(format, stencil),
null null
); );
@@ -215,7 +_,7 @@ }
} else if (j1 != 0) { @@ -184,7 +_,7 @@
throw new IllegalStateException("OpenGL error " + j1); } else {
} else { for (int i = 0; i < mipLevels; i++) {
- GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i); GlStateManager._texImage2D(
+ GlTexture gltexture = new GlTexture(p_395535_, p_394142_, p_394951_, p_393944_, p_392329_, p_408015_, p_406483_, i, stencil); - target, i, GlConst.toGlInternalId(format), width >> i, height >> i, 0, GlConst.toGlExternalId(format), GlConst.toGlType(format), null
this.debugLabels.applyLabel(gltexture); + target, i, GlConst.toGlInternalId(format, stencil), width >> i, height >> i, 0, GlConst.toGlExternalId(format, stencil), GlConst.toGlType(format, stencil), null
return gltexture; );
} }
}
@@ -195,7 +_,7 @@
} else if (error != 0) {
throw new IllegalStateException("OpenGL error " + error);
} else {
- GlTexture texture = new GlTexture(usage, label, format, width, height, depthOrLayers, mipLevels, id);
+ GlTexture texture = new GlTexture(usage, label, format, width, height, depthOrLayers, mipLevels, id, stencil);
this.debugLabels.applyLabel(texture);
return texture;
}
@@ -12,7 +12,7 @@
public static void _disableBlend() { public static void _disableBlend() {
RenderSystem.assertOnRenderThread(); RenderSystem.assertOnRenderThread();
BLEND.mode.disable(); BLEND.mode.disable();
@@ -371,9 +_,17 @@ @@ -380,9 +_,17 @@
} }
} }
@@ -20,13 +20,13 @@
+ public static float lastBrightnessX = 0.0f; + public static float lastBrightnessX = 0.0f;
+ public static float lastBrightnessY = 0.0f; + public static float lastBrightnessY = 0.0f;
+ +
public static void _texParameter(int p_393876_, int p_397998_, int p_396741_) { public static void _texParameter(final int target, final int name, final int value) {
RenderSystem.assertOnRenderThread(); RenderSystem.assertOnRenderThread();
GL11.glTexParameteri(p_393876_, p_397998_, p_396741_); GL11.glTexParameteri(target, name, value);
+ if (p_393876_ == GL13.GL_TEXTURE1) { + if (target == GL13.GL_TEXTURE1) {
+ lastBrightnessX = p_397998_; + lastBrightnessX = name;
+ lastBrightnessY = p_396741_; + lastBrightnessY = value;
+ } + }
} }
public static int _getTexLevelParameter(int p_393352_, int p_397204_, int p_396319_) { public static int _getTexLevelParameter(final int target, final int level, final int name) {
@@ -1,20 +1,20 @@
--- a/com/mojang/blaze3d/opengl/GlTexture.java --- a/com/mojang/blaze3d/opengl/GlTexture.java
+++ b/com/mojang/blaze3d/opengl/GlTexture.java +++ b/com/mojang/blaze3d/opengl/GlTexture.java
@@ -21,8 +_,13 @@ @@ -28,8 +_,13 @@
protected GlTexture( final int mipLevels,
@GpuTexture.Usage int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_ final int id
) { ) {
+ this(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_, p_408889_, false); + this(usage, label, format, width, height, depthOrLayers, mipLevels, id, false);
+ } + }
+ +
+ protected GlTexture(int p_394590_, String p_393950_, TextureFormat p_392837_, int p_391379_, int p_391947_, int p_396659_, int p_408255_, int p_408889_, boolean stencil) { + protected GlTexture(int usage, String label, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels, int id, boolean stencil) {
super(p_394590_, p_393950_, p_392837_, p_391379_, p_391947_, p_396659_, p_408255_); super(usage, label, format, width, height, depthOrLayers, mipLevels);
this.id = p_408889_; this.id = id;
+ this.stencilEnabled = stencil; + this.stencilEnabled = stencil;
} }
@Override @Override
@@ -89,5 +_,12 @@ @@ -96,5 +_,12 @@
if (this.closed && this.views == 0) { if (this.closed && this.views == 0) {
this.destroyImmediately(); this.destroyImmediately();
} }
@@ -1,15 +1,15 @@
--- 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
@@ -80,7 +_,7 @@ @@ -80,7 +_,7 @@
this.width = p_83951_; this.width = width;
this.height = p_83952_; this.height = height;
if (this.useDepth) { if (this.useDepth) {
- this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1); - this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, width, height, 1, 1);
+ this.depthTexture = gpudevice.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, p_83951_, p_83952_, 1, 1, this.stencilEnabled); + this.depthTexture = device.createTexture(() -> this.label + " / Depth", 15, TextureFormat.DEPTH32, width, height, 1, 1, this.stencilEnabled);
this.depthTextureView = gpudevice.createTextureView(this.depthTexture); this.depthTextureView = device.createTextureView(this.depthTexture);
} }
@@ -126,5 +_,26 @@ @@ -124,5 +_,26 @@
public @Nullable GpuTextureView getDepthTextureView() { public @Nullable GpuTextureView getDepthTextureView() {
return this.depthTextureView; return this.depthTextureView;
@@ -1,30 +1,31 @@
--- a/com/mojang/blaze3d/platform/Window.java --- a/com/mojang/blaze3d/platform/Window.java
+++ b/com/mojang/blaze3d/platform/Window.java +++ b/com/mojang/blaze3d/platform/Window.java
@@ -91,7 +_,8 @@ @@ -97,8 +_,9 @@
GLFW.glfwWindowHint(139267, 3); Monitor initialMonitor = this.screenManager.getMonitor(GLFW.glfwGetPrimaryMonitor());
GLFW.glfwWindowHint(139272, 204801); this.windowedWidth = this.width = allowedWindowMinSize(displayData.width());
GLFW.glfwWindowHint(139270, 1); this.windowedHeight = this.height = allowedWindowMinSize(displayData.height());
- this.handle = GLFW.glfwCreateWindow(this.width, this.height, p_85376_, this.fullscreen && monitor != null ? monitor.getMonitor() : 0L, 0L); - this.handle = this.createWindow(backend, this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.getMonitor() : 0L);
+ this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(()->this.width, ()->this.height, ()->p_85376_, ()->this.fullscreen && monitor != null ? monitor.getMonitor() : 0L); + this.handle = net.minecraftforge.fml.loading.ImmediateWindowHandler.setupMinecraftWindow(this.width, this.height, title, this.fullscreen && initialMonitor != null ? initialMonitor.getMonitor() : 0L, () -> backend);
+ if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(monitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) { this.backend = backend;
if (monitor != null) { + if (!net.minecraftforge.fml.loading.ImmediateWindowHandler.positionWindow(Optional.ofNullable(initialMonitor), w->this.width = this.windowedWidth = w, h->this.height = this.windowedHeight = h, x->this.x = this.windowedX = x, y->this.y = this.windowedY = y)) {
VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty()); if (initialMonitor != null) {
this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2; VideoMode mode = initialMonitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
@@ -103,6 +_,7 @@ this.windowedX = this.x = initialMonitor.getX() + mode.getWidth() / 2 - this.width / 2;
this.windowedX = this.x = aint1[0]; @@ -110,6 +_,7 @@
this.windowedY = this.y = aint[0]; this.windowedX = this.x = actualX[0];
this.windowedY = this.y = actualY[0];
} }
+ } + }
this.setMode(); this.setMode();
this.refreshFramebufferSize(); this.refreshFramebufferSize();
@@ -269,6 +_,9 @@ @@ -300,6 +_,9 @@
GLFW.glfwGetFramebufferSize(this.handle, aint, aint1); GLFW.glfwGetFramebufferSize(this.handle, outWidth, outHeight);
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1; this.framebufferWidth = outWidth[0] > 0 ? outWidth[0] : 1;
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1; this.framebufferHeight = outHeight[0] > 0 ? outHeight[0] : 1;
+ if (this.framebufferHeight == 0 || this.framebufferWidth == 0) { + if (this.framebufferHeight == 0 || this.framebufferWidth == 0) {
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h); + net.minecraftforge.fml.loading.ImmediateWindowHandler.updateFBSize(w -> this.framebufferWidth = w, h -> this.framebufferHeight = h);
+ } + }
} }
private void onResize(long p_85428_, int p_85429_, int p_85430_) { private void onResize(final long handle, final int newWidth, final int newHeight) {
@@ -1,22 +1,46 @@
--- a/com/mojang/blaze3d/systems/GpuDevice.java --- a/com/mojang/blaze3d/systems/GpuDevice.java
+++ b/com/mojang/blaze3d/systems/GpuDevice.java +++ b/com/mojang/blaze3d/systems/GpuDevice.java
@@ -36,9 +_,19 @@ @@ -61,6 +_,21 @@
int p_407070_ return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
); }
+ /** Forge: same as {@link #createTexture(Supplier, int, TextureFormat, int, int, int)} but with stencil support */ + /** Forge: same as {@link #createTexture(Supplier, int, TextureFormat, int, int, int)} but with stencil support */
+ default GpuTexture createTexture(@Nullable Supplier<String> p_394357_, int p_395623_, TextureFormat p_395807_, int p_395802_, int p_396157_, int p_408810_, int p_407070_, boolean stencil) { + public GpuTexture createTexture(
+ return this.createTexture(p_394357_, p_395623_, p_395807_, p_395802_, p_396157_, p_408810_, p_407070_); + final @Nullable Supplier<String> label,
+ @GpuTexture.Usage final int usage,
+ final TextureFormat format,
+ final int width,
+ final int height,
+ final int depthOrLayers,
+ final int mipLevels,
+ final boolean stencil
+ ) {
+ this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
+ return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, stencil);
+ } + }
+ +
GpuTexture createTexture( public GpuTexture createTexture(
@Nullable String p_391798_, @GpuTexture.Usage int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_ final @Nullable String label,
); @GpuTexture.Usage final int usage,
+ @@ -72,6 +_,21 @@
+ /** Forge: same as {@link #createTexture(String, int, TextureFormat, int, int, int)} but with stencil support */ ) {
+ default GpuTexture createTexture(@Nullable String p_391798_, int p_391800_, TextureFormat p_393333_, int p_395600_, int p_394065_, int p_408732_, int p_407125_, boolean stencil) { this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
+ return this.createTexture(p_391798_, p_391800_, p_393333_, p_395600_, p_394065_, p_408732_, p_407125_); return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
+ } + }
+
+ /** Forge: same as {@link #createTexture(Supplier, int, TextureFormat, int, int, int)} but with stencil support */
+ public GpuTexture createTexture(
+ final @Nullable String label,
+ @GpuTexture.Usage final int usage,
+ final TextureFormat format,
+ final int width,
+ final int height,
+ final int depthOrLayers,
+ final int mipLevels,
+ final boolean stencil
+ ) {
+ this.verifyTextureCreationArgs(usage, width, height, depthOrLayers, mipLevels);
+ return this.backend.createTexture(label, usage, format, width, height, depthOrLayers, mipLevels, stencil);
}
GpuTextureView createTextureView(GpuTexture p_409045_); private void verifyTextureCreationArgs(@GpuTexture.Usage final int usage, final int width, final int height, final int depthOrLayers, final int mipLevels) {
@@ -0,0 +1,22 @@
--- a/com/mojang/blaze3d/systems/GpuDeviceBackend.java
+++ b/com/mojang/blaze3d/systems/GpuDeviceBackend.java
@@ -30,9 +_,19 @@
@Nullable Supplier<String> label, @GpuTexture.Usage final int usage, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels
);
+ /** Forge: same as {@link #createTexture(Supplier<String>, int, TextureFormat, int, int, int)} but with stencil support */
+ default GpuTexture createTexture(@Nullable Supplier<String> label, @GpuTexture.Usage final int usage, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
+ }
+
GpuTexture createTexture(
@Nullable String label, @GpuTexture.Usage final int usage, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels
);
+
+ /** Forge: same as {@link #createTexture(String, int, TextureFormat, int, int, int)} but with stencil support */
+ default GpuTexture createTexture(@Nullable String label, @GpuTexture.Usage final int usage, TextureFormat format, int width, int height, int depthOrLayers, int mipLevels, boolean stencil) {
+ return createTexture(label, usage, format, width, height, depthOrLayers, mipLevels);
+ }
GpuTextureView createTextureView(GpuTexture texture);
@@ -1,9 +1,9 @@
--- a/com/mojang/blaze3d/textures/GpuTexture.java --- a/com/mojang/blaze3d/textures/GpuTexture.java
+++ b/com/mojang/blaze3d/textures/GpuTexture.java +++ b/com/mojang/blaze3d/textures/GpuTexture.java
@@ -10,7 +_,7 @@ @@ -8,7 +_,7 @@
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@DontObfuscate
-public abstract class GpuTexture implements AutoCloseable { -public abstract class GpuTexture implements AutoCloseable {
+public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture { +public abstract class GpuTexture implements AutoCloseable, net.minecraftforge.client.extensions.IForgeGpuTexture {
public static final int USAGE_COPY_DST = 1; public static final int USAGE_COPY_DST = 1;
@@ -1,6 +1,6 @@
--- 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
@@ -15,7 +_,7 @@ @@ -16,7 +_,7 @@
import org.joml.Vector3fc; import org.joml.Vector3fc;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@@ -1,11 +0,0 @@
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
@@ -14,7 +_,7 @@
import org.joml.Vector3fc;
@OnlyIn(Dist.CLIENT)
-public interface VertexConsumer {
+public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
@@ -1,36 +1,27 @@
--- 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
@@ -20,7 +_,7 @@
@OnlyIn(Dist.CLIENT)
@DontObfuscate
-public class VertexFormat {
+public class VertexFormat implements net.minecraftforge.client.extensions.IForgeVertexFormat {
public static final int UNKNOWN_ELEMENT = -1;
private final List<VertexFormatElement> elements;
private final List<String> names;
@@ -29,6 +_,7 @@ @@ -29,6 +_,7 @@
private final int[] offsetsByElement = new int[32]; private final int[] offsetsByElement = new int[32];
private @Nullable GpuBuffer immediateDrawVertexBuffer; private @Nullable GpuBuffer immediateDrawVertexBuffer;
private @Nullable GpuBuffer immediateDrawIndexBuffer; private @Nullable 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_) { private VertexFormat(final List<VertexFormatElement> elements, final List<String> names, final IntList offsets, final int vertexSize) {
this.elements = p_343616_; this.elements = elements;
@@ -41,6 +_,11 @@ @@ -41,6 +_,11 @@
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1; int index = element != null ? elements.indexOf(element) : -1;
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1; this.offsetsByElement[id] = index != -1 ? offsets.getInt(index) : -1;
} }
+ +
+ ImmutableMap.Builder<String, VertexFormatElement> elements = ImmutableMap.builder(); + ImmutableMap.Builder<String, VertexFormatElement> elementMapping = ImmutableMap.builder();
+ for (int i = 0; i < p_343616_.size(); i++) + for (int i = 0; i < elements.size(); i++)
+ elements.put(p_345241_.get(i), p_343616_.get(i)); + elementMapping.put(names.get(i), elements.get(i));
+ this.elementMapping = elements.buildOrThrow(); + this.elementMapping = elementMapping.buildOrThrow();
} }
public static VertexFormat.Builder builder() { public static VertexFormat.Builder builder() {
@@ -139,6 +_,9 @@ @@ -139,6 +_,9 @@
this.immediateDrawIndexBuffer = uploadToBuffer(this.immediateDrawIndexBuffer, p_391835_, 72, () -> "Immediate index buffer for " + this); this.immediateDrawIndexBuffer = uploadToBuffer(this.immediateDrawIndexBuffer, buffer, 72, () -> "Immediate index buffer for " + this);
return this.immediateDrawIndexBuffer; return this.immediateDrawIndexBuffer;
} }
+ +
@@ -38,4 +29,4 @@
+ public int getOffset(int index) { return offsetsByElement[index]; } + public int getOffset(int index) { return offsetsByElement[index]; }
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@DontObfuscate public static class Builder {
@@ -6,12 +6,12 @@
-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 Matrix4fc matrix; private static final Vector3fc ZERO_TRANSLATION = new Vector3f();
public static final Codec<Transformation> CODEC = RecordCodecBuilder.create( private static final Vector3fc UNIT_SCALE = new Vector3f(1.0F, 1.0F, 1.0F);
p_269604_ -> p_269604_.group( private static final Quaternionfc ZERO_ROTATION = new Quaternionf();
@@ -168,5 +_,19 @@ @@ -171,6 +_,20 @@
this.getScale().lerp(p_175938_.getScale(), p_175939_, new Vector3f()), this.scale().lerp(that.scale(), progress, new Vector3f()),
this.getRightRotation().slerp(p_175938_.getRightRotation(), p_175939_, new Quaternionf()) this.rightRotation().slerp(that.rightRotation(), progress, new Quaternionf())
); );
+ } + }
+ +
@@ -28,4 +28,5 @@
+ normalTransform.transpose(); + normalTransform.transpose();
+ } + }
} }
}
public static Matrix4fc compose(final Matrix4fc parent, final Optional<Transformation> transform) {
@@ -1,6 +1,6 @@
--- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
+++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
@@ -62,6 +_,15 @@ @@ -60,6 +_,15 @@
} }
@Override @Override
@@ -13,6 +13,6 @@
+ } + }
+ +
+ @Override + @Override
public void render(GuiGraphics p_283497_, int p_88680_, int p_88681_, float p_88682_) { public void extractRenderState(final GuiGraphicsExtractor graphics, final int xm, final int ym, final float a) {
super.render(p_283497_, p_88680_, p_88681_, p_88682_); super.extractRenderState(graphics, xm, ym, a);
p_283497_.drawCenteredString(this.font, this.title, this.width / 2, 80, -1); graphics.centeredText(this.font, this.title, this.width / 2, 80, -1);
@@ -1,11 +1,11 @@
--- a/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java --- a/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
+++ b/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java +++ b/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.java
@@ -263,7 +_,7 @@ @@ -302,7 +_,7 @@
int k = this.getY(); int y = this.getY();
p_282595_.blit(RenderPipelines.GUI_TEXTURED, this.image, j + 2, k + 2, 0.0F, 0.0F, 56, 56, 56, 56, 56, 56, i); graphics.blit(RenderPipelines.GUI_TEXTURED, this.image, x + 2, y + 2, 0.0F, 0.0F, 56, 56, 56, 56, 56, 56, color);
p_282595_.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, j, k, 60, 60, i); graphics.blitSprite(RenderPipelines.GUI_TEXTURED, SLOT_FRAME_SPRITE, x, y, 60, 60, color);
- int l = flag ? -6250336 : -1; - int textColor = hoveredOrFocused ? -6250336 : -1;
+ int l = getFGColor(); + int textColor = getFGColor();
p_282595_.drawCenteredString(RealmsResetWorldScreen.this.font, this.getMessage(), j + 28, k - 14, l); graphics.centeredText(RealmsResetWorldScreen.this.font, this.getMessage(), x + 28, y - 14, textColor);
} }
} }
@@ -2,47 +2,47 @@
+++ b/net/minecraft/CrashReport.java +++ b/net/minecraft/CrashReport.java
@@ -58,14 +_,9 @@ @@ -58,14 +_,9 @@
if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) { if (this.uncategorizedStackTrace != null && this.uncategorizedStackTrace.length > 0) {
p_127520_.append("-- Head --\n"); builder.append("-- Head --\n");
p_127520_.append("Thread: ").append(Thread.currentThread().getName()).append("\n"); builder.append("Thread: ").append(Thread.currentThread().getName()).append("\n");
- p_127520_.append("Stacktrace:\n"); - builder.append("Stacktrace:\n");
- -
- for (StackTraceElement stacktraceelement : this.uncategorizedStackTrace) { - for (StackTraceElement element : this.uncategorizedStackTrace) {
- p_127520_.append("\t").append("at ").append(stacktraceelement); - builder.append("\t").append("at ").append(element);
- p_127520_.append("\n"); - builder.append("\n");
- } - }
- -
- p_127520_.append("\n"); - builder.append("\n");
+ p_127520_.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace)); + builder.append(net.minecraftforge.logging.CrashReportAnalyser.appendSuspectedMods(this.exception, this.uncategorizedStackTrace));
+ p_127520_.append("Stacktrace:"); + builder.append("Stacktrace:");
+ p_127520_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace)); + builder.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.uncategorizedStackTrace));
} }
for (CrashReportCategory crashreportcategory : this.details) { for (CrashReportCategory entry : this.details) {
@@ -73,6 +_,7 @@ @@ -73,6 +_,7 @@
p_127520_.append("\n\n"); builder.append("\n\n");
} }
+ net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport); + net.minecraftforge.logging.CrashReportExtender.extendSystemReport(systemReport);
this.systemReport.appendToCrashReportString(p_127520_); this.systemReport.appendToCrashReportString(builder);
} }
@@ -92,18 +_,7 @@ @@ -92,18 +_,7 @@
throwable.setStackTrace(this.exception.getStackTrace()); exception.setStackTrace(this.exception.getStackTrace());
} }
- String s; - String var4;
- try { - try {
- stringwriter = new StringWriter(); - writer = new StringWriter();
- printwriter = new PrintWriter(stringwriter); - printWriter = new PrintWriter(writer);
- throwable.printStackTrace(printwriter); - exception.printStackTrace(printWriter);
- s = stringwriter.toString(); - var4 = writer.toString();
- } finally { - } finally {
- IOUtils.closeQuietly((Writer)stringwriter); - IOUtils.closeQuietly((Writer)writer);
- IOUtils.closeQuietly((Writer)printwriter); - IOUtils.closeQuietly((Writer)printWriter);
- } - }
- -
- return s; - return var4;
+ return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(throwable); + return net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(exception);
} }
public String getFriendlyReport(ReportType p_343869_, List<String> p_342487_) { public String getFriendlyReport(final ReportType reportType, final List<String> extraComments) {
@@ -1,28 +1,28 @@
--- a/net/minecraft/CrashReportCategory.java --- a/net/minecraft/CrashReportCategory.java
+++ b/net/minecraft/CrashReportCategory.java +++ b/net/minecraft/CrashReportCategory.java
@@ -116,8 +_,10 @@ @@ -140,8 +_,10 @@
if (astacktraceelement.length <= 0) { if (full.length <= 0) {
return 0; return 0;
} else { } else {
- this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - p_128149_]; - this.stackTrace = new StackTraceElement[full.length - 3 - nestedOffset];
- System.arraycopy(astacktraceelement, 3 + p_128149_, this.stackTrace, 0, this.stackTrace.length); - System.arraycopy(full, 3 + nestedOffset, this.stackTrace, 0, this.stackTrace.length);
+ int len = astacktraceelement.length - 3 - p_128149_; + int len = full.length - 3 - nestedOffset;
+ if (len <= 0) len = astacktraceelement.length; + if (len <= 0) len = full.length;
+ this.stackTrace = new StackTraceElement[len]; + this.stackTrace = new StackTraceElement[len];
+ System.arraycopy(astacktraceelement, astacktraceelement.length - len, this.stackTrace, 0, this.stackTrace.length); + System.arraycopy(full, full.length - len, this.stackTrace, 0, this.stackTrace.length);
return this.stackTrace.length; return this.stackTrace.length;
} }
} }
@@ -164,16 +_,16 @@ @@ -188,16 +_,16 @@
if (this.stackTrace != null && this.stackTrace.length > 0) { if (this.stackTrace != null && this.stackTrace.length > 0) {
p_128169_.append("\nStacktrace:"); builder.append("\nStacktrace:");
- -
- for (StackTraceElement stacktraceelement : this.stackTrace) { - for (StackTraceElement element : this.stackTrace) {
- p_128169_.append("\n\tat "); - builder.append("\n\tat ");
- p_128169_.append(stacktraceelement); - builder.append(element);
- } - }
+ p_128169_.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace)); + builder.append(net.minecraftforge.logging.CrashReportExtender.generateEnhancedStackTrace(this.stackTrace));
} }
} }
@@ -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_, BlockState p_178954_) { public static void populateBlockDetails(
@@ -1,15 +1,15 @@
--- a/net/minecraft/advancements/Advancement.java --- a/net/minecraft/advancements/Advancement.java
+++ b/net/minecraft/advancements/Advancement.java +++ b/net/minecraft/advancements/Advancement.java
@@ -231,7 +_,11 @@ @@ -219,7 +_,11 @@
} }
public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, String p_138391_) { public AdvancementHolder save(final Consumer<AdvancementHolder> output, final String name) {
- AdvancementHolder advancementholder = this.build(Identifier.parse(p_138391_)); - AdvancementHolder advancement = this.build(Identifier.parse(name));
+ return save(p_138390_, Identifier.parse(p_138391_)); + return save(output, Identifier.parse(name));
+ } + }
+ +
+ public AdvancementHolder save(Consumer<AdvancementHolder> p_138390_, Identifier id) { + public AdvancementHolder save(Consumer<AdvancementHolder> output, Identifier id) {
+ AdvancementHolder advancementholder = this.build(id); + AdvancementHolder advancement = this.build(id);
p_138390_.accept(advancementholder); output.accept(advancement);
return advancementholder; return advancement;
} }
@@ -1,10 +1,10 @@
--- a/net/minecraft/advancements/AdvancementRewards.java --- a/net/minecraft/advancements/AdvancementRewards.java
+++ b/net/minecraft/advancements/AdvancementRewards.java +++ b/net/minecraft/advancements/AdvancementRewards.java
@@ -44,6 +_,7 @@ @@ -43,6 +_,7 @@
LootParams lootparams = new LootParams.Builder(serverlevel) LootParams params = new LootParams.Builder(level)
.withParameter(LootContextParams.THIS_ENTITY, p_9990_) .withParameter(LootContextParams.THIS_ENTITY, player)
.withParameter(LootContextParams.ORIGIN, p_9990_.position()) .withParameter(LootContextParams.ORIGIN, player.position())
+ .withLuck(p_9990_.getLuck()) + .withLuck(player.getLuck())
.create(LootContextParamSets.ADVANCEMENT_REWARD); .create(LootContextParamSets.ADVANCEMENT_REWARD);
boolean flag = false; boolean changes = false;
@@ -1,21 +1,38 @@
--- a/net/minecraft/client/Camera.java --- a/net/minecraft/client/Camera.java
+++ b/net/minecraft/client/Camera.java +++ b/net/minecraft/client/Camera.java
@@ -136,9 +_,13 @@ @@ -217,12 +_,14 @@
return 90.0F;
} else {
float fov = this.minecraft.options.fov().get().intValue() * Mth.lerp(partialTicks, this.oldFovModifier, this.fovModifier);
- return this.modifyFovBasedOnDeathOrFluid(partialTicks, fov);
+ var ret = this.modifyFovBasedOnDeathOrFluid(partialTicks, fov);
+ return net.minecraftforge.client.event.ForgeEventFactoryClient.fireComputeFov(this.minecraft.gameRenderer, this, partialTicks, ret, true).getFOV();
}
} }
protected void setRotation(float p_90573_, float p_90574_) { private float calculateHudFov(final float partialTicks) {
+ setRotation(p_90573_, p_90574_, 0.0f); - return this.modifyFovBasedOnDeathOrFluid(partialTicks, 70.0F);
+ var ret = this.modifyFovBasedOnDeathOrFluid(partialTicks, 70.0F);
+ return net.minecraftforge.client.event.ForgeEventFactoryClient.fireComputeFov(this.minecraft.gameRenderer, this, partialTicks, ret, false).getFOV();
}
private float modifyFovBasedOnDeathOrFluid(final float partialTicks, float fov) {
@@ -331,9 +_,13 @@
}
protected void setRotation(final float yRot, final float xRot) {
+ setRotation(yRot, xRot, 0.0f);
+ } + }
+ +
+ public void setRotation(float p_90573_, float p_90574_, float z) { + public void setRotation(float yRot, float xRot, float z) {
this.xRot = p_90574_; this.xRot = xRot;
this.yRot = p_90573_; this.yRot = yRot;
- this.rotation.rotationYXZ((float) Math.PI - p_90573_ * (float) (Math.PI / 180.0), -p_90574_ * (float) (Math.PI / 180.0), 0.0F); - this.rotation.rotationYXZ((float) Math.PI - yRot * (float) (Math.PI / 180.0), -xRot * (float) (Math.PI / 180.0), 0.0F);
+ this.rotation.rotationYXZ((float) Math.PI - p_90573_ * (float) (Math.PI / 180.0), -p_90574_ * (float) (Math.PI / 180.0), z * (float) (Math.PI / 180.0)); + this.rotation.rotationYXZ((float) Math.PI - yRot * (float) (Math.PI / 180.0), -xRot * (float) (Math.PI / 180.0), z * (float) (Math.PI / 180.0));
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);
@@ -168,6 +_,13 @@ @@ -364,6 +_,13 @@
public float yRot() { public float yRot() {
return this.yRot; return this.yRot;
@@ -1,8 +1,8 @@
--- a/net/minecraft/client/ClientBrandRetriever.java --- a/net/minecraft/client/ClientBrandRetriever.java
+++ b/net/minecraft/client/ClientBrandRetriever.java +++ b/net/minecraft/client/ClientBrandRetriever.java
@@ -10,6 +_,6 @@ @@ -8,6 +_,6 @@
public static final String VANILLA_NAME = "vanilla";
@DontObfuscate
public static String getClientModName() { public static String getClientModName() {
- return "vanilla"; - return "vanilla";
+ return net.minecraftforge.internal.BrandingControl.getBranding(); + return net.minecraftforge.internal.BrandingControl.getBranding();
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/DeltaTracker.java --- a/net/minecraft/client/DeltaTracker.java
+++ b/net/minecraft/client/DeltaTracker.java +++ b/net/minecraft/client/DeltaTracker.java
@@ -87,18 +_,22 @@ @@ -82,18 +_,22 @@
private void pause() { private void pause() {
if (!this.paused) { if (!this.paused) {
@@ -22,4 +22,4 @@
+ net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePost(false); + net.minecraftforge.client.ForgeHooksClient.onClientPauseChangePost(false);
} }
public void updateFrozenState(boolean p_344005_) { public void updateFrozenState(final boolean frozen) {
@@ -15,12 +15,12 @@
@@ -39,7 +_,7 @@ @@ -39,7 +_,7 @@
} }
private static void forAllKeyMappings(InputConstants.Key p_424096_, Consumer<KeyMapping> p_427756_) { private static void forAllKeyMappings(final InputConstants.Key key, final Consumer<KeyMapping> operation) {
- List<KeyMapping> list = MAP.get(p_424096_); - List<KeyMapping> keyMappings = MAP.get(key);
+ List<KeyMapping> list = MAP.getAll(p_424096_); + List<KeyMapping> keyMappings = MAP.getAll(key);
if (list != null && !list.isEmpty()) { if (keyMappings != null && !keyMappings.isEmpty()) {
for (KeyMapping keymapping : list) { for (KeyMapping keyMapping : keyMappings) {
p_427756_.accept(keymapping); operation.accept(keyMapping);
@@ -106,7 +_,7 @@ @@ -106,7 +_,7 @@
} }
@@ -30,12 +30,12 @@
} }
public KeyMapping.Category getCategory() { public KeyMapping.Category getCategory() {
@@ -149,8 +_,17 @@ @@ -147,8 +_,17 @@
? I18n.get(this.name).compareTo(I18n.get(p_90841_.name)) if (this.category == o.category) {
: Integer.compare(this.order, p_90841_.order); return this.order == o.order ? I18n.get(this.name).compareTo(I18n.get(o.name)) : Integer.compare(this.order, o.order);
} else { } else {
- return Integer.compare(KeyMapping.Category.SORT_ORDER.indexOf(this.category), KeyMapping.Category.SORT_ORDER.indexOf(p_90841_.category)); - return Integer.compare(KeyMapping.Category.SORT_ORDER.indexOf(this.category), KeyMapping.Category.SORT_ORDER.indexOf(o.category));
+ return compareSort(this.category, p_90841_.category); + return compareSort(this.category, o.category);
} }
+ } + }
+ +
@@ -48,17 +48,17 @@
+ return o1 - o2; + return o1 - o2;
} }
public static Supplier<Component> createNameSupplier(String p_90843_) { public static Supplier<Component> createNameSupplier(final String key) {
@@ -159,6 +_,20 @@ @@ -157,6 +_,20 @@
} }
public boolean same(KeyMapping p_90851_) { public boolean same(final KeyMapping that) {
+ if (getKeyConflictContext().conflicts(p_90851_.getKeyConflictContext()) || p_90851_.getKeyConflictContext().conflicts(getKeyConflictContext())) { + if (getKeyConflictContext().conflicts(that.getKeyConflictContext()) || that.getKeyConflictContext().conflicts(getKeyConflictContext())) {
+ var keyModifier = getKeyModifier(); + var keyModifier = getKeyModifier();
+ var otherKeyModifier = p_90851_.getKeyModifier(); + var otherKeyModifier = that.getKeyModifier();
+ if (keyModifier.matches(p_90851_.getKey()) || otherKeyModifier.matches(getKey())) { + if (keyModifier.matches(that.getKey()) || otherKeyModifier.matches(getKey())) {
+ return true; + return true;
+ } else if (getKey().equals(p_90851_.getKey())) { + } else if (getKey().equals(that.getKey())) {
+ // IN_GAME key contexts have a conflict when at least one modifier is NONE. + // IN_GAME key contexts have a conflict when at least one modifier is NONE.
+ // For example: If you hold shift to crouch, you can still press E to open your inventory. This means that a Shift+E hotkey is in conflict with E. + // For example: If you hold shift to crouch, you can still press E to open your inventory. This means that a Shift+E hotkey is in conflict with E.
+ // GUI and other key contexts do not have this limitation. + // GUI and other key contexts do not have this limitation.
@@ -67,10 +67,10 @@
+ (keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE)); + (keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE));
+ } + }
+ } + }
return this.key.equals(p_90851_.key); return this.key.equals(that.key);
} }
@@ -177,11 +_,13 @@ @@ -175,11 +_,13 @@
} }
public Component getTranslatedKeyMessage() { public Component getTranslatedKeyMessage() {
@@ -85,16 +85,16 @@
} }
public String saveString() { public String saveString() {
@@ -193,11 +_,94 @@ @@ -191,11 +_,94 @@
} }
private void registerMapping(InputConstants.Key p_423386_) { private void registerMapping(final InputConstants.Key key) {
- MAP.computeIfAbsent(p_423386_, p_420623_ -> new ArrayList<>()).add(this); - MAP.computeIfAbsent(key, k -> new ArrayList<>()).add(this);
+ MAP.put(p_423386_, this); + MAP.put(key, this);
} }
public static @Nullable KeyMapping get(String p_378660_) { public static @Nullable KeyMapping get(final String name) {
return ALL.get(p_378660_); return ALL.get(name);
+ } + }
+ +
+ 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,37 +1,37 @@
--- a/net/minecraft/client/KeyboardHandler.java --- a/net/minecraft/client/KeyboardHandler.java
+++ b/net/minecraft/client/KeyboardHandler.java +++ b/net/minecraft/client/KeyboardHandler.java
@@ -497,7 +_,7 @@ @@ -514,7 +_,7 @@
if (screen != null) { if (screen != null) {
try { try {
if (p_90895_ != 1 && p_90895_ != 2) { if (action != 1 && action != 2) {
- if (p_90895_ == 0 && screen.keyReleased(p_423534_)) { - if (action == 0 && screen.keyReleased(event)) {
+ if (p_90895_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_423534_)) { + if (action == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, event)) {
if (options.keyDebugModifier.matches(p_423534_)) { if (options.keyDebugModifier.matches(event)) {
this.usedDebugKeyAsModifier = false; this.usedDebugKeyAsModifier = false;
} }
@@ -506,7 +_,7 @@ @@ -523,7 +_,7 @@
} }
} else { } else {
screen.afterKeyboardAction(); screen.afterKeyboardAction();
- if (screen.keyPressed(p_423534_)) { - if (screen.keyPressed(event)) {
+ if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_423534_)) { + if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, event)) {
if (this.minecraft.screen == null) { if (this.minecraft.screen == null) {
InputConstants.Key inputconstants$key = InputConstants.getKey(p_423534_); InputConstants.Key key = InputConstants.getKey(event);
KeyMapping.set(inputconstants$key, false); KeyMapping.set(key, false);
@@ -582,6 +_,7 @@ @@ -595,6 +_,7 @@
} }
} }
} }
+ net.minecraftforge.client.ForgeHooksClient.onKeyInput(p_423534_, p_90895_); + net.minecraftforge.client.ForgeHooksClient.onKeyInput(event, action);
} }
} }
@@ -590,7 +_,7 @@ @@ -603,7 +_,7 @@
Screen screen = this.minecraft.screen; Screen screen = this.minecraft.screen;
if (screen != null && this.minecraft.getOverlay() == null) { if (screen != null && this.minecraft.getOverlay() == null) {
try { try {
- screen.charTyped(p_427531_); - screen.charTyped(event);
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, p_427531_); + net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, event);
} catch (Throwable throwable) { } catch (Throwable var8) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "charTyped event handler"); CrashReport report = CrashReport.forThrowable(var8, "charTyped event handler");
screen.fillCrashDetails(crashreport); screen.fillCrashDetails(report);
@@ -1,116 +1,110 @@
--- a/net/minecraft/client/Minecraft.java --- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java
@@ -265,7 +_,7 @@ @@ -268,7 +_,7 @@
import org.slf4j.Logger; import org.slf4j.Logger;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
-public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler { -public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler {
+public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft { +public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements WindowEventHandler, net.minecraftforge.client.extensions.IForgeMinecraft {
static Minecraft instance; private static Minecraft instance;
private static final Logger LOGGER = LogUtils.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private static final int MAX_TICKS_PER_UPDATE = 10; private static final int MAX_TICKS_PER_UPDATE = 10;
@@ -431,7 +_,6 @@ @@ -432,7 +_,6 @@
} }
}, Util.nonCriticalIoPool()); }, Util.nonCriticalIoPool());
LOGGER.info("Setting user: {}", this.user.getName()); LOGGER.info("Setting user: {}", this.user.getName());
- LOGGER.debug("(Session ID is {})", this.user.getSessionId()); - LOGGER.debug("(Session ID is {})", this.user.getSessionId());
this.demo = p_91084_.game.demo; this.demo = gameConfig.game.demo;
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer; this.allowsMultiplayer = !gameConfig.game.disableMultiplayer;
this.allowsChat = !p_91084_.game.disableChat; this.allowsChat = !gameConfig.game.disableChat;
@@ -483,10 +_,9 @@ @@ -518,14 +_,14 @@
LOGGER.error("Couldn't set icon", (Throwable)ioexception); LOGGER.error("Couldn't set icon", (Throwable)var23);
}
+ // FORGE: Move mouse and keyboard handler setup further below
this.mouseHandler = new MouseHandler(this);
- this.mouseHandler.setup(this.window);
this.keyboardHandler = new KeyboardHandler(this);
- this.keyboardHandler.setup(this.window);
RenderSystem.initRenderer(
this.window.handle(),
this.options.glDebugVerbosity,
@@ -498,6 +_,7 @@
LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
this.resourcePackRepository.reload();
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
@@ -585,6 +_,7 @@
this.particleResources = new ParticleResources();
this.resourceManager.registerReloadListener(this.particleResources);
this.particleEngine = new ParticleEngine(this.level, this.particleResources);
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleResources);
this.particleResources.onReload(this.particleEngine::clearParticles);
this.waypointStyles = new WaypointStyleManager();
this.resourceManager.registerReloadListener(this.waypointStyles);
@@ -596,6 +_,9 @@
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
this.resourceManager.registerReloadListener(this.regionalCompliancies);
this.gui = new Gui(this);
+ // FORGE: Moved keyboard and mouse handler setup below ingame gui creation to prevent NPEs in them.
+ this.mouseHandler.setup(this.window);
+ this.keyboardHandler.setup(this.window);
RealmsClient realmsclient = RealmsClient.getOrCreate(this);
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
RenderSystem.setErrorCallback(this::onFullscreenError);
@@ -628,6 +_,7 @@
} }
}
+ net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager); + // FORGE: Move mouse and keyboard handler setup further below
this.window.updateVsync(this.options.enableVsync().get()); this.mouseHandler = new MouseHandler(this);
this.window.updateRawMouseInput(this.options.rawMouseInput().get()); - this.mouseHandler.setup(this.window);
this.window.setAllowCursorChanges(this.options.allowCursorChanges().get()); this.keyboardHandler = new KeyboardHandler(this);
@@ -651,16 +_,17 @@ - this.keyboardHandler.setup(this.window);
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS); this.options.applyGraphicsPreset(this.options.graphicsPreset().get());
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay); LOGGER.info("Using optional rendering extensions: {}", String.join(", ", RenderSystem.getDevice().getEnabledExtensions()));
this.setOverlay( this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
- new LoadingOverlay( this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
- this, reloadinstance, p_447796_ -> Util.ifElse(p_447796_, p_296162_ -> this.rollbackResourcePacks(p_296162_, minecraft$gameloadcookie), () -> { + net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
+ net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay( this.resourcePackRepository.reload();
+ () -> this, () -> reloadinstance, p_296164_ -> Util.ifElse(p_296164_, p_447796_ -> this.rollbackResourcePacks(p_447796_, minecraft$gameloadcookie), () -> { this.options.loadSelectedResourcePacks(this.resourcePackRepository);
if (SharedConstants.IS_RUNNING_IN_IDE) { this.languageManager = new LanguageManager(this.options.languageCode, languageData -> {
this.selfTest(); @@ -613,6 +_,7 @@
} this.particleResources = new ParticleResources();
this.resourceManager.registerReloadListener(this.particleResources);
this.particleEngine = new ParticleEngine(this.level, this.particleResources);
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleResources);
this.particleResources.onReload(this.particleEngine::clearParticles);
this.waypointStyles = new WaypointStyleManager();
this.resourceManager.registerReloadListener(this.waypointStyles);
@@ -634,6 +_,9 @@
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
this.resourceManager.registerReloadListener(this.regionalCompliancies);
this.gui = new Gui(this);
+ // FORGE: Moved keyboard and mouse handler setup below ingame gui creation to prevent NPEs in them.
+ this.mouseHandler.setup(this.window);
+ this.keyboardHandler.setup(this.window);
RealmsClient realmsClient = RealmsClient.getOrCreate(this);
this.realmsDataFetcher = new RealmsDataFetcher(realmsClient);
RenderSystem.setErrorCallback(this::onFullscreenError);
@@ -665,6 +_,7 @@
}
}
this.reloadStateTracker.finishReload(); + net.minecraftforge.client.ForgeHooksClient.initClientHooks(this, this.resourceManager);
this.onResourceLoadFinished(minecraft$gameloadcookie); this.window.updateVsync(this.options.enableVsync().get());
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading(); this.window.updateRawMouseInput(this.options.rawMouseInput().get());
}), false this.window.setAllowCursorChanges(this.options.allowCursorChanges().get());
- ) @@ -690,14 +_,15 @@
+ ).get() .createReload(Util.backgroundExecutor().forName("resourceLoad"), this, RESOURCE_RELOAD_INITIAL_TASK, packs);
); GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.logPath()); Minecraft.GameLoadCookie loadCookie = new Minecraft.GameLoadCookie(realmsClient, gameConfig.quickPlay);
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this); - this.setOverlay(new LoadingOverlay(this, reloadInstance, maybeT -> Util.ifElse(maybeT, t -> this.rollbackResourcePacks(t, loadCookie), () -> {
@@ -779,6 +_,7 @@ + this.setOverlay(net.minecraftforge.fml.loading.ImmediateWindowHandler.<LoadingOverlay>loadingOverlay(() -> this, () ->reloadInstance, maybeT -> Util.ifElse(maybeT, t -> this.rollbackResourcePacks(t, loadCookie), () -> {
StringBuilder stringbuilder = new StringBuilder("Minecraft"); if (SharedConstants.IS_RUNNING_IN_IDE) {
this.selfTest();
}
this.reloadStateTracker.finishReload();
this.onResourceLoadFinished(loadCookie);
- }), false));
+ net.minecraftforge.client.loading.ClientModLoader.completeModLoading();
+ }), false).get());
this.quickPlayLog = QuickPlayLog.of(gameConfig.quickPlay.logPath());
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
this.fpsPieProfiler = new ContinuousProfiler(Util.timeSource, () -> this.fpsPieRenderTicks, this.framerateLimitTracker::isHeavilyThrottled);
@@ -816,6 +_,7 @@
StringBuilder builder = new StringBuilder("Minecraft");
if (checkModStatus().shouldReportAsModified()) { if (checkModStatus().shouldReportAsModified()) {
stringbuilder.append("*"); builder.append("*");
+ stringbuilder.append(" Forge"); + builder.append(" Forge");
} }
stringbuilder.append(" "); builder.append(" ");
@@ -802,6 +_,8 @@ @@ -839,6 +_,8 @@
} }
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) { private UserApiService createUserApiService(final YggdrasilAuthenticationService authService, final GameConfig config) {
+ if ("0".equals(p_193587_.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam. + if ("0".equals(config.user.user.getAccessToken())) // Forge: We use "0" in dev. Short circuit to stop exception spam.
+ return UserApiService.OFFLINE; + return UserApiService.OFFLINE;
return p_193587_.game.offlineDeveloperMode ? UserApiService.OFFLINE : p_193586_.createUserApiService(p_193587_.user.user.getAccessToken()); return config.game.offlineDeveloperMode ? UserApiService.OFFLINE : authService.createUserApiService(config.user.user.getAccessToken());
} }
@@ -814,7 +_,7 @@ @@ -851,7 +_,7 @@
} }
private void rollbackResourcePacks(Throwable p_91240_, Minecraft.@Nullable GameLoadCookie p_299515_) { private void rollbackResourcePacks(final Throwable t, final Minecraft.@Nullable GameLoadCookie loadCookie) {
- if (this.resourcePackRepository.getSelectedIds().size() > 1) { - if (this.resourcePackRepository.getSelectedIds().size() > 1) {
+ if (this.resourcePackRepository.getSelectedPacks().stream().anyMatch(e -> !e.isRequired())) { //Forge: This caused infinite loop if any resource packs are forced. Such as mod resources. So check if we can disable any. + if (this.resourcePackRepository.getSelectedPacks().stream().anyMatch(e -> !e.isRequired())) { //Forge: This caused infinite loop if any resource packs are forced. Such as mod resources. So check if we can disable any.
this.clearResourcePacksOnError(p_91240_, null, p_299515_); this.clearResourcePacksOnError(t, null, loadCookie);
} else { } else {
Util.throwAsRuntime(p_91240_); Util.throwAsRuntime(t);
@@ -1100,12 +_,6 @@ @@ -1128,12 +_,6 @@
LOGGER.error("setScreen called from non-game thread"); LOGGER.error("setScreen called from non-game thread");
} }
@@ -120,22 +114,22 @@
- this.setLastInputType(InputType.NONE); - this.setLastInputType(InputType.NONE);
- } - }
- -
if (p_91153_ == null) { if (screen == null) {
if (this.clientLevelTeardownInProgress) { if (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");
@@ -1124,6 +_,23 @@ @@ -1152,6 +_,23 @@
} }
} }
+ net.minecraftforge.client.ForgeHooksClient.clearGuiLayers(this); + net.minecraftforge.client.ForgeHooksClient.clearGuiLayers(this);
+ Screen old = this.screen; + Screen old = this.screen;
+ if (p_91153_ != null) { + if (screen != null) {
+ var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenOpening(old, p_91153_); + var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenOpening(old, screen);
+ if (event == null) return; + if (event == null) return;
+ p_91153_ = event; + screen = event;
+ } + }
+ +
+ if (p_91153_ != old) { + if (screen != old) {
+ if (old != null) { + if (old != null) {
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old); + net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenClose(old);
+ old.removed(); + old.removed();
@@ -144,41 +138,36 @@
+ } + }
+ } + }
+ +
this.screen = p_91153_; this.screen = screen;
if (this.screen != null) { if (this.screen != null) {
this.screen.added(); this.screen.added();
@@ -1207,6 +_,7 @@ @@ -1235,6 +_,7 @@
Util.shutdownExecutors(); Util.shutdownExecutors();
RenderSystem.getSamplerCache().close(); RenderSystem.getSamplerCache().close();
RenderSystem.getDevice().close(); RenderSystem.getDevice().close();
+ net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload(); + net.minecraftforge.fml.config.ConfigTracker.forceUnload();
} catch (Throwable throwable) { } catch (Throwable var5) {
LOGGER.error("Shutdown failure!", throwable); LOGGER.error("Shutdown failure!", var5);
throw throwable; throw var5;
@@ -1289,7 +_,9 @@ @@ -1346,7 +_,9 @@
RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(rendertarget.getColorTexture(), 0, rendertarget.getDepthTexture(), 1.0); profiler.popPush("gpuAsync");
profilerfiller.push("gameRenderer"); RenderSystem.executePendingTasks();
if (!this.noRender) { profiler.pop();
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker); + net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
this.gameRenderer.render(this.deltaTracker, p_91384_); this.gameRenderer.render(this.deltaTracker, advanceGameTime);
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker); + net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
} profiler.push("present");
if (!this.gameRenderer.getGameRenderState().windowRenderState.isMinimized) {
profilerfiller.popPush("blit"); this.mainRenderTarget.blitToScreen();
@@ -1401,10 +_,12 @@ @@ -1450,6 +_,7 @@
this.window.setGuiScale(i); this.window.setGuiScale(guiScale);
if (this.screen != null) { if (this.screen != null) {
this.screen.resize(this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight()); this.screen.resize(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());
} }
RenderTarget rendertarget = this.getMainRenderTarget();
rendertarget.resize(this.window.getWidth(), this.window.getHeight());
+ if (this.gameRenderer != null)
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
this.mouseHandler.setIgnoreFirstMove(); this.mouseHandler.setIgnoreFirstMove();
} @@ -1601,6 +_,7 @@
@@ -1542,6 +_,7 @@
} }
public void stop() { public void stop() {
@@ -186,29 +175,29 @@
this.running = false; this.running = false;
} }
@@ -1571,10 +_,18 @@ @@ -1630,10 +_,18 @@
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) { if (down && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult; BlockHitResult blockHit = (BlockHitResult)this.hitResult;
BlockPos blockpos = blockhitresult.getBlockPos(); BlockPos pos = blockHit.getBlockPos();
- if (!this.level.getBlockState(blockpos).isAir()) { - if (!this.level.getBlockState(pos).isAir()) {
+ if (!this.level.isEmptyBlock(blockpos)) { + if (!this.level.isEmptyBlock(pos)) {
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND); + var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(0, this.options.keyAttack, InteractionHand.MAIN_HAND);
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) { + if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
+ if (inputEvent.shouldSwingHand()) { + if (inputEvent.shouldSwingHand()) {
+ this.level.addBreakingBlockEffect(blockpos, blockhitresult); + this.level.addBreakingBlockEffect(pos, blockHit);
+ this.player.swing(InteractionHand.MAIN_HAND); + this.player.swing(InteractionHand.MAIN_HAND);
+ } + }
+ return; + return;
+ } + }
Direction direction = blockhitresult.getDirection(); Direction direction = blockHit.getDirection();
- if (this.gameMode.continueDestroyBlock(blockpos, direction)) { - if (this.gameMode.continueDestroyBlock(pos, direction)) {
- this.level.addBreakingBlockEffect(blockpos, direction); - this.level.addBreakingBlockEffect(pos, direction);
+ if (this.gameMode.continueDestroyBlock(blockpos, direction) && inputEvent.shouldSwingHand()) { + if (this.gameMode.continueDestroyBlock(pos, direction) && inputEvent.shouldSwingHand()) {
+ this.level.addBreakingBlockEffect(blockpos, blockhitresult); + this.level.addBreakingBlockEffect(pos, blockHit);
this.player.swing(InteractionHand.MAIN_HAND); this.player.swing(InteractionHand.MAIN_HAND);
} }
} }
@@ -1611,6 +_,8 @@ @@ -1676,6 +_,8 @@
this.player.swing(InteractionHand.MAIN_HAND); this.player.swing(InteractionHand.MAIN_HAND);
return true; return true;
} else { } else {
@@ -216,139 +205,138 @@
+ if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) + if (!net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent))
switch (this.hitResult.getType()) { switch (this.hitResult.getType()) {
case ENTITY: case ENTITY:
AttackRange attackrange = itemstack.get(DataComponents.ATTACK_RANGE); AttackRange customItemRange = heldItem.get(DataComponents.ATTACK_RANGE);
@@ -1621,7 +_,7 @@ @@ -1686,7 +_,7 @@
case BLOCK: case BLOCK:
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult; BlockHitResult blockHit = (BlockHitResult)this.hitResult;
BlockPos blockpos = blockhitresult.getBlockPos(); BlockPos pos = blockHit.getBlockPos();
- if (!this.level.getBlockState(blockpos).isAir()) { - if (!this.level.getBlockState(pos).isAir()) {
+ if (!this.level.isEmptyBlock(blockpos)) { + if (!this.level.isEmptyBlock(pos)) {
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection()); this.gameMode.startDestroyBlock(pos, blockHit.getDirection());
if (this.level.getBlockState(blockpos).isAir()) { if (this.level.getBlockState(pos).isAir()) {
flag = true; endAttack = true;
@@ -1634,9 +_,10 @@ @@ -1699,8 +_,10 @@
} }
this.player.resetAttackStrengthTicker(); this.player.resetAttackStrengthTicker();
+ net.minecraftforge.event.ForgeEventFactory.onLeftClickEmpty(this.player); + net.minecraftforge.event.ForgeEventFactory.onLeftClickEmpty(this.player);
} }
- if (!this.player.isSpectator()) { + if (inputEvent.shouldSwingHand())
+ if (!this.player.isSpectator() && inputEvent.shouldSwingHand()) { this.player.swing(InteractionHand.MAIN_HAND);
this.player.swing(InteractionHand.MAIN_HAND); return endAttack;
} }
@@ -1717,6 +_,12 @@
@@ -1655,6 +_,12 @@
} }
for (InteractionHand interactionhand : InteractionHand.values()) { for (InteractionHand hand : InteractionHand.values()) {
+ var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(1, this.options.keyUse, interactionhand); + var inputEvent = new net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered(1, this.options.keyUse, hand);
+ if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) { + if (net.minecraftforge.client.event.InputEvent.InteractionKeyMappingTriggered.BUS.post(inputEvent)) {
+ if (inputEvent.shouldSwingHand()) this.player.swing(interactionhand); + if (inputEvent.shouldSwingHand()) this.player.swing(hand);
+ return; + return;
+ } + }
+ +
ItemStack itemstack = this.player.getItemInHand(interactionhand); ItemStack heldItem = this.player.getItemInHand(hand);
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) { if (!heldItem.isItemEnabled(this.level.enabledFeatures())) {
return; return;
@@ -1676,7 +_,7 @@ @@ -1733,7 +_,7 @@
if (this.player.isWithinEntityInteractionRange(entity, 0.0)
&& this.gameMode.interact(this.player, entity, entityHit, hand) instanceof InteractionResult.Success success) {
- if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
+ if (success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
this.player.swing(hand);
} }
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) { @@ -1745,7 +_,7 @@
- if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT) { int oldCount = heldItem.getCount();
+ if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) { InteractionResult useResult = this.gameMode.useItemOn(this.player, hand, blockHit);
this.player.swing(interactionhand); if (useResult instanceof InteractionResult.Success success) {
} - if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
+ if (success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
@@ -1689,7 +_,7 @@ this.player.swing(hand);
int i = itemstack.getCount(); if (!heldItem.isEmpty() && (heldItem.getCount() != oldCount || this.player.hasInfiniteMaterials())) {
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult); this.gameRenderer.itemInHandRenderer.itemUsed(hand);
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) { @@ -1761,6 +_,9 @@
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
this.player.swing(interactionhand);
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.player.hasInfiniteMaterials())) {
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
@@ -1705,6 +_,9 @@
} }
} }
+ if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS)) + if (heldItem.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
+ net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, interactionhand); + net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, hand);
+ +
if (!itemstack.isEmpty() if (!heldItem.isEmpty() && this.gameMode.useItem(this.player, hand) instanceof InteractionResult.Success success) {
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) { if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) { this.player.swing(hand);
@@ -1734,6 +_,8 @@ @@ -1789,6 +_,8 @@
} }
ProfilerFiller profilerfiller = Profiler.get(); ProfilerFiller profiler = Profiler.get();
+ net.minecraftforge.event.ForgeEventFactory.onPreClientTick(); + net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
+ +
profilerfiller.push("gui"); profiler.push("gui");
this.textInputManager.tick();
this.chatListener.tick(); this.chatListener.tick();
this.gui.tick(this.pause); @@ -1871,6 +_,7 @@
@@ -1815,6 +_,7 @@
this.tutorial.tick(); this.tutorial.tick();
+ net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true); + net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
try { try {
this.level.tick(() -> true); this.level.tick(() -> true);
} catch (Throwable throwable1) { } catch (Throwable var6) {
@@ -1828,6 +_,7 @@ @@ -1884,6 +_,7 @@
throw new ReportedException(crashreport1); throw new ReportedException(report);
} }
+ net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true); + net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
} }
profilerfiller.popPush("animateTick"); profiler.popPush("animateTick");
@@ -1852,6 +_,7 @@ @@ -1908,6 +_,7 @@
profilerfiller.popPush("keyboard"); profiler.popPush("keyboard");
this.keyboardHandler.tick(); this.keyboardHandler.tick();
profilerfiller.pop(); profiler.pop();
+ net.minecraftforge.event.ForgeEventFactory.onPostClientTick(); + net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
} }
private boolean isLevelRunningNormally() { private boolean isLevelRunningNormally() {
@@ -2070,6 +_,7 @@ @@ -2138,6 +_,7 @@
} }
public void setLevel(ClientLevel p_91157_) { public void setLevel(final ClientLevel level) {
+ if (this.level != null) net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level); + if (this.level != null) net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
this.level = p_91157_; this.level = level;
this.updateLevelInEngines(p_91157_); this.updateLevelInEngines(level);
} }
@@ -2131,6 +_,7 @@ @@ -2199,6 +_,7 @@
IntegratedServer integratedserver = this.singleplayerServer; IntegratedServer server = this.singleplayerServer;
this.singleplayerServer = null; this.singleplayerServer = null;
this.gameRenderer.resetData(); this.gameRenderer.resetData();
+ net.minecraftforge.client.event.ForgeEventFactoryClient.firePlayerLogout(this.gameMode, this.player); + net.minecraftforge.client.event.ForgeEventFactoryClient.firePlayerLogout(this.gameMode, this.player);
this.gameMode = null; this.gameMode = null;
this.narrator.clear(); this.narrator.clear();
this.clientLevelTeardownInProgress = true; this.clientLevelTeardownInProgress = true;
@@ -2138,6 +_,7 @@ @@ -2206,6 +_,7 @@
try { try {
if (this.level != null) { if (this.level != null) {
this.gui.onDisconnected(); this.gui.onDisconnected();
+ net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level); + net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
} }
if (integratedserver != null) { this.level = null;
@@ -2150,6 +_,7 @@ @@ -2220,6 +_,7 @@
} }
profilerfiller.pop(); profiler.pop();
+ net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(this.level); + net.minecraftforge.client.ForgeHooksClient.handleClientLevelClosing(this.level);
} }
this.setScreenAndShow(p_457642_); this.setScreenAndShow(screen);
@@ -2292,6 +_,7 @@ @@ -2372,6 +_,7 @@
private void pickBlock() { private void pickBlockOrEntity() {
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.onClickInputPickBlock(this.options.keyPickItem)) return; + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onClickInputPickBlock(this.options.keyPickItem)) return;
boolean flag = this.hasControlDown(); boolean includeData = this.hasControlDown();
switch (this.hitResult) { switch (this.hitResult) {
case BlockHitResult blockhitresult: case BlockHitResult blockHitResult:
@@ -4,65 +4,65 @@
this.activeButton = null; this.activeButton = null;
} }
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(mousebuttoninfo, p_423948_)) return; + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(buttonInfo, action)) return;
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 && pressed) {
@@ -106,7 +_,7 @@ @@ -106,7 +_,7 @@
&& i - this.lastClick.time() < 250L && currentTime - this.lastClick.time() < 250L
&& this.lastClick.screen() == screen && this.lastClick.screen() == screen
&& this.lastClickButton == mousebuttonevent.button(); && this.lastClickButton == event.button();
- if (screen.mouseClicked(mousebuttonevent, flag1)) { - if (screen.mouseClicked(event, doubleClick)) {
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, mousebuttonevent, flag1)) { + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, xm, ym, event, doubleClick)) {
this.lastClick = new MouseHandler.LastClick(i, screen); this.lastClick = new MouseHandler.LastClick(currentTime, screen);
this.lastClickButton = mousebuttoninfo.button(); this.lastClickButton = buttonInfo.button();
return; return;
@@ -121,7 +_,7 @@ @@ -121,7 +_,7 @@
} }
} else { } else {
try { try {
- if (screen.mouseReleased(mousebuttonevent)) { - if (screen.mouseReleased(event)) {
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, mousebuttonevent)) { + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, xm, ym, event)) {
return; return;
} }
} catch (Throwable throwable) { } catch (Throwable var17) {
@@ -151,6 +_,7 @@ @@ -151,6 +_,7 @@
KeyMapping.click(inputconstants$key); KeyMapping.click(mouseKey);
} }
} }
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(mousebuttoninfo, p_423948_); + net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(buttonInfo, action);
} }
} }
@@ -207,7 +_,9 @@ @@ -202,7 +_,9 @@
if (this.minecraft.screen != null) { if (this.minecraft.screen != null) {
double d3 = this.getScaledXPos(this.minecraft.getWindow()); double xm = this.getScaledXPos(this.minecraft.getWindow());
double d4 = this.getScaledYPos(this.minecraft.getWindow()); double ym = this.getScaledYPos(this.minecraft.getWindow());
- this.minecraft.screen.mouseScrolled(d3, d4, d1, d2); - this.minecraft.screen.mouseScrolled(xm, ym, scaledXOffset, scaledYOffset);
+ 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, xm, ym, scaledXOffset, scaledYOffset)) return;
+ if (this.minecraft.screen.mouseScrolled(d3, d4, d1, d2)) return; + if (this.minecraft.screen.mouseScrolled(xm, ym, scaledXOffset, scaledYOffset)) return;
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, d3, d4, d1, d2); + net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, xm, ym, scaledXOffset, scaledYOffset);
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 wheelXY = this.scrollWheelHandler.onMouseScroll(scaledXOffset, scaledYOffset);
@@ -216,6 +_,7 @@ @@ -211,6 +_,7 @@
} }
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y; int wheel = wheelXY.y == 0 ? -wheelXY.x : wheelXY.y;
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, d1, d2)) return; + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, scaledXOffset, scaledYOffset)) return;
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(-wheel);
@@ -324,7 +_,7 @@ @@ -317,7 +_,7 @@
double d5 = getScaledYPos(window, this.accumulatedDY); double dy = getScaledYPos(window, this.accumulatedDY);
try { try {
- screen.mouseDragged(new MouseButtonEvent(d2, d3, this.activeButton), d4, d5); - screen.mouseDragged(new MouseButtonEvent(xm, ym, this.activeButton), dx, dy);
+ net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, new MouseButtonEvent(d2, d3, this.activeButton), d4, d5); + net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, new MouseButtonEvent(xm, ym, this.activeButton), dx, dy);
} catch (Throwable throwable) { } catch (Throwable var19) {
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler"); CrashReport report = CrashReport.forThrowable(var19, "mouseDragged event handler");
screen.fillCrashDetails(crashreport1); screen.fillCrashDetails(report);
@@ -411,6 +_,14 @@ @@ -402,6 +_,14 @@
public double ypos() { public double ypos() {
return this.ypos; return this.ypos;
@@ -1,62 +1,52 @@
--- a/net/minecraft/client/Options.java --- a/net/minecraft/client/Options.java
+++ b/net/minecraft/client/Options.java +++ b/net/minecraft/client/Options.java
@@ -816,7 +_,8 @@ @@ -929,6 +_,7 @@
},
new OptionInstance.LazyEnum<>(
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
- p_232011_ -> Minecraft.getInstance().isRunning() && p_232011_ != "" && !Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().contains(p_232011_)
+ // 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_)
? Optional.empty()
: Optional.of(p_232011_),
Codec.STRING
@@ -848,6 +_,7 @@
); );
public boolean syncWrites; public boolean syncWrites;
public boolean startedCleanly = true; public boolean startedCleanly = true;
+ private final Map<String, String> unknownKeys = new java.util.HashMap<>(); + private final Map<String, String> unknownKeys = new java.util.HashMap<>();
private static void operateOnLevelRenderer(Consumer<LevelRenderer> p_457625_) { public static boolean isSoundDeviceDefault(final String deviceName) {
LevelRenderer levelrenderer = Minecraft.getInstance().levelRenderer; return deviceName.equals("");
@@ -1313,6 +_,7 @@ @@ -1404,6 +_,7 @@
} }
public Options(Minecraft p_92138_, File p_92139_) { public Options(final Minecraft minecraft, final File workingDirectory) {
+ setForgeKeybindProperties(); + setForgeKeybindProperties();
this.minecraft = p_92138_; this.minecraft = minecraft;
this.optionsFile = new File(p_92139_, "options.txt"); this.optionsFile = new File(workingDirectory, "options.txt");
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L; boolean largeDistances = Runtime.getRuntime().maxMemory() >= 1000000000L;
@@ -1463,15 +_,28 @@ @@ -1556,15 +_,28 @@
this.startedCleanly = p_168428_.process("startedCleanly", this.startedCleanly); this.startedCleanly = access.process("startedCleanly", this.startedCleanly);
p_168428_.process("musicToast", this.musicToast); access.process("musicToast", this.musicToast);
p_168428_.process("musicFrequency", this.musicFrequency); access.process("musicFrequency", this.musicFrequency);
+ processOptionsKeysOnly(p_168428_); + processOptionsKeysOnly(access);
+ processOptionsEnd(p_168428_); + processOptionsEnd(access);
+ } + }
+ // FORGE: split off to allow reloading keys after mod loading is done + // FORGE: split off to allow reloading keys after mod loading is done
+ private void processOptionsKeysOnly(Options.FieldAccess p_168428_) { + private void processOptionsKeysOnly(Options.FieldAccess access) {
for (KeyMapping keymapping : this.keyMappings) { for (KeyMapping keyMapping : this.keyMappings) {
- String s = keymapping.saveString(); - String currentValue = keyMapping.saveString();
+ String s = keymapping.saveString() + (keymapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keymapping.getKeyModifier() : ""); + String currentValue = keyMapping.saveString() + (keyMapping.getKeyModifier() != net.minecraftforge.client.settings.KeyModifier.NONE ? ":" + keyMapping.getKeyModifier() : "");
String s1 = p_168428_.process("key_" + keymapping.getName(), s); String newValue = access.process("key_" + keyMapping.getName(), currentValue);
if (!s.equals(s1)) { if (!currentValue.equals(newValue)) {
keymapping.setKey(InputConstants.getKey(s1)); keyMapping.setKey(InputConstants.getKey(newValue));
+ if (s1.indexOf(':') != -1) { + if (newValue.indexOf(':') != -1) {
+ String[] pts = s1.split(":"); + String[] pts = newValue.split(":");
+ keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0])); + keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(pts[1]), InputConstants.getKey(pts[0]));
+ } else { + } else {
+ keymapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(s1)); + keyMapping.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, InputConstants.getKey(newValue));
+ } + }
} }
} }
+ } + }
+ private void processOptionsEnd(Options.FieldAccess p_168428_) { + private void processOptionsEnd(Options.FieldAccess access) {
for (SoundSource soundsource : SoundSource.values()) { for (SoundSource source : SoundSource.values()) {
p_168428_.process("soundCategory_" + soundsource.getName(), this.soundSourceVolumes.get(soundsource)); access.process("soundCategory_" + source.getName(), this.soundSourceVolumes.get(source));
} }
@@ -1486,6 +_,10 @@ @@ -1579,6 +_,10 @@
} }
public void load() { public void load() {
@@ -67,60 +57,64 @@
try { try {
if (!this.optionsFile.exists()) { if (!this.optionsFile.exists()) {
return; return;
@@ -1505,7 +_,8 @@ @@ -1598,7 +_,8 @@
} }
final CompoundTag compoundtag1 = this.dataFix(compoundtag); final CompoundTag options = this.dataFix(rawOptions);
- this.processOptions( - this.processOptions(
+ java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions; + java.util.function.Consumer<FieldAccess> processor = limited ? this::processOptionsKeysOnly : this::processOptions;
+ processor.accept( + processor.accept(
new Options.FieldAccess() { new Options.FieldAccess() {
private @Nullable String getValue(String p_394210_) { {
Tag tag = compoundtag1.get(p_394210_); Objects.requireNonNull(Options.this);
@@ -1585,6 +_,17 @@ @@ -1680,6 +_,17 @@
); );
compoundtag1.getString("fullscreenResolution").ifPresent(p_389133_ -> this.fullscreenVideoModeString = p_389133_); options.getString("fullscreenResolution").ifPresent(fullscreenResolution -> this.fullscreenVideoModeString = fullscreenResolution);
KeyMapping.resetMapping(); KeyMapping.resetMapping();
+ +
+ if (limited) { + if (limited) {
+ this.unknownKeys.clear(); + this.unknownKeys.clear();
+ } else { + } else {
+ var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet()); + var knownKeys = Arrays.stream(this.keyMappings).map(k -> "key_" + k.getName()).collect(Collectors.toSet());
+ for (var entry : compoundtag1.entrySet()) { + for (var entry : options.entrySet()) {
+ if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey())) + if (entry.getKey().startsWith("key_") && entry.getValue().asString().isPresent() && !knownKeys.contains(entry.getKey()))
+ this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get()); + this.unknownKeys.put(entry.getKey(), entry.getValue().asString().get());
+ } + }
+ } + }
+ +
} catch (Exception exception) { } catch (Exception var7) {
LOGGER.error("Failed to load options", (Throwable)exception); LOGGER.error("Failed to load options", (Throwable)var7);
} }
@@ -1612,9 +_,11 @@ @@ -1707,6 +_,7 @@
public void save() { public void save() {
try (final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) { try (final PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.optionsFile), StandardCharsets.UTF_8))) {
printwriter.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version()); writer.println("version:" + SharedConstants.getCurrentVersion().dataVersion().version());
+ var seen = new java.util.HashSet<String>(); + var seen = new java.util.HashSet<String>();
this.processOptions( this.processOptions(
new Options.FieldAccess() { new Options.FieldAccess() {
public void writePrefix(String p_168491_) { {
+ seen.add(p_168491_); @@ -1714,6 +_,7 @@
printwriter.print(p_168491_);
printwriter.print(':');
} }
@@ -1670,6 +_,12 @@
if (s != null) { public void writePrefix(final String name) {
printwriter.println("fullscreenResolution:" + s); + seen.add(name);
writer.print(name);
writer.print(':');
}
@@ -1769,6 +_,12 @@
if (fullscreenVideoModeString != null) {
writer.println("fullscreenResolution:" + fullscreenVideoModeString);
} }
+ // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config. + // Forge add any unknown keys so that Mods can add keybindings between vanilla loading/saving its config.
+ for (var entry : this.unknownKeys.entrySet()) { + for (var entry : this.unknownKeys.entrySet()) {
+ if (!seen.contains(entry.getKey())) + if (!seen.contains(entry.getKey()))
+ printwriter.println(entry.getKey() + ":" + entry.getValue()); + writer.println(entry.getKey() + ":" + entry.getValue());
+ } + }
+ +
} catch (Exception exception) { } catch (Exception var6) {
LOGGER.error("Failed to save options", (Throwable)exception); LOGGER.error("Failed to save options", (Throwable)var6);
} }
@@ -1707,6 +_,7 @@ @@ -1806,6 +_,7 @@
} }
public void broadcastOptions() { public void broadcastOptions() {
@@ -128,10 +122,10 @@
if (this.minecraft.player != null) { if (this.minecraft.player != null) {
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation()); this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
} }
@@ -1820,6 +_,23 @@ @@ -1923,6 +_,23 @@
public static Component genericValueLabel(Component p_231901_, int p_231902_) { public static Component genericValueLabel(final Component caption, final int value) {
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_))); return genericValueLabel(caption, Component.literal(Integer.toString(value)));
+ } + }
+ +
+ private void setForgeKeybindProperties() { + private void setForgeKeybindProperties() {
@@ -151,4 +145,4 @@
+ keySmoothCamera.setKeyConflictContext(inGame); + keySmoothCamera.setKeyConflictContext(inGame);
} }
public static Component genericValueOrOffLabel(Component p_345288_, int p_344826_) { public static Component genericValueOrOffLabel(final Component caption, final int value) {
@@ -1,32 +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
@@ -43,6 +_,13 @@ @@ -44,6 +_,13 @@
file2 = new File(file1, p_92297_); file = new File(picDir, forceName);
} }
+ var event = new net.minecraftforge.client.event.ScreenshotEvent(p_447863_, file2); + var event = new net.minecraftforge.client.event.ScreenshotEvent(image, file);
+ if (net.minecraftforge.client.event.ScreenshotEvent.BUS.post(event)) { + if (net.minecraftforge.client.event.ScreenshotEvent.BUS.post(event)) {
+ p_92301_.accept(event.getCancelMessage()); + callback.accept(event.getCancelMessage());
+ return; + return;
+ } + }
+ final File target = event.getScreenshotFile(); + final File outputFile = event.getScreenshotFile();
+ +
Util.ioPool() Util.ioPool()
.execute( .execute(
() -> { () -> {
@@ -50,10 +_,13 @@ @@ -51,10 +_,13 @@
NativeImage $$4x = p_447863_; NativeImage twrVar0$ = image;
try { try {
- p_447863_.writeToFile(file2); - image.writeToFile(file);
- Component component = Component.literal(file2.getName()) - Component component = Component.literal(file.getName())
+ p_447863_.writeToFile(target); + image.writeToFile(outputFile);
+ Component component = Component.literal(target.getName()) + Component component = Component.literal(outputFile.getName())
.withStyle(ChatFormatting.UNDERLINE) .withStyle(ChatFormatting.UNDERLINE)
.withStyle(p_389149_ -> p_389149_.withClickEvent(new ClickEvent.OpenFile(file2.getAbsoluteFile()))); .withStyle(s -> s.withClickEvent(new ClickEvent.OpenFile(file.getAbsoluteFile())));
+ if (event.getResultMessage() != null) + if (event.getResultMessage() != null)
+ p_92301_.accept(event.getResultMessage()); + callback.accept(event.getResultMessage());
+ else + else
p_92301_.accept(Component.translatable("screenshot.success", component)); callback.accept(Component.translatable("screenshot.success", component));
} catch (Throwable throwable1) { } catch (Throwable var7) {
if (p_447863_ != null) { if (image != null) {
@@ -1,21 +1,22 @@
--- a/net/minecraft/client/ToggleKeyMapping.java --- a/net/minecraft/client/ToggleKeyMapping.java
+++ b/net/minecraft/client/ToggleKeyMapping.java +++ b/net/minecraft/client/ToggleKeyMapping.java
@@ -31,7 +_,7 @@ @@ -38,7 +_,7 @@
@Override @Override
public void setDown(boolean p_92534_) { public void setDown(final boolean down) {
if (this.needsToggle.getAsBoolean()) { if (this.needsToggle.getAsBoolean()) {
- if (p_92534_) { - if (down) {
+ if (p_92534_ && isConflictContextAndModifierActive()) { + if (down && isConflictContextAndModifierActive()) {
super.setDown(!this.isDown()); super.setDown(!this.isDown());
} }
} else { } else {
@@ -56,5 +_,9 @@ @@ -66,5 +_,10 @@
protected void reset() { protected void reset() {
super.setDown(false); super.setDown(false);
+ } + }
+ +
+ @Override public boolean isDown() { + @Override
+ public boolean isDown() {
+ return this.isDown && (isConflictContextAndModifierActive() || needsToggle.getAsBoolean()); + return this.isDown && (isConflictContextAndModifierActive() || needsToggle.getAsBoolean());
} }
} }
@@ -1,44 +1,19 @@
--- 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
@@ -30,7 +_,8 @@ @@ -45,6 +_,7 @@
private static final int DEFAULT = -1; colors.register(List.of(BlockTintSources.constant(-2046180)), Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
public static final int LILY_PAD_IN_WORLD = -14647248; colors.register(List.of(BlockTintSources.stem()), Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
public static final int LILY_PAD_DEFAULT = -9321636; colors.register(List.of(BlockTintSources.constant(-9321636, -14647248)), Blocks.LILY_PAD);
- private final IdMapper<BlockColor> blockColors = new IdMapper<>(32); + net.minecraftforge.client.ForgeHooksClient.onBlockColorsInit(colors);
+ // Forge: Use registry delegate as non-Vanilla block ids are not constant return colors;
+ 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();
public static BlockColors createDefault() {
@@ -95,11 +_,12 @@
}, 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);
+ net.minecraftforge.client.ForgeHooksClient.onBlockColorsInit(blockcolors);
return blockcolors;
} }
public int getColor(BlockState p_92583_, Level p_92584_, BlockPos p_92585_) { @@ -57,6 +_,8 @@
- BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92583_.getBlock())); return layer >= layers.size() ? null : layers.get(layer);
+ BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92583_.getBlock()));
if (blockcolor != null) {
return blockcolor.getColor(p_92583_, null, null, 0);
} else {
@@ -109,13 +_,15 @@
}
public int getColor(BlockState p_92578_, @Nullable BlockAndTintGetter p_92579_, @Nullable BlockPos p_92580_, int p_92581_) {
- BlockColor blockcolor = this.blockColors.byId(BuiltInRegistries.BLOCK.getId(p_92578_.getBlock()));
+ BlockColor blockcolor = this.blockColors.get(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(p_92578_.getBlock()));
return blockcolor == null ? -1 : blockcolor.getColor(p_92578_, p_92579_, p_92580_, p_92581_);
} }
+ /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Block} */ + /** @deprecated Register via {@link net.minecraftforge.client.event.RegisterColorHandlersEvent.Block} */
+ @Deprecated + @Deprecated
public void register(BlockColor p_92590_, Block... p_92591_) { public void register(final List<BlockTintSource> layers, final Block... blocks) {
for (Block block : p_92591_) { for (Block block : blocks) {
- this.blockColors.addMapping(p_92590_, BuiltInRegistries.BLOCK.getId(block)); this.sources.put(block, layers);
+ this.blockColors.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), p_92590_);
}
}
@@ -1,22 +1,22 @@
--- a/net/minecraft/client/data/Main.java --- a/net/minecraft/client/data/Main.java
+++ b/net/minecraft/client/data/Main.java +++ b/net/minecraft/client/data/Main.java
@@ -30,13 +_,18 @@ @@ -28,13 +_,18 @@
OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators"); OptionSpec<Void> clientOption = parser.accepts("client", "Include client generators");
OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators"); OptionSpec<Void> allOption = parser.accepts("all", "Include all generators");
OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated"); OptionSpec<String> outputOption = parser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
+ OptionSpec<String> inputSpec = optionparser.accepts("input", "Input folder").withRequiredArg(); + OptionSpec<String> inputSpec = parser.accepts("input", "Input folder").withRequiredArg();
+ var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(optionparser, true); + var loader = net.minecraftforge.data.loading.DatagenModLoader.setup(parser, true);
OptionSet optionset = optionparser.parse(p_375526_); OptionSet optionSet = parser.parse(args);
- if (!optionset.has(optionspec) && optionset.hasOptions()) { - if (!optionSet.has(helpOption) && optionSet.hasOptions()) {
+ if (!optionset.has(optionspec) && optionset.hasOptions() && loader.hasArgs(optionset)) { + if (!optionSet.has(helpOption) && optionSet.hasOptions() && loader.hasArgs(optionSet)) {
+ var input = optionset.valuesOf(inputSpec).stream().map(Paths::get).toList(); + var input = optionSet.valuesOf(inputSpec).stream().map(Paths::get).toList();
Path path = Paths.get(optionspec3.value(optionset)); Path output = Paths.get(outputOption.value(optionSet));
boolean flag = optionset.has(optionspec2); boolean allOptions = optionSet.has(allOption);
boolean flag1 = flag || optionset.has(optionspec1); boolean client = allOptions || optionSet.has(clientOption);
Bootstrap.bootStrap(); Bootstrap.bootStrap();
ClientBootstrap.bootstrap(); ClientBootstrap.bootstrap();
+ if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true)) + if (!loader.run(optionSet, output, input, allOptions, client, allOptions, allOptions))
+ return; + return;
DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true); DataGenerator generator = new DataGenerator.Cached(output, SharedConstants.getCurrentVersion(), true);
addClientProviders(datagenerator, flag1); addClientProviders(generator, client);
datagenerator.run(); generator.run();
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/data/models/ItemModelGenerators.java --- a/net/minecraft/client/data/models/ItemModelGenerators.java
+++ b/net/minecraft/client/data/models/ItemModelGenerators.java +++ b/net/minecraft/client/data/models/ItemModelGenerators.java
@@ -912,6 +_,9 @@ @@ -909,6 +_,9 @@
this.declareCustomModelItem(Items.COD); this.declareCustomModelItem(Items.COD);
this.declareCustomModelItem(Items.FEATHER); this.declareCustomModelItem(Items.FEATHER);
this.declareCustomModelItem(Items.LEAD); this.declareCustomModelItem(Items.LEAD);
@@ -1,30 +1,30 @@
--- a/net/minecraft/client/data/models/ModelProvider.java --- a/net/minecraft/client/data/models/ModelProvider.java
+++ b/net/minecraft/client/data/models/ModelProvider.java +++ b/net/minecraft/client/data/models/ModelProvider.java
@@ -45,11 +_,11 @@ @@ -43,11 +_,11 @@
@Override @Override
public CompletableFuture<?> run(CachedOutput p_376268_) { public CompletableFuture<?> run(final CachedOutput cache) {
- ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(); - ModelProvider.ItemInfoCollector itemModels = new ModelProvider.ItemInfoCollector();
- ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(); - ModelProvider.BlockStateGeneratorCollector blockStateGenerators = new ModelProvider.BlockStateGeneratorCollector();
+ ModelProvider.ItemInfoCollector modelprovider$iteminfocollector = new ModelProvider.ItemInfoCollector(this::getKnownItems); + ModelProvider.ItemInfoCollector itemModels = new ModelProvider.ItemInfoCollector(this::getKnownItems);
+ ModelProvider.BlockStateGeneratorCollector modelprovider$blockstategeneratorcollector = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks); + ModelProvider.BlockStateGeneratorCollector blockStateGenerators = new ModelProvider.BlockStateGeneratorCollector(this::getKnownBlocks);
ModelProvider.SimpleModelCollector modelprovider$simplemodelcollector = new ModelProvider.SimpleModelCollector(); ModelProvider.SimpleModelCollector simpleModels = new ModelProvider.SimpleModelCollector();
- new BlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run(); - new BlockModelGenerators(blockStateGenerators, itemModels, simpleModels).run();
- new ItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run(); - new ItemModelGenerators(itemModels, simpleModels).run();
+ getBlockModelGenerators(modelprovider$blockstategeneratorcollector, modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run(); + getBlockModelGenerators(blockStateGenerators, itemModels, simpleModels).run();
+ getItemModelGenerators(modelprovider$iteminfocollector, modelprovider$simplemodelcollector).run(); + getItemModelGenerators(itemModels, simpleModels).run();
modelprovider$blockstategeneratorcollector.validate(); blockStateGenerators.validate();
modelprovider$iteminfocollector.finalizeAndValidate(); itemModels.finalizeAndValidate();
return CompletableFuture.allOf( return CompletableFuture.allOf(
@@ -59,6 +_,22 @@ @@ -57,6 +_,22 @@
); );
} }
+ protected Stream<Block> getKnownBlocks() { + protected java.util.stream.Stream<Block> getKnownBlocks() {
+ return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace())); + return BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace()));
+ } + }
+ +
+ protected Stream<Item> getKnownItems() { + protected java.util.stream.Stream<Item> getKnownItems() {
+ return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace())); + return BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace()));
+ } + }
+ +
@@ -39,73 +39,74 @@
@Override @Override
public final String getName() { public final String getName() {
return "Model Definitions"; return "Model Definitions";
@@ -67,6 +_,15 @@ @@ -65,6 +_,15 @@
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> { public static class BlockStateGeneratorCollector implements Consumer<BlockModelDefinitionGenerator> {
private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>(); private final Map<Block, BlockModelDefinitionGenerator> generators = new HashMap<>();
+ private final Supplier<Stream<Block>> known; + private final Supplier<java.util.stream.Stream<Block>> known;
+ +
+ public BlockStateGeneratorCollector() { + public BlockStateGeneratorCollector() {
+ this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace()))); + this(() -> BuiltInRegistries.BLOCK.stream().filter(block -> "minecraft".equals(block.builtInRegistryHolder().key().identifier().getNamespace())));
+ } + }
+ +
+ public BlockStateGeneratorCollector(Supplier<Stream<Block>> known) { + public BlockStateGeneratorCollector(Supplier<java.util.stream.Stream<Block>> known) {
+ this.known = known; + this.known = known;
+ } + }
public void accept(BlockModelDefinitionGenerator p_393399_) { public void accept(final BlockModelDefinitionGenerator generator) {
Block block = p_393399_.block(); Block block = generator.block();
@@ -77,7 +_,7 @@ @@ -75,8 +_,7 @@
} }
public void validate() { public void validate() {
- Stream<Holder.Reference<Block>> stream = BuiltInRegistries.BLOCK.listElements().filter(p_376480_ -> true); - List<Identifier> missingDefinitions = BuiltInRegistries.BLOCK
+ Stream<Holder.Reference<Block>> stream = known.get().map(Block::builtInRegistryHolder); - .listElements()
List<Identifier> list = stream.filter(p_378423_ -> !this.generators.containsKey(p_378423_.value())) + List<Identifier> missingDefinitions = known.get().map(Block::builtInRegistryHolder)
.map(p_447940_ -> p_447940_.key().identifier()) .filter(e -> !this.generators.containsKey(e.value()))
.map(e -> e.key().identifier())
.toList(); .toList();
@@ -97,6 +_,15 @@ @@ -96,6 +_,15 @@
public static class ItemInfoCollector implements ItemModelOutput { public static class ItemInfoCollector implements ItemModelOutput {
private final Map<Item, ClientItem> itemInfos = new HashMap<>(); private final Map<Item, ClientItem> itemInfos = new HashMap<>();
private final Map<Item, Item> copies = new HashMap<>(); private final Map<Item, Item> copies = new HashMap<>();
+ private final Supplier<Stream<Item>> known; + private final Supplier<java.util.stream.Stream<Item>> known;
+ +
+ public ItemInfoCollector() { + public ItemInfoCollector() {
+ this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace()))); + this(() -> BuiltInRegistries.ITEM.stream().filter(item -> "minecraft".equals(item.builtInRegistryHolder().key().identifier().getNamespace())));
+ } + }
+ +
+ public ItemInfoCollector(Supplier<Stream<Item>> known) { + public ItemInfoCollector(Supplier<java.util.stream.Stream<Item>> known) {
+ this.known = known; + this.known = known;
+ } + }
@Override @Override
public void accept(Item p_376450_, ItemModel.Unbaked p_378513_, ClientItem.Properties p_455809_) { public void accept(final Item item, final ItemModel.Unbaked model, final ClientItem.Properties properties) {
@@ -115,7 +_,7 @@ @@ -114,7 +_,7 @@
this.copies.put(p_376965_, p_377438_); this.copies.put(acceptor, donor);
} }
- public void finalizeAndValidate() { - public void finalizeAndValidate() {
+ public void generateDefaultBlockModels() { + public void generateDefaultBlockModels() {
BuiltInRegistries.ITEM.forEach(p_447944_ -> { BuiltInRegistries.ITEM.forEach(item -> {
if (!this.copies.containsKey(p_447944_)) { if (!this.copies.containsKey(item)) {
if (p_447944_ instanceof BlockItem blockitem && !this.itemInfos.containsKey(blockitem)) { if (item instanceof BlockItem blockItem && !this.itemInfos.containsKey(blockItem)) {
@@ -124,6 +_,8 @@ @@ -123,6 +_,8 @@
} }
} }
}); });
+ } + }
+ public void finalizeAndValidate() { + public void finalizeAndValidate() {
this.copies.forEach((p_376289_, p_375718_) -> { this.copies.forEach((acceptor, donor) -> {
ClientItem clientitem = this.itemInfos.get(p_375718_); ClientItem donorInfo = this.itemInfos.get(donor);
if (clientitem == null) { if (donorInfo == null) {
@@ -132,8 +_,8 @@ @@ -131,8 +_,8 @@
this.register(p_376289_, clientitem); this.register(acceptor, donorInfo);
} }
}); });
- List<Identifier> list = BuiltInRegistries.ITEM - List<Identifier> missingDefinitions = BuiltInRegistries.ITEM
- .listElements() - .listElements()
+ List<Identifier> list = known.get() + List<Identifier> missingDefinitions = known.get()
+ .map(item -> item.builtInRegistryHolder()) + .map(item -> item.builtInRegistryHolder())
.filter(p_377225_ -> !this.itemInfos.containsKey(p_377225_.value())) .filter(e -> !this.itemInfos.containsKey(e.value()))
.map(p_447943_ -> p_447943_.key().identifier()) .map(e -> e.key().identifier())
.toList(); .toList();
@@ -1,6 +1,6 @@
--- 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
@@ -32,7 +_,7 @@ @@ -33,7 +_,7 @@
import org.jspecify.annotations.Nullable; import org.jspecify.annotations.Nullable;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
@@ -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
@@ -151,7 +_,7 @@ @@ -150,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,108 +9,108 @@
private final SubtitleOverlay subtitleOverlay; private final SubtitleOverlay subtitleOverlay;
private final SpectatorGui spectatorGui; private final SpectatorGui spectatorGui;
private final PlayerTabOverlay tabList; private final PlayerTabOverlay tabList;
@@ -193,6 +_,7 @@ @@ -192,6 +_,7 @@
() -> new JumpableVehicleBarRenderer(p_330021_) () -> new JumpableVehicleBarRenderer(minecraft)
); );
this.resetTitleTimes(); this.resetTitleTimes();
+ net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.init(this, p_330021_); + net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.init(this, minecraft);
} }
public void resetTitleTimes() { public void resetTitleTimes() {
@@ -203,6 +_,10 @@ @@ -202,6 +_,10 @@
public void render(GuiGraphics p_282884_, DeltaTracker p_342095_) { public void extractRenderState(final GuiGraphicsExtractor graphics, final DeltaTracker deltaTracker) {
if (!(this.minecraft.screen instanceof LevelLoadingScreen)) { if (!(this.minecraft.screen instanceof LevelLoadingScreen)) {
+ if (Boolean.valueOf(true)) { + if (Boolean.valueOf(true)) {
+ net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.beginRender(p_282884_, p_342095_); + net.minecraftforge.client.gui.overlay.ForgeLayeredDraw.extractRenderState(graphics, deltaTracker);
+ return; + return;
+ } + }
if (!this.minecraft.options.hideGui) { if (!this.minecraft.options.hideGui) {
this.renderCameraOverlays(p_282884_, p_342095_); this.extractCameraOverlays(graphics, deltaTracker);
this.renderCrosshair(p_282884_, p_342095_); this.extractCrosshair(graphics, deltaTracker);
@@ -386,7 +_,7 @@ @@ -385,7 +_,7 @@
int i = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window)); int mouseX = Mth.floor(this.minecraft.mouseHandler.getScaledXPos(window));
int j = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window)); int mouseY = Mth.floor(this.minecraft.mouseHandler.getScaledYPos(window));
p_329202_.nextStratum(); graphics.nextStratum();
- this.chat.render(p_329202_, this.getFont(), this.tickCount, i, j, false, false); - this.chat.extractRenderState(graphics, this.getFont(), this.tickCount, mouseX, mouseY, ChatComponent.DisplayMode.BACKGROUND, false);
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(p_329202_, this.chat, window, i, j, this.tickCount, this.getFont()); + net.minecraftforge.client.ForgeHooksClient.onCustomizeChatEvent(graphics, this.chat, window, mouseX, mouseY, this.tickCount, this.getFont());
} }
} }
@@ -476,6 +_,8 @@ @@ -478,6 +_,8 @@
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) { for (MobEffectInstance instance : Ordering.natural().reverse().sortedCopy(activeEffects)) {
Holder<MobEffect> holder = mobeffectinstance.getEffect(); Holder<MobEffect> effect = instance.getEffect();
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance); + var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(instance);
+ if (!renderer.isVisibleInGui(mobeffectinstance)) continue; + if (!renderer.isVisibleInGui(instance)) continue;
if (mobeffectinstance.showIcon()) { if (instance.showIcon()) {
int k = p_282812_.guiWidth(); int x = graphics.guiWidth();
int l = 1; int y = 1;
@@ -506,6 +_,7 @@ @@ -508,6 +_,7 @@
} }
} }
+ if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue; + if (renderer.extractGuiIcon(instance, this, graphics, x, y, 0, alpha)) continue;
p_282812_.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(holder), k + 3, l + 3, 18, 18, ARGB.white(f)); graphics.blitSprite(RenderPipelines.GUI_TEXTURED, getMobEffectSprite(effect), x + 3, y + 3, 18, 18, ARGB.white(alpha));
} }
} }
@@ -601,7 +_,25 @@ @@ -610,15 +_,37 @@
}
} }
public void extractSelectedItemName(final GuiGraphicsExtractor graphics) {
+ renderSelectedItemName(graphics, 0);
+ }
+
+ // Forge: Maintain vanilla parity during FLD#BACKGROUND + // Forge: Maintain vanilla parity during FLD#BACKGROUND
+ public final void updateContextualInfo(final GuiGraphics graphics, DeltaTracker deltaTracker) { + public final void updateContextualInfo(final GuiGraphicsExtractor graphics, DeltaTracker deltaTracker) {
+ Gui.ContextualInfo nextContextualInfo = this.nextContextualInfoState(); + Gui.ContextualInfo nextContextualInfo = this.nextContextualInfoState();
+ if (nextContextualInfo != this.contextualInfoBar.getKey()) { + if (nextContextualInfo != this.contextualInfoBar.getKey()) {
+ this.contextualInfoBar = Pair.of(nextContextualInfo, this.contextualInfoBarRenderers.get(nextContextualInfo).get()); + this.contextualInfoBar = Pair.of(nextContextualInfo, this.contextualInfoBarRenderers.get(nextContextualInfo).get());
+ } + }
+ +
+ this.contextualInfoBar.getValue().renderBackground(graphics, deltaTracker); + this.contextualInfoBar.getValue().extractBackground(graphics, deltaTracker);
+ } + }
+ // Forge: Same as above but for FLD#CONTEXTUAL_INFO + // Forge: Same as above but for FLD#CONTEXTUAL_INFO
+ public final void extractContextualInfoState(final GuiGraphics graphics, DeltaTracker deltaTracker) { + public final void extractContextualInfoState(final GuiGraphicsExtractor graphics, DeltaTracker deltaTracker) {
+ this.contextualInfoBar.getValue().render(graphics, deltaTracker); + this.contextualInfoBar.getValue().extractRenderState(graphics, deltaTracker);
+ } + }
+ +
public void renderSelectedItemName(GuiGraphics p_283501_) { + public void renderSelectedItemName(final GuiGraphicsExtractor graphics, int yShift) {
+ renderSelectedItemName(p_283501_, 0);
+ }
+
+ public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
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 str = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
@@ -609,9 +_,13 @@ if (this.lastToolHighlight.has(DataComponents.CUSTOM_NAME)) {
mutablecomponent.withStyle(ChatFormatting.ITALIC); str.withStyle(ChatFormatting.ITALIC);
} }
- int i = this.getFont().width(mutablecomponent); - int strWidth = this.getFont().width(str);
+ Component highlightTip = this.lastToolHighlight.getHighlightTip(mutablecomponent); + Component highlightTip = this.lastToolHighlight.getHighlightTip(str);
+ Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME); + Font font = net.minecraftforge.client.extensions.common.IClientItemExtensions.of(lastToolHighlight).getFont(lastToolHighlight, net.minecraftforge.client.extensions.common.IClientItemExtensions.FontContext.SELECTED_ITEM_NAME);
+ if (font == null) + if (font == null)
+ font = this.getFont(); + font = this.getFont();
+ int i = font.width(highlightTip); + int strWidth = font.width(highlightTip);
int j = (p_283501_.guiWidth() - i) / 2; int x = (graphics.guiWidth() - strWidth) / 2;
- int k = p_283501_.guiHeight() - 59; - int y = graphics.guiHeight() - 59;
+ int k = p_283501_.guiHeight() - Math.max(yShift, 59); + int y = graphics.guiHeight() - Math.max(yShift, 59);
if (!this.minecraft.gameMode.canHurtPlayer()) { if (!this.minecraft.gameMode.canHurtPlayer()) {
k += 14; y += 14;
} }
@@ -622,7 +_,7 @@ @@ -629,7 +_,7 @@
} }
if (l > 0) { if (alpha > 0) {
- p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, ARGB.white(l)); - graphics.textWithBackdrop(this.getFont(), str, x, y, strWidth, ARGB.white(alpha));
+ p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, ARGB.white(l)); + graphics.textWithBackdrop(font, highlightTip, x, y, strWidth, ARGB.white(alpha));
} }
} }
}
@@ -1148,7 +_,7 @@ @@ -1195,7 +_,9 @@
ItemStack itemstack = this.minecraft.player.getInventory().getSelectedItem();
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()
+ } else if (this.lastToolHighlight.isEmpty() || !itemstack.is(this.lastToolHighlight.getItem()) || !itemstack.getHoverName().equals(this.lastToolHighlight.getHoverName()) || !itemstack.getHighlightTip(itemstack.getHoverName()).equals(lastToolHighlight.getHighlightTip(lastToolHighlight.getHoverName()))) { || !selected.is(this.lastToolHighlight.getItem())
- || !selected.getHoverName().equals(this.lastToolHighlight.getHoverName())) {
+ || !selected.getHoverName().equals(this.lastToolHighlight.getHoverName())
+ || !selected.getHighlightTip(selected.getHoverName()).equals(lastToolHighlight.getHighlightTip(lastToolHighlight.getHoverName()))
+ ) {
this.toolHighlightTimer = (int)(40.0 * this.minecraft.options.notificationDisplayTime().get()); this.toolHighlightTimer = (int)(40.0 * this.minecraft.options.notificationDisplayTime().get());
} else if (this.toolHighlightTimer > 0) { } else if (this.toolHighlightTimer > 0) {
this.toolHighlightTimer--; this.toolHighlightTimer--;
@@ -1,164 +0,0 @@
--- a/net/minecraft/client/gui/GuiGraphics.java
+++ b/net/minecraft/client/gui/GuiGraphics.java
@@ -86,7 +_,7 @@
import org.jspecify.annotations.Nullable;
@OnlyIn(Dist.CLIENT)
-public class GuiGraphics {
+public class GuiGraphics implements net.minecraftforge.client.extensions.IForgeGuiGraphics {
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
final Minecraft minecraft;
private final Matrix3x2fStack pose;
@@ -972,6 +_,7 @@
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_283653_.getItem()));
+ crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(p_283653_.getItem())));
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_283653_.getComponents()));
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_283653_.hasFoil()));
throw new ReportedException(crashreport);
@@ -990,6 +_,7 @@
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
this.pose.popMatrix();
+ net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
}
}
@@ -1001,21 +_,30 @@
this.setTooltipForNextFrame(this.minecraft.font, p_407686_, DefaultTooltipPositioner.INSTANCE, p_410475_, p_407139_, false);
}
+ private ItemStack tooltipStack = ItemStack.EMPTY;
+
public void setTooltipForNextFrame(Font p_408152_, ItemStack p_410145_, int p_410585_, int p_408354_) {
+ this.tooltipStack = p_410145_;
this.setTooltipForNextFrame(
p_408152_, Screen.getTooltipFromItem(this.minecraft, p_410145_), p_410145_.getTooltipImage(), p_410585_, p_408354_, p_410145_.get(DataComponents.TOOLTIP_STYLE)
);
+ this.tooltipStack = ItemStack.EMPTY;
}
public void setTooltipForNextFrame(Font p_407170_, List<Component> p_407123_, Optional<TooltipComponent> p_409349_, int p_406573_, int p_409911_) {
this.setTooltipForNextFrame(p_407170_, p_407123_, p_409349_, p_406573_, p_409911_, null);
}
+ public void setTooltipForNextFrame(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
+ this.tooltipStack = stack;
+ this.setTooltipForNextFrame(font, textComponents, tooltipComponent, mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE));
+ this.tooltipStack = ItemStack.EMPTY;
+ }
+
public void setTooltipForNextFrame(
Font p_408450_, List<Component> p_405939_, Optional<TooltipComponent> p_456997_, int p_409519_, int p_410392_, @Nullable Identifier p_460731_
) {
- List<ClientTooltipComponent> list = p_405939_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
- p_456997_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
+ List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_405939_, p_456997_, p_409519_, guiWidth(), guiHeight(), p_408450_);
this.setTooltipForNextFrameInternal(p_408450_, list, p_409519_, p_410392_, DefaultTooltipPositioner.INSTANCE, p_460731_, false);
}
@@ -1028,7 +_,22 @@
}
public void setComponentTooltipForNextFrame(Font p_406239_, List<Component> p_410275_, int p_410594_, int p_409343_) {
- this.setComponentTooltipForNextFrame(p_406239_, p_410275_, p_410594_, p_409343_, null);
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_410275_, p_410594_, guiWidth(), guiHeight(), p_406239_);
+ this.setTooltipForNextFrameInternal(p_406239_, components, p_410594_, p_409343_, DefaultTooltipPositioner.INSTANCE, null, false);
+ }
+
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
+ this.tooltipStack = stack;
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
+ this.setTooltipForNextFrameInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null, false);
+ this.tooltipStack = ItemStack.EMPTY;
+ }
+
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
+ this.tooltipStack = stack;
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
+ this.setTooltipForNextFrameInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null, false);
+ this.tooltipStack = ItemStack.EMPTY;
}
public void setComponentTooltipForNextFrame(Font p_408650_, List<Component> p_407512_, int p_406019_, int p_408123_, @Nullable Identifier p_456486_) {
@@ -1073,24 +_,31 @@
int p_407794_,
int p_408784_,
ClientTooltipPositioner p_408798_,
- @Nullable Identifier p_451079_,
+ @Nullable Identifier p_456486_,
boolean p_410618_
) {
if (!p_409928_.isEmpty()) {
if (this.deferredTooltip == null || p_410618_) {
- this.deferredTooltip = () -> this.renderTooltip(p_406605_, p_409928_, p_407794_, p_408784_, p_408798_, p_451079_);
+ final var stackContext = this.tooltipStack;
+ this.deferredTooltip = () -> this.renderTooltip(p_406605_, p_409928_, p_407794_, p_408784_, p_408798_, p_456486_, stackContext);
}
}
+ }
+
+ public void renderTooltip(Font p_283128_, List<ClientTooltipComponent> p_282716_, int p_283678_, int p_281696_, ClientTooltipPositioner p_409451_, @Nullable Identifier p_456486_) {
+ renderTooltip(p_283128_, p_282716_, p_283678_, p_281696_, p_409451_, p_456486_, ItemStack.EMPTY);
}
public void renderTooltip(
- Font p_283128_, List<ClientTooltipComponent> p_282716_, int p_283678_, int p_281696_, ClientTooltipPositioner p_409451_, @Nullable Identifier p_459396_
+ Font p_283128_, List<ClientTooltipComponent> p_282716_, int p_283678_, int p_281696_, ClientTooltipPositioner p_409451_, @Nullable Identifier p_459396_, ItemStack itemstack
) {
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(itemstack, this, p_283678_, p_281696_, guiWidth(), guiHeight(), p_282716_, p_283128_, p_409451_, p_459396_);
+ if (preEvent == null) return;
int i = 0;
int j = p_282716_.size() == 1 ? -2 : 0;
for (ClientTooltipComponent clienttooltipcomponent : p_282716_) {
- int k = clienttooltipcomponent.getWidth(p_283128_);
+ int k = clienttooltipcomponent.getWidth(preEvent.getFont());
if (k > i) {
i = k;
}
@@ -1100,16 +_,16 @@
int l1 = i;
int i2 = j;
- Vector2ic vector2ic = p_409451_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283678_, p_281696_, i, j);
+ Vector2ic vector2ic = p_409451_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i, j);
int l = vector2ic.x();
int i1 = vector2ic.y();
this.pose.pushMatrix();
- TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, p_459396_);
+ TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, preEvent.getBackground());
int j1 = i1;
for (int k1 = 0; k1 < p_282716_.size(); k1++) {
ClientTooltipComponent clienttooltipcomponent1 = p_282716_.get(k1);
- clienttooltipcomponent1.renderText(this, p_283128_, l, j1);
+ clienttooltipcomponent1.renderText(this, preEvent.getFont(), l, j1);
j1 += clienttooltipcomponent1.getHeight(p_283128_) + (k1 == 0 ? 2 : 0);
}
@@ -1117,7 +_,7 @@
for (int j2 = 0; j2 < p_282716_.size(); j2++) {
ClientTooltipComponent clienttooltipcomponent2 = p_282716_.get(j2);
- clienttooltipcomponent2.renderImage(p_283128_, l, j1, l1, i2, this);
+ clienttooltipcomponent2.renderImage(preEvent.getFont(), l, j1, l1, i2, this);
j1 += clienttooltipcomponent2.getHeight(p_283128_) + (j2 == 0 ? 2 : 0);
}
@@ -1328,6 +_,14 @@
public void submitProfilerChartRenderState(List<ResultField> p_408565_, int p_410147_, int p_406156_, int p_407365_, int p_408180_) {
this.guiRenderState.submitPicturesInPictureState(new GuiProfilerChartRenderState(p_408565_, p_410147_, p_406156_, p_407365_, p_408180_, this.scissorStack.peek()));
+ }
+
+ public GuiRenderState getRenderState() {
+ return this.guiRenderState;
+ }
+
+ public GuiGraphics.ScissorStack getScissorStack() {
+ return this.scissorStack;
}
public TextureAtlasSprite getSprite(Material p_430745_) {
@@ -0,0 +1,174 @@
--- a/net/minecraft/client/gui/GuiGraphicsExtractor.java
+++ b/net/minecraft/client/gui/GuiGraphicsExtractor.java
@@ -88,7 +_,7 @@
import org.jspecify.annotations.Nullable;
@OnlyIn(Dist.CLIENT)
-public class GuiGraphicsExtractor {
+public class GuiGraphicsExtractor implements net.minecraftforge.client.extensions.IForgeGuiGraphicsExtractor {
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
private final Minecraft minecraft;
private final Matrix3x2fStack pose;
@@ -914,6 +_,7 @@
CrashReport report = CrashReport.forThrowable(var11, "Rendering item");
CrashReportCategory category = report.addCategory("Item being rendered");
category.setDetail("Item Type", () -> String.valueOf(itemStack.getItem()));
+ category.setDetail("Registry Name", () -> String.valueOf(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(itemStack.getItem())));
category.setDetail("Item Components", () -> String.valueOf(itemStack.getComponents()));
category.setDetail("Item Foil", () -> String.valueOf(itemStack.hasFoil()));
throw new ReportedException(report);
@@ -940,6 +_,7 @@
this.itemCooldown(itemStack, x, y);
this.itemCount(font, itemStack, x, y, countText);
this.pose.popMatrix();
+ net.minecraftforge.client.ItemDecoratorHandler.of(itemStack).render(this, font, itemStack, x, y);
}
}
@@ -1112,16 +_,25 @@
this.setTooltipForNextFrame(this.minecraft.font, formattedCharSequences, DefaultTooltipPositioner.INSTANCE, x, y, false);
}
+ private ItemStack tooltipStack = ItemStack.EMPTY;
public void setTooltipForNextFrame(final Font font, final ItemStack itemStack, final int xo, final int yo) {
+ this.tooltipStack = itemStack;
this.setTooltipForNextFrame(
font, Screen.getTooltipFromItem(this.minecraft, itemStack), itemStack.getTooltipImage(), xo, yo, itemStack.get(DataComponents.TOOLTIP_STYLE)
);
+ this.tooltipStack = ItemStack.EMPTY;
}
public void setTooltipForNextFrame(final Font font, final List<Component> texts, final Optional<TooltipComponent> optionalImage, final int xo, final int yo) {
this.setTooltipForNextFrame(font, texts, optionalImage, xo, yo, null);
}
+ public void setTooltipForNextFrame(Font font, List<Component> texts, Optional<TooltipComponent> optionalImage, ItemStack stack, int xo, int yo) {
+ this.tooltipStack = stack;
+ this.setTooltipForNextFrame(font, texts, optionalImage, xo, yo, stack.get(DataComponents.TOOLTIP_STYLE));
+ this.tooltipStack = ItemStack.EMPTY;
+ }
+
public void setTooltipForNextFrame(
final Font font,
final List<Component> texts,
@@ -1130,11 +_,7 @@
final int yo,
final @Nullable Identifier style
) {
- List<ClientTooltipComponent> components = texts.stream()
- .map(Component::getVisualOrderText)
- .map(ClientTooltipComponent::create)
- .collect(Util.toMutableList());
- optionalImage.ifPresent(image -> components.add(components.isEmpty() ? 0 : 1, ClientTooltipComponent.create(image)));
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, texts, optionalImage, xo, guiWidth(), guiHeight(), font);
this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, style, false);
}
@@ -1162,7 +_,22 @@
}
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo) {
- this.setComponentTooltipForNextFrame(font, lines, xo, yo, null);
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, lines, xo, guiWidth(), guiHeight(), font);
+ this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, null, false);
+ }
+
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> lines, int xo, int yo, ItemStack stack) {
+ this.tooltipStack = stack;
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, lines, xo, guiWidth(), guiHeight(), font);
+ this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, null, false);
+ this.tooltipStack = ItemStack.EMPTY;
+ }
+
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> lines, int xo, int yo, ItemStack stack) {
+ this.tooltipStack = stack;
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, lines, xo, guiWidth(), guiHeight(), font);
+ this.setTooltipForNextFrameInternal(font, components, xo, yo, DefaultTooltipPositioner.INSTANCE, null, false);
+ this.tooltipStack = ItemStack.EMPTY;
}
public void setComponentTooltipForNextFrame(final Font font, final List<Component> lines, final int xo, final int yo, final @Nullable Identifier style) {
@@ -1213,10 +_,16 @@
) {
if (!lines.isEmpty()) {
if (this.deferredTooltip == null || replaceExisting) {
- this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style);
+ final var stackContext = this.tooltipStack;
+ this.deferredTooltip = () -> this.tooltip(font, lines, xo, yo, positioner, style, stackContext);
}
}
}
+
+ public void tooltip(Font font, List<ClientTooltipComponent> lines, int xo, int yo, ClientTooltipPositioner positioner, @Nullable Identifier style) {
+ tooltip(font, lines, xo, yo, positioner, style, ItemStack.EMPTY);
+ }
+
public void tooltip(
final Font font,
@@ -1224,13 +_,16 @@
final int xo,
final int yo,
final ClientTooltipPositioner positioner,
- final @Nullable Identifier style
+ final @Nullable Identifier style,
+ ItemStack itemstack
) {
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(itemstack, this, xo, yo, guiWidth(), guiHeight(), lines, font, positioner, style);
+ if (preEvent == null) return;
int textWidth = 0;
int tempHeight = lines.size() == 1 ? -2 : 0;
for (ClientTooltipComponent line : lines) {
- int lineWidth = line.getWidth(font);
+ int lineWidth = line.getWidth(preEvent.getFont());
if (lineWidth > textWidth) {
textWidth = lineWidth;
}
@@ -1240,25 +_,25 @@
int w = textWidth;
int h = tempHeight;
- Vector2ic positionedTooltip = positioner.positionTooltip(this.guiWidth(), this.guiHeight(), xo, yo, textWidth, tempHeight);
+ Vector2ic positionedTooltip = positioner.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), textWidth, tempHeight);
int x = positionedTooltip.x();
int y = positionedTooltip.y();
this.pose.pushMatrix();
- TooltipRenderUtil.extractTooltipBackground(this, x, y, textWidth, tempHeight, style);
+ TooltipRenderUtil.extractTooltipBackground(this, x, y, textWidth, tempHeight, preEvent.getBackground());
int localY = y;
for (int i = 0; i < lines.size(); i++) {
ClientTooltipComponent line = lines.get(i);
- line.extractText(this, font, x, localY);
- localY += line.getHeight(font) + (i == 0 ? 2 : 0);
+ line.extractText(this, preEvent.getFont(), x, localY);
+ localY += line.getHeight(preEvent.getFont()) + (i == 0 ? 2 : 0);
}
localY = y;
for (int i = 0; i < lines.size(); i++) {
ClientTooltipComponent line = lines.get(i);
- line.extractImage(font, x, localY, w, h, this);
- localY += line.getHeight(font) + (i == 0 ? 2 : 0);
+ line.extractImage(preEvent.getFont(), x, localY, w, h, this);
+ localY += line.getHeight(preEvent.getFont()) + (i == 0 ? 2 : 0);
}
this.pose.popMatrix();
@@ -1333,6 +_,14 @@
private ActiveTextCollector.Parameters createDefaultTextParameters(final float opacity) {
return new ActiveTextCollector.Parameters(new Matrix3x2f(this.pose), opacity, this.scissorStack.peek());
+ }
+
+ public GuiRenderState getRenderState() {
+ return this.guiRenderState;
+ }
+
+ public GuiGraphicsExtractor.ScissorStack getScissorStack() {
+ return this.scissorStack;
}
@OnlyIn(Dist.CLIENT)
@@ -1,7 +1,7 @@
--- 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
@@ -221,6 +_,23 @@ @@ -221,6 +_,23 @@
this.focused = p_93693_; this.focused = focused;
} }
+ public static final int UNSET_FG_COLOR = -1; + public static final int UNSET_FG_COLOR = -1;
@@ -1,20 +1,20 @@
--- a/net/minecraft/client/gui/components/BossHealthOverlay.java --- a/net/minecraft/client/gui/components/BossHealthOverlay.java
+++ b/net/minecraft/client/gui/components/BossHealthOverlay.java +++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
@@ -67,13 +_,16 @@ @@ -68,13 +_,16 @@
for (LerpingBossEvent lerpingbossevent : this.events.values()) { for (LerpingBossEvent event : this.events.values()) {
int k = i / 2 - 91; int xLeft = screenWidth / 2 - 91;
+ var event = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(p_283175_, this.minecraft.getWindow(), lerpingbossevent, k, j, 10 + this.minecraft.font.lineHeight); + var progressEvent = net.minecraftforge.client.ForgeHooksClient.onCustomizeBossEventProgress(graphics, this.minecraft.getWindow(), event, xLeft, yOffset, 10 + this.minecraft.font.lineHeight);
+ if (event != null) { + if (progressEvent != null) {
this.drawBar(p_283175_, k, j, lerpingbossevent); this.extractBar(graphics, xLeft, yOffset, event);
Component component = lerpingbossevent.getName(); Component msg = event.getName();
int l = this.minecraft.font.width(component); int width = this.minecraft.font.width(msg);
int i1 = i / 2 - l / 2; int x = screenWidth / 2 - width / 2;
int j1 = j - 9; int y = yOffset - 9;
p_283175_.drawString(this.minecraft.font, component, i1, j1, -1); graphics.text(this.minecraft.font, msg, x, y, -1);
- j += 10 + 9; - yOffset += 10 + 9;
+ } + }
+ j += event.getIncrement(); + yOffset += progressEvent.getIncrement();
if (j >= p_283175_.guiHeight() / 3) { if (yOffset >= graphics.guiHeight() / 3) {
break; break;
} }
@@ -1,7 +1,7 @@
--- a/net/minecraft/client/gui/components/Button.java --- a/net/minecraft/client/gui/components/Button.java
+++ b/net/minecraft/client/gui/components/Button.java +++ b/net/minecraft/client/gui/components/Button.java
@@ -33,6 +_,12 @@ @@ -39,6 +_,12 @@
this.createNarration = p_259552_; this.createNarration = createNarration;
} }
+ // Forge (GH-9238) + // Forge (GH-9238)
@@ -11,9 +11,9 @@
+ } + }
+ +
@Override @Override
public void onPress(InputWithModifiers p_424878_) { public void onPress(final InputWithModifiers input) {
this.onPress.onPress(this); this.onPress.onPress(this);
@@ -96,9 +_,12 @@ @@ -102,9 +_,12 @@
} }
public Button build() { public Button build() {
@@ -29,10 +29,10 @@
} }
} }
@@ -118,6 +_,10 @@ @@ -130,6 +_,10 @@
int p_455297_, int p_455388_, int p_459653_, int p_452847_, Component p_459347_, Button.OnPress p_453378_, Button.CreateNarration p_456163_ final Button.CreateNarration createNarration
) { ) {
super(p_455297_, p_455388_, p_459653_, p_452847_, p_459347_, p_453378_, p_456163_); super(x, y, width, height, message, onPress, createNarration);
+ } + }
+ +
+ protected Plain(Builder builder) { + protected Plain(Builder builder) {
@@ -1,10 +1,10 @@
--- a/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java --- a/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java
+++ b/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java +++ b/net/minecraft/client/gui/components/debug/DebugEntryLookingAtEntity.java
@@ -25,6 +_,7 @@ @@ -29,6 +_,7 @@
if (entity != null) { if (entity != null) {
list.add(ChatFormatting.UNDERLINE + "Targeted Entity"); result.add(ChatFormatting.UNDERLINE + "Targeted Entity");
list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()))); result.add(entity.typeHolder().getRegisteredName());
+ entity.getType().builtInRegistryHolder().tags().forEach(t -> list.add("#" + t.location())); + entity.getType().builtInRegistryHolder().tags().forEach(t -> result.add("#" + t.location()));
} }
p_426755_.addToGroup(GROUP, list); displayer.addToGroup(GROUP, result);
@@ -1,10 +1,10 @@
--- 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
@@ -142,6 +_,7 @@ @@ -143,6 +_,7 @@
} }
public void addToast(Toast p_360768_) { public void addToast(final Toast toast) {
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onToastAdd(p_360768_)) return; + if (net.minecraftforge.client.event.ForgeEventFactoryClient.onToastAdd(toast)) return;
this.queued.add(p_360768_); this.queued.add(toast);
} }
@@ -1,10 +1,10 @@
--- a/net/minecraft/client/gui/render/GuiRenderer.java --- a/net/minecraft/client/gui/render/GuiRenderer.java
+++ b/net/minecraft/client/gui/render/GuiRenderer.java +++ b/net/minecraft/client/gui/render/GuiRenderer.java
@@ -138,6 +_,7 @@ @@ -130,6 +_,7 @@
builder.put((Class<? extends PictureInPictureRenderState>)pictureinpicturerenderer.getRenderStateClass(), pictureinpicturerenderer); builder.put((Class<? extends PictureInPictureRenderState>)pictureInPictureRenderer.getRenderStateClass(), pictureInPictureRenderer);
} }
+ net.minecraftforge.client.ForgeHooksClient.onRegisterPictureInPictureRenderers(p_410565_, p_410441_, builder); + net.minecraftforge.client.ForgeHooksClient.onRegisterPictureInPictureRenderers(pictureInPictureRenderers, bufferSource, builder);
this.pictureInPictureRenderers = builder.buildOrThrow(); this.pictureInPictureRenderers = builder.buildOrThrow();
} }
@@ -1,10 +1,10 @@
--- a/net/minecraft/client/gui/screens/ChatScreen.java --- a/net/minecraft/client/gui/screens/ChatScreen.java
+++ b/net/minecraft/client/gui/screens/ChatScreen.java +++ b/net/minecraft/client/gui/screens/ChatScreen.java
@@ -115,6 +_,7 @@ @@ -139,6 +_,7 @@
} else if (p_426273_.isConfirmation()) { this.handleChatInput(this.input.getValue(), true);
this.handleChatInput(this.input.getValue(), true); if (this.closeOnSubmit) {
this.exitReason = ChatScreen.ExitReason.DONE; this.exitReason = ChatScreen.ExitReason.DONE;
+ if (this.minecraft.screen == this) // FORGE: Prevent closing the screen if another screen has been opened. + if (this.minecraft.screen == this) // FORGE: Prevent closing the screen if another screen has been opened.
this.minecraft.setScreen(null); this.minecraft.setScreen(null);
return true; } else {
} else { this.input.setValue("");
@@ -1,11 +1,11 @@
--- a/net/minecraft/client/gui/screens/ConnectScreen.java --- a/net/minecraft/client/gui/screens/ConnectScreen.java
+++ b/net/minecraft/client/gui/screens/ConnectScreen.java +++ b/net/minecraft/client/gui/screens/ConnectScreen.java
@@ -102,6 +_,8 @@ @@ -114,6 +_,8 @@
} }
if (optional.isEmpty()) { if (resolvedAddress.isEmpty()) {
+ ConnectScreen.LOGGER.error("Couldn't connect to server: Unknown host \"{}\"", p_249536_.getHost()); + ConnectScreen.LOGGER.error("Couldn't connect to server: Unknown host \"{}\"", hostAndPort.getHost());
+ net.minecraftforge.network.DualStackUtils.logInitialPreferences(); + net.minecraftforge.network.DualStackUtils.logInitialPreferences();
p_251955_.execute( minecraft.execute(
() -> p_251955_.setScreen(new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.connectFailedTitle, ConnectScreen.UNKNOWN_HOST_MESSAGE)) () -> minecraft.setScreen(
); new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.connectFailedTitle, ConnectScreen.UNKNOWN_HOST_MESSAGE)
Loaded 100 of 1600 files, more files were not shown because too many files have changed in this diff. Show more