mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
dfsek
2021-06-23 10:13:50 -07:00
parent a5f879ae7a
commit fa0bd103f3
14 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/implementation/src/main/java/com/dfsek/terra/config/prototype/ConfigType.java → common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java
View File

@@ -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.registry.OpenRegistry;
import com.dfsek.terra.api.registry.OpenRegistry;
import java.util.function.Supplier;

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

@@ -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;

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

@@ -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")

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

@@ -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;

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

@@ -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> {
}

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

@@ -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;
}
}

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

@@ -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) {

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

@@ -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<?>> {
}

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

@@ -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);

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

@@ -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> {
}

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

@@ -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) {

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

@@ -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> {
}

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

@@ -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> {
}

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

@@ -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> {
@Override
public boolean add(String identifier, Tree value) {
return super.add(identifier, value);
}
public class TreeRegistry extends OpenRegistryImpl<Tree> {
}