From 510bd7fc6a1b03a3b511be7d902e18f1a4fa3abf Mon Sep 17 00:00:00 2001
From: Light_Quanta <zch22248@foxmail.com>
Date: Sat, 11 May 2024 14:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E8=81=94GunPickupProcedure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mcreator/target/item/gun/GunItem.java | 12 ++++++++
 .../target/procedures/GunpickupProcedure.java | 29 -------------------
 2 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/java/net/mcreator/target/procedures/GunpickupProcedure.java

diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java
index 7011824a7..e84cb51d4 100644
--- a/src/main/java/net/mcreator/target/item/gun/GunItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java
@@ -1,5 +1,6 @@
 package net.mcreator.target.item.gun;
 
+import net.mcreator.target.init.TargetModTags;
 import net.mcreator.target.tools.GunsTool;
 import net.mcreator.target.tools.ItemNBTTool;
 import net.minecraft.core.BlockPos;
@@ -9,7 +10,11 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
 
+@Mod.EventBusSubscriber
 public class GunItem extends Item {
     public GunItem(Properties properties) {
         super(properties);
@@ -34,4 +39,11 @@ public class GunItem extends Item {
     public boolean isFoil(ItemStack stack) {
         return stack.getOrCreateTag().getBoolean("beast");
     }
+
+    @SubscribeEvent
+    public static void onPickup(EntityItemPickupEvent event) {
+        if (event.getItem().getItem().is(TargetModTags.Items.GUN)) {
+            event.getItem().getItem().getOrCreateTag().putDouble("drawtime", 0);
+        }
+    }
 }
diff --git a/src/main/java/net/mcreator/target/procedures/GunpickupProcedure.java b/src/main/java/net/mcreator/target/procedures/GunpickupProcedure.java
deleted file mode 100644
index efd84eb6a..000000000
--- a/src/main/java/net/mcreator/target/procedures/GunpickupProcedure.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package net.mcreator.target.procedures;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-import javax.annotation.Nullable;
-
-@Mod.EventBusSubscriber
-public class GunpickupProcedure {
-    @SubscribeEvent
-    public static void onPickup(EntityItemPickupEvent event) {
-        execute(event, event.getItem().getItem());
-    }
-
-    public static void execute(ItemStack itemstack) {
-        execute(null, itemstack);
-    }
-
-    private static void execute(@Nullable Event event, ItemStack itemstack) {
-        if (itemstack.is(ItemTags.create(new ResourceLocation("target:gun")))) {
-            itemstack.getOrCreateTag().putDouble("drawtime", 0);
-        }
-    }
-}