Reformat all code

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
This commit is contained in:
solonovamax
2021-08-30 17:34:44 -04:00
parent 1655381413
commit c445a0434d
753 changed files with 10461 additions and 8783 deletions
@@ -8,30 +8,32 @@ import com.dfsek.terra.api.structure.feature.Locator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.World;
public class ConfiguredFeature implements Feature {
private final ProbabilityCollection<Structure> structures;
private final NoiseSampler structureSelector;
private final Distributor distributor;
private final Locator locator;
public ConfiguredFeature(ProbabilityCollection<Structure> structures, NoiseSampler structureSelector, Distributor distributor, Locator locator) {
public ConfiguredFeature(ProbabilityCollection<Structure> structures, NoiseSampler structureSelector, Distributor distributor,
Locator locator) {
this.structures = structures;
this.structureSelector = structureSelector;
this.distributor = distributor;
this.locator = locator;
}
@Override
public Structure getStructure(World world, int x, int y, int z) {
return structures.get(structureSelector, x, y, z, world.getSeed());
}
@Override
public Distributor getDistributor() {
return distributor;
}
@Override
public Locator getLocator() {
return locator;
@@ -9,19 +9,20 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.injection.annotations.Inject;
@Addon("config-feature")
@Version("1.0.0")
@Author("Terra")
public class FeatureAddon extends TerraAddon {
@Inject
private TerraPlugin main;
@Override
public void initialize() {
main.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 2))
.failThrough();
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 2))
.failThrough();
}
}
@@ -1,5 +1,7 @@
package com.dfsek.terra.addons.feature;
import java.util.function.Supplier;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.api.config.ConfigPack;
@@ -8,30 +10,30 @@ import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.structure.feature.Feature;
import com.dfsek.terra.api.util.reflection.TypeKey;
import java.util.function.Supplier;
public class FeatureConfigType implements ConfigType<FeatureTemplate, Feature> {
public static final TypeKey<Feature> FEATURE_TYPE_KEY = new TypeKey<>() {};
public static final TypeKey<Feature> FEATURE_TYPE_KEY = new TypeKey<>() {
};
private final FeatureFactory factory = new FeatureFactory();
@Override
public FeatureTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
return new FeatureTemplate();
}
@Override
public ConfigFactory<FeatureTemplate, Feature> getFactory() {
return factory;
}
@Override
public TypeKey<Feature> getTypeKey() {
return FEATURE_TYPE_KEY;
}
@Override
public Supplier<OpenRegistry<Feature>> registrySupplier(ConfigPack pack) {
return pack.getRegistryFactory()::create;
}
@Override
public FeatureTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
return new FeatureTemplate();
}
@Override
public ConfigFactory<FeatureTemplate, Feature> getFactory() {
return factory;
}
@Override
public TypeKey<Feature> getTypeKey() {
return FEATURE_TYPE_KEY;
}
}
@@ -1,10 +1,12 @@
package com.dfsek.terra.addons.feature;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.api.structure.feature.Feature;
public class FeatureFactory implements ConfigFactory<FeatureTemplate, Feature> {
@Override
public Feature build(FeatureTemplate config, TerraPlugin main) throws LoadException {
@@ -2,7 +2,7 @@ package com.dfsek.terra.addons.feature;
import com.dfsek.tectonic.annotations.Final;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.config.AbstractableTemplate;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
@@ -11,40 +11,41 @@ import com.dfsek.terra.api.structure.feature.Distributor;
import com.dfsek.terra.api.structure.feature.Locator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class FeatureTemplate implements AbstractableTemplate {
@Value("id")
@Final
private String id;
@Value("distributor")
private @Meta Distributor distributor;
@Value("locator")
private @Meta Locator locator;
@Value("structures.distribution")
private @Meta NoiseSampler structureNoise;
@Value("structures.structures")
private @Meta ProbabilityCollection<Structure> structures;
@Override
public String getID() {
return id;
}
public Distributor getDistributor() {
return distributor;
}
public Locator getLocator() {
return locator;
}
public NoiseSampler getStructureNoise() {
return structureNoise;
}
public ProbabilityCollection<Structure> getStructures() {
return structures;
}