From 31795106277b1967df6d73a3a82af1897103b31e Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 7 Jan 2025 00:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E5=93=81=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/init/ModItems.java | 15 ++++++++------- .../item/common/ammo/AmmoSupplierItem.java | 4 ++-- .../superbwarfare/item/common/ammo/Ap5Inches.java | 10 ---------- .../item/common/ammo/CannonShellItem.java | 3 ++- .../item/common/ammo/HandgunAmmo.java | 12 ------------ .../superbwarfare/item/common/ammo/He5Inches.java | 11 ----------- .../superbwarfare/item/common/ammo/RifleAmmo.java | 12 ------------ .../item/common/ammo/ShotgunAmmo.java | 12 ------------ .../item/common/ammo/SniperAmmo.java | 12 ------------ 9 files changed, 12 insertions(+), 79 deletions(-) delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Ap5Inches.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/He5Inches.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 3c04b1ceb..05616a6d4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/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 AMMO = DeferredRegister.create(ForgeRegistries.ITEMS, ModUtils.MODID); - public static final RegistryObject HANDGUN_AMMO = AMMO.register("handgun_ammo", HandgunAmmo::new); - public static final RegistryObject RIFLE_AMMO = AMMO.register("rifle_ammo", RifleAmmo::new); - public static final RegistryObject SNIPER_AMMO = AMMO.register("sniper_ammo", SniperAmmo::new); - public static final RegistryObject SHOTGUN_AMMO = AMMO.register("shotgun_ammo", ShotgunAmmo::new); + public static final RegistryObject HANDGUN_AMMO = AMMO.register("handgun_ammo", () -> new AmmoSupplierItem(GunInfo.Type.HANDGUN, 5, new Item.Properties())); + public static final RegistryObject RIFLE_AMMO = AMMO.register("rifle_ammo", () -> new AmmoSupplierItem(GunInfo.Type.RIFLE, 5, new Item.Properties())); + public static final RegistryObject SNIPER_AMMO = AMMO.register("sniper_ammo", () -> new AmmoSupplierItem(GunInfo.Type.SNIPER, 2, new Item.Properties())); + public static final RegistryObject SHOTGUN_AMMO = AMMO.register("shotgun_ammo", () -> new AmmoSupplierItem(GunInfo.Type.SHOTGUN, 2, new Item.Properties())); public static final RegistryObject HANDGUN_AMMO_BOX = AMMO.register("handgun_ammo_box", HandgunAmmoBox::new); public static final RegistryObject RIFLE_AMMO_BOX = AMMO.register("rifle_ammo_box", RifleAmmoBox::new); public static final RegistryObject SNIPER_AMMO_BOX = AMMO.register("sniper_ammo_box", SniperAmmoBox::new); public static final RegistryObject SHOTGUN_AMMO_BOX = AMMO.register("shotgun_ammo_box", ShotgunAmmoBox::new); - public static final RegistryObject CREATIVE_AMMO_BOX = AMMO.register("creative_ammo_box", () -> new Item(new Item.Properties().rarity(Rarity.EPIC))); + public static final RegistryObject CREATIVE_AMMO_BOX = AMMO.register("creative_ammo_box", () -> new Item(new Item.Properties().rarity(Rarity.EPIC).stacksTo(1))); public static final RegistryObject AMMO_BOX = AMMO.register("ammo_box", AmmoBox::new); public static final RegistryObject TASER_ELECTRODE = AMMO.register("taser_electrode", () -> new Item(new Item.Properties())); public static final RegistryObject GRENADE_40MM = AMMO.register("grenade_40mm", () -> new Item(new Item.Properties())); @@ -100,8 +101,8 @@ public class ModItems { public static final RegistryObject MORTAR_SHELLS = AMMO.register("mortar_shells", () -> new Item(new Item.Properties())); public static final RegistryObject ROCKET = AMMO.register("rocket", Rocket::new); public static final RegistryObject LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new); - public static final RegistryObject HE_5_INCHES = AMMO.register("he_5_inches", He5Inches::new); - public static final RegistryObject AP_5_INCHES = AMMO.register("ap_5_inches", Ap5Inches::new); + public static final RegistryObject HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE))); + public static final RegistryObject AP_5_INCHES = AMMO.register("ap_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE))); public static final RegistryObject HAND_GRENADE = AMMO.register("hand_grenade", HandGrenade::new); public static final RegistryObject RGO_GRENADE = AMMO.register("rgo_grenade", RgoGrenade::new); public static final RegistryObject CLAYMORE_MINE = AMMO.register("claymore_mine", ClaymoreMine::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoSupplierItem.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoSupplierItem.java index 8fc2acf72..4c1e5fc77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/AmmoSupplierItem.java +++ b/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; diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Ap5Inches.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Ap5Inches.java deleted file mode 100644 index 9e251ac43..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/Ap5Inches.java +++ /dev/null @@ -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)); - } - -} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/CannonShellItem.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/CannonShellItem.java index bcecd487b..5769c644e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/CannonShellItem.java +++ b/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); } 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 deleted file mode 100644 index 08068b432..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/HandgunAmmo.java +++ /dev/null @@ -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()); - } - -} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/He5Inches.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/He5Inches.java deleted file mode 100644 index 482954130..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/He5Inches.java +++ /dev/null @@ -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)); - } - -} 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 deleted file mode 100644 index 01af30c9d..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/RifleAmmo.java +++ /dev/null @@ -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()); - } - -} 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 deleted file mode 100644 index 96ea000cd..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/ShotgunAmmo.java +++ /dev/null @@ -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()); - } - -} 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 deleted file mode 100644 index 417348dd8..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/SniperAmmo.java +++ /dev/null @@ -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()); - } - -}