prettier gui

Author: emyfops

src/main/java/com/lambda/mixin/render/BackgroundRendererMixin.java

@@ -35,6 +35,7 @@
  * blue = (float)vec3d3.getZ();
  * }</pre>
  */
+// FixMe: This crashes the game
 @Mixin(BackgroundRenderer.class)
 public class BackgroundRendererMixin {
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))

src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt

@@ -38,6 +38,7 @@ open class FunctionSetting<T>(
         get() =
         {
             button(name) { value() }
+
             sameLine()
             helpMarker(description)
         }

src/main/kotlin/com/lambda/config/settings/StringSetting.kt

@@ -47,11 +47,13 @@ class StringSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            if (multiline) inputTextMultiline(name, ::value, flags = flags)
-            else inputText(name, ::value, flags)
+            text(name)
 
             sameLine()
             helpMarker(description)
+
+            if (multiline) inputTextMultiline(name, ::value, flags = flags)
+            else inputText(name, ::value, flags)
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt

@@ -45,6 +45,7 @@ class BooleanSetting(
         get() =
         {
             checkbox(name, ::value)
+
             sameLine()
             helpMarker(description)
         }

src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -61,7 +61,12 @@ class EnumSetting<T : Enum<T>>(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            slider(name, ::index, 0, value.enumValues.size - 1, format = "", flags = AlwaysClamp)
+            text(name)
+
+            sameLine()
+            helpMarker(description)
+
+            slider("##$name", ::index, 0, value.enumValues.size - 1, format = "", flags = AlwaysClamp)
 
             val min = ImGui.getItemRectMin()
             val max = ImGui.getItemRectMax()

src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt

@@ -50,9 +50,12 @@ class BlockPosSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            inputVec3i(name, value) { value = it.blockPos }
+            text(name)
+
             sameLine()
             helpMarker(description)
+
+            inputVec3i("##$name", value) { value = it.blockPos }
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/config/settings/complex/ColorSetting.kt

@@ -26,6 +26,7 @@ import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.util.extension.CommandBuilder
+import imgui.ImGui
 import net.minecraft.command.CommandRegistryAccess
 import java.awt.Color
 
@@ -46,12 +47,12 @@ class ColorSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            colorButton(name, value) {
-                colorPicker(name, ::value)
-            }
+            text(name)
 
             sameLine()
             helpMarker(description)
+
+            colorEdit("##$name", ::value)
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt

@@ -42,9 +42,12 @@ class Vec3dSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            inputVec3d(name, ::value as Vec3d) // wat da hell
+            text(name)
+
             sameLine()
             helpMarker(description)
+
+            inputVec3d(name, ::value as Vec3d) // wat da hell
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt

@@ -49,9 +49,12 @@ class DoubleSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            inputDouble(name, ::value)
+            text(name)
+
             sameLine()
             helpMarker(description)
+
+            inputDouble("##$name", ::value)
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {

src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt

@@ -48,9 +48,12 @@ class FloatSetting(
     override val layout: ImGuiBuilder.() -> Unit
         get() =
         {
-            inputFloat(name, ::value)
+            text(name)
+
             sameLine()
             helpMarker(description)
+
+            inputFloat("##$name", ::value)
         }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {