diff --git a/common/build.gradle b/common/build.gradle index c6adc99..f7233a2 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -41,26 +41,18 @@ clean { def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) ['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'common') - } - } + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'common') + } + } +} +sourceSets.configureEach { + [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant-> + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'common') + } } - } catch (Exception ignored) {} -} -sourceSets.configureEach { - [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'common') - } - } - } - } catch (Exception ignored) {} } } diff --git a/fabric/build.gradle b/fabric/build.gradle index 0742ef6..d82d9b6 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -136,26 +136,18 @@ loom { def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) ['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements', 'includeInternal', 'modCompileClasspath'].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'fabric') - } - } + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'fabric') } - } catch (Exception ignored) {} + } } sourceSets.configureEach { - [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'fabric') - } - } + [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName].each { variant-> + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'fabric') } - } catch (Exception ignored) {} + } } } \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 9b92790..45f41c4 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -31,7 +31,7 @@ neoForge { ) } data { - data() + clientData() // DataGen can be run by - "./gradlew :neoforge:runData" in Terminal. // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. @@ -108,28 +108,21 @@ tasks.named('build') { sourceSets.main.resources.srcDir project(':common').file('src/generated/resources') +// Implement mcgradleconventions loader attribute def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String) ['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements'].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'neoforge') - } - } + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'neoforge') } - } catch (Exception ignored) {} + } } sourceSets.configureEach { [it.compileClasspathConfigurationName, it.runtimeClasspathConfigurationName, it.getTaskName(null, 'jarJar')].each { variant -> - try { - configurations.named(variant) { - if (!it.isLocked()) { - attributes { - attribute(loaderAttribute, 'neoforge') - } - } + configurations.named("$variant") { + attributes { + attribute(loaderAttribute, 'neoforge') } - } catch (Exception ignored) {} + } } } \ No newline at end of file