diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-03-10 23:27:31 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 13:27:31 +0100 |
| commit | 498afd58e3405d473107e08a3b1891f93f76a96a (patch) | |
| tree | 9eabf6a6642cfa9d8939f5f4572c3a5cf00a3a6d /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | cb62e10474ac7c5aacb52d6cd04095e65051c060 (diff) | |
| download | skyhanni-498afd58e3405d473107e08a3b1891f93f76a96a.tar.gz skyhanni-498afd58e3405d473107e08a3b1891f93f76a96a.tar.bz2 skyhanni-498afd58e3405d473107e08a3b1891f93f76a96a.zip | |
Feature: Display current and upcoming mining events (#1040)
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt | 24 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 4 |
2 files changed, 3 insertions, 25 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt index e9d755fab..81f6e82fd 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt @@ -13,27 +13,3 @@ inline fun <reified T : Any> Gson.fromJson(jsonElement: JsonElement): T = this.fromJson(jsonElement, typeOf<T>().javaType) inline fun <reified T : Any> Gson.fromJson(reader: Reader): T = this.fromJson(reader, typeOf<T>().javaType) - -fun JsonObject.getBoolean(key: String): Boolean { - return if (has(key)) { - try { - get(key).asBoolean - } catch (_: Exception) { - false - } - } else { - false - } -} - -fun JsonObject.getStringOrValue(key: String, alternative: String): String { - return if (has(key)) { - try { - get(key).asString - } catch (_: Exception) { - alternative - } - } else { - alternative - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 80fca6178..7df997f0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -366,6 +366,8 @@ object LorenzUtils { @Deprecated("moved", ReplaceWith("ChatUtils.sendMessageToServer(message)")) fun sendMessageToServer(message: String) = ChatUtils.sendMessageToServer(message) + fun inAdvancedMiningIsland() = IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland() + fun inMiningIsland() = IslandType.GOLD_MINES.isInIsland() || IslandType.DEEP_CAVERNS.isInIsland() - || IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland() + || inAdvancedMiningIsland() } |