clean buildscripts a lil soz troph

build.gradle

@@ -6,8 +6,8 @@ plugins {
 	alias libs.plugins.minotaur
 }
 
-version = "$project.baseVersion+$project.branch"
-archivesBaseName = project.archivesName
+version = "$baseVersion+$branch"
+archivesBaseName = project.slug
 
 repositories {
 	maven { url "https://maven.terraformersmc.com/releases" }
@@ -17,15 +17,17 @@ repositories {
 }
 
 dependencies {
+	implementation libs.kaleidoConfig
+	include libs.kaleidoConfig
+
 	minecraft libs.mc
 	mappings variantOf(libs.yarn) { classifier "v2" }
 	modImplementation libs.fl
+
 	modImplementation libs.fapi
-	modImplementation libs.spruceui
-	implementation libs.kaleidoConfig
 
+	modImplementation libs.spruceui
 	include libs.spruceui
-	include libs.kaleidoConfig
 }
 
 processResources {
@@ -34,19 +36,21 @@ processResources {
 		modId         : modId,
 		modName       : modName,
 		modDescription: modDescription,
-		homepage      : homepage,
-		issues        : issues,
-		sources       : sources,
+		homepage      : "https://modrinth.com/mod/${slug}",
+		issues        : "https://github.com/${user}/${slug}/issues",
+		sources       : "https://github.com/${user}/${slug}",
 		license       : license,
 		authors       : authors.split(", ").join("\",\n    \""),
 		contributors  : contributors.split(", ").join("\",\n    \""),
-		mc            : libs.versions.mc.get(),
+		members       : "${authors}. Contributions by ${contributors}",
+		mc            : compatibleVersions.split(", ")[0],
 		fl            : libs.versions.fl.get(),
 		fapi          : libs.versions.fapi.get(),
 		spruceui      : libs.versions.spruceui.get()
 	]
-	inputs.properties meta
-	filesMatching("fabric.mod.json") { expand meta }
+	inputs.properties(meta)
+	filesMatching("*.mod.json") { expand(meta) }
+	filesMatching("META-INF/*mods.toml") { expand(meta) }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -56,10 +60,14 @@ tasks.withType(JavaCompile).configureEach {
 
 java {
 	withSourcesJar()
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${archivesBaseName}" }
+	}
 }
 
 publishing {
@@ -71,12 +79,16 @@ publishing {
 }
 
 modrinth {
-	token = System.getenv("MODRINTH_TOKEN")
-	projectId = "ballotbox"
+	token = "$System.env.MODRINTH_TOKEN"
+	projectId = slug
+	versionNumber = project.version
+	uploadFile = remapJar
+	gameVersions = compatibleVersions.split(", ").toList()
+	loaders = compatibleLoaders.split(", ").toList()
+	changelog = "$System.env.CHANGELOG"
+	syncBodyFrom = "<!--DO NOT EDIT MANUALLY: synced from gh readme-->\n" + rootProject.file("README.md").text
 	dependencies {
 		required.version "fabric-api", libs.versions.fapi.get()
 	}
-	changelog = System.getenv("CHANGELOG")
-	syncBodyFrom = "<!--DO NOT EDIT MANUALLY: synced from gh readme-->\n" + rootProject.file("README.md").text
-	uploadFile = remapJar
 }
+

gradle.properties

@@ -4,23 +4,22 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.caching.debug=false
 org.gradle.configureondemand=true
-
 # Loom
 fabric.loom.multiProjectOptimisation=true
-
 # Mod Metadata
-archivesName=ballotbox
 group=net.modfest
+user=ModFest
+slug=ballotbox
 modId=ballotbox
 modName=Ballotbox
 modDescription=In-game category voting!
 authors=ModFest
 contributors=Prospector, Sisby folk, acikek
-homepage=https://modrinth.com/mod/ballotbox
-issues=https://github.com/modfest/ballotbox/issues
-sources=https://github.com/modfest/ballotbox
 license=MIT
-
 # Mod Version
 baseVersion=0.4.2
+# Branch Metadata
 branch=1.21
+tagBranch=1.21
+compatibleVersions=1.21, 1.21.1
+compatibleLoaders=fabric, quilt, neoforge

libs.versions.toml

@@ -2,21 +2,25 @@
 loom = "1.7.+"
 minotaur = "2.+"
 
+kaleidoConfig = "0.3.1+1.3.1"
+
 mc = "1.21"
 fl = "0.15.11"
 yarn = "1.21+build.9"
 fapi = "0.100.7+1.21"
+
 spruceui = "5.1.0+1.21"
-kaleidoConfig = "0.3.1+1.3.1"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }
 minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
 
 [libraries]
+kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }
+
 mc = { group = "mojang", name = "minecraft", version.ref = "mc" }
 fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" }
 yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
 fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" }
+
 spruceui = { group = "dev.lambdaurora", name = "spruceui", version.ref = "spruceui" }
-kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
 	repositories {
-		maven { url 'https://maven.fabricmc.net/' }
+		maven { url "https://maven.fabricmc.net/" }
 		gradlePluginPortal()
 	}
 }

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

@@ -0,0 +1,44 @@
+modLoader = "javafml"
+loaderVersion = "[4,)"
+license = "${license}"
+issueTrackerURL = "${issues}"
+
+[[mods]]
+modId = "${modId}"
+version = "${version}"
+displayName = "${modName}"
+description = '''${modDescription}'''
+authors = "${members}"
+displayURL = "${homepage}"
+logoFile = "assets/${modId}/icon.png"
+
+[properties]
+"connector:placeholder" = true
+
+[[dependencies.${ modId }]]
+modId = "connector"
+type = "required"
+versionRange = "*"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.${ modId }]]
+modId = "neoforge"
+type = "required"
+versionRange = "*"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.${ modId }]]
+modId = "minecraft"
+type = "required"
+versionRange = "[${mc},)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.${ modId }]]
+modId = "fabric_api"
+type = "required"
+versionRange = "[${fapi},)"
+ordering = "NONE"
+side = "BOTH"

src/main/resources/fabric.mod.json

@@ -16,22 +16,21 @@
 		"sources": "${sources}"
 	},
 	"license": "${license}",
-	"icon": "assets/ballotbox/icon.png",
+	"icon": "assets/${modId}/icon.png",
+	"mixins": [
+		"${modId}.mixins.json"
+	],
+	"depends": {
+		"minecraft": ">=${mc}",
+		"fabricloader": ">=${fl}",
+		"fabric-api": ">=${fapi}"
+	},
 	"entrypoints": {
 		"main": [
 			"net.modfest.ballotbox.BallotBox"
 		],
 		"client": [
 			"net.modfest.ballotbox.client.BallotBoxClient"
 		]
-	},
-	"mixins": [
-		"ballotbox.mixins.json"
-	],
-	"depends": {
-		"minecraft": ">=${mc}",
-		"fabricloader": ">=${fl}",
-		"fabric-api": ">=${fapi}",
-		"spruceui": ">=${spruceui}"
 	}
 }