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(-) 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 7a8ad1e4f6a7cc3e685a5199a5dd0ca0049c61ff Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Tue, 14 Jun 2022 04:18:15 +0200 Subject: fix issue #73 --- src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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(); -- 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(-) 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(-) 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(-) 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 From 84097869dc18443660511e656885498beb3c6bc9 Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Fri, 17 Jun 2022 21:41:06 +0200 Subject: Fix wrong flower models in item list --- .../skyblocker/skyblock/itemlist/ItemFixerUpper.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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"; -- cgit From 55524d92f3a15b68a52a0ea5edc9ba3765a781bb Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Sat, 18 Jun 2022 10:17:08 +0200 Subject: Fix typo in commission hud pattern --- src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0c614641..de571130 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java @@ -20,7 +20,7 @@ public class DwarvenHud { public static final List 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", -- cgit From bfb06cca525b3cb33f3e4a60a1cfe30be71a6797 Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Mon, 20 Jun 2022 10:29:18 +0200 Subject: Update to 1.8.1 --- CHANGELOG.md | 10 ++++++++++ gradle.properties | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df0fdc53..3204bdb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Release 1.8.1 + +Fixes +* Fix crash on disconnect by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/7a8ad1e4f6a7cc3e685a5199a5dd0ca0049c61ff +* Fix item price tooltip not working with some languages by @Fix3dll in https://github.com/SkyblockerMod/Skyblocker/pull/74 +* Fix spirit sceptre and other flower items having the wrong texture in the item list by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/84097869dc18443660511e656885498beb3c6bc9 +* Fix "Team Treasurite Member Slayer" not showing up in commissions HUD by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/55524d92f3a15b68a52a0ea5edc9ba3765a781bb + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.8.0...v1.8.1 +___ # Release 1.8.0 New Feature diff --git a/gradle.properties b/gradle.properties index d9473bd9..78591f0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ clothconfig_version=6.2.57 mod_menu_version=3.1.0 # Mod Properties -mod_version = 1.8.0 +mod_version = 1.8.1 maven_group = me.xmrvizzy archives_base_name = skyblocker modrinth_id=y6DuFGwJ -- cgit