From dbb6783d1871656c6ae4502d1a7add4745eb0e44 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Tue, 28 Jul 2026 00:01:38 +0800 Subject: [PATCH] v1.6.0 --- .../terraria/LzxnoneTerrariaClient.java | 3 + ...ClientStaticProjectileRenderBehaviors.java | 2 + .../ClientStaticSummonRenderBehaviors.java | 1 + .../item/ammo/ClientCrystalFragment.java | 7 + .../projectile/StaticProjectileBehaviors.java | 3 + .../com/lzxnone/terraria/item/ModItems.java | 1 + .../terraria/item/ammo/CrystalBullet.java | 139 +++++++++++++++++- .../terraria/item/ammo/CursedBullet.java | 2 + .../terraria/item/ammo/GoldenBullet.java | 2 + .../item/ammo/HighVelocityBullet.java | 2 + .../terraria/item/ammo/MeteorShot.java | 38 ++--- .../terraria/item/ammo/MusketBall.java | 2 + .../terraria/item/ammo/PartyBullet.java | 1 + .../terraria/item/ammo/SilverBullet.java | 2 + .../terraria/item/ammo/TungstenBullet.java | 2 + .../particle/CrystalFragmentParticle.java | 69 +++++++++ .../terraria/particle/ModParticles.java | 4 +- .../models/item/crystal_fragment.json | 6 + .../particles/crystal_fragment_particle.json | 5 + .../item/crystal_bullet_projectile.png | Bin 0 -> 465 bytes .../textures/item/crystal_fragment.png | Bin 0 -> 122 bytes .../particle/crystal_fragment_particle.png | Bin 0 -> 122 bytes 22 files changed, 270 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java create mode 100644 src/main/java/com/lzxnone/terraria/particle/CrystalFragmentParticle.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/crystal_fragment.json create mode 100644 src/main/resources/assets/lzxnoneterraria/particles/crystal_fragment_particle.json create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/crystal_fragment.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/crystal_fragment_particle.png diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index e2eb086..0ac87d0 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -83,6 +83,9 @@ public class LzxnoneTerrariaClient { modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.SOLAR_EXPLOSION_PARTICLE.get(), SolarExplosionParticle.Provider::new); }); + modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { + event.registerSpriteSet(ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), CrystalFragmentParticle.Provider::new); + }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.DEVILS_DEVASTATION_RUNE_PARTICLE.get(), DevilsDevastationRuneParticle.Provider::new); }); 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 c0744d9..c728b9d 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,5 +1,6 @@ package com.lzxnone.terraria.client.entity.projectile; +import com.lzxnone.terraria.client.item.ammo.ClientCrystalFragment; import com.lzxnone.terraria.client.item.melee.ClientBladeOfGrass; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientMace; @@ -27,6 +28,7 @@ public class ClientStaticProjectileRenderBehaviors { BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE, ClientDevilsDevastation.PROJECTILE_BEHAVIOR); BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE2, ClientDevilsDevastation.PROJECTILE_BEHAVIOR2); BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE3, ClientDevilsDevastation.PROJECTILE_BEHAVIOR3); + BEHAVIORS.put(StaticProjectileBehaviors.CRYSTAL_FRAGMENT, ClientCrystalFragment.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 cea9aa2..bc68e62 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,6 +1,7 @@ package com.lzxnone.terraria.client.entity.summon; import com.lzxnone.terraria.client.item.ammo.ClientBulletAmmo; +import com.lzxnone.terraria.client.item.ammo.ClientCrystalFragment; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientFirstFractal; diff --git a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java new file mode 100644 index 0000000..411666a --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java @@ -0,0 +1,7 @@ +package com.lzxnone.terraria.client.item.ammo; + +import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior; + +public class ClientCrystalFragment { + public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() {}; +} 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 2710159..943e376 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.entity.projectile; +import com.lzxnone.terraria.item.ammo.CrystalBullet; import com.lzxnone.terraria.item.weapon.melee.*; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; @@ -22,6 +23,7 @@ public class StaticProjectileBehaviors { public static final String DEVILS_DEVASTATION_PROJECTILE = "devils_devastation_projectile"; public static final String DEVILS_DEVASTATION_PROJECTILE2 = "devils_devastation_projectile2"; public static final String DEVILS_DEVASTATION_PROJECTILE3 = "devils_devastation_projectile3"; + public static final String CRYSTAL_FRAGMENT = "crystal_fragment"; static { BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() { @@ -49,6 +51,7 @@ public class StaticProjectileBehaviors { BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE, DevilsDevastation.PROJECTILE_BEHAVIOR); BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE2, DevilsDevastation.PROJECTILE_BEHAVIOR2); BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE3, DevilsDevastation.PROJECTILE_BEHAVIOR3); + BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR); } public static IStaticProjectileBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 651600b..5ac2964 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -69,6 +69,7 @@ public class ModItems { public static final DeferredItem METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem SILVER_BULLET_PROJECTILE = ITEMS.register("silver_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem CRYSTAL_BULLET_PROJECTILE = ITEMS.register("crystal_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem CRYSTAL_FRAGMENT = ITEMS.register("crystal_fragment", () -> new Item(new Item.Properties())); public static final DeferredItem CURSED_BULLET_PROJECTILE = ITEMS.register("cursed_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem CHLOROPHYTE_BULLET_PROJECTILE = ITEMS.register("chlorophyte_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem HIGH_VELOCITY_BULLET_PROJECTILE = ITEMS.register("high_velocity_bullet_projectile", () -> new Item(new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java index b401256..1da37d0 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -1,9 +1,144 @@ package com.lzxnone.terraria.item.ammo; +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.item.ModItems; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.utils.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.*; +import org.joml.Vector3f; + +import java.util.List; public class CrystalBullet extends BasicBulletAmmo { - public static final float BASE_DAMAGE = 0.8f; + public static final float BASE_DAMAGE = 1.2f; public static final double SPEED = 3.0D; - public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); + + public static final float FRAGMENT_DAMAGE_MUL = 0.5f; + public static final double FRAGMENT_SPEED = 1.0; + public static final int FRAGMENT_TIME = 60; + public static final int FRAGMENT_COUNT = 3; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED); + summon.setDeltaMovement(motion); + + if(summon.level().isClientSide()) return; + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + for(int i = 0;i < FRAGMENT_COUNT;i++) { + summonProjectile(summon, (BASE_DAMAGE + damage) * FRAGMENT_DAMAGE_MUL); + } + ParticleUtil.addParticles( + (ServerLevel) summon.level(), ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), + summon.position(), new Vec3(0.2, 0.2, 0.2), + 0.2, 5 + ); + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + for(int i = 0;i < FRAGMENT_COUNT;i++) { + summonProjectile(summon, (BASE_DAMAGE + damage) * FRAGMENT_DAMAGE_MUL); + } + ParticleUtil.addParticles( + (ServerLevel) summon.level(), ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), + summon.position(), new Vec3(0.2, 0.2, 0.2), + 0.2, 5 + ); + this.onDied(summon); + } + } + }; + + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { + @Override + public void onHitEntity(StaticProjectile projectile, EntityHitResult result) { + if(!projectile.level().isClientSide()) { + Entity target = result.getEntity(); + Entity owner = projectile.getOwner(); + if(owner == null) return; + if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; + CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + if(DamageUtil.rangedAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), damage, 1.0f)) { + target.invulnerableTime = 5; + onDied(projectile); + } + } + } + + @Override + public void onHitBlock(StaticProjectile projectile, BlockHitResult result) { + if(projectile.level().isClientSide()) return; + if(!projectile.level().getBlockState(result.getBlockPos()).getCollisionShape(projectile.level(), result.getBlockPos()).isEmpty()) { + onDied(projectile); + } + } + }; + + public static void summonProjectile(StaticSummon summon, float damage) { + if(summon.level().isClientSide()) return; + if(summon.getOwner() == null) return; + Vec3 targetPos = MathUtil.getRandomPosOnRadius(summon.position(), 1); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(targetPos.subtract(summon.position()).toVector3f(), 0); + + StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), summon.level()); + projectile.setOwner(summon.getOwner()); + projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE).copy()); + projectile.setPos(summon.position()); + projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.CRYSTAL_FRAGMENT); + projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "item"); + 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.ITEM, new ItemStack(ModItems.CRYSTAL_FRAGMENT.get())); + projectile.getEntityData().set(StaticProjectile.SCALE_X, 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_Z, 0.5f); + projectile.getEntityData().set(StaticProjectile.RXPS, 10); + projectile.getEntityData().set(StaticProjectile.LIFETIME, FRAGMENT_TIME); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", FRAGMENT_SPEED)); + + CompoundTag customData = new CompoundTag(); + customData.putFloat("damage", damage); + projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); + + projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); + summon.level().addFreshEntity(projectile); + } } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java index 6e52d1d..4670fdf 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -31,6 +31,8 @@ public class CursedBullet extends BasicBulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(SPEED); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java index f7725cc..42c9afc 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -86,6 +86,8 @@ public class GoldenBullet extends BasicBulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java index 904c637..b5d6f1e 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -26,6 +26,8 @@ public class HighVelocityBullet extends BasicBulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(SPEED); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java index 8e0ce98..1c68b8a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -94,25 +94,27 @@ public class MeteorShot extends BulletAmmo { summon.setDeltaMovement(motion); //碰撞检测 - AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); - List targets = summon.level().getEntitiesOfClass( - Entity.class, - hitBox, - FilterUtil.createTargetFilter(summon, summon.getOwner()) - ); - if(!targets.isEmpty()) { - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; - float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; - int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + if(!summon.level().isClientSide()) { + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if (!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; - ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { - target.invulnerableTime = invulnerableTime; - if(MeteorShot.incrementHit(summon) >= getMaxHit()) { - this.onDied(summon); - return; + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if (DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + if (MeteorShot.incrementHit(summon) >= getMaxHit()) { + this.onDied(summon); + return; + } } } } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java index 8afef19..c58960a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -73,6 +73,8 @@ public class MusketBall extends BulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java index c457396..50be4e0 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -6,4 +6,5 @@ public class PartyBullet extends BasicBulletAmmo { public static final float BASE_DAMAGE = 0.8f; public static final double SPEED = 3.0D; public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java index 6c1f08d..ec5c1b7 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -86,6 +86,8 @@ public class SilverBullet extends BasicBulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java index 7879191..6982d31 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -73,6 +73,8 @@ public class TungstenBullet extends BasicBulletAmmo { Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); summon.setDeltaMovement(motion); + if(summon.level().isClientSide()) return; + //碰撞检测 AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); List targets = summon.level().getEntitiesOfClass( diff --git a/src/main/java/com/lzxnone/terraria/particle/CrystalFragmentParticle.java b/src/main/java/com/lzxnone/terraria/particle/CrystalFragmentParticle.java new file mode 100644 index 0000000..a91382f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/particle/CrystalFragmentParticle.java @@ -0,0 +1,69 @@ +package com.lzxnone.terraria.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.core.particles.SimpleParticleType; + +public class CrystalFragmentParticle extends TextureSheetParticle { + private final float rotSpeed; + private final float baseSize; + + protected CrystalFragmentParticle(ClientLevel level, double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed, SpriteSet spriteSet) { + super(level, x, y, z, xSpeed, ySpeed, zSpeed); + this.hasPhysics = false; + + this.friction = 0.9F; + this.gravity = 0.0F; + this.xd = xSpeed; + this.yd = ySpeed; + this.zd = zSpeed; + + this.baseSize = 0.03F + this.random.nextFloat() * 0.03F; + this.quadSize = this.baseSize; + + this.roll = this.random.nextFloat() * ((float)Math.PI * 2F); + this.oRoll = this.roll; + this.rotSpeed = (this.random.nextFloat() - 0.5F) * 0.5F; + + this.lifetime = 20 + this.random.nextInt(10); + + this.pickSprite(spriteSet); + } + + @Override + public void tick() { + super.tick(); + + this.oRoll = this.roll; + this.roll += this.rotSpeed; + + float lifeRatio = (float)this.age / (float)this.lifetime; + this.quadSize = this.baseSize * (1.0F - lifeRatio); + this.alpha = 1.0F - lifeRatio; + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + } + + public static class Provider implements ParticleProvider { + private final SpriteSet spriteSet; + + public Provider(SpriteSet spriteSet) { + this.spriteSet = spriteSet; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, + double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed) { + return new CrystalFragmentParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/particle/ModParticles.java b/src/main/java/com/lzxnone/terraria/particle/ModParticles.java index 4d47c95..708542a 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ModParticles.java +++ b/src/main/java/com/lzxnone/terraria/particle/ModParticles.java @@ -120,10 +120,12 @@ public class ModParticles { PARTICLE_TYPES.register("leaf_particle", () -> new SimpleParticleType(true)); public static final Supplier SOLAR_EXPLOSION_PARTICLE = PARTICLE_TYPES.register("solar_explosion_particle", () -> new SimpleParticleType(true)); + public static final Supplier CRYSTAL_FRAGMENT_PARTICLE = + PARTICLE_TYPES.register("crystal_fragment_particle", () -> new SimpleParticleType(true)); public static final Supplier DEVILS_DEVASTATION_RUNE_PARTICLE = PARTICLE_TYPES.register("devils_devastation_rune_particle", () -> new SimpleParticleType(true)); public static final Supplier DEVILS_DEVASTATION_RUNE_PARTICLE2 = PARTICLE_TYPES.register("devils_devastation_rune_particle2", () -> new SimpleParticleType(true)); -} \ No newline at end of file +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/crystal_fragment.json b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_fragment.json new file mode 100644 index 0000000..6d788a7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_fragment.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/crystal_fragment" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/particles/crystal_fragment_particle.json b/src/main/resources/assets/lzxnoneterraria/particles/crystal_fragment_particle.json new file mode 100644 index 0000000..ad9da72 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/particles/crystal_fragment_particle.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "lzxnoneterraria:crystal_fragment_particle" + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet_projectile.png new file mode 100644 index 0000000000000000000000000000000000000000..1f2665f3574068be6611c99dfb34aa91f65ea033 GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^GC<74!3HF~FYc)aQjEnx?oJHr&dIz4vLiD?B1$5B zeXNr6bM+Ea@{>~aDsl^esu&n-Dy)Fa+|-gpg^Jvqyke^gTP3gxD1^l#~=$>Fbx5m+O@q>*W`v z>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycO zWDy)d+*y*DhOjBG80syc2lYWR`i6Q2`f#&>T5Uk0R{lkqsX&`S=Gz(CfK{T1LG7{8 z2U(8f7>G~7qCl_OaoOm@gUyc1=a70NFeKGHT^vI=WRp_@w$41+zo-^kheb+pF)?rkFl)a#*PH; OjKR~@&t;ucLK6UPHz$n% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/crystal_fragment_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/crystal_fragment_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c80bbfc68ea8fc500ba7c2cb45197f5a665002 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*XJ7JzX3_D&{1A$cxz}B57O^rkDC* zP0Xo74a^&IYztc(f#Be6Cw8Sxdu?X{*^Jxy+J37`fWS7VP$iWD28OV`!Y9?X{k;Y> OjKR~@&t;ucLK6UPHz$n% literal 0 HcmV?d00001