Refactor: Build scripts

Author: emyfops

common/build.gradle.kts

@@ -1,10 +1,11 @@
+import java.util.Properties
+
 val fabricLoaderVersion = property("fabric_loader_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
 val kotlinVersion = property("kotlin_version").toString()
 val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
-val architecturyVersion = property("architectury_version").toString()
 
-architectury { common("fabric", "forge", "neoforge") }
+architectury { common("fabric", "forge", "neoforge", "quilt") }
 
 loom {
     silentMojangMappingsLicense()
@@ -31,8 +32,17 @@ dependencies {
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
 }
 
-// Avoid nested jars
-tasks.named("remapJar") {
-    enabled = false
+tasks {
+    remapJar {
+        enabled = false
+    }
+
+    processResources {
+        Properties().apply {
+            load(project.rootProject.file("gradle.properties").inputStream())
+        }.forEach { key, value ->
+            inputs.property(key.toString(), value)
+        }
+    }
 }
 

common/src/main/java/com/lambda/mixin/render/LightmapTextureManagerMixin.java

@@ -7,17 +7,17 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
 @Mixin(LightmapTextureManager.class)
 public class LightmapTextureManagerMixin {
-    @ModifyArgs(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"))
-    private void updateModify(Args args) {
+    @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"), index = 2)
+    private int updateModify(int x) {
         if (Fullbright.INSTANCE.isEnabled() || XRay.INSTANCE.isEnabled()) {
-            args.set(2, 0xFFFFFFFF);
+            return 0xFFFFFFFF;
         }
+        return x;
     }
 
     @Inject(method = "getDarknessFactor(F)F", at = @At("HEAD"), cancellable = true)

common/src/main/kotlin/com/lambda/command/CommandManager.kt

@@ -117,16 +117,6 @@ object CommandManager : Configurable(LambdaConfig), Loadable {
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                // Let's hope the maintainer of the library releases a new version soon
-                // because this is horrible, it takes multiple SECONDS to scan the classpath,
-                // and it's not even that big
-                //
-                // The culprit may be due to [ClasspathHelper.forClassLoader()] loading
-                // the classes from the main thread while we are in a different thread.
-                // If this is the case I wish the maintainer a very bad day.
-                .addUrls(ClasspathHelper.forJavaClassPath())
-                .addUrls(ClasspathHelper.forClassLoader())
-                .filterInputsBy { it.contains("lambda") }
                 .forPackage("com.lambda.command.commands")
                 .setScanners(Scanners.SubTypes)
         ).getSubTypesOf(LambdaCommand::class.java).forEach { commandClass ->

common/src/main/kotlin/com/lambda/module/ModuleRegistry.kt

@@ -22,16 +22,6 @@ object ModuleRegistry : Loadable {
     override fun load(): String {
         Reflections(
             ConfigurationBuilder()
-                // Let's hope the maintainer of the library releases a new version soon
-                // because this is horrible, it takes multiple SECONDS to scan the classpath,
-                // and it's not even that big
-                //
-                // The culprit may be due to [ClasspathHelper.forClassLoader()] loading
-                // the classes from the main thread while we are in a different thread.
-                // If this is the case I wish the maintainer a very bad day.
-                .addUrls(ClasspathHelper.forJavaClassPath())
-                .addUrls(ClasspathHelper.forClassLoader())
-                .filterInputsBy { it.contains("lambda") }
                 .forPackage("com.lambda.module.modules")
                 .addScanners(Scanners.SubTypes)
         ).getSubTypesOf(Module::class.java).forEach { moduleClass ->

fabric/build.gradle.kts

@@ -1,15 +1,14 @@
 val fabricLoaderVersion = property("fabric_loader_version").toString()
 val fabricApiVersion = property("fabric_api_version").toString()
-val architecturyVersion = property("architectury_version").toString()
 val kotlinFabricVersion = property("kotlin_fabric_version").toString()
 
+base.archivesName.set("${base.archivesName.get()}-fabric")
+
 architectury {
     platformSetupLoomIde()
     fabric()
 }
 
-base.archivesName.set("${base.archivesName.get()}-fabric")
-
 loom {
     accessWidenerPath.set(project(":common").loom.accessWidenerPath)
     enableTransitiveAccessWideners.set(true)
@@ -19,10 +18,16 @@ val common: Configuration by configurations.creating {
     configurations.compileClasspath.get().extendsFrom(this)
     configurations.runtimeClasspath.get().extendsFrom(this)
     configurations["developmentFabric"].extendsFrom(this)
+    isCanBeResolved = true
+    isCanBeConsumed = false
 }
 
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
+val shadowBundle: Configuration by configurations.creating {
+    isCanBeResolved = true
+    isCanBeConsumed = false
+}
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
@@ -34,6 +39,11 @@ fun DependencyHandlerScope.setupConfigurations() {
         modImplementation(it)
         include(it)
     }
+
+    shadowBundle.dependencies.forEach {
+        shadowCommon(it)
+        shadow(it)
+    }
 }
 
 dependencies {
@@ -52,27 +62,20 @@ dependencies {
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
-    shadowCommon(project(":common", configuration = "transformProductionFabric")) { isTransitive = false }
+    shadowBundle(project(":common", configuration = "transformProductionFabric"))
 
     // Finish the configuration
     setupConfigurations()
 }
 
 tasks {
-    processResources {
-        inputs.property("group", project.group)
-        inputs.property("version", project.version)
+    remapJar {
+        injectAccessWidener = true
+    }
 
+    processResources {
         filesMatching("fabric.mod.json") {
-            expand(getProperties())
-            expand(mutableMapOf(
-                "group" to project.group,
-                "version" to project.version,
-            ))
+            expand(project(":common").properties)
         }
     }
-
-    remapJar {
-        injectAccessWidener.set(true)
-    }
 }

forge/build.gradle.kts

@@ -1,15 +1,14 @@
 val forgeVersion = property("forge_version").toString()
-val architecturyVersion = property("architectury_version").toString()
 val mixinExtrasVersion = property("mixinextras_version").toString()
 val kotlinForgeVersion = property("kotlin_forge_version").toString()
 
+base.archivesName.set("${base.archivesName.get()}-forge")
+
 architectury {
     platformSetupLoomIde()
     forge()
 }
 
-base.archivesName.set("${base.archivesName.get()}-forge")
-
 loom {
     accessWidenerPath.set(project(":common").loom.accessWidenerPath)
 
@@ -29,11 +28,16 @@ val common: Configuration by configurations.creating {
     configurations.compileClasspath.get().extendsFrom(this)
     configurations.runtimeClasspath.get().extendsFrom(this)
     configurations["developmentForge"].extendsFrom(this)
+    isCanBeResolved = true
+    isCanBeConsumed = false
 }
 
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
-val shadowInclude: Configuration by configurations.creating
+val shadowBundle: Configuration by configurations.creating {
+    isCanBeResolved = true
+    isCanBeConsumed = false
+}
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
@@ -45,6 +49,11 @@ fun DependencyHandlerScope.setupConfigurations() {
         forgeRuntimeLibrary(it)
         include(it)
     }
+
+    shadowBundle.dependencies.forEach {
+        shadowCommon(it)
+        shadow(it)
+    }
 }
 
 dependencies {
@@ -67,23 +76,20 @@ dependencies {
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
-    shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
+    shadowBundle(project(path = ":common", configuration = "transformProductionForge"))
 
     // Finish the configuration
     setupConfigurations()
 }
 
 tasks {
-    processResources {
-        inputs.property("group", project.group)
-        inputs.property("version", project.version)
+    remapJar {
+        injectAccessWidener = true
+    }
 
+    processResources {
         filesMatching("META-INF/mods.toml") {
-            expand(getProperties())
-            expand(mutableMapOf(
-                "group" to project.group,
-                "version" to project.version,
-            ))
+            expand(project(":common").properties)
         }
     }
 

gradle.properties

@@ -11,10 +11,6 @@ mixinextras_version=0.3.5
 kotlin_version=1.9.23
 kotlinx_coroutines_version=1.8.0
 
-# Architectury https://docs.architectury.dev/start
-enabled_platforms=fabric,forge
-architectury_version=11.1.13
-
 # Fabric https://fabricmc.net/develop/
 fabric_loader_version=0.15.7
 yarn_mappings=1.20.4+build.3
@@ -30,7 +26,8 @@ neo_version=20.4.196
 
 # Quilt https://quiltmc.org/
 quilt_version=0.24.0
-quilted_fabric_version=8.0.0-alpha.4+0.91.6-1.20.2
+quilted_fabric_version=9.0.0-alpha.5+0.96.11-1.20.4
+kotlin_quilt_version=4.0.0+kt.1.9.23+flk.1.10.19
 
 # Kotlin https://kotlinlang.org/
 kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/build.gradle.kts

@@ -1,16 +1,16 @@
 val neoVersion = property("neo_version").toString()
-val architecturyVersion = property("architectury_version").toString()
 val kotlinForgeVersion = property("kotlin_forge_version").toString()
 
+base.archivesName.set("${base.archivesName.get()}-neoforge")
+
 architectury {
     platformSetupLoomIde()
     neoForge()
 }
 
-base.archivesName.set("${base.archivesName.get()}-neoforge")
-
 loom {
     accessWidenerPath.set(project(":common").loom.accessWidenerPath)
+
     neoForge {
         enableTransitiveAccessWideners = true
     }
@@ -25,23 +25,32 @@ val common: Configuration by configurations.creating {
     configurations.compileClasspath.get().extendsFrom(this)
     configurations.runtimeClasspath.get().extendsFrom(this)
     configurations["developmentNeoForge"].extendsFrom(this)
+    isCanBeResolved = true
+    isCanBeConsumed = false
 }
 
 val includeLib: Configuration by configurations.creating
 val includeMod: Configuration by configurations.creating
+val shadowBundle: Configuration by configurations.creating {
+    isCanBeResolved = true
+    isCanBeConsumed = false
+}
 
 fun DependencyHandlerScope.setupConfigurations() {
     includeLib.dependencies.forEach {
         implementation(it)
-        forgeRuntimeLibrary(it)
         include(it)
     }
 
     includeMod.dependencies.forEach {
         implementation(it)
-        forgeRuntimeLibrary(it)
         include(it)
     }
+
+    shadowBundle.dependencies.forEach {
+        shadowCommon(it)
+        shadow(it)
+    }
 }
 
 dependencies {
@@ -57,34 +66,20 @@ dependencies {
 
     // Common (Do not touch)
     common(project(":common", configuration = "namedElements")) { isTransitive = false }
-    shadowCommon(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }
+    shadowBundle(project(path = ":common", configuration = "transformProductionNeoForge"))
 
     // Finish the configuration
     setupConfigurations()
 }
 
 tasks {
-    processResources {
-        inputs.property("group", project.group)
-        inputs.property("version", project.version)
-
-        filesMatching("META-INF/mods.toml") {
-            expand(getProperties())
-            expand(mutableMapOf(
-                "group" to project.group,
-                "version" to project.version,
-            ))
-        }
-    }
-
     remapJar {
-        atAccessWideners.add("lambda.accesswidener")
-        injectAccessWidener.set(true)
+        injectAccessWidener = true
     }
 
-    sourceSets.forEach {
-        val dir = layout.buildDirectory.dir("sourcesSets/${it.name}")
-        it.output.setResourcesDir(dir)
-        it.java.destinationDirectory.set(dir)
+    processResources {
+        filesMatching("META-INF/mods.toml") {
+            expand(project(":common").properties)
+        }
     }
 }