From 9d10aa9f1fe7ebdce315cebe4ba7e93305ae74b7 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Sun, 28 Jun 2026 12:50:25 +0700 Subject: [PATCH] build: update versioning --- build.gradle | 37 ++++++++++++++----------------------- gradle.properties | 15 ++++++++------- settings.gradle | 2 +- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 40a6dae..34ae6d0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,29 +8,18 @@ plugins { alias libs.plugins.modmuss50.publish } +def targetJavaVersion = Integer.parseInt(java_version) def local = !System.getenv().containsKey("GITHUB_RUN_NUMBER") -version = "${project.mod_version}-${project.minecraft_version}-${local ? 'SNAPSHOT' : "build.${System.getenv("GITHUB_RUN_NUMBER")}"}" +version = "${mod_version}+mc${minecraft_version}" group = project.maven_group base { - archivesName = project.archives_base_name + archivesName = "${project.mod_id}-${loader_id}" } -apply from: "https://raw.githubusercontent.com/constellation-mc/artifacts/main/artifacts.groovy" - repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. - maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" - content { includeGroup "maven.modrinth" } - } - maven { url 'https://jitpack.io' } + mavenCentral() } dependencies { @@ -50,16 +39,17 @@ spotless { } } -loom.mods.register(project.archives_base_name) { +loom.mods.register(mod_id) { sourceSet project.sourceSets.main } processResources { def map = [ - "version" : project.version, - "minecraft_version": project.minecraft_version, - "loader_version" : libs.fabric.loader.get().version, - "fabric_version" : libs.fabric.api.get().version + "version": project.version, + "mod_id": mod_id, + "minecraft_version": minecraft_version, + "loader_version": libs.fabric.loader.get().version, + "fabric_version": libs.fabric.api.get().version ] inputs.properties(map) filteringCharset "UTF-8" @@ -69,7 +59,6 @@ processResources { } } -def targetJavaVersion = 17 tasks.withType(JavaCompile).configureEach { // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly @@ -91,7 +80,7 @@ java { jar { from("LICENSE") { - rename { "${it}_${project.archives_base_name}" } + rename { "${it}_${mod_id}" } } } @@ -106,7 +95,8 @@ sourcesJar { publishing { publications { mavenJava(MavenPublication) { - artifactId = project.archives_base_name + artifactId = "${mod_id}-${loader_id}" + version = "${mod_version}+mc${minecraft_version}" from components.java } } @@ -129,6 +119,7 @@ publishing { publishMods { file = remapJar.archiveFile additionalFiles.from(remapSourcesJar.archiveFile) + version = "${mod_version}+mc${minecraft_version}+${loader_id}" changelog = file("CHANGELOG.md").text type = ReleaseType.valueOf(providers.environmentVariable("VERSION_TYPE").getOrElse("BETA")) diff --git a/gradle.properties b/gradle.properties index 50889f2..5b29dc4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ -# Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.1 -# Mod Properties -mod_version=1.0.0 + maven_group=dev.zenfyr -archives_base_name=rbip +java_version=17 + +mod_id=rbip +mod_version=1.0.1 + +loader_id=fabric +minecraft_version=1.20.1 diff --git a/settings.gradle b/settings.gradle index 2dbd41d..b94341b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,4 +7,4 @@ pluginManagement { gradlePluginPortal() } } -rootProject.name = "${settings['archives_base_name']}-${settings['minecraft_version']}-fabric" +rootProject.name = "${settings['mod_id']}-${settings['minecraft_version']}-${settings['loader_id']}" -- 2.51.2