优化taser逻辑

This commit is contained in:
17146 2024-06-10 00:19:46 +08:00
parent b6dee62576
commit 48c0d95a91
3 changed files with 3 additions and 11 deletions

View file

@ -36,11 +36,6 @@ public class TaserBulletProjectileEntity extends ThrowableItemProjectile {
return this;
}
public TaserBulletProjectileEntity volt(int volt) {
this.volt = volt;
return this;
}
public TaserBulletProjectileEntity(EntityType<? extends TaserBulletProjectileEntity> type, Level world) {
super(type, world);
}

View file

@ -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;
}

View file

@ -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()) {