diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index daf5973..770ec03 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -5,12 +5,17 @@ import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.client.entity.beam.SwordBeamRenderer; import com.lzxnone.terraria.client.entity.projectile.StaticProjectileRenderer; import com.lzxnone.terraria.client.entity.summon.StaticSummonRenderer; +import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.*; +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; import net.minecraft.client.renderer.entity.BeeRenderer; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; @@ -20,6 +25,18 @@ public class LzxnoneTerrariaClient { public LzxnoneTerrariaClient(ModContainer container, IEventBus modEventBus) { container.registerExtensionPoint(IConfigScreenFactory.class, (modContainer, parent) -> ConfigScreen.create(parent)); + //使用渲染 + modEventBus.addListener(FMLClientSetupEvent.class, event -> event.enqueueWork(() -> ItemProperties.register( + ModItems.NEBULA_ARCANUM.get(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "using"), + (stack, level, entity, seed) -> { + if(entity instanceof Player player && player.isUsingItem() && player.getUseItem().is(stack.getItem())) { + return 1.0F; + } + return 0.0F; + } + ))); + //Entity渲染 modEventBus.addListener(EntityRenderersEvent.RegisterRenderers.class, event -> { event.registerEntityRenderer(ModEntities.STATIC_PROJECTILE.get(), StaticProjectileRenderer::new); diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index 2a1a708..1b066a5 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -35,6 +35,10 @@ public class ModSounds { SOUND_EVENTS.register("magic_shoot2", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "magic_shoot2"))); + public static final Supplier MAGIC_SHOOT3 = + SOUND_EVENTS.register("magic_shoot3", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "magic_shoot3"))); public static final Supplier BUBBLE = SOUND_EVENTS.register("bubble", () -> SoundEvent.createVariableRangeEvent( diff --git a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java index e7f8663..c06a13d 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.client.entity.projectile; import com.lzxnone.terraria.client.item.accessory.ClientAccessoryFallenStar; +import com.lzxnone.terraria.client.item.magic.ClientNebulaArcanum; import com.lzxnone.terraria.client.item.melee.ClientBladeOfGrass; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientMace; @@ -35,6 +36,7 @@ public class ClientStaticProjectileRenderBehaviors { BEHAVIORS.put(StaticProjectileBehaviors.SUPER_STAR_PRISMATIC_BOLT, ClientSuperStarShooter.PROJECTILE_BEHAVIOR); BEHAVIORS.put(StaticProjectileBehaviors.POSSESSION_PROJECTILE, ClientPossession.PROJECTILE_BEHAVIOR); BEHAVIORS.put(StaticProjectileBehaviors.ACCESSORY_FALLEN_STAR_PROJECTILE, ClientAccessoryFallenStar.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(StaticProjectileBehaviors.NEBULA_ARCANUM_ORBIT_PROJECTILE, ClientNebulaArcanum.PROJECTILE_BEHAVIOR); } public static IStaticProjectileRenderBehavior getBehavior(String id) { 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 a5fda6c..f0c401a 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 @@ -7,6 +7,7 @@ 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; @@ -60,6 +61,8 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.BETSY_WRATH, ClientBetsysWrath.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.NEBULA_BLAZE, ClientNebulaBlaze.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.NEBULA_BLAZE_EXPLOSIVE, ClientNebulaBlaze.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.NEBULA_ARCANUM_PROJECTILE, ClientNebulaArcanum.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.NEBULA_ARCANUM_SMALL_PROJECTILE, ClientNebulaArcanum.SUMMON_BEHAVIOR2); BEHAVIORS.put(StaticSummonBehaviors.TERRAPRISMA, ClientTerraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.POSSESSION, ClientWhip.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.POSSESSION_VISION, DEFAULT_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNebulaArcanum.java b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNebulaArcanum.java new file mode 100644 index 0000000..106cb74 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientNebulaArcanum.java @@ -0,0 +1,92 @@ +package com.lzxnone.terraria.client.item.magic; + +import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +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.world.entity.Entity; + +public class ClientNebulaArcanum { + private static final ResourceLocation PROJECTILE = + ResourceLocation.parse("lzxnoneterraria:textures/vfx/nebula_arcanum_projectile.png"); + private static final ResourceLocation CIRCLE = + ResourceLocation.parse("lzxnoneterraria:textures/vfx/circle.png"); + private static final String ORANGE_RED_KEY = "orangeRed"; + + 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; + + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + renderBillboard(PROJECTILE, poseStack, bufferSource, 1.6F, 1.0F, 1.0F, 1.0F, 1.0F, age * 10.0F); + } + }; + + public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticProjectile projectile)) return; + float age = projectile.getEntityData().get(StaticProjectile.AGE) + partialTick; + //renderBillboard(CIRCLE, poseStack, bufferSource, 0.3F, 1.0F, 0.18F, 0.72F, 1.0F, age * 18.0F); + } + }; + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR2 = new IStaticSummonRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + if(customData.getBoolean(ORANGE_RED_KEY)) { + //renderBillboard(CIRCLE, poseStack, bufferSource, 0.16F, 1.0F, 0.22F, 0.08F, 1.0F, age * 22.0F); + }else { + //renderBillboard(CIRCLE, poseStack, bufferSource, 0.16F, 1.0F, 0.22F, 0.74F, 1.0F, age * 22.0F); + } + } + }; + + private static void renderBillboard(ResourceLocation texture, PoseStack poseStack, MultiBufferSource bufferSource, + float halfSize, float r, float g, float b, float a, float rotationDegrees) { + poseStack.pushPose(); + poseStack.mulPose(Minecraft.getInstance().getEntityRenderDispatcher().cameraOrientation()); + poseStack.mulPose(Axis.ZP.rotationDegrees(rotationDegrees)); + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(texture)); + consumer.addVertex(poseStack.last().pose(), -halfSize, -halfSize, 0.0F) + .setColor(r, g, b, a) + .setUv(0.0F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(poseStack.last().pose(), halfSize, -halfSize, 0.0F) + .setColor(r, g, b, a) + .setUv(1.0F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(poseStack.last().pose(), halfSize, halfSize, 0.0F) + .setColor(r, g, b, a) + .setUv(1.0F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(poseStack.last().pose(), -halfSize, halfSize, 0.0F) + .setColor(r, g, b, a) + .setUv(0.0F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + poseStack.popPose(); + } +} 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 e534106..f871b42 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -69,7 +69,9 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.FALLEN_STAR_SUPER, StaticSummonBehaviors.DROP_FALLEN_STAR, StaticSummonBehaviors.MANA_STAR, - StaticSummonBehaviors.BETSY_WRATH -> { + StaticSummonBehaviors.BETSY_WRATH, + StaticSummonBehaviors.NEBULA_BLAZE, + StaticSummonBehaviors.NEBULA_ARCANUM_PROJECTILE -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectile.java b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectile.java index 070146f..00ed4b7 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectile.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectile.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.entity.projectile; +import com.lzxnone.terraria.entity.summon.StaticSummon; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; @@ -191,7 +192,8 @@ public class StaticProjectile extends Projectile { this.onHit(hitResult); } - if(this.entityData.get(AGE) > this.entityData.get(LIFETIME)) { + int lifetime = this.entityData.get(LIFETIME); + if(lifetime != StaticSummon.INFINITE_LIFETIME && this.entityData.get(AGE) > lifetime) { StaticProjectileBehaviors.getBehavior(this.entityData.get(BEHAVIOR)).onDied(this); } this.entityData.set(AGE, this.entityData.get(AGE) + 1); diff --git a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java index 1bcf645..b36745e 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.entity.projectile; import com.lzxnone.terraria.item.ammo.CrystalBullet; import com.lzxnone.terraria.item.effect.FallenStarSummoner; +import com.lzxnone.terraria.item.weapon.magic.NebulaArcanum; import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; @@ -31,6 +32,7 @@ public class StaticProjectileBehaviors { public static final String SUPER_STAR_PRISMATIC_BOLT = "super_star_prismatic_blot"; public static final String POSSESSION_PROJECTILE = "possession_projectile"; public static final String ACCESSORY_FALLEN_STAR_PROJECTILE = "accessory_fallen_star_projectile"; + public static final String NEBULA_ARCANUM_ORBIT_PROJECTILE = "nebula_arcanum_orbit_projectile"; static { BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() { @@ -62,6 +64,7 @@ public class StaticProjectileBehaviors { BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR); BEHAVIORS.put(POSSESSION_PROJECTILE, Possession.PROJECTILE_BEHAVIOR); BEHAVIORS.put(ACCESSORY_FALLEN_STAR_PROJECTILE, FallenStarSummoner.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(NEBULA_ARCANUM_ORBIT_PROJECTILE, NebulaArcanum.PROJECTILE_BEHAVIOR); } public static IStaticProjectileBehavior getBehavior(String id) { 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 9096532..592f0bd 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -7,6 +7,7 @@ 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.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; @@ -55,6 +56,8 @@ public class StaticSummonBehaviors { public static final String BUBBLE = "bubble"; public static final String NEBULA_BLAZE = "nebula_blaze"; public static final String NEBULA_BLAZE_EXPLOSIVE = "nebula_blaze_explosive"; + public static final String NEBULA_ARCANUM_PROJECTILE = "nebula_arcanum_projectile"; + public static final String NEBULA_ARCANUM_SMALL_PROJECTILE = "nebula_arcanum_small_projectile"; public static final String TERRAPRISMA = "terraprisma"; public static final String STARDUST_DRAGON_STAFF = "stardust_dragon_staff"; public static final String POSSESSION = "possession"; @@ -114,6 +117,8 @@ public class StaticSummonBehaviors { BEHAVIORS.put(BUBBLE, BubbleGun.SUMMON_BEHAVIOR); BEHAVIORS.put(NEBULA_BLAZE, NebulaBlaze.SUMMON_BEHAVIOR); BEHAVIORS.put(NEBULA_BLAZE_EXPLOSIVE, NebulaBlaze.SUMMON_BEHAVIOR2); + BEHAVIORS.put(NEBULA_ARCANUM_PROJECTILE, NebulaArcanum.SUMMON_BEHAVIOR); + BEHAVIORS.put(NEBULA_ARCANUM_SMALL_PROJECTILE, NebulaArcanum.SUMMON_BEHAVIOR2); BEHAVIORS.put(TERRAPRISMA, Terraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(STARDUST_DRAGON_STAFF, StardustDragonStaff.SUMMON_BEHAVIOR); BEHAVIORS.put(POSSESSION, Whip.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 37a7cac..02bd379 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -250,6 +250,7 @@ public class ModItems { public static final DeferredItem WHITE_STAR = ITEMS.register("white_star", () -> new Item(new Item.Properties())); public static final DeferredItem MANA_STAR = ITEMS.register("mana_star", () -> new Item(new Item.Properties())); public static final DeferredItem BUBBLE_GUN_PROJECTILE = ITEMS.register("bubble_gun_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem VORTEX_ROCKET = ITEMS.register("vortex_rocket", () -> new Item(new Item.Properties())); public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", () -> new Item(new Item.Properties())); public static final DeferredItem STARFURY_STAR = ITEMS.register("starfury_star", () -> new Item(new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaArcanum.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaArcanum.java index 9b8c28f..ee58bbb 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaArcanum.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaArcanum.java @@ -1,30 +1,103 @@ 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.projectile.IStaticProjectileBehavior; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; +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.CircleParticleOptions; 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.*; +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; +import java.util.Locale; public class NebulaArcanum extends MagicWeapon { - public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.nebula_arcanum.damage", "nebula_arcanum_damage", 0.0F, 0.0F, 8388600.0F); - public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.nebula_arcanum.mana_consume", "nebula_arcanum_mana_consume", 0.0D, 0.0D, 10000.0D); + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.nebula_arcanum.damage", "nebula_arcanum_damage", 15.0F, 0.0F, 8388600.0F); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.nebula_arcanum.mana_consume", "nebula_arcanum_mana_consume", 30.0D, 0.0D, 10000.0D); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.nebula_arcanum.speed", "nebula_arcanum_speed", 0.5D, 0.0D, 10.0D); + public static final ConfigInt LIFETIME = new ConfigInt("weapon.nebula_arcanum.lifetime", "nebula_arcanum_lifetime", 220, 1, 72000); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble("weapon.nebula_arcanum.target_range", "nebula_arcanum_target_range", 24.0D, 0.0D, 128.0D); + public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble("weapon.nebula_arcanum.explosion_range", "nebula_arcanum_explosion_range", 4.0D, 0.0D, 64.0D); + public static final ConfigInt HIT_COUNT = new ConfigInt("weapon.nebula_arcanum.hit_count", "nebula_arcanum_hit_count", 3, 1, 128); + public static final ConfigFloat ORBIT_PROJECTILE_DAMAGE = new ConfigFloat("weapon.nebula_arcanum.orbit_projectile_damage", "nebula_arcanum_orbit_projectile_damage", 7.0F, 0.0F, 8388600.0F); + public static final ConfigFloat SMALL_PROJECTILE_DAMAGE = new ConfigFloat("weapon.nebula_arcanum.small_projectile_damage", "nebula_arcanum_small_projectile_damage", 10.0F, 0.0F, 8388600.0F); + + private static final int TRACK_DELAY = 20; + private static final int ORBIT_PROJECTILE_SPAWN_INTERVAL = 20; + private static final int ORBIT_PROJECTILE_MAX_COUNT = 8; + private static final int ORBIT_PROJECTILE_MIN_SPAWN_COUNT = 2; + private static final int ORBIT_PROJECTILE_MAX_SPAWN_COUNT = 3; + private static final int SMALL_PROJECTILE_MIN_COUNT = 10; + private static final int SMALL_PROJECTILE_MAX_COUNT = 16; + private static final int SMALL_PROJECTILE_LIFETIME = 20; + private static final double SMALL_PROJECTILE_SPEED = 0.75D; + private static final double HITBOX_INFLATE = 0.45D; + private static final double ORBIT_RADIUS = 4D; + private static final double ORBIT_SPEED = 0.1D; + private static final double SMALL_PROJECTILE_GRAVITY = 0.04D; + private static final double BOUNCE_SCALE = 0.85D; + private static final String TARGET_UUID_KEY = "target"; + private static final String MAIN_UUID_KEY = "main"; + private static final String ORANGE_RED_KEY = "orangeRed"; + + public static final CircleParticleOptions ORBIT_PROJECTILE_TRAIL_PARTICLE = + new CircleParticleOptions(0.12F, 16, new Vector3f(1.0F, 0.18F, 0.72F)); + public static final CircleParticleOptions SMALL_PROJECTILE_PINK_PARTICLE = + new CircleParticleOptions(0.16F, 14, new Vector3f(1.0F, 0.22F, 0.74F)); + public static final CircleParticleOptions SMALL_PROJECTILE_ORANGE_RED_PARTICLE = + new CircleParticleOptions(0.16F, 14, new Vector3f(1.0F, 0.22F, 0.08F)); + public static final CircleParticleOptions MAIN_PINK_PARTICLE = + new CircleParticleOptions(0.14F, 10, new Vector3f(1.0F, 0.18F, 0.72F)); + public static final CircleParticleOptions MAIN_ORANGE_RED_PARTICLE = + new CircleParticleOptions(0.14F, 10, new Vector3f(1.0F, 0.18F, 0.06F)); + public static final CircleParticleOptions MAIN_BLACK_PARTICLE = + new CircleParticleOptions(0.14F, 10, new Vector3f(0.0F, 0.0F, 0.0F)); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(DAMAGE, MANA_CONSUME); + ConfigStruct.loadAll( + DAMAGE, + MANA_CONSUME, + SPEED, + LIFETIME, + TARGET_RANGE, + EXPLOSION_RANGE, + HIT_COUNT, + ORBIT_PROJECTILE_DAMAGE, + SMALL_PROJECTILE_DAMAGE + ); } }; @@ -39,6 +112,315 @@ public class NebulaArcanum extends MagicWeapon { super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + if(summon.isRemoved()) return; + + if(summon.level().isClientSide()) { + if(summon.getEntityData().get(StaticSummon.AGE) < TRACK_DELAY) return; + Vec3 speed = new Vec3( + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D + ); + if(speed.lengthSqr() < 1.0E-7D) speed = new Vec3(0.0D, 1.0D, 0.0D); + speed = speed.normalize(); + ParticleUtil.addParticle(summon.level(), MAIN_PINK_PARTICLE, summon.position().add(speed.scale(1.5D)), 0.0D, speed.scale(0.5D), 0.0D); + + speed = new Vec3( + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D + ); + if(speed.lengthSqr() < 1.0E-7D) speed = new Vec3(0.0D, 1.0D, 0.0D); + speed = speed.normalize(); + ParticleUtil.addParticle(summon.level(), MAIN_ORANGE_RED_PARTICLE, summon.position().add(speed.scale(1.5D)), 0.0D, speed.scale(0.5D), 0.0D); + + speed = new Vec3( + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D + ); + if(speed.lengthSqr() < 1.0E-7D) speed = new Vec3(0.0D, 1.0D, 0.0D); + speed = speed.normalize(); + ParticleUtil.addParticle(summon.level(), MAIN_BLACK_PARTICLE, summon.position().add(speed.scale(1.5D)), 0.0D, speed.scale(0.5D), 0.0D); + } + + Vec3 motion = summon.getDeltaMovement(); + if(motion.lengthSqr() < 1.0E-7D) motion = summon.getLookAngle().normalize().scale(SPEED.get()); + if(motion.lengthSqr() < 1.0E-7D) motion = new Vec3(0.0D, 0.0D, 1.0D).scale(SPEED.get()); + + int age = summon.getEntityData().get(StaticSummon.AGE); + if(age > TRACK_DELAY && summon.level() instanceof ServerLevel serverLevel) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Entity target = null; + if(customData.contains(TARGET_UUID_KEY)) { + target = serverLevel.getEntity(customData.getUUID(TARGET_UUID_KEY)); + if(target == null || !target.isAlive() || !hasLineOfSight(summon, target)) { + target = null; + customData.remove(TARGET_UUID_KEY); + } + } + if(target == null) { + double bestDistance = Double.MAX_VALUE; + for(Entity candidate : SearchUtil.searchEnemies(summon, summon.getOwner(), summon.getBoundingBox().inflate(TARGET_RANGE.get()))) { + if(!hasLineOfSight(summon, candidate)) continue; + double distance = candidate.getBoundingBox().getCenter().distanceToSqr(summon.position()); + if(distance < bestDistance) { + bestDistance = distance; + target = candidate; + } + } + if(target != null) customData.putUUID(TARGET_UUID_KEY, target.getUUID()); + } + + int spawned = customData.getInt("orbitProjectileCount"); + if(spawned < ORBIT_PROJECTILE_MAX_COUNT && (age - TRACK_DELAY - 1) % ORBIT_PROJECTILE_SPAWN_INTERVAL == 0) { + Entity owner = summon.getOwner(); + if(owner != null) { + int spawnCount = ORBIT_PROJECTILE_MIN_SPAWN_COUNT + summon.getRandom().nextInt(ORBIT_PROJECTILE_MAX_SPAWN_COUNT - ORBIT_PROJECTILE_MIN_SPAWN_COUNT + 1); + spawnCount = Math.min(spawnCount, ORBIT_PROJECTILE_MAX_COUNT - spawned); + for(int i = 0; i < spawnCount; i++) { + Vec3 orbitDirection = summon.getDeltaMovement(); + if(orbitDirection.lengthSqr() < 1.0E-7D) orbitDirection = summon.getLookAngle(); + if(orbitDirection.lengthSqr() < 1.0E-7D) orbitDirection = new Vec3(0.0D, 0.0D, 1.0D); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(orbitDirection.toVector3f(), summon.getYRot()); + dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], (int) ((Math.random() * 2 - 1) * 90)); + double phase = summon.getRandom().nextDouble() * Math.PI * 2.0D; + + StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), summon.level()); + projectile.setOwner(summon); + projectile.setPos(summon.position()); + projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE)); + projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.NEBULA_ARCANUM_ORBIT_PROJECTILE); + projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "custom"); + projectile.getEntityData().set(StaticProjectile.ORIGIN, summon.position().toVector3f()); + projectile.getEntityData().set(StaticProjectile.DIRECTION, dirs[0]); + projectile.getEntityData().set(StaticProjectile.UP, dirs[1]); + projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); + projectile.getEntityData().set(StaticProjectile.LIFETIME, StaticSummon.INFINITE_LIFETIME); + projectile.getEntityData().set(StaticProjectile.RZPS, 18); + projectile.getEntityData().set(StaticProjectile.SCALE_X, 0.4f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, 0.4f); + projectile.getEntityData().set(StaticProjectile.SCALE_Z, 0.4f); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format(Locale.ROOT, "%.3f*cos(%.3f*t+%.3f)", ORBIT_RADIUS, ORBIT_SPEED, phase)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format(Locale.ROOT, "%.3f*sin(%.3f*t+%.3f)", ORBIT_RADIUS, ORBIT_SPEED, phase)); + projectile.getEntityData().set(StaticProjectile.GLOW, true); + + CompoundTag orbitData = new CompoundTag(); + orbitData.putUUID(MAIN_UUID_KEY, summon.getUUID()); + projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, orbitData); + summon.level().addFreshEntity(projectile); + } + customData.putInt("orbitProjectileCount", spawned + spawnCount); + } + } + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + + if(target != null) { + Vec3 targetDir = target.getBoundingBox().getCenter().subtract(summon.position()); + if(targetDir.lengthSqr() > 1.0E-7D) motion = targetDir.normalize().scale(SPEED.get()); + } + } + + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + if(!summon.level().isClientSide()) { + List targets = summon.level().getEntitiesOfClass( + Entity.class, + new AABB(start, end).inflate(HITBOX_INFLATE), + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.magicAttack(summon, targets.getFirst(), sourceStack, DAMAGE.get(), 0.75F, 15)) { + int hitCount = customData.getInt("hitCount") + 1; + customData.putInt("hitCount", hitCount); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + if(hitCount >= HIT_COUNT.get()) { + onDied(summon); + return; + } + } + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + summon.setPos(blockHitResult.getLocation().add(Vec3.atLowerCornerOf(blockHitResult.getDirection().getNormal()).scale(0.05D))); + motion = bounce(motion, blockHitResult).normalize().scale(SPEED.get()); + } + } + + summon.setDeltaMovement(motion); + float[] xyRot = MathUtil.computeXYRot(motion.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + } + + @Override + public void onDied(StaticSummon summon) { + if(!(summon.level() instanceof ServerLevel serverLevel)) return; + + Vec3 pos = summon.position(); + double explosionRange = EXPLOSION_RANGE.get(); + if(explosionRange > 0.0D) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + for(Entity target : serverLevel.getEntitiesOfClass( + Entity.class, + AABB.ofSize(pos, explosionRange * 2.0D, explosionRange * 2.0D, explosionRange * 2.0D), + FilterUtil.createTargetFilter(summon, summon.getOwner()) + )) { + if(target.distanceToSqr(pos) > explosionRange * explosionRange) continue; + DamageUtil.magicAttack(summon, target, sourceStack, DAMAGE.get(), 0.75F, 5); + } + } + SoundUtil.playServerSound(summon.level(), ModSounds.BOOM.get(), summon.position()); + ParticleUtil.addParticles(serverLevel, MAIN_PINK_PARTICLE, pos, new Vec3(0.3D, 0.3D, 0.3D), 0.22D, 16); + ParticleUtil.addParticles(serverLevel, MAIN_ORANGE_RED_PARTICLE, pos, new Vec3(0.3D, 0.3D, 0.3D), 0.22D, 16); + ParticleUtil.addParticles(serverLevel, MAIN_BLACK_PARTICLE, pos, new Vec3(0.3D, 0.3D, 0.3D), 0.22D, 16); + + Entity owner = summon.getOwner(); + if(owner != null) { + int count = SMALL_PROJECTILE_MIN_COUNT + summon.getRandom().nextInt(SMALL_PROJECTILE_MAX_COUNT - SMALL_PROJECTILE_MIN_COUNT + 1); + for(int i = 0; i < count; i++) { + Vec3 dir = new Vec3( + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D, + summon.getRandom().nextDouble() * 2.0D - 1.0D + ); + if(dir.lengthSqr() < 1.0E-7D) dir = new Vec3(0.0D, 1.0D, 0.0D); + dir = dir.normalize(); + + StaticSummon small = new StaticSummon(ModEntities.STATIC_SUMMON.get(), summon.level()); + small.setOwner(owner); + small.setPos(summon.position()); + small.setDeltaMovement(dir.scale(SMALL_PROJECTILE_SPEED)); + small.getEntityData().set(StaticSummon.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE)); + small.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NEBULA_ARCANUM_SMALL_PROJECTILE); + small.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + small.getEntityData().set(StaticSummon.LIFETIME, SMALL_PROJECTILE_LIFETIME); + small.getEntityData().set(StaticSummon.RZPS, 18); + small.getEntityData().set(StaticSummon.SCALE_X, 0.4f); + small.getEntityData().set(StaticSummon.SCALE_Y, 0.4f); + small.getEntityData().set(StaticSummon.SCALE_Z, 0.4f); + small.getEntityData().set(StaticSummon.GLOW, true); + CompoundTag smallData = new CompoundTag(); + smallData.putBoolean(ORANGE_RED_KEY, summon.getRandom().nextBoolean()); + small.getEntityData().set(StaticSummon.CUSTOM_DATA, smallData); + small.setNoGravity(true); + small.noPhysics = true; + summon.level().addFreshEntity(small); + } + } + summon.discard(); + } + }; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR2 = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + if(summon.isRemoved()) return; + + if(summon.level().isClientSide()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + ParticleUtil.addParticle( + summon.level(), + customData.getBoolean(ORANGE_RED_KEY) ? SMALL_PROJECTILE_ORANGE_RED_PARTICLE : SMALL_PROJECTILE_PINK_PARTICLE, + summon.position(), + 0.0D, + Vec3.ZERO, + 0.0D + ); + } + + Vec3 motion = summon.getDeltaMovement().add(0.0D, -SMALL_PROJECTILE_GRAVITY, 0.0D); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + if(!summon.level().isClientSide()) { + List targets = summon.level().getEntitiesOfClass( + Entity.class, + new AABB(start, end).inflate(0.3D), + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.magicAttack(summon, targets.getFirst(), sourceStack, SMALL_PROJECTILE_DAMAGE.get(), 0.4F, 15)) { + onDied(summon); + return; + } + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + summon.setPos(blockHitResult.getLocation().add(Vec3.atLowerCornerOf(blockHitResult.getDirection().getNormal()).scale(0.05D))); + motion = bounce(motion, blockHitResult).scale(BOUNCE_SCALE); + } + } + summon.setDeltaMovement(motion); + } + + @Override + public void onDied(StaticSummon summon) { + if(!(summon.level() instanceof ServerLevel serverLevel)) return; + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + ParticleUtil.addParticles( + serverLevel, + customData.getBoolean(ORANGE_RED_KEY) ? SMALL_PROJECTILE_ORANGE_RED_PARTICLE : SMALL_PROJECTILE_PINK_PARTICLE, + summon.position(), + new Vec3(0.18D, 0.18D, 0.18D), + 0.18D, + 12 + ); + summon.discard(); + } + }; + + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { + @Override + public void onMoving(StaticProjectile projectile) { + if(projectile.level().isClientSide()) { + ParticleUtil.addParticle( + projectile.level(), + ORBIT_PROJECTILE_TRAIL_PARTICLE, + projectile.position(), + 0.0D, + Vec3.ZERO, + 0.0D + ); + return; + } + + CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); + if(!customData.contains(MAIN_UUID_KEY) || !(projectile.level() instanceof ServerLevel serverLevel)) { + onDied(projectile); + return; + } + + Entity main = serverLevel.getEntity(customData.getUUID(MAIN_UUID_KEY)); + if(main == null || !main.isAlive()) { + onDied(projectile); + return; + } + projectile.getEntityData().set(StaticProjectile.ORIGIN, main.position().toVector3f()); + } + + @Override + public void onHitEntity(StaticProjectile projectile, net.minecraft.world.phys.EntityHitResult result) { + if(projectile.level().isClientSide()) return; + ItemStack sourceStack = projectile.getEntityData().get(StaticProjectile.STACK_SOURCE); + DamageUtil.magicAttack(projectile, result.getEntity(), sourceStack, ORBIT_PROJECTILE_DAMAGE.get(), 0.0F, 10); + } + + @Override + public void onHitBlock(StaticProjectile projectile, BlockHitResult result) {} + }; + @Override public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); @@ -49,4 +431,55 @@ public class NebulaArcanum extends MagicWeapon { protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { return MANA_CONSUME.get(); } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 30; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + + player.playNotifySound(ModSounds.MAGIC_SHOOT3.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + + Vec3 direction = player.getLookAngle().normalize(); + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(player.getEyePosition().add(direction.scale(1.2D))); + summon.setDeltaMovement(direction.scale(SPEED.get())); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NEBULA_ARCANUM_PROJECTILE); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, LIFETIME.get()); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + summon.noPhysics = true; + + float[] xyRot = MathUtil.computeXYRot(direction.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + level.addFreshEntity(summon); + } + + private static boolean hasLineOfSight(Entity entity, Entity target) { + return entity.level().clip(new ClipContext( + entity.position(), + target.getBoundingBox().getCenter(), + ClipContext.Block.COLLIDER, + ClipContext.Fluid.NONE, + entity + )).getType() == HitResult.Type.MISS; + } + + private static Vec3 bounce(Vec3 motion, BlockHitResult result) { + return switch(result.getDirection().getAxis()) { + case X -> new Vec3(-motion.x, motion.y, motion.z); + case Y -> new Vec3(motion.x, -motion.y, motion.z); + case Z -> new Vec3(motion.x, motion.y, -motion.z); + }; + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaBlaze.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaBlaze.java index d3c99e6..ea6ff34 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaBlaze.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/NebulaBlaze.java @@ -13,6 +13,7 @@ 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.nbt.CompoundTag; @@ -51,6 +52,7 @@ public class NebulaBlaze extends MagicWeapon { public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble("weapon.nebula_blaze.explosion_range", "nebula_blaze_explosion_range", 3.0D, 0.0D, 64.0D); public static final ConfigDouble EXPLOSIVE_CHANCE = new ConfigDouble("weapon.nebula_blaze.explosive_chance", "nebula_blaze_explosive_chance", 0.2D, 0.0D, 1.0D); public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.nebula_blaze.mana_consume", "nebula_blaze_mana_consume", 12.0D, 0.0D, 10000.0D); + public static final ConfigInt LIFETIME = new ConfigInt("weapon.nebula_blaze.lifetime", "nebula_blaze_lifetime", 100, 1, 72000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override @@ -64,7 +66,8 @@ public class NebulaBlaze extends MagicWeapon { EXPLOSIVE_TARGET_RANGE, EXPLOSION_RANGE, EXPLOSIVE_CHANCE, - MANA_CONSUME + MANA_CONSUME, + LIFETIME ); } }; @@ -169,7 +172,7 @@ public class NebulaBlaze extends MagicWeapon { summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); summon.getEntityData().set(StaticSummon.BEHAVIOR, explosive ? StaticSummonBehaviors.NEBULA_BLAZE_EXPLOSIVE : StaticSummonBehaviors.NEBULA_BLAZE); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.LIFETIME, LIFETIME.get()); if(explosive) { summon.getEntityData().set(StaticSummon.SCALE_X, 2.0f); summon.getEntityData().set(StaticSummon.SCALE_Y, 2.0f); 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 0a30e86..c83ac0e 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 @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; public abstract class Whip extends SummonWeapon { - public static final Vector3f OFFSET = new Vector3f(1.0F, -1.0F, 0.0F); + public static final Vector3f OFFSET = new Vector3f(-1.0F, 1.0F, 0.0F); private static final int SEGMENTS = 24; private static final double HITBOX_INFLATE = 1.0D; diff --git a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java index a4a8a42..5b6f745 100644 --- a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java @@ -9,6 +9,7 @@ import net.minecraft.core.particles.ParticleOptions; public class CircleParticle extends TextureSheetParticle { private final float baseSize; + private final boolean opaque; protected CircleParticle(ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed, @@ -25,6 +26,7 @@ public class CircleParticle extends TextureSheetParticle { this.rCol = options.color.x; this.gCol = options.color.y; this.bCol = options.color.z; + this.opaque = options.color.x + options.color.y + options.color.z < 0.18F; this.baseSize = options.initSize + (this.random.nextFloat() * options.initSize * 0.5f); this.quadSize = baseSize; @@ -56,7 +58,7 @@ public class CircleParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + return this.opaque ? ParticleRenderType.PARTICLE_SHEET_OPAQUE : ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 316dda5..2f24f7d 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -46,6 +46,7 @@ "item.lzxnoneterraria.nebula_arcanum": "Nebula Arcanum", "item.lzxnoneterraria.bubble_gun": "Bubble Gun", "item.lzxnoneterraria.bubble_gun_projectile": "Bubble", + "item.lzxnoneterraria.vortex_rocket": "Vortex Rocket", "item.lzxnoneterraria.terraprisma": "Terraprisma", "item.lzxnoneterraria.stardust_dragon_staff": "Stardust Dragon Staff", "item.lzxnoneterraria.possession": "Possession", @@ -1066,10 +1067,26 @@ "lzxnoneterraria.configuration.nebula_blaze_explosive_chance.tooltip": "Chance for each shot to become an explosive projectile", "lzxnoneterraria.configuration.nebula_blaze_mana_consume": "Mana Cost", "lzxnoneterraria.configuration.nebula_blaze_mana_consume.tooltip": "Mana consumed per shot", + "lzxnoneterraria.configuration.nebula_blaze_lifetime": "Lifetime", + "lzxnoneterraria.configuration.nebula_blaze_lifetime.tooltip": "Projectile lifetime in ticks", "lzxnoneterraria.configuration.nebula_arcanum_damage": "Damage", "lzxnoneterraria.configuration.nebula_arcanum_damage.tooltip": "Magic damage dealt", "lzxnoneterraria.configuration.nebula_arcanum_mana_consume": "Mana Cost", "lzxnoneterraria.configuration.nebula_arcanum_mana_consume.tooltip": "Mana consumed per shot", + "lzxnoneterraria.configuration.nebula_arcanum_speed": "Main Speed", + "lzxnoneterraria.configuration.nebula_arcanum_speed.tooltip": "Main projectile movement speed", + "lzxnoneterraria.configuration.nebula_arcanum_lifetime": "Main Lifetime", + "lzxnoneterraria.configuration.nebula_arcanum_lifetime.tooltip": "Lifetime of the main projectile in ticks", + "lzxnoneterraria.configuration.nebula_arcanum_target_range": "Main Tracking Range", + "lzxnoneterraria.configuration.nebula_arcanum_target_range.tooltip": "Range for the main projectile to search enemies", + "lzxnoneterraria.configuration.nebula_arcanum_explosion_range": "Area Damage Radius", + "lzxnoneterraria.configuration.nebula_arcanum_explosion_range.tooltip": "Radius for area damage after the main projectile dies", + "lzxnoneterraria.configuration.nebula_arcanum_hit_count": "Main Hit Count", + "lzxnoneterraria.configuration.nebula_arcanum_hit_count.tooltip": "Damage hits the main projectile can deal before dying", + "lzxnoneterraria.configuration.nebula_arcanum_orbit_projectile_damage": "Orbit Projectile Damage", + "lzxnoneterraria.configuration.nebula_arcanum_orbit_projectile_damage.tooltip": "Magic damage dealt by orbiting projectiles", + "lzxnoneterraria.configuration.nebula_arcanum_small_projectile_damage": "Small Projectile Damage", + "lzxnoneterraria.configuration.nebula_arcanum_small_projectile_damage.tooltip": "Magic damage dealt by small projectiles spawned after the main projectile dies", "lzxnoneterraria.configuration.bubble_gun_damage": "Damage", "lzxnoneterraria.configuration.bubble_gun_damage.tooltip": "Magic damage dealt by each bubble hit", "lzxnoneterraria.configuration.bubble_gun_speed": "Speed", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index c0e2569..504e9c2 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -46,6 +46,7 @@ "item.lzxnoneterraria.nebula_arcanum": "星云奥秘", "item.lzxnoneterraria.bubble_gun": "泡泡枪", "item.lzxnoneterraria.bubble_gun_projectile": "泡泡", + "item.lzxnoneterraria.vortex_rocket": "星旋火箭", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", "item.lzxnoneterraria.stardust_dragon_staff": "星尘之龙法杖", "item.lzxnoneterraria.possession": "支配之鞭", @@ -1066,10 +1067,26 @@ "lzxnoneterraria.configuration.nebula_blaze_explosive_chance.tooltip": "每次发射变为爆弹射的概率", "lzxnoneterraria.configuration.nebula_blaze_mana_consume": "魔力消耗", "lzxnoneterraria.configuration.nebula_blaze_mana_consume.tooltip": "每次发射消耗的魔力", + "lzxnoneterraria.configuration.nebula_blaze_lifetime": "生命周期", + "lzxnoneterraria.configuration.nebula_blaze_lifetime.tooltip": "弹射存在的时间(刻)", "lzxnoneterraria.configuration.nebula_arcanum_damage": "伤害", "lzxnoneterraria.configuration.nebula_arcanum_damage.tooltip": "造成的魔法伤害", "lzxnoneterraria.configuration.nebula_arcanum_mana_consume": "魔力消耗", "lzxnoneterraria.configuration.nebula_arcanum_mana_consume.tooltip": "每次发射消耗的魔力", + "lzxnoneterraria.configuration.nebula_arcanum_speed": "主体速度", + "lzxnoneterraria.configuration.nebula_arcanum_speed.tooltip": "主体弹射的移动速度", + "lzxnoneterraria.configuration.nebula_arcanum_lifetime": "主体生命周期", + "lzxnoneterraria.configuration.nebula_arcanum_lifetime.tooltip": "主体弹射存在的时间(刻)", + "lzxnoneterraria.configuration.nebula_arcanum_target_range": "主体追踪范围", + "lzxnoneterraria.configuration.nebula_arcanum_target_range.tooltip": "主体弹射自动搜寻敌人的范围", + "lzxnoneterraria.configuration.nebula_arcanum_explosion_range": "范围伤害半径", + "lzxnoneterraria.configuration.nebula_arcanum_explosion_range.tooltip": "主体死亡后造成范围伤害的半径", + "lzxnoneterraria.configuration.nebula_arcanum_hit_count": "主体命中次数", + "lzxnoneterraria.configuration.nebula_arcanum_hit_count.tooltip": "主体造成多少次伤害后死亡", + "lzxnoneterraria.configuration.nebula_arcanum_orbit_projectile_damage": "环绕弹射伤害", + "lzxnoneterraria.configuration.nebula_arcanum_orbit_projectile_damage.tooltip": "环绕主体的弹射造成的魔法伤害", + "lzxnoneterraria.configuration.nebula_arcanum_small_projectile_damage": "小弹射伤害", + "lzxnoneterraria.configuration.nebula_arcanum_small_projectile_damage.tooltip": "主体死亡后生成的小弹射造成的魔法伤害", "lzxnoneterraria.configuration.bubble_gun_damage": "伤害", "lzxnoneterraria.configuration.bubble_gun_damage.tooltip": "每个泡泡命中造成的魔法伤害", "lzxnoneterraria.configuration.bubble_gun_speed": "速度", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum.json b/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum.json index a4be316..393f627 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum.json @@ -2,5 +2,13 @@ "parent": "lzxnoneterraria:item/sword", "textures": { "layer0": "lzxnoneterraria:item/nebula_arcanum" - } + }, + "overrides": [ + { + "predicate": { + "lzxnoneterraria:using": 1.0 + }, + "model": "lzxnoneterraria:item/nebula_arcanum_held" + } + ] } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum_held.json b/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum_held.json new file mode 100644 index 0000000..8045313 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nebula_arcanum_held.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/sword", + "textures": { + "layer0": "lzxnoneterraria:item/nebula_arcanum_held" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/vortex_rocket.json b/src/main/resources/assets/lzxnoneterraria/models/item/vortex_rocket.json new file mode 100644 index 0000000..02dcf86 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/vortex_rocket.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/vortex_rocket" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 20950cb..82fb0be 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -43,6 +43,9 @@ "magic_shoot2": { "sounds": ["lzxnoneterraria:magic_shoot2"] }, + "magic_shoot3": { + "sounds": ["lzxnoneterraria:magic_shoot3"] + }, "bubble": { "sounds": ["lzxnoneterraria:bubble"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.ogg new file mode 100644 index 0000000..7f14a74 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.ogg differ diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.wav b/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.wav new file mode 100644 index 0000000..42e9b4d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot3.wav differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png b/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png new file mode 100644 index 0000000..3be1881 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png.mcmeta b/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png.mcmeta new file mode 100644 index 0000000..e007d17 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/textures/item/nebula_arcanum_held.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 2, + "interpolate": false + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/vortex_rocket.png b/src/main/resources/assets/lzxnoneterraria/textures/item/vortex_rocket.png similarity index 100% rename from src/main/resources/assets/lzxnoneterraria/textures/vfx/vortex_rocket.png rename to src/main/resources/assets/lzxnoneterraria/textures/item/vortex_rocket.png diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/circle.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/circle.png new file mode 100644 index 0000000..4d06b4f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/circle.png differ