diff --git a/src/main/java/com/enderio/core/common/config/JsonConfigReader.java b/src/main/java/com/enderio/core/common/config/JsonConfigReader.java index 0fda3ff..a76908c 100644 --- a/src/main/java/com/enderio/core/common/config/JsonConfigReader.java +++ b/src/main/java/com/enderio/core/common/config/JsonConfigReader.java @@ -6,9 +6,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import lombok.Value; +import lombok.AllArgsConstructor; +import lombok.Getter; import com.enderio.core.common.util.EnderFileUtils; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; @@ -33,7 +35,6 @@ import com.google.gson.reflect.TypeToken; * constructors. */ public class JsonConfigReader implements Iterable { - /** * A class representing some info about your mod. *

@@ -42,15 +43,17 @@ public class JsonConfigReader implements Iterable { * assetPath is the path to your default json file. This includes the * /modid part and whatever subfolders follow. */ - @Value + @AllArgsConstructor + @Getter public static class ModToken { private Class mainClass; private String assetPath; } - private static final Gson gson = new GsonBuilder().setPrettyPrinting().create(); - private static final JsonParser parser = new JsonParser(); private static final String DEFAULT_KEY = "data"; + private static final JsonParser parser = new JsonParser(); + + private final GsonBuilder builder = new GsonBuilder(); private File file; private JsonObject root; @@ -188,6 +191,14 @@ public class JsonConfigReader implements Iterable { return root.get(key) != null; } + /** + * Gives this reader's {@link GsonBuilder} object so that you may configure + * type adapters and other settings. + */ + public GsonBuilder getBuilder() { + return builder; + } + /** * Reads from the {@link JsonObject} linked to the {@link String key} and * returns a List of all the elements contained in its array. @@ -197,6 +208,11 @@ public class JsonConfigReader implements Iterable { */ @SuppressWarnings("unchecked") public List getElements(String key) { + if (!hasKey(key)) { + return Lists.newArrayList(); + } + + Gson gson = builder.create(); JsonArray elements = root.get(key).getAsJsonArray(); List list = new ArrayList(); for (int i = 0; i < elements.size(); i++) {