From 1fa92f5205e45b430c20d4f71477d36d23b5774c Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sat, 4 Jan 2025 21:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E8=8D=AF=E7=9B=92?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/item/common/ammo/AmmoBox.java |  3 ++-
 .../item/common/ammo/HandgunAmmo.java           |  1 +
 .../item/common/ammo/HandgunAmmoBox.java        | 15 ++++-----------
 .../item/common/ammo/RifleAmmo.java             |  1 +
 .../item/common/ammo/RifleAmmoBox.java          | 15 ++++-----------
 .../item/common/ammo/ShotgunAmmo.java           |  1 +
 .../item/common/ammo/ShotgunAmmoBox.java        | 17 +++++------------
 .../item/common/ammo/SniperAmmo.java            |  1 +
 .../item/common/ammo/SniperAmmoBox.java         | 15 ++++-----------
 9 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java
index 5194c867c..93fc4fd0a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoBox.java
@@ -1,8 +1,8 @@
 package com.atsuishio.superbwarfare.item.common.ammo;
 
+import com.atsuishio.superbwarfare.init.ModSounds;
 import com.atsuishio.superbwarfare.network.ModVariables;
 import com.atsuishio.superbwarfare.tools.ItemNBTTool;
-import com.atsuishio.superbwarfare.init.ModSounds;
 import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -22,6 +22,7 @@ import java.text.DecimalFormat;
 import java.util.List;
 
 public class AmmoBox extends Item {
+
     public AmmoBox() {
         super(new Properties().stacksTo(1));
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java
index 40fe49696..08068b432 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java
@@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.world.item.Item;
 
 public class HandgunAmmo extends AmmoSupplierItem {
+
     public HandgunAmmo() {
         super(GunInfo.Type.HANDGUN, 5, new Item.Properties());
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmoBox.java
index 09b30f378..1b38a3db7 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmoBox.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmoBox.java
@@ -3,26 +3,19 @@ package com.atsuishio.superbwarfare.item.common.ammo;
 import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.*;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 
 import java.util.List;
 
 public class HandgunAmmoBox extends AmmoSupplierItem {
+
     public HandgunAmmoBox() {
         super(GunInfo.Type.HANDGUN, 30, new Item.Properties());
     }
 
-    @Override
-    public UseAnim getUseAnimation(ItemStack itemstack) {
-        return UseAnim.EAT;
-    }
-
-    @Override
-    public int getUseDuration(ItemStack itemstack) {
-        return 16;
-    }
-
     @Override
     public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
         list.add(Component.translatable("des.superbwarfare.handgun_ammo_box").withStyle(ChatFormatting.GRAY));
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java
index 359405294..01af30c9d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java
@@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.world.item.Item;
 
 public class RifleAmmo extends AmmoSupplierItem {
+
     public RifleAmmo() {
         super(GunInfo.Type.RIFLE, 5, new Item.Properties());
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmoBox.java
index 5c92f4ce7..fc3ce5931 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmoBox.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmoBox.java
@@ -3,26 +3,19 @@ package com.atsuishio.superbwarfare.item.common.ammo;
 import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.*;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 
 import java.util.List;
 
 public class RifleAmmoBox extends AmmoSupplierItem {
+
     public RifleAmmoBox() {
         super(GunInfo.Type.RIFLE, 30, new Item.Properties());
     }
 
-    @Override
-    public UseAnim getUseAnimation(ItemStack itemstack) {
-        return UseAnim.EAT;
-    }
-
-    @Override
-    public int getUseDuration(ItemStack itemstack) {
-        return 16;
-    }
-
     @Override
     public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
         list.add(Component.translatable("des.superbwarfare.rifle_ammo_box").withStyle(ChatFormatting.GRAY));
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java
index d91352397..96ea000cd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java
@@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.world.item.Item;
 
 public class ShotgunAmmo extends AmmoSupplierItem {
+
     public ShotgunAmmo() {
         super(GunInfo.Type.SHOTGUN, 2, new Item.Properties());
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmoBox.java
index 29cdddcf4..5a831f285 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmoBox.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmoBox.java
@@ -3,24 +3,17 @@ package com.atsuishio.superbwarfare.item.common.ammo;
 import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.*;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 
 import java.util.List;
 
 public class ShotgunAmmoBox extends AmmoSupplierItem {
+
     public ShotgunAmmoBox() {
-        super(GunInfo.Type.SHOTGUN, 12, new Item.Properties().stacksTo(8));
-    }
-
-    @Override
-    public UseAnim getUseAnimation(ItemStack itemstack) {
-        return UseAnim.EAT;
-    }
-
-    @Override
-    public int getUseDuration(ItemStack itemstack) {
-        return 16;
+        super(GunInfo.Type.SHOTGUN, 12, new Item.Properties());
     }
 
     @Override
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java
index c24552fdf..417348dd8 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java
@@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.world.item.Item;
 
 public class SniperAmmo extends AmmoSupplierItem {
+
     public SniperAmmo() {
         super(GunInfo.Type.SNIPER, 2, new Item.Properties());
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmoBox.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmoBox.java
index de75352a1..672a700ae 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmoBox.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmoBox.java
@@ -3,26 +3,19 @@ package com.atsuishio.superbwarfare.item.common.ammo;
 import com.atsuishio.superbwarfare.tools.GunInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.*;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 
 import java.util.List;
 
 public class SniperAmmoBox extends AmmoSupplierItem {
+
     public SniperAmmoBox() {
         super(GunInfo.Type.SNIPER, 12, new Item.Properties());
     }
 
-    @Override
-    public UseAnim getUseAnimation(ItemStack itemstack) {
-        return UseAnim.EAT;
-    }
-
-    @Override
-    public int getUseDuration(ItemStack itemstack) {
-        return 16;
-    }
-
     @Override
     public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
         list.add(Component.translatable("des.superbwarfare.sniper_ammo_box").withStyle(ChatFormatting.GRAY));