修复来自CuriosUtils的报错

src/main/java/cn/qiuye/gtmoremachine/client/ClientProxy.java

@@ -1,12 +1,10 @@
 package cn.qiuye.gtmoremachine.client;
 
 import cn.qiuye.gtmoremachine.common.CommonProxy;
-import cn.qiuye.gtmoremachine.utils.input.SyncedKeyMapping;
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -19,16 +17,11 @@ public ClientProxy() {
         init();
         IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
         eventBus.addListener(ClientProxy::clientSetup);
-        eventBus.addListener(ClientProxy::registerKeyBindings);
         eventBus.addListener(ClientProxy::registerGuiOverlays);
     }
 
     private static void init() {}
 
-    public static void registerKeyBindings(RegisterKeyMappingsEvent event) {
-        SyncedKeyMapping.onRegisterKeyBinds(event);
-    }
-
     public static void registerGuiOverlays(RegisterGuiOverlaysEvent event) {
         event.registerAboveAll("hud", new HudGuiOverlay());
     }

src/main/java/cn/qiuye/gtmoremachine/common/CommonProxy.java

@@ -10,6 +10,7 @@
 import cn.qiuye.gtmoremachine.config.GTMMConfig;
 import cn.qiuye.gtmoremachine.data.GTMMDatagen;
 import cn.qiuye.gtmoremachine.utils.input.SyncedKeyMappings;
+import cn.qiuye.gtmoremachine.utils.input.open.HotKeyActions;
 
 import com.gregtechceu.gtceu.api.GTCEuAPI;
 import com.gregtechceu.gtceu.api.cover.CoverDefinition;
@@ -44,6 +45,7 @@ private static void init() {
         }
         GTMMDatagen.initPost();
         SyncedKeyMappings.init();
+        HotKeyActions.init();
     }
 
     private static void commonSetup(FMLCommonSetupEvent event) {}

src/main/java/cn/qiuye/gtmoremachine/common/item/behaviour/WirelessTransferCoverPlaceBehavior.java

@@ -40,7 +40,7 @@ public InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext contex
                 tag.putInt("y", blockPos.getY());
                 tag.putInt("z", blockPos.getZ());
                 itemStack.setTag(tag);
-                if (level.isClientSide()) player.sendSystemMessage(Component.translatable("item.gtmthings.wireless_transfer.tooltip.bind.1", Component.translatable(level.getBlockState(blockPos).getBlock().getDescriptionId()), blockPos.toShortString()));
+                if (level.isClientSide()) player.sendSystemMessage(Component.translatable("item.gtmoremachine.wireless_transfer.tooltip.bind.1", Component.translatable(level.getBlockState(blockPos).getBlock().getDescriptionId()), blockPos.toShortString()));
             }
             return InteractionResult.SUCCESS;
         }
@@ -58,7 +58,7 @@ public InteractionResultHolder<ItemStack> use(Item item, Level level, Player pla
             is.removeTagKey("x");
             is.removeTagKey("y");
             is.removeTagKey("z");
-            if (level.isClientSide()) player.sendSystemMessage(Component.translatable("item.gtmthings.wireless_transfer.tooltip.bind.2"));
+            if (level.isClientSide()) player.sendSystemMessage(Component.translatable("item.gtmoremachine.wireless_transfer.tooltip.bind.2"));
         }
         return IInteractionItem.super.use(item, level, player, usedHand);
     }

src/main/java/cn/qiuye/gtmoremachine/data/lang/KeybindingLang.kt

@@ -3,14 +3,5 @@ package cn.qiuye.gtmoremachine.data.lang
 import com.tterrag.registrate.providers.RegistrateLangProvider
 
 object KeybindingLang {
-    fun init(provider: RegistrateLangProvider) {
-        provider.add(
-            "key.gtmoremachine.category",
-            "GT More Machine",
-        )
-        provider.add(
-            "key.gtmoremachine.bind.wet",
-            "Wireless Energy Terminal",
-        )
-    }
+    fun init(provider: RegistrateLangProvider) {}
 }

src/main/java/cn/qiuye/gtmoremachine/data/lang/LangHandler.kt

