feat: Support MC 1.21.1, 1.21.9-1.21.10

* Update dependency top.hendrixshen.magiclib:magiclib-better-dev to v0.3.68-beta
* Update dependency fabric-loom to v1.12-SNAPSHOT
* Update dependency fabric-loader to v0.18.4

Signed-off-by: MSDNicrosoft <i@msdnicrosoft.work>

Author: MSDNicrosoft

build.gradle

@@ -13,17 +13,21 @@ preprocess {
     def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
     def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
     def mc1206 = createNode("1.20.6", 1_20_06, "mojang")
+    def mc1211 = createNode("1.21.1", 1_21_01, "mojang")
     def mc1215 = createNode("1.21.5", 1_21_05, "mojang")
     def mc1218 = createNode("1.21.8", 1_21_08, "mojang")
+    def mc12110 = createNode("1.21.10", 1_21_10, "mojang")
 
     mc1165.link(mc1171, null)
     mc1171.link(mc1182, null)
     mc1182.link(mc1192, null)
     mc1192.link(mc1193, null)
     mc1193.link(mc1194, null)
     mc1194.link(mc1206, null)
-    mc1206.link(mc1215, null)
+    mc1206.link(mc1211, null)
+    mc1211.link(mc1215, null)
     mc1215.link(mc1218, null)
+    mc1218.link(mc12110, null)
 }
 
 def ENV = System.getenv()

gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
 # Gradle Plugins
-fabric-loom = "1.11-SNAPSHOT"
+fabric-loom = "1.12-SNAPSHOT"
 preprocessor = "d452ef7"
 grgit = "5.3.3"
 yamlang = "1.5.0"
 replace-token = "1.2.0"
 
 # modApi
-fabric-loader = "0.17.2"
+fabric-loader = "0.18.4"
 lombok = "1.18.42"
 
 [plugins]
@@ -22,5 +22,5 @@ replace-token = { id = "top.hendrixshen.replace-token", version.ref = "replace-t
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 
-# modRuntimeOnly Dependencies
+# modRuntimeOnly
 magiclib-core-fabric = { module = "top.hendrixshen.magiclib:magiclib-core-fabric", version = "0.8.160" }

settings.json

@@ -7,7 +7,9 @@
     "1.19.3",
     "1.19.4",
     "1.20.6",
+    "1.21.1",
     "1.21.5",
-    "1.21.8"
+    "1.21.8",
+    "1.21.10"
   ]
 }

src/main/java/work/msdnicrosoft/commandbuttons/CommandButtons.java

@@ -7,6 +7,9 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
+//#if MC >= 12109
+import net.minecraft.resources.ResourceLocation;
+//#endif
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 import work.msdnicrosoft.commandbuttons.data.ConfigManager;
@@ -22,11 +25,16 @@ public class CommandButtons implements ModInitializer {
     @Override
     public void onInitialize() {
         ConfigManager.init();
+
         KeyMapping keyBinding = KeyBindingHelper.registerKeyBinding(new KeyMapping(
                 "mgbuttons.key.opengui",
                 InputConstants.Type.KEYSYM,
                 GLFW.GLFW_KEY_G,
-                "mgbuttons.key.category"
+                //#if MC >= 12109
+                KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath("mgbuttons", "category"))
+                //#else
+                //$$ "key.category.mgbuttons.category"
+                //#endif
         ));
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {

src/main/java/work/msdnicrosoft/commandbuttons/gui/WrapperCommandGUIScreen.java

@@ -10,6 +10,9 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+//#if MC >= 12109
+import net.minecraft.client.input.KeyEvent;
+//#endif
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
@@ -84,16 +87,35 @@ public void removed() {
     }
 
     @Override
-    public boolean keyPressed(int ch, int keyCode, int modifiers) {
+    public boolean keyPressed(
+            //#if MC >= 12109
+            KeyEvent input
+            //#else
+            //$$ int ch, int keyCode, int modifiers
+            //#endif
+    ) {
         // Support for returning to previous screens.
-        if (ch == GLFW.GLFW_KEY_ESCAPE && this.parent != null) {
+        boolean isEscapeKey =
+                //#if MC >= 12109
+                input.key() == GLFW.GLFW_KEY_ESCAPE
+                //#else
+                //$$ ch == GLFW.GLFW_KEY_ESCAPE
+                //#endif
+                ;
+        if (isEscapeKey && this.parent != null) {
             Minecraft.getInstance().setScreen(this.parent);
             if (this.returnAction != null) {
-                // Need to apply list update in main screen.
+                // Need to apply list update in the main screen.
                 this.returnAction.run();
             }
             return true;
         }
-        return super.keyPressed(ch, keyCode, modifiers);
+        return super.keyPressed(
+                //#if MC >= 12119
+                input
+                //#else
+                //$$ ch, keyCode, modifiers
+                //#endif
+        );
     }
 }

src/main/resources/assets/mgbuttons/lang/en_us.yml

@@ -9,6 +9,6 @@ mgbuttons:
       delete: Delete mode
       edit: Edit mode
       search: Search...
-  key:
-    category: Command GUI Buttons
-    opengui: Open GUI
+  key.opengui: Open GUI
+
+key.category.mgbuttons.category: Command GUI Buttons

src/main/resources/assets/mgbuttons/lang/zh_cn.yml

@@ -9,6 +9,6 @@ mgbuttons:
       delete: 删除模式
       edit: 编辑模式
       search: 搜索...
-  key:
-    category: Command GUI Buttons
-    opengui: 打开 GUI
+  key.opengui: 打开 GUI
+
+key.category.mgbuttons.category: Command GUI Buttons

versions/1.16.5/build.gradle

@@ -52,7 +52,7 @@ dependencies {
     modApi("maven.modrinth:modmenu:${project.modmenu_version}")
 
     // Make development client more comfortable.
-    modRuntimeOnly("top.hendrixshen.magiclib:magiclib-better-dev-${project.minecraft_version}${project.minecraft_version.size() == 4 ? ".0" : ""}-fabric:0.3.63") {
+    modRuntimeOnly("top.hendrixshen.magiclib:magiclib-better-dev-${project.minecraft_version}${project.minecraft_version.size() == 4 ? ".0" : ""}-fabric:0.3.68-beta") {
         transitive = false
     }
 

versions/1.21.1/gradle.properties

@@ -0,0 +1,15 @@
+# Dependency Versions
+minecraft_dependency=1.21.1
+minecraft_version=1.21.1
+minecraft_out=1.21.1
+
+# Required Libraries
+# FabricAPI 0.116.7+1.21.1
+fabric_version=0.116.7+1.21.1
+
+# LibGui 11.1.0+1.21
+libgui_version=11.1.0+1.21
+
+# Runtime Libraries - Only for development environment
+# Mod Menu - 11.0.3
+modmenu_version=11.0.3

versions/1.21.10/gradle.properties

@@ -0,0 +1,15 @@
+# Dependency Versions
+minecraft_dependency=>=1.21.9 <=1.21.10
+minecraft_version=1.21.10
+minecraft_out=1.21.9-10
+
+# Required Libraries
+# FabricAPI 0.138.4+1.21.10
+fabric_version=0.138.4+1.21.10
+
+# LibGui 15.0.0+1.21.9-rc1
+libgui_version=15.0.0+1.21.9-rc1
+
+# Runtime Libraries - Only for development environment
+# Mod Menu - 16.0.0
+modmenu_version=16.0.0