Used SkyHanniTracker in DicerDropTracker and migrated the data to make it better readable.

2 files changed, 3 insertions, 17 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index a290b9bf9..8bb3b7268 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -9,7 +9,7 @@ import com.google.gson.JsonPrimitive
 
 object ConfigUpdaterMigrator {
     val logger = LorenzLogger("ConfigMigration")
-    val configVersion = 7
+    val configVersion = 8
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index 82aa9a4cb..247792fb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.features.garden.farming.DicerDropTracker;
 import at.hannibal2.skyhanni.features.garden.farming.FarmingArmorDrops;
 import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
-import at.hannibal2.skyhanni.features.mining.powdertracker.PowderChestReward;
+import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker;
 import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker;
 import at.hannibal2.skyhanni.features.misc.visualwords.VisualWord;
 import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal;
@@ -304,21 +304,7 @@ public class Storage {
         }
 
         @Expose
-        public Map<Integer, PowderTracker> powderTracker = new HashMap<>();
-
-        public static class PowderTracker extends TrackerData {
-
-            public void reset() {
-                rewards.clear();
-                totalChestPicked = 0;
-            }
-
-            @Expose
-            public int totalChestPicked = 0;
-
-            @Expose
-            public Map<PowderChestReward, Long> rewards = new HashMap<>();
-        }
+        public PowderTracker.Data powderTracker = new PowderTracker.Data();
 
         @Expose
         public FrozenTreasureTracker frozenTreasureTracker = new FrozenTreasureTracker();