minor cleanup

common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java

@@ -1,10 +1,9 @@
-package com.dfsek.terra.config.prototype;
+package com.dfsek.terra.api.config;
 
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.registry.OpenRegistry;
-import com.dfsek.terra.registry.OpenRegistry;
 
 import java.util.function.Supplier;
 

common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java

@@ -8,7 +8,6 @@ import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.api.LoaderRegistrar;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
@@ -34,7 +33,7 @@ import com.dfsek.terra.config.loaders.config.biome.templates.provider.ImageProvi
 import com.dfsek.terra.config.loaders.config.biome.templates.provider.SingleBiomeProviderTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader;
 import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate;
-import com.dfsek.terra.config.prototype.ConfigType;
+import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.config.prototype.ProtoConfig;
 import com.dfsek.terra.registry.config.ConfigTypeRegistry;
 import com.dfsek.terra.registry.config.FunctionRegistry;

common/implementation/src/main/java/com/dfsek/terra/config/prototype/ProtoConfig.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.prototype;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.api.config.ConfigType;
 
 public class ProtoConfig implements ConfigTemplate {
     @Value("id")

common/implementation/src/main/java/com/dfsek/terra/registry/config/BiomeRegistry.java

@@ -3,11 +3,11 @@ package com.dfsek.terra.registry.config;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.terra.config.builder.BiomeBuilder;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
 import java.lang.reflect.Type;
 
-public class BiomeRegistry extends OpenRegistry<BiomeBuilder> {
+public class BiomeRegistry extends OpenRegistryImpl<BiomeBuilder> {
     @Override
     public BiomeBuilder load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
         if(o.equals("SELF")) return null;

common/implementation/src/main/java/com/dfsek/terra/registry/config/CarverRegistry.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.registry.config;
 
 import com.dfsek.terra.carving.UserDefinedCarver;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class CarverRegistry extends OpenRegistry<UserDefinedCarver> {
+public class CarverRegistry extends OpenRegistryImpl<UserDefinedCarver> {
 }

common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java

@@ -4,6 +4,7 @@ import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
@@ -18,7 +19,7 @@ import com.dfsek.terra.config.factories.PaletteFactory;
 import com.dfsek.terra.config.factories.StructureFactory;
 import com.dfsek.terra.config.factories.TreeFactory;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
-import com.dfsek.terra.config.prototype.ConfigType;
+import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.config.templates.AbstractableTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.config.templates.CarverTemplate;
@@ -27,7 +28,7 @@ import com.dfsek.terra.config.templates.OreTemplate;
 import com.dfsek.terra.config.templates.PaletteTemplate;
 import com.dfsek.terra.config.templates.StructureTemplate;
 import com.dfsek.terra.config.templates.TreeTemplate;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.world.population.items.TerraStructure;
 import com.dfsek.terra.world.population.items.ores.Ore;
 
@@ -35,7 +36,7 @@ import java.util.LinkedHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 
-public class ConfigTypeRegistry extends OpenRegistry<ConfigType<?, ?>> {
+public class ConfigTypeRegistry extends OpenRegistryImpl<ConfigType<?, ?>> {
     private final BiConsumer<String, ConfigType<?, ?>> callback;
 
     public ConfigTypeRegistry(ConfigPackImpl pack, TerraPlugin main, BiConsumer<String, ConfigType<?, ?>> callback) {
@@ -52,7 +53,7 @@ public class ConfigTypeRegistry extends OpenRegistry<ConfigType<?, ?>> {
     }
 
     @Override
-    protected boolean add(String identifier, Entry<ConfigType<?, ?>> value) {
+    public boolean add(String identifier, Entry<ConfigType<?, ?>> value) {
         callback.accept(identifier, value.getValue());
         return super.add(identifier, value);
     }
@@ -72,12 +73,12 @@ public class ConfigTypeRegistry extends OpenRegistry<ConfigType<?, ?>> {
 
         @Override
         public Class<ConfigPack> getTypeClass() {
-            return ConfigPackImpl.class;
+            return ConfigPack.class;
         }
 
         @Override
         public Supplier<OpenRegistry<ConfigPack>> registrySupplier() {
-            return OpenRegistry::new;
+            return OpenRegistryImpl::new;
         }
     }
 

common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java

@@ -4,14 +4,14 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.Flora;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.world.population.items.flora.ConstantFlora;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.Callable;
 
-public class FloraRegistry extends OpenRegistry<Flora> {
+public class FloraRegistry extends OpenRegistryImpl<Flora> {
     private final TerraPlugin main;
 
     public FloraRegistry(TerraPlugin main) {

common/implementation/src/main/java/com/dfsek/terra/registry/config/FunctionRegistry.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.registry.config;
 
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class FunctionRegistry extends OpenRegistry<FunctionBuilder<?>> {
+public class FunctionRegistry extends OpenRegistryImpl<FunctionBuilder<?>> {
 }

common/implementation/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java

@@ -23,9 +23,9 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal.Rid
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class NoiseRegistry extends OpenRegistry<NoiseProvider> {
+public class NoiseRegistry extends OpenRegistryImpl<NoiseProvider> {
     public NoiseRegistry() {
         add("LINEAR", LinearNormalizerTemplate::new);
         add("NORMAL", NormalNormalizerTemplate::new);

common/implementation/src/main/java/com/dfsek/terra/registry/config/OreRegistry.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.registry.config;
 
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.world.population.items.ores.Ore;
 
-public class OreRegistry extends OpenRegistry<Ore> {
+public class OreRegistry extends OpenRegistryImpl<Ore> {
 }

common/implementation/src/main/java/com/dfsek/terra/registry/config/PaletteRegistry.java

@@ -3,9 +3,9 @@ package com.dfsek.terra.registry.config;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.SinglePalette;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class PaletteRegistry extends OpenRegistry<Palette> {
+public class PaletteRegistry extends OpenRegistryImpl<Palette> {
     private final TerraPlugin main;
 
     public PaletteRegistry(TerraPlugin main) {

common/implementation/src/main/java/com/dfsek/terra/registry/config/ScriptRegistry.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.registry.config;
 
 import com.dfsek.terra.api.structures.script.StructureScript;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class ScriptRegistry extends OpenRegistry<StructureScript> {
+public class ScriptRegistry extends OpenRegistryImpl<StructureScript> {
 }

common/implementation/src/main/java/com/dfsek/terra/registry/config/StructureRegistry.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.registry.config;
 
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.world.population.items.TerraStructure;
 
-public class StructureRegistry extends OpenRegistry<TerraStructure> {
+public class StructureRegistry extends OpenRegistryImpl<TerraStructure> {
 }

common/implementation/src/main/java/com/dfsek/terra/registry/config/TreeRegistry.java

@@ -1,11 +1,7 @@
 package com.dfsek.terra.registry.config;
 
 import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.registry.OpenRegistry;
+import com.dfsek.terra.registry.OpenRegistryImpl;
 
-public class TreeRegistry extends OpenRegistry<Tree> {
+public class TreeRegistry extends OpenRegistryImpl<Tree> {
-    @Override
-    public boolean add(String identifier, Tree value) {
-        return super.add(identifier, value);
-    }
 }