优化物品注册类

src/main/java/com/atsuishio/superbwarfare/init/ModItems.java

@@ -25,6 +25,7 @@ import com.atsuishio.superbwarfare.item.gun.smg.VectorItem;
 import com.atsuishio.superbwarfare.item.gun.sniper.*;
 import com.atsuishio.superbwarfare.item.gun.special.BocekItem;
 import com.atsuishio.superbwarfare.item.gun.special.TaserItem;
+import com.atsuishio.superbwarfare.tools.GunInfo;
 import com.atsuishio.superbwarfare.tools.RarityTool;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
@@ -84,15 +85,15 @@ public class ModItems {
      */
     public static final DeferredRegister<Item> AMMO = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID);
 
-    public static final RegistryObject<Item> HANDGUN_AMMO = AMMO.register("handgun_ammo", HandgunAmmo::new);
+    public static final RegistryObject<Item> HANDGUN_AMMO = AMMO.register("handgun_ammo", () -> new AmmoSupplierItem(GunInfo.Type.HANDGUN, 5, new Item.Properties()));
-    public static final RegistryObject<Item> RIFLE_AMMO = AMMO.register("rifle_ammo", RifleAmmo::new);
+    public static final RegistryObject<Item> RIFLE_AMMO = AMMO.register("rifle_ammo", () -> new AmmoSupplierItem(GunInfo.Type.RIFLE, 5, new Item.Properties()));
-    public static final RegistryObject<Item> SNIPER_AMMO = AMMO.register("sniper_ammo", SniperAmmo::new);
+    public static final RegistryObject<Item> SNIPER_AMMO = AMMO.register("sniper_ammo", () -> new AmmoSupplierItem(GunInfo.Type.SNIPER, 2, new Item.Properties()));
-    public static final RegistryObject<Item> SHOTGUN_AMMO = AMMO.register("shotgun_ammo", ShotgunAmmo::new);
+    public static final RegistryObject<Item> SHOTGUN_AMMO = AMMO.register("shotgun_ammo", () -> new AmmoSupplierItem(GunInfo.Type.SHOTGUN, 2, new Item.Properties()));
     public static final RegistryObject<Item> HANDGUN_AMMO_BOX = AMMO.register("handgun_ammo_box", HandgunAmmoBox::new);
     public static final RegistryObject<Item> RIFLE_AMMO_BOX = AMMO.register("rifle_ammo_box", RifleAmmoBox::new);
     public static final RegistryObject<Item> SNIPER_AMMO_BOX = AMMO.register("sniper_ammo_box", SniperAmmoBox::new);
     public static final RegistryObject<Item> SHOTGUN_AMMO_BOX = AMMO.register("shotgun_ammo_box", ShotgunAmmoBox::new);
-    public static final RegistryObject<Item> CREATIVE_AMMO_BOX = AMMO.register("creative_ammo_box", () -> new Item(new Item.Properties().rarity(Rarity.EPIC)));
+    public static final RegistryObject<Item> CREATIVE_AMMO_BOX = AMMO.register("creative_ammo_box", () -> new Item(new Item.Properties().rarity(Rarity.EPIC).stacksTo(1)));
     public static final RegistryObject<Item> AMMO_BOX = AMMO.register("ammo_box", AmmoBox::new);
     public static final RegistryObject<Item> TASER_ELECTRODE = AMMO.register("taser_electrode", () -> new Item(new Item.Properties()));
     public static final RegistryObject<Item> GRENADE_40MM = AMMO.register("grenade_40mm", () -> new Item(new Item.Properties()));
@@ -100,8 +101,8 @@ public class ModItems {
     public static final RegistryObject<Item> MORTAR_SHELLS = AMMO.register("mortar_shells", () -> new Item(new Item.Properties()));
     public static final RegistryObject<Item> ROCKET = AMMO.register("rocket", Rocket::new);
     public static final RegistryObject<Item> LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new);
-    public static final RegistryObject<Item> HE_5_INCHES = AMMO.register("he_5_inches", He5Inches::new);
+    public static final RegistryObject<Item> HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE)));
-    public static final RegistryObject<Item> AP_5_INCHES = AMMO.register("ap_5_inches", Ap5Inches::new);
+    public static final RegistryObject<Item> AP_5_INCHES = AMMO.register("ap_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE)));
     public static final RegistryObject<Item> HAND_GRENADE = AMMO.register("hand_grenade", HandGrenade::new);
     public static final RegistryObject<Item> RGO_GRENADE = AMMO.register("rgo_grenade", RgoGrenade::new);
     public static final RegistryObject<Item> CLAYMORE_MINE = AMMO.register("claymore_mine", ClaymoreMine::new);

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoSupplierItem.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.GunInfo;
-import com.atsuishio.superbwarfare.init.ModSounds;
 import net.minecraft.network.chat.Component;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
@@ -12,7 +12,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 
-public abstract class AmmoSupplierItem extends Item {
+public class AmmoSupplierItem extends Item {
 
     public final GunInfo.Type type;
     public final int ammoToAdd;

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Ap5Inches.java

@@ -1,10 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-import net.minecraft.world.item.Rarity;
-
-public class Ap5Inches extends CannonShellItem {
-    public Ap5Inches() {
-        super(new Properties().rarity(Rarity.RARE));
-    }
-
-}

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/CannonShellItem.java

@@ -2,7 +2,8 @@ package com.atsuishio.superbwarfare.item.common.ammo;
 
 import net.minecraft.world.item.Item;
 
-public abstract class CannonShellItem extends Item {
+public class CannonShellItem extends Item {
+
     public CannonShellItem(Properties properties) {
         super(properties);
     }

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java

@@ -1,12 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-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());
-    }
-
-}

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/He5Inches.java

@@ -1,11 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Rarity;
-
-public class He5Inches extends CannonShellItem {
-    public He5Inches() {
-        super(new Item.Properties().rarity(Rarity.RARE));
-    }
-
-}

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java

@@ -1,12 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-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());
-    }
-
-}

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java

@@ -1,12 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-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());
-    }
-
-}

src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java

@@ -1,12 +0,0 @@
-package com.atsuishio.superbwarfare.item.common.ammo;
-
-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());
-    }
-
-}