summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/JsonUtils.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt4
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()
}