Trevor stuff and small frozen treasure tracker stuff #422

* accept quest hotkey and more prevention for false detects

* saving to fix other thing

* basic data tracker done and fix ice tracker/hr

* colour change and elusive horse thx fycron

* Merge branch 'hannibal002:beta' into trevor_changes

* Merge remote-tracking branch 'origin/trevor_changes' into trevor_changes

* Merge branch 'beta' into trevor_changes

* fix

* update display each second

* Merge branch 'beta' into trevor_changes

* Merge branch 'hannibal002:beta' into trevor_changes

* i prob did this right

* okay this might be better

* Merge branch 'beta' into trevor_changes

* nea change

* think this is what nea meant

* fix toctou?

* Merge branch 'beta' into trevor_changes

2 files changed, 80 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index da3ccd8f4..3c3d0d130 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.misc.EnderNode;
 import at.hannibal2.skyhanni.features.misc.FrozenTreasure;
 import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostData;
+import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker;
 import at.hannibal2.skyhanni.features.misc.powdertracker.PowderChestReward;
 import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal;
 import at.hannibal2.skyhanni.utils.LorenzVec;
@@ -407,5 +408,26 @@ public class Storage {
             @Expose
             public List<String> kingsTalkedTo = new ArrayList<>();
         }
+
+        @Expose
+        public TrapperData trapperData = new TrapperData();
+
+        public static class TrapperData {
+
+            @Expose
+            public int questsDone;
+
+            @Expose
+            public int peltsGained;
+
+            @Expose
+            public int killedAnimals;
+
+            @Expose
+            public int selfKillingAnimals;
+
+            @Expose
+            public Map<TrevorTracker.TrapperMobRarity, Integer> animalRarities= new HashMap<>();
+        }
     }
 }
\ No newline at end of file
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 f50d95dca..da816457e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
@@ -7,6 +7,10 @@ import io.github.moulberry.moulconfig.annotations.*;
 import io.github.moulberry.moulconfig.observer.Property;
 import org.lwjgl.input.Keyboard;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class MiscConfig {
 
     @Expose
@@ -281,6 +285,51 @@ public class MiscConfig {
     public static class TrevorTheTrapper {
 
         @Expose
+        @ConfigOption(
+                name = "Enable Data Tracker",
+                desc = "Tracks all of your data from doing Trevor Quests.\n" +
+                        "Shows based on the setting below"
+        )
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean dataTracker = true;
+
+        @Expose
+        @ConfigOption(
+                name = "Show Between Quests",
+                desc = "Shows the tracker during and between quests otherwise it will only show during them." +
+                        "Will show in the Trapper's Den regardless. Global toggle above"
+        )
+        @ConfigEditorBoolean
+        public boolean displayType = true;
+
+        @Expose
+        @ConfigOption(
+                name = "Text Format",
+                desc = "Drag text to change the appearance of the overlay."
+        )
+        @ConfigEditorDraggableList(
+                exampleText = {
+                        "§b§lTrevor Data Tracker",
+                        "§b1,428 §9Quests Started",
+                        "§b11,281 §5Total Pelts Gained",
+                        "§b2,448 §5Pelts Per Hour",
+                        "",
+                        "§b850 §cKilled Animals",
+                        "§b153 §cSelf Killing Animals",
+                        "§b788 §fTrackable Animals",
+                        "§b239 §aUntrackable Animals",
+                        "§b115 §9Undetected Animals",
+                        "§b73 §5Endangered Animals",
+                        "§b12 §6Elusive Animals"
+                }
+        )
+        public List<Integer> textFormat = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11));
+
+        @Expose
+        public Position position = new Position(10, 80, false, true);
+
+        @Expose
         @ConfigOption(name = "Trapper Solver", desc = "Assists you in finding Trevor's mobs. §eNote: May not always work as expected. " +
                 "§cWill not help you to find rabbits or sheep in the Oasis!")
         @ConfigEditorBoolean
@@ -299,10 +348,18 @@ public class MiscConfig {
         public boolean warpToTrapper = false;
 
         @Expose
-        @ConfigOption(name = "Warp Hotkey", desc = "Press this key to warp to Trevor's Den.")
+        @ConfigOption(name = "Accept Trapper Quest", desc = "Click this key after the chat prompt to accept Trevor's quest.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean acceptQuest = false;
+
+        @Expose
+        @ConfigOption(name = "Trapper Hotkey", desc = "Press this key to warp to Trevor's Den and to accept the quest." +
+                "§eRequires the relevant above settings to be toggled")
         @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
         public int keyBindWarpTrapper = Keyboard.KEY_NONE;
 
+
         @Expose
         @ConfigOption(name = "Trapper Cooldown", desc = "Change the color of Trevor and adds a cooldown over his head.")
         @ConfigEditorBoolean