Merge pull request #25 from martimavocado/skymall-display

add skymall display

Author: martimavocado

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt

@@ -206,6 +206,7 @@ import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer
 import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles
 import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown
 import at.hannibal2.skyhanni.features.mainlobby.halloweenwaypoints.BasketWaypoints
+import at.hannibal2.skyhanni.features.mining.SkymallDisplay
 import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore
@@ -672,6 +673,7 @@ class SkyHanniMod {
         loadModule(PestSpawnTimer)
         loadModule(PestFinder())
         loadModule(SprayFeatures())
+        loadModule(SkymallDisplay())
 
         init()
 

src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java

@@ -56,6 +56,12 @@ public class FilterTypesConfig {
     @FeatureToggle
     public boolean powderMining = true;
 
+    @Expose
+    @ConfigOption(name = "Sky Mall", desc = "Hide daily Sky Mall messages for when the perk updates.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean skymall = true;
+
     @Expose
     @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current Kill Combo from the Grandma Wolf Pet.")
     @ConfigEditorBoolean

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

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.config.features.mining;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
+import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.Accordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
@@ -29,4 +30,13 @@ public class MiningConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean crystalHollowsNamesInCore = false;
+
+    @Expose
+    @ConfigOption(name = "Sky Mall Display", desc = "Shows an overlay with the current skymall perk.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean skymallDisplay = false;
+
+    @Expose
+    public Position skymallDisplayPosition = new Position(3, 140, 1.0f);
 }

src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt

@@ -188,6 +188,8 @@ class ChatFilter {
         "§aYou used your §r§6Mining Speed Boost §r§aPickaxe Ability!",
         "§cYour Mining Speed Boost has expired!",
         "§a§r§6Mining Speed Boost §r§ais now available!",
+        "§bNew day! §r§eYour §r§2Sky Mall §r§ebuff changed!",
+        "§8§oYou can disable this messaging by toggling Sky Mall in your /hotm!",
     )
 
     // Party
@@ -307,6 +309,10 @@ class ChatFilter {
         "§6§k§lA§r §c§lFIRE SALE §r§6§k§lA",
     )
 
+    private val skymallPatterns = listOf(
+        "§eNew buff§r§r§r: (.*).§r§f.".toPattern(),
+    )
+
     private val patternsMap: Map<String, List<Pattern>> = mapOf(
         "lobby" to lobbyPatterns,
         "warping" to warpingPatterns,
@@ -321,6 +327,7 @@ class ChatFilter {
         "annoying_spam" to annoyingSpamPatterns,
         "winter_gift" to winterGiftPatterns,
         "powder_mining" to powderMiningPatterns,
+        "skymall" to skymallPatterns,
         "fire_sale" to fireSalePatterns,
     )
 
@@ -375,8 +382,8 @@ class ChatFilter {
 
         config.winterGift && message.isPresent("winter_gift") -> "winter_gift"
         config.powderMining && message.isPresent("powder_mining") -> "powder_mining"
+        config.skymall && message.isPresent("skymall") -> "skymall"
         config.fireSale && message.isPresent("fire_sale") -> "fire_sale"
-
         else -> ""
     }
 

src/main/java/at/hannibal2/skyhanni/features/mining/SkymallDisplay.kt

@@ -0,0 +1,64 @@
+package at.hannibal2.skyhanni.features.mining
+
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.InventoryUpdatedEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RenderUtils.renderString
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class SkymallDisplay {
+    private val config get() = SkyHanniMod.feature.mining
+    private var currentPerk = "nothing"
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
+        if (!config.skymallDisplay) return
+        if (!LorenzUtils.inSkyBlock) return
+        when (currentPerk) {
+            "nothing" -> config.skymallDisplayPosition.renderString("§cNo perks found! Open §b/hotm §cto refresh", posLabel = "Sky Mall Display")
+            "unknown" -> {
+                config.skymallDisplayPosition.renderString("§cUnknown perk!", posLabel = "Sky Mall Display")
+            }
+            else -> config.skymallDisplayPosition.renderString("§eSky Mall:§f $currentPerk", posLabel = "Sky Mall Display")
+        }
+    }
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (event.message.removeColor().startsWith("New buff:")) {
+            currentPerk = event.message
+                .replace("New buff", "")
+                .replace(": ", "")
+                .replace(".", "")
+        }
+    }
+
+    @SubscribeEvent
+    fun onInventoryUpdate(event: InventoryUpdatedEvent) {
+        if (!config.skymallDisplay) return
+        if (!LorenzUtils.inSkyBlock) return
+        if (event.inventoryName != "Heart of the Mountain") return
+        for((slot, item) in event.inventoryItems) {
+            if (item.name == "§aSky Mall") {
+                currentPerk = when (item.getLore()[16]) {
+                    "§8 ■ §7Gain §a+100 §6⸕ Mining Speed§7." -> "§fGain §a+100 §6⸕ Mining Speed"
+                    "§8 ■ §7Gain §a+50 §6☘ Mining Fortune§7." -> "§fGain §a+50 §6☘ Mining Fortune"
+                    "§8 ■ §7Gain §a+15% §7more Powder while" -> "§fGain §a+15% §fmore Powder while mining"
+                    "§8 ■ §7Reduce Pickaxe Ability cooldown" -> "§fReduce Pickaxe Ability cooldown by §a20%"
+                    "§8 ■ §7§a10x §7chance to find Golden" -> "§f§a10x §fchance to find Golden and Diamond Goblins"
+                    "§8 ■ §7Gain §a5x §9Titanium §7drops." -> "§fGain §a5x §9Titanium §fdrops"
+                    else -> {
+                        // todo copy item nbt so people can paste it in support
+                        // LorenzUtils.chat("unknown event: ${item.getLore()[16]}")
+                        "unknown"
+                    }
+                }
+            }
+        }
+    }
+}