Update to 26.2-snapshot-1

Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>

.idea/runConfigurations/SnowyGUI__build_.xml

@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PdevBuild=true" />
+      <option name="scriptParameters" value="-PdevBuild=true --stacktrace" />
       <option name="taskDescriptions">
         <list />
       </option>

.idea/runConfigurations/SnowyGUI__build_release_.xml

@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PdevBuild=false" />
+      <option name="scriptParameters" value="-PdevBuild=false --stacktrace" />
       <option name="taskDescriptions">
         <list />
       </option>

build.gradle.kts

@@ -1,7 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.modrinth.minotaur.ModrinthExtension
-import com.modrinth.minotaur.dependencies.DependencyType
-import masecla.modrinth4j.model.version.ProjectVersion.VersionType
 import net.fabricmc.loom.LoomGradleExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -15,22 +12,21 @@ buildscript {
 }
 
 plugins {
-    kotlin("jvm") version "2.3.0"
-    kotlin("plugin.serialization") version "2.3.0"
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("architectury-plugin") version "[3.4.160, 3.5["
-    id("dev.architectury.loom") version "[1.13.464, 1.14[" apply false
+    kotlin("jvm") version "2.3.10"
+    kotlin("plugin.serialization") version "2.3.10"
+    id("com.gradleup.shadow") version "9.4.1" apply false
+    id("architectury-plugin") version "[3.5.166, 3.6["
+    id("dev.architectury.loom-no-remap") version "[1.14.473, 1.15[" apply false
     id("com.github.ben-manes.versions") version "0.51.0"
     id("net.kyori.indra.git") version "3.1.3"
     id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5"
-    id("com.modrinth.minotaur") version "2.8.7" apply false
 }
 
 group = "fr.username404"
-version = "0.4.2"
+version = "0.4.4"
 val groupAndName = "${rootProject.group}.${rootProject.name.lowercase()}"
 
-val javaVer: String = "21"
+val javaVer: String = "25"
 val sourceJavaVer: String = javaVer
 val kotlinVer: String by rootProject
 val kotlinSplitVersion = kotlinVer.split('.')
@@ -50,22 +46,17 @@ subprojects {
         ignoreFailures = true
     }
     lateinit var mappingsDep: Dependency
-    apply(plugin = "dev.architectury.loom")
+    apply(plugin = "dev.architectury.loom-no-remap")
     apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
     extensions.configure<LoomGradleExtension>("loom") {
         if (this@subprojects.project.name != "common") {
             accessWidenerPath.set(project(":common").extensions.getByType<LoomGradleExtensionAPI>().accessWidenerPath)
         }
-        mappingsDep = layered {
-            silentMojangMappingsLicense()
-            officialMojangMappings().parchment("org.parchmentmc.data:parchment-1.21.11:2025.12.20")
     }
-    }
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
     val shadowC by configurations.creating
     repositories {
         maven(url = "https://jitpack.io"); mavenCentral()
-        maven(url = "https://maven.parchmentmc.org")
     }
     dependencies {
         implementation("$kotlinX:kotlinx-coroutines-jdk8:${rootProject.property("kotlin_coroutines_version")}")
@@ -77,20 +68,6 @@ subprojects {
             "com.github.Vatuu:discord-rpc:1.6.2"
         ).forEach { implementation(it); shadowC(it) { isTransitive = false; exclude("com.sun.jna") } }
         "minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}")
