feat: vulkan implementation with cinnabar

Author: LunasaVT

build.gradle.kts

@@ -10,6 +10,15 @@ plugins {
 // This will cause loom to completely break apart and throw itself into oblivion.
 // I have no idea how to fix it, and honestly, I don't want to know.
 
+allprojects {
+    repositories {
+        maven("https://pkg.frst.cloud/releases") {
+            name = "frstCloudReleases"
+        }
+        maven("https://maven.logix.dev/snapshots")
+    }
+}
+
 subprojects {
     pluginManager.withPlugin("java") {
         apply(plugin = rootProject.libs.plugins.licenser.get().pluginId)

buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt

@@ -42,7 +42,7 @@ private val fabricApiModuleVersions = mapOf(
     "api-base-12109" to "0.5.2+2fa446b294", // 1.21.9
     "api-base-12110" to "1.0.0+14b92d8968", // 1.21.10
     "api-base-12111" to "1.0.5+4ebb5c0853", // 1.21.11
-    "api-base-260100" to "2.0.0+574290ba7d", // 26.1
+    "api-base-260100" to "2.0.3+ece06323c3", // 26.1
     "lifecycle-events-v1-common" to "1.1.0+2c3f108c81e6", // Common (Legacy Fabric API)
     "lifecycle-events-v1-10809" to "1.1.0+1.8.9+2c3f108c81e6", // 1.8.9
     "lifecycle-events-v1-11202" to "1.1.0+1.12.2+2c3f108c81e6", // 1.12.2
@@ -65,7 +65,7 @@ private val fabricApiModuleVersions = mapOf(
     "lifecycle-events-v1-12109" to "2.6.8+33df5e6e94", // 1.21.9
     "lifecycle-events-v1-12110" to "2.6.9+33df5e6e68", // 1.21.10
     "lifecycle-events-v1-12111" to "2.6.15+4ebb5c0853", // 1.21.11
-    "lifecycle-events-v1-260100" to "4.0.2+a208210e7d", // 26.1
+    "lifecycle-events-v1-260100" to "4.0.5+c82f0461c3", // 26.1
     "keybindings-api-v1-common" to "1.1.1+281301ea81e6", // Common (Legacy Fabric API)
     "keybindings-api-v1-10809" to "1.1.1+1.8.9+2c3f108c81e6", // 1.8.9
     "keybindings-api-v1-11202" to "1.1.1+1.12.2+2c3f108c81e6", // 1.12.2
@@ -88,7 +88,7 @@ private val fabricApiModuleVersions = mapOf(
     "key-binding-api-v1-12109" to "1.1.0+4ec8267494", // 1.21.9
     "key-binding-api-v1-12110" to "1.1.1+b3ba9c4868", // 1.21.10
     "key-binding-api-v1-12111" to "1.1.7+4fc5413f53", // 1.21.11
-    "key-mapping-api-v1-260100" to "2.0.0+574290ba7d", // 26.1
+    "key-mapping-api-v1-260100" to "2.0.4+e2bdee78c3", // 26.1
     "rendering-api-v1-common" to "1.0.0+7c545fdb81e6", // Common (Legacy Fabric API)
     "rendering-api-v1-10809" to "1.0.0+1.8.9+2c3f108c81e6", // 1.8.9
     "rendering-api-v1-11202" to "1.0.0+1.8.9+2c3f108c81e6", // 1.12.2
@@ -111,7 +111,7 @@ private val fabricApiModuleVersions = mapOf(
     "rendering-v1-12109" to "15.0.2+9bce411b94", // 1.21.9
     "rendering-v1-12110" to "16.0.1+328a75ba68", // 1.21.10
     "rendering-v1-12111" to "16.2.5+1fb1cde953", // 1.21.11
-    "rendering-v1-260100" to "18.0.0+a9f246707d", // 26.1
+    "rendering-v1-260100" to "23.0.2+f348b6c3c3", // 26.1
     "screen-api-v1-11605" to "1.0.1+3cc0f0907d", // 1.16.5
     "screen-api-v1-11701" to "1.0.5+cf39a74318", // 1.17.1
     "screen-api-v1-11802" to "1.0.11+d882b91560", // 1.18.2
@@ -131,7 +131,7 @@ private val fabricApiModuleVersions = mapOf(
     "screen-api-v1-12109" to "3.0.2+86b3ae5794", // 1.21.9
     "screen-api-v1-12110" to "3.1.0+9c82a79868", // 1.21.10
     "screen-api-v1-12111" to "3.1.7+4ebb5c0853", // 1.21.11
-    "screen-api-v1-260100" to "4.0.0+574290ba7d", // 26.1
+    "screen-api-v1-260100" to "5.0.1+d871b99ec3", // 26.1
     "command-api-v1-11605" to "1.1.3+3cc0f0907d", // 1.16.5
     "command-api-v1-11701" to "1.1.4+cf39a74318", // 1.17.1
     "command-api-v1-11802" to "1.1.10+d7c144a860", // 1.18.2
@@ -151,7 +151,7 @@ private val fabricApiModuleVersions = mapOf(
     "command-api-v2-12109" to "2.3.5+33df5e6e94", // 1.21.9
     "command-api-v2-12110" to "2.3.7+328a75ba68", // 1.21.10
     "command-api-v2-12111" to "2.4.6+4ebb5c0853", // 1.21.11
-    "command-api-v2-260100" to "3.0.0+574290ba7d", // 26.1
+    "command-api-v2-260100" to "3.0.5+e2bdee78c3", // 26.1
     "transitive-access-wideners-v1-11802" to "1.1.0+e747827960", // 1.18.2
     "transitive-access-wideners-v1-11902" to "1.3.3+08b73de490", // 1.19.2
     "transitive-access-wideners-v1-11904" to "3.3.0+1b5f819af4", // 1.19.4
@@ -169,7 +169,7 @@ private val fabricApiModuleVersions = mapOf(
     "transitive-access-wideners-v1-12109" to "6.5.2+5d9dbead94", // 1.21.9
     "transitive-access-wideners-v1-12110" to "6.5.3+41eb434368", // 1.21.10
     "transitive-access-wideners-v1-12111" to "7.0.7+1fb1cde953", // 1.21.11
-    "transitive-access-wideners-v1-260100" to "8.0.1+a208210e7d", // 26.1
+    "transitive-access-wideners-v1-260100" to "8.0.11+d871b99ec3", // 26.1
 )
 
 /**
@@ -268,7 +268,7 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
     }
     if (version != null) {
         actualDeps.add(OCDependency("dev.deftu:textile-${shenanigans}-$loader:${libs.findVersion("textile").get().displayName}", true))
-        actualDeps.add(OCDependency("dev.deftu:omnicore-${shenanigans}-$loader:${libs.findVersion("omnicore").get().displayName}", true))
+        actualDeps.add(OCDependency("org.polyfrost:omnicore-${shenanigans}-$loader:${libs.findVersion("omnicore").get().displayName}", true))
     }
 
     return actualDeps
@@ -289,6 +289,10 @@ fun Project.provideFabricApiDependency(version: Triple<Int, Int, Int>): List<OCD
         // Modern Fabric
         val finalList = mutableListOf<String>()
         finalList.addAll(fabricApiModules)
+        if (version.first >= 2) {
+            finalList.remove("screen-api-v1")
+            finalList.remove("rendering-v1")
+        }
         if (version.first >= 2 || version.second >= 18) {
             finalList.add("transitive-access-wideners-v1")
         }

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ copycat = "0.1.3"
 copycat-image-awt = "0.1.1"
 
 # Per version
-textile = "1.0.0-beta.17"
+textile = "1.0.0-beta.18"
 omnicore = "1.0.0-beta.41"
 lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
 
@@ -42,9 +42,9 @@ jetbrains-idea-ext = "1.3"
 log4j-api = "2.0-beta9" # used because this is the version that 1.8.9 supports, so we have to compile against the same (annoying)
 
 # Compose
-compose = "1.10.2"
+compose = "1.11.0-alpha04"
 compose-navigation = "2.9.1"
-skiko = "0.9.37.4"
+skiko = "0.696.0"
 
 lifecycle = "2.11.0-alpha01"
 viewmodel = "2.10.0-beta01"

minecraft/build.gradle.kts

@@ -19,6 +19,9 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.function.Predicate
 import kotlin.io.path.absolutePathString
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
 import java.lang.Boolean as JBoolean
 
 plugins {
@@ -49,6 +52,7 @@ toolkitLoomHelper {
     useProperty("mixin.debug.export", "true", GameSide.CLIENT)
     useProperty("debugBytecode", "true", GameSide.CLIENT)
     useProperty("forge.logging.console.level", "debug", GameSide.CLIENT)
+    useProperty("oshi.os.windows.wmi.timeout", "3000", GameSide.CLIENT)
     if (org.gradle.internal.os.OperatingSystem.current().isMacOsX) {
         useProperty("fml.earlyprogresswindow", "false", GameSide.CLIENT)
     }
@@ -336,6 +340,10 @@ dependencies {
     ksp(rootProject.project(":modules:relocator"))
     annotationProcessor(rootProject.project(":modules:relocator"))
 
+    if (properties["minecraft.vulkan"] != null) {
+        implementation("graphics.cinnabar:cinnabar-fabric:26.1-snapshot-9-0.0.7-beta-85-gd3508cc")
+    }
+
     for (project in rootProject.project(":modules").subprojects) {
         if ("relocator" in project.path) {
             compileOnly(project(project.path))
@@ -368,6 +376,60 @@ dependencies {
         compileOnly("net.azureaaron:dandelion:1.0.0-alpha.3") { isTransitive = false }
     }
     api("dev.deftu:enhancedeventbus:2.0.0") // TODO
+    if (properties["minecraft.vulkan"] != null) {
+        // i couldnt find a way to get it to work
+        // soooooooooooooooooooooooooooooooo
+        val fabricApiPatchSrc = configurations.create("fabricApiPatchSrc") {
+            isCanBeConsumed = false
+            isCanBeResolved = true
+        }
+        dependencies.add(fabricApiPatchSrc.name, "net.fabricmc.fabric-api:fabric-screen-api-v1:4.0.0+9f78a5a8ed") { isTransitive = false }
+        dependencies.add(fabricApiPatchSrc.name, "net.fabricmc.fabric-api:fabric-rendering-v1:23.0.2+f348b6c3c3") { isTransitive = false }
+
+        val patchedFabricApiDir = layout.buildDirectory.dir("patched-fabric-api")
+
+        val patchFabricApiMods by tasks.registering {
+            inputs.files(fabricApiPatchSrc)
+            outputs.dir(patchedFabricApiDir)
+            doLast {
+                val outDir = patchedFabricApiDir.get().asFile
+                outDir.mkdirs()
+                val jarFiles: Set<File> = fabricApiPatchSrc.resolvedConfiguration.resolvedArtifacts.map { it.file }.toSet()
+                for (jar: File in jarFiles) {
+                    val mixinJson: String? = when {
+                        "screen-api" in jar.name -> "fabric-screen-api-v1.mixins.json"
+                        "rendering-v1" in jar.name -> "fabric-rendering-v1.mixins.json"
+                        else -> null
+                    }
+                    val outFile = File(outDir, jar.name)
+                    ZipFile(jar).use { zf ->
+                        ZipOutputStream(outFile.outputStream().buffered()).use { zos ->
+                            zf.entries().asSequence().forEach { entry ->
+                                val bytes = zf.getInputStream(entry).readBytes()
+                                val content = if (mixinJson != null && entry.name == mixinJson) {
+                                    var json = String(bytes)
+                                        .replace("\"required\": true", "\"required\": false")
+                                        .replace("\"defaultRequire\": 1", "\"defaultRequire\": 0")
+                                    if ("rendering-v1" in mixinJson) {
+                                        json = json.replace(Regex("\"client\"\\s*:\\s*\\[.*?\\]", RegexOption.DOT_MATCHES_ALL), "\"client\": []")
+                                    }
+                                    json.toByteArray()
+                                } else bytes
+                                zos.putNextEntry(ZipEntry(entry.name))
+                                zos.write(content)
+                                zos.closeEntry()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        val patchedScreenApi = patchedFabricApiDir.map { it.file("fabric-screen-api-v1-4.0.0+9f78a5a8ed.jar") }
+        val patchedRenderingV1 = patchedFabricApiDir.map { it.file("fabric-rendering-v1-23.0.2+f348b6c3c3.jar") }
+        maybeModApi(files(patchedScreenApi) { builtBy(patchFabricApiMods) })
+        maybeModApi(files(patchedRenderingV1) { builtBy(patchFabricApiMods) })
+    }
 }
 
 tasks {

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java

@@ -186,10 +186,11 @@ private static void registerEventHandlers() {
         EventManager.register(InitializationEvent.class, e -> HudManager.INSTANCE.initialize());
         EventManager.register(HudRenderEvent.class, e -> {
             if (!SkiaCtx.INSTANCE.isReady()) return;
-            SkiaCtx.INSTANCE.queueDraw((Runnable) () -> {
+            SkiaCtx.INSTANCE.queueHudDraw(() -> {
                 var ctx = new RenderContext(SkiaCtx.INSTANCE.getCanvas());
                 HudManager.INSTANCE.render(ctx, OmniClient.getWindow().getScreenWidth(), OmniClient.getWindow().getScreenHeight());
             });
+            SkiaCtx.INSTANCE.drawNow();
         });
         EventManager.register(HudEditorToggleEvent.class, e -> {
             if (e.open) {

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java

@@ -123,9 +123,15 @@ public List<String> getMixins() {
 
         mixins.add("skia.Mixin_InitSkia");
         mixins.add("skia.Mixin_SkiaFrame");
+        mixins.add("skia.Mixin_SkiaFrameVk");
         mixins.add("skia.Mixin_InitSkiaFontRenderer");
         mixins.add("skia.Mixin_FixComposeRaceCondition");
 
+        try {
+            Class.forName("org.polyfrost.oneconfig.internal.ui.services.CinnabarVulkanService");
+            mixins.add("skia.Mixin_CinnabarSkiaFlush");
+        } catch (ClassNotFoundException ignored) {}
+
         {
             Logger logger = LogManager.getLogger(OneConfigMixinInit.class);
             logger.info("Loaded {} non-common Mixins", mixins.size());

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/skia/Mixin_SkiaFrame.java

@@ -21,8 +21,17 @@ public class Mixin_SkiaFrame {
         SkiaCtx.INSTANCE.recreateSurface(this.framebufferWidth, this.framebufferHeight);
     }
 
-    @Inject(method = "updateDisplay", at = @At("HEAD"))
+    @Inject(method = "updateDisplay", at = @At("HEAD"), require = 0)
     void impl$onDraw(CallbackInfo ci) {
-        SkiaCtx.INSTANCE.draw();
+        if (!SkiaCtx.INSTANCE.isVulkanMode()) {
+            SkiaCtx.INSTANCE.draw();
+        }
+    }
+
+    @Inject(method = "updateDisplay(Lcom/mojang/blaze3d/TracyFrameCapture;)V", at = @At("HEAD"), require = 0)
+    void impl$onDrawNew(CallbackInfo ci) {
+        if (!SkiaCtx.INSTANCE.isVulkanMode()) {
+            SkiaCtx.INSTANCE.draw();
+        }
     }
 }

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/skia/Mixin_SkiaFrameVk.java

@@ -0,0 +1,8 @@
+package org.polyfrost.oneconfig.internal.mixin.skia;
+
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Minecraft.class)
+public class Mixin_SkiaFrameVk {
+}