移除ammo冗余代码

This commit is contained in:
17146 2024-07-29 17:15:50 +08:00
parent 8bf3f8a41f
commit 163c63a544
21 changed files with 24 additions and 181 deletions

View file

@ -2,7 +2,6 @@ package net.mcreator.superbwarfare.item;
import net.mcreator.superbwarfare.entity.ClaymoreEntity; import net.mcreator.superbwarfare.entity.ClaymoreEntity;
import net.mcreator.superbwarfare.init.ModEntities; import net.mcreator.superbwarfare.init.ModEntities;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder; 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.entity.player.Player;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; 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 net.minecraft.world.level.Level;
import java.util.List;
public class ClaymoreMine extends Item { public class ClaymoreMine extends Item {
public ClaymoreMine() { public ClaymoreMine() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(new Item.Properties());
}
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package net.mcreator.superbwarfare.item; package net.mcreator.superbwarfare.item;
import net.mcreator.superbwarfare.entity.DroneEntity;
import net.mcreator.superbwarfare.init.ModEntities; import net.mcreator.superbwarfare.init.ModEntities;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
@ -10,7 +9,6 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.MobSpawnType;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item; 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.item.context.UseOnContext;
import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.Level; 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.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.block.state.BlockState;
import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
@ -52,7 +47,7 @@ public class Drone extends Item {
blockpos1 = blockpos.relative(direction); 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); itemstack.shrink(1);
level.gameEvent(pContext.getPlayer(), GameEvent.ENTITY_PLACE, blockpos); level.gameEvent(pContext.getPlayer(), GameEvent.ENTITY_PLACE, blockpos);
} }
@ -74,7 +69,7 @@ public class Drone extends Item {
if (!(pLevel.getBlockState(blockpos).getBlock() instanceof LiquidBlock)) { if (!(pLevel.getBlockState(blockpos).getBlock() instanceof LiquidBlock)) {
return InteractionResultHolder.pass(itemstack); return InteractionResultHolder.pass(itemstack);
} else if (pLevel.mayInteract(pPlayer, blockpos) && pPlayer.mayUseItemAt(blockpos, blockhitresult.getDirection(), 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) { if (entity == null) {
return InteractionResultHolder.pass(itemstack); return InteractionResultHolder.pass(itemstack);
} else { } else {

View file

@ -1,11 +1,10 @@
package net.mcreator.superbwarfare.item; package net.mcreator.superbwarfare.item;
import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item;
import net.minecraft.world.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.item.crafting.Ingredient;
import net.minecraft.world.level.Level;
import java.util.List;
public class Hammer extends SwordItem { public class Hammer extends SwordItem {
public Hammer() { public Hammer() {
@ -56,8 +55,4 @@ public class Hammer extends SwordItem {
return false; return false;
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -5,7 +5,6 @@ import com.google.common.collect.Multimap;
import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.ModUtils;
import net.mcreator.superbwarfare.client.renderer.item.LightSaberItemRenderer; import net.mcreator.superbwarfare.client.renderer.item.LightSaberItemRenderer;
import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; 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.*;
import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentCategory; import net.minecraft.world.item.enchantment.EnchantmentCategory;
import net.minecraft.world.level.Level;
import net.minecraftforge.client.extensions.common.IClientItemExtensions; import net.minecraftforge.client.extensions.common.IClientItemExtensions;
import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.animatable.GeoItem;
import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; 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.core.object.PlayState;
import software.bernie.geckolib.util.GeckoLibUtil; import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.function.Consumer; 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; return enchantment.category == EnchantmentCategory.BREAKABLE || enchantment.category == EnchantmentCategory.WEAPON;
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
@Override @Override
public void setAnimationProcedure(String procedure) { public void setAnimationProcedure(String procedure) {
this.animationProcedure = procedure; this.animationProcedure = procedure;

View file

@ -1,21 +1,10 @@
package net.mcreator.superbwarfare.item; package net.mcreator.superbwarfare.item;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class MortarBarrel extends Item {
public MortarBarrel() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,21 +1,10 @@
package net.mcreator.superbwarfare.item; package net.mcreator.superbwarfare.item;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class MortarBipod extends Item {
public MortarBipod() { public MortarBipod() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(new Item.Properties());
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,21 +1,10 @@
package net.mcreator.superbwarfare.item; package net.mcreator.superbwarfare.item;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class MortarShells extends Item {
public MortarShells() { public MortarShells() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(new Item.Properties());
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,20 +1,10 @@
package net.mcreator.superbwarfare.item.common.ammo; 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.Rarity;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import java.util.List;
public class Ap5Inches extends CannonShellItem { public class Ap5Inches extends CannonShellItem {
public Ap5Inches() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -17,7 +17,7 @@ import java.util.List;
public class CreativeAmmoBox extends Item { public class CreativeAmmoBox extends Item {
public CreativeAmmoBox() { public CreativeAmmoBox() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.EPIC)); super(new Item.Properties().rarity(Rarity.EPIC));
} }
@Override @Override

View file

@ -1,21 +1,10 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class Grenade40mm extends Item {
public Grenade40mm() { public Grenade40mm() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(new Item.Properties());
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,22 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.tools.GunInfo; import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class HandgunAmmo extends AmmoSupplierItem {
public HandgunAmmo() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -10,7 +10,7 @@ import java.util.List;
public class HandgunAmmoBox extends AmmoSupplierItem { public class HandgunAmmoBox extends AmmoSupplierItem {
public HandgunAmmoBox() { public HandgunAmmoBox() {
super(GunInfo.Type.HANDGUN, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(GunInfo.Type.HANDGUN, 30, new Item.Properties());
} }
@Override @Override

View file

@ -1,21 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity; 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 class He5Inches extends CannonShellItem {
public He5Inches() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,22 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.tools.GunInfo; import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class RifleAmmo extends AmmoSupplierItem {
public RifleAmmo() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -10,7 +10,7 @@ import java.util.List;
public class RifleAmmoBox extends AmmoSupplierItem { public class RifleAmmoBox extends AmmoSupplierItem {
public RifleAmmoBox() { public RifleAmmoBox() {
super(GunInfo.Type.RIFLE, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(GunInfo.Type.RIFLE, 30, new Item.Properties());
} }
@Override @Override

View file

@ -1,21 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity; 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 class ShieldCell extends Item {
public ShieldCell() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -1,22 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.tools.GunInfo; import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class ShotgunAmmo extends AmmoSupplierItem {
public ShotgunAmmo() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -10,7 +10,7 @@ import java.util.List;
public class ShotgunAmmoBox extends AmmoSupplierItem { public class ShotgunAmmoBox extends AmmoSupplierItem {
public ShotgunAmmoBox() { 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 @Override

View file

@ -1,22 +1,11 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.mcreator.superbwarfare.tools.GunInfo; import net.mcreator.superbwarfare.tools.GunInfo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class SniperAmmo extends AmmoSupplierItem {
public SniperAmmo() { 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<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }

View file

@ -10,7 +10,7 @@ import java.util.List;
public class SniperAmmoBox extends AmmoSupplierItem { public class SniperAmmoBox extends AmmoSupplierItem {
public SniperAmmoBox() { public SniperAmmoBox() {
super(GunInfo.Type.SNIPER, 12, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(GunInfo.Type.SNIPER, 12, new Item.Properties());
} }
@Override @Override

View file

@ -1,21 +1,10 @@
package net.mcreator.superbwarfare.item.common.ammo; package net.mcreator.superbwarfare.item.common.ammo;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item; 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 class TaserElectrode extends Item {
public TaserElectrode() { public TaserElectrode() {
super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); super(new Item.Properties());
} }
@Override
public void appendHoverText(ItemStack itemstack, Level world, List<Component> list, TooltipFlag flag) {
super.appendHoverText(itemstack, world, list, flag);
}
} }