Merge pull request #267

* added random code cleanups

* Merge branch 'beta' into random_code_cleanup

* ...

5 files changed, 2 insertions, 88 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChromaUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChromaUtils.kt
deleted file mode 100644
index c1326fe8e..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/ChromaUtils.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-//package at.hannibal2.skyhanni.utils
-//
-//import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-//import net.minecraft.client.Minecraft
-//import net.minecraft.util.EnumChatFormatting
-//import java.util.regex.Matcher
-//import java.util.regex.Pattern
-//
-//object ChromaUtils {
-//
-//    private val CHROMA_REPLACE_PATTERN = Pattern.compile("\u00a7z(.+?)(?=\u00a7|$)")
-//    private val startTime = 0
-//
-//    fun chromaStringByColourCode(str: String): String? {
-//        var str = str
-//        if (str.contains("\u00a7z")) {
-//            val matcher: Matcher = CHROMA_REPLACE_PATTERN.matcher(str)
-//            val sb = StringBuffer()
-//            while (matcher.find()) {
-//                matcher.appendReplacement(
-//                    sb,
-//                    chromaString(matcher.group(1))
-//                        .replace("\\", "\\\\")
-//                        .replace("$", "\\$")
-//                )
-//            }
-//            matcher.appendTail(sb)
-//            str = sb.toString()
-//        }
-//        return str
-//    }
-//
-//    fun chromaString(str: String): String? {
-//        return chromaString(str, 0f, false)
-//    }
-//
-//    fun chromaString(str: String, offset: Float, bold: Boolean): String {
-//        var str = str
-//        str = str.removeColor()
-//        val currentTimeMillis = System.currentTimeMillis()
-//        if (startTime == 0L) startTime =
-//            currentTimeMillis
-//        var chromaSpeed: Int = NotEnoughUpdates.INSTANCE.config.misc.chromaSpeed
-//        if (chromaSpeed < 10) chromaSpeed = 10
-//        if (chromaSpeed > 5000) chromaSpeed = 5000
-//        val rainbowText = java.lang.StringBuilder()
-//        var len = 0
-//        for (i in 0 until str.length) {
-//            val c = str[i]
-//            var index: Int =
-//                (offset + len / 12f - (currentTimeMillis - startTime) / chromaSpeed).toInt() % io..Utils.rainbow.size
-//            len += Minecraft.getMinecraft().fontRendererObj.getCharWidth(c)
-//            if (bold) len++
-//            if (index < 0) index += io.github.moulberry.notenoughupdates.util.Utils.rainbow.size
-//            rainbowText.append(io.github.moulberry.notenoughupdates.util.Utils.rainbow.get(index))
-//            if (bold) rainbowText.append(EnumChatFormatting.BOLD)
-//            rainbowText.append(c)
-//        }
-//        return rainbowText.toString()
-//    }
-//}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
index bb199625d..83430cecb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.features.misc.GhostCounter
 import io.github.moulberry.notenoughupdates.core.util.lerp.LerpUtils
 import io.github.moulberry.notenoughupdates.util.XPInformation
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java b/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java
index 6495873f4..8e71319aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SpecialColour.java
@@ -6,22 +6,9 @@ import java.awt.*;
  * Taken from NotEnoughUpdates
  */
 public class SpecialColour {
-    public static String special(int chromaSpeed, int alpha, int rgb) {
-        return special(chromaSpeed, alpha, (rgb & 0xFF0000) >> 16, (rgb & 0x00FF00) >> 8, (rgb & 0x0000FF));
-    }
 
     private static final int RADIX = 10;
 
-    public static String special(int chromaSpeed, int alpha, int r, int g, int b) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Integer.toString(chromaSpeed, RADIX)).append(":");
-        sb.append(Integer.toString(alpha, RADIX)).append(":");
-        sb.append(Integer.toString(r, RADIX)).append(":");
-        sb.append(Integer.toString(g, RADIX)).append(":");
-        sb.append(Integer.toString(b, RADIX));
-        return sb.toString();
-    }
-
     private static int[] decompose(String csv) {
         String[] split = csv.split(":");
 
@@ -33,17 +20,6 @@ public class SpecialColour {
         return arr;
     }
 
-    public static int specialToSimpleRGB(String special) {
-        int[] d = decompose(special);
-        int r = d[2];
-        int g = d[1];
-        int b = d[0];
-        int a = d[3];
-        int chr = d[4];
-
-        return (a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF);
-    }
-
     public static int getSpeed(String special) {
         return decompose(special)[4];
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
index 813020bc1..7482902a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
@@ -60,7 +60,7 @@ public class MayorJson {
         public Election election;
     }
 
-    public class Perk {
+    public static class Perk {
         @Expose
         public String name;
         @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModsJson.java
index d765f3e02..9e04d55c7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModsJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModsJson.java
@@ -12,7 +12,7 @@ public class ModsJson {
     @Expose
     public Map<String, Mod> mods = new HashMap<>();
 
-    public class Mod {
+    public static class Mod {
         @Expose
         public List<String> description = new ArrayList<>();