feat: Stonecutter (#24)

* make launch :3

* Fix UI alignment

* 1.21.11

* publishing

---------

Co-authored-by: Helium9 <80259183+sivthepolarfox@users.noreply.github.com>

Author: mariethepolarfox

build.gradle.kts

@@ -1,122 +1,138 @@
-@file:Suppress("UnstableApiUsage", "PropertyName")
-
-import dev.deftu.gradle.utils.GameSide
-import dev.deftu.gradle.utils.includeOrShade
-import dev.deftu.gradle.utils.version.MinecraftVersion
-import dev.deftu.gradle.utils.version.MinecraftVersions
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    java
-    kotlin("jvm")
-    id("dev.deftu.gradle.multiversion") // Applies preprocessing for multiple versions of Minecraft and/or multiple mod loaders.
-    id("dev.deftu.gradle.tools") // Applies several configurations to things such as the Java version, project name/version, etc.
-    id("dev.deftu.gradle.tools.resources") // Applies resource processing so that we can replace tokens, such as our mod name/version, in our resources.
-    id("dev.deftu.gradle.tools.bloom") // Applies the Bloom plugin, which allows us to replace tokens in our source files, such as being able to use `@MOD_VERSION` in our source files.
-    id("dev.deftu.gradle.tools.minecraft.loom") // Applies the Loom plugin, which automagically configures Essential's Architectury Loom plugin for you.
-    id("dev.deftu.gradle.tools.shadow") // Applies the Shadow plugin, which allows us to shade our dependencies into our mod JAR. This is NOT recommended for Fabric mods, but we have an *additional* configuration for those!
-    id("dev.deftu.gradle.tools.minecraft.releases") // Applies the Minecraft auto-releasing plugin, which allows you to automatically release your mod to CurseForge and Modrinth.
+    kotlin("jvm") version "2.3.0"
+    id("net.fabricmc.fabric-loom-remap") version "1.14-SNAPSHOT"
+    id("dev.deftu.gradle.bloom") version "0.2.0"
+    id("me.modmuss50.mod-publish-plugin") version "1.1.0"
 }
 
