Merge pull request #2622 from burin-ljx/multitool

Fix bug of multitool and magnet block 修复多用途工具和磁铁块的问题

Author: Gu-ZT

src/main/java/dev/dubhe/anvilcraft/block/HollowMagnetBlock.java

@@ -133,13 +133,12 @@ protected void entityInside(BlockState state, Level level, BlockPos pos, Entity
 
     @Override
     protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
-        if (level.isClientSide) {
-            return ItemInteractionResult.sidedSuccess(true);
-        }
-        if (stack.is(Items.IRON_INGOT)) {
-            stack.consume(1, player);
-            level.setBlockAndUpdate(pos, ModBlocks.FERRITE_CORE_MAGNET_BLOCK.getDefaultState());
-            return ItemInteractionResult.sidedSuccess(false);
+        if (!level.isClientSide) {
+            if (stack.is(Items.IRON_INGOT)) {
+                stack.consume(1, player);
+                level.setBlockAndUpdate(pos, ModBlocks.FERRITE_CORE_MAGNET_BLOCK.getDefaultState());
+                return ItemInteractionResult.SUCCESS;
+            }
         }
         return super.useItemOn(stack, state, level, pos, player, hand, hitResult);
     }

src/main/java/dev/dubhe/anvilcraft/block/MagnetBlock.java

@@ -166,14 +166,13 @@ public void tick(
 
     @Override
     protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
-        if (level.isClientSide) {
-            return InteractionResult.sidedSuccess(true);
-        }
-        if (state.is(ModBlocks.MAGNET_BLOCK)) {
-            if (player.isShiftKeyDown()) {
-                player.addItem(ModItems.MAGNET_INGOT.asStack());
-                level.setBlockAndUpdate(pos, ModBlocks.HOLLOW_MAGNET_BLOCK.getDefaultState());
-                return InteractionResult.sidedSuccess(false);
+        if (!level.isClientSide) {
+            if (state.is(ModBlocks.MAGNET_BLOCK)) {
+                if (player.isShiftKeyDown()) {
+                    player.addItem(ModItems.MAGNET_INGOT.asStack());
+                    level.setBlockAndUpdate(pos, ModBlocks.HOLLOW_MAGNET_BLOCK.getDefaultState());
+                    return InteractionResult.SUCCESS;
+                }
             }
         }
         return super.useWithoutItem(state, level, pos, player, hitResult);

src/main/java/dev/dubhe/anvilcraft/client/event/ClientEventListener.java

@@ -127,7 +127,7 @@ public static void onKeyPress(Key event) {
         }
 
         if (event.getKey() == ModKeyMappings.SWITCH_RESONATE_MODE.get().getKey().getValue()) {
-            if (event.getAction() == InputConstants.PRESS) {
+            if (event.getAction() == InputConstants.PRESS && Minecraft.getInstance().screen == null) {
                 LocalPlayer player = Minecraft.getInstance().player;
                 if (player == null) {
                     return;