Conversation
Jonathing
commented
Dec 7, 2025
- Ports [1.21.5] ForgeDev 7 #10728 to 1.21.10.
LexManos
left a comment
There was a problem hiding this comment.
Mostly minor questions/nitpicks.
Now for the diff, fmlcore has a parameter renamed in VersionChecker$1. Not a big deal
The universal jars don't have jarjar_options.json
syncMavenizer/syncMavenizerExtra are not dependencies of publish so need to be done manually.
And couple of issues on eclipse end. Will look again when you tell me to on discord.
| plugin 'apt', 'com.diffplug.eclipse.apt' version '4.4.1' | ||
|
|
||
| // TODO [Forge][Buildscript We should not be needing to manually add transitive dependencies | ||
| // If we need to make strict versions for dependencies, we should do so using dependency constraints |
There was a problem hiding this comment.
We need to manually set transitive dependencies so that the installer only includes the things that we need.
We dont want random things like guava's fake annotation library.
| } | ||
|
|
||
| dependencyResolutionManagement.versionCatalogs { | ||
| register('bootLibs') { |
There was a problem hiding this comment.
I would rename this to something like variables or something. These really arnt bootLibs.
And then we should have a section called bootLibs that ist he old bootstrap config. So that we know what files need to be on the boot classpath.
|
|
||
| api(libs.eventbus) | ||
| annotationProcessor(libs.eventbus.validator) | ||
| api libs.eventbus |
| 'FMLModType' : 'LIBRARY' | ||
| ]) | ||
| attributes([ | ||
| 'Specification-Title' : gradleutils.displayName.get(), |
There was a problem hiding this comment.
Might actually be worth making a GU helper for this.
Tho in 26.1 its going away.
| useJUnitPlatform() | ||
| // See gradle/gradle#35070 (https://github.com/gradle/gradle/issues/35070) | ||
| // We are making the list of providers first BEFORE mapping them to a provider of the resolved objects so that they can be finalized after configuration. | ||
| var lwjglTestLibs = [ |
There was a problem hiding this comment.
Early display doesn't have a test workspace, so these libraries are probably not needed.
Also because of JPMS tests should be is a separate project.
I'd just strip it out for the time being until we decode what 'tests' need to be run.
And how it'd unit test a graphics process.
| 'Automatic-Module-Name': 'net.minecraftforge.forge.transformers', | ||
| 'Forge-Module-Layer': 'boot' | ||
| ] as LinkedHashMap) | ||
| 'FMLModType' : 'boot' |
| 'Implementation-Title' : gradleutils.displayName.get(), | ||
| 'Implementation-Vendor' : vendor, | ||
| 'Implementation-Version': forgeVersion | ||
| ], 'net/minecraftforge/fml/javafmlmod/') |
| installer projects.mclanguage | ||
| installer projects.forgeTransformers | ||
|
|
||
| installerextra mcpSrg2OffString |
There was a problem hiding this comment.
Why is this special from any of the other installer deps?
| input = project(':mcp').setupMCP.output | ||
| } | ||
| */ | ||
| tasks.named('userdevJar') { onlyIf = { true } } |
|
@Jonathing, this pull request has conflicts, please resolve them for this PR to move forward. |