-if (mcData.isForge) {
-    loom.forge.mixinConfig("mixins.crashpatch.init.json")
+val modid = property("mod.id")
+val modname = property("mod.name")
+val modversion = property("mod.version")
+val mcversion = stonecutter.current.version
+val oneconfigversion = property("oneconfig_version")
+
+version = "$modversion+$mcversion"
+base.archivesName = modname.toString()
+
+repositories {
+    maven("https://maven.parchmentmc.org")
+    maven("https://repo.polyfrost.org/releases")
+    maven("https://repo.polyfrost.org/snapshots")
+    maven("https://api.modrinth.com/maven") {
+        content { includeGroup("maven.modrinth") }
+    }
+    maven("https://maven.bawnorton.com/releases") {
+        content { includeGroup("com.github.bawnorton.mixinsquared") }
+    }
 }
 
-toolkitLoomHelper {
-    useOneConfig {
-        version = "1.0.0-alpha.171"
-        loaderVersion = "1.1.0-alpha.53"
+loom {
+    runConfigs.all {
+        ideConfigGenerated(stonecutter.current.isActive)
+        runDir = "../../run"
+    }
 
-        usePolyMixin = true
-        polyMixinVersion = "0.8.4+build.7"
+    runConfigs.remove(runConfigs["server"])
+}
 
-        applyLoaderTweaker = true
+dependencies {
+    minecraft("com.mojang:minecraft:$mcversion")
+    compileOnly("com.mojang:datafixerupper:4.0.26")
+    mappings(loom.officialMojangMappings())
 
-        for (module in arrayOf("commands", "config", "config-impl", "events", "internal", "hud", "ui", "utils")) {
-            +module
-        }
+    modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
+    modImplementation("maven.modrinth:notenoughcrashes:${property("nec_version")}+$mcversion-fabric")
+    implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3")!!)
+    implementation("gs.mclo:api:3.0.1")
+
+    modImplementation("org.polyfrost.oneconfig:$mcversion-fabric:1.0.0-alpha.182")
+    for (module in arrayOf("config", "config-impl", "internal", "ui")) {
+        implementation("org.polyfrost.oneconfig:$module:$oneconfigversion")
     }
+}
 
-    useMixinExtras("0.5.0")
+bloom {
+    replacement("@MOD_ID@", modid!!)
+    replacement("@MOD_NAME@", modname!!)
+    replacement("@MOD_VERSION@", modversion!!)
+}
 
-    useProperty("mixin.debug.export", "true", GameSide.BOTH)
+tasks.processResources {
+    val props = mapOf(
+        "mod_id" to modid,
+        "mod_name" to modname,
+        "mod_version" to modversion,
+        "mc_version" to mcversion,
+        "loader_version" to providers.gradleProperty("loader_version").get()
+    )
 
-    // Turns off the server-side run configs, as we're building a client-sided mod.
-    disableRunConfigs(GameSide.SERVER)
+    inputs.properties(props)
 
-    // Defines the name of the Mixin refmap, which is used to map the Mixin classes to the obfuscated Minecraft classes.
-    if (!mcData.isNeoForge) {
-        useMixinRefMap(modData.id)
+    filesMatching("fabric.mod.json") {
+        expand(props)
     }
+}
 
-    if (mcData.isForge) {
-        // Configures the Mixin tweaker if we are building for Forge.
-        useForgeMixin(modData.id)
+tasks.build {
+    doLast {
+        val sourceFile = rootProject.projectDir.resolve("versions/${project.name}/build/libs/crashpatch.jar")
+        val targetFile = rootProject.projectDir.resolve("build/libs/crashpatch-${stonecutter.current.version}.jar")
+        targetFile.parentFile.mkdirs()
+        targetFile.writeBytes(sourceFile.readBytes())
     }
 }
 
-repositories {
-    maven("https://api.modrinth.com/maven") {
-        content { includeGroup("maven.modrinth") }
-    }
-    maven("https://maven.bawnorton.com/releases") {
-        content { includeGroup("com.github.bawnorton.mixinsquared") }
-    }
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set(21)
 }
 
-dependencies {
-    compileOnly("com.mojang:datafixerupper:4.0.26")
-    implementation(includeOrShade("gs.mclo:api:3.0.1")!!)
-    includeOrShade(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3")!!)!!)
-    if (mcData.version >= MinecraftVersions.VERSION_1_16) {
-        includeOrShade(implementation("com.github.bawnorton.mixinsquared:mixinsquared-${mcData.loader}:0.3.3")!!)
-        data class CompatDependency(
-            val forge: String,
-            val fabric: String,
-            val neoforge: String
-        )
-
-        fun DependencyHandlerScope.modImplementationCompat(notation: CompatDependency?) {
-            notation?.let {
-                when {
-                    mcData.isNeoForge -> modImplementation(it.neoforge)
-                    mcData.isForge -> modImplementation(it.forge)
-                    mcData.isFabric -> modImplementation(it.fabric)
-                    else -> error("Unsupported loader type: ${mcData.loader}")
-                }
-            }
-        }
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+}
 
-        fun nec(mcVersion: String, modVersion: String) =
-            mcVersion to CompatDependency(
-                fabric = "maven.modrinth:notenoughcrashes:$modVersion+$mcVersion-fabric",
-                forge = "maven.modrinth:notenoughcrashes:$modVersion+$mcVersion-forge",
-                neoforge = "maven.modrinth:notenoughcrashes:$modVersion+$mcVersion-neoforge"
-            )
-
-        val nec = mapOf(
-            nec("1.16.5", "4.1.4"),
-            nec("1.20.1", "4.4.9"),
-            nec("1.20.4", "4.4.7"),
-            nec("1.21.1", "4.4.9"),
-            nec("1.21.4", "4.4.8"),
-            nec("1.21.5", "4.4.9"),
-            nec("1.21.8", "4.4.9"),
-        )
-
-        modImplementationCompat(nec[mcData.version.toString()])
-    }
+java {
+    withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
-tasks {
-    jar {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+tasks.jar {
+    inputs.property("archivesName", base.archivesName)
+
+    from("LICENSE") {
+        rename { "${it}_${inputs.properties["archivesName"]}" }
     }
+}
+
+fun <T> optionalProp(property: String, block: (String) -> T?): T? =
+    findProperty(property)?.toString()?.takeUnless { it.isBlank() }?.let(block)
+
+val modrinthId = findProperty("publish.modrinth")?.toString()?.takeIf { it.isNotBlank() }
+
+// make sure modrinth.token is set in your user gradle properties
+publishMods {
+    file = project.tasks.remapJar.get().archiveFile
+
+    displayName = modversion.toString()
+    version = "v$modversion"
+    changelog = project.rootProject.file("CHANGELOG.md").takeIf { it.exists() }?.readText() ?: "No changelog provided."
+    type = ALPHA
+
+    modLoaders.add("fabric")
+
+    dryRun = modrinthId == null
+
+    if (modrinthId != null) {
+        modrinth {
+            projectId = property("publish.modrinth").toString()
+            accessToken = findProperty("modrinth.token").toString()
+
+            minecraftVersions.add(mcversion)
 
-    remapJar {
-        manifest {
-            attributes(mapOf(
-                "MixinConfigs" to "mixins.crashpatch.init.json,mixins.crashpatch.json",
-            ))
+            requires("oneconfig")
         }
     }
 }

gradle.properties

@@ -1,11 +1,19 @@
-# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
+mod.name=CrashPatch
+mod.id=crashpatch
+mod.version=2.1.0-alpha.1
+mod.group=org.polyfrost
+
+loom_version=1.14-SNAPSHOT
+loader_version=0.18.4
+nec_version=[VERSIONED]
+oneconfig_version=1.0.0-alpha.182
+
+publish.modrinth=nZ3E8WQz
+
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureoncommand=true
 org.gradle.parallel.threads=4
 org.gradle.jvmargs=-Xmx2G
 
-mod.group=org.polyfrost
-mod.id=crashpatch
-mod.name=CrashPatch
-mod.version=2.1.0-alpha.1
+fabric.loom.dropNonIntermediateRootMethods=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip