properly using the hook to not have potential broken code in the mixin itself, added inSkyBlock checks before accessing the config to fix `lateinit property configManager has not been initialized` startup crash

1 files changed, 21 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
index 808406946..a2fc3ad76 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.mixins.transformers.AccessorFontRenderer
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
 
 /**
  * Object to handle chroma font states from handler methods from MixinFontRenderer
@@ -98,6 +99,8 @@ object FontRendererHook {
 
     @JvmStatic
     fun forceWhiteColorCode(i1: Int) : Int {
+        if (!LorenzUtils.inSkyBlock) return i1
+
         if (!SkyHanniMod.feature.chroma.enabled) return i1
 
         val drawState = currentDrawState ?: return i1
@@ -112,16 +115,16 @@ object FontRendererHook {
 
     @JvmStatic
     fun restoreChromaState() {
-        if (!SkyHanniMod.feature.chroma.enabled) return
         if (!LorenzUtils.inSkyBlock) return
+        if (!SkyHanniMod.feature.chroma.enabled) return
 
         currentDrawState?.restoreChromaEnv()
     }
 
     @JvmStatic
     fun endChromaRendering() {
-        if (!SkyHanniMod.feature.chroma.enabled) return
         if (!LorenzUtils.inSkyBlock) return
+        if (!SkyHanniMod.feature.chroma.enabled) return
 
         if (previewChroma) {
             previewChroma = false
@@ -132,4 +135,20 @@ object FontRendererHook {
 
         currentDrawState?.endChromaEnv()
     }
+
+    @JvmStatic
+    fun insertZColorCode(constant: String): String {
+        return if (LorenzUtils.inSkyBlock && !SkyHanniMod.feature.chroma.enabled) constant else "0123456789abcdefklmnorz"
+    }
+
+    @JvmStatic
+    fun toggleChromaCondition_shouldResetStyles(text: String, shadow: Boolean, ci: CallbackInfo, i: Int, c0: Char, i1: Int): Boolean {
+        if (!LorenzUtils.inSkyBlock) return false
+        if (!SkyHanniMod.feature.chroma.enabled) return false
+        if (i1 == 22) {
+            toggleChromaOn()
+            return true
+        }
+        return false
+    }
 }
\ No newline at end of file