From 14c68eb5ba16774f581d95a39e64a7b303954ffc Mon Sep 17 00:00:00 2001 From: Arslaan Pathan Date: Sat, 26 Sep 2026 17:05:36 +1200 Subject: migration to 26.2 - run migrateMappings with old loom then bring it back to new --- .../screens/clickgui/setting/CheckBox.java | 50 ++++++++++++ .../screens/clickgui/setting/Component.java | 37 +++++++++ .../clickgui/setting/KeybindingSelector.java | 74 +++++++++++++++++ .../screens/clickgui/setting/ModeBox.java | 56 +++++++++++++ .../screens/clickgui/setting/Slider.java | 92 ++++++++++++++++++++++ 5 files changed, 309 insertions(+) create mode 100644 src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java create mode 100644 src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java create mode 100644 src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java create mode 100644 src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java create mode 100644 src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java (limited to 'src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting') diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java new file mode 100644 index 0000000..2dacd2f --- /dev/null +++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/CheckBox.java @@ -0,0 +1,50 @@ +package com.arslaancodes.arslaansmagichax.screens.clickgui.setting; + +import com.arslaancodes.arslaansmagichax.modules.settings.BooleanSetting; +import com.arslaancodes.arslaansmagichax.modules.settings.Setting; +import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton; +import java.awt.*; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; + +public class CheckBox extends Component { + + private BooleanSetting booleanSetting = (BooleanSetting) setting; + + public CheckBox(Setting setting, ModuleButton parent, int offset) { + super(setting, parent, offset); + this.booleanSetting = (BooleanSetting) setting; + } + + @Override + public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) { + String displayText = booleanSetting.getName() + ": " + booleanSetting.isEnabled(); + int textWidth = mc.font.width(displayText); + int padding = 5; + int boxWidth = Math.max(parent.parent.width, textWidth + (padding * 2)); + + int alpha = isHovered(mouseX, mouseY) ? 230 : 160; + context.fill( + parent.parent.x, + parent.parent.y + parent.offset + offset, + parent.parent.x + boxWidth, + parent.parent.y + parent.offset + offset + parent.parent.height, + new Color(30, 30, 47, alpha).getRGB() + ); + + context.drawString( + mc.font, + Component.literal(displayText), + parent.parent.x + padding, + parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2, + Color.white.getRGB() + ); + } + + @Override + public void mouseClicked(double mouseX, double mouseY, int button) { + if (isHovered(mouseX, mouseY) && button == 0) { + booleanSetting.toggle(); + } + } +} diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java new file mode 100644 index 0000000..96a3bbd --- /dev/null +++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Component.java @@ -0,0 +1,37 @@ +package com.arslaancodes.arslaansmagichax.screens.clickgui.setting; + +import com.arslaancodes.arslaansmagichax.modules.settings.Setting; +import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; + +public class Component { + + public Setting setting; + public ModuleButton parent; + public int offset; + + protected static Minecraft mc = Minecraft.getInstance(); + + public Component(Setting setting, ModuleButton parent, int offset) { + this.setting = setting; + this.parent = parent; + this.offset = offset; + } + + public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) { + + } + + public void mouseClicked(double mouseX, double mouseY, int button) { + + } + + public void mouseReleased(double mouseX, double mouseY, int button) { + + } + + public boolean isHovered(double mouseX, double mouseY) { + return mouseX > parent.parent.x && mouseX < parent.parent.x + parent.parent.width && mouseY > parent.parent.y + parent.offset + offset && mouseY < parent.parent.y + parent.offset + offset + parent.parent.height; + } +} diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java new file mode 100644 index 0000000..a29c3a2 --- /dev/null +++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/KeybindingSelector.java @@ -0,0 +1,74 @@ +package com.arslaancodes.arslaansmagichax.screens.clickgui.setting; + +import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton; +import org.lwjgl.glfw.GLFW; + +import java.awt.*; +import net.minecraft.client.gui.GuiGraphics; + +public class KeybindingSelector extends Component { + + private boolean listening = false; + + public KeybindingSelector(ModuleButton parent, int offset) { + super(null, parent, offset); + } + + @Override + public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) { + int alpha = isHovered(mouseX, mouseY) ? 230 : 160; + context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(30, 30, 47, alpha).getRGB()); + + if (listening) { + context.fill(parent.parent.x, parent.parent.y + parent.offset + offset, parent.parent.x + parent.parent.width, parent.parent.y + parent.offset + offset + parent.parent.height, new Color(252, 210, 77, 255).getRGB()); + } + + String displayText = listening ? "Press a key..." : "Keybind: " + getKeyName(parent.module.getGlfwKeybinding()); + context.drawString(mc.font, displayText, parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2, Color.white.getRGB()); + } + + @Override + public void mouseClicked(double mouseX, double mouseY, int button) { + if (isHovered(mouseX, mouseY) && button == 0) { + listening = !listening; + } + } + + public void onKeyPressed(int keyCode) { + if (!listening) return; + + listening = false; + + if (keyCode == GLFW.GLFW_KEY_ESCAPE || keyCode == GLFW.GLFW_KEY_DELETE || keyCode == GLFW.GLFW_KEY_BACKSPACE) { + // remove bingdingd AHH I CANT SPELL + parent.module.setGlfwKeybinding(-1); + return; + } + + parent.module.setGlfwKeybinding(keyCode); + } + + private String getKeyName(int key) { + if (key == -1) return "NONE"; + String name = GLFW.glfwGetKeyName(key, 0); + + if (name != null) return name.toUpperCase(); + + return switch (key) { + case GLFW.GLFW_KEY_LEFT_SHIFT -> "LSHIFT"; + case GLFW.GLFW_KEY_RIGHT_SHIFT -> "RSHIFT"; + case GLFW.GLFW_KEY_LEFT_CONTROL -> "LCTRL"; + case GLFW.GLFW_KEY_RIGHT_CONTROL -> "RCTRL"; + case GLFW.GLFW_KEY_LEFT_ALT -> "LALT"; + case GLFW.GLFW_KEY_RIGHT_ALT -> "RALT"; + case GLFW.GLFW_KEY_SPACE -> "SPACE"; + case GLFW.GLFW_KEY_TAB -> "TAB"; + case GLFW.GLFW_KEY_ENTER -> "ENTER"; + case GLFW.GLFW_KEY_UP -> "UP"; + case GLFW.GLFW_KEY_DOWN -> "DOWN"; + case GLFW.GLFW_KEY_LEFT -> "LEFT"; + case GLFW.GLFW_KEY_RIGHT -> "RIGHT"; + default -> "KEY_" + key; + }; + } +} diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java new file mode 100644 index 0000000..1200fa0 --- /dev/null +++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/ModeBox.java @@ -0,0 +1,56 @@ +package com.arslaancodes.arslaansmagichax.screens.clickgui.setting; + +import com.arslaancodes.arslaansmagichax.modules.settings.ModeSetting; +import com.arslaancodes.arslaansmagichax.modules.settings.Setting; +import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton; +import java.awt.*; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; + +public class ModeBox extends Component { + + private ModeSetting modeSetting = (ModeSetting) setting; + + public ModeBox(Setting setting, ModuleButton parent, int offset) { + super(setting, parent, offset); + this.modeSetting = (ModeSetting) setting; + } + + @Override + public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) { + String displayText = modeSetting.getName() + ": " + modeSetting.getMode(); + int textWidth = mc.font.width(displayText); + + int padding = 5; + int boxWidth = Math.max(parent.parent.width, textWidth + padding * 2); + + int alpha = isHovered(mouseX, mouseY) ? 230 : 160; + context.fill( + parent.parent.x, + parent.parent.y + parent.offset + offset, + parent.parent.x + boxWidth, + parent.parent.y + parent.offset + offset + parent.parent.height, + new Color(30, 30, 47, alpha).getRGB() + ); + + context.drawString( + mc.font, + Component.literal(displayText), + parent.parent.x + padding, // left padding + parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2, + Color.white.getRGB() + ); + } + + @Override + public void mouseClicked(double mouseX, double mouseY, int button) { + if (isHovered(mouseX, mouseY) && button == 0) { + modeSetting.cycle(); + } + } + + @Override + public void mouseReleased(double mouseX, double mouseY, int button) { + super.mouseReleased(mouseX, mouseY, button); + } +} diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java new file mode 100644 index 0000000..bacefd6 --- /dev/null +++ b/src/main/java/com/arslaancodes/arslaansmagichax/screens/clickgui/setting/Slider.java @@ -0,0 +1,92 @@ +package com.arslaancodes.arslaansmagichax.screens.clickgui.setting; + +import com.arslaancodes.arslaansmagichax.modules.settings.NumberSetting; +import com.arslaancodes.arslaansmagichax.modules.settings.Setting; +import com.arslaancodes.arslaansmagichax.screens.clickgui.ModuleButton; +import java.awt.*; +import java.math.BigDecimal; +import java.math.RoundingMode; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; + +public class Slider extends Component { + + public NumberSetting numberSetting = (NumberSetting) setting; + + private boolean sliding = false; + + public Slider(Setting setting, ModuleButton parent, int offset) { + super(setting, parent, offset); + this.numberSetting = (NumberSetting) setting; + } + + @Override + public void render(GuiGraphics context, int mouseX, int mouseY, float deltaTicks) { + String displayText = numberSetting.getName() + ": " + numberSetting.getValue(); + int defaultPadding = 5; + int boxWidth = parent.parent.width; + + int alpha = isHovered(mouseX, mouseY) ? 230 : 160; + + context.fill( + parent.parent.x, + parent.parent.y + parent.offset + offset, + parent.parent.x + boxWidth, + parent.parent.y + parent.offset + offset + parent.parent.height, + new Color(30, 30, 47, alpha).getRGB() + ); + + double diff = Math.min(boxWidth, Math.max(0, mouseX - parent.parent.x)); + int renderWidth = (int) (boxWidth * (numberSetting.getValue() - numberSetting.getMin()) / (numberSetting.getMax() - numberSetting.getMin())); + + context.fill( + parent.parent.x, + parent.parent.y + parent.offset + offset, + parent.parent.x + renderWidth, + parent.parent.y + parent.offset + offset + parent.parent.height, + new Color(252, 210, 77, 255).getRGB() + ); + + if (sliding) { + if (diff == 0) { + numberSetting.setValue(numberSetting.getMin()); + } else { + numberSetting.setValue(roundToPlace((diff / boxWidth) * (numberSetting.getMax() - numberSetting.getMin()) + numberSetting.getMin(), 1)); + } + } + + int textWidth = mc.font.width(displayText); + int leftPadding = defaultPadding; + if (textWidth + 2 * defaultPadding > boxWidth) { + leftPadding = Math.max(2, boxWidth - textWidth - 2); + } + + context.drawString( + mc.font, + Component.literal(displayText), + parent.parent.x + leftPadding, + parent.parent.y + parent.offset + offset + (parent.parent.height - mc.font.lineHeight) / 2, + Color.white.getRGB() + ); + } + + @Override + public void mouseClicked(double mouseX, double mouseY, int button) { + if (isHovered(mouseX, mouseY)) sliding = true; + } + + @Override + public void mouseReleased(double mouseX, double mouseY, int button) { + sliding = false; + } + + private double roundToPlace(double value, int place) { + if (place < 0) { + return value; + } + + BigDecimal bd = new BigDecimal(value); + bd = bd.setScale(place, RoundingMode.HALF_UP); + return bd.doubleValue(); + } +} -- cgit v1.2.3