Refactor CheckExotic

1 files changed, 31 insertions, 48 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/exotic/CheckExotic.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/exotic/CheckExotic.java
index fb22362e..c1b90f06 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/exotic/CheckExotic.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/exotic/CheckExotic.java
@@ -3,13 +3,13 @@ package me.xmrvizzy.skyblocker.skyblock.item.exotic;
 import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
 import me.xmrvizzy.skyblocker.utils.Constants;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 public class CheckExotic {
-    static String[] SeymourIDS = {"VELVET_TOP_HAT", "CASHMERE_JACKET", "SATIN_TROUSERS", "OXFORD_SHOES"};
     public static String getExpectedHex(String id) {
-        String color = PriceInfoTooltip.ColorApiData.get(id).getAsString();
+        String color = PriceInfoTooltip.colorJson.get(id).getAsString();
         if (color != null) {
             String[] RGBValues = color.split(",");
             String hex = String.format("%02x%02x%02x", Integer.parseInt(RGBValues[0]), Integer.parseInt(RGBValues[1]), Integer.parseInt(RGBValues[2]));
@@ -20,86 +20,69 @@ public class CheckExotic {
         }
     }
 
-    public static Boolean checkExceptions(String id, String hex) {
-        if (id.startsWith("LEATHER") || id.equals("GHOST_BOOTS") || ListContainsString(SeymourIDS, id)) {
+    public static boolean isException(String id, String hex) {
+        if (id.startsWith("LEATHER") || id.equals("GHOST_BOOTS") || Constants.SEYMOUR_IDS.contains(id)) {
             return true;
         }
         if (id.startsWith("RANCHER")) {
-            return ListContainsString(Constants.Ranchers, hex);
+            return Constants.RANCHERS.contains(hex);
         }
         if (id.contains("ADAPTIVE_CHESTPLATE")) {
-            return ListContainsString(Constants.AdaptiveChest, hex);
+            return Constants.ADAPTIVE_CHEST.contains(hex);
         } else if (id.contains("ADAPTIVE")) {
-            return ListContainsString(Constants.Adaptive, hex);
+            return Constants.ADAPTIVE.contains(hex);
         }
         if (id.startsWith("REAPER")) {
-            return ListContainsString(Constants.Reaper, hex);
+            return Constants.REAPER.contains(hex);
         }
         if (id.startsWith("FAIRY")) {
-            return ListContainsString(Constants.FairyHexes, hex);
+            return Constants.FAIRY_HEXES.contains(hex);
         }
         if (id.startsWith("CRYSTAL")) {
-            return ListContainsString(Constants.CrystalHexes, hex);
+            return Constants.CRYSTAL_HEXES.contains(hex);
         }
         if (id.contains("SPOOK")) {
-            return ListContainsString(Constants.Spook, hex);
+            return Constants.SPOOK.contains(hex);
         }
         return false;
     }
 
-    public static String checkDyeType(String ActualHex) {
-        if (ListContainsString(Constants.CrystalHexes, ActualHex)) {
+    public static String checkDyeType(String hex) {
+        if (Constants.CRYSTAL_HEXES.contains(hex)) {
             return "CRYSTAL";
         }
-        if (ListContainsString(Constants.FairyHexes, ActualHex)) {
+        if (Constants.FAIRY_HEXES.contains(hex)) {
             return "FAIRY";
         }
-        if (ListContainsString(Constants.OgFairyHexes, ActualHex)) {
+        if (Constants.OG_FAIRY_HEXES.contains(hex)) {
             return "OG_FAIRY";
         }
-        if (ListContainsString(Constants.Spook, ActualHex)) {
+        if (Constants.SPOOK.contains(hex)) {
             return "SPOOK";
         }
-        if (ListContainsString(Constants.Glitched, ActualHex)) {
+        if (Constants.GLITCHED.contains(hex)) {
             return "GLITCHED";
         }
         return "EXOTIC";
     }
 
-    private static Boolean ListContainsString(String[] list, String s) {
-        for (int i = 0; i < list.length; i++) {
-            if (list[i].equalsIgnoreCase(s)) {
-                return  true;
-            }
-        }
-        return false;
-    }
-
-    public static Boolean intendedDyed(NbtCompound ItemData) {
-        return ItemData.getCompound("ExtraAttributes").getKeys().contains("dye_item");
+    public static boolean intendedDyed(NbtCompound ItemData) {
+        return ItemData.getCompound("ExtraAttributes").contains("dye_item");
     }
 
-    public static Formatting FormattingColor(String s) {
-        switch (s) {
-            case "CRYSTAL": return Formatting.AQUA;
-            case "FAIRY": return Formatting.LIGHT_PURPLE;
-            case "OG_FAIRY": return Formatting.DARK_PURPLE;
-            case "SPOOK": return Formatting.RED;
-            case "GLITCHED": return Formatting.BLUE;
-            case "EXOTIC": return Formatting.GOLD;
-        }
-        return Formatting.DARK_GRAY;
+    public static Formatting getFormattingColor(String s) {
+        return switch (s) {
+            case "CRYSTAL" -> Formatting.AQUA;
+            case "FAIRY" -> Formatting.LIGHT_PURPLE;
+            case "OG_FAIRY" -> Formatting.DARK_PURPLE;
+            case "SPOOK" -> Formatting.RED;
+            case "GLITCHED" -> Formatting.BLUE;
+            case "EXOTIC" -> Formatting.GOLD;
+            default -> Formatting.DARK_GRAY;
+        };
     }
 
-    public static Text getTranslatatedText(String s) {
-        switch (s) {
-            case "CRYSTAL": return Text.translatable("skyblocker.exotic.crystal");
-            case "FAIRY": return Text.translatable("skyblocker.exotic.fairy");
-            case "OG_FAIRY": return Text.translatable("skyblocker.exotic.og_fairy");
-            case "SPOOK": return Text.translatable("skyblocker.exotic.spook");
-            case "GLITCHED": return Text.translatable("skyblocker.exotic.glitched");
-            case "EXOTIC": return Text.translatable("skyblocker.exotic.exotic");
-        }
-        return null;
+    public static MutableText getTranslatedText(String s) {
+        return Text.translatable("skyblocker.exotic." + s.toLowerCase());
     }
 }