From 8950706b8fbb945771059176de3e2180884a33a0 Mon Sep 17 00:00:00 2001 From: Fix3dll Date: Mon, 14 Mar 2022 23:27:31 +0300 Subject: add: customization backpack preview without shift and a little cleanup for tooltip injection --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 4 ++-- src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 3 ++- .../java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java | 3 +-- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index a37f7951..eea430ab 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -30,6 +30,8 @@ public class SkyblockerConfig implements ConfigData { public RichPresence richPresence = new RichPresence(); public static class General { + public boolean enableUpdateNotification = true; + public boolean backpackPreviewWithoutShift = false; @ConfigEntry.Gui.Excluded public String apiKey; @@ -46,8 +48,6 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Quicknav quicknav = new Quicknav(); - public boolean enableUpdateNotification = true; - @ConfigEntry.Category("itemTooltip") @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public ItemTooltip itemTooltip = new ItemTooltip(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index b3de4850..b1bb0d93 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -55,7 +55,8 @@ public abstract class HandledScreenMixin extends Screen { @Inject(at = @At("HEAD"), method = "drawMouseoverTooltip", cancellable = true) public void drawMouseOverTooltip(MatrixStack matrices, int x, int y, CallbackInfo ci) { String title = ((HandledScreen)(Object)this).getTitle().getString(); - if (Screen.hasShiftDown() && title.equals("Storage") && focusedSlot != null) { + boolean shiftDown = SkyblockerConfig.get().general.backpackPreviewWithoutShift || Screen.hasShiftDown(); + if (shiftDown && title.equals("Storage") && focusedSlot != null) { if (BackpackPreview.renderPreview(matrices, focusedSlot.getIndex(), x, y)) ci.cancel(); } } 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 cb760d7d..2413471c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -49,7 +49,6 @@ public class PriceInfoTooltip { int count = stack.getCount(); String timestamp = getTimestamp(stack); - List listString = lines.stream().map(Text::getString).toList(); if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice) { if (npcPricesJson == null) { @@ -136,7 +135,7 @@ public class PriceInfoTooltip { } if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice - && listString.stream().noneMatch(each -> each.contains("Buy price:") || each.contains("Sell price:"))) { + && lines.stream().noneMatch(each -> each.getString().contains("Buy price:") || each.getString().contains("Sell price:"))) { if (bazaarPricesJson == null) { if (!nullMsgSend) { client.player.sendMessage(new TranslatableText("skyblocker.itemTooltip.nullMessage"), false); diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 4aacfebf..9ac021cf 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -10,6 +10,7 @@ "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars", "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav", "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Backpack preview without press shift key", "text.autoconfig.skyblocker.option.general.itemTooltip": "Item Tooltip", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Enable NPC Price", "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Enable Avg. BIN Price", -- cgit From 2cfda0230cca44b51e1b71db77d6c2a4ae7d42a1 Mon Sep 17 00:00:00 2001 From: Trương Hoàng Long Date: Mon, 14 Mar 2022 22:26:20 +0100 Subject: Update en_us.json --- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 9ac021cf..db024916 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -10,7 +10,7 @@ "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars", "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav", "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav", - "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Backpack preview without press shift key", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift", "text.autoconfig.skyblocker.option.general.itemTooltip": "Item Tooltip", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Enable NPC Price", "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Enable Avg. BIN Price", @@ -65,4 +65,4 @@ "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification", "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!" -} \ No newline at end of file +} -- cgit