aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/cc/polyfrost/oneconfig/config
diff options
context:
space:
mode:
authorWyvest <45589059+Wyvest@users.noreply.github.com>2022-06-11 19:56:27 +0700
committerWyvest <45589059+Wyvest@users.noreply.github.com>2022-06-11 19:56:27 +0700
commitb41e6fd6cbfee6b3b31855447f9ba79d68846e4e (patch)
tree8a07948d711eda51c9664c100e9ec58fd8ce61a6 /src/main/java/cc/polyfrost/oneconfig/config
parentb1d03048892dfe736bcae057d4f7ac565a16f112 (diff)
parent744e295d86805955194d8b203e5e5dbffe1228fd (diff)
downloadOneConfig-b41e6fd6cbfee6b3b31855447f9ba79d68846e4e.tar.gz
OneConfig-b41e6fd6cbfee6b3b31855447f9ba79d68846e4e.tar.bz2
OneConfig-b41e6fd6cbfee6b3b31855447f9ba79d68846e4e.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/config')
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/config/annotations/Color.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/annotations/Color.java b/src/main/java/cc/polyfrost/oneconfig/config/annotations/Color.java
index 98cc5ec..cea220e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/annotations/Color.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/annotations/Color.java
@@ -14,6 +14,8 @@ import java.lang.annotation.Target;
public @interface Color {
String name();
+ boolean allowAlpha() default true;
+
int size() default 1;
String category() default "General";
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java
index 2c49f08..a8fdb5e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java
@@ -169,7 +169,7 @@ public class VigilanceConfig extends Config {
private OneColor cachedColor = null;
public CompatConfigColorElement(Field color, Vigilant parent, String name, String category, String subcategory, int size) {
- super(null, parent, name, category, subcategory, size);
+ super(null, parent, name, category, subcategory, size, true);
this.color = color;
}