From a703867e3ac945446dde06fbc2984835e790ffe3 Mon Sep 17 00:00:00 2001 From: Lulonaut <67191924+Lulonaut@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:21:02 +0100 Subject: craft cost fix and SkillOverlay config changes (#73) * Also multiply raw craft cost when holding shift * SkillOverlays.java config changes --- .../moulberry/notenoughupdates/ItemPriceInformation.java | 6 ++++-- .../options/seperateSections/SkillOverlays.java | 10 +--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java index e78c117b..2a1d1766 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java @@ -160,8 +160,10 @@ public class ItemPriceInformation { tooltip.add(""); added = true; } - tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + - (shortNumber && craftCost.craftCost > 1000 ? Utils.shortNumberFormat(craftCost.craftCost, 0) : format.format((int) craftCost.craftCost)) + " coins"); + float cost = craftCost.craftCost; + if (shiftPressed) cost = cost * shiftStackMultiplier; + + tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && cost > 1000 ? Utils.shortNumberFormat(cost, 0) : format.format((int) cost)) + " coins"); } break; } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java index 92697cb4..6db021f1 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java @@ -11,14 +11,7 @@ import java.util.List; public class SkillOverlays { @ConfigOption( - name = "Skill Overlay Info", - desc = "" - ) - @ConfigEditorAccordion(id = 2) - public boolean infoAccordion = false; - @Expose - @ConfigOption( - name = "Skill display info", + name = "Skill Overlay info", desc = "The skill trackers need you to have an \u00A72api key\u00A77 set (if you dont have one set do \u00A72/api new\u00A77)\n" + "For the overlays to show you need a \u00A7bmathematical hoe\u00A77 or an axe with \u00A7bcultivating\u00A77 " + "enchant for farming, a pickaxe with \u00A7bcompact\u00A77 for mining or a rod with \u00A7bexpertise\u00A77" @@ -27,7 +20,6 @@ public class SkillOverlays { runnableId = 12, buttonText = "" ) - @ConfigAccordionId(id = 2) public boolean skillInfo = false; @ConfigOption( name = "Farming", -- cgit