aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-02 19:12:35 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-02 19:12:35 +0100
commit03fadd15879bf262777536edc1e5110252115339 (patch)
tree7a80c5565482d25824d65e9790dd16769e0d301d
parente7b2ef2728d2fc04eef1e5872a7723d63a7c85bd (diff)
downloadskyhanni-03fadd15879bf262777536edc1e5110252115339.tar.gz
skyhanni-03fadd15879bf262777536edc1e5110252115339.tar.bz2
skyhanni-03fadd15879bf262777536edc1e5110252115339.zip
Added option to only show tier 1 Minion Crafts in the Helper display when their items needed are fully collected.
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt7
2 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java
index 816f8a194..24fdf9732 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java
@@ -26,5 +26,11 @@ public class BingoConfig {
public boolean minionCraftHelperEnabled = true;
@Expose
+ @ConfigOption(name = "Show Progress to T1", desc = "Show tier 1 Minion Crafts in the Helper display even if needed items are not fully collected.")
+ @ConfigEditorBoolean
+ @FeatureToggle
+ public boolean minionCraftHelperProgressFirst = false;
+
+ @Expose
public Position minionCraftHelperPos = new Position(10, 10, false, true);
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index 62106622f..a2dc399d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -225,11 +225,16 @@ class MinionCraftHelper {
val have = otherItems.getOrDefault(itemId, 0)
val percentage = have.toDouble() / needAmount
val itemName = NEUItems.getItemStack(rawId).name ?: "§cName??§f"
+ val isTool = itemId.startsWith("WOOD_")
if (percentage >= 1) {
- val color = if (itemId.startsWith("WOOD_")) "§7" else "§a"
+ val color = if (isTool) "§7" else "§a"
newDisplay.add(" $itemName§8: ${color}DONE")
otherItems[itemId] = have - needAmount
} else {
+ if (!config.minionCraftHelperProgressFirst && !isTool && minionId.endsWith("_0")) {
+ newDisplay.removeLast()
+ return
+ }
val format = LorenzUtils.formatPercentage(percentage)
val haveFormat = LorenzUtils.formatInteger(have)
val needFormat = LorenzUtils.formatInteger(needAmount)