clean up buildscripts, add neo placeholder

Author: sisby-folk

.editorconfig

@@ -2,6 +2,7 @@
 indent_size = 4
 indent_style = tab
 tab_width = 4
+insert_final_newline = true
 
 [*.yml]
 indent_size = 2

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -21,4 +21,10 @@ jobs:
           validate-wrappers: true
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build
+
+      - name: capture build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/

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://server.bbkr.space/artifactory/libs-release" }
@@ -17,8 +17,10 @@ repositories {
 dependencies {
 	minecraft libs.mc
 	mappings variantOf(libs.yarn) { classifier "v2" }
+
 	modImplementation libs.fl
 	modImplementation libs.fapi
+
 	modImplementation libs.libgui
 	modImplementation libs.fpapi
 
@@ -32,20 +34,22 @@ 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(),
 		libgui        : libs.versions.libgui.get(),
 		fpapi         : libs.versions.fpapi.get()
 	]
 	inputs.properties meta
-	filesMatching("fabric.mod.json") { expand meta }
+	filesMatching("*.mod.json") { expand(meta) }
+	filesMatching("META-INF/*mods.toml") { expand(meta) }
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -55,7 +59,8 @@ tasks.withType(JavaCompile).configureEach {
 
 java {
 	withSourcesJar()
-	sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
@@ -73,13 +78,16 @@ publishing {
 }
 
 modrinth {
-	token = System.getenv("MODRINTH_TOKEN")
-	projectId = "scattered-shards"
+	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()
 		embedded.version "fabric-permissions-api", libs.versions.fpapi.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=scatteredshards
 group=net.modfest
+user=ModFest
+slug=scattered-shards
 modId=scattered_shards
 modName=Scattered Shards
 modDescription=Collectible trading cards... without the trading. Shards!
 authors=Falkreon, acikek
 contributors=Trudle, FoundationGames, TheEpicBlock, hama
-homepage=https://modrinth.com/mod/scattered-shards
-issues=https://github.com/modfest/scattered-shards/issues
-sources=https://github.com/modfest/scattered-shards
 license=MIT
-
 # Mod Version
 baseVersion=1.6.0
-branch=1.21
+# Branch Metadata
+branch=1.21
+tagBranch=1.21
+compatibleVersions=1.21, 1.21.1
+compatibleLoaders=fabric, quilt, neoforge

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,20 +16,20 @@
 		"sources": "${sources}"
 	},
 	"license": "${license}",
-	"icon": "assets/scattered_shards/icon.png",
+	"icon": "assets/${modId}/icon.png",
+	"depends": {
+		"minecraft": ">=${mc}",
+		"fabricloader": ">=${fl}",
+		"fabric-api": ">=${fapi}",
+		"libgui": ">=${libgui}",
+		"fabric-permissions-api-v0": ">=${fpapi}"
+	},
 	"entrypoints": {
 		"main": [
 			"net.modfest.scatteredshards.ScatteredShards"
 		],
 		"client": [
 			"net.modfest.scatteredshards.client.ScatteredShardsClient"
 		]
-	},
-	"depends": {
-		"minecraft": ">=${mc}",
-		"fabricloader": ">=${fl}",
-		"fabric-api": ">=${fapi}",
-		"fabric-permissions-api-v0": ">=${fpapi}",
-		"libgui": ">=${libgui}"
 	}
 }