From 3ff01d9fffdfb9822064d11b5adc35d2d82e9b50 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Thu, 20 Mar 2025 20:03:13 +0100 Subject: [PATCH] config editor --- .../saturnclient/menus/ConfigEditor.java | 27 +++++++++++-------- .../saturnmods/mods/ArmorDisplay.java | 4 +-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java b/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java index d53cc84..e409bd3 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java @@ -10,6 +10,7 @@ import org.saturnclient.ui.animations.Slide; import org.saturnclient.ui.components.SaturnToggle; import org.saturnclient.ui.widgets.SaturnScroll; import org.saturnclient.ui.widgets.SaturnSprite; +import org.saturnclient.ui.widgets.SaturnText; import net.minecraft.text.Text; @@ -52,25 +53,29 @@ public class ConfigEditor extends SaturnUi { int propWidth = (rectWidth - 15) / 2; - SaturnScroll modsScroll = new SaturnScroll(); + SaturnScroll configScroll = new SaturnScroll(); for (Map.Entry> propEntry : config.getProperties().entrySet()) { Property prop = propEntry.getValue(); + String propName = propEntry.getKey(); if (prop.value instanceof Boolean) { - draw(new SaturnToggle((Property) prop).setX(modX).setY(modY)); + configScroll.draw(new SaturnToggle((Property) prop).setX(modX).setY(modY)); + configScroll.draw( + new SaturnText(propName.substring(0, 1).toUpperCase() + propName.substring(1)) + .setX(modX + 18).setY(modY)); + col++; + if (col < 2) { + modX += propWidth + 21; + } else { + modX = 0; + modY += 20 + 20; + col = 0; + } } - col++; - if (col < 2) { - modX += propWidth + 21; - } else { - modX = 0; - modY += 20 + 20; - col = 0; - } } - draw(modsScroll.setX(rectX + 17).setY(rectY + 10).setWidth(rectWidth - 17).setHeight(rectHeight - 10)); + draw(configScroll.setX(rectX + 17).setY(rectY + 10).setWidth(rectWidth - 17).setHeight(rectHeight - 10)); super.init(); } diff --git a/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java index c626073..873b91a 100644 --- a/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java +++ b/src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java @@ -51,11 +51,11 @@ public class ArmorDisplay implements SaturnMod, HudMod { public void render(DrawContext context) { PlayerEntity player = MinecraftClient.getInstance().player; ItemStack[] items = { + player.getEquippedStack(EquipmentSlot.MAINHAND), player.getEquippedStack(EquipmentSlot.FEET), player.getEquippedStack(EquipmentSlot.LEGS), player.getEquippedStack(EquipmentSlot.CHEST), player.getEquippedStack(EquipmentSlot.HEAD), - player.getEquippedStack(EquipmentSlot.MAINHAND), }; int y = 60; @@ -70,11 +70,11 @@ public class ArmorDisplay implements SaturnMod, HudMod { @Override public void renderDummy(DrawContext context) { ItemStack[] items = { + new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.DIAMOND_BOOTS), new ItemStack(Items.DIAMOND_LEGGINGS), new ItemStack(Items.DIAMOND_CHESTPLATE), new ItemStack(Items.DIAMOND_HELMET), - new ItemStack(Items.DIAMOND_SWORD), }; int y = 60;