From 3dbf7d8e68158bf87de94c29a17a7e18fe11726f Mon Sep 17 00:00:00 2001 From: Fix3d Date: Mon, 25 Apr 2022 16:26:31 +0300 Subject: fix: quick fix for FancyBar --- src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index 5d3cf9c4..cc557536 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -17,7 +17,7 @@ public class FancyStatusBars extends DrawableHelper { private static final MinecraftClient client = MinecraftClient.getInstance(); private static final Identifier BARS = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/bars.png"); private static final Pattern ACTION_BAR_MANA = Pattern.compile("§b-\\d+ Mana \\(.*\\) +"); - private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c](\\d+)/(\\d+)❤(\\+§c\\d+.)? +(?:§a(\\d+)§a❈ Defense|([^✎]*?))?(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ))?(?: +(§[27].*))?$"); + private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c](\\d+)/(\\d+)❤(\\+§c\\d+.)? +(?:§a(\\d+)§a❈ Defense|([^✎]*?))?(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ)| +(§c§lNOT ENOUGH MANA))?(?: +(§[27].*))?$"); private final Resource[] resources = new Resource[]{ // Health @@ -73,6 +73,7 @@ public class FancyStatusBars extends DrawableHelper { appendIfNotNull(sb, matcher.group(5)); } appendIfNotNull(sb, matcher.group(9)); + appendIfNotNull(sb, matcher.group(10)); if (!sb.isEmpty()) { assert client.player != null; -- cgit From 4afe31dca21b94c102099549800d4fa1cb1bbe6d Mon Sep 17 00:00:00 2001 From: Fix3d Date: Thu, 16 Jun 2022 12:34:03 +0300 Subject: revert changes --- src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index cc557536..5d3cf9c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -17,7 +17,7 @@ public class FancyStatusBars extends DrawableHelper { private static final MinecraftClient client = MinecraftClient.getInstance(); private static final Identifier BARS = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/bars.png"); private static final Pattern ACTION_BAR_MANA = Pattern.compile("§b-\\d+ Mana \\(.*\\) +"); - private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c](\\d+)/(\\d+)❤(\\+§c\\d+.)? +(?:§a(\\d+)§a❈ Defense|([^✎]*?))?(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ)| +(§c§lNOT ENOUGH MANA))?(?: +(§[27].*))?$"); + private static final Pattern ACTION_BAR_STATUS = Pattern.compile("^§[6c](\\d+)/(\\d+)❤(\\+§c\\d+.)? +(?:§a(\\d+)§a❈ Defense|([^✎]*?))?(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ))?(?: +(§[27].*))?$"); private final Resource[] resources = new Resource[]{ // Health @@ -73,7 +73,6 @@ public class FancyStatusBars extends DrawableHelper { appendIfNotNull(sb, matcher.group(5)); } appendIfNotNull(sb, matcher.group(9)); - appendIfNotNull(sb, matcher.group(10)); if (!sb.isEmpty()) { assert client.player != null; -- cgit From 32dd941310f3a459778ebb37e364717d9dcaa4b3 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Thu, 16 Jun 2022 14:21:23 +0300 Subject: fix: changing default locale to English for toUpperCase --- .../java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker') 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); } } -- cgit From 84a741c7627252e7bff8143f1c573b7b75764766 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Thu, 16 Jun 2022 18:19:31 +0300 Subject: fix: change "toXCase" language to English for other uses --- .../xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java | 2 +- .../xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker') 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/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); } -- cgit