From 7ff28af498fdba6e5a2a1150c3e2620c613c2c48 Mon Sep 17 00:00:00 2001 From: David Cole <40234707+DavidArthurCole@users.noreply.github.com> Date: Sun, 23 Jun 2024 07:45:28 -0400 Subject: Feature & Fix: Powder Tracker Hard Stone & Goblin Eggs (#2138) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/mining/PowderTrackerConfig.java | 8 ++++- .../features/mining/powdertracker/PowderTracker.kt | 37 +++++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java index 2f277d925..1c32cabc2 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java @@ -22,6 +22,7 @@ import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.P import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.FTX; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.GEMSTONE_POWDER; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.GOLD_ESSENCE; +import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.HARD_STONE; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.JADE; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.MITHRIL_POWDER; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.ROBOTRON; @@ -29,6 +30,7 @@ import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.P import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SAPPHIRE; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_1; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_2; +import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.SPACER_3; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.TOPAZ; import static at.hannibal2.skyhanni.config.features.mining.PowderTrackerConfig.PowderDisplayEntry.TOTAL_CHESTS; @@ -60,6 +62,8 @@ public class PowderTrackerConfig { DIAMOND_ESSENCE, GOLD_ESSENCE, SPACER_2, + HARD_STONE, + SPACER_3, RUBY, SAPPHIRE, AMBER, @@ -80,6 +84,8 @@ public class PowderTrackerConfig { DIAMOND_ESSENCE("§b129 §bDiamond Essence §7(600/h)", 7), GOLD_ESSENCE("§b234 §6Gold Essence §7(700/h)", 8), SPACER_2("", 9), + HARD_STONE("§b1000 §fHard Stone §bCompacted §7(500/h)"), + SPACER_3(""), RUBY("§50§7-§90§7-§a0§f-0 §cRuby Gemstone", 10), SAPPHIRE("§50§7-§90§7-§a0§f-0 §bSapphire Gemstone", 11), AMBER("§50§7-§90§7-§a0§f-0 §6Amber Gemstone", 12), @@ -93,7 +99,7 @@ public class PowderTrackerConfig { CONTROL_SWITCH("§b14 §9Control Switch", 20), SYNTHETIC_HEART("§b14 §9Synthetic Heart", 21), TOTAL_ROBOT_PARTS("§b14 §9Total Robot Parts", 22), - GOBLIN_EGGS("§90§7-§a0§7-§c0§f-§e0§f-§30 §fGoblin Egg", 23), + GOBLIN_EGGS("§30§7-§c0§7-§e0§f-§a0§f-§90 §fGoblin Egg", 23), WISHING_COMPASS("§b12 §aWishing Compass", 24), SLUDGE_JUICE("§b320 §aSludge Juice", 25), ASCENSION_ROPE("§b2 §9Ascension Rope", 26), diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt index a936f9636..f302b669b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt @@ -57,6 +57,14 @@ object PowderTracker { "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?