add config type registry to ConfigPack loader registry

This commit is contained in:
dfsek 2021-04-05 09:50:07 -07:00
parent d96d834a08
commit 473ed45dee

View File

@ -42,6 +42,7 @@ import com.dfsek.terra.config.templates.AbstractableTemplate;
import com.dfsek.terra.registry.OpenRegistry; import com.dfsek.terra.registry.OpenRegistry;
import com.dfsek.terra.registry.config.BiomeRegistry; import com.dfsek.terra.registry.config.BiomeRegistry;
import com.dfsek.terra.registry.config.CarverRegistry; import com.dfsek.terra.registry.config.CarverRegistry;
import com.dfsek.terra.registry.config.ConfigTypeRegistry;
import com.dfsek.terra.registry.config.FloraRegistry; import com.dfsek.terra.registry.config.FloraRegistry;
import com.dfsek.terra.registry.config.FunctionRegistry; import com.dfsek.terra.registry.config.FunctionRegistry;
import com.dfsek.terra.registry.config.LootRegistry; import com.dfsek.terra.registry.config.LootRegistry;
@ -104,9 +105,12 @@ public class ConfigPack implements LoaderRegistrar {
private final BiomeProvider.BiomeProviderBuilder biomeProviderBuilder; private final BiomeProvider.BiomeProviderBuilder biomeProviderBuilder;
private final ConfigTypeRegistry configTypeRegistry;
public ConfigPack(File folder, TerraPlugin main) throws ConfigException { public ConfigPack(File folder, TerraPlugin main) throws ConfigException {
try { try {
this.configTypeRegistry = new ConfigTypeRegistry(this, main);
this.loader = new FolderLoader(folder.toPath()); this.loader = new FolderLoader(folder.toPath());
this.main = main; this.main = main;
long l = System.nanoTime(); long l = System.nanoTime();
@ -143,6 +147,7 @@ public class ConfigPack implements LoaderRegistrar {
public ConfigPack(ZipFile file, TerraPlugin main) throws ConfigException { public ConfigPack(ZipFile file, TerraPlugin main) throws ConfigException {
try { try {
this.configTypeRegistry = new ConfigTypeRegistry(this, main);
this.loader = new ZIPLoader(file); this.loader = new ZIPLoader(file);
this.main = main; this.main = main;
long l = System.nanoTime(); long l = System.nanoTime();
@ -264,6 +269,7 @@ public class ConfigPack implements LoaderRegistrar {
@Override @Override
public void register(TypeRegistry registry) { public void register(TypeRegistry registry) {
registry registry
.registerLoader(ConfigType.class, configTypeRegistry)
.registerLoader(Palette.class, paletteRegistry) .registerLoader(Palette.class, paletteRegistry)
.registerLoader(BiomeBuilder.class, biomeRegistry) .registerLoader(BiomeBuilder.class, biomeRegistry)
.registerLoader(Flora.class, floraRegistry) .registerLoader(Flora.class, floraRegistry)