add blaze particle hide feature

3 files changed, 47 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt
new file mode 100644
index 000000000..1216afe6a
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt
@@ -0,0 +1,28 @@
+package at.hannibal2.skyhanni.features
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.SpawnParticleEvent
+import at.hannibal2.skyhanni.utils.EntityUtils.getEntitiesNearby
+import at.hannibal2.skyhanni.utils.LorenzVec
+import net.minecraft.client.Minecraft
+import net.minecraft.entity.monster.EntityBlaze
+import net.minecraft.util.EnumParticleTypes
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class HideBlazeParticles {
+
+    @SubscribeEvent
+    fun onSpawnParticle(event: SpawnParticleEvent) {
+        val particleId = event.particleId
+        if (!SkyHanniMod.feature.misc.hideBlazeParticles) return
+
+        val particleType = EnumParticleTypes.values().find { it.particleID == particleId }
+        if (particleType != EnumParticleTypes.SMOKE_LARGE) return
+
+        val location = LorenzVec(event.x, event.y, event.z)
+        val clazz = EntityBlaze::class.java
+        if (Minecraft.getMinecraft().theWorld.getEntitiesNearby(clazz, location, 3.0).isNotEmpty()) {
+            event.isCanceled = true
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
index feb13b2eb..266ec3da8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
@@ -37,7 +37,16 @@ class AshfangHideParticles {
         if (!isEnabled()) return
         if (!hideParticles) return
 
-        event.isCanceled = true
+
+        when (event.callerClass) {
+            "net.minecraft.block.BlockFire",
+            "net.minecraft.entity.monster.EntityBlaze",
+            "net.minecraft.entity.projectile.EntityFireball",
+            -> {
+                event.isCanceled = true
+            }
+        }
+
     }
 
     private fun isEnabled() = LorenzUtils.inSkyblock && SkyHanniMod.feature.ashfang.hideParticles
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
index b595f3cfa..5455d3067 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
@@ -47,7 +47,15 @@ class BlazeSlayerClearView {
     @SubscribeEvent
     fun onSpawnParticle(event: SpawnParticleEvent) {
         if (isEnabled()) {
-            event.isCanceled = true
+            when (event.callerClass) {
+                "net.minecraft.block.BlockFire",
+                "net.minecraft.entity.monster.EntityBlaze",
+                "net.minecraft.entity.projectile.EntityFireball",
+                -> {
+                    event.isCanceled = true
+                    return
+                }
+            }
         }
     }