From 27f0b207793ddedf406fd56521d0ae0537279661 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 2 Nov 2023 23:30:22 +0100
Subject: code cleanup

---
 src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt      |  8 +++++---
 src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt      |  4 +++-
 .../at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java  | 11 +++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java

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

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 28afe3b4e..751271510 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -139,6 +139,7 @@ object LorenzUtils {
     }
 
     // TODO replace all calls with regex
+    @Deprecated("Do not use complicated string operations", ReplaceWith("Regex"))
     fun String.between(start: String, end: String): String = this.split(start, end)[1]
 
     // TODO use derpy() on every use case
@@ -426,11 +427,12 @@ object LorenzUtils {
 
         val tileSign = (this as AccessorGuiEditSign).tileSign
         return (tileSign.signText[1].unformattedText.removeColor() == "^^^^^^"
-                && tileSign.signText[2].unformattedText.removeColor() == "Set your"
-                && tileSign.signText[3].unformattedText.removeColor() == "speed cap!")
+            && tileSign.signText[2].unformattedText.removeColor() == "Set your"
+            && tileSign.signText[3].unformattedText.removeColor() == "speed cap!")
     }
 
-    fun inIsland(island: IslandType) = inSkyBlock && (skyBlockIsland == island || island == IslandType.CATACOMBS && inDungeons)
+    fun inIsland(island: IslandType) =
+        inSkyBlock && (skyBlockIsland == island || island == IslandType.CATACOMBS && inDungeons)
 
     fun IslandType.isInIsland() = inIsland(this)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 66eb0faad..0900b3812 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -235,4 +235,6 @@ object StringUtils {
     fun String.convertToFormatted(): String {
         return this.replace("&&", "§")
     }
-}
\ No newline at end of file
+
+    fun Pattern.matches(string: String) = matcher(string).matches()
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java
new file mode 100644
index 000000000..03c256256
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java
@@ -0,0 +1,11 @@
+package at.hannibal2.skyhanni.utils.jsonobjects;
+
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+
+public class TabListJson {
+
+    @Expose
+    public List<String> sun_moon_symbols;
+}
-- 
cgit