diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-04-09 20:49:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 20:49:52 +0200 |
| commit | 58f1fec99d532c517aaf309772874ad5629ea39b (patch) | |
| tree | e4c52e21f7bbbc6920253584680dae33770693d1 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 259acef3cffac049f20c528cb21740e0ec394f3e (diff) | |
| download | skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.tar.gz skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.tar.bz2 skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.zip | |
Backend: Switch from LorenzUtils.inDungeons to DungeonAPI.inDungeon() (#1378)
Co-authored-by: Cal <cwolfson58@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt index c9b90d738..494fe1efa 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.utils -import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent import at.hannibal2.skyhanni.data.mob.MobFilter.isRealPlayer +import at.hannibal2.skyhanni.events.SkyHanniRenderEntityEvent +import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture import at.hannibal2.skyhanni.utils.LocationUtils.canBeSeen import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo @@ -123,7 +124,7 @@ object EntityUtils { val derpyMultiplier = if (LorenzUtils.isDerpy) 2 else 1 if (maxHealth == health * derpyMultiplier) return true - if (!boss && !LorenzUtils.inDungeons) { + if (!boss && !DungeonAPI.inDungeon()) { // Corrupted if (maxHealth == health * 3 * derpyMultiplier) return true // Runic diff --git a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt index 81f6e82fd..f9a279c46 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.utils import com.google.gson.Gson import com.google.gson.JsonElement -import com.google.gson.JsonObject import java.io.Reader import kotlin.reflect.jvm.javaType import kotlin.reflect.typeOf diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index d0064c4b9..c292abafd 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -51,10 +51,11 @@ object LorenzUtils { val inHypixelLobby get() = onHypixel && HypixelData.inLobby - val inDungeons get() = inSkyBlock && DungeonAPI.inDungeon() + @Deprecated("Use DungeonAPI.inDungeon() instead", ReplaceWith("DungeonAPI.inDungeon()")) + val inDungeons get() = DungeonAPI.inDungeon() /** - * Consider using IslandType.isInIsland() instead + * Consider using [IslandType.isInIsland] instead */ val skyBlockIsland get() = HypixelData.skyBlockIsland |