diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
11 files changed, 23 insertions, 23 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt index 646f29847..9658ab2d3 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.PacketEvent -import at.hannibal2.skyhanni.events.PlayParticleEvent import at.hannibal2.skyhanni.events.PlaySoundEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzVec import net.minecraft.network.play.server.S29PacketSoundEffect @@ -36,7 +36,7 @@ class MinecraftData { val packet = event.packet if (packet !is S2APacketParticles) return - if (PlayParticleEvent( + if (ReceiveParticleEvent( packet.particleType!!, LorenzVec(packet.xCoordinate, packet.yCoordinate, packet.zCoordinate), packet.particleCount, diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlayParticleEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt index 08548f1f4..81c849d3c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/PlayParticleEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt @@ -5,7 +5,7 @@ import net.minecraft.util.EnumParticleTypes import net.minecraftforge.fml.common.eventhandler.Cancelable @Cancelable -class PlayParticleEvent( +class ReceiveParticleEvent( val type: EnumParticleTypes, val location: LorenzVec, val count: Int, diff --git a/src/main/java/at/hannibal2/skyhanni/events/SpawnParticleEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderParticleEvent.kt index cb43492cc..0146c0467 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SpawnParticleEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderParticleEvent.kt @@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.events import net.minecraftforge.fml.common.eventhandler.Cancelable @Cancelable -class SpawnParticleEvent(val particleId: Int, val callerClass: String, val x: Double, val y: Double, val z: Double) : +class RenderParticleEvent(val particleId: Int, val callerClass: String, val x: Double, val y: Double, val z: Double) : LorenzEvent()
\ No newline at end of file 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", diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt index 0558aa955..459d192f8 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.mixins.hooks -import at.hannibal2.skyhanni.events.SpawnParticleEvent +import at.hannibal2.skyhanni.events.RenderParticleEvent import at.hannibal2.skyhanni.utils.LorenzUtils import org.spongepowered.asm.mixin.injection.callback.CallbackInfo @@ -22,7 +22,7 @@ class RenderGlobalHook { "net.minecraft.network.play.server.S2APacketParticles", ) ?: "null" - if (SpawnParticleEvent(particleId, callerClass, x, y, z).postAndCatch()) { + if (RenderParticleEvent(particleId, callerClass, x, y, z).postAndCatch()) { ci.cancel() return } diff --git a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt index feefb60d7..c82048e8c 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.test import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.PacketEvent -import at.hannibal2.skyhanni.events.PlayParticleEvent import at.hannibal2.skyhanni.events.PlaySoundEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LorenzDebug import at.hannibal2.skyhanni.utils.LorenzLogger @@ -123,7 +123,7 @@ class LorenzTest { } @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true) - fun onHypExplosions(event: PlayParticleEvent) { + fun onHypExplosions(event: ReceiveParticleEvent) { // if (!LorenzUtils.inSkyblock) return // when (event.type) { // EnumParticleTypes.EXPLOSION_LARGE, @@ -341,7 +341,7 @@ class LorenzTest { } @SubscribeEvent - fun onParticlePlay(event: PlayParticleEvent) { + fun onParticlePlay(event: ReceiveParticleEvent) { if (!shouldLogPackets) return // val particleType = event.type |