migrate mobs nad summoning config into combat

6 files changed, 34 insertions, 21 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
index ab4d22df1..0d164b477 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.util.EnumParticleTypes
@@ -16,7 +17,7 @@ class MiscFeatures {
     @SubscribeEvent
     fun onEnderTeleport(event: EnderTeleportEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.mobs.endermanTeleportationHider) return
+        if (!SkyHanniMod.feature.combat.mobs.endermanTeleportationHider) return
 
         event.isCanceled = true
     }
@@ -44,4 +45,9 @@ class MiscFeatures {
             event.isCanceled = true
         }
     }
+
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "mobs", "combat.mobs")
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/AreaMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/AreaMiniBossFeatures.kt
index a0988ceac..10b77f526 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/AreaMiniBossFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/AreaMiniBossFeatures.kt
@@ -17,6 +17,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class AreaMiniBossFeatures {
+    private val config get() = SkyHanniMod.feature.combat.mobs
     private var lastTime = 0L
     private var miniBossType: AreaMiniBossType? = null
     private var respawnCooldown = 11_000L
@@ -39,11 +40,11 @@ class AreaMiniBossFeatures {
             }
             lastTime = time
 
-            if (SkyHanniMod.feature.mobs.areaBossHighlight) {
+            if (config.areaBossHighlight) {
                 val color = bossType.color.toColor().withAlpha(bossType.colorOpacity)
                 RenderLivingEntityHelper.setEntityColor(entity, color)
-                { SkyHanniMod.feature.mobs.areaBossHighlight }
-                RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.areaBossHighlight }
+                { config.areaBossHighlight }
+                RenderLivingEntityHelper.setNoHurtTime(entity) { config.areaBossHighlight }
             }
 
             // TODO add sound
@@ -53,7 +54,7 @@ class AreaMiniBossFeatures {
     @SubscribeEvent
     fun onRenderWorld(event: RenderWorldLastEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.mobs.areaBossRespawnTimer) return
+        if (!config.areaBossRespawnTimer) return
 
         miniBossType?.apply {
             val time = getTime()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/AshfangMinisNametagHider.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/AshfangMinisNametagHider.kt
index f3709b317..87d4e5a13 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/AshfangMinisNametagHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/AshfangMinisNametagHider.kt
@@ -9,11 +9,12 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class AshfangMinisNametagHider {
+    private val config get() = SkyHanniMod.feature.combat.mobs
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLiving(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.mobs.hideNameTagArachneMinis) return
+        if (!config.hideNameTagArachneMinis) return
 
         val entity = event.entity
         if (entity !is EntityArmorStand) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
index 8d8a3ca40..a366f5ce5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
@@ -11,13 +11,13 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.entity.EntityLivingBase
+import net.minecraft.entity.monster.EntityCaveSpider
 import net.minecraft.entity.monster.EntityEnderman
 import net.minecraft.entity.monster.EntitySpider
-import net.minecraft.entity.monster.EntityCaveSpider
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class MobHighlight {
-    private val config get() = SkyHanniMod.feature.mobs
+    private val config get() = SkyHanniMod.feature.combat.mobs
 
     @SubscribeEvent
     fun onEntityHealthUpdate(event: EntityHealthUpdateEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
index 63df99ab0..dc3533cd2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.summonings
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.*
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
@@ -14,6 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class SummoningMobManager {
+    private val config get() = SkyHanniMod.feature.combat.summonings
 
 
     private val summoningMobs = mutableMapOf<EntityLiving, SummoningMob>()
@@ -38,7 +40,7 @@ class SummoningMobManager {
 
         val message = event.message
         spawnPatter.matchMatcher(message) {
-            if (SkyHanniMod.feature.summonings.summoningMobDisplay) {
+            if (config.summoningMobDisplay) {
                 event.blockedReason = "summoning_soul"
             }
             summoningsSpawned++
@@ -48,13 +50,13 @@ class SummoningMobManager {
 
         if (despawnPatter.matcher(message).matches() || message.startsWith("§c ☠ §r§7You ")) {
             despawned()
-            if (SkyHanniMod.feature.summonings.summoningMobDisplay && !message.contains("☠")) {
+            if (config.summoningMobDisplay && !message.contains("☠")) {
                 event.blockedReason = "summoning_soul"
             }
         }
         if (message == "§cThe Seraph recalled your summoned ally!" || seraphRecallPattern.matcher(message).matches()) {
             despawned()
-            if (SkyHanniMod.feature.summonings.summoningMobDisplay) {
+            if (config.summoningMobDisplay) {
                 event.blockedReason = "summoning_soul"
             }
         }
@@ -64,7 +66,7 @@ class SummoningMobManager {
     fun onTick(event: LorenzTickEvent) {
         if (!isEnabled()) return
 
-        if (SkyHanniMod.feature.summonings.summoningMobDisplay) {
+        if (config.summoningMobDisplay) {
             if (event.repeatSeconds(1)) {
                 updateData()
             }
@@ -128,7 +130,7 @@ class SummoningMobManager {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.summonings.summoningMobDisplay) return
+        if (!config.summoningMobDisplay) return
         if (summoningMobs.isEmpty()) return
 
         val list = mutableListOf<String>()
@@ -140,7 +142,7 @@ class SummoningMobManager {
             id++
         }
 
-        SkyHanniMod.feature.summonings.summoningMobDisplayPos.renderStrings(list, posLabel = "Summoning Mob Display")
+        config.summoningMobDisplayPos.renderStrings(list, posLabel = "Summoning Mob Display")
     }
 
     @SubscribeEvent
@@ -151,7 +153,7 @@ class SummoningMobManager {
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLiving(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.summonings.summoningMobHideNametag) return
+        if (!config.summoningMobHideNametag) return
 
         val entity = event.entity
         if (entity !is EntityArmorStand) return
@@ -163,7 +165,7 @@ class SummoningMobManager {
 
     @SubscribeEvent
     fun onRenderMobColored(event: RenderMobColoredEvent) {
-        if (SkyHanniMod.feature.summonings.summoningMobColored) {
+        if (config.summoningMobColored) {
             val entity = event.entity
             if (entity is EntityLiving && entity in summoningMobs.keys) {
                 event.color = LorenzColor.GREEN.toColor().withAlpha(127)
@@ -174,11 +176,16 @@ class SummoningMobManager {
     @SubscribeEvent
     fun onResetEntityHurtTime(event: ResetEntityHurtEvent) {
         val entity = event.entity
-        if (SkyHanniMod.feature.summonings.summoningMobColored && entity in summoningMobs.keys) {
+        if (config.summoningMobColored && entity in summoningMobs.keys) {
             event.shouldReset = true
         }
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "summonings", "combat.summonings")
+    }
+
     private fun despawned() {
         summoningMobs.clear()
         summoningMobNametags.clear()
@@ -188,7 +195,7 @@ class SummoningMobManager {
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && (SkyHanniMod.feature.summonings.summoningMobDisplay || SkyHanniMod.feature.summonings.summoningMobHideNametag)
+        return LorenzUtils.inSkyBlock && (config.summoningMobDisplay || config.summoningMobHideNametag)
     }
 
     class SummoningMob(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index 5bf3b1a3d..709d5e662 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -92,7 +92,5 @@ class SummoningSoulsName {
         mobsName.clear()
     }
 
-    private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.summonings.summoningSoulDisplay
-    }
+    private fun isEnabled() = LorenzUtils.inSkyBlock && SkyHanniMod.feature.combat.summonings.summoningSoulDisplay
 }
\ No newline at end of file