1.21.9 (neo)forge support

Author: not-coded

CHANGES.md

@@ -1,2 +1,3 @@
 changes:
-- 
+- properly support 1.21.9+ (now including 1.21.11)
+  - (neo)forge support

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.0.21"
 }
 
 repositories {

settings.gradle.kts

@@ -21,7 +21,7 @@ stonecutter {
         fun mc(loader: String, vararg versions: String) {
             for (version in versions) vers("$version-$loader", version)
         }
-        mc("fabric", "1.16.5", "1.19", "1.19.3", "1.20.6", "1.21.9")
+        mc("fabric", "1.16.5", "1.19", "1.19.3", "1.20.6")
         mc("forge", "1.16.5", "1.17.1", "1.18.2", "1.19", "1.19.2", "1.19.3", "1.20.1", "1.20.6") // cool forge mixin bs!!!!
         mc("neoforge", "1.20.4", "1.20.6", "1.21")
 

src/main/java/net/notcoded/wayfix/mixin/KeyboardMixin.java

@@ -1,18 +1,14 @@
 package net.notcoded.wayfix.mixin;
 
+import io.netty.util.internal.PlatformDependent;
 import net.minecraft.client.Keyboard;
-
-//? if >=1.21.9 {
-/*import net.minecraft.client.input.CharInput;
-import net.minecraft.client.input.SystemKeycodes;
-*///?} else if <1.21.9 {
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.InputUtil;
-//?}
+import net.minecraft.client.MinecraftClient;
 import org.lwjgl.glfw.GLFW;
 import net.notcoded.wayfix.WayFix;
 
+import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -26,25 +22,20 @@
 @Mixin(Keyboard.class)
 public class KeyboardMixin {
 
-    @Inject(method = "onChar", at = @At("HEAD"), cancellable = true)
-    //? if <1.21.9 {
-    private void charTyped(long window, int codePoint, int modifiers, CallbackInfo ci) {
-    //?}
-    //? if >=1.21.9 {
-    /*private void charTyped(long window, CharInput input, CallbackInfo ci) {
-    *///?}
+    @Unique
+    private static final int LEFT_CTRL = PlatformDependent.isOsx() ? GLFW.GLFW_KEY_LEFT_SUPER : GLFW.GLFW_KEY_LEFT_CONTROL;
+    @Unique
+    private static final int RIGHT_CTRL = PlatformDependent.isOsx() ? GLFW.GLFW_KEY_RIGHT_SUPER : GLFW.GLFW_KEY_RIGHT_CONTROL;
+
+    @Dynamic
+    @Inject(method = {"onChar", "method_1457"}, at = @At("HEAD"), cancellable = true, require = 1)
+    private void charTyped(CallbackInfo ci) {
         if(!WayFix.config.keyModifiersFix || !WayFix.isWayland()) return;
 
-        //? if >=1.21.9 {
-        /*if(GLFW.glfwGetKey(window, SystemKeycodes.LEFT_CTRL) == GLFW.GLFW_PRESS ||
-                GLFW.glfwGetKey(window, SystemKeycodes.RIGHT_CTRL) == GLFW.GLFW_PRESS ||
+        long window = MinecraftClient.getInstance().getWindow().getHandle();
+        if(GLFW.glfwGetKey(window, LEFT_CTRL) == GLFW.GLFW_PRESS ||
+                GLFW.glfwGetKey(window, RIGHT_CTRL) == GLFW.GLFW_PRESS ||
                 GLFW.glfwGetKey(window, GLFW.GLFW_KEY_LEFT_ALT) == GLFW.GLFW_PRESS
-        *///?}
-        //? if <1.21.9 {
-        if(
-                Screen.hasControlDown() ||
-                        InputUtil.isKeyPressed(window, GLFW.GLFW_KEY_LEFT_ALT)
-        //?}
         ) {
             ci.cancel();
         }

stonecutter.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("dev.kikugie.stonecutter")
-    id("dev.architectury.loom") version "1.13.457" apply false
-    id("architectury-plugin") version "3.4.162" apply false
+    id("dev.architectury.loom") version "1.13.465" apply false
+    id("architectury-plugin") version "3.4-SNAPSHOT" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("me.modmuss50.mod-publish-plugin") version "1.1.0" apply false
 }

versions/1.20.6-fabric/gradle.properties

@@ -1,6 +1,7 @@
-mod.mc_dep=>=1.20- <=1.21.8
-mod.version_name=1.20-1.21.8
-mod.mc_targets=1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8
+mod.mc_dep=>=1.20- <26.1
+# https://www.minecraft.net/en-us/article/minecraft-new-version-numbering-system
+mod.version_name=1.20
+mod.mc_targets=1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
 
 deps.yarn_build=1
 

versions/1.20.6-forge/gradle.properties

@@ -1,6 +1,6 @@
-mod.mc_dep=[1.20.5, 1.21.8]
+mod.mc_dep=[1.20.5,)
 mod.version_name=1.20.5
-mod.mc_targets=1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8
+mod.mc_targets=1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
 
 deps.yarn_build=1
 deps.forge_loader=50.1.0

versions/1.21-neoforge/gradle.properties

@@ -1,6 +1,6 @@
-mod.mc_dep=[1.21, 1.21.8]
-mod.version_name=1.21-1.21.8
-mod.mc_targets=1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8
+mod.mc_dep=[1.21,)
+mod.version_name=1.21
+mod.mc_targets=1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
 
 deps.yarn_build=9
 deps.neoforge_loader=21.0.167

versions/1.21.9-fabric/gradle.properties

@@ -0,0 +1,13 @@
+mod.mc_dep=[1.21.9,)
+mod.version_name=1.21.9
+mod.mc_targets=1.21.9,1.21.10,1.21.11
+
+deps.yarn_build=1
+deps.neoforge_loader=21.9.16-beta
+deps.neoforge_patch=1.21+build.4
+
+deps.cloth_config_version=20.0.149
+
+deps.java=21
+
+loom.platform=neoforge