diff options
Diffstat (limited to 'src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens')
8 files changed, 316 insertions, 65 deletions
diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIModuleButton.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIModuleButton.java deleted file mode 100644 index a1090a5..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIModuleButton.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.justlearning.arslaan3102.arslaansmagichax.screens; - -import net.justlearning.arslaan3102.arslaansmagichax.modules.Module; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.text.Text; - -import java.awt.Color; - -public class ClickGUIModuleButton { - - public Module module; - public ClickGUIFrame parent; - public int offset; - - public ClickGUIModuleButton(Module module, ClickGUIFrame parent, int offset) { - this.module = module; - this.parent = parent; - this.offset = offset; - } - - public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) { - int alpha = isHovered(mouseX, mouseY) ? 230 : 160; - context.fill(parent.x, parent.y + offset, parent.x + parent.width, parent.y + offset + parent.height, new Color(30, 30, 47, alpha).getRGB()); - - String text = module.getName(); - - int textX = parent.x + 5; - int textY = parent.y + offset + (parent.height - parent.mc.textRenderer.fontHeight) / 2; - - int textColor = module.isEnabled() ? new Color(252, 210, 77, 255).getRGB() : Color.white.getRGB(); - - context.drawTextWithShadow(parent.mc.textRenderer, Text.literal(text), textX, textY, textColor); - } - - public void mouseClicked(double mouseX, double mouseY, int button) { - if (isHovered(mouseX, mouseY) && button == 0) { - module.toggle(); - } - } - - public boolean isHovered(double mouseX, double mouseY) { - return mouseX > parent.x && mouseX < parent.x + parent.width && mouseY > parent.y + offset && mouseY < parent.y + offset + parent.height; - } -} diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIScreen.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ClickGUIScreen.java index 0e33107..85458c0 100644 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIScreen.java +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ClickGUIScreen.java @@ -1,4 +1,4 @@ -package net.justlearning.arslaan3102.arslaansmagichax.screens; +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui; import net.justlearning.arslaan3102.arslaansmagichax.ArslaansMagicHaxClient; import net.justlearning.arslaan3102.arslaansmagichax.modules.Category; @@ -12,7 +12,7 @@ import java.util.List; public class ClickGUIScreen extends Screen { public static final ClickGUIScreen INSTANCE = new ClickGUIScreen(); - private List<ClickGUIFrame> frames; + private List<Frame> frames; private ClickGUIScreen() { super(Text.literal("ClickGUI")); @@ -21,14 +21,14 @@ public class ClickGUIScreen extends Screen { int offset = 20; for (Category category : Category.values()) { - frames.add(new ClickGUIFrame(category, offset, 30, 100, 30)); + frames.add(new Frame(category, offset, 30, 100, 20)); offset += 120; } } @Override public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) { - for (ClickGUIFrame frame : frames) { + for (Frame frame : frames) { frame.render(context, mouseX, mouseY, deltaTicks); frame.updatePosition(mouseX, mouseY); } @@ -37,7 +37,7 @@ public class ClickGUIScreen extends Screen { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - for (ClickGUIFrame frame : frames) { + for (Frame frame : frames) { frame.mouseClicked(mouseX, mouseY, button); } return super.mouseClicked(mouseX, mouseY, button); @@ -45,7 +45,7 @@ public class ClickGUIScreen extends Screen { @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - for (ClickGUIFrame frame : frames) { + for (Frame frame : frames) { frame.mouseReleased(mouseX, mouseY, button); } return super.mouseReleased(mouseX, mouseY, button); diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIFrame.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/Frame.java index 0958162..a959ffc 100644 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/ClickGUIFrame.java +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/Frame.java @@ -1,8 +1,9 @@ -package net.justlearning.arslaan3102.arslaansmagichax.screens; +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui; import net.justlearning.arslaan3102.arslaansmagichax.modules.Category; import net.justlearning.arslaan3102.arslaansmagichax.modules.Module; import net.justlearning.arslaan3102.arslaansmagichax.modules.ModuleManager; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting.Component; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; @@ -10,9 +11,8 @@ import net.minecraft.text.Text; import java.awt.Color; import java.util.ArrayList; import java.util.List; -import java.util.Objects; -public class ClickGUIFrame { +public class Frame { public int x, y, width, height, dragX, dragY; public Category category; @@ -20,11 +20,11 @@ public class ClickGUIFrame { public boolean isOpen = false; - private List<ClickGUIModuleButton> buttons; + private List<ModuleButton> buttons; protected MinecraftClient mc = MinecraftClient.getInstance(); - public ClickGUIFrame(Category category, int x, int y, int width, int height) { + public Frame(Category category, int x, int y, int width, int height) { this.category = category; this.x = x; this.y = y; @@ -36,10 +36,8 @@ public class ClickGUIFrame { int offset = height; for (Module module : ModuleManager.INSTANCE.getModulesWithCategory(category)) { - if (!Objects.equals(module.getName(), "ClickGUI")) { - buttons.add(new ClickGUIModuleButton(module, this, offset)); - offset += height; - } + buttons.add(new ModuleButton(module, this, offset)); + offset += height; } } @@ -47,14 +45,13 @@ public class ClickGUIFrame { context.fill(x, y, x + width, y + height, new Color(252, 210, 77, 255).getRGB()); String text = category.name(); - int textWidth = mc.textRenderer.getWidth(text); - int textX = x + (width - textWidth) / 2; int textY = y + (height - mc.textRenderer.fontHeight) / 2; - context.drawText(mc.textRenderer, Text.literal(text), textX, textY, new Color(30, 30, 47, 255).getRGB(), false); + context.drawText(mc.textRenderer, Text.literal(text), x + 5, textY, new Color(30, 30, 47, 255).getRGB(), false); + context.drawText(mc.textRenderer, isOpen ? "-" : "+", x + width - 5 - mc.textRenderer.getWidth("+"), textY, new Color(30, 30, 47, 255).getRGB(), false); if (isOpen) { - for (ClickGUIModuleButton button : buttons) { + for (ModuleButton button : buttons) { button.render(context, mouseX, mouseY, deltaTicks); } } @@ -72,7 +69,7 @@ public class ClickGUIFrame { } if (isOpen) { - for (ClickGUIModuleButton moduleButton : buttons) { + for (ModuleButton moduleButton : buttons) { moduleButton.mouseClicked(mouseX, mouseY, button); } } @@ -82,6 +79,12 @@ public class ClickGUIFrame { if (button == 0 && dragging) { dragging = false; } + + if (isOpen) { + for (ModuleButton moduleButton : buttons) { + moduleButton.mouseReleased(mouseX, mouseY, button); + } + } } public boolean isHovered(double mouseX, double mouseY) { @@ -94,4 +97,21 @@ public class ClickGUIFrame { y = (int) (mouseY - dragY); } } + + public void updateButtons() { + int offset = height; + + for (ModuleButton button : buttons) { + button.offset = offset; + offset += height; + + if (button.extended) { + for (Component component : button.components) { + if (component.setting.isVisible()) { + offset += height; + } + } + } + } + } } diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ModuleButton.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ModuleButton.java new file mode 100644 index 0000000..979b81d --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/ModuleButton.java @@ -0,0 +1,100 @@ +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui; + +import net.justlearning.arslaan3102.arslaansmagichax.modules.Module; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.BooleanSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.ModeSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.NumberSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.Setting; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting.CheckBox; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting.Component; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting.ModeBox; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting.Slider; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.text.Text; + +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + +public class ModuleButton { + + public Module module; + public Frame parent; + public int offset; + public List<Component> components; + public boolean extended; + + public ModuleButton(Module module, Frame parent, int offset) { + this.module = module; + this.parent = parent; + this.offset = offset; + this.extended = false; + this.components = new ArrayList<>(); + + int setOffset = parent.height; + for (Setting setting : module.getSettings()) { + if (setting instanceof BooleanSetting) { + components.add(new CheckBox(setting, this, setOffset)); + } else if (setting instanceof ModeSetting) { + components.add(new ModeBox(setting, this, setOffset)); + } else if (setting instanceof NumberSetting) { + components.add(new Slider(setting, this, setOffset)); + } + setOffset += parent.height; + } + } + + public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) { + int alpha = isHovered(mouseX, mouseY) ? 230 : 160; + + context.fill(parent.x, parent.y + offset, parent.x + parent.width, parent.y + offset + parent.height, new Color(30, 30, 47, alpha).getRGB()); + + if (isHovered(mouseX, mouseY)) { + context.drawTooltip(Text.literal(module.getDescription()), mouseX, mouseY); + } + + String text = module.getName(); + + int textX = parent.x + 5; + int textY = parent.y + offset + (parent.height - parent.mc.textRenderer.fontHeight) / 2; + + int textColor = module.isEnabled() ? new Color(252, 210, 77, 255).getRGB() : Color.white.getRGB(); + + context.drawTextWithShadow(parent.mc.textRenderer, Text.literal(text), textX, textY, textColor); + + if (extended) { + for (Component component : components) { + component.render(context, mouseX, mouseY, deltaTicks); + } + } + } + + public void mouseClicked(double mouseX, double mouseY, int button) { + if (isHovered(mouseX, mouseY)) { + if (button == 0) { + module.toggle(); + } + else if (button == 1) { + extended = !extended; + parent.updateButtons(); + } + } + + for (Component component : components) { + component.mouseClicked(mouseX, mouseY, button); + } + } + + public void mouseReleased(double mouseX, double mouseY, int button) { + // luigi wins by doing absolutely nothing + + // nevermind we did something + for (Component component : components) { + component.mouseReleased(mouseX, mouseY, button); + } + } + + public boolean isHovered(double mouseX, double mouseY) { + return mouseX > parent.x && mouseX < parent.x + parent.width && mouseY > parent.y + offset && mouseY < parent.y + offset + parent.height; + } +} diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java new file mode 100644 index 0000000..e6e3ef7 --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/CheckBox.java @@ -0,0 +1,35 @@ +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting; + +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.BooleanSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.Setting; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.ModuleButton; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.text.Text; + +import java.awt.*; + +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(DrawContext 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()); + + context.drawTextWithShadow(mc.textRenderer, Text.literal(booleanSetting.getName() + ": " + booleanSetting.isEnabled()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 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/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Component.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Component.java new file mode 100644 index 0000000..1622aa5 --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Component.java @@ -0,0 +1,37 @@ +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting; + +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.Setting; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.ModuleButton; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; + +public class Component { + + public Setting setting; + public ModuleButton parent; + public int offset; + + protected static MinecraftClient mc = MinecraftClient.getInstance(); + + public Component(Setting setting, ModuleButton parent, int offset) { + this.setting = setting; + this.parent = parent; + this.offset = offset; + } + + public void render(DrawContext 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/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java new file mode 100644 index 0000000..651cab1 --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/ModeBox.java @@ -0,0 +1,39 @@ +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting; + +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.ModeSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.Setting; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.ModuleButton; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.text.Text; + +import java.awt.*; + +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(DrawContext 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()); + + context.drawTextWithShadow(mc.textRenderer, Text.literal(modeSetting.getName() + ": " + modeSetting.getMode()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 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/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java new file mode 100644 index 0000000..bf002e3 --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/screens/clickgui/setting/Slider.java @@ -0,0 +1,65 @@ +package net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.setting; + +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.NumberSetting; +import net.justlearning.arslaan3102.arslaansmagichax.modules.settings.Setting; +import net.justlearning.arslaan3102.arslaansmagichax.screens.clickgui.ModuleButton; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.text.Text; + +import java.awt.*; +import java.math.BigDecimal; +import java.math.RoundingMode; + +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(DrawContext 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()); + + double diff = Math.min(parent.parent.width, Math.max(0, mouseX - parent.parent.x)); + int renderWidth = (int) (parent.parent.width * (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 / parent.parent.width) * (numberSetting.getMax() - numberSetting.getMin()) + numberSetting.getMin(), 1)); + } + } + + context.drawTextWithShadow(mc.textRenderer, Text.literal(numberSetting.getName() + ": " + numberSetting.getValue()), parent.parent.x + 5, parent.parent.y + parent.offset + offset + (parent.parent.height - mc.textRenderer.fontHeight) / 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(); + } +} |