Merge branch 'v1' into legacy

CHANGELOG.md

@@ -1,4 +1,2 @@
-1.2.0 changelogs:
-- Fixed conflicting keybind handling always using Right Shift instead of the actual OneConfig open keybind
-- Fixed notifications not being clickable on macOS Retina and possibly other HiDPI setups
-- Added support for Minecraft 26.3
+1.2.3 changelogs:
+- fixed gl context not being created on wayland/egl

buildSrc/src/main/kotlin/oneconfig-bootstrap.gradle.kts

@@ -74,7 +74,6 @@ gradle.projectsEvaluated {
         "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm",
         "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm",
         "org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm",
-        "org.jetbrains.kotlinx:atomicfu-jvm",
         "org.jetbrains.kotlinx:kotlinx-datetime-jvm",
         "org.jetbrains.kotlinx:kotlinx-io-core-jvm",
         "org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm",

buildSrc/src/main/kotlin/oneconfig-fabric.gradle.kts

@@ -1,3 +1,4 @@
+import dev.kikugie.stonecutter.build.StonecutterBuildExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -40,8 +41,13 @@ tasks.withType<Test>().configureEach {
     }
 }
 
+val sc = extensions.getByName<StonecutterBuildExtension>("stonecutter")
 val loom = extensions.getByName<LoomGradleExtensionAPI>("loom")
 loom.apply {
+    accessWidenerPath = sc.process(
+        rootProject.file("minecraft/src/main/resources/oneconfigv1.classtweaker"),
+        "build/processed.classtweaker",
+    )
     runConfigs["client"].apply {
         ideConfigGenerated(true)
         runDir = "../../run"

buildSrc/src/main/kotlin/oneconfig-setup.gradle.kts

@@ -87,6 +87,7 @@ if (loader == "fabric") {
     val modMenuShimClasses = layout.buildDirectory.dir("classes/modMenuShim")
     val compileModMenuApiShimJava = tasks.register<JavaCompile>("compileModMenuApiShimJava") {
         val mainSourceSet = sourceSets.named("main").get()
+        javaCompiler.set(tasks.named<JavaCompile>("compileJava").flatMap { it.javaCompiler })
         source(rootProject.projectDir.resolve("minecraft/src/modMenuShim/java"))
         classpath = files(mainSourceSet.output.classesDirs, mainSourceSet.compileClasspath)
         destinationDirectory.set(modMenuShimClasses)
@@ -180,7 +181,7 @@ val firmamentRelocatedConfiguration: Configuration by configurations.creating {
 
 val adventurePlatform = when {
     loader != "fabric" -> null
-    stonecutter.eval(stonecutter.current.version, ">= 26.2") -> "7.0.0-SNAPSHOT"
+    stonecutter.eval(stonecutter.current.version, ">= 26.2") -> "7.0.0"
     stonecutter.eval(stonecutter.current.version, ">= 26.1") -> "6.9.0"
     stonecutter.eval(stonecutter.current.version, ">= 1.21.11") -> "6.8.0"
     stonecutter.eval(stonecutter.current.version, ">= 1.21.10") -> "6.7.0"
@@ -451,15 +452,21 @@ tasks.withType<ProcessResources>() {
         exclude("ornithe.mod.json")
     }
 
-    val mixinCompat = if (stonecutter.eval(stonecutter.current.version, ">= 26.1")) "JAVA_25" else "JAVA_21"
+    val mixinCompat = if (
+        stonecutter.eval(stonecutter.current.version, ">= 26.1") ||
+        stonecutter.eval(stonecutter.current.version, "= 1.8.9")
+    ) "JAVA_25" else "JAVA_21"
     this.inputs.property("mixin_compat", mixinCompat)
     this.filesMatching("mixins.oneconfigv1*.json") {
         filter { line -> line.replace("\"JAVA_21\"", "\"$mixinCompat\"") }
     }
 }
 
 val minJavaVersion = 21
-val javaVersion = if (stonecutter.eval(stonecutter.current.version, ">= 26.1")) {
+val javaVersion = if (
+    stonecutter.eval(stonecutter.current.version, ">= 26.1") ||
+    stonecutter.eval(stonecutter.current.version, "= 1.8.9")
+) {
     25
 } else {
     21

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx4096m
 
 group=org.polyfrost.oneconfig
-version=1.2.0
+version=1.2.3
 
 ksp.incremental=false

gradle/fabric/1.21.1.versions.toml

@@ -3,7 +3,7 @@ modmenu = "11.0.3"
 yacl = "3.7.1+1.21.1-fabric"
 moulconfig = "3.11.0"
 
-vulkanmod = "pY3DXoVe"
+vulkanmod = "2eqroDKD"
 
 [libraries]
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu"}

gradle/libs.versions.toml

@@ -4,7 +4,6 @@
 # All
 kotlin = "2.4.10"
 kotlinx-coroutines = "1.10.2"
-kotlinx-atomicfu = "0.29.0"
 fabric-language-kotlin = "1.13.13+kotlin.2.4.10"
 google-ksp = "2.3.11"
 annotations = "24.1.0"
@@ -83,7 +82,6 @@ kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", versi
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "kotlinx-coroutines" }
-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu-jvm", version.ref = "kotlinx-atomicfu" }
 fabric-language-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric-language-kotlin" }
 
 jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation-desktop", version.ref = "compose" }
@@ -145,7 +143,7 @@ adventure = [
     "kyori-option",
 ]
 kotlin = ["kotlin-reflect", "kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]
-kotlinx = ["kotlinx-coroutines", "kotlinx-coroutines-jvm", "kotlinx-coroutines-jdk8", "kotlinx-atomicfu"]
+kotlinx = ["kotlinx-coroutines", "kotlinx-coroutines-jvm", "kotlinx-coroutines-jdk8"]
 lwjgl = ["lwjgl", "lwjgl-nvg", "lwjgl-opengl", "lwjgl-stb", "lwjgl-tinyfd"]
 nightconfig = ["nightconfig", "nightconfig-json", "nightconfig-toml", "nightconfig-yaml"]
 test-core = ["junit", "logging-impl"]

gradle/ornithe.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 loader = "0.19.3"
-osl = "0.20.3"
+osl = "0.21.0"
 feather_build = "2"
 ploceus = "1.17.4"
 

mappings/feather-overrides.tiny

@@ -14,6 +14,11 @@ c	net/minecraft/client/Minecraft	net/minecraft/client/Minecraft
 	m	()I	m_53086118	getFramerateLimit
 	m	()Lnet/minecraft/unmapped/C_06196994;	m_17688331	getMainRenderTarget
 	m	()V	m_61857590	startUseItem
+	f	Lnet/minecraft/unmapped/C_23014920;	f_21497584	font
+c	net/minecraft/unmapped/C_23014920	net/minecraft/client/render/TextRenderer
+	m	(Ljava/lang/String;)I	m_09235706	width
+c	net/minecraft/unmapped/C_88708284	net/minecraft/item/ItemStack
+	f	I	f_60602012	count
 c	net/minecraft/unmapped/C_23708450	net/minecraft/client/KeyMapping
 	m	()Z	m_70603120	isDown
 c	net/minecraft/unmapped/C_76792751	net/minecraft/client/Options

minecraft/ornithe.gradle.kts

@@ -14,10 +14,6 @@ ploceus {
     setIntermediaryGeneration(2)
 }
 
-loom {
-    accessWidenerPath.set(rootProject.file("minecraft/src/main/resources/oneconfigv1.classtweaker"))
-}
-
 dependencies {
     modImplementation(versionedCatalog["fabric-language-kotlin"])
     modImplementation(versionedCatalog["fabric-loader"])

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

@@ -62,6 +62,7 @@
 import org.polyfrost.oneconfig.internal.ui.api.ConfigRegistry;
 import org.polyfrost.oneconfig.internal.ui.api.ConfigSource;
 import org.polyfrost.oneconfig.internal.ui.api.ThirdPartyModCategories;
+import org.polyfrost.oneconfig.internal.ui.components.item.ItemCatalog;
 import org.polyfrost.oneconfig.internal.ui.compose.McFontService;
 import org.polyfrost.oneconfig.internal.ui.compose.SkiaCtx;
 import org.polyfrost.oneconfig.internal.ui.compose.impls.HudEditorUIScreen;
@@ -73,6 +74,10 @@
 import org.polyfrost.oneconfig.internal.ui.keybind.KeybindConflicts;
 import org.polyfrost.oneconfig.internal.ui.search.SearchCorpus;
 import org.polyfrost.oneconfig.test.TestMod_Test;
+//? if = 1.8.9 {
+/*import net.ornithemc.osl.resource.loader.api.client.ClientResourceLoaderEvents;
+import org.polyfrost.oneconfig.internal.ui.compose.SkiaFontRenderer;
+*///?}
 
 //? neoforge
 //@net.neoforged.fml.common.Mod("oneconfigv1")
@@ -200,7 +205,7 @@ public static void render(GuiGraphicsExtractor graphics, float partial) {
         // 1.8.9 replays the overlay in Mixin_SkiaFrame after Skia finishes drawing instead
         //? if > 1.8.9
         org.polyfrost.oneconfig.internal.ui.hud.DebugOverlayOffscreen.INSTANCE.render();
-        if (HudManager.INSTANCE.beginFrame(sw, sh)) {
+        if (HudManager.INSTANCE.beginFrame(sw, sh, ItemCatalog.INSTANCE::renderHudIcons)) {
             SkiaCtx.INSTANCE.queueHudDraw(() -> {
                 var ctx = new RenderContext(SkiaCtx.INSTANCE.getCanvas());
                 HudManager.INSTANCE.render(ctx, sw, sh);
@@ -270,7 +275,10 @@ private static void registerEventHandlers() {
                     org.polyfrost.oneconfig.internal.compat.WWaypointsCompat.register();
                     org.polyfrost.oneconfig.internal.ui.themes.ThemeRegistry.INSTANCE.loadFromConfig();
                 });
-        EventManager.register(WorldEvent.Load.class, e -> showFirstLaunchNotification());
+        EventManager.register(WorldEvent.Load.class, e -> {
+            showFirstLaunchNotification();
+            ItemCatalog.INSTANCE.markIconsAvailable();
+        });
         // after loading finishes so translation keys are available
         EventManager.register(ResourceFinishedLoading.class, e -> SearchCorpus.INSTANCE.init());
 //        //#if MC < 1.13
@@ -332,6 +340,12 @@ private void init() {
 
         SkikoDataPath.redirect();
 
+        //? if = 1.8.9 {
+        /*ClientResourceLoaderEvents.INIT_RESOURCE_MANAGER.register(
+            resourceManager -> resourceManager.addReloader(SkiaFontRenderer.INSTANCE)
+        );
+        *///?}
+
         // to enable RenderDoc set these JVM arguments
         // -Drenderdoc.enabled=true
         // (Windows) -Drenderdoc.path="C:\Program Files\RenderDoc\renderdoc.dll" (or wherever you installed RenderDoc)

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

@@ -195,13 +195,16 @@ public List<String> getMixins() {
         mixins.add("render.GameRendererAccessor");
         mixins.add("render.GuiRendererAccessor");
         //? }
+        //? if > 1.8.9
+        mixins.add("skia.Mixin_ItemAtlasScissor");
         //? if < 1.21.8
         //mixins.add("skia.Mixin_MainTargetRedirect");
         mixins.add("skia.Mixin_DebugOverlayAboveUi");
         //? if < 26.1 && > 1.8.9 {
         /*mixins.add("skia.Mixin_ScreenshotComposite");
         *///? }
         mixins.add("skia.Mixin_InitSkiaFontRenderer");
+        mixins.add("skia.Mixin_StartupWarmupOverlay");
 
         //? if >= 1.21.10 {
         mixins.add("keybind.Mixin_KeybindCategoryLabel");

minecraft/src/main/java/org/polyfrost/oneconfig/internal/legacy/compat/ItemStackCompat.java

@@ -0,0 +1,27 @@
+package org.polyfrost.oneconfig.internal.legacy.compat;
+
+//? if = 1.8.9 {
+/*import net.minecraft.item.ItemStack;
+
+public interface ItemStackCompat {
+    default boolean isEmpty() {
+        ItemStack stack = (ItemStack) (Object) this;
+        return stack.getItem() == null || stack.count <= 0;
+    }
+
+    default boolean isBarVisible() {
+        return ((ItemStack) (Object) this).isDamaged();
+    }
+
+    default int getBarWidth() {
+        ItemStack stack = (ItemStack) (Object) this;
+        return (int) Math.round(13.0 - stack.getDamage() * 13.0 / stack.getMaxDamage());
+    }
+
+    default int getBarColor() {
+        ItemStack stack = (ItemStack) (Object) this;
+        int health = (int) Math.round(255.0 - stack.getDamage() * 255.0 / stack.getMaxDamage());
+        return (255 - health) << 16 | health << 8;
+    }
+}
+*///?}

minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SimpleReloadInstance.java

@@ -19,6 +19,7 @@ public class Mixin_SimpleReloadInstance {
     private static void oneconfig$onResourceFinishedLoading(CallbackInfoReturnable<ReloadInstance> cir) {
         //~ if = 1.8.9 'done()' -> 'result()'
         cir.getReturnValue().done().whenComplete((result, throwable) -> {
+            if (throwable != null) return;
             EventManager.INSTANCE.post(ResourceFinishedLoading.INSTANCE);
         });
     }

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

@@ -18,6 +18,17 @@
 
 @Mixin(GuiRenderer.class)
 public class Mixin_GuiRendererLegacyTarget {
+    @ModifyExpressionValue(
+            method = "draw",
+            //? if >= 26.1 {
+            at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/WindowRenderState;guiScale:I", opcode = Opcodes.GETFIELD)
+            //?} else
+            //at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/Window;getGuiScale()I")
+    )
+    private int oneconfig$itemAtlasProjectionScale(int original) {
+        return GuiTargetRedirect.itemRenderSizePx > 0 ? 1 : original;
+    }
+
     //? if >= 26.1 {
     @ModifyExpressionValue(
             method = "draw",

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

@@ -2,13 +2,30 @@
 
 import net.minecraft.client.Minecraft;
 import org.polyfrost.oneconfig.internal.ui.compose.SkiaFontRenderer;
+//? if > 1.8.9 {
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Shadow;
+//?}
 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.CallbackInfo;
 
 @Mixin(Minecraft.class)
 public class Mixin_InitSkiaFontRenderer {
+    //? if > 1.8.9 {
+    @Shadow
+    @Final
+    private ReloadableResourceManager resourceManager;
+
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/ReloadableResourceManager;createReload(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/server/packs/resources/ReloadInstance;"), require = 1)
+    private void impl$registerFontReloadListener(CallbackInfo ci) {
+        this.resourceManager.registerReloadListener(SkiaFontRenderer.INSTANCE);
+    }
+    //?}
+
+    //~ if = 1.8.9 '<init>' -> 'init'
     @Inject(method = "<init>", at = @At("TAIL"))
     void impl$__init__(CallbackInfo ci) {
         SkiaFontRenderer.INSTANCE.init();

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

@@ -0,0 +1,52 @@
+package org.polyfrost.oneconfig.internal.mixin.skia;
+
+//? if > 1.8.9 {
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+//? if >= 1.21.8 {
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.mojang.renderpearl.api.commands.RenderPass;
+import net.minecraft.client.gui.render.GuiRenderer;
+//?} else
+//import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.navigation.ScreenRectangle;
+import org.polyfrost.oneconfig.internal.ui.hud.GuiTargetRedirect;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+//~ if < 1.21.8 'GuiRenderer' -> 'GuiGraphics'
+@Mixin(GuiRenderer.class)
+public class Mixin_ItemAtlasScissor {
+    //? if >= 1.21.8 {
+    @Expression("16 * ?")
+    @ModifyExpressionValue(method = "prepareItemElements", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private int oneconfig$itemAtlasSlotSize(int original) {
+        int requested = GuiTargetRedirect.itemRenderSizePx;
+        return requested > 0 ? requested : original;
+    }
+    //?}
+
+    @WrapOperation(
+        //? if >= 1.21.8 {
+        method = "enableScissor",
+        at = @At(value = "INVOKE", target = "Lcom/mojang/renderpearl/api/commands/RenderPass;enableScissor(IIII)V")
+        //?} else {
+        /*method = "applyScissor",
+        at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableScissor(IIII)V")
+        *///?}
+    )
+    //~ if < 1.21.8 '(RenderPass pass, int x' -> '(int x'
+    private void oneconfig$targetScissor(RenderPass pass, int x, int y, int width, int height, Operation<Void> original, ScreenRectangle rectangle) {
+        GuiTargetRedirect.ScissorTransform transform = GuiTargetRedirect.scissorTransform;
+        if (transform == null) {
+            //~ if < 1.21.8 '(pass, x' -> '(x'
+            original.call(pass, x, y, width, height);
+            return;
+        }
+        int[] mapped = transform.map(rectangle.left(), rectangle.top(), rectangle.right(), rectangle.bottom());
+        //~ if < 1.21.8 '(pass, mapped[0]' -> '(mapped[0]'
+        original.call(pass, mapped[0], mapped[1], mapped[2], mapped[3]);
+    }
+}
+//?}