From 23942c99722540226afc0eeee6fae34705976a58 Mon Sep 17 00:00:00 2001
From: Jenny <jennytsonline@proton.me>
Date: Mon, 27 Jan 2025 23:29:42 +0100
Subject: [PATCH] more particle spawning rewrite

---
 gradle.properties                                    |  2 +-
 .../entities/tnt/ClusterPrimedTNT.java               |  1 -
 .../entities/tnt/basePrimedTNT.java                  | 12 +++++++-----
 .../entities/tnt/homingPrimedTNT.java                |  5 ++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8b20d8e..2eb4ec8 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.9.0
+mod_version=0.9.1
 # 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/tnt/ClusterPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java
index fde6f46..4ec5ff1 100644
--- a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java
+++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/ClusterPrimedTNT.java
@@ -1,6 +1,5 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
-import com.jenny.enhancedexplosives.blocks.blocks;
 import com.jenny.enhancedexplosives.entities.entities;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java
index d70af11..debabca 100644
--- a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java
+++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/basePrimedTNT.java
@@ -1,5 +1,6 @@
 package com.jenny.enhancedexplosives.entities.tnt;
 
+import com.jenny.enhancedexplosives.config.ConfigClient;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.syncher.EntityDataAccessor;
@@ -66,7 +67,9 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
 
     public void tick() {
         if (level().isClientSide) {
-            spawnParticles(0);
+            if (ConfigClient.tntParticles) {
+                spawnParticles();
+            }
         }
         if (!this.isNoGravity()) {
             this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D));
@@ -87,9 +90,6 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
             }
         } else {
             this.updateInWaterStateAndDoFluidPushing();
-            if (this.level().isClientSide) {
-                this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
-            }
         }
     }
 
@@ -138,5 +138,7 @@ public abstract class basePrimedTNT extends Entity implements TraceableEntity {
         return this.fuse;
     }
 
-    public void spawnParticles(float partialTicks) {}
+    public void spawnParticles() {
+        level().addParticle(ParticleTypes.SMOKE, getX(), getY(), getZ(), 0, 0, 0);
+    }
 }
diff --git a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java
index fe6910c..321f3ce 100644
--- a/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java
+++ b/src/main/java/com/jenny/enhancedexplosives/entities/tnt/homingPrimedTNT.java
@@ -96,10 +96,9 @@ public class homingPrimedTNT extends basePrimedTNT {
     }
 
     @Override
-    public void spawnParticles(float partialTicks) {
-        Vec3 pos = getPosition(partialTicks);
+    public void spawnParticles() {
         for (int i = 1; i <= ConfigClient.calcPCount(1); i++) {
-            level().addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, 0, 0, 0);
+            level().addParticle(ParticleTypes.FLAME, getX(), getY(), getZ(), 0, 0, 0);
         }
     }