@@ -9,6 +9,7 @@ object LangHandler {
         ItemLang.init(provider)
         BlockLang.init(provider)
         HUDLang.init(provider)
+        KeybindingLang.init(provider)
         MachineLang.init(provider)
         CreativeLang.init(provider)
         AdvancedTerminalLang.init(provider)

src/main/java/cn/qiuye/gtmoremachine/utils/CuriosUtils.kt

@@ -10,13 +10,20 @@ import top.theillusivec4.curios.api.CuriosApi
 
 object CuriosUtils {
     fun getItemCuriosEquipped(player: Player, item: Item): ItemStack {
-        if (GTmm.Mods.isCuriosLoaded()) {
-            val curiosInventory = CuriosApi.getCuriosInventory(player)
-            if (curiosInventory.isPresent && curiosInventory.resolve().isPresent) {
-                return curiosInventory.resolve().get().findFirstCurio(item).get().stack
-            }
+        if (!GTmm.Mods.isCuriosLoaded()) {
+            return ItemStack.EMPTY
         }
-        return ItemStack.EMPTY
+
+        return CuriosApi.getCuriosInventory(player)
+            .takeIf { it.isPresent }
+            ?.resolve()
+            ?.takeIf { it.isPresent }
+            ?.get()
+            ?.findFirstCurio(item)
+            ?.takeIf { it.isPresent }
+            ?.get()
+            ?.stack
+            ?: ItemStack.EMPTY
     }
 
     fun getItemInventoryEquipped(player: Player, item: Item): ItemStack =

src/main/java/cn/qiuye/gtmoremachine/utils/input/SyncedKeyMappings.kt

@@ -2,39 +2,20 @@ package cn.qiuye.gtmoremachine.utils.input
 
 import cn.qiuye.gtmoremachine.GTmm
 
-import net.minecraft.client.Minecraft
+import com.gregtechceu.gtceu.utils.input.SyncedKeyMapping
+
 import net.minecraftforge.client.settings.KeyConflictContext
-import net.minecraftforge.common.MinecraftForge
-import net.minecraftforge.fml.ModLoader
 
 import com.mojang.blaze3d.platform.InputConstants
 
-import java.util.function.Supplier
-
 object SyncedKeyMappings {
-    val VANILLA_JUMP: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyJump } }
-    val VANILLA_SNEAK: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyShift } }
-    val VANILLA_FORWARD: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyUp } }
-    val VANILLA_BACKWARD: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyDown } }
-    val VANILLA_LEFT: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyLeft } }
-    val VANILLA_RIGHT: SyncedKeyMapping = SyncedKeyMapping
-        .createFromMC { Supplier { Minecraft.getInstance().options.keyRight } }
     val OPEN_WET: SyncedKeyMapping = SyncedKeyMapping.createConfigurable(
-        "key.gtmoremachine.bind.wet",
+        "gtmoremachine.key.wet",
         KeyConflictContext.IN_GAME,
-        InputConstants.KEY_Y,
+        InputConstants.CURSOR_DISABLED,
+        GTmm.MOD_NAME,
     )
 
     @JvmStatic
-    fun init() {
-        if (GTmm.isClientSide()) {
-            MinecraftForge.EVENT_BUS.register(SyncedKeyMapping::class.java)
-        }
-        ModLoader.get().postEvent(SyncedKeyMappingEvent())
-    }
+    fun init() {}
 }

src/main/java/cn/qiuye/gtmoremachine/utils/input/open/HotKeyActions.kt

@@ -0,0 +1,18 @@
+package cn.qiuye.gtmoremachine.utils.input.open
+
+import cn.qiuye.gtmoremachine.common.data.GTMMItems
+import cn.qiuye.gtmoremachine.utils.input.SyncedKeyMappings.OPEN_WET
+
+import net.minecraft.world.InteractionHand
+
+object HotKeyActions {
+
+    @JvmStatic
+    fun init() {
+        OPEN_WET.registerGlobalListener { player, key, isDown ->
+            if (isDown) {
+                GTMMItems.WIRELESS_ENERGY_TERMINAL.asItem().use(player.level(), player, InteractionHand.MAIN_HAND)
+            }
+        }
+    }
+}