diff --git a/build.gradle.kts b/build.gradle.kts index f544229..458f7da 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,8 +64,19 @@ sourceSets { } } -configurations.implementation { - extendsFrom(shade) +configurations { + implementation { + extendsFrom(shade) + } + + runtimeElements { + setExtendsFrom(setOf()) + + outgoing { + artifacts.clear() + artifact(tasks.shadowJar) + } + } } repositories { @@ -176,10 +187,6 @@ tasks { archiveClassifier.set("full") } - withType { - isEnabled = false - } - assemble { dependsOn(shadowJar) } @@ -222,9 +229,11 @@ open class GenerateMergedMappingsTask : DefaultTask() { fun execute() { // OFFICIAL -> MOJANG -> INTERMEDIARY val yarnTree = MemoryMappingTree() - val renamer = MappingNsRenamer(yarnTree, mapOf( - MappingsNamespace.NAMED.toString() to MappingsNamespace.MOJANG.toString() - )) + val renamer = MappingNsRenamer( + yarnTree, mapOf( + MappingsNamespace.NAMED.toString() to MappingsNamespace.MOJANG.toString() + ) + ) MappingReader.read(inputMojangMappings.get().asFile.toPath(), renamer) FileSystems.newFileSystem(inputYarnMappings.asFile.get().toPath()).use { val mappings = it.getPath("mappings", "mappings.tiny") @@ -240,7 +249,11 @@ open class GenerateMergedMappingsTask : DefaultTask() { // OFFICIAL -> INTERMEDIARY -> MOJANG val completed = MemoryMappingTree() - val reorder = MappingDstNsReorder(completed, MappingsNamespace.INTERMEDIARY.toString(), MappingsNamespace.MOJANG.toString()) + val reorder = MappingDstNsReorder( + completed, + MappingsNamespace.INTERMEDIARY.toString(), + MappingsNamespace.MOJANG.toString() + ) val completer = MappingNsCompleter( reorder, mapOf(MappingsNamespace.INTERMEDIARY.toString() to MappingsNamespace.OFFICIAL.toString()) diff --git a/gradle.properties b/gradle.properties index b8b08ad..da98c42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx3G loom.platform=neoforge versionMc=1.21 -versionForge=21.0.4-beta +versionForge=21.0.55-beta versionLoaderUpstream=0.15.10 versionYarn=1.21-rc1+build.1 diff --git a/settings.gradle.kts b/settings.gradle.kts index 43c0611..ec44f51 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,5 +19,5 @@ pluginManagement { } } -rootProject.name = "fabric-loader" +rootProject.name = "forgified-fabric-loader"