From 31bfd8a1d3437f4bdbefa7bcba75143e37c4ac90 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 7 Apr 2024 10:30:03 +0200
Subject: Backend: Mayor Overwrite (#1302)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt     | 3 +--
 .../hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt  | 6 ++++--
 .../hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt   | 6 +-----
 3 files changed, 6 insertions(+), 9 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
index e1e420ab4..747c0d02a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.features.event.diana
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.Perk
 import at.hannibal2.skyhanni.data.PetAPI
@@ -17,7 +16,7 @@ object DianaAPI {
     fun hasSpadeInHand() = InventoryUtils.itemInHandId == spade
 
     private fun isRitualActive() = Perk.MYTHOLOGICAL_RITUAL.isActive ||
-        Perk.PERKPOCALYPSE.isActive || SkyHanniMod.feature.event.diana.alwaysDiana
+        Perk.PERKPOCALYPSE.isActive
 
     fun hasGriffinPet() = PetAPI.isCurrentPet("Griffin")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 94145eaca..4fb025097 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -4,6 +4,8 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.Mayor
+import at.hannibal2.skyhanni.data.MayorAPI.currentMayor
 import at.hannibal2.skyhanni.events.BlockClickEvent
 import at.hannibal2.skyhanni.events.BurrowDetectEvent
 import at.hannibal2.skyhanni.events.BurrowDugEvent
@@ -323,8 +325,8 @@ object GriffinBurrowHelper {
         }
 
         if (!isEnabled()) {
-            if (!config.alwaysDiana) {
-                ChatUtils.clickableChat("§cEnable Always Diana in the config!", "sh always diana")
+            if (currentMayor != Mayor.DIANA) {
+                ChatUtils.clickableChat("§cSelect Diana as mayor overwrite!", "sh assume mayor")
             } else {
                 ChatUtils.userError("Have an Ancestral Spade in the inventory!")
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
index b866944d5..691c3777c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt
@@ -174,11 +174,7 @@ object GardenCropSpeed {
         secondsStopped = 0
     }
 
-    fun finneganPerkActive(): Boolean {
-        val forcefullyEnabledAlwaysFinnegan = config.forcefullyEnabledAlwaysFinnegan
-        val perkActive = Perk.FARMING_SIMULATOR.isActive
-        return forcefullyEnabledAlwaysFinnegan || perkActive
-    }
+    fun finneganPerkActive() = Perk.FARMING_SIMULATOR.isActive
 
     fun isEnabled() = GardenAPI.inGarden()
 
-- 
cgit