Fix rebase conflicts

Author: Avanatiker

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/setting/settings/EnumSlider.kt

@@ -22,7 +22,6 @@ import com.lambda.config.settings.comparable.EnumSetting.Companion.enumValues
 import com.lambda.gui.component.core.UIBuilder
 import com.lambda.gui.component.layout.Layout
 import com.lambda.util.NamedEnum
-import com.lambda.gui.impl.clickgui.module.settings.SettingSlider
 import com.lambda.gui.impl.clickgui.module.setting.SettingSlider
 import com.lambda.util.math.MathUtils.floorToInt
 import com.lambda.util.math.transform

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

@@ -18,9 +18,7 @@
 package com.lambda.module.hud
 
 import com.lambda.context.SafeContext
-import com.lambda.graphics.renderer.gui.font.FontRenderer
-import com.lambda.graphics.renderer.gui.font.FontRenderer.drawString
-import com.lambda.gui.component.core.TextField.Companion.textField
+import com.lambda.graphics.renderer.gui.FontRenderer
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
@@ -39,19 +37,7 @@ object Coordinates : HudModule.Text(
     private val showDimension by setting("Show Dimension", true)
     private val decimals by setting("Decimals", 2, 0..4, 1)
 
-    private val text: String
-        get() = runSafe { "XYZ ${if (showDimension) dimensionName else ""} ${positionForDimension()}" } ?: ""
-
-    override val height: Double get() = FontRenderer.getHeight()
-    override val width: Double get() = FontRenderer.getWidth(text)
-
-    init {
-        onRender {
-            runSafe {
-                drawString(text, position)
-            }
-        }
-    }
+    override fun getText() = runSafe { "XYZ ${if (showDimension) dimensionName else ""} ${positionForDimension()}" } ?: ""
 
     private fun SafeContext.positionForDimension() =
         when {

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

@@ -17,8 +17,6 @@
 
 package com.lambda.module.hud
 
-import com.lambda.graphics.renderer.gui.font.FontRenderer
-import com.lambda.graphics.renderer.gui.font.FontRenderer.drawString
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Formatting.string
@@ -35,17 +33,6 @@ object TPS : HudModule.Text(
     override fun getText() =
         "${format.displayName}: ${format.output().string}${format.unit}"
 
-    // TODO: Replace by LambdaAtlas height cache and actually build a proper text with highlighted parameters
-
-    override val height: Double get() = FontRenderer.getHeight()
-    override val width: Double get() = FontRenderer.getWidth(text)
-
-    init {
-        onRender {
-            drawString(text, position)
-        }
-    }
-
     @Suppress("unused")
     private enum class TickFormat(
         val output: () -> Double,