From 48c0d95a9141e9afe2cfadd0a39d621bdf3aeb83 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 10 Jun 2024 00:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96taser=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/entity/TaserBulletProjectileEntity.java | 5 ----- src/main/java/net/mcreator/target/item/gun/Taser.java | 6 ++---- .../net/mcreator/target/procedures/TaserfireProcedure.java | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java b/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java index aa8367c5f..945d5b7be 100644 --- a/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/TaserBulletProjectileEntity.java @@ -36,11 +36,6 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile { return this; } - public TaserBulletProjectileEntity volt(int volt) { - this.volt = volt; - return this; - } - public TaserBulletProjectileEntity(EntityType type, Level world) { super(type, world); } diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 2325c0e25..4f16f9928 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -28,7 +28,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; 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; @@ -246,13 +245,12 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { } @Override - public int getEnchantmentValue() { + public int getEnchantmentValue(ItemStack stack) { return 15; } @Override - public boolean isEnchantable(ItemStack stack) - { + public boolean isEnchantable(ItemStack stack) { return true; } diff --git a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java index 32155f2ef..3c3ea1167 100644 --- a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java @@ -14,7 +14,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.EnchantmentHelper; -import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; // TODO 内联这个类 @@ -40,7 +39,7 @@ public class TaserfireProcedure { serverPlayer.level().playSound(null, serverPlayer.getOnPos(), TargetModSounds.TASER_FIRE_3P.get(), SoundSource.PLAYERS, 1, 1); } - int volt = EnchantmentHelper.getItemEnchantmentLevel(TargetModEnchantments.VOLT_OVERLOAD.get(), stack); + int volt = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.VOLT_OVERLOAD.get(), stack); Level level = entity.level(); if (!level.isClientSide()) {