From 22dcc7c8954c595f5465d8bde20c077b57679465 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 2 Oct 2022 13:32:42 +0200 Subject: renamed particle events --- .../java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt | 4 ++-- .../at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt | 2 +- .../at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt | 2 +- .../skyhanni/features/itemabilities/FireVeilWandParticles.kt | 4 ++-- .../skyhanni/features/nether/ashfang/AshfangHideParticles.kt | 8 ++++---- .../skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt index 1216afe6a..6387ab145 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/HideBlazeParticles.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.SpawnParticleEvent +import at.hannibal2.skyhanni.events.RenderParticleEvent import at.hannibal2.skyhanni.utils.EntityUtils.getEntitiesNearby import at.hannibal2.skyhanni.utils.LorenzVec import net.minecraft.client.Minecraft @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class HideBlazeParticles { @SubscribeEvent - fun onSpawnParticle(event: SpawnParticleEvent) { + fun onSpawnParticle(event: RenderParticleEvent) { val particleId = event.particleId if (!SkyHanniMod.feature.misc.hideBlazeParticles) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index 86c2a770b..e8eda0785 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -105,7 +105,7 @@ class DungeonCleanEnd { } @SubscribeEvent - fun onPlayParticle(event: PlayParticleEvent) { + fun onPlayParticle(event: ReceiveParticleEvent) { if (shouldBlock()) { event.isCanceled = true } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt index 6fbc542c0..f1c80062f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt @@ -173,7 +173,7 @@ class DungeonHideItems { } @SubscribeEvent - fun onReceivePacket(event: PlayParticleEvent) { + fun onReceivePacket(event: ReceiveParticleEvent) { if (!LorenzUtils.inDungeons) return if (!SkyHanniMod.feature.dungeon.hideSuperboomTNT && !SkyHanniMod.feature.dungeon.hideReviveStone) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt index 28d605946..93da7dc7a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.itemabilities import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.ItemClickInHandEvent -import at.hannibal2.skyhanni.events.PlayParticleEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils @@ -18,7 +18,7 @@ class FireVeilWandParticles { var lastClick = 0L @SubscribeEvent - fun onChatPacket(event: PlayParticleEvent) { + fun onChatPacket(event: ReceiveParticleEvent) { if (!LorenzUtils.inSkyblock) return if (SkyHanniMod.feature.itemAbilities.fireVeilWandDisplay == 0) return if (System.currentTimeMillis() > lastClick + 5_500) return 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 0a43f6940..c299e7ef6 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 @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.nether.ashfang import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.CheckRenderEntityEvent -import at.hannibal2.skyhanni.events.PlayParticleEvent -import at.hannibal2.skyhanni.events.SpawnParticleEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent +import at.hannibal2.skyhanni.events.RenderParticleEvent import at.hannibal2.skyhanni.features.damageindicator.BossType import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager import at.hannibal2.skyhanni.utils.ItemUtils.name @@ -29,14 +29,14 @@ class AshfangHideParticles { } @SubscribeEvent - fun onReceivePacket(event: PlayParticleEvent) { + fun onReceivePacket(event: ReceiveParticleEvent) { if (!isEnabled()) return event.isCanceled = true } @SubscribeEvent - fun onSpawnParticle(event: SpawnParticleEvent) { + fun onSpawnParticle(event: RenderParticleEvent) { if (!isEnabled()) return 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 757f401a2..8a9f58718 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 @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.slayer.blaze import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.CheckRenderEntityEvent -import at.hannibal2.skyhanni.events.PlayParticleEvent -import at.hannibal2.skyhanni.events.SpawnParticleEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent +import at.hannibal2.skyhanni.events.RenderParticleEvent import at.hannibal2.skyhanni.features.damageindicator.BossType import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture @@ -40,14 +40,14 @@ class BlazeSlayerClearView { } @SubscribeEvent - fun onReceivePacket(event: PlayParticleEvent) { + fun onReceivePacket(event: ReceiveParticleEvent) { if (isEnabled()) { event.isCanceled = true } } @SubscribeEvent - fun onSpawnParticle(event: SpawnParticleEvent) { + fun onSpawnParticle(event: RenderParticleEvent) { if (isEnabled()) { when (event.callerClass) { "net.minecraft.block.BlockFire", -- cgit