From 2bae7fee671a9bb088393e7bca171c20fe08264a Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Tue, 4 Aug 2026 23:22:16 +0800 Subject: [PATCH] v1.7.2 --- .../terraria/item/accessory/RangerEmblem.java | 2 +- .../terraria/item/accessory/SorcererEmblem.java | 2 +- .../terraria/item/accessory/WarriorEmblem.java | 2 +- .../terraria/item/effect/DamageModifier.java | 8 ++++++++ .../item/effect/MagicDamageModifier.java | 2 +- .../item/effect/MeleeDamageModifier.java | 2 +- .../item/effect/RangedDamageModifier.java | 2 +- .../terraria/item/weapon/MagicWeapon.java | 2 +- .../terraria/item/weapon/MeleeWeapon.java | 2 +- .../terraria/item/weapon/RangedWeapon.java | 2 +- .../com/lzxnone/terraria/item/weapon/Weapon.java | 16 ++++++++++++++++ .../com/lzxnone/terraria/utils/DamageUtil.java | 8 +++----- 12 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/item/effect/DamageModifier.java diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java index 22f2447..3e61ab7 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java @@ -30,7 +30,7 @@ public class RangerEmblem extends AccessoryItem implements RangedDamageModifier 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(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java index cf8461d..98c1ee5 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java @@ -30,7 +30,7 @@ public class SorcererEmblem extends AccessoryItem implements MagicDamageModifier 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(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java index d584c3e..4c85f39 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java @@ -37,7 +37,7 @@ public class WarriorEmblem extends AccessoryItem implements MeleeDamageModifier 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(); } diff --git a/src/main/java/com/lzxnone/terraria/item/effect/DamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/DamageModifier.java new file mode 100644 index 0000000..6f0d71e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/DamageModifier.java @@ -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); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java index b3af684..4225574 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java @@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; public interface MagicDamageModifier { - double getMagicDamageModifier(ItemStack stack, LivingEntity entity); + double getMagicDamageMultiplier(ItemStack stack, LivingEntity entity); } diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java index f65a1c1..60b03ee 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java @@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; public interface MeleeDamageModifier { - double getMeleeDamageModifier(ItemStack stack, LivingEntity entity); + double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity); } diff --git a/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java index 7006cad..c9d53ac 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java @@ -4,5 +4,5 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; public interface RangedDamageModifier { - double getRangedDamageModifier(ItemStack stack, LivingEntity entity); + double getRangedDamageMultiplier(ItemStack stack, LivingEntity entity); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index 105a909..e41fddd 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -79,7 +79,7 @@ public class MagicWeapon extends Weapon { double[] multiplier = {1.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { if(accessory instanceof MagicDamageModifier modifier) { - multiplier[0] *= modifier.getMagicDamageModifier(accessoryStack, entity); + multiplier[0] *= modifier.getMagicDamageMultiplier(accessoryStack, entity); } }); finalDamage *= multiplier[0]; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java index 2a0c7fa..0f09388 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java @@ -21,7 +21,7 @@ public class MeleeWeapon extends Weapon { double[] multiplier = {1.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { if(accessory instanceof MeleeDamageModifier modifier) { - multiplier[0] *= modifier.getMeleeDamageModifier(accessoryStack, entity); + multiplier[0] *= modifier.getMeleeDamageMultiplier(accessoryStack, entity); } }); finalDamage *= multiplier[0]; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java index 7e327a0..0062ecb 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -62,7 +62,7 @@ public class RangedWeapon extends Weapon { double[] multiplier = {1.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { if(accessory instanceof RangedDamageModifier modifier) { - multiplier[0] *= modifier.getRangedDamageModifier(accessoryStack, entity); + multiplier[0] *= modifier.getRangedDamageMultiplier(accessoryStack, entity); } }); finalDamage *= multiplier[0]; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java index 4add9d9..98d5623 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java @@ -1,5 +1,8 @@ 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.registries.Registries; import net.minecraft.resources.ResourceKey; @@ -25,6 +28,19 @@ public class Weapon extends Item { 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 public boolean canAttackBlock(BlockState state, Level level, BlockPos pos, Player player) { return false; diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index afac42f..ee48f61 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -9,10 +9,7 @@ import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; -import com.lzxnone.terraria.item.weapon.MagicWeapon; -import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.item.weapon.RangedWeapon; -import com.lzxnone.terraria.item.weapon.SummonWeapon; +import com.lzxnone.terraria.item.weapon.*; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; 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 knockbackLevel = (float) player.getAttributeValue(Attributes.ATTACK_KNOCKBACK); // - //应用附魔 + //应用 + finalDamage = Weapon.applyDamageBonus(itemSource, player, finalDamage); if(category == DamageCategory.MELEE && !itemSource.isEmpty()) { finalDamage = EnchantmentHelper.modifyDamage(serverLevel, itemSource, target, source, finalDamage); finalDamage = MeleeWeapon.applyMeleeDamageBonus(itemSource, player, finalDamage);