Update to Minecraft 1.21.9

Author: kalucky0

README.md

@@ -2,9 +2,9 @@
 
 ![Code license (MIT)](https://img.shields.io/github/license/devs-immortal/bind-cmd)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/devs-immortal/bind-cmd)
-![Minecraft 1.21.7](https://img.shields.io/badge/Minecraft-1.21.7-yellowgreen)
+![Minecraft 1.21.9](https://img.shields.io/badge/Minecraft-1.21.9-yellowgreen)
 
-The BindCommands mod allows players to bind Minecraft commands to specific keys on their keyboard, making it easier and faster to execute commands in the game. The mod is built using the [Fabric](https://fabricmc.net/) mod loader and is compatible with Minecraft versions from 1.16.5 up to 1.21.7.
+The BindCommands mod allows players to bind Minecraft commands to specific keys on their keyboard, making it easier and faster to execute commands in the game. The mod is built using the [Fabric](https://fabricmc.net/) mod loader and is compatible with Minecraft versions from 1.16.5 up to 1.21.9.
 
 ## Features
 
@@ -14,7 +14,7 @@ The BindCommands mod allows players to bind Minecraft commands to specific keys
 
 ## Installation
 
-1. Download and install [Fabric](https://fabricmc.net/use/installer/) for Minecraft 1.21.7.
+1. Download and install [Fabric](https://fabricmc.net/use/installer/) for Minecraft 1.21.9.
 2. Download BindCommands, [Mod Menu](https://github.com/TerraformersMC/ModMenu), and [Fabric Language Kotlin](https://github.com/FabricMC/fabric-language-kotlin) mods.
 3. Place the downloaded mod files in the "mods" folder located in your Minecraft game directory.
 4. Launch Minecraft with the Fabric mod loader and enjoy the mod!

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 # Check these on https://fabricmc.net/develop/
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
 
 # Fabric API
-fabric_version=0.133.4+1.21.8
+fabric_version=0.134.0+1.21.9
 loom_version=1.11-SNAPSHOT
 
 # Mod Properties
-mod_version=1.7.3
+mod_version=1.8.0
 maven_group=net.immortaldevs
 archives_base_name=fabric-bind-cmd
 
 # Kotlin
 kotlin_version=2.2.20
 fabric_kotlin_version=1.13.6+kotlin.2.2.20
-modmenu_version=15.0.0
+modmenu_version=16.0.0-rc.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 # Wed Jul 02 13:34:00 UTC 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/net/immortaldevs/bindcmd/BindCmdClient.kt

@@ -47,7 +47,7 @@ private fun handleBinding(client: MinecraftClient, binding: CommandBinding) {
     if (binding.isUnknown) return
 
     if (binding.isPressed && !binding.wasPressed) {
-        val commands = Config.bindings.filter { it.key.translationKey == binding.key.translationKey }.map { it.command }
+        val commands = Config.bindings.filter { it.translationKey == binding.translationKey }.map { it.command }
         for (command in commands) {
             val cmd = Command(command)
             when (cmd.type) {

src/main/kotlin/net/immortaldevs/bindcmd/CommandBinding.kt

@@ -1,44 +1,43 @@
 package net.immortaldevs.bindcmd
 
+import net.minecraft.client.input.KeyInput
 import net.minecraft.client.option.KeyBinding
 import net.minecraft.client.util.InputUtil
+import net.minecraft.util.Identifier
 
-class CommandBinding(var command: String, var key: KeyBinding) {
+private val CATEGORY = KeyBinding.Category(Identifier.of("bindcmd", "category"))
 
-    constructor(command: String) : this(command, KeyBinding("key.keyboard.unknown", -1, "key.categories.bindcmd"))
+class CommandBinding(var command: String, var key: KeyBinding) {
+    constructor(command: String) : this(command, KeyBinding("key.keyboard.unknown", -1, CATEGORY))
 
     constructor(command: String, translationKey: String, source: BindSource = BindSource.CLIENT) : this(command) {
         this.command = command
         this.source = source
         val keyCode = InputUtil.fromTranslationKey(translationKey).code
         val type = if (translationKey.startsWith("key.mouse")) InputUtil.Type.MOUSE else InputUtil.Type.KEYSYM
-        this.key = KeyBinding(translationKey, type, keyCode, "key.categories.bindcmd")
-    }
-
-    constructor(command: String, key: Int) : this(command) {
-        this.command = command
-        setBoundKey(key, 0)
+        this.key = KeyBinding(translationKey, type, keyCode, CATEGORY)
     }
 
     var source: BindSource = BindSource.CLIENT
-    val isUnknown: Boolean get() = key.translationKey.endsWith("unknown")
+    val translationKey: String get() = key.boundKeyTranslationKey
+    val isUnknown: Boolean get() = translationKey.endsWith("unknown")
     val isPressed: Boolean get() = key.isPressed
     var wasPressed: Boolean = false
 
-    fun setBoundKey(keyCode: Int, scanCode: Int) {
+    fun setBoundKey(keyInput: KeyInput) {
         unbind()
-        val key = InputUtil.fromKeyCode(if (keyCode == 256) -1 else keyCode, scanCode)
-        this.key = KeyBinding(key.translationKey, key.code, "key.categories.bindcmd")
+        val key = if (keyInput.isEscape) InputUtil.UNKNOWN_KEY else InputUtil.fromKeyCode(keyInput)
+        this.key = KeyBinding(key.translationKey, key.code, CATEGORY)
     }
 
     fun setBoundMouse(button: Int) {
         unbind()
         val key = InputUtil.Type.MOUSE.createFromCode(button)
-        this.key = KeyBinding(key.translationKey, InputUtil.Type.MOUSE, key.code, "key.categories.bindcmd")
+        this.key = KeyBinding(key.translationKey, InputUtil.Type.MOUSE, key.code, CATEGORY)
     }
 
     fun unbind() {
-        KeyBinding.KEYS_BY_ID.remove(this.key.translationKey)
+        KeyBinding.KEYS_BY_ID.remove(translationKey)
         KeyBinding.updateKeysByCode()
     }
 }

src/main/kotlin/net/immortaldevs/bindcmd/config/BindingsListWidget.kt

@@ -71,7 +71,7 @@ class BindingsListWidget(val parent: ModConfigScreen, client: MinecraftClient?)
             0,
             124,
             16,
-            Text.of(binding.key.translationKey)
+            binding.key.boundKeyLocalizedText
         )
 
         init {
@@ -87,18 +87,13 @@ class BindingsListWidget(val parent: ModConfigScreen, client: MinecraftClient?)
 
         override fun render(
             context: DrawContext?,
-            index: Int,
-            y: Int,
-            x: Int,
-            entryWidth: Int,
-            entryHeight: Int,
             mouseX: Int,
             mouseY: Int,
             hovered: Boolean,
             tickDelta: Float
         ) {
             val textRenderer: TextRenderer = this@BindingsListWidget.client.textRenderer
-            val textWidth: Int = entryWidth - editButton.width - deleteButton.width - 3
+            val textWidth: Int = width - editButton.width - deleteButton.width - 3
             val isClient: Boolean = binding.source == BindSource.CLIENT
             val tooltip = when (binding.source) {
                 BindSource.SERVER -> serverBindingTooltip
@@ -119,36 +114,36 @@ class BindingsListWidget(val parent: ModConfigScreen, client: MinecraftClient?)
                 }
                 this.hovered = true
             } else {
-                val yPosition = y + entryHeight / 2 - 2
+                val yPosition = y + height / 2 - 2
                 val text = cutString(binding.command, textRenderer, textWidth - 12)
                 context?.drawTextWithShadow(textRenderer, text, x, yPosition, Colors.WHITE)
                 this.hovered = false
             }
 
             editButton.setTooltip(tooltip)
             editButton.active = isClient
-            editButton.x = x + entryWidth - editButton.width - deleteButton.width - 2
+            editButton.x = x + width - editButton.width - deleteButton.width - 2
             editButton.y = y
 
             deleteButton.setTooltip(tooltip)
             deleteButton.active = isClient
-            deleteButton.x = x + entryWidth - deleteButton.width
+            deleteButton.x = x + width - deleteButton.width
             deleteButton.y = y
             deleteButton.render(context, mouseX, mouseY, tickDelta)
 
             if (duplicate) {
                 val j = editButton.x - 6
-                context?.fill(j, y + 2, j + 3, y + entryHeight + 2, -65536)
+                context?.fill(j, y + 2, j + 3, y + height + 2, -65536)
             }
 
             editButton.render(context, mouseX, mouseY, tickDelta)
         }
 
-        override fun children(): List<Element?>? {
+        override fun children(): List<Element?> {
             return listOf(editButton, deleteButton, inputField)
         }
 
-        override fun selectableChildren(): List<Selectable?>? {
+        override fun selectableChildren(): List<Selectable?> {
             return listOf(editButton, deleteButton, inputField)
         }
 
@@ -164,7 +159,7 @@ class BindingsListWidget(val parent: ModConfigScreen, client: MinecraftClient?)
                     if (duplicate)
                         mutableText.append(", ")
                     duplicate = true
-                    mutableText.append(Text.translatable(keyBinding.translationKey))
+                    mutableText.append(keyBinding.boundKeyLocalizedText)
                 }
             }
 

src/main/kotlin/net/immortaldevs/bindcmd/config/Config.kt

@@ -61,7 +61,7 @@ class Config {
         @JvmStatic
         private fun toTuples(data: List<CommandBinding>): List<Pair<String, String>> {
             return data.map { binding ->
-                binding.key.translationKey to binding.command
+                binding.translationKey to binding.command
             }
         }
 

src/main/kotlin/net/immortaldevs/bindcmd/config/ConfigLoader.kt

@@ -20,7 +20,7 @@ class ConfigLoader(private val runDirectory: File) {
             val stream = file.inputStream()
             val content = stream.readBytes().decodeToString()
             return decode(content)
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             return null
         }
     }

src/main/kotlin/net/immortaldevs/bindcmd/config/ModConfigScreen.kt

@@ -3,11 +3,13 @@ package net.immortaldevs.bindcmd.config
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.immortaldevs.bindcmd.CommandBinding
+import net.minecraft.client.gui.Click
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.screen.option.GameOptionsScreen
 import net.minecraft.client.gui.widget.ButtonWidget
 import net.minecraft.client.gui.widget.DirectionalLayoutWidget
 import net.minecraft.client.gui.widget.TextWidget
+import net.minecraft.client.input.KeyInput
 import net.minecraft.client.option.KeyBinding
 import net.minecraft.screen.ScreenTexts
 import net.minecraft.text.Text
@@ -57,31 +59,32 @@ class ModConfigScreen(parent: Screen?) : GameOptionsScreen(
         bindingsList?.position(this.width, this.layout)
     }
 
-    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+    override fun mouseClicked(click: Click, doubled: Boolean): Boolean {
         return if (selectedKeyBinding != null) {
             Config.bindings.forEach { binding ->
                 if (binding.key == selectedKeyBinding)
-                    binding.setBoundMouse(button)
+                    binding.setBoundMouse(click.button())
             }
             selectedKeyBinding = null
             bindingsList?.update()
             true
         } else {
-            super.mouseClicked(mouseX, mouseY, button)
+            super.mouseClicked(click, doubled)
         }
     }
 
-    override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
+    override fun keyPressed(input: KeyInput): Boolean {
         return if (selectedKeyBinding != null) {
             Config.bindings.forEach { binding ->
-                if (binding.key == selectedKeyBinding)
-                    binding.setBoundKey(keyCode, scanCode)
+                if (binding.key == selectedKeyBinding) {
+                    binding.setBoundKey(input)
+                }
             }
             selectedKeyBinding = null
             bindingsList?.update()
             true
         } else {
-            super.keyPressed(keyCode, scanCode, modifiers)
+            super.keyPressed(input)
         }
     }
 

src/main/resources/fabric.mod.json

@@ -41,7 +41,7 @@
     "fabric-api": "*",
     "fabric-language-kotlin": "*",
     "fabricloader": ">=0.17.0",
-    "minecraft": "1.21.8",
+    "minecraft": "1.21.9",
     "modmenu": "*"
   }
 }