From 73f861eca0423d5709ada36254dff659b1d15602 Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Mon, 14 Mar 2022 22:26:20 +0100 Subject: add: filter for mana consumption message from action bar --- .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 1 + src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java | 9 +++++++++ src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 3 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index eea430ab..669746c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -152,6 +152,7 @@ public class SkyblockerConfig implements ConfigData { public ChatFilterResult hideCombo = ChatFilterResult.PASS; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) public ChatFilterResult hideAutopet = ChatFilterResult.PASS; + public boolean hideMana = false; } public enum Info { diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index 19e0d79e..0549d235 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -24,10 +24,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + @Environment(EnvType.CLIENT) @Mixin(InGameHud.class) public abstract class InGameHudMixin extends DrawableHelper { private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png"); + private static final Pattern ACTION_BAR_MANA = Pattern.compile("^§b-\\d+ Mana \\(.*\\)(| +)$"); private final FancyStatusBars statusBars = new FancyStatusBars(); private MatrixStack hotbarMatrices; @@ -46,6 +50,11 @@ public abstract class InGameHudMixin extends DrawableHelper { if(!Utils.isOnSkyblock) return; String msg = message.getString(); + if (SkyblockerConfig.get().messages.hideMana) { + Matcher matcher = ACTION_BAR_MANA.matcher(msg); + if (matcher.matches()) + ci.cancel(); + } if(statusBars.update(msg)) ci.cancel(); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index db024916..e60eb0aa 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -57,6 +57,7 @@ "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Hide Teleport Pad Messages", "text.autoconfig.skyblocker.option.messages.hideCombo": "Hide Combo Messages", "text.autoconfig.skyblocker.option.messages.hideAutopet": "Hide Autopet Messages", + "text.autoconfig.skyblocker.option.messages.hideMana": "Hide Mana Consumption Messages from Action Bar", "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!", "skyblocker.update.update_link": " §2§nClick here§r", -- cgit From 8c5519565e4a9527e8f56219183a0b21f04b1cd0 Mon Sep 17 00:00:00 2001 From: Fix3dll Date: Sun, 20 Mar 2022 18:39:11 +0300 Subject: change: improved FancyBar and mana consumption filter Little addition for ComboFilter which I forgot to add 1 check ^v^ Thanks to @ExternalTime for help --- .../skyblocker/chat/filters/ComboFilter.java | 2 +- .../skyblocker/config/SkyblockerConfig.java | 1 + .../xmrvizzy/skyblocker/mixin/InGameHudMixin.java | 6 ------ .../skyblocker/skyblock/FancyStatusBars.java | 24 ++++++++++++++++++---- .../resources/assets/skyblocker/lang/en_us.json | 1 + .../skyblocker/chat/filters/ComboFilterTest.java | 5 +++++ 6 files changed, 28 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java index c05afdbf..714ee9c9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java @@ -5,7 +5,7 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig; public class ComboFilter extends SimpleChatFilter { public ComboFilter() { - super("^(\\+\\d+ Kill Combo \\+\\d+(% ✯ Magic Find| coins per kill)" + + super("^(\\+\\d+ Kill Combo \\+\\d+(% ✯ Magic Find| coins per kill|% Combat Exp)" + "|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$"); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 669746c4..1862313b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -152,6 +152,7 @@ public class SkyblockerConfig implements ConfigData { public ChatFilterResult hideCombo = ChatFilterResult.PASS; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) public ChatFilterResult hideAutopet = ChatFilterResult.PASS; + @ConfigEntry.Gui.Tooltip() public boolean hideMana = false; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index 0549d235..b9e80bd6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -31,7 +31,6 @@ import java.util.regex.Pattern; @Mixin(InGameHud.class) public abstract class InGameHudMixin extends DrawableHelper { private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png"); - private static final Pattern ACTION_BAR_MANA = Pattern.compile("^§b-\\d+ Mana \\(.*\\)(| +)$"); private final FancyStatusBars statusBars = new FancyStatusBars(); private MatrixStack hotbarMatrices; @@ -50,11 +49,6 @@ public abstract class InGameHudMixin extends DrawableHelper { if(!Utils.isOnSkyblock) return; String msg = message.getString(); - if (SkyblockerConfig.get().messages.hideMana) { - Matcher matcher = ACTION_BAR_MANA.matcher(msg); - if (matcher.matches()) - ci.cancel(); - } if(statusBars.update(msg)) ci.cancel(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index 84eebed3..1d766bc1 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -16,7 +16,8 @@ import java.util.regex.Pattern; 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_STATUS = Pattern.compile("^§[6c]([0-9]+)/([0-9]+)❤(?:\\+§c[0-9]+\\S)? {3,}(?:§a([0-9]+)§a❈ Defense|(\\S+(?: \\S+)*)) {3,}(?:§b([0-9]+)/([0-9]+)✎ (?:Mana|§3([0-9]+)ʬ)?|(\\S+(?: \\S+)*))(.*)$"); + 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)?(?: +(\\S+(?:\\s\\S+)*))??(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ))?(?: +(§[27].*))?$"); private final Resource[] resources = new Resource[]{ // Health @@ -30,8 +31,18 @@ public class FancyStatusBars extends DrawableHelper { }; public boolean update(String actionBar) { - if (!SkyblockerConfig.get().general.bars.enableBars) + if (!SkyblockerConfig.get().general.bars.enableBars) { + if (SkyblockerConfig.get().messages.hideMana) { + Matcher mana = ACTION_BAR_MANA.matcher(actionBar); + if (mana.find()) { + assert client.player != null; + client.player.sendMessage(Text.of(actionBar.replace(mana.group(), "")), true); + return true; + } + } return false; + } + Matcher matcher = ACTION_BAR_STATUS.matcher(actionBar); if (!matcher.matches()) return false; @@ -51,9 +62,14 @@ public class FancyStatusBars extends DrawableHelper { resources[3].setFillLevel(client.player.experienceLevel, client.player.experienceProgress); StringBuilder sb = new StringBuilder(); - appendIfNotNull(sb, matcher.group(4)); + if (SkyblockerConfig.get().messages.hideMana) { + Matcher mana = ACTION_BAR_MANA.matcher(actionBar); + if (!mana.find()) + appendIfNotNull(sb, matcher.group(4)); + } else { + appendIfNotNull(sb, matcher.group(4)); + } appendIfNotNull(sb, matcher.group(8)); - appendIfNotNull(sb, matcher.group(9)); if (!sb.isEmpty()) { assert client.player != null; diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index e60eb0aa..91b2cf28 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -58,6 +58,7 @@ "text.autoconfig.skyblocker.option.messages.hideCombo": "Hide Combo Messages", "text.autoconfig.skyblocker.option.messages.hideAutopet": "Hide Autopet Messages", "text.autoconfig.skyblocker.option.messages.hideMana": "Hide Mana Consumption Messages from Action Bar", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Gives a better experience with FancyBar", "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!", "skyblocker.update.update_link": " §2§nClick here§r", diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilterTest.java index 8af25b5e..85d38f44 100644 --- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilterTest.java +++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilterTest.java @@ -17,6 +17,11 @@ public class ComboFilterTest extends ChatFilterTest { assertMatches("+10 Kill Combo +10 coins per kill"); } + @Test + void testComboEXP() { + assertMatches("+20 Kill Combo +15% Combat Exp"); + } + @Test void testComboExpired() { assertMatches("Your Kill Combo has expired! You reached a 11 Kill Combo!"); -- cgit From cc6903b37c536d47ec10b15132f4a348d7704010 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Mon, 21 Mar 2022 18:07:44 +0100 Subject: Update to 1.6.1 [skip ci] + translated using weblate (russian) by @HyperSoop --- CHANGELOG.md | 10 ++++++++++ build.gradle | 2 +- gradle.properties | 2 +- src/main/resources/assets/skyblocker/lang/ru_ru.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e858560..0f038a5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Release 1.6.1 + +Fixes +* PriceInfoTooltip fixes by @Fix3dll in https://github.com/LifeIsAParadox/Skyblocker/pull/56 +* quick and small change by @Fix3dll in https://github.com/LifeIsAParadox/Skyblocker/pull/57 +* backpack preview without shift by @Fix3dll in https://github.com/LifeIsAParadox/Skyblocker/pull/60 + + +**Full Changelog**: https://github.com/LifeIsAParadox/Skyblocker/compare/v1.6.0...v1.6.1 +___ # Release 1.6.0 This release only support 1.18.x diff --git a/build.gradle b/build.gradle index 145fb285..9e918bd7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' - id 'com.modrinth.minotaur' version '2.0.2' + id 'com.modrinth.minotaur' version '2.+' } import com.modrinth.minotaur.dependencies.ModDependency diff --git a/gradle.properties b/gradle.properties index d9daf2ac..6184f154 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.6.0 +mod_version = 1.6.1 maven_group = me.xmrvizzy archives_base_name = skyblocker modrinth_id=y6DuFGwJ diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index 7eb5b380..693d2e8f 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -8,7 +8,7 @@ "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить полоски", "text.autoconfig.skyblocker.category.locations": "Локации", - "text.autoconfig.skyblocker.option.locations.dungeons": "Подземелья", + "text.autoconfig.skyblocker.option.locations.dungeons": "Катакомбы", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить карту", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решать головоломку \"Три чудака\"", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решать головоломку с ифритами", -- cgit From 17bbd926da6c16149ce8d3bf07837aa2f04243ff Mon Sep 17 00:00:00 2001 From: Fix3dll Date: Mon, 28 Mar 2022 22:23:17 +0300 Subject: add: HP regeneration to actionbar --- .../skyblocker/skyblock/FancyStatusBars.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index 1d766bc1..75d232e9 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)?(?: +(\\S+(?:\\s\\S+)*))??(?: +§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)?(?: +(\\S+(?:\\s\\S+)*))??(?: +§b(\\d+)/(\\d+)✎ +(?:Mana|§3(\\d+)ʬ))?(?: +(§[27].*))?$"); private final Resource[] resources = new Resource[]{ // Health @@ -48,28 +48,31 @@ public class FancyStatusBars extends DrawableHelper { return false; resources[0].setMax(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))); - if (matcher.group(3) != null) { - int def = Integer.parseInt(matcher.group(3)); + if (matcher.group(4) != null) { + int def = Integer.parseInt(matcher.group(4)); resources[2].setFillLevel(def, (double) def / ((double) def + 100D)); } - if (matcher.group(5) != null) { - int m = Integer.parseInt(matcher.group(5)); - if (matcher.group(7) != null) - m += Integer.parseInt(matcher.group(7)); - resources[1].setMax(m, Integer.parseInt(matcher.group(6))); + if (matcher.group(6) != null) { + int m = Integer.parseInt(matcher.group(6)); + if (matcher.group(8) != null) + m += Integer.parseInt(matcher.group(8)); + resources[1].setMax(m, Integer.parseInt(matcher.group(7))); } assert client.player != null; resources[3].setFillLevel(client.player.experienceLevel, client.player.experienceProgress); StringBuilder sb = new StringBuilder(); + if (matcher.group(3) != null) { + sb.append("§c").append(matcher.group(3)); + } if (SkyblockerConfig.get().messages.hideMana) { Matcher mana = ACTION_BAR_MANA.matcher(actionBar); if (!mana.find()) - appendIfNotNull(sb, matcher.group(4)); + appendIfNotNull(sb, matcher.group(5)); } else { - appendIfNotNull(sb, matcher.group(4)); + appendIfNotNull(sb, matcher.group(5)); } - appendIfNotNull(sb, matcher.group(8)); + appendIfNotNull(sb, matcher.group(9)); if (!sb.isEmpty()) { assert client.player != null; -- cgit From 68234fb519a71008353aec1375b897655cb82fb2 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Fri, 1 Apr 2022 23:16:17 +0200 Subject: fix lowestbin link --- .../java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 2413471c..290bd0ae 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -324,7 +324,7 @@ public class PriceInfoTooltip { private static void downloadLowestPrices() { JsonObject result = null; try { - URL apiAddr = new URL("https://sbe-stole-skytils.design/api/auctions/lowestbins"); + URL apiAddr = new URL("https://skytils.gg/api/auctions/lowestbins"); InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); result = new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { -- cgit From 8c9c735ffc97d34dfc4f058321f797971777a0a7 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Fri, 1 Apr 2022 23:18:03 +0200 Subject: Translated using Weblate (french) by @edgarogh --- README.md | 3 +- .../resources/assets/skyblocker/lang/fr_fr.json | 58 ++++++++++++++++++++++ src/main/resources/fabric.mod.json | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/skyblocker/lang/fr_fr.json (limited to 'src') diff --git a/README.md b/README.md index 74711bcc..bf851331 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,5 @@ Everyone can contribute to Skyblocker, read [this](https://github.com/LifeIsAPar ### Translators German ([LifeIsAParadox](https://github.com/LifeIsAParadox)) \ Indonesian ([null2264](https://github.com/null2264)) \ -Russian ([HyperSoop](https://github.com/HyperSoop)) +Russian ([HyperSoop](https://github.com/HyperSoop)) \ +French ([edgarogh](https://github.com/edgarogh)) diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json new file mode 100644 index 00000000..8dd68ce6 --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -0,0 +1,58 @@ +{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Verrouillage de slot (Hotbar)", + "key.wikiLookup": "Recherche dans le wiki", + "text.autoconfig.skyblocker.title": "Paramètres de Skyblocker", + "text.autoconfig.skyblocker.category.general": "Général", + "text.autoconfig.skyblocker.option.general.bars": "Vie, mana, défense et barres d'XP", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Activer les barres", + "text.autoconfig.skyblocker.option.general.quicknav": "Navigation rapide", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Navigation rapide activée", + "text.autoconfig.skyblocker.option.general.itemTooltip": "Infobulle des items", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Afficher le prix des NPC", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Afficher le prix moyen BIN (achat immédiat)", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Type de moyenne", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Vous pouvez choisir sur combien de jours la moyenne est calculée", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Afficher le prix minimal BIN (achat immédiat)", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Afficher le prix d'achat/vente au Bazar", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Afficher le musée et la date d'ajout", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cLes informations sur le prix des items vont s'actualiser dans 60 secondes maximum. Sinon, consultez latest.log", + "text.autoconfig.skyblocker.category.richPresence": "Rich Presence Discord", + "text.autoconfig.skyblocker.option.richPresence.info": "Information à afficher", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Cette valeur n'a aucune importance si vous faites défiler", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Faire défiler les informations", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Activée", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "Message personnalisé", + "text.autoconfig.skyblocker.option.general.itemList": "Liste d'items", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Activer la liste d'items", + "text.autoconfig.skyblocker.category.locations": "Lieux", + "text.autoconfig.skyblocker.option.locations.dungeons": "Donjons", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Activer la carte", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Résoudre le puzzle « Three Weirdos »", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Résoudre le puzzle des blazes", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Résoudre le quiz", + "text.autoconfig.skyblocker.option.locations.dungeons.oldLevers": "Hitbox de levier 1.8", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Solveurs des terminaux", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Résoudre « Select Colored »", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Résoudre « Click In Order »", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Résoudre « Starts With »", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Mines des nains", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Afficher le niveau de fuel des foreuses", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Décoder les requêtes de Fetchur", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Résoudre le puzzle de Puzzler", + "text.autoconfig.skyblocker.category.messages": "Messages", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Cacher le rechargement des capacités", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Cacher les messages de soin", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Cacher les messages d'AOTE", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Cacher les messages d'implosion", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Cacher les messages de « Molten Wave » (bâton de Midas)", + "text.autoconfig.skyblocker.option.messages.hideAds": "Cacher la publicité dans le chat public", + "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Cacher les messages des téléporteurs", + "text.autoconfig.skyblocker.option.messages.hideCombo": "Cacher les messages de combo", + "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2Une nouvelle version est disponible !", + "skyblocker.update.update_link": " §2§nCliquez ici§r", + "skyblocker.update.update_message_end": " §apour découvrir les dernières fonctionnalités.", + "skyblocker.update.hover_text": "Ouvrir Modrinth", + "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Notification de mise à jour", + "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Votre clé d'API a été automatiquement définie !" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index aa1ad170..c5d30d73 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,7 @@ "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll"], - "translators" : ["null2264", "HyperSoop"], + "translators" : ["null2264", "HyperSoop", "edgarogh"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", -- cgit From 0fda7a86daf04f9ac0de54492629e38d290af887 Mon Sep 17 00:00:00 2001 From: Spencer <75862693+TacoMonkey11@users.noreply.github.com> Date: Mon, 4 Apr 2022 16:02:29 -0400 Subject: Should fix crash --- src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index b1bb0d93..bd99f2d4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -47,8 +47,10 @@ public abstract class HandledScreenMixin extends Screen { @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true) public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable cir) { - if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){ - if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); + if (focusedSlot != null){ + if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){ + if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); + } } } -- cgit