migrate mobs nad summoning config into combat

3 files changed, 9 insertions, 7 deletions

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) {