mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-02 07:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

use getOrCreateRegistry

Browse Source
This commit is contained in:
dfsek 2021-07-05 22:39:48 -07:00
parent 4acfeab948
commit 01351883d1
10 changed files with 23 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java
View File

@ -1,7 +1,6 @@
package com.dfsek.terra.addons.biome.pipeline;
import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.api.util.seeded.StageSeeded;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;

8
common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/StageSeeded.java Normal file
View File

@ -0,0 +1,8 @@
package com.dfsek.terra.addons.biome.pipeline;
import com.dfsek.terra.addons.biome.pipeline.api.Stage;
import com.dfsek.terra.api.util.seeded.SeededBuilder;
@FunctionalInterface
public interface StageSeeded extends SeededBuilder<Stage> {
}

2
common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java
View File

@ -5,7 +5,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.BiomePipelineImpl;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.seeded.SourceSeeded;
import com.dfsek.terra.api.util.seeded.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.biome.provider.StandardBiomeProvider;

2
common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageBuilderLoader.java
View File

@ -3,7 +3,7 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.util.seeded.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;

2
common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java
View File

@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.loading.object.ObjectTemplate;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.util.seeded.SeededBuilder;
import com.dfsek.terra.api.util.seeded.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.api.Stage;
public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {

2
common/addons/noise/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java
View File

@ -63,7 +63,7 @@ public class NoiseAddon extends TerraAddon implements EventListener {
@SuppressWarnings("deprecation")
public void packPreLoad(ConfigPackPreLoadEvent event) {
CheckedRegistry<NoiseProvider> noiseRegistry = event.getPack().getCheckedRegistry(NoiseProvider.class);
CheckedRegistry<NoiseProvider> noiseRegistry = event.getPack().getOrCreateRegistry(NoiseProvider.class);
event.getPack()
.applyLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(noiseRegistry));

4
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java
View File

@ -33,8 +33,8 @@ public class TerraScriptAddon extends TerraAddon implements EventListener {
}
public void onPackLoad(ConfigPackPreLoadEvent event) throws ConfigException {
CheckedRegistry<Structure> structureRegistry = event.getPack().getCheckedRegistry(Structure.class);
CheckedRegistry<LootTable> lootRegistry = event.getPack().getCheckedRegistry(LootTable.class);
CheckedRegistry<Structure> structureRegistry = event.getPack().getOrCreateRegistry(Structure.class);
CheckedRegistry<LootTable> lootRegistry = event.getPack().getOrCreateRegistry(LootTable.class);
event.getPack().getLoader().open("", ".tesf").thenEntries(entries -> {
for(Map.Entry<String, InputStream> entry : entries) {
try {

7
common/api/src/main/java/com/dfsek/terra/api/util/seeded/StageSeeded.java
View File

@ -1,7 +0,0 @@
package com.dfsek.terra.api.util.seeded;
import com.dfsek.terra.api.world.biome.generation.pipeline.Stage;
@FunctionalInterface
public interface StageSeeded extends SeededBuilder<Stage> {
}

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

@ -24,10 +24,7 @@ import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.api.registry.meta.RegistryFactory;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
import com.dfsek.terra.api.util.seeded.NoiseProvider;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
import com.dfsek.terra.config.dummy.DummyWorld;
@ -39,7 +36,6 @@ import com.dfsek.terra.registry.CheckedRegistryImpl;
import com.dfsek.terra.registry.OpenRegistryImpl;
import com.dfsek.terra.registry.RegistryFactoryImpl;
import com.dfsek.terra.registry.config.ConfigTypeRegistry;
import com.dfsek.terra.registry.config.NoiseRegistry;
import com.dfsek.terra.world.TerraWorldImpl;
import java.awt.image.BufferedImage;
@ -58,6 +54,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.Function;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@ -82,7 +79,7 @@ public class ConfigPackImpl implements ConfigPack {
private final ConfigTypeRegistry configTypeRegistry;
private final Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> registryMap = newRegistryMap();
private final Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> registryMap = new HashMap<>();
private final TreeMap<Integer, List<ImmutablePair<String, ConfigType<?, ?>>>> configTypes = new TreeMap<>();
@ -90,6 +87,8 @@ public class ConfigPackImpl implements ConfigPack {
try {
this.configTypeRegistry = new ConfigTypeRegistry(main, (id, configType) -> {
OpenRegistry<?> openRegistry = configType.registrySupplier().get();
selfLoader.registerLoader(configType.getTypeClass(), openRegistry);
abstractConfigLoader.registerLoader(configType.getTypeClass(), openRegistry);
registryMap.put(configType.getTypeClass(), ImmutablePair.of(openRegistry, new CheckedRegistryImpl<>(openRegistry)));
});
this.loader = new FolderLoader(folder.toPath());
@ -102,7 +101,6 @@ public class ConfigPackImpl implements ConfigPack {
register(selfLoader);
main.register(selfLoader);
File pack = new File(folder, "pack.yml");
try {
@ -134,6 +132,8 @@ public class ConfigPackImpl implements ConfigPack {
try {
this.configTypeRegistry = new ConfigTypeRegistry(main, (id, configType) -> {
OpenRegistry<?> openRegistry = configType.registrySupplier().get();
selfLoader.registerLoader(configType.getTypeClass(), openRegistry);
abstractConfigLoader.registerLoader(configType.getTypeClass(), openRegistry);
registryMap.put(configType.getTypeClass(), ImmutablePair.of(openRegistry, new CheckedRegistryImpl<>(openRegistry)));
});
this.loader = new ZIPLoader(file);
@ -181,29 +181,6 @@ public class ConfigPackImpl implements ConfigPack {
toWorldConfig(new TerraWorldImpl(new DummyWorld(), this, main)); // Build now to catch any errors immediately.
}
private Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> newRegistryMap() {
Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> map = new HashMap<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>>() {
@Serial
private static final long serialVersionUID = 4015855819914064466L;
@Override
public ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>> put(Class<?> key, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>> value) {
selfLoader.registerLoader(key, value.getLeft());
abstractConfigLoader.registerLoader(key, value.getLeft());
return super.put(key, value);
}
};
putPair(map, LootTable.class, new OpenRegistryImpl<>());
putPair(map, Structure.class, new OpenRegistryImpl<>());
return map;
}
private <R> void putPair(Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> map, Class<R> key, OpenRegistry<R> l) {
map.put(key, ImmutablePair.of(l, new CheckedRegistryImpl<>(l)));
}
private void checkDeadEntries(TerraPlugin main) {
registryMap.forEach((clazz, pair) -> ((OpenRegistryImpl<?>) pair.getLeft()).getDeadEntries().forEach((id, value) -> main.getDebugLogger().warning("Dead entry in '" + clazz + "' registry: '" + id + "'")));
}
@ -259,16 +236,10 @@ public class ConfigPackImpl implements ConfigPack {
main.logger().info("Loaded config pack \"" + template.getID() + "\" v" + template.getVersion() + " by " + template.getAuthor() + " in " + (System.nanoTime() - start) / 1000000D + "ms.");
}
public ConfigPackTemplate getTemplate() {
return template;
}
public Scope getVarScope() {
return varScope;
}
@Override
@SuppressWarnings("unchecked")
public <T> CheckedRegistry<T> getRegistry(Class<T> clazz) {
@ -286,8 +257,6 @@ public class ConfigPackImpl implements ConfigPack {
return (OpenRegistry<T>) registryMap.getOrDefault(clazz, ImmutablePair.ofNull()).getLeft();
}
@SuppressWarnings("unchecked")
@Override
public void register(TypeRegistry registry) {
registry
@ -306,6 +275,9 @@ public class ConfigPackImpl implements ConfigPack {
public <T> CheckedRegistry<T> getOrCreateRegistry(Class<T> clazz) {
return (CheckedRegistry<T>) registryMap.computeIfAbsent(clazz, c -> {
OpenRegistry<T> registry = new OpenRegistryImpl<>();
selfLoader.registerLoader(c, registry);
abstractConfigLoader.registerLoader(c, registry);
main.getDebugLogger().info("Registered loader for registry of class " + c);
return ImmutablePair.of(registry, new CheckedRegistryImpl<>(registry));
}).getRight();
}

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

@ -1,10 +0,0 @@
package com.dfsek.terra.registry.config;
import com.dfsek.terra.api.util.seeded.NoiseProvider;
import com.dfsek.terra.registry.OpenRegistryImpl;
public class NoiseRegistry extends OpenRegistryImpl<NoiseProvider> {
public NoiseRegistry() {
}
}