fixed bazaar api checking too often

2 files changed, 46 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt
index 1205c202b..ff4c80d69 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt
@@ -5,9 +5,16 @@ import at.hannibal2.skyhanni.events.ItemClickInHandEvent
 import at.hannibal2.skyhanni.events.PacketEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils
+import at.hannibal2.skyhanni.utils.SpecialColour
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.network.play.server.S2APacketParticles
 import net.minecraft.util.EnumParticleTypes
+import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.lwjgl.opengl.GL11
+import java.awt.Color
 
 class FireVeilWandParticles {
 
@@ -15,12 +22,13 @@ class FireVeilWandParticles {
 
     @SubscribeEvent
     fun onChatPacket(event: PacketEvent.ReceiveEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
+        if (SkyHanniMod.feature.abilities.fireVeilWandDisplay == 0) return
+        if (System.currentTimeMillis() > lastClick + 5_500) return
 
         val packet = event.packet
         if (packet !is S2APacketParticles) return
 
-        if (System.currentTimeMillis() > lastClick + 5_500) return
 
         if (packet.particleType == EnumParticleTypes.FLAME && packet.particleCount == 1 && packet.particleSpeed == 0f &&
             packet.xOffset == 0f &&
@@ -33,7 +41,7 @@ class FireVeilWandParticles {
 
     @SubscribeEvent
     fun onItemClick(event: ItemClickInHandEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
         if (event.clickType != ItemClickInHandEvent.ClickType.RIGHT_CLICK) return
 
         val itemInHand = event.itemInHand ?: return
@@ -44,7 +52,39 @@ class FireVeilWandParticles {
         }
     }
 
-    private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.abilities.fireVeilWandHider
+    @SubscribeEvent
+    fun onRenderWorld(event: RenderWorldLastEvent) {
+        if (!LorenzUtils.inSkyblock) return
+        if (SkyHanniMod.feature.abilities.fireVeilWandDisplay != 1) return
+        if (System.currentTimeMillis() > lastClick + 5_500) return
+
+        val color = Color(SpecialColour.specialToChromaRGB(SkyHanniMod.feature.abilities.fireVeilWandDisplayColor), true)
+
+        GlStateManager.pushMatrix()
+        GL11.glNormal3f(0.0f, 1.0f, 0.0f)
+
+        GlStateManager.enableDepth()
+        GlStateManager.enableBlend()
+        GlStateManager.depthFunc(GL11.GL_LEQUAL)
+        GlStateManager.disableCull()
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0)
+        GlStateManager.enableAlpha()
+        GlStateManager.disableTexture2D()
+
+        GlStateManager.disableDepth()
+        RenderUtils.drawCircle(
+            Minecraft.getMinecraft().thePlayer,
+            event.partialTicks,
+            3.5,
+            color
+        )
+        GlStateManager.enableDepth()
+
+        GlStateManager.enableCull()
+        GlStateManager.enableTexture2D()
+        GlStateManager.enableDepth()
+        GlStateManager.disableBlend()
+        GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f)
+        GlStateManager.popMatrix()
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt
index f2cf90190..15b497936 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.events.RenderMobColoredEvent
 import at.hannibal2.skyhanni.events.withAlpha
 import at.hannibal2.skyhanni.features.damageindicator.BossType
 import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager
-import at.hannibal2.skyhanni.test.LorenzTest
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.RenderUtils.drawColor
@@ -76,7 +75,7 @@ class EndermanSlayerBeacon {
         if (!isEnabled()) return
 
         if (event.entity in armorStands) {
-            event.color = LorenzColor.DARK_RED.toColor().withAlpha(LorenzTest.a.toInt())
+            event.color = LorenzColor.DARK_RED.toColor().withAlpha(1)
         }
     }