Fabric/src/main/resources/fabric.mod.json

@@ -6,7 +6,7 @@
   "version": "${version}",
   "license": "${license}",
   
-  "icon": "assets/${id}/logo.png",
+  "icon": "assets/bettercontrols/icon.png",
   
   "authors": [
     "${author}"

NeoForge/src/main/resources/META-INF/neoforge.mods.toml

@@ -11,7 +11,7 @@ displayURL = "${sourcesURL}"
 description = "${description}"
 authors = "${author}"
 version = "${version}"
-logoFile = "assets/${id}/logo.png"
+logoFile = "icon.png"
 
 [[mixins]]
 config = "${id}.mixins.json"

build.gradle.kts

@@ -1,6 +1,6 @@
 @file:Suppress("ConvertLambdaToReference")
 
-import org.gradle.jvm.tasks.Jar
+import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
 
 val modId: String by project
 val modName: String by project
@@ -50,16 +50,6 @@ base {
 	archivesName.set("$modNameStripped-Common")
 }
 
-loom {
-	runs {
-		named("client") {
-			ideConfigGenerated(false)
-		}
-		
-		findByName("server")?.let(::remove)
-	}
-}
-
 dependencies {
 	minecraft("com.mojang:minecraft:$minecraftVersion")
 	mappings(loom.officialMojangMappings())
@@ -94,24 +84,6 @@ allprojects {
 	dependencies {
 		implementation("org.jetbrains:annotations:24.1.0")
 	}
-	
-	tasks.withType<ProcessResources> {
-		inputs.property("id", modId)
-		inputs.property("name", modName)
-		inputs.property("description", modDescription)
-		inputs.property("version", modVersion)
-		inputs.property("author", modAuthor)
-		inputs.property("license", modLicense)
-		inputs.property("sourcesURL", modSourcesURL)
-		inputs.property("issuesURL", modIssuesURL)
-		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
-		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
-		inputs.property("minimumFabricVersion", minimumFabricVersion)
-		
-		from(rootProject.file("logo.png")) {
-			into("assets/$modId")
-		}
-	}
 }
 
 subprojects {
@@ -130,6 +102,18 @@ subprojects {
 	}
 	
 	tasks.processResources {
+		inputs.property("id", modId)
+		inputs.property("name", modName)
+		inputs.property("description", modDescription)
+		inputs.property("version", modVersion)
+		inputs.property("author", modAuthor)
+		inputs.property("license", modLicense)
+		inputs.property("sourcesURL", modSourcesURL)
+		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
 		from(rootProject.sourceSets.main.get().resources) {
 			expand(inputs.properties)
 		}
@@ -137,12 +121,18 @@ subprojects {
 	
 	tasks.jar {
 		archiveVersion.set(jarVersion)
-		entryCompression = ZipEntryCompression.STORED
 		
 		from(rootProject.file("LICENSE"))
 		
 		manifest {
-			packageInformation(modId, "$modNameStripped-${project.name}")
+			attributes(
+				"Specification-Title" to modId,
+				"Specification-Vendor" to modAuthor,
+				"Specification-Version" to "1",
+				"Implementation-Title" to "$modNameStripped-${project.name}",
+				"Implementation-Vendor" to modAuthor,
+				"Implementation-Version" to modVersion,
+			)
 		}
 	}
 	
@@ -151,54 +141,37 @@ subprojects {
 	}
 }
 
-fun Manifest.packageInformation(specificationTitle: String, implementationTitle: String) {
-	attributes(
-		"Specification-Title" to specificationTitle,
-		"Specification-Vendor" to modAuthor,
-		"Specification-Version" to "1",
-		"Implementation-Title" to implementationTitle,
-		"Implementation-Vendor" to modAuthor,
-		"Implementation-Version" to modVersion,
-	)
-}
+loom {
+	runs {
+		val runJvmArgs: Set<String> by project
 		
-val multiloaderSources = sourceSets.register("multiloader")
-
-val multiloaderJar = tasks.register<Jar>("multiloaderJar") {
-	group = "build"
-	
-	archiveBaseName.set(modNameStripped)
-	archiveVersion.set(jarVersion)
-	
-	destinationDirectory = layout.buildDirectory.dir("dist")
-	
-	fun includeJar(project: Project, jarTask: (TaskContainer) -> TaskProvider<out Jar>) {
-		from(jarTask(project.tasks).map { it.outputs }) {
-			into("jars")
-			rename { "$modNameStripped-${project.name}.jar" }
+		configureEach {
+			runDir("../run")
+			vmArgs(runJvmArgs)
+			ideConfigGenerated(true)
 		}
-	}
 		
-	findProject(":NeoForge")?.let { includeJar(it, TaskContainer::jar) }
-	findProject(":Fabric")?.let { includeJar(it, TaskContainer::remapJar) }
+		named("client") {
+			configName = "Vanilla Client"
+			client()
+		}
 		
-	from(multiloaderSources.map { it.output })
-	
-	manifest {
-		packageInformation("$modId-multiloader", modNameStripped)
-		attributes("FMLModType" to "GAMELIBRARY")
+		findByName("server")?.let(::remove)
 	}
 }
 
-tasks.named<ProcessResources>("processMultiloaderResources").configure {
-	inputs.property("group", project.group)
-	inputs.property("jarPrefix", modNameStripped)
+val copyJars = tasks.register<Copy>("copyJars") {
+	group = "build"
+	duplicatesStrategy = EXCLUDE
 	
-	filesMatching(listOf("fabric.mod.json", "META-INF/jarjar/metadata.json")) {
-		expand(inputs.properties)
+	for (subproject in subprojects) {
+		dependsOn(subproject.tasks.assemble)
+		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
 	}
+	
+	into(project.layout.buildDirectory.dir("dist"))
 }
 
 tasks.assemble {
-	finalizedBy(multiloaderJar)
+	finalizedBy(copyJars)
 }

src/multiloader/resources/META-INF/jarjar/metadata.json

@@ -1,13 +0,0 @@
-{
-  "jars": [{
-    "identifier": {
-      "group": "${group}",
-      "artifact": "${id}"
-    },
-    "version": {
-      "artifactVersion": "${version}",
-      "range": "[${version}]"
-    },
-    "path": "jars/${jarPrefix}-NeoForge.jar"
-  }]
-}

src/multiloader/resources/fabric.mod.json

@@ -1,34 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "${id}_multiloader",
-  "name": "${name} (Multiloader)",
-  "description": "${description}",
-  "version": "${version}",
-  "license": "${license}",
-  
-  "icon": "assets/${id}/logo.png",
-  
-  "authors": [
-    "${author}"
-  ],
-  
-  "contact": {
-    "homepage": "https://chylex.com",
-    "issues": "${issuesURL}",
-    "sources": "${sourcesURL}"
-  },
-  
-  "environment": "client",
-  
-  "jars": [{
-      "file": "jars/${jarPrefix}-Fabric.jar"
-  }],
-  
-  "custom": {
-    "modmenu": {
-      "parent": "${id}",
-      "badges": [ "library" ],
-      "update_checker": false
-    }
-  }
-}