1
0
Fork 0

Compare commits

...

2 Commits

Author SHA1 Message Date
chylex 449ee5b435
Release v1.2.1 for Minecraft 1.17+ 2021-10-05 14:08:12 +02:00
chylex 7fba750e35
Tweak JAR file names 2021-10-05 14:07:55 +02:00
4 changed files with 30 additions and 21 deletions

View File

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

View File

@ -2,6 +2,11 @@ import net.minecraftforge.gradle.userdev.UserDevExtension
import org.gradle.api.file.DuplicatesStrategy.INCLUDE import org.gradle.api.file.DuplicatesStrategy.INCLUDE
import org.spongepowered.asm.gradle.plugins.MixinExtension 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 { buildscript {
repositories { repositories {
maven("https://maven.minecraftforge.net") maven("https://maven.minecraftforge.net")
@ -25,11 +30,6 @@ apply {
plugin("org.spongepowered.mixin") 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 { dependencies {
"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion") "minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")

View File

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

View File

@ -2,7 +2,7 @@
modId=bettercontrols modId=bettercontrols
modName=Better Controls modName=Better Controls
modAuthor=chylex modAuthor=chylex
modVersion=1.2.0a modVersion=1.2.1
# Dependencies # Dependencies
minecraftVersion=1.17.1 minecraftVersion=1.17.1