0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplified

Browse Source
This commit is contained in:
Leijurv 2018-08-14 15:16:38 -07:00
parent bb453a94b9
commit 45375c45bb
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/baritone/bot/Settings.java
View File

@ -18,7 +18,6 @@
package baritone.bot; package baritone.bot;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.util.*; import java.util.*;
/** /**
@ -45,10 +44,11 @@ public class Settings {
public class Setting<T> { public class Setting<T> {
public T value; public T value;
private String name; private String name;
private Class<? extends T> klass; private final Class<T> klass;
private <V extends T> Setting(V value) { private Setting(T value) {
this.value = value; this.value = value;
this.klass = (Class<T>) value.getClass();
} }
public final T get() { public final T get() {
@ -70,41 +70,31 @@ public class Settings {
Field[] temp = getClass().getFields(); Field[] temp = getClass().getFields();
HashMap<String, Setting<?>> tmpByName = new HashMap<>(); HashMap<String, Setting<?>> tmpByName = new HashMap<>();
List<Setting<?>> tmpAll = new ArrayList<>(); List<Setting<?>> tmpAll = new ArrayList<>();
for (Field field : temp) { try {
if (field.getType().equals(Setting.class)) { for (Field field : temp) {
try { if (field.getType().equals(Setting.class)) {
ParameterizedType param = (ParameterizedType) field.getGenericType();
Class settingType = (Class<? extends Object>) param.getActualTypeArguments()[0];
// can't always do field.get(this).value.getClass() because default value might be null
Setting<?> setting = (Setting<? extends Object>) field.get(this); Setting<?> setting = (Setting<? extends Object>) field.get(this);
if (setting.value != null) {
if (setting.value.getClass() != settingType) {
throw new IllegalStateException("Generic mismatch" + setting.value + " " + setting.value.getClass() + " " + settingType);
}
}
String name = field.getName(); String name = field.getName();
setting.name = name; setting.name = name;
setting.klass = settingType;
if (tmpByName.containsKey(name)) { if (tmpByName.containsKey(name)) {
throw new IllegalStateException("Duplicate setting name"); throw new IllegalStateException("Duplicate setting name");
} }
tmpByName.put(name, setting); tmpByName.put(name, setting);
tmpAll.add(setting); tmpAll.add(setting);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
} }
} }
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
} }
byName = Collections.unmodifiableMap(tmpByName); byName = Collections.unmodifiableMap(tmpByName);
allSettings = Collections.unmodifiableList(tmpAll); allSettings = Collections.unmodifiableList(tmpAll);
} }
public <T, V extends T> List<Setting<V>> getByValueType(Class<T> klass) { public <T> List<Setting<T>> getByValueType(Class<T> klass) {
ArrayList<Setting<V>> result = new ArrayList<>(); ArrayList<Setting<T>> result = new ArrayList<>();
for (Setting<?> setting : allSettings) { for (Setting<?> setting : allSettings) {
if (setting.klass.equals(klass)) { if (setting.klass.equals(klass)) {
result.add((Setting<V>) setting); result.add((Setting<T>) setting);
} }
} }
return result; return result;