Splitting many utils functions from LorenzUtils up into other classes: ChatUtils, CollectionUtils, ConditionalUtils. And code cleanup #978

5 files changed, 12 insertions, 8 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 4959bda33..b48b1376c 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.features.chroma.ChromaFontRenderer
 import at.hannibal2.skyhanni.mixins.transformers.AccessorFontRenderer
 import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.shader.ShaderManager
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
@@ -17,6 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
  * Credit: [FontRendererHook.java](https://github.com/BiscuitDevelopment/SkyblockAddons/blob/main/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/FontRendererHook.java)
  */
 object FontRendererHook {
+
     private var CHROMA_COLOR: Int = -0x1
     private val DRAW_CHROMA = ChromaFontRenderer(CHROMA_COLOR)
     private var CHROMA_COLOR_SHADOW: Int = -0xAAAAAB
@@ -156,7 +156,7 @@ object FontRendererHook {
         ci: CallbackInfo,
         i: Int,
         c0: Char,
-        i1: Int
+        i1: Int,
     ): Boolean {
         if (!LorenzUtils.inSkyBlock) return false
         if (!SkyHanniMod.feature.chroma.enabled) return false
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
index 33ee05271..6bbbbf6e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/MixinPatcherFontRendererHookHook.kt
@@ -6,6 +6,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 
 class MixinPatcherFontRendererHookHook {
     companion object {
+
         @JvmStatic
         fun overridePatcherFontRenderer(string: String, shadow: Boolean, cir: CallbackInfoReturnable<Boolean>) {
             if (!LorenzUtils.onHypixel) return
@@ -16,4 +17,4 @@ class MixinPatcherFontRendererHookHook {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt
index 57305c5bd..92e7a95ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderGlobalHook.kt
@@ -7,6 +7,7 @@ import net.minecraft.client.renderer.culling.ICamera
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable

 

 class RenderGlobalHook {

+

     fun renderEntitiesOutlines(camera: ICamera?, partialTicks: Float): Boolean {

         val vec = RenderUtils.exactLocation(Minecraft.getMinecraft().renderViewEntity, partialTicks)

         return EntityOutlineRenderer.renderEntityOutlines(camera!!, partialTicks, vec)

@@ -17,4 +18,4 @@ class RenderGlobalHook {
             cir.returnValue = true

         }

     }

-}
\ No newline at end of file
+}

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderLivingEntityHelper.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderLivingEntityHelper.kt
index d2ea03611..4d54aa90b 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderLivingEntityHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderLivingEntityHelper.kt
@@ -19,6 +19,7 @@ class RenderLivingEntityHelper {
     }
 
     companion object {
+
         private val entityColorMap = mutableMapOf<EntityLivingBase, Int>()
         private val entityColorCondition = mutableMapOf<EntityLivingBase, () -> Boolean>()
 
@@ -49,7 +50,7 @@ class RenderLivingEntityHelper {
                 }
             }
 
-            //TODO remove event
+            // TODO remove event
             if (!SkyHanniDebugsAndTests.globalRender) return 0
             val event = RenderMobColoredEvent(entity, 0)
             event.postAndCatch()
@@ -65,10 +66,10 @@ class RenderLivingEntityHelper {
                 }
             }
 
-            //TODO remove event
+            // TODO remove event
             val event = ResetEntityHurtEvent(entity, false)
             event.postAndCatch()
             return if (event.shouldReset) 0 else entity.hurtTime
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RendererLivingEntityHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RendererLivingEntityHook.kt
index c91252c8a..8fb195a3b 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RendererLivingEntityHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RendererLivingEntityHook.kt
@@ -5,6 +5,7 @@ import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.entity.EntityLivingBase

 

 class RendererLivingEntityHook {

+

     fun setOutlineColor(red: Float, green: Float, blue: Float, alpha: Float, entity: EntityLivingBase) {

         val color = EntityOutlineRenderer.getCustomOutlineColor(entity)

 

@@ -17,4 +18,4 @@ class RendererLivingEntityHook {
             GlStateManager.color(red, green, blue, alpha)

         }

     }

-}
\ No newline at end of file
+}