Merge branch 'main' into scala

Author: kappa-maintainer

build.gradle

@@ -5,48 +5,32 @@ plugins {
     id 'maven-publish'
     id 'com.gradleup.shadow' version '9.4.1'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
-    id 'xyz.wagyourtail.unimined' version '1.4.18-kappa'
+    id 'xyz.wagyourtail.unimined' version '1.4.23-kappa'
     id 'net.kyori.blossom' version '2.2.0'
 }
 
 import org.jetbrains.gradle.ext.Gradle
 
-apply from: 'gradle/scripts/helpers.gradle'
-
-// Early Assertions
-assertProperty 'mod_version'
-assertProperty 'root_package'
-assertProperty 'mod_id'
-assertProperty 'mod_name'
-
-assertSubProperties 'use_access_transformer', 'access_transformer_locations'
-assertSubProperties 'is_coremod', 'coremod_includes_mod', 'coremod_plugin_class_name'
-assertSubProperties 'use_asset_mover', 'asset_mover_version'
-
-setDefaultProperty 'generate_sources_jar', true, false
-setDefaultProperty 'generate_javadocs_jar', true, false
-setDefaultProperty 'minecraft_username', true, 'Developer'
-setDefaultProperty 'extra_jvm_args', false, ''
+ext {
+    //noinspection GroovyAssignabilityCheck
+    access_transformer_locations = "${mod_id}_at.cfg"
+}
 
-version = propertyString('mod_version')
-group = propertyString('root_package')
+version = mod_version
+group = root_package
 
 base {
-    archivesName = propertyString('mod_id') as String
-}
-
-scala {
-    scalaVersion = '3.8.2'
+    archivesName = mod_id
 }
 
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(25)
     }
