Feature: Mineshaft Pity Display + OreMinedEvent

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt

@@ -52,6 +52,7 @@ import at.hannibal2.skyhanni.features.garden.pests.PestFinder
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
+import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
 import at.hannibal2.skyhanni.features.misc.CollectionTracker
@@ -547,6 +548,10 @@ object Commands {
             "shtoggleegglocationdebug",
             "Shows Hoppity egg locations with their internal API names and status.",
         ) { HoppityEggLocations.toggleDebug() }
+        registerCommand(
+            "shresetmineshaftpitystats",
+            "Resets the mineshaft pity display stats"
+        ) { MineshaftPityDisplay.fullResetCounter() }
     }
 
     private fun internalCommands() {

src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java

@@ -126,6 +126,16 @@ public class DebugConfig {
     @ConfigEditorBoolean
     public boolean currentAreaDebug = true;
 
+    @Expose
+    @ConfigOption(name = "Oreblock Name", desc = "Show the OreBlock you are currently looking at.")
+    @ConfigEditorBoolean
+    public boolean raytracedOreblock = true;
+
+    @Expose
+    @ConfigOption(name = "Ore Event Messages", desc = "Shows debug messages every time the Ore Event happens.")
+    @ConfigEditorBoolean
+    public boolean oreEventMessages = false;
+
     @Expose
     @ConfigOption(name = "Assume Mayor", desc = "Select a mayor to assume.")
     @ConfigEditorDropdown

src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java

@@ -8,6 +8,7 @@
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
 
@@ -60,6 +61,10 @@ public class DevConfig {
     @Expose
     public Position debugItemPos = new Position(90, 70);
 
+    @Expose
+    @ConfigLink(owner = DebugConfig.class, field = "raytracedOreblock")
+    public Position debugOrePos = new Position(1, 200, false, true);
+
     @Expose
     @ConfigOption(
         name = "Fancy Contributors",

src/main/java/at/hannibal2/skyhanni/config/features/mining/MineshaftPityDisplayConfig.java

@@ -0,0 +1,43 @@
+package at.hannibal2.skyhanni.config.features.mining;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay.MineshaftPityLines;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MineshaftPityDisplayConfig {
+    @Expose
+    @ConfigOption(name = "Enable Display", desc = "Enable the Mineshaft Pity Display.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(name = "Stats List", desc = "Drag text to change the appearance of the display.")
+    @ConfigEditorDraggableList
+    public List<MineshaftPityLines> mineshaftPityLines = new ArrayList<>(Arrays.asList(
+        MineshaftPityLines.TITLE,
+        MineshaftPityLines.COUNTER,
+        MineshaftPityLines.CHANCE,
+        MineshaftPityLines.NEEDED_TO_PITY,
+        MineshaftPityLines.TIME_SINCE_MINESHAFT
+    ));
+
+    @Expose
+    @ConfigOption(name = "Modify Spawn Message", desc = "Modify the Mineshaft spawn message with more stats.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean modifyChatMessage = true;
+
+    @Expose
+    @ConfigLink(owner = MineshaftPityDisplayConfig.class, field = "enabled")
+    public Position position = new Position(16, 192, false, true);
+}

src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java

@@ -68,6 +68,11 @@ public class MiningConfig {
     @Accordion
     public MineshaftConfig mineshaft = new MineshaftConfig();
 
+    @Expose
+    @ConfigOption(name = "Mineshaft Pity Display", desc = "")
+    @Accordion
+    public MineshaftPityDisplayConfig mineshaftPityDisplay = new MineshaftPityDisplayConfig();
+
     @Expose
     @ConfigOption(name = "Highlight Commission Mobs", desc = "Highlight Mobs that are part of active commissions.")
     @ConfigEditorBoolean

src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java

@@ -29,6 +29,7 @@
 import at.hannibal2.skyhanni.features.garden.pests.VinylType;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.inventory.wardrobe.WardrobeAPI;
+import at.hannibal2.skyhanni.features.mining.MineshaftPityDisplay;
 import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker;
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker;
 import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker;
@@ -540,6 +541,21 @@ public static class PowderStorage {
 
         @Expose
         public int availableTokens;
+
+        @Expose
+        public MineshaftStorage mineshaft = new MineshaftStorage();
+
+        public static class MineshaftStorage {
+
+            @Expose
+            public long mineshaftTotalBlocks = 0L;
+
+            @Expose
+            public int mineshaftTotalCount = 0;
+
+            @Expose
+            public List<MineshaftPityDisplay.PityData> blocksBroken = new ArrayList<>();
+        }
     }
 
     @Expose

src/main/java/at/hannibal2/skyhanni/data/HotmData.kt

@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut
 import at.hannibal2.skyhanni.utils.ConditionalUtils.transformIf
 import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -36,11 +37,28 @@ import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.pow
 
+
+private fun calculatePeakOfTheMountainLoot(level: Int): Map<HotmReward, Double> = buildMap {
+    for (i in 1..level) {
+        when (i) {
+            1, 5, 7 -> addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
+            2 -> addOrPut(HotmReward.EXTRA_FORGE_SLOTS, 1.0)
+            3 -> addOrPut(HotmReward.EXTRA_COMMISSION_SLOTS, 1.0)
+            4 -> addOrPut(HotmReward.MORE_BASE_MITHRIL_POWER, 1.0)
+            6 -> addOrPut(HotmReward.MORE_BASE_GEMSTONE_POWER, 2.0)
+            8 -> addOrPut(HotmReward.MORE_BASE_GLACITE_POWER, 3.0)
+            9 -> addOrPut(HotmReward.MINESHAFT_CHANCE, 10.0)
+            10 -> addOrPut(HotmReward.EXTRA_TOKENS, 2.0)
+        }
+    }
+}
+
+
 enum class HotmData(
     val guiName: String,
     val maxLevel: Int,
-    val costFun: ((Int) -> (Double?)),
-    val rewardFun: ((Int) -> (Map<HotmReward, Double>)),
+    val costFun: (Int) -> (Double?),
+    val rewardFun: (Int) -> (Map<HotmReward, Double>),
 ) {
 
     MINING_SPEED(
@@ -246,7 +264,10 @@ enum class HotmData(
         },
     ),
 
-    PEAK_OF_THE_MOUNTAIN("Peak of the Mountain", 10, { null }, { emptyMap() }),
+    PEAK_OF_THE_MOUNTAIN(
+        "Peak of the Mountain", 10, { null },
+        { level -> calculatePeakOfTheMountainLoot(level) },
+    ),
 
     // Mining V3
     DAILY_GRIND(
@@ -291,7 +312,7 @@ enum class HotmData(
         "Surveyor",
         20,
         { currentLevel -> (currentLevel + 1.0).pow(4) },
-        { level -> mapOf(HotmReward.UNKNOWN to 0.75 * level) },
+        { level -> mapOf(HotmReward.MINESHAFT_CHANCE to 0.75 * level) },
     ),
     EAGER_ADVENTURER(
         "Eager Adventurer",
@@ -343,7 +364,7 @@ enum class HotmData(
         get() = storage?.perks?.get(this.name)?.level ?: 0
 
     var activeLevel: Int
-        get() = storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0
+        get() = if (enabled) storage?.perks?.get(this.name)?.level?.plus(blueEgg()) ?: 0 else 0
         private set(value) {
             storage?.perks?.computeIfAbsent(this.name) { HotmTree.HotmPerk() }?.level = value
         }
@@ -370,7 +391,7 @@ enum class HotmData(
 
     fun getLevelUpCost() = costFun(rawLevel)
 
-    fun getReward() = rewardFun(activeLevel)
+    fun getReward() = if (enabled) rewardFun(activeLevel) else emptyMap()
 
     fun calculateTotalCost(desiredLevel: Int) = (1 until desiredLevel).sumOf { level -> costFun(level) ?: 0.0 }.toInt()
 
@@ -382,8 +403,7 @@ enum class HotmData(
 
         val storage get() = ProfileStorageData.profileSpecific?.mining?.hotmTree
 
-        val abilities =
-            listOf(PICKOBULUS, MINING_SPEED_BOOST, VEIN_SEEKER, MANIAC_MINER, HAZARDOUS_MINER, GEMSTONE_INFUSION)
+        val abilities = listOf(PICKOBULUS, MINING_SPEED_BOOST, VEIN_SEEKER, MANIAC_MINER, HAZARDOUS_MINER, GEMSTONE_INFUSION)
 
         private val inventoryPattern by patternGroup.pattern(
             "inventory",
@@ -407,7 +427,7 @@ enum class HotmData(
         private val disabledPattern by patternGroup.pattern(
             "perk.disabled",
             "§c§lDISABLED|§7§eClick to select!",
-        ) // unused for now since the assumption is when enabled isn't found it is disabled, 
+        ) // unused for now since the assumption is when enabled isn't found it is disabled,
         // but the value might be useful in the future or for debugging
 
         val perkCostPattern by patternGroup.pattern(
@@ -478,6 +498,21 @@ enum class HotmData(
             HotmAPI.MayhemPerk.entries.forEach {
                 it.chatPattern
             }
+            (0..PEAK_OF_THE_MOUNTAIN.maxLevel).forEach { level ->
+                val map = mutableMapOf<HotmReward, Double>()
+                if (level >= 1) map.addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
+                if (level >= 2) map.addOrPut(HotmReward.EXTRA_FORGE_SLOTS, 1.0)
+                if (level >= 3) map.addOrPut(HotmReward.EXTRA_COMMISSION_SLOTS, 1.0)
+                if (level >= 4) map.addOrPut(HotmReward.MORE_BASE_MITHRIL_POWER, 1.0)
+                if (level >= 5) map.addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
+                if (level >= 6) map.addOrPut(HotmReward.MORE_BASE_GEMSTONE_POWER, 2.0)
+                if (level >= 7) map.addOrPut(HotmReward.EXTRA_TOKENS, 1.0)
+                if (level >= 8) map.addOrPut(HotmReward.MORE_BASE_GLACITE_POWER, 3.0)
+                if (level >= 9) map.addOrPut(HotmReward.MINESHAFT_CHANCE, 10.0)
+                if (level >= 10) map.addOrPut(HotmReward.EXTRA_TOKENS, 2.0)
+
+                peakOfTheMountainPerks[level] = map
+            }
         }
 
         fun getPerkByNameOrNull(name: String): HotmData? = entries.find { it.guiName == name }
@@ -724,6 +759,8 @@ enum class HotmData(
     }
 }
 
+private val peakOfTheMountainPerks = mutableMapOf<Int, Map<HotmReward, Double>>()
+
 private val patternGroup = RepoPattern.group("mining.hotm")
 
 enum class HotmReward {
@@ -735,6 +772,7 @@ enum class HotmReward {
     DAILY_POWDER,
     MORE_BASE_MITHRIL_POWER,
     MORE_BASE_GEMSTONE_POWER,
+    MORE_BASE_GLACITE_POWER,
     MORE_MITHRIL_POWER,
     MORE_GEMSTONE_POWER,
     COMBAT_STAT_BOOST,
@@ -748,6 +786,10 @@ enum class HotmReward {
     ABILITY_RADIUS,
     ABILITY_COOLDOWN,
     FOSSIL_DUST,
+    MINESHAFT_CHANCE,
+    EXTRA_TOKENS,
+    EXTRA_FORGE_SLOTS,
+    EXTRA_COMMISSION_SLOTS,
     UNKNOWN,
     COLD_RESISTANCE
 }