Tweak JAR file names

Fabric/build.gradle.kts

@@ -1,12 +1,12 @@
+val modId: String by project
+val minecraftVersion: String by project
+val fabricVersion: String by project
+
 plugins {
 	idea
 	id("fabric-loom") version "0.9-SNAPSHOT"
 }
 
-val modId: String by project
-val minecraftVersion: String by project
-val fabricVersion: String by project
-
 dependencies {
 	minecraft("com.mojang:minecraft:$minecraftVersion")
 	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
@@ -44,3 +44,7 @@ tasks.processResources {
 tasks.jar {
 	exclude("io/github/prospector/")
 }
+
+tasks.remapJar {
+	archiveVersion.set(tasks.jar.get().archiveVersion)
+}

Forge/build.gradle.kts

@@ -2,6 +2,11 @@ import net.minecraftforge.gradle.userdev.UserDevExtension
 import org.gradle.api.file.DuplicatesStrategy.INCLUDE
 import org.spongepowered.asm.gradle.plugins.MixinExtension
 
+val modId: String by project
+val minecraftVersion: String by project
+val forgeVersion: String by project
+val mixinVersion: String by project
+
 buildscript {
 	repositories {
 		maven("https://maven.minecraftforge.net")
@@ -25,11 +30,6 @@ apply {
 	plugin("org.spongepowered.mixin")
 }
 
-val modId: String by project
-val minecraftVersion: String by project
-val forgeVersion: String by project
-val mixinVersion: String by project
-
 dependencies {
 	"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")
 	

build.gradle.kts

@@ -2,6 +2,16 @@ import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
 import java.text.SimpleDateFormat
 import java.util.Date
 
+val modId: String by project
+val modName: String by project
+val modAuthor: String by project
+val modVersion: String by project
+val minecraftVersion: String by project
+val mixinVersion: String by project
+
+val modNameStripped = modName.replace(" ", "")
+val jarVersion = "$minecraftVersion+v$modVersion"
+
 buildscript {
 	repositories {
 		maven("https://repo.spongepowered.org/maven")
@@ -20,13 +30,6 @@ idea {
 	}
 }
 
-val modId: String by project
-val modName: String by project
-val modAuthor: String by project
-val modVersion: String by project
-val minecraftVersion: String by project
-val mixinVersion: String by project
-
 repositories {
 	maven("https://repo.spongepowered.org/maven")
 	mavenCentral()
@@ -38,7 +41,7 @@ dependencies {
 }
 
 base {
-	archivesName.set("${modName.replace(" ", "")}-Common-$minecraftVersion")
+	archivesName.set("$modNameStripped-Common")
 }
 
 minecraft {
@@ -76,7 +79,7 @@ subprojects {
 	}
 	
 	base {
-		archivesName.set("${modName.replace(" ", "")}-${project.name}-$minecraftVersion")
+		archivesName.set("$modNameStripped-${project.name}")
 	}
 	
 	tasks.withType<JavaCompile> {
@@ -91,6 +94,8 @@ subprojects {
 	}
 	
 	tasks.jar {
+		archiveVersion.set(jarVersion)
+		
 		from(rootProject.file("LICENSE"))
 		
 		manifest {
@@ -98,7 +103,7 @@ subprojects {
 				"Specification-Title" to modId,
 				"Specification-Vendor" to modAuthor,
 				"Specification-Version" to "1",
-				"Implementation-Title" to "${modName.replace(" ", "")}-${project.name}",
+				"Implementation-Title" to "$modNameStripped-${project.name}",
 				"Implementation-Vendor" to modAuthor,
 				"Implementation-Version" to modVersion,
 				"Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()),
@@ -113,7 +118,7 @@ val copyJars = tasks.register<Copy>("copyJars") {
 	
 	for (subproject in subprojects) {
 		dependsOn(subproject.tasks.build)
-		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$modVersion.jar"))
+		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
 	}
 	
 	into(file("${project.buildDir}/dist"))