From ae9db3fbbd995cd36a103ffacbcbf1d2fc248c7b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 19 Mar 2024 22:15:33 +0000 Subject: [PATCH] Fix datagen run config having incorrect name. Closes #1000 --- .../net/fabricmc/loom/configuration/FabricApiExtension.java | 2 +- .../fabricmc/loom/test/integration/DataGenerationTest.groovy | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java b/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java index 4fde07fd..67d97342 100644 --- a/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java +++ b/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java @@ -181,8 +181,8 @@ public abstract class FabricApiExtension { if (settings.getCreateRunConfiguration().get()) { extension.getRunConfigs().create("datagen", run -> { - run.setConfigName("Data Generation"); run.inherit(extension.getRunConfigs().getByName("server")); + run.setConfigName("Data Generation"); run.property("fabric-api.datagen"); run.property("fabric-api.datagen.output-dir", outputDirectory.getAbsolutePath()); diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/DataGenerationTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/DataGenerationTest.groovy index 778b6611..80ee747a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/DataGenerationTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/DataGenerationTest.groovy @@ -88,12 +88,15 @@ class DataGenerationTest extends Specification implements GradleProjectTestTrait modDatagenImplementation fabricApi.module("fabric-data-generation-api-v1", "0.90.0+1.20.2") } + + println("%%" + loom.runs.datagen.configName + "%%") ''' when: def result = gradle.run(task: "runDatagen") then: result.task(":runDatagen").outcome == SUCCESS + result.output.contains("%%Data Generation%%") where: version << STANDARD_TEST_VERSIONS