fixed BazaarOrderHelper and added essence to bazaar

3 files changed, 27 insertions, 17 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index b9b11479f..aafed0994 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -191,4 +191,11 @@ object ItemUtils {
         return nbt.getCompoundTag("SkullOwner").getCompoundTag("Properties")
             .getTagList("textures", Constants.NBT.TAG_COMPOUND).getCompoundTagAt(0).getString("Value")
     }
+
+    //extra method for shorter name and kotlin nullability logic
+    var ItemStack.name: String?
+        get() = this.displayName
+        set(value) {
+            setStackDisplayName(value)
+        }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index c4bc912ee..04d7bb34a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -58,23 +58,6 @@ object LorenzUtils {
 
     fun String.matchRegex(@Language("RegExp") regex: String): Boolean = regex.toRegex().matches(this)
 
-    fun String.removeColor(): String {
-        val builder = StringBuilder()
-        var skipNext = false
-        for (c in this.toCharArray()) {
-            if (c == '§') {
-                skipNext = true
-                continue
-            }
-            if (skipNext) {
-                skipNext = false
-                continue
-            }
-            builder.append(c)
-        }
-
-        return builder.toString()
-    }
 
     fun SimpleDateFormat.formatCurrentTime(): String = this.format(System.currentTimeMillis())
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
new file mode 100644
index 000000000..a28f6fd2e
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -0,0 +1,20 @@
+package at.hannibal2.skyhanni.utils
+
+object StringUtils {
+
+    fun String.firstLetterUppercase(): String {
+        if (isEmpty()) return this
+
+        val lowercase = this.lowercase()
+        val first = lowercase[0].uppercase()
+        return first + lowercase.substring(1)
+    }
+
+    fun String.removeColor(): String {
+        return replace("(?i)\\u00A7.", "")
+    }
+
+//    fun cleanColour(`in`: String): String? {
+//        return `in`.replace("(?i)\\u00A7.".toRegex(), "")
+//    }
+}
\ No newline at end of file