From 6be0064866d72f1e698fa31c4c5c207894d7437b Mon Sep 17 00:00:00 2001 From: Jenny Date: Sun, 26 Jan 2025 12:46:29 +0100 Subject: [PATCH] new particle textures & new algorithm for arrow particle position --- gradle.properties | 2 +- .../entities/arrows/concussiveArrow.java | 14 ++++++++------ .../entities/arrows/tntArrow.java | 16 ++++++++-------- .../particles/ArrowParticle.java | 1 - .../particle/particle_concussive_arrow.png | Bin 123 -> 132 bytes .../textures/particle/particle_tnt_arrow.png | Bin 123 -> 132 bytes 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 94dc23d..a599aab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ mod_name=Enhanced Explosives # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=0.8.7 +mod_version=0.8.8 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java index 88014ec..301fc8a 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/concussiveArrow.java @@ -26,7 +26,6 @@ public class concussiveArrow extends baseArrow{ super.tick(); if (this.inGround) { this.level().explode(this, getX(), getY(), getZ(), 8.0f, Level.ExplosionInteraction.NONE); - //this.level().explode(this, null, new NilExplosionCalculator(), this.getX(), this.getY(), this.getZ(), 8, false, Level.ExplosionInteraction.NONE); this.discard(); } } @@ -45,11 +44,14 @@ public class concussiveArrow extends baseArrow{ @Override public void spawnParticles(float partialTicks) { for (int i = 1; i <= ConfigClient.calcPCount(3); i++) { - Vec3 pos = getPosition(partialTicks); - double x = pos.x + (double) level().getRandom().nextInt(-5, 6) / 10; - double y = pos.y + (double) level().getRandom().nextInt(-5, 6) / 10; - double z = pos.z + (double) level().getRandom().nextInt(-5, 6) / 10; - level().addParticle(particles.CONCUSSIVE_ARROW_PARTICLE.get(), x, y, z, this.getDeltaMovement().x, this.getDeltaMovement().y, this.getDeltaMovement().z); + double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100; + Vec3 DeltaMovement = getDeltaMovement(); + Vec3 pos = new Vec3( + (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10, + 0, + (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10 + ).normalize().multiply(m, m, m).add(getPosition(partialTicks)); + level().addParticle(particles.CONCUSSIVE_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z); } } } diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java index 50e8ce2..f1c1e65 100644 --- a/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java +++ b/src/main/java/com/jenny/enhancedexplosives/entities/arrows/tntArrow.java @@ -24,9 +24,6 @@ public class tntArrow extends baseArrow { @Override public void tick() { super.tick(); - if (level().isClientSide()) { - //spawnParticles(); - } if (this.inGround) { this.level().explode(this, this.getX(), this.getY(), this.getZ(), 2, Level.ExplosionInteraction.TNT); this.discard(); @@ -47,11 +44,14 @@ public class tntArrow extends baseArrow { @Override public void spawnParticles(float partialTicks) { for (int i = 1; i <= ConfigClient.calcPCount(3); i++) { - Vec3 pos = getPosition(partialTicks); - double x = pos.x + (double) level().getRandom().nextInt(-5, 6) / 10; - double y = pos.y + (double) level().getRandom().nextInt(-5, 6) / 10; - double z = pos.z + (double) level().getRandom().nextInt(-5, 6) / 10; - level().addParticle(particles.TNT_ARROW_PARTICLE.get(), x, y, z, this.getDeltaMovement().x, this.getDeltaMovement().y, this.getDeltaMovement().z); + double m = (double) level().getRandom().nextIntBetweenInclusive(- 100, 100) / 100; + Vec3 DeltaMovement = getDeltaMovement(); + Vec3 pos = new Vec3( + (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10, + 0, + (double) level().getRandom().nextIntBetweenInclusive(-5, 5) / 10 + ).normalize().multiply(m, m, m).add(getPosition(partialTicks)); + level().addParticle(particles.TNT_ARROW_PARTICLE.get(), pos.x, pos.y, pos.z, DeltaMovement.x, DeltaMovement.y, DeltaMovement.z); } } } diff --git a/src/main/java/com/jenny/enhancedexplosives/particles/ArrowParticle.java b/src/main/java/com/jenny/enhancedexplosives/particles/ArrowParticle.java index 024c6ce..89e2d6e 100644 --- a/src/main/java/com/jenny/enhancedexplosives/particles/ArrowParticle.java +++ b/src/main/java/com/jenny/enhancedexplosives/particles/ArrowParticle.java @@ -18,7 +18,6 @@ public class ArrowParticle extends TextureSheetParticle { this.xd = xd; this.yd = yd; this.zd = zd; - this.quadSize *= 0.85F; this.quadSizeStart = this.quadSize; this.lifetime = 20; this.setSpriteFromAge(spriteSet); diff --git a/src/main/resources/assets/enhancedexplosives/textures/particle/particle_concussive_arrow.png b/src/main/resources/assets/enhancedexplosives/textures/particle/particle_concussive_arrow.png index b160df51752e94d775fa2bf07a647aab04a8e4fa..314891d0eac19daeb555de7a5349ba5745e723e8 100644 GIT binary patch delta 89 zcmb*<@qIkNJ&_jStUoR=TmNFbKOFY+w-XZvQW7SmMCAt5bt( t!cCtYJ?)HQG0Pr^yG%+xw3I`QjUnTuJo6qa_xB7y;OXk;vd$@?2>{*<@qIkNJ#T=jKdEPjO(@dBMa31Se+A*r4gaCgHYd_JIz) ihIf2TVFDoz0t^fSH9X7mgJp6UfWXt$&t;ucLK6UO_Zn;f diff --git a/src/main/resources/assets/enhancedexplosives/textures/particle/particle_tnt_arrow.png b/src/main/resources/assets/enhancedexplosives/textures/particle/particle_tnt_arrow.png index 2bf8a6710db95bea51d46e0d1b6fb86ea67f13a4..8ae8e44c82fe8539237aefd9524916ecbe864597 100644 GIT binary patch delta 89 zcmbIcDwBkMkQF8x_CY;&o$FVGwpV*wAn_O6tF)VTl9du1*cE t2{(Oq^t3aI#VmUu?lLL)&{7UHHilofr62EEYAnY91fH&bF6*2UngAYsA_D*b delta 80 zcmZo+te#-#W$NkT7$Pw>IcDwBkMkM1oYvn>NO54+dBMa31Se+A*r4gaCgHYd_JIz) ihIf2TVFDoz0t^gueR0D-5gpUXO@geCxV{u+q@