diff options
author | CalMWolfs <cwolfson58@gmail.com> | 2023-06-19 21:37:22 +1000 |
---|---|---|
committer | CalMWolfs <cwolfson58@gmail.com> | 2023-06-19 21:37:22 +1000 |
commit | 54cbf2fc5177ffc6b219a72be8032789ff3514b7 (patch) | |
tree | aaea7f8277b39c1daca8bd13017befd33f7a351d /src/main/java/at/hannibal2/skyhanni/config | |
parent | cd283aa10ba01dbd3162c4ebe2ddf3760ededbc9 (diff) | |
download | skyhanni-54cbf2fc5177ffc6b219a72be8032789ff3514b7.tar.gz skyhanni-54cbf2fc5177ffc6b219a72be8032789ff3514b7.tar.bz2 skyhanni-54cbf2fc5177ffc6b219a72be8032789ff3514b7.zip |
done apart from testing
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/Storage.java | 17 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/Misc.java | 15 |
2 files changed, 22 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index 0a63e5928..c0a003aad 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -5,7 +5,8 @@ import at.hannibal2.skyhanni.features.garden.CropAccessory; import at.hannibal2.skyhanni.features.garden.CropType; import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems; import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward; -import at.hannibal2.skyhanni.features.misc.GhostCounter.Option; +import at.hannibal2.skyhanni.features.misc.FrozenTreasures; +import at.hannibal2.skyhanni.features.misc.GhostCounter.Option; import at.hannibal2.skyhanni.utils.LorenzVec; import com.google.gson.annotations.Expose; import net.minecraft.item.ItemStack; @@ -229,6 +230,20 @@ public class Storage { } + @Expose + public FrozenTreasureTracker frozenTreasureTracker = new FrozenTreasureTracker(); + + public static class FrozenTreasureTracker { + @Expose + public int treasuresMined = 0; + + @Expose + public int compactProcs = 0; + + @Expose + public Map<FrozenTreasures, Integer> treasureCount = new HashMap<>(); + } + public long nextCityProjectParticipationTime = 0L; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java index f0d5b7d7b..ebfe716fe 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -1,13 +1,10 @@ package at.hannibal2.skyhanni.config.features; -import at.hannibal2.skyhanni.config.core.config.*; -import com.google.gson.annotations.*; +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.*; -import io.github.moulberry.moulconfig.observer.*; -import org.lwjgl.input.*; - -import java.util.ArrayList; -import java.util.List; +import io.github.moulberry.moulconfig.observer.Property; +import org.lwjgl.input.Keyboard; import java.util.ArrayList; import java.util.Arrays; @@ -510,9 +507,9 @@ public class Misc { exampleText = { // todo change colours "§e§lFrozen Treasure Tracker", "§e1,636 Treasures Mined", - "§e3.2 Total Ice", + "§e3.2m Total Ice", "§e342,192 Ice/hr", - "§e31,002 Compact Procs", + "§e1,002 Compact Procs", " ", "§b182 §fWhite Gift", "§b94 §aGreen Gift", |