build: 1.21.9-rc1

Author: ishland

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on Linux
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts

build.gradle

@@ -1,12 +1,17 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
@@ -55,7 +60,7 @@ java {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}"}
 	}
 }
 

gradle.properties

@@ -3,14 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.3
-	loader_version=0.15.3
+	minecraft_version=1.21.9-rc1
+	yarn_mappings=1.21.9-rc1+build.1
+	loader_version=0.17.2
 
 # Mod Properties
 	mod_version = 1.0.1
 	maven_group = com.ishland.fabric
 	archives_base_name = fix-keyboard-on-linux
 
-# Dependencies
-	fabric_version=0.55.1+1.19

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/ishland/fixkeyboardonlinux/TheMod.java

@@ -1,8 +1,14 @@
 package com.ishland.fixkeyboardonlinux;
 
+import io.netty.util.internal.PlatformDependent;
 import net.fabricmc.api.ModInitializer;
+import org.lwjgl.glfw.GLFW;
 
 public class TheMod implements ModInitializer {
+
+    public static final int KEY_LEFT_CTRL = PlatformDependent.isOsx() ? GLFW.GLFW_KEY_LEFT_SUPER : GLFW.GLFW_KEY_LEFT_CONTROL;
+    public static final int KEY_RIGHT_CTRL = PlatformDependent.isOsx() ? GLFW.GLFW_KEY_RIGHT_SUPER : GLFW.GLFW_KEY_RIGHT_CONTROL;
+
     @Override
     public void onInitialize() {
 

src/main/java/com/ishland/fixkeyboardonlinux/mixin/MixinKeyboard.java

@@ -1,5 +1,6 @@
 package com.ishland.fixkeyboardonlinux.mixin;
 
+import com.ishland.fixkeyboardonlinux.TheMod;
 import net.minecraft.client.Keyboard;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -15,7 +16,13 @@ public class MixinKeyboard {
 
     @Inject(method = "onChar", at = @At(value = "HEAD"), cancellable = true)
     private void beforeOnChar(CallbackInfo ci) {
-        if (Screen.hasControlDown() || InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), GLFW.GLFW_KEY_LEFT_ALT)) ci.cancel();
+        long handle = MinecraftClient.getInstance().getWindow().getHandle();
+
+        if (GLFW.glfwGetKey(handle, TheMod.KEY_LEFT_CTRL) == GLFW.GLFW_PRESS ||
+                GLFW.glfwGetKey(handle, TheMod.KEY_RIGHT_CTRL) == GLFW.GLFW_PRESS ||
+                GLFW.glfwGetKey(handle, GLFW.GLFW_KEY_LEFT_ALT) == GLFW.GLFW_PRESS) {
+            ci.cancel();
+        }
     }
 
 }