Resolve merge conflicts

Author: Avanatiker

common/src/main/java/com/lambda/mixin/render/SplashOverlayMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.util.LambdaResource;
+import com.lambda.util.LambdaResourceKt;
 import net.minecraft.client.gui.screen.SplashOverlay;
 import net.minecraft.client.texture.ResourceTexture;
 import net.minecraft.resource.DefaultResourcePack;
@@ -62,7 +62,7 @@ public LogoTextureMixin(Identifier location) {
 
         @Redirect(method = "loadTextureData", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/DefaultResourcePack;open(Lnet/minecraft/resource/ResourceType;Lnet/minecraft/util/Identifier;)Lnet/minecraft/resource/InputSupplier;"))
         InputSupplier<InputStream> loadTextureData(DefaultResourcePack instance, ResourceType type, Identifier id) {
-            return () -> new LambdaResource("textures/lambda_banner.png").getStream();
+            return () -> LambdaResourceKt.getStream("textures/lambda_banner.png");
         }
     }
 }

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/FontRenderer.kt

@@ -66,7 +66,7 @@ object FontRenderer {
         scale: Double = 1.0,
         shadow: Boolean = RenderSettings.shadow,
         parseEmoji: Boolean = LambdaMoji.isEnabled
-    ) = processText(text, color, scale, shadow, parseEmoji) { char, pos1, pos2, color -> buildGlyph(char, position, pos1, pos2, color) }.also {
+    ) = processText(text, color, scale, shadow, parseEmoji) { char, pos1, pos2, col -> buildGlyph(char, position, pos1, pos2, col) }.also {
         UIPipeline.objectDrawn()
     }
 

common/src/main/kotlin/com/lambda/module/hud/TaskFlowHUD.kt

@@ -32,7 +32,7 @@ object TaskFlowHUD : HudModule(
 
     init {
         onRender {
-            drawString("TaskFlow", Vec2d.ZERO)
+            drawString(TaskFlow.toString(), Vec2d.ZERO)
         }
     }
 }

common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt

@@ -21,9 +21,8 @@ import com.lambda.Lambda.mc
 import com.lambda.graphics.renderer.esp.ChunkedESP.Companion.newChunkedESP
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.buildSideMesh
-import com.lambda.graphics.renderer.esp.ESPRenderer
-import com.lambda.graphics.renderer.esp.builders.buildFilled
-import com.lambda.graphics.renderer.esp.builders.buildOutline
+import com.lambda.graphics.renderer.esp.builders.buildFilledMesh
+import com.lambda.graphics.renderer.esp.builders.buildOutlineMesh
 import com.lambda.graphics.renderer.esp.impl.StaticESPRenderer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag