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/data | |
| 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/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt index 85b0e8ec7..ebfb4a892 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.data.jsonobjects.repo.MaxwellPowersJson import at.hannibal2.skyhanni.events.InventoryOpenEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent +import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardElement import at.hannibal2.skyhanni.test.command.ErrorManager @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.groupOrNull -import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.NumberUtil.formatInt import at.hannibal2.skyhanni.utils.StringUtils.matchFirst import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher @@ -250,7 +250,7 @@ object MaxwellAPI { inventoryMPPattern.matchMatcher(line) { // MagicalPower is boosted in catacombs - if (IslandType.CATACOMBS.isInIsland()) return@matchMatcher + if (DungeonAPI.inDungeon()) return@matchMatcher val mp = group("mp") magicalPower = mp.formatInt() diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java index 3388cb62c..4173fa0a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo; import com.google.gson.annotations.Expose; + import java.util.Map; public class ArrowTypeJson { |