Dev

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [26.1.2.5-beta]
+
+### Changed
+* Duplicate keymap category registration (when done via FTB Library platform abstraction API) is no longer fatal
+  * A warning will be logged and the duplicate registration attempt ignored
+
 ## [26.1.2.4-beta]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftblibrary/platform/client/input/Input.java

@@ -1,8 +1,13 @@
 package dev.ftb.mods.ftblibrary.platform.client.input;
 
+import dev.ftb.mods.ftblibrary.FTBLibrary;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Collection;
+import java.util.function.Consumer;
 
 public interface Input {
     /// Register one or more keymappings with vanilla.
@@ -39,4 +44,15 @@ public interface Input {
     /// @implNote modifiers are supported if the platform is NeoForge, or if the platform is Fabric with the Amecs
     /// mod installed
     boolean matches(KeyMapping mapping, KeyEvent event);
+
+    @ApiStatus.Internal
+    static void registerCategories(Collection<KeyMapping.Category> categories, Consumer<KeyMapping.Category> consumer) {
+        for (var c : categories) {
+            try {
+                consumer.accept(c);
+            } catch (IllegalArgumentException e) {
+                FTBLibrary.LOGGER.warn("ignoring attempt to register duplicate keymapping category '{}'", c.id());
+            }
+        }
+    }
 }

common/src/main/java/dev/ftb/mods/ftblibrary/platform/client/input/InputHelper.java

@@ -0,0 +1,33 @@
+package dev.ftb.mods.ftblibrary.platform.client.input;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import dev.ftb.mods.ftblibrary.platform.client.PlatformClient;
+import net.minecraft.client.KeyMapping;
+
+public class InputHelper {
+    /// Register a keymapping with no default binding, in a platform-independent way. Convenience wrapper for
+    /// [Input#createKeyMapping(KeyMappingConfig)].
+    ///
+    /// @param name the keymap name
+    /// @param category the keymap category
+    /// @return the keymapping object
+    public static KeyMapping createSimpleKeyMapping(String name, KeyMapping.Category category) {
+        return createSimpleKeyMapping(name, category, InputConstants.UNKNOWN.getValue());
+    }
+
+    /// Register a keymapping a default binding and zero or more modifiers, in a platform-independent way. Convenience
+    /// wrapper for [Input#createKeyMapping(KeyMappingConfig)].
+    ///
+    /// @param name the keymap name
+    /// @param category the keymap category
+    /// @return the keymapping object
+    /// @implNote Although multiple modifiers are accepted, NeoForge keymapping objects only support a single modifier. So
+    /// it is not recommended to pass more than one modifier.
+    public static KeyMapping createSimpleKeyMapping(String name, KeyMapping.Category category, int keyCode, KeyModifier... modifiers) {
+        KeyMappingConfig.Builder builder = KeyMappingConfig.builder(name, category).keyboard(keyCode);
+        for (var m : modifiers) {
+            builder.modifier(m);
+        }
+        return PlatformClient.get().input().createKeyMapping(builder.build());
+    }
+}

common/src/main/resources/assets/ftblibrary/lang/zh_cn.json

@@ -6,8 +6,8 @@
   "gui.removed": "已移除",
   "gui.close": "关闭",
   "gui.open": "打开",
-  "gui.saved": "保存",
-  "gui.loaded": "加载",
+  "gui.saved": "已保存",
+  "gui.loaded": "已加载",
   "gui.info": "信息",
   "gui.collapse_all": "全部折叠",
   "gui.expand_all": "全部展开",
@@ -36,7 +36,7 @@
   "delete_item": "你想要删除“%s”么？",
   "lat_support": "喜欢这个Mod吗？点击支持我的项目！",
   "ftblibrary.select_fluid.gui": "选择流体",
-  "ftblibrary.select_item.list_mode": "列出模式",
+  "ftblibrary.select_item.list_mode": "列表模式",
   "ftblibrary.select_item.list_mode.all": "所有物品",
   "ftblibrary.select_fluid.list_mode.all": "所有流体",
   "ftblibrary.select_item.list_mode.inv": "物品栏",
@@ -112,4 +112,4 @@
   "dimension.ae2.spatial_storage": "AE2空间存储",
   "itemGroup.ftbsuite.creative_tab": "FTB套件",
   "item.ftblibrary.icon_item": "FTB图标"
-}
+}

fabric/src/main/java/dev/ftb/mods/ftblibrary/fabric/platform/client/FabricInputImpl.java

@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftblibrary.fabric.platform.client;
 
+import dev.ftb.mods.ftblibrary.FTBLibrary;
 import dev.ftb.mods.ftblibrary.fabric.integrations.keys.AmecsKeyProvider;
 import dev.ftb.mods.ftblibrary.fabric.integrations.keys.KeyProvider;
 import dev.ftb.mods.ftblibrary.fabric.integrations.keys.VanillaKeyProvider;
@@ -35,7 +36,7 @@ public void registerKeyMapping(String modId, KeyMapping... keyMappings) {
             cats.add(k.getCategory());
             KeyMappingHelper.registerKeyMapping(k);
         }
-        cats.forEach(c -> KeyMapping.Category.register(c.id()));
+        Input.registerCategories(cats, c -> KeyMapping.Category.register(c.id()));
     }
 
     @Override

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 # Mod
 mod_id=ftblibrary
 readable_name=FTB Library
-mod_version=4
+mod_version=5
 mod_author=FTB Team
 
 # Maven
@@ -23,8 +23,8 @@ neoforge_version_range=[26.1.0.0-beta,27)
 neoforge_loader_version=4
 
 fabric_loader_version=0.18.6
-fabric_api_version=0.145.4+26.1.1
-fabric_api_version_range=>=0.145.0+26.1.1
+fabric_api_version=0.149.1+26.1.2
+fabric_api_version_range=>=0.149.1+26.1.2
 
 jei_version=29.5.0.26
 

neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/platform/client/NeoInputImpl.java

@@ -28,7 +28,7 @@ public void registerKeyMapping(String modId, KeyMapping... keyMappings) {
                 cats.add(k.getCategory());
                 event.register(k);
             }
-            cats.forEach(event::registerCategory);
+            Input.registerCategories(cats, event::registerCategory);
         });
     }