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

Merge pull request #285 from Astrashh/key-name-refactor

Browse Source 
Key name refactor
This commit is contained in:
dfsek
2021-12-17 19:37:51 -07:00
committed by GitHub
parent 8ff6c3e65c 68d262b6b6
commit 0a896862fe
21 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
View File

@@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader;
import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.SamplerSourceTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate;
@@ -65,7 +65,7 @@ public class BiomePipelineAddon implements AddonInitializer {
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
SOURCE_REGISTRY_KEY);
sourceRegistry.register("NOISE", NoiseSourceTemplate::new);
sourceRegistry.register("SAMPLER", SamplerSourceTemplate::new);
})
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(

4
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java
View File

@@ -26,9 +26,9 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
Larger values are quadratically faster, but produce lower quality results.
For example, a value of 3 would sample every 3 blocks.""")
protected @Meta int resolution = 1;
@Value("blend.noise")
@Value("blend.sampler")
@Default
@Description("A noise sampler to use for blending the edges of biomes via domain warping.")
@Description("A sampler to use for blending the edges of biomes via domain warping.")
protected @Meta NoiseSampler blend = NoiseSampler.zero();
@Value("blend.amplitude")
@Default

10
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java → common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java
View File

@@ -12,15 +12,15 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource;
import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class NoiseSourceTemplate extends SourceTemplate {
@Value("noise")
@Description("The noise function to distribute biomes.")
public class SamplerSourceTemplate extends SourceTemplate {
@Value("sampler")
@Description("The sampler used to distribute biomes.")
private @Meta NoiseSampler noise;
@Value("biomes")
@@ -29,6 +29,6 @@ public class NoiseSourceTemplate extends SourceTemplate {
@Override
public BiomeSource get() {
return new NoiseSource(biomes, noise);
return new SamplerSource(biomes, noise);
}
}

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

@@ -17,7 +17,7 @@ import com.dfsek.terra.api.noise.NoiseSampler;
public abstract class StageTemplate implements ObjectTemplate<Stage> {
@Value("noise")
@Description("Noise sampler to use for stage distribution.")
@Value("sampler")
@Description("Sampler to use for stage distribution.")
protected @Meta NoiseSampler noise;
}

4
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java → common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java
View File

@@ -12,11 +12,11 @@ import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class NoiseSource implements BiomeSource {
public class SamplerSource implements BiomeSource {
private final ProbabilityCollection<BiomeDelegate> biomes;
private final NoiseSampler sampler;
public NoiseSource(ProbabilityCollection<BiomeDelegate> biomes, NoiseSampler sampler) {
public SamplerSource(ProbabilityCollection<BiomeDelegate> biomes, NoiseSampler sampler) {
this.biomes = biomes;
this.sampler = sampler;
}

12
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java
View File

@@ -9,10 +9,10 @@ import com.dfsek.terra.api.noise.NoiseSampler;
public class BiomeNoiseConfigTemplate implements ObjectTemplate<BiomeNoiseProperties> {
@Value("noise")
@Value("terrain.sampler")
private @Meta NoiseSampler baseSampler;
@Value("elevation.equation")
@Value("terrain.sampler-2d")
@Default
private @Meta NoiseSampler elevationSampler = NoiseSampler.zero();
@@ -20,19 +20,19 @@ public class BiomeNoiseConfigTemplate implements ObjectTemplate<BiomeNoiseProper
@Default
private @Meta NoiseSampler carvingSampler = NoiseSampler.zero();
@Value("blend.distance")
@Value("terrain.blend.distance")
@Default
private @Meta int blendDistance = 3;
@Value("blend.weight")
@Value("terrain.blend.weight")
@Default
private @Meta double blendWeight = 1;
@Value("blend.step")
@Value("terrain.blend.step")
@Default
private @Meta int blendStep = 4;
@Value("elevation.weight")
@Value("terrain.blend.weight-2d")
@Default
private @Meta double elevationWeight = 1;

7
common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java
View File

@@ -12,7 +12,8 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.function.Supplier;
import com.dfsek.terra.addons.feature.distributor.config.AndDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.NoiseDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.NoDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.SamplerDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.OrDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.PointSetDistributorTemplate;
import com.dfsek.terra.addons.feature.distributor.config.YesDistributorTemplate;
@@ -46,12 +47,12 @@ public class DistributorAddon implements AddonInitializer {
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<Distributor>>> distributorRegistry = event.getPack().getOrCreateRegistry(
DISTRIBUTOR_TOKEN);
distributorRegistry.register("NOISE", NoiseDistributorTemplate::new);
distributorRegistry.register("SAMPLER", SamplerDistributorTemplate::new);
distributorRegistry.register("POINTS", PointSetDistributorTemplate::new);
distributorRegistry.register("AND", AndDistributorTemplate::new);
distributorRegistry.register("OR", OrDistributorTemplate::new);
distributorRegistry.register("YES", YesDistributorTemplate::new);
distributorRegistry.register("NO", NoiseDistributorTemplate::new);
distributorRegistry.register("NO", NoDistributorTemplate::new);
event.getPack()
.applyLoader(Point.class, PointTemplate::new);

8
common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java → common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java
View File

@@ -11,22 +11,22 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.feature.distributor.distributors.NoiseDistributor;
import com.dfsek.terra.addons.feature.distributor.distributors.SamplerDistributor;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.structure.feature.Distributor;
@SuppressWarnings("FieldMayBeFinal")
public class NoiseDistributorTemplate implements ObjectTemplate<Distributor> {
public class SamplerDistributorTemplate implements ObjectTemplate<Distributor> {
@Value("threshold")
@Default
private @Meta double threshold = 0;
@Value("distribution")
@Value("sampler")
private @Meta NoiseSampler noise;
@Override
public Distributor get() {
return new NoiseDistributor(noise, threshold);
return new SamplerDistributor(noise, threshold);
}
}

4
common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java → common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java
View File

@@ -11,12 +11,12 @@ import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.structure.feature.Distributor;
public class NoiseDistributor implements Distributor {
public class SamplerDistributor implements Distributor {
private final NoiseSampler sampler;
private final double threshold;
public NoiseDistributor(NoiseSampler sampler, double threshold) {
public SamplerDistributor(NoiseSampler sampler, double threshold) {
this.sampler = sampler;
this.threshold = threshold;
}

8
common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java
View File

@@ -13,8 +13,8 @@ import java.util.function.Supplier;
import com.dfsek.terra.addons.feature.locator.config.AndLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.GaussianRandomLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.Noise3DLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.NoiseLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.Sampler3DLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.SamplerLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.OrLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.PatternLocatorTemplate;
import com.dfsek.terra.addons.feature.locator.config.RandomLocatorTemplate;
@@ -64,8 +64,8 @@ public class LocatorAddon implements AddonInitializer {
locatorRegistry.register("PATTERN", PatternLocatorTemplate::new);
locatorRegistry.register("NOISE", NoiseLocatorTemplate::new);
locatorRegistry.register("NOISE_3D", Noise3DLocatorTemplate::new);
locatorRegistry.register("SAMPLER", SamplerLocatorTemplate::new);
locatorRegistry.register("SAMPLER_3D", Sampler3DLocatorTemplate::new);
locatorRegistry.register("AND", AndLocatorTemplate::new);
locatorRegistry.register("OR", OrLocatorTemplate::new);

6
common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Noise3DLocatorTemplate.java → common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java
View File

@@ -10,18 +10,18 @@ package com.dfsek.terra.addons.feature.locator.config;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.feature.locator.locators.Noise3DLocator;
import com.dfsek.terra.addons.feature.locator.locators.Sampler3DLocator;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.structure.feature.Locator;
public class Noise3DLocatorTemplate implements ObjectTemplate<Locator> {
public class Sampler3DLocatorTemplate implements ObjectTemplate<Locator> {
@Value("sampler")
private @Meta NoiseSampler sampler;
@Override
public Locator get() {
return new Noise3DLocator(sampler);
return new Sampler3DLocator(sampler);
}
}

6
common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/NoiseLocatorTemplate.java → common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java
View File

@@ -12,18 +12,18 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import java.util.List;
import com.dfsek.terra.addons.feature.locator.locators.NoiseLocator;
import com.dfsek.terra.addons.feature.locator.locators.SamplerLocator;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.structure.feature.Locator;
public class NoiseLocatorTemplate implements ObjectTemplate<Locator> {
public class SamplerLocatorTemplate implements ObjectTemplate<Locator> {
@Value("samplers")
private @Meta List<@Meta NoiseSampler> samplers;
@Override
public Locator get() {
return new NoiseLocator(samplers);
return new SamplerLocator(samplers);
}
}

4
common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java → common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java
View File

@@ -13,10 +13,10 @@ import com.dfsek.terra.api.structure.feature.Locator;
import com.dfsek.terra.api.world.chunk.generation.util.Column;
public class Noise3DLocator implements Locator {
public class Sampler3DLocator implements Locator {
private final NoiseSampler sampler;
public Noise3DLocator(NoiseSampler sampler) {
public Sampler3DLocator(NoiseSampler sampler) {
this.sampler = sampler;
}

4
common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java → common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java
View File

@@ -17,10 +17,10 @@ import com.dfsek.terra.api.structure.feature.Locator;
import com.dfsek.terra.api.world.chunk.generation.util.Column;
public class NoiseLocator implements Locator {
public class SamplerLocator implements Locator {
private final List<NoiseSampler> samplers;
public NoiseLocator(List<NoiseSampler> samplers) {
public SamplerLocator(List<NoiseSampler> samplers) {
this.samplers = samplers;
}

2
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java
View File

@@ -21,7 +21,7 @@ import com.dfsek.terra.api.config.meta.Meta;
@SuppressWarnings("FieldMayBeFinal")
public class NoiseConfigPackTemplate implements ConfigTemplate {
@Value("noise")
@Value("samplers")
private @Meta Map<String, @Meta DimensionApplicableNoiseSampler> noiseBuilderMap;
@Value("functions")

2
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java
View File

@@ -20,7 +20,7 @@ public class DomainWarpTemplate extends SamplerTemplate<DomainWarpedSampler> {
@Value("warp")
private @Meta NoiseSampler warp;
@Value("function")
@Value("sampler")
private @Meta NoiseSampler function;
@Value("amplitude")

2
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java
View File

@@ -28,7 +28,7 @@ public class KernelTemplate extends SamplerTemplate<KernelSampler> {
@Default
private @Meta double factor = 1;
@Value("function")
@Value("sampler")
private @Meta NoiseSampler function;
@Value("frequency")

2
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java
View File

@@ -33,6 +33,6 @@ public abstract class FractalTemplate<T extends FractalNoiseFunction> extends Sa
@Default
protected @Meta double weightedStrength = 0.0D;
@Value("function")
@Value("sampler")
protected @Meta NoiseSampler function;
}

2
common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java
View File

@@ -16,6 +16,6 @@ import com.dfsek.terra.api.noise.NoiseSampler;
public abstract class NormalizerTemplate<T extends Normalizer> extends SamplerTemplate<T> {
@Value("function")
@Value("sampler")
protected @Meta NoiseSampler function;
}

2
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java
View File

@@ -21,7 +21,7 @@ import com.dfsek.terra.api.noise.NoiseSampler;
@SuppressWarnings({ "FieldMayBeFinal", "unused" })
public class PaletteTemplate implements AbstractableTemplate {
@Value("noise")
@Value("sampler")
@Default
private @Meta NoiseSampler noise = NoiseSampler.zero();

4
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java
View File

@@ -40,8 +40,8 @@ public class PaletteLayerLoader implements TypeLoader<PaletteLayerHolder> {
BLOCK_DATA_PROBABILITY_COLLECTION_TYPE, map.get("materials"));
NoiseSampler sampler = null;
if(map.containsKey("noise")) {
sampler = configLoader.loadType(NoiseSampler.class, map.get("noise"));
if(map.containsKey("sampler")) {
sampler = configLoader.loadType(NoiseSampler.class, map.get("sampler"));
}
if(collection == null) throw new LoadException("Collection is null: " + map.get("materials"));