From d02e9a569e9ca242bfc75a5fe729c8d6746e84b8 Mon Sep 17 00:00:00 2001 From: Cassian Date: Wed, 31 Dec 2025 13:03:48 -0500 Subject: [PATCH] Port to Fabric API 0.140.3 --- build.gradle | 2 +- gradle.properties | 2 +- .../terraformersmc/modmenu/event/ModMenuEventHandler.java | 6 +++--- .../com/terraformersmc/modmenu/mixin/MixinPauseScreen.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index dc5a2afc..82f44ce7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation include(fabricApi.module("fabric-api-base", project.fabric_version)) implementation include(fabricApi.module("fabric-resource-loader-v1", project.fabric_version)) implementation include(fabricApi.module("fabric-screen-api-v1", project.fabric_version)) - implementation include(fabricApi.module("fabric-key-binding-api-v1", project.fabric_version)) + implementation include(fabricApi.module("fabric-key-mapping-api-v1", project.fabric_version)) implementation include(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)) // implementation include("eu.pb4:placeholder-api:${project.text_placeholder_api_version}") diff --git a/gradle.properties b/gradle.properties index cd4e7d66..59870dbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ archive_name=modmenu minecraft_version=26.1-snapshot-1 loader_version=0.18.4 -fabric_version=0.140.2+26.1 +fabric_version=0.140.3+26.1 text_placeholder_api_version=2.8.1+1.21.10 quilt_loader_version=0.29.0-beta.3 diff --git a/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java b/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java index baaf5be2..6c829aa8 100644 --- a/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java +++ b/src/main/java/com/terraformersmc/modmenu/event/ModMenuEventHandler.java @@ -10,7 +10,7 @@ import com.terraformersmc.modmenu.mixin.AccessorAbstractWidget; import com.terraformersmc.modmenu.util.UpdateCheckerUtil; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.fabricmc.fabric.api.client.screen.v1.Screens; import net.minecraft.client.KeyMapping; @@ -34,7 +34,7 @@ public class ModMenuEventHandler { private static KeyMapping MENU_KEY_BIND; public static void register() { - MENU_KEY_BIND = KeyBindingHelper.registerKeyBinding(new KeyMapping( + MENU_KEY_BIND = KeyMappingHelper.registerKeyMapping(new KeyMapping( "key.modmenu.open_menu", InputConstants.Type.KEYSYM, InputConstants.UNKNOWN.getValue(), @@ -51,7 +51,7 @@ public static void afterScreenInit(Minecraft client, Screen screen, int scaledWi } private static void afterTitleScreenInit(Screen screen) { - final List buttons = Screens.getButtons(screen); + final List buttons = Screens.getWidgets(screen); if (ModMenuConfig.MODIFY_TITLE_SCREEN.getValue()) { int modsButtonIndex = -1; final int spacing = 24; diff --git a/src/main/java/com/terraformersmc/modmenu/mixin/MixinPauseScreen.java b/src/main/java/com/terraformersmc/modmenu/mixin/MixinPauseScreen.java index fdb64bf6..66f66b1e 100644 --- a/src/main/java/com/terraformersmc/modmenu/mixin/MixinPauseScreen.java +++ b/src/main/java/com/terraformersmc/modmenu/mixin/MixinPauseScreen.java @@ -36,7 +36,7 @@ private static Tooltip getCUSTOM_OPTIONS_TOOLTIP() { @Inject(method = "createPauseMenu", at = @At("TAIL")) private void onCreatePauseMenu(CallbackInfo ci) { - List buttons = Screens.getButtons(this); + List buttons = Screens.getWidgets(this); if (ModMenuConfig.MODIFY_GAME_MENU.getValue()) { int modsButtonIndex = -1; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8257ba72..7e12dbfd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,10 +22,10 @@ "depends": { "fabric-resource-loader-v1": "*", "fabric-screen-api-v1": "*", - "fabric-key-binding-api-v1": "*", + "fabric-key-mapping-api-v1": "*", "fabric-lifecycle-events-v1": "*", "fabricloader": ">=0.17.2", - "minecraft": ">1.21.10" + "minecraft": ">1.21.11" }, "authors": [ "Prospector",