diff options
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/gui/elements')
3 files changed, 14 insertions, 27 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java index b972d40..25987db 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java @@ -16,13 +16,13 @@ public class ColorSelector { private final int y; private Color color; private float percentMove = 0f; - private final BasicElement hsbBtn = new BasicElement(124, 28, 2,true); - private final BasicElement rgbBtn = new BasicElement(124, 28, 2,true); - private final BasicElement chromaBtn = new BasicElement(124, 28, 2,true); + private final BasicElement hsbBtn = new BasicElement(124, 28, 2, true); + private final BasicElement rgbBtn = new BasicElement(124, 28, 2, true); + private final BasicElement chromaBtn = new BasicElement(124, 28, 2, true); private final BasicElement closeBtn = new BasicElement(32, 32, true); - private final BasicElement copyBtn = new BasicElement(32, 32, 2,true); - private final BasicElement pasteBtn = new BasicElement(32, 32, 2,true); + private final BasicElement copyBtn = new BasicElement(32, 32, 2, true); + private final BasicElement pasteBtn = new BasicElement(32, 32, 2, true); private final BasicButton guideBtn = new BasicButton(112, 32, "Guide", null, null, 0, BasicButton.ALIGNMENT_CENTER); private final NumberInputField hueInput = new NumberInputField(90, 32, 0, 0, 255, 1); @@ -36,7 +36,6 @@ public class ColorSelector { private final Slider speedSlider = new Slider(384, 1, 60, 20); - public ColorSelector(Color color, int mouseX, int mouseY) { this.color = color; this.x = mouseX - 208; @@ -53,7 +52,7 @@ public class ColorSelector { RenderManager.drawString(vg, "Color Selector", x + 16, y + 32, OneConfigConfig.WHITE_90, 18f, Fonts.SEMIBOLD); closeBtn.draw(vg, x + 368, y + 16); RenderManager.drawImage(vg, Images.CLOSE, x + 369, y + 17, 30, 30); - if(closeBtn.isClicked()) { + if (closeBtn.isClicked()) { OneConfigGui.INSTANCE.closeColorSelector(); } @@ -85,9 +84,6 @@ public class ColorSelector { RenderManager.drawImage(vg, Images.HELP, x + 301, y + 631, 18, 18); RenderManager.drawImage(vg, Images.LAUNCH, x + 369, y + 631, 18, 18); - - - switch (mode) { default: case 0: @@ -128,9 +124,6 @@ public class ColorSelector { RenderManager.drawHollowRoundRect(vg, x + 15, y + 487, 384, 40, OneConfigConfig.GRAY_300, 12f, 2f); RenderManager.drawImage(vg, Images.COLOR_BASE_LARGE, x + 20, y + 492, 376, 32); RenderManager.drawRoundedRect(vg, x + 20, y + 492, 376, 32, color.getRGB(), 8f); - - - } public Color getColor() { @@ -146,8 +139,6 @@ public class ColorSelector { } - - private static class ColorSlider extends Slider { protected Color gradColorStart, gradColorEnd; diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java index ce683bf..627c0cc 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java @@ -29,7 +29,7 @@ public class ConfigColorElement extends BasicOption { alphaField.setCentered(true); alphaField.onlyAcceptNumbers(true); String buf = Integer.toHexString(color.getRGB()); - hex = "#"+buf.substring(buf.length()-6); + hex = "#" + buf.substring(buf.length() - 6); } @Override @@ -44,7 +44,7 @@ public class ConfigColorElement extends BasicOption { if (!alphaField.isToggled()) alphaField.setInput(String.format("%.01f", alpha * 100f) + "%"); alphaField.setErrored(false); - if(alphaField.isToggled()) { + if (alphaField.isToggled()) { try { float input = Float.parseFloat(alphaField.getInput()); if (input < 0f) { @@ -62,15 +62,13 @@ public class ConfigColorElement extends BasicOption { } alphaField.draw(vg, x + 352, y); - - if (!hexField.isToggled()) hexField.setInput(hex); hexField.setErrored(false); - if(hexField.isToggled()) { + if (hexField.isToggled()) { try { color = HexToColor(hexField.getInput()); String buf = Integer.toHexString(color.getRGB()); - hex = "#"+buf.substring(buf.length()-6); + hex = "#" + buf.substring(buf.length() - 6); } catch (NumberFormatException e) { hexField.setErrored(true); } @@ -80,14 +78,14 @@ public class ConfigColorElement extends BasicOption { element.update(x + 432, y); RenderManager.drawRoundedRect(vg, x + 432, y, 64, 32, OneConfigConfig.GRAY_300, 12f); RenderManager.drawImage(vg, Images.COLOR_BASE, x + 948, y + 4, 56, 24, color.getRGB()); - if(element.isClicked() && !element.isToggled()) { + if (element.isClicked() && !element.isToggled()) { OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(color, InputUtils.mouseX(), InputUtils.mouseY())); } - if(element.isToggled() && element.isClicked()) { + if (element.isToggled() && element.isClicked()) { color = OneConfigGui.INSTANCE.closeColorSelector(); alpha = color.getAlpha() / 255f; String buf = Integer.toHexString(color.getRGB()); - hex = "#"+buf.substring(buf.length()-6); + hex = "#" + buf.substring(buf.length() - 6); } } @@ -110,6 +108,4 @@ public class ConfigColorElement extends BasicOption { } throw new NumberFormatException("Invalid hex string: " + hex); } - - } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java index 531f18a..d44c33f 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java @@ -23,7 +23,7 @@ public class ConfigSlider extends BasicOption { this.min = min; this.max = max; this.step = step; - inputField = new NumberInputField(84, 24, 0, min, max, step == 0 ? 1 : step); + inputField = new NumberInputField(84, 32, 0, min, max, step == 0 ? 1 : step); } @Override |