Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker

3 files changed, 7 insertions, 6 deletions

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/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index fdff7831..ddac803e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -233,7 +233,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")) {
@@ -245,14 +245,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/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);
             }