new loading system, begin ZIP loading implementation

src/main/java/com/dfsek/terra/config/base/ConfigPack.java

@@ -13,6 +13,7 @@ import com.dfsek.terra.config.factories.BiomeGridFactory;
 import com.dfsek.terra.config.factories.CarverFactory;
 import com.dfsek.terra.config.factories.FloraFactory;
 import com.dfsek.terra.config.factories.PaletteFactory;
+import com.dfsek.terra.config.files.FolderLoader;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.loaders.NoiseBuilderLoader;
 import com.dfsek.terra.config.templates.BiomeGridTemplate;
@@ -26,6 +27,7 @@ import com.dfsek.terra.registry.BiomeGridRegistry;
 import com.dfsek.terra.registry.BiomeRegistry;
 import com.dfsek.terra.registry.CarverRegistry;
 import com.dfsek.terra.registry.FloraRegistry;
+import com.dfsek.terra.registry.OreRegistry;
 import com.dfsek.terra.registry.PaletteRegistry;
 import com.dfsek.terra.registry.StructureRegistry;
 import com.dfsek.terra.util.ConfigUtil;
@@ -55,6 +57,19 @@ public class ConfigPack {
     private final CarverRegistry carverRegistry = new CarverRegistry();
     private final PaletteRegistry paletteRegistry = new PaletteRegistry();
     private final FloraRegistry floraRegistry = new FloraRegistry();
+    private final OreRegistry oreRegistry = new OreRegistry();
+
+    private final AbstractConfigLoader abstractConfigLoader;
+
+    {
+        abstractConfigLoader = new AbstractConfigLoader();
+        abstractConfigLoader
+                .registerLoader(Palette.class, paletteRegistry)
+                .registerLoader(Biome.class, biomeRegistry)
+                .registerLoader(UserDefinedCarver.class, carverRegistry)
+                .registerLoader(Flora.class, floraRegistry);
+        ConfigUtil.registerAllLoaders(abstractConfigLoader);
+    }
 
     private final Scope varScope;
 
@@ -78,51 +93,65 @@ public class ConfigPack {
             varScope.create(var.getKey()).setValue(var.getValue());
         }
 
-        AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
+        List<PaletteTemplate> paletteTemplates = new ArrayList<>();
-        abstractConfigLoader
+        new FolderLoader(new File(folder, "palettes").toPath())
-                .registerLoader(Palette.class, paletteRegistry)
+                .then(streams -> paletteTemplates.addAll(abstractConfigLoader.load(streams, PaletteTemplate::new)))
-                .registerLoader(Biome.class, biomeRegistry)
+                .close();
-                .registerLoader(UserDefinedCarver.class, carverRegistry)
-                .registerLoader(Flora.class, floraRegistry);
-        ConfigUtil.registerAllLoaders(abstractConfigLoader);
 
-        List<PaletteTemplate> paletteTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "palettes").toPath()), PaletteTemplate::new);
         PaletteFactory paletteFactory = new PaletteFactory();
         paletteTemplates.forEach(palette -> {
             paletteRegistry.add(palette.getID(), paletteFactory.build(palette));
             Debug.info("Loaded palette " + palette.getID());
         });
 
-        List<FloraTemplate> floraTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "flora").toPath()), FloraTemplate::new);
+        List<FloraTemplate> floraTemplates = new ArrayList<>();
+        new FolderLoader(new File(folder, "flora").toPath())
+                .then(streams -> floraTemplates.addAll(abstractConfigLoader.load(streams, FloraTemplate::new)))
+                .close();
+
         FloraFactory floraFactory = new FloraFactory();
         floraTemplates.forEach(flora -> {
             floraRegistry.add(flora.getID(), floraFactory.build(flora));
             Debug.info("Loaded flora " + flora.getID());
         });
 
-        List<StructureTemplate> structureTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "structures/single").toPath()), StructureTemplate::new);
+        List<StructureTemplate> structureTemplates = new ArrayList<>();
+        new FolderLoader(new File(folder, "structures/single").toPath())
+                .then(streams -> structureTemplates.addAll(abstractConfigLoader.load(streams, StructureTemplate::new)))
+                .close();
+
         structureTemplates.forEach(structure -> {
             structureRegistry.add(structure.getID(), structure);
             Debug.info("Loaded structure " + structure.getID());
         });
 
-        List<CarverTemplate> carverTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "carving").toPath()), CarverTemplate::new);
+        List<CarverTemplate> carverTemplates = new ArrayList<>();
+        new FolderLoader(new File(folder, "carving").toPath())
+                .then(streams -> carverTemplates.addAll(abstractConfigLoader.load(streams, CarverTemplate::new)))
+                .close();
+
         CarverFactory carverFactory = new CarverFactory();
         carverTemplates.forEach(carver -> {
             carverRegistry.add(carver.getID(), carverFactory.build(carver));
             Debug.info("Loaded carver " + carver.getID());
         });
 
-        List<BiomeTemplate> biomeTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "biomes").toPath()), () -> new BiomeTemplate(this));
+        List<BiomeTemplate> biomeTemplates = new ArrayList<>();
+        new FolderLoader(new File(folder, "biomes").toPath())
+                .then(streams -> biomeTemplates.addAll(abstractConfigLoader.load(streams, () -> new BiomeTemplate(this))))
+                .close();
+
         BiomeFactory biomeFactory = new BiomeFactory(this);
         biomeTemplates.forEach(biome -> {
             biomeRegistry.add(biome.getID(), biomeFactory.build(biome));
             Debug.info("Loaded biome " + biome.getID());
-            Debug.info("Flora: " + biome.getFlora());
-            Debug.info("Carvers: " + biome.getCarvers());
         });
 
