Refactor/input helper improvements

build.gradle.kts

@@ -1,9 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17.19"
     `maven-publish`
-    java
-    id("me.modmuss50.mod-publish-plugin") version "0.8.4"
+    id("me.modmuss50.mod-publish-plugin") version "2.0.0"
+    id("org.jetbrains.kotlin.jvm") version "2.4.10"
     id("com.gradleup.shadow") version "9.2.2"
+    java
 }
 
 base {
@@ -65,6 +68,7 @@ repositories {
 class ModDependencies {
     operator fun get(name: String) = property("deps.$name").toString()
 }
+
 val deps = ModDependencies()
 val mcVersion = stonecutter.current.version
 val maxMcVersion = deps["core.maxMcVersion"]
@@ -84,6 +88,7 @@ val owoLibVersion = deps["owo_version"]
 val resourcefulConfigVersion = deps["resourcefulconfig_version"]
 val autoUpdateVersion = deps["autoupdate_version"]
 val skyblockerVersion = deps["skyblocker_version"]
+
 group = property("maven_group")!!
 val versionNumber = property("mod_version").toString().trim()
 val releaseChannel = property("mod_release_channel").toString().trim().ifEmpty { "stable" }.lowercase()
@@ -104,26 +109,26 @@ val releaseLabel = "$versionNumber-$releaseChannel$prereleaseSuffix"
 version = "$releaseLabel+mc$mcVersion"
 
 dependencies {
+    // Mojang Minecraft dependency (no mappings required for 26.1+)
     minecraft("com.mojang:minecraft:${mcVersion}")
-    mappings(loom.officialMojangMappings())
-    modImplementation("net.fabricmc:fabric-loader:${deps["fabricLoaderVersion"]}")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${deps["fabric_api"]}")
+    implementation("net.fabricmc:fabric-loader:${deps["fabricLoaderVersion"]}")
+    implementation("net.fabricmc.fabric-api:fabric-api:${deps["fabric_api"]}")
 
-    modLocalRuntime("maven.modrinth:hypixel-mod-api:$hypixelModApiVersion")
-    modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:$devAuthVersion")
+    localRuntime("maven.modrinth:hypixel-mod-api:$hypixelModApiVersion")
+    runtimeOnly("me.djtheredstoner:DevAuth-fabric:$devAuthVersion")
 
-    modImplementation("tech.thatgravyboat:skyblock-api:${deps["skyblock_api_version"]}") {
+    implementation("tech.thatgravyboat:skyblock-api:${deps["skyblock_api_version"]}") {
         capabilities { requireCapability("tech.thatgravyboat:skyblock-api-${deps["skyblock_api_platform"]}") }
     }
     include("tech.thatgravyboat:skyblock-api:${deps["skyblock_api_version"]}") {
-        capabilities { requireCapability("tech.thatgravyboat:skyblock-api-${deps["skyblock_api_platform"]}-remapped") }
+        capabilities { requireCapability("tech.thatgravyboat:skyblock-api-${deps["skyblock_api_platform"]}") }
     }
 
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
-    modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
+    implementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
 
-    modImplementation("net.hypixel:hypixel-api-transport-apache:$hypixelApiVersion")
+    implementation("net.hypixel:hypixel-api-transport-apache:$hypixelApiVersion")
     include("net.hypixel:hypixel-api-transport-apache:$hypixelApiVersion")
     include("net.hypixel:hypixel-api-core:$hypixelApiVersion")
 
@@ -133,28 +138,26 @@ dependencies {
     include("commons-logging:commons-logging:$commonsLoggingVersion")
     include("commons-codec:commons-codec:$commonsCodecVersion")
 
-    // Config lib and settings screen
-    modImplementation("com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-$resourcefulConfigVersion")
-
-    modCompileOnly("com.terraformersmc:modmenu:$modMenuVersion")
+    implementation("com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-$resourcefulConfigVersion")
+    compileOnly("com.terraformersmc:modmenu:$modMenuVersion")
 
     // Project Lombok
     compileOnly("org.projectlombok:lombok:$lombokVersion")
     annotationProcessor("org.projectlombok:lombok:$lombokVersion")
-
     testCompileOnly("org.projectlombok:lombok:$lombokVersion")
     testAnnotationProcessor("org.projectlombok:lombok:$lombokVersion")
-    // Mixin Constraints
+
     include(implementation("com.moulberry:mixinconstraints:$mixinConstraintsVersion")!!)
 
     //gson extras for easy type adapters
     implementation("org.danilopianini:gson-extras:$gsonExtrasVersion")
     include("org.danilopianini:gson-extras:$gsonExtrasVersion")
+
     // Skyblocker for compatibility
-    modCompileOnly("maven.modrinth:skyblocker-liap:v$skyblockerVersion")
+    compileOnly("maven.modrinth:skyblocker-liap:v$skyblockerVersion")
 
     // Owo Lib for lang features
-    modImplementation("io.wispforest:owo-lib:$owoLibVersion")
+    implementation("io.wispforest:owo-lib:$owoLibVersion")
 
     // Auto Update Library
     implementation("moe.nea:libautoupdate:$autoUpdateVersion")
@@ -182,55 +185,75 @@ sourceSets {
     }
 }
 
-tasks {
-    classes {
-        dependsOn(buildtimeInjectionTask)
-    }
+tasks.withType<JavaCompile>().configureEach {
+    options.release = 25
+}
 
-    processResources {
-        inputs.property("version", project.version)
-        inputs.property("mcVersion", mcVersion)
-        inputs.property("minor_update_notes", rootProject.property("minor_update_notes") as String)
-
-        filesMatching("fabric.mod.json") {
-            expand(mapOf(
-                "version" to project.version,
-                "mod_version" to rootProject.property("mod_version"),
-                "mcVersion" to mcVersion,
-                "maxMcVersion" to maxMcVersion,
-                "minor_update_notes" to rootProject.property("minor_update_notes")
-            ))
-        }
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_25
     }
+}
 
-    jar {
-        from("LICENSE"){
-            rename { "${it}_${archiveBaseName.get()}" }
-        }
+java {
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
+}
 
-    shadowJar {
-        configurations = listOf(project.configurations.shadow.get())
+tasks.processResources {
+    inputs.property("version", project.version)
+    inputs.property("mcVersion", mcVersion)
+    inputs.property("minor_update_notes", rootProject.property("minor_update_notes") as String)
+
+    filesMatching("fabric.mod.json") {
+        expand(mapOf(
+            "version" to project.version,
+            "mod_version" to rootProject.property("mod_version"),
+            "mcVersion" to mcVersion,
+            "maxMcVersion" to maxMcVersion,
+            "minor_update_notes" to rootProject.property("minor_update_notes")
+        ))
     }
-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.get().archiveFile)
+}
+
+tasks.classes {
+    dependsOn(buildtimeInjectionTask)
+}
+
+tasks.jar {
+    enabled = false
+}
+
+tasks.shadowJar {
+    archiveClassifier.set("")
+
+    configurations = listOf(project.configurations.shadow.get())
+
+    from("LICENSE") {
+        rename { "${it}_${archiveBaseName.get()}" }
     }
 }
+
+tasks.assemble {
+    dependsOn(tasks.shadowJar)
+}
+
 loom {
     runConfigs.all {
-        ideConfigGenerated(true) // Run configurations are not created for subprojects by default
-        runDir = "../../run" // Use a shared run folder and create separate worlds
+        generateRunConfig.set(true)
+        runDirectory.set(layout.projectDirectory.dir("../../run"))
     }
 }
-java {
-    withSourcesJar()
-}
 
 publishMods {
-    file = tasks.remapJar.get().archiveFile
-    additionalFiles.from(tasks.remapSourcesJar.get().archiveFile)
-    version = project.version.toString()
+    file.set(tasks.shadowJar.get().archiveFile)
+    version.set(project.version.toString())
 
     type = when (releaseChannel) {
         "alpha" -> ALPHA

buildSrc/build.gradle.kts

@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation("org.ow2.asm:asm:9.6")
-    implementation("org.ow2.asm:asm-tree:9.6")
+    implementation("org.ow2.asm:asm:9.10.1")
+    implementation("org.ow2.asm:asm-tree:9.10.1")
 }

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.caching.debug=false
 
-fabric_kotlin_version=1.13.1+kotlin.2.1.10
+fabric_kotlin_version=1.13.10+kotlin.2.3.20
 
 mod_version=1.0.0
 # Allowed: stable, beta, alpha
@@ -18,9 +18,9 @@ deps.devauth_version=1.2.1
 deps.hypixel_api_version=4.4
 deps.apache_httpclient_version=4.5.14
 deps.apache_httpcore_version=4.4.16
-deps.commons_logging_version=1.2
-deps.commons_codec_version=1.16.0
-deps.lombok_version=1.18.36
+deps.commons_logging_version=1.4.0
+deps.commons_codec_version=1.22.1
+deps.lombok_version=1.18.40
 deps.mixinconstraints_version=1.0.8
 deps.gson_extras_version=3.3.0
 deps.autoupdate_version=1.3.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -7,15 +7,15 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.8.2"
+    id("dev.kikugie.stonecutter") version "0.9.7"
 }
 
 stonecutter {
     kotlinController = true
     centralScript = "build.gradle.kts"
-    create(rootProject){
-        versions("1.21.11")
-        vcsVersion = "1.21.11"
+    create(rootProject) {
+        versions("26.1.2")
+        vcsVersion = "26.1.2"
     }
 }