Merge branch 'master' into 1.19.x

7 files changed, 23 insertions, 9 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index c2f947dc..6b5558cf 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -21,7 +21,7 @@ public class SkyblockerMod {
         scheduler.scheduleCyclic(Utils::sbChecker, 20);
         scheduler.scheduleCyclic(discordRPCManager::update, 100);
         scheduler.scheduleCyclic(DungeonBlaze::update, 4);
-        scheduler.scheduleCyclic(BackpackPreview::tick, 20);
+        scheduler.scheduleCyclic(BackpackPreview::tick, 50);
     }
 
     public static SkyblockerMod getInstance() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
index 123a4dab..00f32459 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
@@ -41,6 +41,7 @@ public class BackpackPreview extends DrawableHelper {
     private static Path save_dir = null;
 
     public static void tick() {
+        Utils.sbChecker(); // force update isOnSkyblock to prevent crash on disconnect
         if (Utils.isOnSkyblock) {
             // save all dirty storages
             saveStorage();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
index 57c40654..a589b759 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -55,7 +55,7 @@ public class ColorTerminal extends ContainerSolver {
     static {
         colorFromName = new HashMap<>();
         for (DyeColor color : DyeColor.values())
-            colorFromName.put(color.getName().toUpperCase(Locale.ROOT), color);
+            colorFromName.put(color.getName().toUpperCase(Locale.ENGLISH), color);
         colorFromName.put("SILVER", DyeColor.LIGHT_GRAY);
         colorFromName.put("LIGHT BLUE", DyeColor.LIGHT_BLUE);
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
index e5e91c38..a75ab412 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -21,7 +21,7 @@ public class DwarvenHud {
 
     public static final List<Pattern> COMMISSIONS = List.of(
             "(?:Titanium|Mithril|Hard Stone) Miner",
-            "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasuite Member|Yog|Boss Corleone|Thyst) Slayer",
+            "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
             "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Mithril",
             "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Titanium",
             "Goblin Raid",
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index 01204c5d..21db3c2e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -234,7 +234,7 @@ public class PriceInfoTooltip {
                 if (ea.contains("enchantments")) {
                     NbtCompound enchants = ea.getCompound("enchantments");
                     String enchant = enchants.getKeys().stream().findFirst().get();
-                    internalName += "-" + enchant.toUpperCase() + "-" + enchants.getInt(enchant);
+                    internalName += "-" + enchant.toUpperCase(Locale.ENGLISH) + "-" + enchants.getInt(enchant);
                 }
             } else if ("PET".equals(internalName)) {
                 if (ea.contains("petInfo")) {
@@ -246,14 +246,14 @@ public class PriceInfoTooltip {
                 String extended = ea.contains("extended") ? "-EXTENDED" : "";
                 String splash = ea.contains("splash") ? "-SPLASH" : "";
                 if (ea.contains("potion") && ea.contains("potion_level")) {
-                    internalName += "-" + ea.getString("potion").toUpperCase() + "-" + ea.getInt("potion_level")
+                    internalName += "-" + ea.getString("potion").toUpperCase(Locale.ENGLISH) + "-" + ea.getInt("potion_level")
                             + enhanced + extended + splash;
                 }
             } else if ("RUNE".equals(internalName)) {
                 if (ea.contains("runes")) {
                     NbtCompound runes = ea.getCompound("runes");
                     String rune = runes.getKeys().stream().findFirst().get();
-                    internalName += "-" + rune.toUpperCase() + "-" + runes.getInt(rune);
+                    internalName += "-" + rune.toUpperCase(Locale.ENGLISH) + "-" + runes.getInt(rune);
                 }
             }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
index 4c56546d..dc2d9947 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java
@@ -27,7 +27,6 @@ public class ItemFixerUpper {
             Map.entry("minecraft:netherbrick", "minecraft:nether_brick"),
             Map.entry("minecraft:stained_hardened_clay", "minecraft:terracotta"),
             Map.entry("minecraft:quartz_ore", "minecraft:nether_quartz_ore"),
-            Map.entry("minecraft:red_flower", "minecraft:poppy"),
             Map.entry("minecraft:tallgrass", "minecraft:grass"),
             Map.entry("minecraft:stone_slab2", "minecraft:red_sandstone_slab"),
             Map.entry("minecraft:waterlily", "minecraft:lily_pad"),
@@ -88,6 +87,18 @@ public class ItemFixerUpper {
             "minecraft:chiseled_stone_bricks"
     };
 
+    private final static String[] RED_FLOWER_VARIANTS = {
+            "minecraft:poppy",
+            "minecraft:blue_orchid",
+            "minecraft:allium",
+            "minecraft:azure_bluet",
+            "minecraft:red_tulip",
+            "minecraft:orange_tulip",
+            "minecraft:white_tulip",
+            "minecraft:pink_tulip",
+            "minecraft:oxeye_daisy"
+    };
+
     private final static String[] DOUBLE_PLANT_VARIANTS = {
             "minecraft:sunflower",
             "minecraft:lilac",
@@ -197,6 +208,7 @@ public class ItemFixerUpper {
         if (id.equals("minecraft:log2")) return "minecraft:" + TREE_VARIANTS[damage + 4] + "log";
         if (id.equals("minecraft:leaves2")) return "minecraft:" + TREE_VARIANTS[damage + 4] + "leaves";
         if (id.equals("minecraft:stonebrick")) return STONE_BRICK_VARIANTS[damage];
+        if (id.equals("minecraft:red_flower")) return RED_FLOWER_VARIANTS[damage];
         if (id.equals("minecraft:double_plant")) return DOUBLE_PLANT_VARIANTS[damage];
         if (id.equals("minecraft:spawn_egg")) return SPAWN_EGG_VARIANTS.getOrDefault(damage, "minecraft:ghast_spawn_egg");
         if (id.equals("minecraft:banner")) return "minecraft:" + BLOCK_COLORS[15 - damage] + "banner";
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
index 88087414..d006649b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
@@ -11,6 +11,7 @@ import net.minecraft.util.Identifier;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 public class SearchResultsWidget implements Drawable {
     private static final Identifier TEXTURE = new Identifier("textures/gui/recipe_book.png");
@@ -61,8 +62,8 @@ public class SearchResultsWidget implements Drawable {
             this.searchText = searchText;
             this.searchResults.clear();
             for (ItemStack entry : ItemRegistry.items) {
-                String name = entry.getName().toString().toLowerCase();
-                String disp = entry.getNbt().getCompound("display").toString().toLowerCase();
+                String name = entry.getName().toString().toLowerCase(Locale.ENGLISH);
+                String disp = entry.getNbt().getCompound("display").toString().toLowerCase(Locale.ENGLISH);
                 if (name.contains(this.searchText) || disp.contains(this.searchText))
                     this.searchResults.add(entry);
             }