summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/config
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2023-06-23 00:50:09 +0200
committerGitHub <noreply@github.com>2023-06-23 00:50:09 +0200
commit1cf1600d0eec7f027c4d10d1b6eb2b2cb249309c (patch)
tree778ae39b4c35133f5117cbe9a9a4c2223a4eeeba /src/main/java/at/hannibal2/skyhanni/config
parentc7463ccbbe3f6a7ff91ed38f0bcafe82dd1a843c (diff)
parenta1efe2d469bfe9e152ffcae4cd42dd9e98818c0f (diff)
downloadskyhanni-1cf1600d0eec7f027c4d10d1b6eb2b2cb249309c.tar.gz
skyhanni-1cf1600d0eec7f027c4d10d1b6eb2b2cb249309c.tar.bz2
skyhanni-1cf1600d0eec7f027c4d10d1b6eb2b2cb249309c.zip
Merge pull request #242
Frozen Treasure Tracker
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/Storage.java15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Misc.java73
2 files changed, 84 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index b92fcb7dd..ccae2ce25 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -5,6 +5,7 @@ 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.FrozenTreasure;
import at.hannibal2.skyhanni.features.misc.GhostCounter.Option;
import at.hannibal2.skyhanni.utils.LorenzVec;
import com.google.gson.annotations.Expose;
@@ -232,6 +233,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<FrozenTreasure, 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 ef99c5d90..8d15a46df 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -1,12 +1,13 @@
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 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 Misc {
@@ -482,6 +483,70 @@ public class Misc {
}
@Expose
+ @ConfigOption(name = "Frozen Treasure Tracker", desc = "")
+ @Accordion
+ public Misc.FrozenTreasureTracker frozenTreasureTracker = new Misc.FrozenTreasureTracker();
+
+ public static class FrozenTreasureTracker {
+
+ @Expose
+ @ConfigOption(
+ name = "Enabled",
+ desc = "Tracks all of your drops from frozen treasure in the Glacial Caves\n" +
+ "§eIce calculations are an estimate but are relatively accurate"
+ )
+ @ConfigEditorBoolean
+ public boolean enabled = true;
+
+ @Expose
+ @ConfigOption(
+ name = "Text Format",
+ desc = "Drag text to change the appearance of the overlay."
+ )
+ @ConfigEditorDraggableList(
+ exampleText = {
+ "§1§lFrozen Treasure Tracker",
+ "§61,636 Treasures Mined",
+ "§33.2m Total Ice",
+ "§3342,192 Ice/hr",
+ "§81,002 Compact Procs",
+ " ",
+ "§b182 §fWhite Gift",
+ "§b94 §aGreen Gift",
+ "§b17 §9§cRed Gift",
+ "§b328 §fPacked Ice",
+ "§b80 §aEnchanted Ice",
+ "§b4 §9Enchanted Packed Ice",
+ "§b182 §aIce Bait",
+ "§b3 §aGlowy Chum Bait",
+ "§b36 §5Glacial Fragment",
+ "§b6 §fGlacial Talisman",
+ " ",
+ }
+ )
+ public List<Integer> textFormat = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 14, 15));
+
+ @Expose
+ @ConfigOption(name = "Only in Glacial Cave", desc = "Only shows the overlay while in the Glacial Cave.")
+ @ConfigEditorBoolean
+ public boolean onlyInCave = true;
+
+ @Expose
+ @ConfigOption(name = "Show as drops", desc = "Multiplies the numbers on the display by the base drop. \n" +
+ "E.g. 3 Ice Bait -> 48 Ice Bait")
+ @ConfigEditorBoolean
+ public boolean showAsDrops = false;
+
+ @Expose
+ @ConfigOption(name = "Hide Chat messages", desc = "Hides the chat messages from frozen treasures.")
+ @ConfigEditorBoolean
+ public boolean hideMessages = false;
+
+ @Expose
+ public Position position = new Position(10, 80, false, true);
+ }
+
+ @Expose
@ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.")
@ConfigEditorBoolean
public boolean hideExpBottles = false;