From 1fe3058aacc93fdec4510bcbfe23d689a4187912 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Sun, 12 Jul 2026 22:34:16 +0800 Subject: [PATCH] v1.3.0 --- src/main/java/com/lzxnone/terraria/Config.java | 7 +++++++ .../com/lzxnone/terraria/item/weapon/melee/Terragrim.java | 4 ++-- .../lzxnone/terraria/particle/SolarExplosionParticle.java | 2 +- src/main/java/com/lzxnone/terraria/utils/DamageUtil.java | 1 + src/main/resources/assets/lzxnoneterraria/lang/en_us.json | 2 ++ src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json | 2 ++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lzxnone/terraria/Config.java b/src/main/java/com/lzxnone/terraria/Config.java index d828925..dd25a6c 100644 --- a/src/main/java/com/lzxnone/terraria/Config.java +++ b/src/main/java/com/lzxnone/terraria/Config.java @@ -76,6 +76,7 @@ public class Config { public static final ModConfigSpec.DoubleValue TERRAGRIM_HIT_RANGE; public static final ModConfigSpec.DoubleValue TERRAGRIM_DAMAGE; + public static final ModConfigSpec.IntValue TERRAGRIM_ROTATE_RANGE; public static final ModConfigSpec.IntValue EXCALIBUR_ROTATE_RANGE; public static final ModConfigSpec.IntValue EXCALIBUR_MAX_HIT_COUNT; @@ -197,6 +198,7 @@ public class Config { public static double terragrimHitRange; public static double terragrimDamage; + public static int terragrimRotateRange; public static int excaliburRotateRange; public static int excaliburMaxHitCount; @@ -530,6 +532,10 @@ public class Config { .comment("伤害") .defineInRange("terragrim_damage", 0.25, 0, 2147483647.0); + TERRAGRIM_ROTATE_RANGE = builder + .comment("刀光偏转角范围") + .defineInRange("terragrim_rotate_range", 45, 0, 90); + builder.pop(); @@ -811,6 +817,7 @@ public class Config { muramasaBeamDamage = MURAMASA_BEAM_DAMAGE.get(); terragrimHitRange = TERRAGRIM_HIT_RANGE.get(); terragrimDamage = TERRAGRIM_DAMAGE.get(); + terragrimRotateRange = TERRAGRIM_ROTATE_RANGE.get(); excaliburRotateRange = EXCALIBUR_ROTATE_RANGE.get(); excaliburMaxHitCount = EXCALIBUR_MAX_HIT_COUNT.get(); excaliburDamage = EXCALIBUR_DAMAGE.get(); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java index 8f2fee2..0a70b3c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java @@ -109,7 +109,7 @@ public class Terragrim extends SwordItem { int rotate = summon.getEntityData().get(StaticSummon.RZP); Quaternionf rotation = new Quaternionf() - .fromAxisAngleRad(dirs[0], (float) Math.toRadians(Math.abs(dirs[0].y) > 0.999 ? 0 : rotate)); + .fromAxisAngleRad(dirs[0], (float) Math.toRadians(rotate)); poseStack.mulPose(rotation); float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); @@ -191,7 +191,7 @@ public class Terragrim extends SwordItem { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TERRAGRIM_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * 45)); + summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * Config.terragrimRotateRange)); summon.getEntityData().set(StaticSummon.LIFETIME, 1); summon.getEntityData().set(StaticSummon.GLOW, true); diff --git a/src/main/java/com/lzxnone/terraria/particle/SolarExplosionParticle.java b/src/main/java/com/lzxnone/terraria/particle/SolarExplosionParticle.java index 8424e2e..34dff94 100644 --- a/src/main/java/com/lzxnone/terraria/particle/SolarExplosionParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/SolarExplosionParticle.java @@ -23,7 +23,7 @@ public class SolarExplosionParticle extends TextureSheetParticle { this.baseSize = 0.5F; this.quadSize = baseSize; - this.lifetime = 20; + this.lifetime = 10; this.spriteSet = spriteSet; this.setSpriteFromAge(this.spriteSet); diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index a60c15c..d6a3e5d 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -5,6 +5,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 5c28397..d9a4db5 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -165,6 +165,8 @@ "lzxnoneterraria.configuration.terragrim_hit_range.tooltip": "AABB collision box range", "lzxnoneterraria.configuration.terragrim_damage": "Damage", "lzxnoneterraria.configuration.terragrim_damage.tooltip": "Damage per tick", + "lzxnoneterraria.configuration.terragrim_rotate_range": "Blade Rotate Range", + "lzxnoneterraria.configuration.terragrim_rotate_range.tooltip": "Blade rotation angle range", "lzxnoneterraria.configuration.excalibur_settings": "Excalibur Settings", "lzxnoneterraria.configuration.excalibur_rotate_range": "Blade Rotate Range", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 7329dbf..3274d73 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -165,6 +165,8 @@ "lzxnoneterraria.configuration.terragrim_hit_range.tooltip": "AABB 碰撞箱半边长", "lzxnoneterraria.configuration.terragrim_damage": "伤害", "lzxnoneterraria.configuration.terragrim_damage.tooltip": "每刻造成的伤害", + "lzxnoneterraria.configuration.terragrim_rotate_range": "刀光偏转角范围", + "lzxnoneterraria.configuration.terragrim_rotate_range.tooltip": "刀光旋转角度范围", "lzxnoneterraria.configuration.excalibur_settings": "断钢剑 设置", "lzxnoneterraria.configuration.excalibur_rotate_range": "刀光偏转角范围",