-    if (propertyBool('generate_sources_jar')) {
+    if (generate_sources_jar.toBoolean()) {
         withSourcesJar()
     }
-    if (propertyBool('generate_javadocs_jar')) {
+    if (generate_javadocs_jar.toBoolean()) {
         withJavadocJar()
     }
 }
@@ -60,8 +44,9 @@ configurations {
     runtimeOnly.extendsFrom(modRuntimeOnly)
 }
 
-String remapTaskName = propertyBool('enable_shadow') ? "remapShadowJar" : "remapJar"
+def remapTaskName = enable_shadow.toBoolean() ? "remapShadowJar" : "remapJar"
 
+//noinspection GroovyAssignabilityCheck
 unimined.minecraft {
     version "1.12.2"
 
@@ -70,38 +55,32 @@ unimined.minecraft {
     }
 
     cleanroom {
-        if (propertyBool('use_access_transformer')) {
-            accessTransformer "${rootProject.projectDir}/src/main/resources/${propertyString('access_transformer_locations')}"
+        if (use_access_transformer.toBoolean()) {
+            accessTransformer "${rootProject.projectDir}/src/main/resources/$access_transformer_locations"
         }
-        loader "0.5.12-alpha"
+        loader "0.5.14-alpha"
         runs.all {
             args += ['--username', minecraft_username]
-            def extraArgs = propertyString('extra_jvm_args')
+            def extraArgs = extra_jvm_args
             if (extraArgs != null && !extraArgs.trim().isEmpty()) {
                 jvmArgs += extraArgs.split { "\\s+" }.toList()
             }
-            if (propertyBool('enable_foundation_debug')) {
+            if (enable_foundation_debug.toBoolean()) {
                 systemProperty("foundation.dump", "true")
                 systemProperty("foundation.verbose", "true")
             }
-            if (propertyBool('is_coremod')) {
-                systemProperty("fml.coreMods.load", propertyString('coremod_plugin_class_name'))
+            if (is_coremod.toBoolean()) {
+                systemProperty("fml.coreMods.load", coremod_plugin_class_name)
             }
             return
         }
     }
 
     defaultRemapJar = false
-    
-    String jarTaskName = propertyBool('enable_shadow') ? "shadowJar" : "jar"
-    
-    remap(tasks.named(jarTaskName).get()) {
-        mixinRemap {
-            enableBaseMixin()
-            enableMixinExtra()
-            disableRefmap()
-        }
-    }
+
+    String jarTaskName = enable_shadow.toBoolean() ? "shadowJar" : "jar"
+
+    remap(tasks.named(jarTaskName).get())
 
     mods {
         remap(configurations.modCompileOnly)
@@ -110,10 +89,10 @@ unimined.minecraft {
 }
 
 dependencies {
-    if (propertyBool('use_asset_mover')) {
-        implementation "com.cleanroommc:assetmover:${propertyString('asset_mover_version')}"
+    if (use_asset_mover.toBoolean()) {
+        implementation "com.cleanroommc:assetmover:${asset_mover_version}"
     }
-    if (propertyBool('enable_junit_testing')) {
+    if (enable_junit_testing.toBoolean()) {
         testImplementation 'org.junit.jupiter:junit-jupiter:6.0.3'
         testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     }
@@ -129,21 +108,21 @@ sourceSets {
     main {
         blossom {
             scalaSources {
-                property('mod_id', propertyString('mod_id'))
-                property('mod_name', propertyString('mod_name'))
-                property('mod_version', propertyString('mod_version'))
+                property('mod_id', mod_id)
+                property('mod_name', mod_name)
+                property('mod_version', mod_version)
                 property('package', "${root_package}.${mod_id}")
             }
             resources {
-                property('mod_id', propertyString('mod_id'))
-                property('mod_name', propertyString('mod_name'))
-                property('mod_version', propertyString('mod_version'))
-                property('mod_description', propertyString('mod_description'))
-                property('mod_authors', propertyStringList('mod_authors', ',').collect {it.strip()}.join('", "'))
-                property('mod_credits', propertyString('mod_credits'))
-                property('mod_url', propertyString('mod_url'))
-                property('mod_update_json', propertyString('mod_update_json'))
-                property('mod_logo_path', propertyString('mod_logo_path'))
+                property('mod_id', mod_id)
+                property('mod_name', mod_name)
+                property('mod_version', mod_version)
+                property('mod_description', mod_description)
+                property('mod_authors', mod_authors.toString().split(',').findAll { !it.isBlank() }.collect { "\"${it.strip()}\"" }.join(', '))
+                property('mod_credits', mod_credits)
+                property('mod_url', mod_url)
+                property('mod_update_json', mod_update_json)
+                property('mod_logo_path', mod_logo_path)
             }
         }
     }
@@ -170,20 +149,20 @@ idea {
                 afterEvaluate {
                     javacAdditionalOptions = '-encoding utf8'
                     moduleJavacAdditionalOptions = [
-                            (project.name + '.main'): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
+                            (project.name + '.main'): tasks.compileJava.options.compilerArgs.collect { "\"${it}\"" }.join(' ')
                     ]
                 }
             }
         }
     }
 }
 
-if (!propertyBool('enable_shadow')) {
+if (!enable_shadow.toBoolean()) {
     shadowJar.enabled = false
 }
 
 compileJava {
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
@@ -202,14 +181,14 @@ jar {
                 attribute_map['ContainedDeps'] = configurations.contain.collect { it.name }.join(' ')
                 attribute_map['NonModDeps'] = true
             }
-            if (propertyBool('is_coremod')) {
-                attribute_map['FMLCorePlugin'] = propertyString('coremod_plugin_class_name')
-                if (propertyBool('coremod_includes_mod')) {
+            if (is_coremod.toBoolean()) {
+                attribute_map['FMLCorePlugin'] = coremod_plugin_class_name
+                if (coremod_includes_mod.toBoolean()) {
                     attribute_map['FMLCorePluginContainsFMLMod'] = true
                 }
             }
-            if (propertyBool('use_access_transformer')) {
-                attribute_map['FMLAT'] = propertyString('access_transformer_locations')
+            if (use_access_transformer.toBoolean()) {
+                attribute_map['FMLAT'] = access_transformer_locations
             }
             attributes(attribute_map)
         }
@@ -219,6 +198,7 @@ jar {
 
 
 shadowJar {
+    //noinspection GroovyAssignabilityCheck,GroovyAccessibility
     configurations = [project.configurations.shadow]
     archiveClassifier = "shadow"
 }
@@ -234,15 +214,15 @@ tasks.named(remapTaskName).configure {
 }
 
 compileTestJava {
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_25
 }
 
 test {
     useJUnitPlatform()
     javaLauncher.set(javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(25)
     })
-    if (propertyBool('show_testing_output')) {
+    if (show_testing_output.toBoolean()) {
         testLogging {
             showStandardStreams = true
         }

gradle.properties

@@ -58,7 +58,6 @@ maven_url =
 # If multiple locations are stated, use spaces as the delimiter
 # WARNING: Use MCP name in AT file. Unimined will remap it to srg name when building.
 use_access_transformer = true
-access_transformer_locations = ${mod_id}_at.cfg
 
 # Coremods
 # The most powerful way to change java classes at runtime, it is however very primitive with little documentation.

gradle/scripts/dependencies.gradle

@@ -1,5 +1,3 @@
-apply from: 'gradle/scripts/helpers.gradle'
-
 repositories {
     // Other repositories described by default:
     // CleanroomMC: https://maven.cleanroommc.com
@@ -25,7 +23,7 @@ repositories {
 
 dependencies {
     compileOnly "com.cleanroommc:sponge-mixin:0.20.13+mixin.0.8.7"
-    if (propertyBool('enable_lwjglx')) {
+    if (enable_lwjglx.toBoolean()) {
         compileOnly "com.cleanroommc:lwjglx:1.0.0"
     }
 

gradle/scripts/extra.gradle

@@ -1,5 +1,5 @@
 // You may write any gradle buildscript component in this file
 // This file is automatically applied after build.gradle + dependencies.gradle is ran
 
-// If you wish to use the default helper methods, uncomment the line below
-// apply from: 'gradle/scripts/helpers.gradle'
+// Helper methods (assertProperty, assertSubProperties, setDefaultProperty) are
+// defined directly in build.gradle's script scope and exported via ext.

gradle/scripts/helpers.gradle

@@ -1,23 +1,17 @@
-apply from: 'gradle/scripts/helpers.gradle'
-
-setDefaultProperty('publish_to_maven', true, false)
-
-if (propertyBool('publish_to_maven')) {
-    assertProperty('maven_name')
-    assertProperty('maven_url')
+if (publish_to_maven.toBoolean()) {
     publishing {
         repositories {
             maven {
-                name propertyString('maven_name').replaceAll("\\s", "")
-                url propertyString('maven_url')
+                name = maven_name.replaceAll("\\s", "")
+                url = maven_url
                 credentials(PasswordCredentials)
             }
         }
         publications {
             mavenJava(MavenPublication) {
                 from components.java // Publish with standard artifacts
-                setGroupId(propertyString('root_package'))// Publish with root package as maven group
-                setArtifactId(propertyString('mod_id')) // Publish artifacts with mod id as the artifact id
+                setGroupId(root_package)// Publish with root package as maven group
+                setArtifactId(mod_id) // Publish artifacts with mod id as the artifact id
 
                 // Custom artifact:
                 // If you want to publish a different artifact to the one outputted when building normally