diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index 2f74866..b38e583 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -59,7 +59,7 @@ public class LzxnoneTerrariaClient { event.registerSpriteSet(ModParticles.ZENITH_TRAIL_PARTICLE.get(), ZenithTrailParticle.Provider::new); }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { - event.registerSpriteSet(ModParticles.IRON_SPARK_PARTICLE.get(), IronSparkParticle.Provider::new); + event.registerSpecial(ModParticles.IRON_SPARK_PARTICLE.get(), new IronSparkParticle.Provider()); }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.CIRCLE_PARTICLE.get(), CircleParticle.Provider::new); diff --git a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java index 3dd20ec..8033fb8 100644 --- a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java @@ -16,7 +16,7 @@ public class IronSparkParticle extends TextureSheetParticle { protected IronSparkParticle(ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed, - IronSparkParticleOptions options, SpriteSet spriteSet) { + IronSparkParticleOptions options) { super(level, x, y, z, xSpeed, ySpeed, zSpeed); this.hasPhysics = false; @@ -40,8 +40,6 @@ public class IronSparkParticle extends TextureSheetParticle { this.xd = velocity.x; this.yd = velocity.y; this.zd = velocity.z; - - this.pickSprite(spriteSet); } @Override @@ -114,17 +112,11 @@ public class IronSparkParticle extends TextureSheetParticle { } public static class Provider implements ParticleProvider { - private final SpriteSet spriteSet; - - public Provider(SpriteSet spriteSet) { - this.spriteSet = spriteSet; - } - @Override public Particle createParticle(IronSparkParticleOptions type, ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { - return new IronSparkParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, type, this.spriteSet); + return new IronSparkParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, type); } } } diff --git a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java index 7bd5618..59b389f 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java @@ -143,7 +143,7 @@ public class ZenithTrailParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json b/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json deleted file mode 100644 index 0d62045..0000000 --- a/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": [ - "lzxnoneterraria:iron_spark_particle" - ] -} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png deleted file mode 100644 index 961d89b..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png deleted file mode 100644 index 6f950bf..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle0.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle0.png deleted file mode 100644 index e0200f9..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle0.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png deleted file mode 100644 index f6d7a4d..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle2.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle2.png deleted file mode 100644 index 94e15eb..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle2.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png deleted file mode 100644 index 9018e32..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle1.png deleted file mode 100644 index 2178bb7..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle1.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle2.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle2.png deleted file mode 100644 index a03960f..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle2.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png deleted file mode 100644 index 95f4d86..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_excalibur_hit_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_excalibur_hit_particle.png deleted file mode 100644 index f112bfc..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_excalibur_hit_particle.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png deleted file mode 100644 index 8802bd0..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png deleted file mode 100644 index 4f65357..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png deleted file mode 100644 index eca85ae..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png and /dev/null differ