From b155103abb08a9d54d91cc1d141bce8994f69a89 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 16 Sep 2023 13:20:59 +0200 Subject: use config migration on ashfang gravity orbs --- .../skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/nether') diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt index 92b699845..b9d6e6b7e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.nether.ashfang import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.features.damageindicator.BossType @@ -14,6 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.awt.Color class AshfangGravityOrbs { + private val config get() = SkyHanniMod.feature.ashfang.gravityOrbs private val texture = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV" + "0L3RleHR1cmUvMWE2OWNjZjdhZDkwNGM5YTg1MmVhMmZmM2Y1YjRlMjNhZGViZjcyZWQxMmQ1ZjI0Yjc4Y2UyZDQ0YjRhMiJ9fX0=" @@ -32,7 +34,7 @@ class AshfangGravityOrbs { fun onRenderWorld(event: RenderWorldLastEvent) { if (!isEnabled()) return - val color = Color(SpecialColour.specialToChromaRGB(SkyHanniMod.feature.ashfang.gravityOrbsColor), true) + val color = Color(SpecialColour.specialToChromaRGB(config.color), true) val playerLocation = LocationUtils.playerLocation() for (orb in orbs) { if (orb.isDead) continue @@ -52,8 +54,12 @@ class AshfangGravityOrbs { orbs.clear() } - private fun isEnabled(): Boolean { - return LorenzUtils.inSkyBlock && SkyHanniMod.feature.ashfang.gravityOrbs && - DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG) + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(1, "ashfang.gravityOrbs", "ashfang.gravityOrbs.enabled") + event.move(1, "ashfang.gravityOrbsColor", "ashfang.gravityOrbs.color") } + + private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && + DamageIndicatorManager.isBossSpawned(BossType.NETHER_ASHFANG) } \ No newline at end of file -- cgit