Skip to content

Commit 38df9d9

Browse files
committed
Prefer toolchain jvm for S2S
Also, configure filterJarNew (oops)
1 parent 5e42a02 commit 38df9d9

File tree

7 files changed

+7
-8
lines changed

7 files changed

+7
-8
lines changed

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gradle.beforeProject { Project project ->
2020

2121
//@formatter:off
2222
dependencyResolutionManagement.versionCatalogs.register('libs') {
23-
version 'gradleutils', '3.3.23'
23+
version 'gradleutils', '3.3.24'
2424

2525
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
2626
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils'

src/main/groovy/net/minecraftforge/forgedev/ForgeDevExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,8 @@ private void setup(ForgeDevPlugin plugin, Project project) {
339339
var extractSrg = tasks.register("extractSrg", MavenizerMCPDataTask.class, task -> task.getArtifact().set(legacyMcp.getConfig()));
340340
createMcp2Srg.configure(task -> task.getMcpSrgData().convention(extractSrg.flatMap(MavenizerMCPDataTask::getOutput)));
341341

342-
// TODO Configure filterNew
342+
filterNew.configure(task -> task.getBlacklist().from(jar.flatMap(AbstractArchiveTask::getArchiveFile)));
343+
343344
tasks.withType(LegacyGenerateSRG.class, task -> task.getMappingsZip().fileProvider(mappingsZipFile));
344345

345346
createMcp2Obf.configure(task -> task.getMcpSrgData().convention(createMcp2Srg.flatMap(LegacyGenerateSRG::getMcpSrgData)));

src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/S2SExec.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import javax.inject.Inject
2828
S2SExec() {
2929
super(Tools.SRG2SRC)
3030

31+
this.preferToolchainJvm.set(true)
32+
3133
this.standardOutputLogLevel.set(LogLevel.INFO)
3234
}
3335

0 commit comments

Comments
 (0)