aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-09-08 17:18:16 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-09-08 17:18:16 +0200
commit6f9fddfc65fa4ccf30d09198ca404d6be5592158 (patch)
treee05b7e1fbdaa5a44ad29d2a78374f17181d79faf /src
parentfa639add79f64941967aae33737d1e85945b79e0 (diff)
parentdafbb51ceb51cd80c5d726ef345bccebc5e94b12 (diff)
downloadskyhanni-6f9fddfc65fa4ccf30d09198ca404d6be5592158.tar.gz
skyhanni-6f9fddfc65fa4ccf30d09198ca404d6be5592158.tar.bz2
skyhanni-6f9fddfc65fa4ccf30d09198ca404d6be5592158.zip
Merge remote-tracking branch 'origin/beta' into beta
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/powdertracker/PowderTracker.kt7
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
index d9cd5c2b8..945468fcb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
@@ -838,6 +838,7 @@ public class MiscConfig {
@ConfigEditorDraggableList(
exampleText = {
"§b§lPowder Tracker",
+ "§7Display Mode: §a[Total] §e[This Session]",
"§d852 Total chests Picked §7(950/h)",
"§bx2 Powder: §aActive!",
"§b250,420 §aMithril Powder §7(350,000/h)",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/powdertracker/PowderTracker.kt
index a24eec911..ce3d4a1c1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/powdertracker/PowderTracker.kt
@@ -169,7 +169,7 @@ class PowderTracker {
private fun drawDisplay() = buildList<List<Any>> {
addAsSingletonList("§b§lPowder Tracker")
- if (inventoryOpen) {
+ if (inventoryOpen){
addSelector<DisplayMode>(
"§7Display Mode: ",
getName = { type -> type.displayName },
@@ -179,7 +179,10 @@ class PowderTracker {
saveAndUpdate()
}
)
+ }else{
+ addAsSingletonList("")
}
+
val both = currentLog() ?: return@buildList
val display = both.get(currentDisplayMode)
val rewards = display.rewards
@@ -238,6 +241,8 @@ class PowderTracker {
val count = rewards.getOrDefault(reward, 0).addSeparators()
addAsSingletonList("§b$count ${reward.displayName}")
}
+
+
}
private fun calculateResourceHour(resourceInfo: ResourceInfo) {