From fb12b1df95fef98d91e7d815964582f500d49a03 Mon Sep 17 00:00:00 2001
From: Guimc <xiluo@guimc.ltd>
Date: Wed, 14 Aug 2024 20:13:30 +0800
Subject: [PATCH] update

---
 .../zombieshelper/ZombiesHelper.java          |  2 --
 .../listener/AutoSwitchListener.java          | 28 -------------------
 .../listener/BlockUseEntityListener.java      |  2 ++
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 src/main/java/win/cuteguimc/zombieshelper/listener/AutoSwitchListener.java

diff --git a/src/main/java/win/cuteguimc/zombieshelper/ZombiesHelper.java b/src/main/java/win/cuteguimc/zombieshelper/ZombiesHelper.java
index e8e31fb..999ad70 100644
--- a/src/main/java/win/cuteguimc/zombieshelper/ZombiesHelper.java
+++ b/src/main/java/win/cuteguimc/zombieshelper/ZombiesHelper.java
@@ -6,7 +6,6 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import win.cuteguimc.zombieshelper.command.OpenGUICommand;
 import win.cuteguimc.zombieshelper.config.ZombiesHelperConfig;
-import win.cuteguimc.zombieshelper.listener.AutoSwitchListener;
 import win.cuteguimc.zombieshelper.listener.BlockUseEntityListener;
 import win.cuteguimc.zombieshelper.listener.NoPuncherListener;
 import win.cuteguimc.zombieshelper.listener.RendHudListener;
@@ -35,7 +34,6 @@ public void onInit(FMLInitializationEvent event) {
         new NoPuncherListener();
         new BlockUseEntityListener();
         new RendHudListener();
-        new AutoSwitchListener();
         CommandManager.INSTANCE.registerCommand(new OpenGUICommand());
     }
 }
diff --git a/src/main/java/win/cuteguimc/zombieshelper/listener/AutoSwitchListener.java b/src/main/java/win/cuteguimc/zombieshelper/listener/AutoSwitchListener.java
deleted file mode 100644
index cbcb062..0000000
--- a/src/main/java/win/cuteguimc/zombieshelper/listener/AutoSwitchListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package win.cuteguimc.zombieshelper.listener;
-
-import cc.polyfrost.oneconfig.events.EventManager;
-import cc.polyfrost.oneconfig.events.event.TickEvent;
-import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
-import win.cuteguimc.zombieshelper.config.ZombiesHelperConfig;
-
-public class AutoSwitchListener {
-    private final Minecraft mc = Minecraft.getMinecraft();
-
-    public AutoSwitchListener() {
-        EventManager.INSTANCE.register(this);
-    }
-
-    @Subscribe
-    public void onTickEvent(TickEvent event) {
-        if (!ZombiesHelperConfig.autoSwitch) return;
-        if (mc.thePlayer == null || mc.theWorld == null) return;
-        if (mc.thePlayer.ticksExisted % 2 == 0) {
-            mc.thePlayer.inventory.currentItem = (int) ZombiesHelperConfig.firstSlot - 1;
-        } else {
-            mc.thePlayer.inventory.currentItem = (int) ZombiesHelperConfig.secondSlot - 1;
-        }
-        mc.getNetHandler().addToSendQueue(new C08PacketPlayerBlockPlacement(mc.thePlayer.inventory.getCurrentItem()));
-    }
-}
diff --git a/src/main/java/win/cuteguimc/zombieshelper/listener/BlockUseEntityListener.java b/src/main/java/win/cuteguimc/zombieshelper/listener/BlockUseEntityListener.java
index da2dfa2..d294909 100644
--- a/src/main/java/win/cuteguimc/zombieshelper/listener/BlockUseEntityListener.java
+++ b/src/main/java/win/cuteguimc/zombieshelper/listener/BlockUseEntityListener.java
@@ -5,6 +5,7 @@
 import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 import net.minecraft.block.BlockChest;
 import net.minecraft.client.Minecraft;
+import net.minecraft.item.EnumAction;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.client.C02PacketUseEntity;
 import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
@@ -23,6 +24,7 @@ public BlockUseEntityListener() {
     @Subscribe
     public void onPacketSend(SendPacketEvent event) {
         if (!ZombiesHelperConfig.blockUseEntity) return;
+        if (mc.thePlayer.inventory.getCurrentItem().getItem().getItemUseAction(mc.thePlayer.inventory.getCurrentItem()) != EnumAction.NONE) return;
         Packet packet = event.packet;
         if ((packet instanceof C08PacketPlayerBlockPlacement &&
                 mc.theWorld.getBlockState(((C08PacketPlayerBlockPlacement) packet).getPosition()).getBlock() instanceof BlockChest) ||