From 16a5d2c65fb0d0dbba5eeae30efba3d00cb16790 Mon Sep 17 00:00:00 2001 From: CalMWolfs Date: Mon, 19 Jun 2023 20:09:38 +1000 Subject: start of frozen treasure tracker --- .../hannibal2/skyhanni/config/features/Misc.java | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/config') 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 258bc517a..f5a08521d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -6,6 +6,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 Misc { @Expose @@ -478,6 +482,69 @@ public class Misc { public Position pos = new Position(-178, 143, false, true); } + @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 = { // todo change colours + "§e§lFrozen Treasure Tracker", + "§e1,636 Treasures Mined", + "§e3.2 Total Ice", + "§e342,192 Ice/hr", + "§e31,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 textFormat = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 14, 15)); + + @Expose + @ConfigOption(name = "Count Compact", desc = "Adds compact drops from your pickaxe to the ice total.") + @ConfigEditorBoolean + public boolean countCompact = true; + + @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 = "Hide Chat messages", desc = "Hides the chat messages from frozen treasures.") + @ConfigEditorBoolean + public boolean hideMessages = false; + + @Expose + public Position glacialDropPos = new Position(10, 80, false, true); + } + @Expose @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.") @ConfigEditorBoolean -- cgit From 54cbf2fc5177ffc6b219a72be8032789ff3514b7 Mon Sep 17 00:00:00 2001 From: CalMWolfs Date: Mon, 19 Jun 2023 21:37:22 +1000 Subject: done apart from testing --- src/main/java/at/hannibal2/skyhanni/config/Storage.java | 17 ++++++++++++++++- .../at/hannibal2/skyhanni/config/features/Misc.java | 15 ++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/config') 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 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", -- cgit From 4a12bbd0b780238557cdc2330cf6314015e0de07 Mon Sep 17 00:00:00 2001 From: CalMWolfs Date: Mon, 19 Jun 2023 21:48:45 +1000 Subject: renaming --- src/main/java/at/hannibal2/skyhanni/config/Storage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/config') diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index 4a95871cb..ca852e482 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -5,7 +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.FrozenTreasures; +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; @@ -241,7 +241,7 @@ public class Storage { public int compactProcs = 0; @Expose - public Map treasureCount = new HashMap<>(); + public Map treasureCount = new HashMap<>(); } public long nextCityProjectParticipationTime = 0L; -- cgit From 617c4352fdb622b1b21769823c0af0235d539717 Mon Sep 17 00:00:00 2001 From: CalMWolfs Date: Fri, 23 Jun 2023 08:18:38 +1000 Subject: fixed up --- .../at/hannibal2/skyhanni/config/features/Misc.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/config') 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 ebfe716fe..e9def2a1c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -504,12 +504,12 @@ public class Misc { desc = "Drag text to change the appearance of the overlay." ) @ConfigEditorDraggableList( - exampleText = { // todo change colours - "§e§lFrozen Treasure Tracker", - "§e1,636 Treasures Mined", - "§e3.2m Total Ice", - "§e342,192 Ice/hr", - "§e1,002 Compact Procs", + 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", @@ -527,14 +527,15 @@ public class Misc { public List textFormat = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 14, 15)); @Expose - @ConfigOption(name = "Count Compact", desc = "Adds compact drops from your pickaxe to the ice total.") + @ConfigOption(name = "Only in Glacial Cave", desc = "Only shows the overlay while in the Glacial Cave.") @ConfigEditorBoolean - public boolean countCompact = true; + public boolean onlyInCave = true; @Expose - @ConfigOption(name = "Only in Glacial Cave", desc = "Only shows the overlay while in the Glacial Cave.") + @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 onlyInCave = true; + public boolean showAsDrops = false; @Expose @ConfigOption(name = "Hide Chat messages", desc = "Hides the chat messages from frozen treasures.") -- cgit From a1efe2d469bfe9e152ffcae4cd42dd9e98818c0f Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 23 Jun 2023 00:49:38 +0200 Subject: formatting changes --- src/main/java/at/hannibal2/skyhanni/config/features/Misc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/config') 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 e9def2a1c..8d15a46df 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -543,7 +543,7 @@ public class Misc { public boolean hideMessages = false; @Expose - public Position glacialDropPos = new Position(10, 80, false, true); + public Position position = new Position(10, 80, false, true); } @Expose -- cgit