diff --git a/src/main/java/com/lzxnone/terraria/client/item/summon/ClientWhip.java b/src/main/java/com/lzxnone/terraria/client/item/summon/ClientWhip.java index 0b48498..fc38062 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/summon/ClientWhip.java +++ b/src/main/java/com/lzxnone/terraria/client/item/summon/ClientWhip.java @@ -43,11 +43,69 @@ public class ClientWhip { double bend = customData.contains("bend") ? customData.getDouble("bend") : range * 0.25D; boolean reverse = customData.contains("reverse") && customData.getBoolean("reverse"); - if(!customData.contains("res") || customData.getString("res").isEmpty()) return; - ResourceLocation res = ResourceLocation.parse(customData.getString("res")); List points = computePoints(hand, dir, up, progress, range, height, bend, reverse, SEGMENTS); - renderRibbon(points, origin, right, res, poseStack, bufferSource); - renderRibbon(points, origin, up, res, poseStack, bufferSource);// + if(points.size() < 2) return; + + // 计算归一化累积弧长序列 + int n = points.size(); + double[] cumulativeDist = new double[n]; + double totalLength = 0.0D; + for(int i = 1; i < n; i++) { + totalLength += points.get(i).distanceTo(points.get(i - 1)); + cumulativeDist[i] = totalLength; + } + if(totalLength < 1.0E-5D) return; + + double[] normalizedDist = new double[n]; + for(int i = 0; i < n; i++) { + normalizedDist[i] = cumulativeDist[i] / totalLength; + } + + if(!customData.contains("tailRes") || !customData.contains("bodyRes") || !customData.contains("headRes")) return; + + String tailResStr = customData.getString("tailRes"); + String bodyResStr = customData.getString("bodyRes"); + String headResStr = customData.getString("headRes"); + if(tailResStr.isEmpty() || bodyResStr.isEmpty() || headResStr.isEmpty()) return; + + float tailRatio = customData.getFloat("tailRatio"); + float headRatio = customData.getFloat("headRatio"); + float bodyUnitRatio = customData.getFloat("bodyUnitRatio"); + + tailRatio = Mth.clamp(tailRatio, 0.0F, 0.9F); + headRatio = Mth.clamp(headRatio, 0.0F, 0.9F - tailRatio); + bodyUnitRatio = Math.max(0.001F, bodyUnitRatio); + + float bodyStart = tailRatio; + float bodyEnd = 1.0F - headRatio; + + ResourceLocation tailRes = ResourceLocation.parse(tailResStr); + ResourceLocation bodyRes = ResourceLocation.parse(bodyResStr); + ResourceLocation headRes = ResourceLocation.parse(headResStr); + + // 1. 渲染尾部 (Tail - 不拉伸,单张贴图完整映射) + if(tailRatio > 1.0E-4F) { + List tailPoints = extractSubPath(points, normalizedDist, 0.0F, tailRatio); + renderRibbonCross(tailPoints, origin, right, up, tailRes, 0.0F, 1.0F, poseStack, bufferSource); + } + + // 2. 渲染身体 (Body - Tiling 平铺渲染,按 bodyUnitRatio 单元循环平铺) + if(bodyEnd > bodyStart + 1.0E-4F) { + float cur = bodyStart; + while(cur < bodyEnd - 1.0E-5F) { + float next = Math.min(bodyEnd, cur + bodyUnitRatio); + float uMax = (next - cur) / bodyUnitRatio; + List bodyTilePoints = extractSubPath(points, normalizedDist, cur, next); + renderRibbonCross(bodyTilePoints, origin, right, up, bodyRes, 0.0F, uMax, poseStack, bufferSource); + cur = next; + } + } + + // 3. 渲染头部 (Head - 不拉伸,单张贴图完整映射) + if(headRatio > 1.0E-4F) { + List headPoints = extractSubPath(points, normalizedDist, bodyEnd, 1.0F); + renderRibbonCross(headPoints, origin, right, up, headRes, 0.0F, 1.0F, poseStack, bufferSource); + } } private static List computePoints(Vec3 hand, Vec3 dir, Vec3 up, float progress, double range, double height, double bend, boolean reverse, int segments) { @@ -81,18 +139,60 @@ public class ClientWhip { return hand.add(parallel.subtract(perpendicular)); } - private static void renderRibbon(List points, Vec3 origin, Vec3 widthDir, ResourceLocation res, PoseStack poseStack, MultiBufferSource bufferSource) { + private static List extractSubPath(List points, double[] s, float startS, float endS) { + List result = new ArrayList<>(); + if(points.size() < 2 || startS >= endS) return result; + + int n = points.size(); + for(int i = 0; i < n - 1; i++) { + double s0 = s[i]; + double s1 = s[i + 1]; + + if(s1 < startS - 1.0E-6) continue; + if(s0 > endS + 1.0E-6) break; + + Vec3 p0 = points.get(i); + Vec3 p1 = points.get(i + 1); + + // 若起点落在 (s0, s1] 之间,插值得到起点 + if(s0 < startS && startS <= s1) { + double t = (startS - s0) / (s1 - s0); + Vec3 startP = p0.lerp(p1, t); + result.add(startP); + } else if(s0 >= startS && result.isEmpty()) { + result.add(p0); + } + + // 若终点落在 [s0, s1) 之间,插值得到终点并结束 + if(s0 <= endS && endS < s1) { + double t = (endS - s0) / (s1 - s0); + Vec3 endP = p0.lerp(p1, t); + result.add(endP); + break; + } else if(s1 <= endS) { + result.add(p1); + } + } + return result; + } + + private static void renderRibbonCross(List points, Vec3 origin, Vec3 right, Vec3 up, ResourceLocation res, float uMin, float uMax, PoseStack poseStack, MultiBufferSource bufferSource) { + renderRibbon(points, origin, right, res, uMin, uMax, poseStack, bufferSource); + renderRibbon(points, origin, up, res, uMin, uMax, poseStack, bufferSource); + } + + private static void renderRibbon(List points, Vec3 origin, Vec3 widthDir, ResourceLocation res, float uMin, float uMax, PoseStack poseStack, MultiBufferSource bufferSource) { if(points.size() < 2) return; VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(res)); Vec3 halfWidth = widthDir.normalize().scale(WIDTH * 0.5F); - double totalLength = 0.0D; + double subLength = 0.0D; double[] distances = new double[points.size()]; for(int i = 1; i < points.size(); i++) { - totalLength += points.get(i).distanceTo(points.get(i - 1)); - distances[i] = totalLength; + subLength += points.get(i).distanceTo(points.get(i - 1)); + distances[i] = subLength; } - if(totalLength < 1.0E-5D) return; + if(subLength < 1.0E-5D) return; for(int i = 0; i < points.size() - 1; i++) { Vec3 p0 = points.get(i); @@ -104,8 +204,8 @@ public class ClientWhip { Vec3 b = p0.subtract(halfWidth).subtract(origin); Vec3 c = p1.subtract(halfWidth).subtract(origin); Vec3 d = p1.add(halfWidth).subtract(origin); - float u0 = (float)(distances[i] / totalLength); - float u1 = (float)(distances[i + 1] / totalLength); + float u0 = uMin + (float)(distances[i] / subLength) * (uMax - uMin); + float u1 = uMin + (float)(distances[i + 1] / subLength) * (uMax - uMin); addVertex(consumer, poseStack, a, u0, 0.0F); addVertex(consumer, poseStack, b, u0, 1.0F); 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 index d14c6ec..82f40b5 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/ArcSurge.java @@ -48,8 +48,8 @@ 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 ConfigFloat DAMAGE = new ConfigFloat("weapon.arc_surge.damage", "arc_surge_damage", 20.0F, 0.0F, 8388600.0F); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.arc_surge.mana_consume", "arc_surge_mana_consume", 18.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); @@ -109,7 +109,7 @@ public class ArcSurge extends MagicWeapon { Vec3 p1 = branch.get(i + 1); // 每条线段的中点都有 0.2 的概率生成一个红色的 dust 粒子 - if(summon.getRandom().nextFloat() < 0.2F) { + if(summon.getRandom().nextFloat() < 0.02F) { Vec3 mid = p0.add(p1).scale(0.5D); ParticleUtil.addParticles( serverLevel, diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java index 0f69d5d..8c70d0d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java @@ -60,8 +60,33 @@ public class Possession extends Whip { } @Override - protected String getRes(StaticSummon summon) { - return "lzxnoneterraria:textures/vfx/possession_projectile" + summon.getRandom().nextInt(3) + ".png"; + protected String getTailRes(StaticSummon summon) { + return "lzxnoneterraria:textures/vfx/possession_projectile_tail.png"; + } + + @Override + protected String getBodyRes(StaticSummon summon) { + return "lzxnoneterraria:textures/vfx/possession_projectile_body.png"; + } + + @Override + protected String getHeadRes(StaticSummon summon) { + return "lzxnoneterraria:textures/vfx/possession_projectile_head" + summon.getRandom().nextInt(3) + ".png"; + } + + @Override + protected float getTailRatio() { + return 0.05F; + } + + @Override + protected float getHeadRatio() { + return 0.075F; + } + + @Override + protected float getBodyUnitRatio() { + return 0.15F; } @Override diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java index 2b5578f..8a5ed63 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java @@ -42,7 +42,17 @@ public abstract class Whip extends SummonWeapon { protected abstract double getRange(); - protected abstract String getRes(StaticSummon summon); + protected abstract String getTailRes(StaticSummon summon); + + protected abstract String getBodyRes(StaticSummon summon); + + protected abstract String getHeadRes(StaticSummon summon); + + protected abstract float getTailRatio(); + + protected abstract float getHeadRatio(); + + protected abstract float getBodyUnitRatio(); protected abstract float getDamage(); @@ -208,7 +218,12 @@ public abstract class Whip extends SummonWeapon { customData.putDouble("height", getHeight()); customData.putDouble("bend", getBend()); customData.putBoolean("reverse", summon.getRandom().nextInt(2) == 0); - customData.putString("res", getRes(summon)); + customData.putString("tailRes", getTailRes(summon)); + customData.putString("bodyRes", getBodyRes(summon)); + customData.putString("headRes", getHeadRes(summon)); + customData.putFloat("tailRatio", getTailRatio()); + customData.putFloat("headRatio", getHeadRatio()); + customData.putFloat("bodyUnitRatio", getBodyUnitRatio()); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); summon.setNoGravity(true); diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile0.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile0.png deleted file mode 100644 index 6b199dc..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile0.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile1.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile1.png deleted file mode 100644 index 86abf22..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile1.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile2.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile2.png deleted file mode 100644 index 682f159..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile2.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_body.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_body.png new file mode 100644 index 0000000..b951a64 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_body.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head0.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head0.png new file mode 100644 index 0000000..3592eac Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head0.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head1.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head1.png new file mode 100644 index 0000000..6dc60b1 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head2.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head2.png new file mode 100644 index 0000000..08e5fa3 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_head2.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_tail.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_tail.png new file mode 100644 index 0000000..bbb86a2 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_projectile_tail.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/arc_surge.json b/src/main/resources/data/lzxnoneterraria/recipe/arc_surge.json new file mode 100644 index 0000000..fe2e9f1 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/arc_surge.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "FDF", + "BAC", + "FEF" + ], + "key": { + "A": { "item": "minecraft:flow_armor_trim_smithing_template" }, + "B": { "item": "minecraft:waxed_oxidized_lightning_rod" }, + "C": { "item": "minecraft:weathered_lightning_rod" }, + "D": { "item": "minecraft:conduit" }, + "E": { "item": "minecraft:heavy_core" }, + "F": { "item": "minecraft:netherite_ingot" } + }, + "result": { + "id": "lzxnoneterraria:arc_surge", + "count": 1 + } +}