upstream/FalsePatternLib
2
0 Fork 0
mirror of https://github.com/FalsePattern/FalsePatternLib.git synced 2026-11-15 21:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework config annotations a bit

Browse Source
This commit is contained in:
FalsePattern committed 2022-05-07 01:33:04 +02:00
1 parent d21a1d3012
commit dc62f9d986
2 files changed
+42 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/falsepattern/lib/config/Config.java
+24 -6
View File
@@ -42,6 +42,12 @@ public @interface Config {
@Target(ElementType.FIELD)
@interface Ignore {}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface DefaultBoolean {
boolean value();
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface RangeInt {
@@ -53,21 +59,33 @@ public @interface Config {
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface DefaultInt {
int value() default 0;
int value();
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface RangeDouble {
double min() default Double.MIN_VALUE;
@interface RangeFloat {
float min() default Float.MIN_VALUE;
double max() default Double.MAX_VALUE;
float max() default Float.MAX_VALUE;
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface DefaultDouble {
double value() default 0d;
@interface DefaultFloat {
float value();
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface DefaultString {
String value();
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
@interface Pattern {
String value();
}
@Retention(RetentionPolicy.RUNTIME)
src/main/java/com/falsepattern/lib/config/ConfigurationManager.java
+18 -21
View File
@@ -8,13 +8,12 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.val;
import lombok.var;
import net.minecraft.launchwrapper.Launch;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import java.nio.file.Path;
import java.util.*;
import java.util.regex.Pattern;
/**
* Class for controlling the loading of configuration files.
@@ -86,27 +85,25 @@ public class ConfigurationManager {
val name = Optional.ofNullable(field.getAnnotation(Config.Name.class)).map(Config.Name::value).orElse(field.getName());
val langKey = Optional.ofNullable(field.getAnnotation(Config.LangKey.class)).map(Config.LangKey::value).orElse(name);
var boxed = false;
Property prop = cat.get(name);
prop.comment = comment;
prop.setLanguageKey(langKey);
if ((boxed = field.getType().equals(Integer.class)) || field.getType().equals(int.class)) {
if ((boxed = field.getType().equals(Boolean.class)) || field.getType().equals(boolean.class)) {
val defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultBoolean.class)).map(Config.DefaultBoolean::value).orElse(boxed ? (Boolean) field.get(null) : field.getBoolean(null));
field.setBoolean(null, rawConfig.getBoolean(name, category, defaultValue, comment, langKey));
} else if ((boxed = field.getType().equals(Integer.class)) || field.getType().equals(int.class)) {
val range = Optional.ofNullable(field.getAnnotation(Config.RangeInt.class));
prop.setMinValue(range.map(Config.RangeInt::min).orElse(Integer.MIN_VALUE));
prop.setMaxValue(range.map(Config.RangeInt::max).orElse(Integer.MAX_VALUE));
prop.setDefaultValue(Optional.ofNullable(field.getAnnotation(Config.DefaultInt.class)).map(Config.DefaultInt::value).orElse(boxed ? (Integer)field.get(null) : field.getInt(null)));
field.setInt(null, prop.getInt());
} else if ((boxed = field.getType().equals(Double.class)) || field.getType().equals(double.class)) {
val range = Optional.ofNullable(field.getAnnotation(Config.RangeDouble.class));
prop.setMinValue(range.map(Config.RangeDouble::min).orElse(Double.MIN_VALUE));
prop.setMaxValue(range.map(Config.RangeDouble::max).orElse(Double.MAX_VALUE));
prop.setDefaultValue(Optional.ofNullable(field.getAnnotation(Config.DefaultDouble.class)).map(Config.DefaultDouble::value).orElse(boxed ? (Double) field.get(null) : field.getDouble(null)));
field.setDouble(null, prop.getDouble());
} else if ((boxed = field.getType().equals(Boolean.class)) || field.getType().equals(boolean.class)) {
prop.setDefaultValue(boxed ? (Boolean)field.get(null) : field.getBoolean(null));
field.setBoolean(null, prop.getBoolean());
val min = range.map(Config.RangeInt::min).orElse(Integer.MIN_VALUE);
val max = range.map(Config.RangeInt::max).orElse(Integer.MAX_VALUE);
val defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultInt.class)).map(Config.DefaultInt::value).orElse(boxed ? (Integer)field.get(null) : field.getInt(null));
field.setInt(null, rawConfig.getInt(name, category, defaultValue, min, max, comment, langKey));
} else if ((boxed = field.getType().equals(Float.class)) || field.getType().equals(float.class)) {
val range = Optional.ofNullable(field.getAnnotation(Config.RangeFloat.class));
val min = range.map(Config.RangeFloat::min).orElse(Float.MIN_VALUE);
val max = range.map(Config.RangeFloat::max).orElse(Float.MAX_VALUE);
val defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultFloat.class)).map(Config.DefaultFloat::value).orElse(boxed ? (Float) field.get(null) : field.getFloat(null));
field.setDouble(null, rawConfig.getFloat(name, category, defaultValue, min, max, comment, langKey));
} else if (field.getType().equals(String.class)) {
prop.setDefaultValue((String)field.get(null));
field.set(null, prop.getString());
val defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultString.class)).map(Config.DefaultString::value).orElse((String)field.get(null));
val pattern = Optional.ofNullable(field.getAnnotation(Config.Pattern.class)).map(Config.Pattern::value).map(Pattern::compile).orElse(null);
field.set(null, rawConfig.getString(name, category, defaultValue, comment, langKey, pattern));
}
if (field.isAnnotationPresent(Config.RequiresMcRestart.class)) {
cat.setRequiresMcRestart(true);