-        "mappings"(mappingsDep)
-    }
-    apply(plugin = "com.modrinth.minotaur")
-    extensions.configure<ModrinthExtension>("modrinth") {
-        projectId.set("OuGyGg6A")
-        syncBodyFrom.set("$rootDir/README.md")
-        gameVersions.add(minecraftVersion)
-        if (project.name == "forge") dependencies.add(com.modrinth.minotaur.dependencies.ModDependency("ordsPcFz", DependencyType.REQUIRED)) // Kotlinforforge dependency
-        versionNumber.set(rootProject.version.toString() + "-${project.name}")
-        versionType.set(VersionType.ALPHA.name)
-        detectLoaders.set(false)
-        loaders.add(project.name)
-        versionName.set("${rootProject.name} ${rootProject.version}")
-        uploadFile.set(fileTree("$rootDir/remappedJars/").files.find { it.name.contains(project.name) })
     }
     tasks {
         apply(plugin = "net.kyori.indra.git")
@@ -108,14 +85,16 @@ subprojects {
             exclude("**/*.kotlin_metadata")
             exclude("**/*.kotlin_builtins")
             exclude("META-INF/maven/**/*")
-            archiveClassifier.set("shadow-${this@subprojects.name}")
+            archiveVersion.set("[${rootProject.version}+$minecraftVersion]")
+            archiveClassifier.set(this@subprojects.name)
+            destinationDirectory.set(file("$rootDir/jars"))
         }
         val shadowJar = getByName("shadowJar") as ShadowJar
         val shrinkJar = register("shrinkJar", proguard.gradle.ProGuardTask::class) { group = this@subprojects.group as String
             val dictionariesDir = "$rootDir/obfuscation"
             dependsOn(shadowJar)
             injars(shadowJar)
-            outjars("$buildDir/shrinkedJar/${shadowJar.outputs.files.singleFile.name}")
+            outjars("$rootDir/jars/shrinkedJar/${shadowJar.outputs.files.singleFile.name}")
             keep("class $group.snowygui.mixins.* { * ; }")
             keep("class $group.snowygui.fabric.FabricInit")
             keep("class $group.snowygui.fabric.ModMenuConf")
@@ -163,20 +142,7 @@ subprojects {
             overloadaggressively()
             mergeinterfacesaggressively()
         }
-        withType(net.fabricmc.loom.task.RemapJarTask::class) {
-            if (!devBuild) {
-                dependsOn(shrinkJar)
-                val shrinkedJar = shrinkJar.get().outJarFileCollection.singleFile
-                inputFile.set(shrinkedJar)
-            } else inputFile.set(shadowJar.archiveFile)
-            archiveBaseName.set(shadowJar.archiveBaseName)
-            archiveVersion.set("[${rootProject.version}+$minecraftVersion]")
-            archiveClassifier.set(this@subprojects.name)
-            if (this@subprojects.name.contains("forge"))
-                atAccessWideners.set(listOf("${rootProject.name.lowercase()}.accessWidener"))
-            if (!archiveFileName.get().contains("common")) destinationDirectory.set(file("$rootDir/remappedJars"))
-        }
-        getByName("modrinth").dependsOn(build)
+        build.get().dependsOn(if (devBuild) shadowJar else shrinkJar)
     }
 }
 
