From cfeac0b6a71c592b61c53fad192eb22bb24b0f54 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Wed, 7 Sep 2022 05:09:48 +0200
Subject: 0.7 (#2)

* code cleanup

* Option to hide the Skyblock Level from the chat messages,
Option to change the way the Skyblock Level gets displayed in the chat

* change version to 0.6.1

* add highlight the voidling extremist in pink color

* add highlight corrupted mobs in purple color

* fixed highlight corrupted mobs in purple color in the private island

* another minor fix for highlight corrupted mobs in purple color

* created EntityHealthUpdateEvent and fixing CorruptedMobHighlight

* using EntityHealthUpdateEvent everywhere

* added marking a player with yellow color

* highlight slayer miniboss in blue color

* /copyentities now shows health correctly for every entity

* infer fix

* fixing bazaar message filter

* changelog

* hides the death messages of other players, except for players who are close to the player.

* hiding tip messages

* highlight deathmites in dungeon in red color

* code cleanup

* code cleanup

* hide tnt laying around in dungeon

* fix infer

* remove debug

* Added hide Blessings laying around in dungeon.
Added hide Revive Stones laying around in dungeon.

* Hide Premium Flesh laying around in dungeon.

* edited LorenzTest

* Added dungeon copilot and separate filter for hiding dungeon key and door messages.

* Added hide Journal Entry pages laying around in dungeon.

* Added hide Skeleton Skulls laying around in dungeon.

* credits

* Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)

* Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)

* fix wording

* clarification

* small fixes

* Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)

* better/more readability for CopyNearbyEntitiesCommand

* make version 0.7
---
 src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt   | 2 +-
 src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 3 +++
 src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 9 +++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index b1d3ef7a7..3b38bd84a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -15,7 +15,7 @@ object ItemUtils {
 
     fun ItemStack.cleanName() = this.displayName.removeColor()
 
-    fun isSack(name: String): Boolean = name.endsWith(" Sack")//TODO change
+    fun isSack(name: String): Boolean = name.endsWith(" Sack")//TODO use item id or api or something? or dont, its working fine now
 
     fun ItemStack.getLore(): List<String> {
         val tagCompound = this.tagCompound ?: return emptyList()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 322fc2b44..602dbad19 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -24,6 +24,9 @@ object LorenzUtils {
     val skyBlockIsland: String
         get() = HypixelData.mode
 
+    val inKuudraFight: Boolean
+        get() = skyBlockIsland == "Instanced"
+
     const val DEBUG_PREFIX = "[Debug] §7"
     private val log = LorenzLogger("chat/mod_sent")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 39c7217f6..5ce94c031 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -47,18 +47,23 @@ object RenderUtils {
         if (lightingState) GlStateManager.enableLighting()
     }
 
-    fun RenderWorldLastEvent.drawColor(location: LorenzVec, color: LorenzColor, beacon: Boolean = false) {
+    fun RenderWorldLastEvent.drawColor(location: LorenzVec, color: LorenzColor, beacon: Boolean = false, alpha: Float = -1f) {
         val (viewerX, viewerY, viewerZ) = getViewerPos(partialTicks)
         val x = location.x - viewerX
         val y = location.y - viewerY
         val z = location.z - viewerZ
         val distSq = x * x + y * y + z * z
+        val realAlpha = if (alpha == -1f) {
+            (0.1f + 0.005f * distSq.toFloat()).coerceAtLeast(0.2f)
+        } else {
+            alpha
+        }
         GlStateManager.disableDepth()
         GlStateManager.disableCull()
         drawFilledBoundingBox(
             AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1).expandBlock(),
             color.toColor(),
-            (0.1f + 0.005f * distSq.toFloat()).coerceAtLeast(0.2f)
+            realAlpha
         )
         GlStateManager.disableTexture2D()
         if (distSq > 5 * 5 && beacon) renderBeaconBeam(x, y + 1, z, color.toColor().rgb, 1.0f, partialTicks)
-- 
cgit