From fc8d82ca5e95d13bcd2205406f1ddcf9e525eb6d Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Wed, 10 Apr 2024 17:18:35 +1000
Subject: Backend: Remove some more deprecated functions and misc code cleanup
 (#1402)

Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/data/CropAccessoryData.kt   |  6 ++--
 .../java/at/hannibal2/skyhanni/data/MaxwellAPI.kt  | 32 +++++++++++-----------
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
index b05cc0e56..321e81e26 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
-import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.garden.CropAccessory
 import at.hannibal2.skyhanni.features.garden.GardenAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -28,7 +28,6 @@ class CropAccessoryData {
     )
 
     private var loadedAccessoryThisProfile = false
-    private var ticks = 0
     private var accessoryInBag: CropAccessory? = null
     private var accessoryInInventory = CropAccessory.NONE
 
@@ -84,8 +83,7 @@ class CropAccessoryData {
 
     // Handle inventory detection
     @SubscribeEvent
-    fun onTick(event: LorenzTickEvent) {
-        if (!event.repeatSeconds(1)) return
+    fun onSecondPassed(event: SecondPassedEvent) {
         if (!LorenzUtils.inSkyBlock) return
         accessoryInInventory = bestCropAccessory(InventoryUtils.getItemsInOwnInventory())
         if (accessoryInInventory == CropAccessory.NONE) return
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
index ebfb4a892..eed541571 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt
@@ -51,64 +51,64 @@ object MaxwellAPI {
 
     private var powers = mutableListOf<String>()
 
-    private val group = RepoPattern.group("data.maxwell")
-    private val chatPowerpattern by group.pattern(
+    private val patternGroup = RepoPattern.group("data.maxwell")
+    private val chatPowerpattern by patternGroup.pattern(
         "chat.power",
         "§eYou selected the §a(?<power>.*) §e(power )?for your §aAccessory Bag§e!"
     )
-    private val inventoryPowerPattern by group.pattern(
+    private val inventoryPowerPattern by patternGroup.pattern(
         "inventory.power",
         "§7Selected Power: §a(?<power>.*)"
     )
-    private val inventoryMPPattern by group.pattern(
+    private val inventoryMPPattern by patternGroup.pattern(
         "inventory.magicalpower",
         "§7Magical Power: §6(?<mp>[\\d,]+)"
     )
-    private val thaumaturgyGuiPattern by group.pattern(
+    private val thaumaturgyGuiPattern by patternGroup.pattern(
         "gui.thaumaturgy",
         "Accessory Bag Thaumaturgy"
     )
-    private val thaumaturgyStartPattern by group.pattern(
+    private val thaumaturgyStartPattern by patternGroup.pattern(
         "gui.thaumaturgy.start",
         "§7Your tuning:"
     )
-    private val thaumaturgyDataPattern by group.pattern(
+    private val thaumaturgyDataPattern by patternGroup.pattern(
         "gui.thaumaturgy.data",
         "§(?<color>.)\\+(?<amount>[^ ]+)(?<icon>.) (?<name>.+)"
     )
-    private val thaumaturgyMagicalPowerPattern by group.pattern(
+    private val thaumaturgyMagicalPowerPattern by patternGroup.pattern(
         "gui.thaumaturgy.magicalpower",
         "§7Total: §6(?<mp>\\d+) Magical Power"
     )
-    private val statsTuningGuiPattern by group.pattern(
+    private val statsTuningGuiPattern by patternGroup.pattern(
         "gui.thaumaturgy.statstuning",
         "Stats Tuning"
     )
-    private val statsTuningDataPattern by group.pattern(
+    private val statsTuningDataPattern by patternGroup.pattern(
         "thaumaturgy.statstuning",
         "§7You have: .+ §7\\+ §(?<color>.)(?<amount>[^ ]+) (?<icon>.)"
     )
-    private val tuningAutoAssignedPattern by group.pattern(
+    private val tuningAutoAssignedPattern by patternGroup.pattern(
         "tuningpoints.chat.autoassigned",
         "§aYour §r§eTuning Points §r§awere auto-assigned as convenience!"
     )
-    private val yourBagsGuiPattern by group.pattern(
+    private val yourBagsGuiPattern by patternGroup.pattern(
         "gui.yourbags",
         "Your Bags"
     )
-    private val powerSelectedPattern by group.pattern(
+    private val powerSelectedPattern by patternGroup.pattern(
         "gui.selectedpower",
         "§aPower is selected!"
     )
-    private val noPowerSelectedPattern by group.pattern(
+    private val noPowerSelectedPattern by patternGroup.pattern(
         "gui.noselectedpower",
         "(?:§.)*Visit Maxwell in the Hub to learn"
     )
-    private val accessoryBagStack by group.pattern(
+    private val accessoryBagStack by patternGroup.pattern(
         "stack.accessorybag",
         "§.Accessory Bag"
     )
-    private val redstoneCollectionRequirementPattern by group.pattern(
+    private val redstoneCollectionRequirementPattern by patternGroup.pattern(
         "collection.redstone.requirement",
         "(?:§.)*Requires (?:§.)*Redstone Collection I+(?:§.)*\\."
     )
-- 
cgit