diff options
Diffstat (limited to 'src/main/java/io/polyfrost/oneconfig/config')
5 files changed, 15 insertions, 10 deletions
diff --git a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java index 30eb6ab..a772a23 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java +++ b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java @@ -41,6 +41,7 @@ public class OneConfigConfig extends Config { public static final int WHITE_60 = new Color(255, 255, 255, 153).getRGB(); // White 60% public static final int WHITE_80 = new Color(255, 255, 255, 204).getRGB(); // White 80% public static final int WHITE_90 = new Color(255, 255, 255, 229).getRGB(); // White 90% + public static final int WHITE_95 = new Color(255, 255, 255, 242).getRGB(); // White 90% public static final int WHITE = new Color(255, 255, 255, 255).getRGB(); // White 100% public static final int ERROR_700 = new Color(180, 24, 24, 255).getRGB(); // Red 700 diff --git a/src/main/java/io/polyfrost/oneconfig/config/annotations/Option.java b/src/main/java/io/polyfrost/oneconfig/config/annotations/Option.java index 77831db..9955c17 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/annotations/Option.java +++ b/src/main/java/io/polyfrost/oneconfig/config/annotations/Option.java @@ -31,6 +31,10 @@ public @interface Option { */ String subcategory(); + /** + * The width of the option (1 = half width, 2 = full width) + */ + int size() default 1; /** * A String array of all the possible values for the UniSelector, dropdownList, and ComboBox. @@ -40,9 +44,9 @@ public @interface Option { String[] options() default {}; /** - * The width of the option (1 = half width, 2 = full width) + * The places you want dividers to be in a dropdown */ - int size() default 1; + int[] dividers() default {}; /** * The placeholder in the text field @@ -60,11 +64,6 @@ public @interface Option { boolean multiLine() default false; /** - * Steps of slider (0 for no steps) - */ - int step() default 0; - - /** * Minimum value of slider */ float min() default 0; @@ -75,6 +74,11 @@ public @interface Option { float max() default 0; /** + * Steps of slider (0 for no steps) + */ + int step() default 0; + + /** * Option for info option type */ InfoType infoType() default InfoType.INFO; diff --git a/src/main/java/io/polyfrost/oneconfig/config/data/Mod.java b/src/main/java/io/polyfrost/oneconfig/config/data/Mod.java index bd6c3f3..095dded 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/data/Mod.java +++ b/src/main/java/io/polyfrost/oneconfig/config/data/Mod.java @@ -8,7 +8,7 @@ public class Mod { public final String creator; public final String version; public Config config; - public OptionPage defaultPage = new OptionPage("", this); + public final OptionPage defaultPage; /** * @param name Friendly name of the mod @@ -21,5 +21,6 @@ public class Mod { this.modType = modType; this.creator = creator; this.version = version; + this.defaultPage = new OptionPage(name, this); } } diff --git a/src/main/java/io/polyfrost/oneconfig/config/interfaces/BasicOption.java b/src/main/java/io/polyfrost/oneconfig/config/interfaces/BasicOption.java index 3c02b69..7b9a807 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/interfaces/BasicOption.java +++ b/src/main/java/io/polyfrost/oneconfig/config/interfaces/BasicOption.java @@ -61,7 +61,6 @@ public abstract class BasicOption { * @param y y position */ public void drawLast(long vg, int x, int y) { - } /** diff --git a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java index b3c8c75..f511ae3 100644 --- a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java +++ b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java @@ -124,7 +124,7 @@ public class Config { options.add(new ConfigUniSelector(field, option.name(), option.size(), option.options())); break; case DROPDOWN: - options.add(new ConfigDropdown(field, option.name(), option.size(), option.options())); + options.add(new ConfigDropdown(field, option.name(), option.size(), option.options(), option.dividers())); break; case SLIDER: options.add(new ConfigSlider(field, option.name(), option.size(), option.min(), option.max(), option.step())); |