From 1968bdf88d7aa5a104891587287ce87784852fc2 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 18 Sep 2021 23:43:00 -0700 Subject: [PATCH] fix final config template values --- .../addons/biome/image/ImageProviderTemplate.java | 2 +- .../distributor/config/NoiseDistributorTemplate.java | 2 +- .../config/templates/noise/GaborNoiseTemplate.java | 10 +++++----- .../addons/structure/BiomeStructuresTemplate.java | 2 +- .../feature/config/BiomeFeaturesTemplate.java | 2 +- .../addons/generation/flora/BiomeFloraTemplate.java | 2 +- .../terra/config/pack/ConfigPackAddonsTemplate.java | 2 +- .../src/test/java/noise/ColorConfigTemplate.java | 3 +-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java index 877697c9e..e82f4a004 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java @@ -16,7 +16,7 @@ public class ImageProviderTemplate implements ObjectTemplate { private final Registry biomes; @Value("resolution") @Default - private final int resolution = 1; + private int resolution = 1; @Value("image.name") private BufferedImage image; @Value("image.align") diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java index 67cf37ee9..945928f02 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.structure.feature.Distributor; public class NoiseDistributorTemplate implements ObjectTemplate { @Value("threshold") @Default - private final @Meta double threshold = 0; + private @Meta double threshold = 0; @Value("distribution") private @Meta NoiseSampler noise; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java index 0fa207a0d..2fb5c20dd 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java @@ -11,23 +11,23 @@ import com.dfsek.terra.api.noise.NoiseSampler; public class GaborNoiseTemplate extends NoiseTemplate { @Value("rotation") @Default - private final @Meta double rotation = 0.25; + private @Meta double rotation = 0.25; @Value("isotropic") @Default - private final @Meta boolean isotropic = true; + private @Meta boolean isotropic = true; @Value("deviation") @Default - private final @Meta double deviation = 1.0; + private @Meta double deviation = 1.0; @Value("impulses") @Default - private final @Meta double impulses = 64d; + private @Meta double impulses = 64d; @Value("frequency_0") @Default - private final @Meta double f0 = 0.625; + private @Meta double f0 = 0.625; @Override public NoiseSampler get() { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java index efc6afc0f..0af5a5e5b 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; public class BiomeStructuresTemplate implements ObjectTemplate { @Value("structures") @Default - private final @Meta Set<@Meta ConfiguredStructure> structures = Collections.emptySet(); + private @Meta Set<@Meta ConfiguredStructure> structures = Collections.emptySet(); @Override public BiomeStructures get() { diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeaturesTemplate.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeaturesTemplate.java index ae25042ae..9132b7374 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeaturesTemplate.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeaturesTemplate.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.structure.feature.Feature; public class BiomeFeaturesTemplate implements ObjectTemplate { @Value("features") @Default - private final @Meta List<@Meta Feature> features = Collections.emptyList(); + private @Meta List<@Meta Feature> features = Collections.emptyList(); @Override public BiomeFeatures get() { diff --git a/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFloraTemplate.java b/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFloraTemplate.java index 7f386b5d3..53bf626b0 100644 --- a/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFloraTemplate.java +++ b/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFloraTemplate.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.config.meta.Meta; public class BiomeFloraTemplate implements ObjectTemplate { @Value("flora") @Default - private final @Meta List<@Meta FloraLayer> flora = Collections.emptyList(); + private @Meta List<@Meta FloraLayer> flora = Collections.emptyList(); @Override public BiomeFlora get() { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java index 984deaf83..976ade247 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.addon.TerraAddon; public class ConfigPackAddonsTemplate implements ConfigTemplate { @Value("addons") @Default - private final Set addons = new HashSet<>(); + private Set addons = new HashSet<>(); public Set getAddons() { diff --git a/common/implementation/src/test/java/noise/ColorConfigTemplate.java b/common/implementation/src/test/java/noise/ColorConfigTemplate.java index 0797330af..8c3514961 100644 --- a/common/implementation/src/test/java/noise/ColorConfigTemplate.java +++ b/common/implementation/src/test/java/noise/ColorConfigTemplate.java @@ -11,8 +11,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection; public class ColorConfigTemplate implements ConfigTemplate { @Value("enable") @Default - private @Meta - final boolean enable = false; + private @Meta boolean enable = false; @Value("colors") private @Meta ProbabilityCollection<@Meta Integer> colors;