This commit is contained in:
LZX committed 2026-08-04 23:22:16 +08:00
1 parent 6b8a58b832
commit 2bae7fee67
12 files changed
+36 -14

No files matched your search

@@ -30,7 +30,7 @@ public class RangerEmblem extends AccessoryItem implements RangedDamageModifier
super(new Item.Properties().stacksTo(1)); super(new Item.Properties().stacksTo(1));
} }
public double getRangedDamageModifier(ItemStack stack, LivingEntity entity) { public double getRangedDamageMultiplier(ItemStack stack, LivingEntity entity) {
return RANGED_DAMAGE_MULTIPLIER.get(); return RANGED_DAMAGE_MULTIPLIER.get();
} }
@@ -30,7 +30,7 @@ public class SorcererEmblem extends AccessoryItem implements MagicDamageModifier
super(new Item.Properties().stacksTo(1)); super(new Item.Properties().stacksTo(1));
} }
public double getMagicDamageModifier(ItemStack stack, LivingEntity entity) { public double getMagicDamageMultiplier(ItemStack stack, LivingEntity entity) {
return MAGIC_DAMAGE_MULTIPLIER.get(); return MAGIC_DAMAGE_MULTIPLIER.get();
} }
@@ -37,7 +37,7 @@ public class WarriorEmblem extends AccessoryItem implements MeleeDamageModifier
super(new Item.Properties().stacksTo(1)); super(new Item.Properties().stacksTo(1));
} }
public double getMeleeDamageModifier(ItemStack stack, LivingEntity entity) { public double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity) {
return MELEE_DAMAGE_MULTIPLIER.get(); return MELEE_DAMAGE_MULTIPLIER.get();
} }
@@ -0,0 +1,8 @@
package com.lzxnone.terraria.item.effect;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
public interface DamageModifier {
double getDamageMultiplier(ItemStack stack, LivingEntity entity);
}
@@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
public interface MagicDamageModifier { public interface MagicDamageModifier {
double getMagicDamageModifier(ItemStack stack, LivingEntity entity); double getMagicDamageMultiplier(ItemStack stack, LivingEntity entity);
} }
@@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
public interface MeleeDamageModifier { public interface MeleeDamageModifier {
double getMeleeDamageModifier(ItemStack stack, LivingEntity entity); double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity);
} }
@@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
public interface RangedDamageModifier { public interface RangedDamageModifier {
double getRangedDamageModifier(ItemStack stack, LivingEntity entity); double getRangedDamageMultiplier(ItemStack stack, LivingEntity entity);
} }
@@ -79,7 +79,7 @@ public class MagicWeapon extends Weapon {
double[] multiplier = {1.0D}; double[] multiplier = {1.0D};
AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> {
if(accessory instanceof MagicDamageModifier modifier) { if(accessory instanceof MagicDamageModifier modifier) {
multiplier[0] *= modifier.getMagicDamageModifier(accessoryStack, entity); multiplier[0] *= modifier.getMagicDamageMultiplier(accessoryStack, entity);
} }
}); });
finalDamage *= multiplier[0]; finalDamage *= multiplier[0];
@@ -21,7 +21,7 @@ public class MeleeWeapon extends Weapon {
double[] multiplier = {1.0D}; double[] multiplier = {1.0D};
AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> {
if(accessory instanceof MeleeDamageModifier modifier) { if(accessory instanceof MeleeDamageModifier modifier) {
multiplier[0] *= modifier.getMeleeDamageModifier(accessoryStack, entity); multiplier[0] *= modifier.getMeleeDamageMultiplier(accessoryStack, entity);
} }
}); });
finalDamage *= multiplier[0]; finalDamage *= multiplier[0];
@@ -62,7 +62,7 @@ public class RangedWeapon extends Weapon {
double[] multiplier = {1.0D}; double[] multiplier = {1.0D};
AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> {
if(accessory instanceof RangedDamageModifier modifier) { if(accessory instanceof RangedDamageModifier modifier) {
multiplier[0] *= modifier.getRangedDamageModifier(accessoryStack, entity); multiplier[0] *= modifier.getRangedDamageMultiplier(accessoryStack, entity);
} }
}); });
finalDamage *= multiplier[0]; finalDamage *= multiplier[0];
@@ -1,5 +1,8 @@
package com.lzxnone.terraria.item.weapon; package com.lzxnone.terraria.item.weapon;
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
import com.lzxnone.terraria.item.effect.DamageModifier;
import com.lzxnone.terraria.item.effect.MeleeDamageModifier;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
@@ -25,6 +28,19 @@ public class Weapon extends Item {
this.enchantmentValue = 0; this.enchantmentValue = 0;
} }
public static float applyDamageBonus(ItemStack stack, LivingEntity entity, float damage) {
double finalDamage = damage;
//饰品
double[] multiplier = {1.0D};
AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> {
if(accessory instanceof DamageModifier modifier) {
multiplier[0] *= modifier.getDamageMultiplier(accessoryStack, entity);
}
});
finalDamage *= multiplier[0];
return (float)Math.max(0.0D, finalDamage);
}
@Override @Override
public boolean canAttackBlock(BlockState state, Level level, BlockPos pos, Player player) { public boolean canAttackBlock(BlockState state, Level level, BlockPos pos, Player player) {
return false; return false;
@@ -9,10 +9,7 @@ import com.lzxnone.terraria.entity.beam.SwordBeam;
import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.projectile.StaticProjectile;
import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.BeeSummon;
import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummon;
import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.item.weapon.*;
import com.lzxnone.terraria.item.weapon.MeleeWeapon;
import com.lzxnone.terraria.item.weapon.RangedWeapon;
import com.lzxnone.terraria.item.weapon.SummonWeapon;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
@@ -77,7 +74,8 @@ public class DamageUtil {
float finalDamage = category == DamageCategory.REAL ? Math.max(0.0F, damage) : applyPlayerDamageEffects(player, damage); float finalDamage = category == DamageCategory.REAL ? Math.max(0.0F, damage) : applyPlayerDamageEffects(player, damage);
float knockbackLevel = (float) player.getAttributeValue(Attributes.ATTACK_KNOCKBACK); float knockbackLevel = (float) player.getAttributeValue(Attributes.ATTACK_KNOCKBACK);
// //
//应用附魔 //应用
finalDamage = Weapon.applyDamageBonus(itemSource, player, finalDamage);
if(category == DamageCategory.MELEE && !itemSource.isEmpty()) { if(category == DamageCategory.MELEE && !itemSource.isEmpty()) {
finalDamage = EnchantmentHelper.modifyDamage(serverLevel, itemSource, target, source, finalDamage); finalDamage = EnchantmentHelper.modifyDamage(serverLevel, itemSource, target, source, finalDamage);
finalDamage = MeleeWeapon.applyMeleeDamageBonus(itemSource, player, finalDamage); finalDamage = MeleeWeapon.applyMeleeDamageBonus(itemSource, player, finalDamage);