@@ -203,7 +169,7 @@ allprojects {
             compilerOptions {
                 // https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
                 freeCompilerArgs = listOf(
-                    "-Xjvm-default=all", "-Xlambdas=indy", "-Xtype-enhancement-improvements-strict-mode",
+                    "-jvm-default=enable", "-Xlambdas=indy", "-Xtype-enhancement-improvements-strict-mode",
                     "-Xmultifile-parts-inherit",
                     "-Xbackend-threads=0", "-Xno-param-assertions", "-Xno-call-assertions",
                     "-opt-in=kotlin.RequiresOptIn", "-Xassertions=jvm", "-progressive"
@@ -230,7 +196,7 @@ allprojects {
             }
             val modProperties = mapOf(
                 "mod_version" to (rootProject.version as String),
-                "minecraft_version" to minecraftVersion,
+                "minecraft_version" to minecraftVersion.replace("snapshot-", "alpha."),
                 "java_version" to javaVer,
                 "mod_group" to this@allprojects.group,
                 "fabric_kotlin" to rootProject.property("fabric_language_kotlin"),

common/build.gradle.kts

@@ -1,7 +1,7 @@
 architectury { common("fabric", "neoforge"); injectInjectables = true }
 dependencies {
-    modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}")
-    modImplementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") {
+    implementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}")
+    implementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") {
         exclude(module = "fabric-api")
     }
 }
@@ -10,4 +10,5 @@ loom {
     accessWidenerPath = file("src/main/resources/${rootProject.name.lowercase()}.accessWidener")
 }
 
+tasks.getByName("shadowJar").enabled = false
 tasks.getByName("shrinkJar").enabled = false

common/src/main/java/fr/username404/snowygui/mixins/GammaMixin.java

@@ -2,17 +2,17 @@ package fr.username404.snowygui.mixins;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import fr.username404.snowygui.gui.feature.GammaBoost;
-import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.LightmapRenderStateExtractor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(LightTexture.class)
+@Mixin(LightmapRenderStateExtractor.class)
 abstract class GammaMixin {
     @ModifyExpressionValue(
-        method = "updateLightTexture(F)V", at = @At(
+        method = "extract", at = @At(
             value = "INVOKE",
             target = "Ljava/lang/Double;floatValue()F",
-            ordinal = 1
+            ordinal = 0
         )
     )
     public float highGamma(float original) {

common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt

@@ -6,7 +6,7 @@ import fr.username404.snowygui.gui.elements.ClickBox.Companion.sortAlphabeticall
 import fr.username404.snowygui.gui.feature.*
 import fr.username404.snowygui.utils.FontUtil
 import me.shedaniel.clothconfig2.gui.entries.StringListListEntry
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.Component.translatable
@@ -23,14 +23,13 @@ private fun supplyComponent(string: String?): Optional<Component> = string?.run
 
 val SnowyConfigScreen: Screen = object: Screen(translationComponent) {
     override fun isPauseScreen(): Boolean = false
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, pTick: Float) {
-        super.renderBackground(guiGraphics, mouseX, mouseY, pTick)
+    override fun extractRenderState(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, pTick: Float) {
         FontUtil.drawScaled(guiGraphics,
             text = "An appropriate version of the Cloth Config mod is required for the configuration of snowygui.", 16.0, 16.0,
             color = Colors.WHITE, scaleFactor = 0.85F
         )
     }
-    override fun onClose() { minecraft?.screen = configScreenParent }
+    override fun onClose() = minecraft.gui.setScreen(configScreenParent)
 }; get() = try {
     Class.forName("me.shedaniel.clothconfig2.api.ConfigBuilder")
     val macrosBox: ClickBox? = ClickGui.components.find {

common/src/main/kotlin/fr/username404/snowygui/gui/Element.kt

@@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer
 import fr.username404.snowygui.Snowy
 import fr.username404.snowygui.gui.feature.Colors
 import fr.username404.snowygui.utils.RenderingUtil
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.client.gui.components.events.GuiEventListener
 
 fun interface Renderable {

common/src/main/kotlin/fr/username404/snowygui/gui/SnowyScreen.kt

@@ -1,12 +1,12 @@
 package fr.username404.snowygui.gui
 
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component.translatable
 
 abstract class SnowyScreen(translatableString: String = "screen.snowy.gui", private val willPauseScreen: Boolean = false): Screen(translatable(translatableString)) {
     abstract val components: MutableCollection<Element>
-    override fun render(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
+    override fun extractRenderState(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
         components.forEach {
             it.display(guiGraphics)
         }

common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt

@@ -9,7 +9,7 @@ import fr.username404.snowygui.gui.feature.Colors
 import fr.username404.snowygui.utils.RenderingUtil
 import io.github.config4k.extract
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.util.ARGB
 import kotlin.math.floor
@@ -157,7 +157,7 @@ class ClickBox(
         }
 
         with(Minecraft.getInstance().font) {
-            guiGraphics?.drawString(
+            guiGraphics?.text(
                 this,
                 Component.nullToEmpty(name.string),
                 (xi + 5 + (inclination / 2f)).toInt(),

common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImpl.kt

@@ -6,7 +6,7 @@ import fr.username404.snowygui.config.Configuration
 import fr.username404.snowygui.gui.ColoredElement
 import fr.username404.snowygui.gui.feature.ButtonInfo.Companion.Type
 import fr.username404.snowygui.utils.FontUtil
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.client.input.MouseButtonEvent
 import kotlin.reflect.full.findAnnotation
 

common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImplWithHud.kt

@@ -4,12 +4,12 @@ import fr.username404.snowygui.EventSnowy
 import fr.username404.snowygui.argsLambda
 import fr.username404.snowygui.gui.Renderable
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 
 sealed class ButtonImplWithHud: ButtonImpl() {
     protected abstract val hudRenderLambda: Renderable
     private val generatedLambda: argsLambda = {
-        if (!Minecraft.getInstance().options.hideGui) {
+        if (!Minecraft.getInstance().gui.hud.isHidden) {
             hudRenderLambda.render(it.first() as GuiGraphics?)
         }
     }

common/src/main/kotlin/fr/username404/snowygui/gui/feature/Keystrokes.kt

@@ -6,7 +6,7 @@ import fr.username404.snowygui.gui.Renderable
 import fr.username404.snowygui.utils.FontUtil
 import fr.username404.snowygui.utils.RenderingUtil
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 
 @ButtonInfo(Category.HUD)
 object Keystrokes: ButtonImplWithHud() {

common/src/main/kotlin/fr/username404/snowygui/misc/AddKeyMaps.kt

@@ -29,8 +29,11 @@ object AddKeyMaps {
     ) to lambda
     val list: MutableMap<KeyMapping, privateLambda> = with(Minecraft.getInstance()) {
         mutableMapOf(
-            mkMap("opengui", GLFW_KEY_Y) { setScreen(ClickGui) },
-            mkMap("configkey", GLFW_KEY_U) { setScreen(run { configScreenParent = null; SnowyConfigScreen }) }
+            mkMap("opengui", GLFW_KEY_Y) { Minecraft.getInstance().setScreenAndShow(ClickGui) },
+            mkMap("configkey", GLFW_KEY_U) {
+                configScreenParent = null
+                Minecraft.getInstance().setScreenAndShow(SnowyConfigScreen)
+            }
         )
     }
 }

common/src/main/kotlin/fr/username404/snowygui/utils/FontUtil.kt

@@ -2,14 +2,14 @@ package fr.username404.snowygui.utils
 
 import net.minecraft.client.Minecraft
 import fr.username404.snowygui.gui.feature.Colors
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.util.ARGB
 
 object FontUtil {
     fun drawScaled(guiGraphics: GuiGraphics, text: String, x: Double, y: Double, scaleFactor: Float, color: Colors = Colors.BLACK) {
         val stack = guiGraphics.pose()
         stack.scale(scaleFactor, scaleFactor)
-        guiGraphics.drawString(
+        guiGraphics.text(
             Minecraft.getInstance().font, text,
             (x / scaleFactor).toInt(), (y / scaleFactor).toInt(),
             ARGB.opaque(color.hexValue), false

common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt

@@ -1,8 +1,7 @@
 package fr.username404.snowygui.utils
 
-import com.mojang.blaze3d.opengl.GlStateManager
 import fr.username404.snowygui.gui.feature.Colors
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
 import net.minecraft.util.ARGB
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -10,8 +9,8 @@ import kotlin.math.max
 import kotlin.math.min
 
 object RenderingUtil {
-    fun prepareDraw() = GlStateManager._enableBlend()
-    fun endDraw() = GlStateManager._disableBlend()
+    fun prepareDraw() = Unit
+    fun endDraw() = Unit
 
     private fun argbFromRgb(rgb: Int, opacity: Float = 1f): Int {
         return ARGB.color(
@@ -98,7 +97,7 @@ object RenderingUtil {
     fun hLine(guiGraphics: GuiGraphics?, x1: Int, x2: Int, y: Int, rgb: Int, opacity: Float = 1f) {
         if (guiGraphics == null) return
         prepareDraw()
-        guiGraphics.hLine(x1, x2, y, argbFromRgb(rgb, opacity))
+        guiGraphics.horizontalLine(x1, x2, y, argbFromRgb(rgb, opacity))
         endDraw()
     }
 }

common/src/main/resources/snowygui.accessWidener

@@ -1,9 +1,3 @@
-accessWidener v2 named
-
-accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object;
-mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
-
-accessible field com/mojang/blaze3d/opengl/GlCommandEncoder inRenderPass Z
-mutable field com/mojang/blaze3d/opengl/GlCommandEncoder inRenderPass Z
+accessWidener v2 official
 
 accessible method net/minecraft/client/KeyMapping$Category register (Ljava/lang/String;)Lnet/minecraft/client/KeyMapping$Category;

fabric/build.gradle.kts

@@ -13,17 +13,17 @@ object Groups {
 architectury { platformSetupLoomIde(); fabric() }
 
 dependencies {
-    modImplementation("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}")
-    modApi("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")
-    modApi("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")
-    modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.property("clothconfig_version")}") { exclude(group = Groups.FabricApi) }
-    modImplementation("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")
-    modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = rootProject.property("fabric_language_kotlin") as String)
-    modImplementation("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") {
+    implementation("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}")
+    api("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")
+    api("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")
+    api("me.shedaniel.cloth:cloth-config-fabric:${rootProject.property("clothconfig_version")}") { exclude(group = Groups.FabricApi) }
+    implementation("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")
+    implementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = rootProject.property("fabric_language_kotlin") as String)
+    implementation("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") {
         exclude(group = Groups.FabricApi, module = "fabric-api-base")
         exclude(group = Groups.FabricApi, module = "fabric-resource-loader-v0")
     }
-    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common")) { isTransitive = false }
     add("developmentFabric", project(path = ":common")) { isTransitive = false }
     shadowC(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false }
 }

fabric/src/main/java/fr/username404/snowygui/mixins/ZoomMixin.java

@@ -1,20 +1,19 @@
 package fr.username404.snowygui.mixins;
 
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import fr.username404.snowygui.fabric.OkZoomerCompatKt;
 import fr.username404.snowygui.gui.feature.Zoom;
 import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.GameRenderer;
 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.callback.CallbackInfoReturnable;
 
-@Mixin(GameRenderer.class)
+@Mixin(Camera.class)
 abstract class ZoomMixin {
-	@Inject(at = @At(value = "RETURN"), method = "getFov(Lnet/minecraft/client/Camera;FZ)F", cancellable = true)
-	private void getFov(Camera camera, float f, boolean bl, CallbackInfoReturnable<Float> cir) {
+	@ModifyReturnValue(at = @At(value = "RETURN"), method = "calculateFov")
+	private static float getFov(float original) {
 		if (Zoom.INSTANCE.getToggled() && !OkZoomerCompatKt.isOkZoomerPresent) {
-			cir.setReturnValue(Zoom.getNewZoom(cir.getReturnValue()));
-		}
+			return Zoom.getNewZoom(original);
+		}
+		return original;
 	}
 }

fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt

@@ -4,12 +4,13 @@ import fr.username404.snowygui.EventSnowy
 import fr.username404.snowygui.Snowy
 import fr.username404.snowygui.gui.feature.ButtonImpl
 import net.fabricmc.api.ClientModInitializer
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback.EVENT
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElement
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry
 import net.fabricmc.loader.api.FabricLoader
 import net.fabricmc.loader.launch.common.FabricLauncherBase
 import net.minecraft.client.DeltaTracker
-import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics
+import net.minecraft.resources.Identifier
 import kotlin.io.path.exists
 import kotlin.io.path.isDirectory
 import kotlin.io.path.listDirectoryEntries
@@ -19,10 +20,10 @@ import kotlin.jvm.optionals.getOrNull
 class FabricInit: Snowy(), ClientModInitializer {
     override fun onInitializeClient() {
         atInit()
-        EVENT.register(
-            object: HudRenderCallback, EventSnowy {
+        HudElementRegistry.addLast(Identifier.fromNamespaceAndPath("snowygui", "hud"),
+            object: HudElement, EventSnowy {
                 override val type: String = "HudRender"
-                override fun onHudRender(guiGraphics: GuiGraphics, tickCounter: DeltaTracker) = fire(guiGraphics)
+                override fun extractRenderState(guiGraphics: GuiGraphics, tickCounter: DeltaTracker) = fire(guiGraphics)
             }
         )
     }

fabric/src/main/kotlin/fr/username404/snowygui/fabric/OkZoomerCompat.kt

@@ -4,20 +4,13 @@ import fr.username404.snowygui.gui.feature.Zoom
 import net.fabricmc.loader.api.FabricLoader
 
 @JvmField
-var isOkZoomerPresent: Boolean = FabricLoader.getInstance().isModLoaded("okzoomer")
-private val okZoomerPairs by lazy {
-    with(Class.forName("io.github.ennuil.okzoomer.utils.ZoomUtils").getDeclaredField("ZOOMER_ZOOM")) {
-        get(null).javaClass.run {
-            (getDeclaredField("zoomDivisor") to this@with.get(null)) to (getDeclaredField("zoom") to this@with.get(null))
-        }
-    }.apply { first.first.isAccessible = true; second.first.isAccessible = true; }
-}
+var isOkZoomerPresent: Boolean = FabricLoader.getInstance().isModLoaded("ok_zoomer")
 
 fun fabricZoom() {
     try {
-        with(okZoomerPairs) {
-            first.run { first.setFloat(second, Zoom.zoomFactor.toFloat()) }
-            second.run { first.setBoolean(second, Zoom.toggled) }
+        with(Class.forName("page.langeweile.ok_zoomer.zoom.Zoom")) {
+            getDeclaredMethod("setZoomDivisor", Double::class.java)(null, Zoom.zoomFactor);
+            getDeclaredMethod("setZooming", Boolean::class.java)(null, Zoom.toggled)
         }
     } catch (e: Exception) {
         isOkZoomerPresent = false

gradle.properties

@@ -7,16 +7,17 @@ org.gradle.parallel=true
 org.gradle.unsafe.configuration-cache=on
 org.gradle.vfs.watch=true
 
-minecraft=1.21.11
-forge_version=21.11.38-beta
-kotlinforforge=6.1.0
-kotlinVer=2.3.0
+minecraft=26.2-snapshot-1
+# TODO: 26.2.0.1-beta
+forge_version=26.1.0.19-beta
+kotlinforforge=6.2.0
+kotlinVer=2.3.10
 kotlin_coroutines_version=1.10.2
-serializationVer=1.9.0
-fabric_loader_version=0.18.4
-fabric_language_kotlin=1.13.8+kotlin.2.3.0
-fabric_resource_loader_version=3.3.4+4fc5413f53
-fabric_rendering_api_version=16.2.5+1fb1cde953
-fabric_api_base_version=1.0.5+4ebb5c0853
-clothconfig_version=21.11.151
-modmenu_version=17.0.0-beta.2
+serializationVer=1.10.0
+fabric_loader_version=0.19.1
+fabric_language_kotlin=1.13.9+kotlin.2.3.10
+fabric_resource_loader_version=3.3.16+4fc5413f92
+fabric_rendering_api_version=23.0.5+086d547a92
+fabric_api_base_version=2.0.3+ece0632392
+clothconfig_version=26.1.154
+modmenu_version=18.0.0-alpha.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/build.gradle.kts

@@ -10,8 +10,8 @@ dependencies {
         return@let if (it.length > 4) it else "$it.+"
     }}")
     implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}")
-    modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.property("clothconfig_version")}")
-    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    api("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.property("clothconfig_version")}")
+    implementation(project(path = ":common")) { isTransitive = false }
 
     add("developmentNeoForge", project(path = ":common")) { isTransitive = false }
     shadowC(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -19,6 +19,7 @@ mandatory = false
 versionRange = "[${clothconfig},)"
 ordering = "BEFORE"
 side = "CLIENT"
+type = "optional"
 
 [[dependencies.snowygui]]
 modId = "neoforge"

settings.gradle.kts

@@ -11,7 +11,7 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("neoforge")
+//include("neoforge")
 
 rootProject.name = "SnowyGUI"