hud

Author: emyfops

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

@@ -19,6 +19,7 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
+import com.lambda.gui.DearImGui;
 import com.lambda.gui.LambdaScreen;
 import com.lambda.module.modules.client.ClickGui;
 import net.minecraft.client.render.GameRenderer;
@@ -36,10 +37,4 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
             info.cancel();
         }
     }
-
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.AFTER))
-    void renderGui(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci) {
-        if (ClickGui.INSTANCE.isEnabled())
-            LambdaScreen.INSTANCE.render();
-    }
 }

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render;
+
+import com.lambda.gui.DearImGui;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.render.RenderTickCounter;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(InGameHud.class)
+public class InGameHudMixin {
+    /**
+     * Begins our 2d render after the game has rendered all 2d elements
+     */
+    @Inject(method = "render", at = @At("TAIL"))
+    private void onRender(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
+        DearImGui.INSTANCE.render();
+    }
+}

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

@@ -43,9 +43,7 @@ class CharSetting(
     description,
     visibility
 ) {
-    override fun ImGuiBuilder.buildLayout() {
-        // ToDo
-    }
+    override fun invoke(p1: ImGuiBuilder) {}
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(word(name)) { parameter ->

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

@@ -34,7 +34,7 @@ open class FunctionSetting<T>(
     description,
     visibility
 ) {
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         button(name) { value() }
         lambdaTooltip(description)
     }

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

@@ -57,7 +57,7 @@ abstract class NumericSetting<T>(
      */
     protected abstract fun ImGuiBuilder.buildSlider()
 
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         val showReset = isModified
         val resetButtonText = "R"
         val valueString = this@NumericSetting.toString()

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

@@ -44,7 +44,7 @@ class StringSetting(
     description,
     visibility
 ) {
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         if (multiline) {
             inputTextMultiline(name, ::value, flags = flags)
         } else {

src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

@@ -44,7 +44,7 @@ class ListSetting<T : Any>(
     private val strListType =
         TypeToken.getParameterized(MutableList::class.java, String::class.java).type
 
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         combo("##$name", "$name: ${value.size} item(s)") {
             immutableList
                 .forEach {
@@ -53,8 +53,7 @@ class ListSetting<T : Any>(
                     selectable(
                         it.toString(), isSelected,
                         flags = DontClosePopups
-                    )
-                    { if (isSelected) value.remove(it) else value.add(it) }
+                    ) { if (isSelected) value.remove(it) else value.add(it) }
                 }
         }
     }

src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt

@@ -36,7 +36,5 @@ class MapSetting<K, V>(
     description,
     visibility
 ) {
-    override fun ImGuiBuilder.buildLayout() {
-        // ToDo
-    }
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {}
 }

src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt

@@ -44,7 +44,7 @@ class SetSetting<T : Any>(
     private val strSetType =
         TypeToken.getParameterized(Set::class.java, String::class.java).type
 
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         combo("##$name", "$name: ${value.size} item(s)") {
             immutableSet
                 .forEach {

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

@@ -41,7 +41,7 @@ class BooleanSetting(
     description,
     visibility
 ) {
-    override fun ImGuiBuilder.buildLayout() {
+    override fun invoke(p1: ImGuiBuilder) = with(p1) {
         checkbox(name, ::value)
         lambdaTooltip(description)
     }