From 163c63a5446dd4b3a93f9ec9442b7b910cbec6fa Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 29 Jul 2024 17:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4ammo=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/superbwarfare/item/ClaymoreMine.java | 12 +----------- .../java/net/mcreator/superbwarfare/item/Drone.java | 9 ++------- .../net/mcreator/superbwarfare/item/Hammer.java | 13 ++++--------- .../net/mcreator/superbwarfare/item/LightSaber.java | 8 -------- .../mcreator/superbwarfare/item/MortarBarrel.java | 13 +------------ .../mcreator/superbwarfare/item/MortarBipod.java | 13 +------------ .../mcreator/superbwarfare/item/MortarShells.java | 13 +------------ .../superbwarfare/item/common/ammo/Ap5Inches.java | 12 +----------- .../item/common/ammo/CreativeAmmoBox.java | 2 +- .../superbwarfare/item/common/ammo/Grenade40mm.java | 13 +------------ .../superbwarfare/item/common/ammo/HandgunAmmo.java | 13 +------------ .../item/common/ammo/HandgunAmmoBox.java | 2 +- .../superbwarfare/item/common/ammo/He5Inches.java | 12 +----------- .../superbwarfare/item/common/ammo/RifleAmmo.java | 13 +------------ .../item/common/ammo/RifleAmmoBox.java | 2 +- .../superbwarfare/item/common/ammo/ShieldCell.java | 12 +----------- .../superbwarfare/item/common/ammo/ShotgunAmmo.java | 13 +------------ .../item/common/ammo/ShotgunAmmoBox.java | 2 +- .../superbwarfare/item/common/ammo/SniperAmmo.java | 13 +------------ .../item/common/ammo/SniperAmmoBox.java | 2 +- .../item/common/ammo/TaserElectrode.java | 13 +------------ 21 files changed, 24 insertions(+), 181 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java b/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java index 54dcdb12b..d6f65ac28 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java +++ b/src/main/java/net/mcreator/superbwarfare/item/ClaymoreMine.java @@ -2,7 +2,6 @@ package net.mcreator.superbwarfare.item; import net.mcreator.superbwarfare.entity.ClaymoreEntity; import net.mcreator.superbwarfare.init.ModEntities; -import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -11,20 +10,11 @@ import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import java.util.List; - public class ClaymoreMine extends Item { public ClaymoreMine() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); - } - - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + super(new Item.Properties()); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/Drone.java b/src/main/java/net/mcreator/superbwarfare/item/Drone.java index a9296c854..555e2cd8b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/Drone.java +++ b/src/main/java/net/mcreator/superbwarfare/item/Drone.java @@ -1,6 +1,5 @@ package net.mcreator.superbwarfare.item; -import net.mcreator.superbwarfare.entity.DroneEntity; import net.mcreator.superbwarfare.init.ModEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -10,7 +9,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -19,10 +17,7 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.SpawnerBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; @@ -52,7 +47,7 @@ public class Drone extends Item { blockpos1 = blockpos.relative(direction); } - if (ModEntities.DRONE.get().spawn((ServerLevel)level, itemstack, pContext.getPlayer(), blockpos1, MobSpawnType.SPAWN_EGG, true, !Objects.equals(blockpos, blockpos1) && direction == Direction.UP) != null) { + if (ModEntities.DRONE.get().spawn((ServerLevel) level, itemstack, pContext.getPlayer(), blockpos1, MobSpawnType.SPAWN_EGG, true, !Objects.equals(blockpos, blockpos1) && direction == Direction.UP) != null) { itemstack.shrink(1); level.gameEvent(pContext.getPlayer(), GameEvent.ENTITY_PLACE, blockpos); } @@ -74,7 +69,7 @@ public class Drone extends Item { if (!(pLevel.getBlockState(blockpos).getBlock() instanceof LiquidBlock)) { return InteractionResultHolder.pass(itemstack); } else if (pLevel.mayInteract(pPlayer, blockpos) && pPlayer.mayUseItemAt(blockpos, blockhitresult.getDirection(), itemstack)) { - Entity entity = ModEntities.DRONE.get().spawn((ServerLevel)pLevel, itemstack, pPlayer, blockpos, MobSpawnType.SPAWN_EGG, false, false); + Entity entity = ModEntities.DRONE.get().spawn((ServerLevel) pLevel, itemstack, pPlayer, blockpos, MobSpawnType.SPAWN_EGG, false, false); if (entity == null) { return InteractionResultHolder.pass(itemstack); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/item/Hammer.java b/src/main/java/net/mcreator/superbwarfare/item/Hammer.java index 68640cb18..64f1f9409 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/Hammer.java +++ b/src/main/java/net/mcreator/superbwarfare/item/Hammer.java @@ -1,11 +1,10 @@ package net.mcreator.superbwarfare.item; -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.SwordItem; +import net.minecraft.world.item.Tier; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.Level; - -import java.util.List; public class Hammer extends SwordItem { public Hammer() { @@ -56,8 +55,4 @@ public class Hammer extends SwordItem { return false; } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/LightSaber.java b/src/main/java/net/mcreator/superbwarfare/item/LightSaber.java index d5dcf072d..ff56171a9 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/LightSaber.java +++ b/src/main/java/net/mcreator/superbwarfare/item/LightSaber.java @@ -5,7 +5,6 @@ import com.google.common.collect.Multimap; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.client.renderer.item.LightSaberItemRenderer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; -import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; @@ -13,7 +12,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.*; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentCategory; -import net.minecraft.world.level.Level; import net.minecraftforge.client.extensions.common.IClientItemExtensions; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; @@ -24,7 +22,6 @@ import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; -import java.util.List; import java.util.UUID; import java.util.function.Consumer; @@ -119,11 +116,6 @@ public class LightSaber extends SwordItem implements GeoItem, AnimatedItem { return enchantment.category == EnchantmentCategory.BREAKABLE || enchantment.category == EnchantmentCategory.WEAPON; } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } - @Override public void setAnimationProcedure(String procedure) { this.animationProcedure = procedure; diff --git a/src/main/java/net/mcreator/superbwarfare/item/MortarBarrel.java b/src/main/java/net/mcreator/superbwarfare/item/MortarBarrel.java index 7f347767a..295546011 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/MortarBarrel.java +++ b/src/main/java/net/mcreator/superbwarfare/item/MortarBarrel.java @@ -1,21 +1,10 @@ package net.mcreator.superbwarfare.item; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class MortarBarrel extends Item { public MortarBarrel() { - super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.COMMON)); + super(new Item.Properties().fireResistant()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/MortarBipod.java b/src/main/java/net/mcreator/superbwarfare/item/MortarBipod.java index bab6ea3c0..27af6d566 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/MortarBipod.java +++ b/src/main/java/net/mcreator/superbwarfare/item/MortarBipod.java @@ -1,21 +1,10 @@ package net.mcreator.superbwarfare.item; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class MortarBipod extends Item { public MortarBipod() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/MortarShells.java b/src/main/java/net/mcreator/superbwarfare/item/MortarShells.java index 44a29a517..a05296ca5 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/MortarShells.java +++ b/src/main/java/net/mcreator/superbwarfare/item/MortarShells.java @@ -1,21 +1,10 @@ package net.mcreator.superbwarfare.item; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class MortarShells extends Item { public MortarShells() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Ap5Inches.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Ap5Inches.java index c31ca229f..299f2939a 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Ap5Inches.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Ap5Inches.java @@ -1,20 +1,10 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class Ap5Inches extends CannonShellItem { public Ap5Inches() { - super(new Properties().stacksTo(64).rarity(Rarity.RARE)); + super(new Properties().rarity(Rarity.RARE)); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java index a36b17e18..5657b6dc9 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/CreativeAmmoBox.java @@ -17,7 +17,7 @@ import java.util.List; public class CreativeAmmoBox extends Item { public CreativeAmmoBox() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); + super(new Item.Properties().rarity(Rarity.EPIC)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Grenade40mm.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Grenade40mm.java index bc88973ed..0c9085c75 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Grenade40mm.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/Grenade40mm.java @@ -1,21 +1,10 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class Grenade40mm extends Item { public Grenade40mm() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmo.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmo.java index 3bb5e5306..14a9434dc 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmo.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmo.java @@ -1,22 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; import net.mcreator.superbwarfare.tools.GunInfo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class HandgunAmmo extends AmmoSupplierItem { public HandgunAmmo() { - super(GunInfo.Type.HANDGUN, 5, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.HANDGUN, 5, new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmoBox.java index 7147421d4..c9e565b12 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/HandgunAmmoBox.java @@ -10,7 +10,7 @@ import java.util.List; public class HandgunAmmoBox extends AmmoSupplierItem { public HandgunAmmoBox() { - super(GunInfo.Type.HANDGUN, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.HANDGUN, 30, new Item.Properties()); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/He5Inches.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/He5Inches.java index 1d2ed0c1d..d75c73526 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/He5Inches.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/He5Inches.java @@ -1,21 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class He5Inches extends CannonShellItem { public He5Inches() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); + super(new Item.Properties().rarity(Rarity.RARE)); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmo.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmo.java index ed794436e..cf5c58033 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmo.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmo.java @@ -1,22 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; import net.mcreator.superbwarfare.tools.GunInfo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class RifleAmmo extends AmmoSupplierItem { public RifleAmmo() { - super(GunInfo.Type.RIFLE, 5, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.RIFLE, 5, new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmoBox.java index 79741daee..7d673f044 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/RifleAmmoBox.java @@ -10,7 +10,7 @@ import java.util.List; public class RifleAmmoBox extends AmmoSupplierItem { public RifleAmmoBox() { - super(GunInfo.Type.RIFLE, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.RIFLE, 30, new Item.Properties()); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShieldCell.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShieldCell.java index 87b06a224..28aad74f2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShieldCell.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShieldCell.java @@ -1,21 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class ShieldCell extends Item { public ShieldCell() { - super(new Properties().stacksTo(64).rarity(Rarity.RARE)); + super(new Properties().rarity(Rarity.RARE)); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmo.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmo.java index 5de98b1b9..a147554ad 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmo.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmo.java @@ -1,22 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; import net.mcreator.superbwarfare.tools.GunInfo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class ShotgunAmmo extends AmmoSupplierItem { public ShotgunAmmo() { - super(GunInfo.Type.SHOTGUN, 2, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.SHOTGUN, 2, new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmoBox.java index 16c1d0bbb..bb639798b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/ShotgunAmmoBox.java @@ -10,7 +10,7 @@ import java.util.List; public class ShotgunAmmoBox extends AmmoSupplierItem { public ShotgunAmmoBox() { - super(GunInfo.Type.SHOTGUN, 12, new Item.Properties().stacksTo(8).rarity(Rarity.COMMON)); + super(GunInfo.Type.SHOTGUN, 12, new Item.Properties().stacksTo(8)); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmo.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmo.java index aa15de358..294dd0ad5 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmo.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmo.java @@ -1,22 +1,11 @@ package net.mcreator.superbwarfare.item.common.ammo; import net.mcreator.superbwarfare.tools.GunInfo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class SniperAmmo extends AmmoSupplierItem { public SniperAmmo() { - super(GunInfo.Type.SNIPER, 2, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.SNIPER, 2, new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } } diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmoBox.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmoBox.java index c5db24254..31fba7be8 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmoBox.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/SniperAmmoBox.java @@ -10,7 +10,7 @@ import java.util.List; public class SniperAmmoBox extends AmmoSupplierItem { public SniperAmmoBox() { - super(GunInfo.Type.SNIPER, 12, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(GunInfo.Type.SNIPER, 12, new Item.Properties()); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/TaserElectrode.java b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/TaserElectrode.java index dfbd23913..ecf00bd9b 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/common/ammo/TaserElectrode.java +++ b/src/main/java/net/mcreator/superbwarfare/item/common/ammo/TaserElectrode.java @@ -1,21 +1,10 @@ package net.mcreator.superbwarfare.item.common.ammo; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; - -import java.util.List; public class TaserElectrode extends Item { public TaserElectrode() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + super(new Item.Properties()); } - @Override - public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); - } }