MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Supporting StringArray in Configs

Browse source
This commit is contained in:
Frank 2021-08-21 13:43:10 +02:00
parent 8f9ff14fac
commit edb6631768
2 changed files with 77 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/ru/bclib/config/Config.java
View file

@ -11,11 +11,13 @@ import ru.bclib.config.ConfigKeeper.Entry;
import ru.bclib.config.ConfigKeeper.FloatEntry; import ru.bclib.config.ConfigKeeper.FloatEntry;
import ru.bclib.config.ConfigKeeper.IntegerEntry; import ru.bclib.config.ConfigKeeper.IntegerEntry;
import ru.bclib.config.ConfigKeeper.RangeEntry; import ru.bclib.config.ConfigKeeper.RangeEntry;
import ru.bclib.config.ConfigKeeper.StringArrayEntry;
import ru.bclib.config.ConfigKeeper.StringEntry; import ru.bclib.config.ConfigKeeper.StringEntry;
import ru.bclib.config.NamedPathConfig.ConfigToken;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
public abstract class Config { public abstract class Config {
@ -210,4 +212,31 @@ public abstract class Config {
} }
return false; return false;
} }
protected List<String> getStringArray(ConfigKey key, List<String> defaultValue) {
List<String> str = keeper.getValue(key, StringArrayEntry.class);
if (str == null) {
StringArrayEntry entry = keeper.registerEntry(key, new StringArrayEntry(defaultValue));
return entry.getValue();
}
return str != null ? str : defaultValue;
}
protected List<String> getStringArray(ConfigKey key) {
List<String> str = keeper.getValue(key, StringArrayEntry.class);
return str != null ? str : new ArrayList<>(0);
}
protected boolean setStringArray(ConfigKey key, List<String> value) {
try {
StringArrayEntry entry = keeper.getEntry(key, StringArrayEntry.class);
if (entry == null) return false;
entry.setValue(value);
return true;
}
catch (NullPointerException ex) {
BCLib.LOGGER.catching(ex);
}
return false;
}
} }

47
src/main/java/ru/bclib/config/ConfigKeeper.java
View file

@ -2,6 +2,7 @@ package ru.bclib.config;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.minecraft.util.GsonHelper; import net.minecraft.util.GsonHelper;
@ -14,6 +15,8 @@ import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.OutputStream; import java.io.OutputStream;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -293,7 +296,51 @@ public final class ConfigKeeper {
public void toJson(String value) { public void toJson(String value) {
this.location.addProperty(key, value); this.location.addProperty(key, value);
} }
}
public static abstract class ArrayEntry<T> extends Entry<List<T>> {
public ArrayEntry(List<T> defaultValue) {
super(defaultValue);
}
protected abstract T getValue(JsonElement element);
protected abstract void add(JsonArray array, T element);
private JsonArray toArray(List<T> input){
final JsonArray array = new JsonArray();
input.forEach(s -> add(array, s));
return array;
}
@Override
public List<T> fromJson() {
final JsonArray resArray = GsonHelper.getAsJsonArray(location, key, toArray(defaultValue));
final List<T> res = new ArrayList<>(resArray.size());
resArray.forEach(e -> res.add(getValue(e)));
return res;
}
@Override
public void toJson(List<T> value) {
this.location.add(key, toArray(value));
}
}
public static class StringArrayEntry extends ArrayEntry<String> {
public StringArrayEntry(List<String> defaultValue) {
super(defaultValue);
}
@Override
protected String getValue(JsonElement el){
return el.getAsString();
}
protected void add(JsonArray array, String el){
array.add(el);
}
} }
public static class EnumEntry<T extends Enum<T>> extends Entry<T> { public static class EnumEntry<T extends Enum<T>> extends Entry<T> {