diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index aeb77a5..fa9f5a8 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -107,10 +107,10 @@ public class ModSounds { SOUND_EVENTS.register("snow_break", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "snow_break"))); - public static final Supplier SUMMON_TERRAPRISMA = - SOUND_EVENTS.register("summon_terraprisma", + public static final Supplier SUMMON2 = + SOUND_EVENTS.register("summon2", () -> SoundEvent.createVariableRangeEvent( - ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "summon_terraprisma"))); + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "summon2"))); public static final Supplier SUMMON = SOUND_EVENTS.register("summon", () -> SoundEvent.createVariableRangeEvent( 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 0491d4d..a72e89a 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 @@ -1,14 +1,10 @@ package com.lzxnone.terraria.client.entity.summon; +import com.lzxnone.terraria.client.item.magic.*; import com.lzxnone.terraria.client.item.normal.ClientDropFallenStar; import com.lzxnone.terraria.client.item.normal.ClientManaStar; import com.lzxnone.terraria.client.item.ranged.ClientArrowAmmo; import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; -import com.lzxnone.terraria.client.item.magic.ClientBetsysWrath; -import com.lzxnone.terraria.client.item.magic.ClientBubbleGun; -import com.lzxnone.terraria.client.item.magic.ClientLastPrism; -import com.lzxnone.terraria.client.item.magic.ClientNebulaArcanum; -import com.lzxnone.terraria.client.item.magic.ClientNebulaBlaze; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientFirstFractal; import com.lzxnone.terraria.client.item.melee.ClientLightsBane; @@ -70,6 +66,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.STARDUST_DRAGON_STAFF, ClientStardustDragonStaff.SUMMON_BEHAVIOR); 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.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java index ba863b4..c047ed1 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java @@ -23,6 +23,7 @@ public class ShaderRegistry { private static ShaderInstance superellipseParticle; private static ShaderInstance nightsEdgeHitParticle; private static ShaderInstance devilsDevastationEnergy; + private static ShaderInstance nightglowSuperellipsoid; public static ShaderInstance getBlur() { return blur; @@ -64,6 +65,10 @@ public class ShaderRegistry { return devilsDevastationEnergy; } + public static ShaderInstance getNightglowSuperellipsoid() { + return nightglowSuperellipsoid; + } + @SubscribeEvent public static void registerShaders(RegisterShadersEvent event) { try { @@ -147,6 +152,14 @@ public class ShaderRegistry { ), shader -> devilsDevastationEnergy = shader ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "nightglow_superellipsoid"), + DefaultVertexFormat.POSITION_COLOR + ), + shader -> nightglowSuperellipsoid = shader + ); } catch (IOException e) { throw new RuntimeException("Shader load error", e); } diff --git a/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNightglow.java b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNightglow.java new file mode 100644 index 0000000..c56ab52 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNightglow.java @@ -0,0 +1,289 @@ +package com.lzxnone.terraria.client.item.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.client.event.ShaderRegistry; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.MathUtil; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.shaders.Uniform; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.*; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.ShaderInstance; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.client.GlStateBackup; +import org.joml.Matrix4f; +import org.joml.Quaternionf; +import org.joml.Vector3f; + +import java.util.LinkedList; +import java.util.Objects; + +public class ClientNightglow { + public static final ResourceLocation RES = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/vfx/normal_trail2.png"); + + // 超椭圆体尺寸:宽(X)=0.20, 高(Y)=0.20, 长(Z)=0.40(长为宽和高的两倍,宽和高相等) + private static final float HALF_WIDTH = 0.60f; + private static final float HALF_HEIGHT = 0.60f; + private static final float HALF_LENGTH = 1.20f; + + // 消光系数, 核心比例, 外发光宽度, 核心亮度 + private static final float EXTINCTION = 6.0f; + private static final float CORE_RATIO = 0.55f; + private static final float AURA_WIDTH = 0.15f; + private static final float CORE_BRIGHTNESS = 2.5f; + + // 尾迹平面旋转角度(双交叉平面形成3D立体感) + private static final float[] TRAIL_PLANE_ANGLES = new float[]{0.0f, 90.0f}; + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + IStaticSummonRenderBehavior.super.renderItem(entity, entityYaw, partialTick, poseStack, bufferSource, packedLight); + if(!(entity instanceof StaticSummon summon)) return; + + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vector3f color = new Vector3f( + customData.contains("colorR") ? customData.getFloat("colorR") : 1.0f, + customData.contains("colorG") ? customData.getFloat("colorG") : 1.0f, + customData.contains("colorB") ? customData.getFloat("colorB") : 1.0f + ); + + // 1. 渲染 n=0.5 超椭圆体体积能量体 + renderSuperellipsoid(summon, color, partialTick, poseStack, bufferSource); + + // 2. 渲染优化后的双条带/双层尾迹 + renderTrail(summon, color, partialTick, poseStack, bufferSource); + } + }; + + private static void renderSuperellipsoid(StaticSummon summon, Vector3f color, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource) { + ShaderInstance shader = ShaderRegistry.getNightglowSuperellipsoid(); + if (shader == null) return; + + poseStack.pushPose(); + + GlStateBackup backup = new GlStateBackup(); + RenderSystem.backupGlState(backup); + ShaderInstance prevShader = RenderSystem.getShader(); + + try { + if (bufferSource instanceof MultiBufferSource.BufferSource source) { + source.endBatch(); + } + + // 计算局部坐标系:dir 为朝向(Z), up 为高(Y), right 为宽(X) + Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon); + Matrix4f orientation = new Matrix4f( + dirs[2].x, dirs[2].y, dirs[2].z, 0.0f, // col 0: right (X 宽方向) + dirs[1].x, dirs[1].y, dirs[1].z, 0.0f, // col 1: up (Y 高方向) + dirs[0].x, dirs[0].y, dirs[0].z, 0.0f, // col 2: dir (Z 长/前进朝向) + 0.0f, 0.0f, 0.0f, 1.0f // col 3: translation + ); + poseStack.mulPose(orientation); + + Matrix4f modelMatrix = new Matrix4f(poseStack.last().pose()); + float renderTime = summon.tickCount + partialTick; + + Uniform modelMat = shader.getUniform("ModelMat"); + if (modelMat != null) modelMat.set(modelMatrix); + + Uniform cameraLocalUniform = shader.getUniform("CameraLocal"); + if (cameraLocalUniform != null) { + Vector3f cameraLocal = new Matrix4f(RenderSystem.getModelViewMatrix()) + .mul(modelMatrix) + .invert() + .transformPosition(new Vector3f()); + cameraLocalUniform.set(cameraLocal.x, cameraLocal.y, cameraLocal.z); + } + + Uniform dimensionsUniform = shader.getUniform("Dimensions"); + if (dimensionsUniform != null) { + dimensionsUniform.set(HALF_WIDTH, HALF_HEIGHT, HALF_LENGTH); + } + + Uniform volumeParametersUniform = shader.getUniform("VolumeParameters"); + if (volumeParametersUniform != null) { + volumeParametersUniform.set(EXTINCTION, CORE_RATIO, AURA_WIDTH, CORE_BRIGHTNESS); + } + + Uniform colorUniform = shader.getUniform("SuperellipsoidColor"); + if (colorUniform != null) { + colorUniform.set(color.x, color.y, color.z); + } + + Uniform flowTimeUniform = shader.getUniform("FlowTime"); + if (flowTimeUniform != null) { + flowTimeUniform.set(renderTime); + } + + // GL 状态:加法混合 + 深度测试 + 启用背面剔除 + RenderSystem.setShader(() -> shader); + RenderSystem.enableBlend(); + RenderSystem.blendFunc( + GlStateManager.SourceFactor.SRC_ALPHA, + GlStateManager.DestFactor.ONE + ); + RenderSystem.enableDepthTest(); + RenderSystem.depthMask(false); + RenderSystem.enableCull(); + + BufferBuilder bb = RenderSystem.renderThreadTesselator().begin( + VertexFormat.Mode.TRIANGLES, + DefaultVertexFormat.POSITION_COLOR + ); + + // AABB 包围盒 + float pad = 1.08f; + float x = HALF_WIDTH * pad; + float y = HALF_HEIGHT * pad; + float z = HALF_LENGTH * pad; + + // 6 个面,12 个三角形(逆时针正面向外) + // +Z 面 (dir 前方) + addCubeVertex(bb, -x, -y, z); + addCubeVertex(bb, x, -y, z); + addCubeVertex(bb, x, y, z); + addCubeVertex(bb, -x, -y, z); + addCubeVertex(bb, x, y, z); + addCubeVertex(bb, -x, y, z); + + // -Z 面 (dir 后方) + addCubeVertex(bb, x, -y, -z); + addCubeVertex(bb, -x, -y, -z); + addCubeVertex(bb, -x, y, -z); + addCubeVertex(bb, x, -y, -z); + addCubeVertex(bb, -x, y, -z); + addCubeVertex(bb, x, y, -z); + + // +X 面 (right 右方) + addCubeVertex(bb, x, -y, z); + addCubeVertex(bb, x, -y, -z); + addCubeVertex(bb, x, y, -z); + addCubeVertex(bb, x, -y, z); + addCubeVertex(bb, x, y, -z); + addCubeVertex(bb, x, y, z); + + // -X 面 (right 左方) + addCubeVertex(bb, -x, -y, -z); + addCubeVertex(bb, -x, -y, z); + addCubeVertex(bb, -x, y, z); + addCubeVertex(bb, -x, -y, -z); + addCubeVertex(bb, -x, y, z); + addCubeVertex(bb, -x, y, -z); + + // +Y 面 (up 上方) + addCubeVertex(bb, -x, y, z); + addCubeVertex(bb, x, y, z); + addCubeVertex(bb, x, y, -z); + addCubeVertex(bb, -x, y, z); + addCubeVertex(bb, x, y, -z); + addCubeVertex(bb, -x, y, -z); + + // -Y 面 (up 下方) + addCubeVertex(bb, -x, -y, -z); + addCubeVertex(bb, x, -y, -z); + addCubeVertex(bb, x, -y, z); + addCubeVertex(bb, -x, -y, -z); + addCubeVertex(bb, x, -y, z); + addCubeVertex(bb, -x, -y, z); + + BufferUploader.drawWithShader(Objects.requireNonNull(bb.build())); + } finally { + poseStack.popPose(); + RenderSystem.depthMask(true); + RenderSystem.enableDepthTest(); + RenderSystem.enableCull(); + RenderSystem.defaultBlendFunc(); + if (prevShader != null) { + RenderSystem.setShader(() -> prevShader); + } + RenderSystem.restoreGlState(backup); + } + } + + private static void addCubeVertex(BufferBuilder bb, float x, float y, float z) { + bb.addVertex(x, y, z).setColor(255, 255, 255, 255); + } + + private static void renderTrail(StaticSummon summon, Vector3f color, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource) { + LinkedList positions = summon.trailPositions; + if(positions.size() < 4) return; + + VertexConsumer vertexConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); + Matrix4f matrix = poseStack.last().pose(); + Vec3 renderOrigin = summon.getPosition(partialTick); + + int sectionCount = positions.size() / 2; + int quadCount = sectionCount - 1; + + for(float planeAngle : TRAIL_PLANE_ANGLES) { + for(int i = 0; i < quadCount; i++) { + Vec3 pLeft0 = positions.get(i * 2); + Vec3 pRight0 = positions.get(i * 2 + 1); + Vec3 pLeft1 = positions.get((i + 1) * 2); + Vec3 pRight1 = positions.get((i + 1) * 2 + 1); + + Vec3 center0 = pLeft0.add(pRight0).scale(0.5D); + Vec3 center1 = pLeft1.add(pRight1).scale(0.5D); + Vec3 half0 = pRight0.subtract(pLeft0).scale(0.5D); + Vec3 half1 = pRight1.subtract(pLeft1).scale(0.5D); + Vec3 segmentDir = center1.subtract(center0); + + if(planeAngle != 0.0f && segmentDir.lengthSqr() > 1.0E-6D) { + Quaternionf rotation = new Quaternionf().fromAxisAngleRad( + segmentDir.normalize().toVector3f(), + (float) Math.toRadians(planeAngle) + ); + half0 = MathUtil.toVec3(half0.toVector3f().rotate(rotation)); + half1 = MathUtil.toVec3(half1.toVector3f().rotate(rotation)); + } + + float widthScale0 = 1.0f - (float) i / sectionCount; + float widthScale1 = 1.0f - (float) (i + 1) / sectionCount; + + float u0 = (float) i / quadCount; + float u1 = (float) (i + 1) / quadCount; + + // 双层条带:Layer 0 为外层彩色光翼,Layer 1 为内层纯白强光激光芯 + for(int layer = 0; layer < 2; layer++) { + boolean isCore = (layer == 1); + float layerWidthMult = isCore ? 0.40f : 1.10f; + float r0 = isCore ? 1.0f : color.x; + float g0 = isCore ? 1.0f : color.y; + float b0 = isCore ? 1.0f : color.z; + float a0 = isCore ? widthScale0 : widthScale0 * 0.85f; + float a1 = isCore ? widthScale1 : widthScale1 * 0.85f; + + Vec3 scaledHalf0 = half0.scale(widthScale0 * layerWidthMult); + Vec3 scaledHalf1 = half1.scale(widthScale1 * layerWidthMult); + + Vec3 left0 = center0.subtract(scaledHalf0).subtract(renderOrigin); + Vec3 right0 = center0.add(scaledHalf0).subtract(renderOrigin); + Vec3 left1 = center1.subtract(scaledHalf1).subtract(renderOrigin); + Vec3 right1 = center1.add(scaledHalf1).subtract(renderOrigin); + + vertexConsumer.addVertex(matrix, (float) left0.x, (float) left0.y, (float) left0.z) + .setColor(r0, g0, b0, a0).setUv(u0, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + vertexConsumer.addVertex(matrix, (float) right0.x, (float) right0.y, (float) right0.z) + .setColor(r0, g0, b0, a0).setUv(u0, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + vertexConsumer.addVertex(matrix, (float) right1.x, (float) right1.y, (float) right1.z) + .setColor(r0, g0, b0, a1).setUv(u1, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + vertexConsumer.addVertex(matrix, (float) left1.x, (float) left1.y, (float) left1.z) + .setColor(r0, g0, b0, a1).setUv(u1, 0.0f) + .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 a586aa5..cb0a275 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 @@ -59,6 +59,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.NEBULA_ARCANUM.get()); output.accept(ModItems.STELLAR_TUNE.get()); output.accept(ModItems.BUBBLE_GUN.get()); + output.accept(ModItems.NIGHTGLOW.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/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index cd61c67..0633f50 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -3,14 +3,9 @@ package com.lzxnone.terraria.entity.summon; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.normal.FallenStar; import com.lzxnone.terraria.item.normal.ManaStar; -import com.lzxnone.terraria.item.weapon.magic.BetsyWrath; -import com.lzxnone.terraria.item.weapon.magic.BubbleGun; -import com.lzxnone.terraria.item.weapon.magic.LunarFlare; -import com.lzxnone.terraria.item.weapon.magic.NebulaBlaze; -import com.lzxnone.terraria.item.weapon.magic.NebulaArcanum; +import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.flail.Flail; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; -import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; @@ -66,6 +61,7 @@ public class StaticSummonBehaviors { public static final String STARDUST_CELL_STUCK_PROJECTILE = "stardust_cell_stuck_projectile"; 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 MUSKET_BALL = "musket_ball"; @@ -129,6 +125,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(STARDUST_CELL_STUCK_PROJECTILE, StardustCellStaff.SUMMON_BEHAVIOR2); BEHAVIORS.put(POSSESSION, Whip.SUMMON_BEHAVIOR); BEHAVIORS.put(POSSESSION_VISION, Possession.SUMMON_BEHAVIOR); + BEHAVIORS.put(NIGHTGLOW_PROJECTILE, Nightglow.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 707d9dd..5417e39 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -62,6 +62,7 @@ public class ModItems { public static final DeferredItem NEBULA_ARCANUM = ITEMS.register("nebula_arcanum", NebulaArcanum::new); 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 MUSKET = ITEMS.register("musket", Musket::new); @@ -280,5 +281,5 @@ public class ModItems { public static final DeferredItem FIRST_FRACTAL_PROJECTILE14 = ITEMS.register("first_fractal_projectile14", () -> new Item(new Item.Properties())); public static final DeferredItem MACE_PROJECTILE = ITEMS.register("mace_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem TERRAPRISMA_SUMMON = ITEMS.register("terraprisma_summon", () -> new Item(new Item.Properties())); - + public static final DeferredItem NIGHTGLOW_PROJECTILE = ITEMS.register("nightglow_projectile", () -> new Item(new Item.Properties())); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/Nightglow.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/Nightglow.java new file mode 100644 index 0000000..b2f2cb3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/Nightglow.java @@ -0,0 +1,325 @@ +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.ModItems; +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.*; +import net.minecraft.core.Direction; +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.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.Vector3f; + +import java.util.List; + +public class Nightglow extends MagicWeapon { + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.nightglow.damage", "nightglow_damage", 5.0F, 0.0F, 8388600.0F); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.nightglow.mana_consume", "nightglow_mana_consume", 23.0D, 0.0D, 10000.0D); + public static final ConfigInt PROJECTILE_COUNT = new ConfigInt("weapon.nightglow.projectile_count", "nightglow_projectile_count", 4, 1, 64); + public static final ConfigInt DELAY_TIME = new ConfigInt("weapon.nightglow.delay_time", "nightglow_delay_time", 10, 0, 1200); + public static final ConfigInt CHASE_TIME = new ConfigInt("weapon.nightglow.chase_time", "nightglow_chase_time", 30, 1, 1200); + public static final ConfigDouble DELAY_SPEED = new ConfigDouble("weapon.nightglow.delay_speed", "nightglow_delay_speed", 0.75D, 0.01D, 64.0D); + public static final ConfigDouble CHASE_SPEED = new ConfigDouble("weapon.nightglow.chase_speed", "nightglow_chase_speed", 1.5D, 0.01D, 64.0D); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble("weapon.nightglow.target_range", "nightglow_target_range", 32.0D, 1.0D, 256.0D); + + public static final double DELAY_DIR_LERP = 0.25; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll( + DAMAGE, + MANA_CONSUME, + PROJECTILE_COUNT, + DELAY_TIME, + CHASE_TIME, + DELAY_SPEED, + CHASE_SPEED, + TARGET_RANGE + ); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "nightglow", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/nightglow.png"), + Component.translatable("item.lzxnoneterraria.nightglow"), + CONFIG_DATA + ); + + public static final List COLORS = List.of( + new Vector3f(1.00F, 1.00F, 1.00F), // 白 + new Vector3f(0.10F, 0.10F, 0.10F), // 黑 + new Vector3f(1.00F, 0.20F, 0.20F), // 红 + new Vector3f(0.60F, 0.05F, 0.05F), // 深红 + new Vector3f(1.00F, 0.55F, 0.10F), // 橙 + new Vector3f(0.85F, 0.35F, 0.00F), // 深橙 + new Vector3f(1.00F, 0.95F, 0.20F), // 黄 + new Vector3f(0.20F, 0.90F, 0.30F), // 绿 + new Vector3f(0.05F, 0.50F, 0.10F), // 深绿 + new Vector3f(1.00F, 0.50F, 0.75F), // 粉 + new Vector3f(0.20F, 0.50F, 1.00F), // 蓝 + new Vector3f(0.40F, 0.85F, 1.00F), // 浅蓝 + new Vector3f(0.75F, 0.25F, 0.95F) // 紫 + ); + + public Nightglow() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + + @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 + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 34; + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vector3f color = new Vector3f( + customData.contains("colorR") ? customData.getFloat("colorR") : 1.0f, + customData.contains("colorG") ? customData.getFloat("colorG") : 1.0f, + customData.contains("colorB") ? customData.getFloat("colorB") : 1.0f + ); + + if(summon.level().isClientSide()) { + Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon); + Vec3 right = MathUtil.toVec3(dirs[2]); + summon.trailPositions.addFirst(summon.position().add(right.scale(0.15))); + summon.trailPositions.addFirst(summon.position().add(right.scale(-0.15))); + while(summon.trailPositions.size() > 20) summon.trailPositions.removeLast(); + if(summon.getEntityData().get(StaticSummon.AGE) > DELAY_TIME.get()) { + DustParticleOptions particle = new DustParticleOptions(0.08f, 0.5f, 40, true, new Vector3f[]{color}); + ParticleUtil.addParticle( + summon.level(), particle, + summon.position(), 0, + new Vec3(0, 0, 0), 0.2f + ); + } + } + if(summon.level().isClientSide()) return; + + // 1. 运动控制逻辑(分阶段) + if(summon.getEntityData().get(StaticSummon.AGE) > DELAY_TIME.get()) { + int dashTime = customData.contains("dashTime") ? customData.getInt("dashTime") : 0; + if(dashTime > 0) { + // 处于冲刺状态:直接获取当前运动方向,保持 CHASE_SPEED 移动 + Vec3 movement = summon.getDeltaMovement(); + if(movement.lengthSqr() > 1.0E-6D) { + summon.setDeltaMovement(movement.normalize().scale(CHASE_SPEED.get())); + } + customData.putInt("dashTime", dashTime - 1); + }else { + AABB searchBox = summon.getBoundingBox().inflate(TARGET_RANGE.get()); + List enemies = SearchUtil.searchEnemies(summon, summon.getOwner(), searchBox); + Entity target = null; + double bestDistSqr = Double.MAX_VALUE; + Vec3 summonPos = summon.position(); + for(Entity enemy : enemies) { + if(!enemy.isAlive()) continue; + Vec3 enemyCenter = enemy.getBoundingBox().getCenter(); + double distSqr = summonPos.distanceToSqr(enemyCenter); + if(distSqr >= bestDistSqr) continue; + if(!hasLineOfSight(summon, enemyCenter)) continue; + bestDistSqr = distSqr; + target = enemy; + } + + if(target != null && target.isAlive()) { + Vec3 targetPos = target.getBoundingBox().getCenter(); + Vec3 toTarget = targetPos.subtract(summon.position()); + double dist = toTarget.length(); + + if(dist < CHASE_SPEED.get()) { + // 距离小于 CHASE_SPEED 时,直接设置冲刺速度并记录 dashTime 为 2 + Vec3 dashDir = toTarget.lengthSqr() > 1.0E-6D ? toTarget.normalize() : summon.getLookAngle().normalize(); + summon.setDeltaMovement(dashDir.scale(CHASE_SPEED.get())); + customData.putInt("dashTime", 2); + }else { + // 追逐逻辑:平滑转向朝目标飞去 + Vec3 chaseDir = toTarget.normalize(); + Vec3 currentMovement = summon.getDeltaMovement(); + double turnRate = 0.35D; + Vec3 targetMovement = chaseDir.scale(CHASE_SPEED.get()); + Vec3 newMovement = currentMovement.lerp(targetMovement, turnRate).normalize().scale(CHASE_SPEED.get()); + summon.setDeltaMovement(newMovement); + } + }else { + Vec3 movement = summon.getDeltaMovement(); + if(movement.lengthSqr() > 1.0E-6D) { + summon.setDeltaMovement(movement.normalize().scale(CHASE_SPEED.get())); + } + } + } + }else { + Vec3 delayPos = new Vec3( + customData.contains("delayPosX") ? customData.getDouble("delayPosX") : summon.getX(), + customData.contains("delayPosY") ? customData.getDouble("delayPosY") : summon.getY(), + customData.contains("delayPosZ") ? customData.getDouble("delayPosZ") : summon.getZ() + ); + Vec3 movement = summon.getDeltaMovement(); + Vec3 distV = delayPos.subtract(summon.position()); + if(distV.lengthSqr() > 1.0E-6D) { + Vec3 targetMovement = distV.normalize().scale(Math.min(DELAY_SPEED.get(), distV.length())); + Vec3 newMovement = movement.lerp(targetMovement, DELAY_DIR_LERP); + summon.setDeltaMovement(newMovement); + } + } + + // 2. 碰到方块反弹逻辑(全局生效) + Vec3 currentPos = summon.position(); + Vec3 nextPos = currentPos.add(summon.getDeltaMovement()); + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, nextPos); + if(blockHitResult.getType() != HitResult.Type.MISS) { + Direction face = blockHitResult.getDirection(); + Vec3 motion = summon.getDeltaMovement(); + double mx = motion.x; + double my = motion.y; + double mz = motion.z; + switch(face.getAxis()) { + case X -> mx = -mx; + case Y -> my = -my; + case Z -> mz = -mz; + } + summon.setDeltaMovement(new Vec3(mx, my, mz)); + } + + // 3. 实体碰撞伤害逻辑(全局生效) + Vec3 endPos = summon.position().add(summon.getDeltaMovement()); + List hitEntities = summon.level().getEntitiesOfClass( + Entity.class, + new AABB(currentPos, endPos).inflate(0.35D), + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + for(Entity hitEntity: hitEntities) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + DamageUtil.magicAttack(summon, hitEntity, sourceStack, DAMAGE.get(), 0.5F, 10); + } + + // 4. 更新实体的正确朝向(全局生效) + Vec3 finalMovement = summon.getDeltaMovement(); + if(finalMovement.lengthSqr() > 1.0E-6D) { + float[] xyRot = MathUtil.computeXYRot(finalMovement.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + } + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + if(summon.trailPositions.isEmpty()) return summon.getBoundingBox(); + AABB box = summon.getBoundingBox(); + for(Vec3 pos : summon.trailPositions) { + box = box.minmax(new AABB(pos, pos)); + } + return box.inflate(0.5D); + } + }; + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + player.playNotifySound(ModSounds.SUMMON2.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + + for(int i = 0;i < PROJECTILE_COUNT.get();i++) { + Vector3f selectedColor = COLORS.get(player.getRandom().nextInt(COLORS.size())); + if(level instanceof ServerLevel serverLevel) { + DustParticleOptions particle = new DustParticleOptions(0.08f, 0.5f, 40, true, new Vector3f[]{selectedColor}); + ParticleUtil.addParticles( + serverLevel, particle, + player.getBoundingBox().getCenter(), new Vec3(0, 0, 0), 0.25, + 10 + ); + } + Vec3 center = player.getBoundingBox().getCenter(); + Vec3 delayMovement = MathUtil.getRandomPosOnRadius(center, 4).subtract(center).normalize().scale(DELAY_SPEED.get()); + Vec3 delayPos = MathUtil.getRandomPosOnRadius(center, 12); + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(center); + summon.setDeltaMovement(delayMovement); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NIGHTGLOW_PROJECTILE); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.NIGHTGLOW_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.RXP, -90); + summon.getEntityData().set(StaticSummon.COLOR_R, selectedColor.x); + summon.getEntityData().set(StaticSummon.COLOR_G, selectedColor.y); + summon.getEntityData().set(StaticSummon.COLOR_B, selectedColor.z); + summon.getEntityData().set(StaticSummon.LIFETIME, DELAY_TIME.get() + CHASE_TIME.get()); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + summon.noPhysics = true; + + float[] initialXyRot = MathUtil.computeXYRot(delayMovement.toVector3f()); + summon.setXRot(initialXyRot[0]); + summon.setYRot(initialXyRot[1]); + summon.xRotO = summon.getXRot(); + summon.yRotO = summon.getYRot(); + + CompoundTag customData = new CompoundTag(); + customData.putFloat("colorR", selectedColor.x); + customData.putFloat("colorG", selectedColor.y); + customData.putFloat("colorB", selectedColor.z); + customData.putDouble("delayPosX", delayPos.x); + customData.putDouble("delayPosY", delayPos.y); + customData.putDouble("delayPosZ", delayPos.z); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + level.addFreshEntity(summon); + } + } + + private static boolean hasLineOfSight(Entity entity, Vec3 targetPos) { + return entity.level().clip(new ClipContext( + entity.position(), + targetPos, + ClipContext.Block.COLLIDER, + ClipContext.Fluid.NONE, + entity + )).getType() == HitResult.Type.MISS; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index 19573d9..4878b5f 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -505,7 +505,7 @@ public class Terraprisma extends MinionWeapon { } } } - SoundUtil.playClientSound(player, ModSounds.SUMMON_TERRAPRISMA.get()); + SoundUtil.playClientSound(player, ModSounds.SUMMON2.get()); return InteractionResultHolder.consume(stack); } } 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 3c99ee4..8996831 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -101,6 +101,7 @@ import com.lzxnone.terraria.item.weapon.magic.LunarFlare; 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.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; import com.lzxnone.terraria.item.weapon.melee.BloodButcherer; @@ -189,6 +190,7 @@ public class ConfigList { NebulaArcanum.CONFIG_LIST_ITEM, StellarTune.CONFIG_LIST_ITEM, BubbleGun.CONFIG_LIST_ITEM, + Nightglow.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 409ce94..edaca79 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -44,6 +44,7 @@ "item.lzxnoneterraria.nebula_arcanum": "Nebula Arcanum", "item.lzxnoneterraria.stellar_tune": "Stellar Tune", "item.lzxnoneterraria.bubble_gun": "Bubble Gun", + "item.lzxnoneterraria.nightglow": "Nightglow", "item.lzxnoneterraria.bubble_gun_projectile": "Bubble", "item.lzxnoneterraria.vortex_rocket": "Vortex Rocket", "item.lzxnoneterraria.terraprisma": "Terraprisma", @@ -1108,6 +1109,22 @@ "lzxnoneterraria.configuration.bubble_gun_drag.tooltip": "Velocity multiplier retained by the bubble each tick", "lzxnoneterraria.configuration.bubble_gun_mana_consume": "Mana Cost", "lzxnoneterraria.configuration.bubble_gun_mana_consume.tooltip": "Mana consumed per shot", + "lzxnoneterraria.configuration.nightglow_damage": "Damage", + "lzxnoneterraria.configuration.nightglow_damage.tooltip": "Base magic damage of Nightglow projectiles", + "lzxnoneterraria.configuration.nightglow_mana_consume": "Mana Cost", + "lzxnoneterraria.configuration.nightglow_mana_consume.tooltip": "Mana consumed per use", + "lzxnoneterraria.configuration.nightglow_projectile_count": "Projectile Count", + "lzxnoneterraria.configuration.nightglow_projectile_count.tooltip": "Number of projectiles fired per use", + "lzxnoneterraria.configuration.nightglow_delay_time": "Spread Delay Time", + "lzxnoneterraria.configuration.nightglow_delay_time.tooltip": "Duration of initial projectile outward spread in ticks", + "lzxnoneterraria.configuration.nightglow_chase_time": "Chase Duration", + "lzxnoneterraria.configuration.nightglow_chase_time.tooltip": "Duration of homing chase phase in ticks", + "lzxnoneterraria.configuration.nightglow_delay_speed": "Spread Speed", + "lzxnoneterraria.configuration.nightglow_delay_speed.tooltip": "Movement speed during initial outward spread", + "lzxnoneterraria.configuration.nightglow_chase_speed": "Chase Speed", + "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.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 f4dec58..3309a89 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -44,6 +44,7 @@ "item.lzxnoneterraria.nebula_arcanum": "星云奥秘", "item.lzxnoneterraria.stellar_tune": "星星吉他", "item.lzxnoneterraria.bubble_gun": "泡泡枪", + "item.lzxnoneterraria.nightglow": "夜光", "item.lzxnoneterraria.bubble_gun_projectile": "泡泡", "item.lzxnoneterraria.vortex_rocket": "星旋火箭", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", @@ -1108,6 +1109,22 @@ "lzxnoneterraria.configuration.bubble_gun_drag.tooltip": "泡泡每刻保留的速度比例", "lzxnoneterraria.configuration.bubble_gun_mana_consume": "魔力消耗", "lzxnoneterraria.configuration.bubble_gun_mana_consume.tooltip": "每次发射消耗的魔力", + "lzxnoneterraria.configuration.nightglow_damage": "伤害", + "lzxnoneterraria.configuration.nightglow_damage.tooltip": "夜光发射的光之飞刃基础伤害", + "lzxnoneterraria.configuration.nightglow_mana_consume": "魔力消耗", + "lzxnoneterraria.configuration.nightglow_mana_consume.tooltip": "每次使用夜光消耗的魔力", + "lzxnoneterraria.configuration.nightglow_projectile_count": "弹射数量", + "lzxnoneterraria.configuration.nightglow_projectile_count.tooltip": "每次使用夜光发射的飞刃数量", + "lzxnoneterraria.configuration.nightglow_delay_time": "散开延迟时间", + "lzxnoneterraria.configuration.nightglow_delay_time.tooltip": "飞刃向外散开的持续时间(刻)", + "lzxnoneterraria.configuration.nightglow_chase_time": "追击持续时间", + "lzxnoneterraria.configuration.nightglow_chase_time.tooltip": "飞刃追逐敌人的持续时间(刻)", + "lzxnoneterraria.configuration.nightglow_delay_speed": "散开速度", + "lzxnoneterraria.configuration.nightglow_delay_speed.tooltip": "飞刃向外散开时的移动速度", + "lzxnoneterraria.configuration.nightglow_chase_speed": "追击速度", + "lzxnoneterraria.configuration.nightglow_chase_speed.tooltip": "飞刃追逐敌人时的移动速度", + "lzxnoneterraria.configuration.nightglow_target_range": "寻敌范围", + "lzxnoneterraria.configuration.nightglow_target_range.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/nightglow.json b/src/main/resources/assets/lzxnoneterraria/models/item/nightglow.json new file mode 100644 index 0000000..1935c5d --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nightglow.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/sword2", + "textures": { + "layer0": "lzxnoneterraria:item/nightglow" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nightglow_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/nightglow_projectile.json new file mode 100644 index 0000000..08cc01b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nightglow_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/nightglow_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.fsh new file mode 100644 index 0000000..815de91 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.fsh @@ -0,0 +1,107 @@ +#version 150 + +in vec3 vLocalPos; +in vec4 vColor; + +out vec4 fragColor; + +uniform vec3 CameraLocal; +uniform vec3 Dimensions; +uniform vec4 VolumeParameters; +uniform vec3 SuperellipsoidColor; +uniform float FlowTime; + +const int VOLUME_STEPS = 48; + +float hash21(vec2 p) { + p = fract(p * vec2(123.34, 456.21)); + p += dot(p, p + 45.32); + return fract(p.x * p.y); +} + +vec2 intersectAABB(vec3 rayOrigin, vec3 rayDir, vec3 boxMin, vec3 boxMax) { + vec3 invDir = 1.0 / max(abs(rayDir), vec3(0.00001)) * sign(rayDir); + vec3 t0 = (boxMin - rayOrigin) * invDir; + vec3 t1 = (boxMax - rayOrigin) * invDir; + vec3 tmin = min(t0, t1); + vec3 tmax = max(t0, t1); + float tEnter = max(max(tmin.x, tmin.y), tmin.z); + float tExit = min(min(tmax.x, tmax.y), tmax.z); + return vec2(tEnter, tExit); +} + +float evaluateSuperellipsoid(vec3 p, vec3 dim) { + vec3 q = abs(p) / max(dim, vec3(0.0001)); + return sqrt(max(q.x, 0.0)) + sqrt(max(q.y, 0.0)) + sqrt(max(q.z, 0.0)); +} + +void main() { + float extinction = VolumeParameters.x; + float coreRatio = VolumeParameters.y; + float coreBrightness = VolumeParameters.w; + + vec3 proxyRadius = Dimensions * 1.05; + vec3 rayOrigin = CameraLocal; + vec3 rayDir = normalize(vLocalPos - rayOrigin); + + vec2 hit = intersectAABB(rayOrigin, rayDir, -proxyRadius, proxyRadius); + float tStart = max(hit.x, 0.0); + float tEnd = hit.y; + + if (tEnd <= tStart || tEnd <= 0.0) { + discard; + } + + float stepSize = (tEnd - tStart) / float(VOLUME_STEPS); + // 屏幕空间微抖动:消除光线步进固定间距导致的阶梯锯齿 + float dither = hash21(gl_FragCoord.xy); + float t = tStart + stepSize * dither; + + vec3 accumulatedColor = vec3(0.0); + float accumulatedAlpha = 0.0; + + // 自适应步长抗锯齿过渡区 + float edgeWidth = max(stepSize * 1.2, 0.025); + + for (int i = 0; i < VOLUME_STEPS; i++) { + vec3 p = rayOrigin + rayDir * t; + + // 纯净解析超椭圆体场函数,去除噪点扰动引起的突起 + float s = evaluateSuperellipsoid(p, Dimensions); + float outerDist = s - 1.0; + float coreDist = (s / max(coreRatio, 0.001)) - 1.0; + + float outerDensity = 1.0 - smoothstep(-edgeWidth, edgeWidth, outerDist); + float coreDensity = 1.0 - smoothstep(-edgeWidth, edgeWidth, coreDist); + float colorDensity = max(outerDensity - coreDensity, 0.0); + + float coreWeight = coreDensity * 12.0; + float sampleDensity = colorDensity * 3.0 + coreWeight; + + if (sampleDensity > 0.0001) { + vec3 sampleColor = ( + SuperellipsoidColor * 1.8 * (colorDensity * 3.0) + + vec3(coreBrightness) * coreWeight + ) / sampleDensity; + + float sampleAlpha = 1.0 - exp(-sampleDensity * stepSize * extinction); + float remain = 1.0 - accumulatedAlpha; + + accumulatedColor += remain * sampleColor * sampleAlpha; + accumulatedAlpha += remain * sampleAlpha; + + if (accumulatedAlpha > 0.99) { + break; + } + } + + t += stepSize; + } + + if (accumulatedAlpha < 0.01) { + discard; + } + + vec3 finalRgb = accumulatedColor / max(accumulatedAlpha, 0.0001); + fragColor = vec4(finalRgb, accumulatedAlpha * vColor.a); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.json new file mode 100644 index 0000000..4ecffd9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.json @@ -0,0 +1,79 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1" + }, + "vertex": "lzxnoneterraria:nightglow_superellipsoid", + "fragment": "lzxnoneterraria:nightglow_superellipsoid", + "attributes": [ + "Position", + "Color" + ], + "samplers": [], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.0, 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.0, 1.0 + ] + }, + { + "name": "ModelMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.0, 1.0 + ] + }, + { + "name": "CameraLocal", + "type": "float", + "count": 3, + "values": [0.0, 0.0, 0.0] + }, + { + "name": "Dimensions", + "type": "float", + "count": 3, + "values": [0.3, 0.3, 0.6] + }, + { + "name": "VolumeParameters", + "type": "float", + "count": 4, + "values": [6.0, 0.55, 0.15, 2.5] + }, + { + "name": "SuperellipsoidColor", + "type": "float", + "count": 3, + "values": [1.0, 1.0, 1.0] + }, + { + "name": "FlowTime", + "type": "float", + "count": 1, + "values": [0.0] + } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.vsh new file mode 100644 index 0000000..a340c3b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/nightglow_superellipsoid.vsh @@ -0,0 +1,19 @@ +#version 150 + +in vec3 Position; +in vec4 Color; + +uniform mat4 ModelMat; +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; + +out vec3 vLocalPos; +out vec4 vColor; + +void main() { + vec4 viewPosition = ModelViewMat * ModelMat * vec4(Position, 1.0); + gl_Position = ProjMat * viewPosition; + + vLocalPos = Position; + vColor = Color; +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index ad95034..7f25f6d 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -79,8 +79,8 @@ "snow_break": { "sounds": ["lzxnoneterraria:snow_break"] }, - "summon_terraprisma": { - "sounds": ["lzxnoneterraria:summon_terraprisma"] + "summon2": { + "sounds": ["lzxnoneterraria:summon2"] }, "summon": { "sounds": ["lzxnoneterraria:summon"] diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/summon_terraprisma.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/summon2.ogg similarity index 100% rename from src/main/resources/assets/lzxnoneterraria/sounds/summon_terraprisma.ogg rename to src/main/resources/assets/lzxnoneterraria/sounds/summon2.ogg diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow.png b/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow.png new file mode 100644 index 0000000..ad785f8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow_projectile.png new file mode 100644 index 0000000..abf9056 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/nightglow_projectile.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/normal_trail2.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/normal_trail2.png new file mode 100644 index 0000000..489f359 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/normal_trail2.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/stellar_tune.json b/src/main/resources/data/lzxnoneterraria/recipe/stellar_tune.json index 2b09286..6da5e37 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/stellar_tune.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/stellar_tune.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "category": "combat", "pattern": [ - "ECE", + "DCD", "BAB", - "EDE" + "ECE" ], "key": { "A": { "item": "minecraft:flow_armor_trim_smithing_template" }, "B": { "item": "minecraft:note_block" }, - "C": { "item": "minecraft:conduit" }, - "D": { "item": "minecraft:heavy_core" }, + "C": { "item": "minecraft:pink_dye" }, + "D": { "item": "minecraft:netherite_scrap" }, "E": { "item": "minecraft:netherite_ingot" } }, "result": { 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 0523090..cc2984e 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json @@ -4,6 +4,10 @@ "lzxnoneterraria:last_prism", "lzxnoneterraria:betsys_wrath", "lzxnoneterraria:lunar_flare", - "lzxnoneterraria:bubble_gun" + "lzxnoneterraria:bubble_gun", + "lzxnoneterraria:nebula_blaze", + "lzxnoneterraria:nebula_arcanum", + "lzxnoneterraria:stellar_tune", + "lzxnoneterraria:nightglow" ] }