-        List<BiomeGridTemplate> biomeGridTemplates = abstractConfigLoader.load(ConfigUtil.loadFromPath(new File(folder, "grids").toPath()), BiomeGridTemplate::new);
+        List<BiomeGridTemplate> biomeGridTemplates = new ArrayList<>();
+        new FolderLoader(new File(folder, "grids").toPath())
+                .then(streams -> biomeGridTemplates.addAll(abstractConfigLoader.load(streams, BiomeGridTemplate::new)))
+                .close();
+
         BiomeGridFactory biomeGridFactory = new BiomeGridFactory();
         biomeGridTemplates.forEach(grid -> {
             biomeGridRegistry.add(grid.getID(), biomeGridFactory.build(grid));

src/main/java/com/dfsek/terra/config/files/ExceptionalConsumer.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.config.files;
+
+import com.dfsek.tectonic.exception.ConfigException;
+
+@FunctionalInterface
+public interface ExceptionalConsumer<T> {
+    void accept(T t) throws ConfigException;
+}

src/main/java/com/dfsek/terra/config/files/FolderLoader.java

@@ -0,0 +1,52 @@
+package com.dfsek.terra.config.files;
+
+import com.dfsek.tectonic.exception.ConfigException;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * Load all {@code *.yml} files from a {@link java.nio.file.Path}.
+ */
+public class FolderLoader implements Loader {
+    private final List<InputStream> streams = new ArrayList<>();
+
+    public FolderLoader(Path path) {
+        path.toFile().mkdirs();
+        try(Stream<Path> paths = Files.walk(path)) {
+            paths.filter(Files::isRegularFile).filter(file -> file.toString().toLowerCase().endsWith(".yml")).forEach(file -> {
+                try {
+                    streams.add(new FileInputStream(file.toFile()));
+                } catch(FileNotFoundException e) {
+                    e.printStackTrace();
+                }
+            });
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public FolderLoader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException {
+        consumer.accept(streams);
+        return this;
+    }
+
+    @Override
+    public void close() {
+        streams.forEach(stream -> {
+            try {
+                stream.close();
+            } catch(IOException e) {
+                e.printStackTrace();
+            }
+        });
+        streams.clear();
+    }
+}

src/main/java/com/dfsek/terra/config/files/Loader.java

@@ -0,0 +1,20 @@
+package com.dfsek.terra.config.files;
+
+import com.dfsek.tectonic.exception.ConfigException;
+
+import java.io.InputStream;
+import java.util.List;
+
+public interface Loader {
+    /**
+     * Do something with the InputStreams.
+     *
+     * @param consumer Something to do with the streams.
+     */
+    Loader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException;
+
+    /**
+     * Close all InputStreams opened.
+     */
+    void close();
+}

src/main/java/com/dfsek/terra/config/files/ZIPLoader.java

@@ -0,0 +1,48 @@
+package com.dfsek.terra.config.files;
+
+import com.dfsek.tectonic.exception.ConfigException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class ZIPLoader implements Loader {
+    private final List<InputStream> streams = new ArrayList<>();
+
+    public ZIPLoader(ZipFile file, String subDirectory) {
+        Enumeration<? extends ZipEntry> entries = file.entries();
+
+        while(entries.hasMoreElements()) {
+            ZipEntry entry = entries.nextElement();
+            if(!entry.isDirectory() && entry.getName().startsWith(subDirectory) && entry.getName().endsWith(".yml")) {
+                try {
+                    streams.add(file.getInputStream(entry));
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @Override
+    public ZIPLoader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException {
+        consumer.accept(streams);
+        return this;
+    }
+
+    @Override
+    public void close() {
+        streams.forEach(stream -> {
+            try {
+                stream.close();
+            } catch(IOException e) {
+                e.printStackTrace();
+            }
+        });
+        streams.clear();
+    }
+}

src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java

@@ -53,9 +53,9 @@ public class BiomeTemplate implements ConfigTemplate {
     @Value("noise-equation")
     @Abstractable
     private String noiseEquation;
-    @Value("ores")
+    //@Value("ores")
-    @Abstractable
+    //@Abstractable
-    @Default
+    //@Default
     private Map<Ore, OreConfig> ores = new HashMap<>();
     @Value("ocean.level")
     @Abstractable

src/main/java/com/dfsek/terra/util/ConfigUtil.java

@@ -26,35 +26,7 @@ import org.bukkit.block.data.BlockData;
 import org.polydev.gaea.math.ProbabilityCollection;
 import org.polydev.gaea.math.Range;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
 public final class ConfigUtil {
-    public static List<InputStream> loadFromPath(Path folder) {
-        List<InputStream> streams = new ArrayList<>();
-        folder.toFile().mkdirs();
-        try(Stream<Path> paths = Files.walk(folder)) {
-            paths.filter(Files::isRegularFile).filter(file -> file.toString().toLowerCase().endsWith(".yml")).forEach(file -> {
-                try {
-                    streams.add(new FileInputStream(file.toFile()));
-                } catch(FileNotFoundException e) {
-                    e.printStackTrace();
-                }
-            });
-        } catch(IOException e) {
-            e.printStackTrace();
-        }
-
-        return streams;
-    }
-
     /**
      * Register all Terra loaders to a {@link TypeRegistry}.
      *