From 2e980cecba7890775deec8bf6f31e7372f2ccf38 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Tue, 1 Sep 2026 17:05:38 +0800 Subject: [PATCH] v1.8.3 --- gradle.properties | 2 +- .../ClientStaticSummonRenderBehaviors.java | 1 + .../client/item/magic/ClientArcSurge.java | 125 ++++++ .../ModCreativeModeTabs.java | 1 + .../dynamic_lights/MEntityLuminance.java | 4 +- .../entity/summon/StaticSummonBehaviors.java | 2 + .../com/lzxnone/terraria/item/ModItems.java | 1 + .../terraria/item/weapon/magic/ArcSurge.java | 419 ++++++++++++++++++ .../terraria/mixin/ItemInHandRenderMixin.java | 6 +- .../terraria/ui/config/ConfigList.java | 2 + .../assets/lzxnoneterraria/lang/en_us.json | 11 + .../assets/lzxnoneterraria/lang/zh_cn.json | 11 + .../models/item/arc_surge.json | 6 + .../textures/item/arc_surge.png | Bin 0 -> 259 bytes .../tags/item/magic_weapons.json | 3 +- 15 files changed, 588 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/magic/ClientArcSurge.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/arc_surge.json create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/arc_surge.png diff --git a/gradle.properties b/gradle.properties index b0a8efa..b0b40d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.8.2 +mod_version=1.8.3 ## The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java index a72e89a..c495849 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java @@ -67,6 +67,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.STARDUST_CELL_STAFF, ClientStardustCellStaff.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.STARDUST_CELL_STUCK_PROJECTILE, ClientStardustCellStaff.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.NIGHTGLOW_PROJECTILE, ClientNightglow.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.ARC_SURGE_LIGHTNING, ClientArcSurge.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/item/magic/ClientArcSurge.java b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientArcSurge.java new file mode 100644 index 0000000..524a5e2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientArcSurge.java @@ -0,0 +1,125 @@ +package com.lzxnone.terraria.client.item.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.item.weapon.magic.ArcSurge; +import com.lzxnone.terraria.utils.MathUtil; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; +import org.joml.Matrix4f; +import org.joml.Vector3f; + +import java.util.List; + +public class ClientArcSurge { + public static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/vfx/normal_trail.png"); + public static final int RING = 8; + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + if(customData.isEmpty()) return; + + int age = summon.getEntityData().get(StaticSummon.AGE); + int lifetime = summon.getEntityData().get(StaticSummon.LIFETIME); + if(lifetime <= 0) return; + float lifeRatio = Mth.clamp((age + partialTick) / (float) lifetime, 0.0F, 1.0F); + if(lifeRatio > 0.999F) return; + + float alpha = 1.0F - lifeRatio; + float radius = ArcSurge.LIGHTNING_RADIUS * (1.0F - lifeRatio); + + List> branches = ArcSurge.getAllLightningBranches(customData, summon.level(), summon); + if(branches.isEmpty()) return; + + Vec3 entWorldPos = new Vec3( + Mth.lerp(partialTick, summon.xo, summon.getX()), + Mth.lerp(partialTick, summon.yo, summon.getY()), + Mth.lerp(partialTick, summon.zo, summon.getZ()) + ); + + VertexConsumer buffer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(RES)); + Matrix4f matrix = poseStack.last().pose(); + + for(List branch : branches) { + // 外红层(Outer Red Layer - 主泛光与外圈微光,线性收缩至末端半径为 0) + renderTube(buffer, matrix, entWorldPos, branch, radius * 1.0F, alpha * 0.7F, 1.0F, 0.15F, 0.15F, true); + renderTube(buffer, matrix, entWorldPos, branch, radius * 1.3F, alpha * 0.3F, 0.85F, 0.05F, 0.1F, true); + + // 内白芯(Inner White Core - 纯白高亮高能核心,线性收缩至末端半径为 0) + renderTube(buffer, matrix, entWorldPos, branch, radius * 0.45F, alpha * 1.0F, 1.0F, 1.0F, 1.0F, true); + } + } + }; + + public static void renderTube(VertexConsumer buffer, Matrix4f matrix, Vec3 entityWorldPos, + List points, float radius, float alpha, float colorR, float colorG, float colorB, boolean linear) { + int n = points.size(); + if(n < 2) return; + + Vector3f[][] oriDirs = new Vector3f[n][3]; + Vec3[] up = new Vec3[n], right = new Vec3[n]; + for(int i = 0; i < n; i++) { + if(i == n - 1) oriDirs[i] = MathUtil.computeCoordinateSystem(points.get(n - 1).subtract(points.get(n - 2)).toVector3f(), 0); + else oriDirs[i] = MathUtil.computeCoordinateSystem(points.get(i + 1).subtract(points.get(i)).toVector3f(), 0); + up[i] = MathUtil.toVec3(oriDirs[i][1]); + right[i] = MathUtil.toVec3(oriDirs[i][2]); + } + + for(int i = 0; i < n - 1; i++) { + float r0 = linear ? radius * (1.0F - (float) i / (float) (n - 1)) : radius; + float r1 = linear ? radius * (1.0F - (float) (i + 1) / (float) (n - 1)) : radius; + if(r0 <= 0.0001F && r1 <= 0.0001F) continue; + Vec3 N = right[i], B = up[i], N1 = right[i + 1], B1 = up[i + 1]; + Vec3 P = points.get(i), P1 = points.get(i + 1); + for(int j = 0; j < RING; j++) { + float a0 = (float) (2.0 * Math.PI * j / RING); + float a1 = (float) (2.0 * Math.PI * (j + 1) / RING); + Vec3 d0 = computeRingDir(N, B, a0); + Vec3 d1 = computeRingDir(N1, B1, a0); + Vec3 d0b = computeRingDir(N, B, a1); + Vec3 d1b = computeRingDir(N1, B1, a1); + Vec3 v0 = P.add(d0.scale(r0)); + Vec3 v1 = P1.add(d1.scale(r1)); + Vec3 v2 = P1.add(d1b.scale(r1)); + Vec3 v3 = P.add(d0b.scale(r0)); + for(int k = 0; k < 3; k++) { + writeVert(buffer, matrix, entityWorldPos, v0, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v1, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v2, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v3, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + } + } + } + } + + public static Vec3 computeRingDir(Vec3 n, Vec3 b, float ang) { + return n.scale(Math.cos(ang)).add(b.scale(Math.sin(ang))); + } + + public static void writeVert(VertexConsumer buffer, Matrix4f matrix, Vec3 entityWorldPos, + Vec3 worldPos, float u, float v, float alpha, float colorR, float colorG, float colorB) { + double lx = worldPos.x - entityWorldPos.x; + double ly = worldPos.y - entityWorldPos.y; + double lz = worldPos.z - entityWorldPos.z; + + buffer.addVertex(matrix, (float) lx, (float) ly, (float) lz) + .setColor(colorR, colorG, colorB, alpha) + .setUv(u, v) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + } +} diff --git a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java index cb0a275..45fe25d 100644 --- a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java @@ -60,6 +60,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.STELLAR_TUNE.get()); output.accept(ModItems.BUBBLE_GUN.get()); output.accept(ModItems.NIGHTGLOW.get()); + output.accept(ModItems.ARC_SURGE.get()); output.accept(ModItems.MANA_CRYSTAL.get()); output.accept(ModItems.LESSER_MANA_POTION.get()); output.accept(ModItems.MANA_POTION.get()); diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 8db77ae..f94024e 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.dynamic_lights; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.client.config.RenderConfigs; import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.beam.SwordBeamBehaviors; @@ -73,7 +72,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.MANA_STAR, StaticSummonBehaviors.BETSY_WRATH, StaticSummonBehaviors.NEBULA_BLAZE, - StaticSummonBehaviors.NEBULA_ARCANUM_PROJECTILE -> { + StaticSummonBehaviors.NEBULA_ARCANUM_PROJECTILE, + StaticSummonBehaviors.ARC_SURGE_LIGHTNING -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index 0633f50..e0a584a 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -62,6 +62,7 @@ public class StaticSummonBehaviors { public static final String POSSESSION = "possession"; public static final String POSSESSION_VISION = "possession_vision"; public static final String NIGHTGLOW_PROJECTILE = "nightglow_projectile"; + public static final String ARC_SURGE_LIGHTNING = "arc_surge_lightning"; //通用子弹实体 public static final String MUSKET_BALL = "musket_ball"; @@ -126,6 +127,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(POSSESSION, Whip.SUMMON_BEHAVIOR); BEHAVIORS.put(POSSESSION_VISION, Possession.SUMMON_BEHAVIOR); BEHAVIORS.put(NIGHTGLOW_PROJECTILE, Nightglow.SUMMON_BEHAVIOR); + BEHAVIORS.put(ARC_SURGE_LIGHTNING, ArcSurge.SUMMON_BEHAVIOR); BEHAVIORS.put(MUSKET_BALL, MusketBall.SUMMON_BEHAVIOR); BEHAVIORS.put(METEOR_SHOT, MeteorShot.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 5417e39..663c8ea 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -63,6 +63,7 @@ public class ModItems { public static final DeferredItem STELLAR_TUNE = ITEMS.register("stellar_tune", StellarTune::new); public static final DeferredItem BUBBLE_GUN = ITEMS.register("bubble_gun", BubbleGun::new); public static final DeferredItem NIGHTGLOW = ITEMS.register("nightglow", Nightglow::new); + public static final DeferredItem ARC_SURGE = ITEMS.register("arc_surge", ArcSurge::new); //远程武器 public static final DeferredItem MUSKET = ITEMS.register("musket", Musket::new); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java new file mode 100644 index 0000000..d14c6ec --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java @@ -0,0 +1,419 @@ +package com.lzxnone.terraria.item.weapon.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.ParticleUtil; +import com.lzxnone.terraria.utils.SearchUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Quaternionf; +import org.joml.Vector3f; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Predicate; + +public class ArcSurge extends MagicWeapon { + // 基础属性配置 + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.arc_surge.damage", "arc_surge_damage", 18.0F, 0.0F, 8388600.0F); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.arc_surge.mana_consume", "arc_surge_mana_consume", 12.0D, 0.0D, 10000.0D); + + // 索敌与电弧生成配置参数 + public static final ConfigInt MAX_EXTRA_ARCS = new ConfigInt("weapon.arc_surge.max_extra_arcs", "arc_surge_max_extra_arcs", 2, 0, 100); + public static final ConfigDouble SEARCH_RANGE = new ConfigDouble("weapon.arc_surge.search_range", "arc_surge_search_range", 32.0D, 0.0D, 256.0D); + public static final ConfigDouble MAX_ANGLE = new ConfigDouble("weapon.arc_surge.max_angle", "arc_surge_max_angle", 60.0D, 0.0D, 180.0D); + + // 分形闪电形状与生命周期参数 + public static final int LIGHTNING_DEPTH = 5; // 分形细分递归深度 + public static final float LIGHTNING_JITTER = 0.18F; // 闪电节点随机扰动因子 + public static final int LIGHTNING_LIFETIME = 8; // 闪电实体存活 tick 数 + public static final int SUB_BRANCH_COUNT = 2; // 次级分叉数量 + public static final float SUB_BRANCH_SPREAD = 0.35F; // 次级分叉散布角 + public static final float SUB_BRANCH_LENGTH_SCALE = 0.5F;// 次级分叉长度比例 + public static final float LIGHTNING_RADIUS = 0.08F; // 闪电半径 + public static final double COLLISION_INFLATE = 0.35D; // 碰撞检测膨胀大小 + + public static final DustParticleOptions DUST_PARTICLE = new DustParticleOptions( + 0.075f, 0.2f, 25, true, new Vector3f[]{ + new Vector3f(1.0F, 0.15F, 0.15F), + new Vector3f(0.9F, 0.05F, 0.1F) + } + ); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE, MANA_CONSUME, MAX_EXTRA_ARCS, SEARCH_RANGE, MAX_ANGLE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "arc_surge", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/arc_surge.png"), + Component.translatable("item.lzxnoneterraria.arc_surge"), + CONFIG_DATA + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + if(summon.level().isClientSide()) return; + + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + List> branches = getAllLightningBranches(customData, summon.level(), summon); + if(branches.isEmpty()) return; + + // 收集本次判定命中的实体,防止同一道电弧在单 tick 内对同一实体重复造成多次伤害 + Set hitEntities = new HashSet<>(); + Predicate targetFilter = FilterUtil.createTargetFilter(summon, summon.getOwner()); + ServerLevel serverLevel = (ServerLevel) summon.level(); + + for(List branch : branches) { + int n = branch.size(); + for(int i = 0; i < n - 1; i++) { + Vec3 p0 = branch.get(i); + Vec3 p1 = branch.get(i + 1); + + // 每条线段的中点都有 0.2 的概率生成一个红色的 dust 粒子 + if(summon.getRandom().nextFloat() < 0.2F) { + Vec3 mid = p0.add(p1).scale(0.5D); + ParticleUtil.addParticles( + serverLevel, + DUST_PARTICLE, + mid, + new Vec3(0.05D, 0.05D, 0.05D), + 0.02D, + 1 + ); + } + + AABB segmentBox = new AABB(p0, p1).inflate(COLLISION_INFLATE); + List candidates = summon.level().getEntitiesOfClass(Entity.class, segmentBox, targetFilter); + + for(Entity target : candidates) { + if(hitEntities.add(target)) { + AABB targetBox = target.getBoundingBox().inflate(COLLISION_INFLATE); + if(targetBox.clip(p0, p1).isPresent() || targetBox.contains(p0) || targetBox.contains(p1)) { + DamageUtil.magicAttack( + summon, + target, + summon.getEntityData().get(StaticSummon.STACK_SOURCE), + DAMAGE.get(), + 0.2F, + 10 + ); + } + } + } + } + } + } + + @Override + public void onDied(StaticSummon summon) { + if(!summon.level().isClientSide()) summon.discard(); + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + double m = SEARCH_RANGE.get() + 8.0D; + Vec3 p = summon.position(); + return new AABB(p.x - m, p.y - m, p.z - m, p.x + m, p.y + m, p.z + m); + } + }; + + public ArcSurge() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 10; + } + + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyMagicDamageBonus(weaponStack, entity, damage); + } + + @Override + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + return MANA_CONSUME.get(); + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + + player.playNotifySound(ModSounds.BEAM.get(), SoundSource.PLAYERS, 1.5F, 1.2F); + + double searchRange = SEARCH_RANGE.get(); + double maxAngle = MAX_ANGLE.get(); + int maxExtraArcs = MAX_EXTRA_ARCS.get(); + + // 1. 计算主电弧的起点(玩家碰撞箱中心)与终点(准星位置) + Vec3 startPos = player.getBoundingBox().getCenter(); + Vec3 mainEndPos = MathUtil.getCrosshairPos(player, level, searchRange, true, true); + + // 2. 搜索玩家指定范围内的敌人 + AABB searchBox = player.getBoundingBox().inflate(searchRange); + List enemies = SearchUtil.searchEnemies(player, player, searchBox); + + Vec3 eyePos = player.getEyePosition(); + Vec3 lookAngle = player.getLookAngle().normalize(); + + // 3. 筛选可视、夹角 <= maxAngle 的有效敌人 + List validTargets = new ArrayList<>(); + for(Entity enemy : enemies) { + if(!enemy.isAlive()) continue; + if(!player.hasLineOfSight(enemy)) continue; + if(enemy.distanceToSqr(player) > searchRange * searchRange) continue; + + Vec3 toEnemy = enemy.getBoundingBox().getCenter().subtract(eyePos); + if(toEnemy.lengthSqr() < 1.0E-4D) continue; + double dot = lookAngle.dot(toEnemy.normalize()); + double angleDeg = Math.toDegrees(Math.acos(Mth.clamp(dot, -1.0D, 1.0D))); + if(angleDeg <= maxAngle) { + validTargets.add(enemy); + } + } + + // 4. 按距玩家距离升序排序 + validTargets.sort(Comparator.comparingDouble(e -> e.distanceToSqr(player))); + + // 5. 最多额外生成 maxExtraArcs 道电弧 + int extraCount = Math.min(maxExtraArcs, validTargets.size()); + + // 6. 构建并保存同步数据到 customData + CompoundTag customData = new CompoundTag(); + long seed = player.getRandom().nextLong(); + customData.putLong("seed", seed); + + customData.putDouble("startX", startPos.x); + customData.putDouble("startY", startPos.y); + customData.putDouble("startZ", startPos.z); + customData.putDouble("endX", mainEndPos.x); + customData.putDouble("endY", mainEndPos.y); + customData.putDouble("endZ", mainEndPos.z); + + customData.putInt("extraCount", extraCount); + for(int i = 0; i < extraCount; i++) { + Entity target = validTargets.get(i); + Vec3 targetCenter = target.getBoundingBox().getCenter(); + customData.putDouble("extraEndX_" + i, targetCenter.x); + customData.putDouble("extraEndY_" + i, targetCenter.y); + customData.putDouble("extraEndZ_" + i, targetCenter.z); + customData.putLong("extraSeed_" + i, player.getRandom().nextLong()); + } + + // 7. 生成 StaticSummon 实体 + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(startPos); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.ARC_SURGE_LIGHTNING); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, LIGHTNING_LIFETIME); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + summon.setNoGravity(true); + summon.noPhysics = true; + + level.addFreshEntity(summon); + } + + // ================= 分形闪电构建与算法实现 ================= + + /** + * 根据 customData 中的确定性数据构建全部闪电分支(主电弧及其次级分叉,所有额外电弧及其次级分叉) + * 并结合方块与液体射线检测进行打断裁剪 + */ + public static List> getAllLightningBranches(CompoundTag customData, @Nullable Level level, @Nullable Entity summon) { + if(!customData.contains("startX") || !customData.contains("endX") || !customData.contains("seed")) { + return List.of(); + } + + List> allBranches = new ArrayList<>(); + + Vec3 start = new Vec3(customData.getDouble("startX"), customData.getDouble("startY"), customData.getDouble("startZ")); + Vec3 mainEnd = new Vec3(customData.getDouble("endX"), customData.getDouble("endY"), customData.getDouble("endZ")); + long seed = customData.getLong("seed"); + + // 1. 主电弧 + Random mainRand = new Random(seed); + List rawMainBranch = generateBranch(start, mainEnd, mainRand, LIGHTNING_DEPTH, LIGHTNING_JITTER); + List clippedMain = clipBranchWithBlocksAndFluids(rawMainBranch, level, summon); + if(clippedMain.size() >= 2) { + allBranches.add(clippedMain); + // 2. 主电弧次级分叉(仅从裁剪后有效的主路径节点衍生) + addSubBranches(allBranches, clippedMain, start, mainEnd, seed, 0, level, summon); + } + + // 3. 额外电弧 + int extraCount = customData.getInt("extraCount"); + for(int i = 0; i < extraCount; i++) { + if(!customData.contains("extraEndX_" + i)) continue; + Vec3 extraEnd = new Vec3( + customData.getDouble("extraEndX_" + i), + customData.getDouble("extraEndY_" + i), + customData.getDouble("extraEndZ_" + i) + ); + long extraSeed = customData.getLong("extraSeed_" + i); + Random extraRand = new Random(extraSeed); + List rawExtraBranch = generateBranch(start, extraEnd, extraRand, LIGHTNING_DEPTH, LIGHTNING_JITTER); + List clippedExtra = clipBranchWithBlocksAndFluids(rawExtraBranch, level, summon); + if(clippedExtra.size() >= 2) { + allBranches.add(clippedExtra); + // 4. 额外电弧次级分叉 + addSubBranches(allBranches, clippedExtra, start, extraEnd, extraSeed, i + 1, level, summon); + } + } + + return allBranches; + } + + public static List> getAllLightningBranches(CompoundTag customData) { + return getAllLightningBranches(customData, null, null); + } + + /** + * 逐线段检测方块与液体碰撞:若碰撞则将该线段终点截断至碰撞点,并丢弃后续所有线段 + */ + public static List clipBranchWithBlocksAndFluids(List rawBranch, @Nullable Level level, @Nullable Entity summon) { + if(rawBranch.size() < 2 || level == null) return rawBranch; + + List clipped = new ArrayList<>(); + clipped.add(rawBranch.getFirst()); + + for(int i = 0; i < rawBranch.size() - 1; i++) { + Vec3 p0 = rawBranch.get(i); + Vec3 p1 = rawBranch.get(i + 1); + + BlockHitResult hit = level.clip(new ClipContext( + p0, + p1, + ClipContext.Block.COLLIDER, + ClipContext.Fluid.ANY, + summon + )); + + if(hit.getType() != HitResult.Type.MISS) { + clipped.add(hit.getLocation()); + break; // 击中方块或液体,立即截断并停止后续线段 + }else { + clipped.add(p1); + } + } + return clipped; + } + + private static void addSubBranches( + List> allBranches, + List parentBranch, + Vec3 start, + Vec3 end, + long baseSeed, + int branchIndex, + @Nullable Level level, + @Nullable Entity summon + ) { + if(parentBranch.size() < 3) return; + Vec3 dir = end.subtract(start).normalize(); + double totalLength = start.distanceTo(end); + + for(int s = 0; s < SUB_BRANCH_COUNT; s++) { + Random subRand = new Random(baseSeed + 1000L * (branchIndex + 1) + s); + int nodeIdx = 1 + subRand.nextInt(parentBranch.size() - 2); + Vec3 subStart = parentBranch.get(nodeIdx); + + Vec3 subDir = spreadDir(dir, subRand, SUB_BRANCH_SPREAD); + double subLen = totalLength * SUB_BRANCH_LENGTH_SCALE * (0.6D + subRand.nextDouble() * 0.4D); + Vec3 subEnd = subStart.add(subDir.scale(subLen)); + + List rawSubBranch = generateBranch(subStart, subEnd, subRand, Math.max(1, LIGHTNING_DEPTH - 1), LIGHTNING_JITTER); + List clippedSub = clipBranchWithBlocksAndFluids(rawSubBranch, level, summon); + if(clippedSub.size() >= 2) { + allBranches.add(clippedSub); + } + } + } + + public static List generateBranch(Vec3 start, Vec3 end, Random rand, int depth, float jitter) { + List branch = new ArrayList<>(); + branch.add(start); + subdivide(start, end, depth, jitter, rand, branch); + branch.add(end); + return branch; + } + + private static void subdivide(Vec3 start, Vec3 end, int depth, float jitter, Random rand, List out) { + if(depth <= 0) return; + Vec3 mid = start.add(end).scale(0.5D); + Vec3 seg = end.subtract(start); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(seg.toVector3f(), 0); + mid = getSurfaceRandomPosInRadius(mid, MathUtil.toVec3(dirs[2]), MathUtil.toVec3(dirs[1]), seg.length() * jitter, rand); + subdivide(start, mid, depth - 1, jitter, rand, out); + out.add(mid); + subdivide(mid, end, depth - 1, jitter, rand, out); + } + + public static Vec3 getSurfaceRandomPosInRadius(Vec3 pos, Vec3 axisX, Vec3 axisY, double radius, Random random) { + double s = Math.sqrt(random.nextDouble()); + axisX = axisX.normalize().scale(radius).scale(s); + axisY = axisY.normalize().scale(radius).scale(s); + double rad = Math.PI * 2 * random.nextDouble(); + double cos = Math.cos(rad); + double sin = Math.sin(rad); + return new Vec3( + pos.x + cos * axisX.x + sin * axisY.x, + pos.y + cos * axisX.y + sin * axisY.y, + pos.z + cos * axisX.z + sin * axisY.z + ); + } + + public static Vec3 spreadDir(Vec3 dir, Random rand, float maxAngle) { + float angle = (rand.nextFloat() - 0.5F) * 2.0F * maxAngle; + Vec3 axisV = new Vec3(rand.nextDouble() - 0.5, rand.nextDouble() - 0.5, rand.nextDouble() - 0.5).normalize(); + if(axisV.lengthSqr() < 0.01D) axisV = new Vec3(1, 0, 0); + axisV = axisV.cross(dir).normalize(); + if(axisV.lengthSqr() < 0.01D) axisV = new Vec3(0, 0, 1); + Vector3f d = dir.toVector3f().normalize(); + new Quaternionf().fromAxisAngleRad(axisV.toVector3f().normalize(), angle).transform(d); + return new Vec3(d.x(), d.y(), d.z()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java index 3232c24..107a6b4 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java @@ -62,7 +62,8 @@ public class ItemInHandRenderMixin { poseStack.popPose(); }else if(stack.is(ModItems.ZENITH.get()) || stack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) - || stack.is(ModItems.FIRST_FRACTAL.get())) { + || stack.is(ModItems.FIRST_FRACTAL.get()) + || stack.is(ModItems.ARC_SURGE.get())) { if(player.isUsingItem()) { ItemStack usingStack = player.getUseItem(); if(usingStack.is(stack.getItem())) { @@ -133,7 +134,8 @@ public class ItemInHandRenderMixin { }else if((itemStack.is(ModItems.ZENITH.get()) || itemStack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || itemStack.is(ModItems.FIRST_FRACTAL.get()) - || itemStack.is(ModItems.TERRAGRIM.get())) && entity instanceof Player player) { + || itemStack.is(ModItems.TERRAGRIM.get()) + || itemStack.is(ModItems.ARC_SURGE.get())) && entity instanceof Player player) { if(player.isUsingItem()) { ItemStack usingStack = player.getUseItem(); if(usingStack.is(itemStack.getItem())) { diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index 8996831..3e77930 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -102,6 +102,7 @@ import com.lzxnone.terraria.item.weapon.magic.NebulaArcanum; import com.lzxnone.terraria.item.weapon.magic.NebulaBlaze; import com.lzxnone.terraria.item.weapon.magic.StellarTune; import com.lzxnone.terraria.item.weapon.magic.Nightglow; +import com.lzxnone.terraria.item.weapon.magic.ArcSurge; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; import com.lzxnone.terraria.item.weapon.melee.BloodButcherer; @@ -191,6 +192,7 @@ public class ConfigList { StellarTune.CONFIG_LIST_ITEM, BubbleGun.CONFIG_LIST_ITEM, Nightglow.CONFIG_LIST_ITEM, + ArcSurge.CONFIG_LIST_ITEM, Minishark.CONFIG_LIST_ITEM, FlintlockPistol.CONFIG_LIST_ITEM, Boomstick.CONFIG_LIST_ITEM, diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index edaca79..67c8530 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -45,6 +45,7 @@ "item.lzxnoneterraria.stellar_tune": "Stellar Tune", "item.lzxnoneterraria.bubble_gun": "Bubble Gun", "item.lzxnoneterraria.nightglow": "Nightglow", + "item.lzxnoneterraria.arc_surge": "Arc Surge", "item.lzxnoneterraria.bubble_gun_projectile": "Bubble", "item.lzxnoneterraria.vortex_rocket": "Vortex Rocket", "item.lzxnoneterraria.terraprisma": "Terraprisma", @@ -1125,6 +1126,16 @@ "lzxnoneterraria.configuration.nightglow_chase_speed.tooltip": "Movement speed while chasing enemies", "lzxnoneterraria.configuration.nightglow_target_range": "Targeting Range", "lzxnoneterraria.configuration.nightglow_target_range.tooltip": "Maximum enemy detection and tracking range", + "lzxnoneterraria.configuration.arc_surge_damage": "Damage", + "lzxnoneterraria.configuration.arc_surge_damage.tooltip": "Base magic damage dealt by Arc Surge", + "lzxnoneterraria.configuration.arc_surge_mana_consume": "Mana Cost", + "lzxnoneterraria.configuration.arc_surge_mana_consume.tooltip": "Mana consumed per attack", + "lzxnoneterraria.configuration.arc_surge_max_extra_arcs": "Max Extra Arcs", + "lzxnoneterraria.configuration.arc_surge_max_extra_arcs.tooltip": "Maximum number of extra arcs generated per attack", + "lzxnoneterraria.configuration.arc_surge_search_range": "Search Range", + "lzxnoneterraria.configuration.arc_surge_search_range.tooltip": "Search range for enemy targeting and crosshair raycast (blocks)", + "lzxnoneterraria.configuration.arc_surge_max_angle": "Max Angle", + "lzxnoneterraria.configuration.arc_surge_max_angle.tooltip": "Maximum angle between player's line of sight and enemy for targeting (degrees)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "Kill Mode Cooldown", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 3309a89..71c6f18 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -45,6 +45,7 @@ "item.lzxnoneterraria.stellar_tune": "星星吉他", "item.lzxnoneterraria.bubble_gun": "泡泡枪", "item.lzxnoneterraria.nightglow": "夜光", + "item.lzxnoneterraria.arc_surge": "电弧涌动", "item.lzxnoneterraria.bubble_gun_projectile": "泡泡", "item.lzxnoneterraria.vortex_rocket": "星旋火箭", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", @@ -1125,6 +1126,16 @@ "lzxnoneterraria.configuration.nightglow_chase_speed.tooltip": "飞刃追逐敌人时的移动速度", "lzxnoneterraria.configuration.nightglow_target_range": "寻敌范围", "lzxnoneterraria.configuration.nightglow_target_range.tooltip": "飞刃自动索敌的最大距离", + "lzxnoneterraria.configuration.arc_surge_damage": "伤害", + "lzxnoneterraria.configuration.arc_surge_damage.tooltip": "电弧涌动造成的基础魔法伤害", + "lzxnoneterraria.configuration.arc_surge_mana_consume": "魔力消耗", + "lzxnoneterraria.configuration.arc_surge_mana_consume.tooltip": "每次攻击消耗的魔力值", + "lzxnoneterraria.configuration.arc_surge_max_extra_arcs": "最大额外电弧数", + "lzxnoneterraria.configuration.arc_surge_max_extra_arcs.tooltip": "每次攻击最多可额外生成的电弧数量", + "lzxnoneterraria.configuration.arc_surge_search_range": "索敌距离", + "lzxnoneterraria.configuration.arc_surge_search_range.tooltip": "搜索额外目标敌人及准星检测的有效距离(方块)", + "lzxnoneterraria.configuration.arc_surge_max_angle": "最大索敌夹角", + "lzxnoneterraria.configuration.arc_surge_max_angle.tooltip": "额外电弧锁定时目标与玩家视线方向的最大夹角(度)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "杀戮模式冷却时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/arc_surge.json b/src/main/resources/assets/lzxnoneterraria/models/item/arc_surge.json new file mode 100644 index 0000000..c8110b6 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/arc_surge.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/arc_surge" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/arc_surge.png b/src/main/resources/assets/lzxnoneterraria/textures/item/arc_surge.png new file mode 100644 index 0000000000000000000000000000000000000000..dc50b15bc9a9842737451465dfaf4169090eed2b GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`r!VDxo&t@$IQtAOdA+A9BZEph*yb7?+$;sKH zZ0P0X)g^3}$ZM*hp&>6XZ^5O;&&M~_+06{7l(8hpFPOpM*^M+Hr_0mDF{I*F>8U_o zCIg<9hfxO(>0EKrozoh%qBUwp>t+LPbuPAtt-bp_C+l1Oc6(Q^x>E3$bKi*%D)~ze zEmwB`pyKXhQe}0m^V+99ET(9oEF zT~ga_W!0Pdt#40g8e8Agm^5YXABn4*tbMI_f8uoBJULhOyx?1)s~9|8{an^LB{Ts5 DvvXa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json b/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json index cc2984e..1008451 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json @@ -8,6 +8,7 @@ "lzxnoneterraria:nebula_blaze", "lzxnoneterraria:nebula_arcanum", "lzxnoneterraria:stellar_tune", - "lzxnoneterraria:nightglow" + "lzxnoneterraria:nightglow", + "lzxnoneterraria:arc_surge" ] }