Merge branch 'multiversion/dev' into feature/splitscreen

Author: isXander

buildSrc/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
 
     implementation(plugin("dev.isxander.modstitch.base", "0.5.16-unstable"))
-    implementation(plugin("dev.kikugie.stonecutter", "0.6-beta.2"))
+    implementation(plugin("dev.kikugie.stonecutter", "0.7-alpha.8"))
     implementation(plugin("fabric-loom", "1.10.5"))
     implementation(plugin("net.neoforged.moddev", "2.0.80"))
 }

buildSrc/src/main/kotlin/dev/isxander/controlify/Project.kt

@@ -1,19 +1,16 @@
 package dev.isxander.controlify
 
-import dev.isxander.controlify.stonecutter
 import dev.isxander.modstitch.base.extensions.ModstitchExtension
-import dev.kikugie.stonecutter.build.StonecutterBuild
+import dev.kikugie.stonecutter.build.StonecutterBuildExtension
 import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
-import kotlin.text.toBoolean
 
 internal val Project.modstitch: ModstitchExtension
     get() = extensions.getByType<ModstitchExtension>()
 
-internal val Project.stonecutter: StonecutterBuild
-    get() = extensions.getByType<StonecutterBuild>()
+internal val Project.stonecutter: StonecutterBuildExtension
+    get() = extensions.getByType<StonecutterBuildExtension>()
 
 val Project.branchProj: Project
     get() = stonecutter.node.sibling("")!!.project

buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts

@@ -140,3 +140,14 @@ publishing {
         }
     }
 }
+
+// fix stonecutterGenerate task dependencies
+tasks.named<ProcessResources>("generateModMetadata") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    dependsOn("stonecutterGenerate")
+}
+modstitch.moddevgradle {
+    tasks.named("createMinecraftArtifacts") {
+        dependsOn("stonecutterGenerate")
+    }
+}

settings.gradle.kts

@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.6-beta.2"
+    id("dev.kikugie.stonecutter") version "0.7-alpha.8"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 

src/main/java/dev/isxander/controlify/utils/render/Blit.java

@@ -1,5 +1,7 @@
 package dev.isxander.controlify.utils.render;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import dev.isxander.controlify.utils.ColorUtils;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

stonecutter.gradle.kts

@@ -18,6 +18,8 @@ if (ciSingleBuild != null) {
     stonecutter active file("versions/current")
 }
 
+stonecutter.tree.nodes.forEach { it.project.plugins.apply("dev.kikugie.stonecutter") }
+
 val releaseMod by tasks.registering {
     group = "controlify"
     dependsOn("buildAndCollect")