From 44595a861aa1ceedabc2c99d377fb5ee5d7a21ae Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 18 Jan 2022 20:51:32 -0700 Subject: [PATCH] put NoiseConfigPackTemplate in config context --- .../com/dfsek/terra/addons/noise/NoiseAddon.java | 13 ++++++++----- .../terra/addons/noise/NoiseConfigPackTemplate.java | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index d0c5d769a..f06dff182 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -80,7 +80,8 @@ public class NoiseAddon implements AddonInitializer { event.getPack() .applyLoader(CellularSampler.DistanceFunction.class, (type, o, loader, depthTracker) -> CellularSampler.DistanceFunction.valueOf((String) o)) - .applyLoader(CellularSampler.ReturnType.class, (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o)) + .applyLoader(CellularSampler.ReturnType.class, + (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o)) .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new) .applyLoader(FunctionTemplate.class, FunctionTemplate::new); @@ -117,17 +118,17 @@ public class NoiseAddon implements AddonInitializer { noiseRegistry.register(addon.key("CONSTANT"), ConstantNoiseTemplate::new); noiseRegistry.register(addon.key("KERNEL"), KernelTemplate::new); - + noiseRegistry.register(addon.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new); - - + + noiseRegistry.register(addon.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new)); noiseRegistry.register(addon.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new)); noiseRegistry.register(addon.key("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new)); noiseRegistry.register(addon.key("DIV"), () -> new BinaryArithmeticTemplate<>(DivisionSampler::new)); noiseRegistry.register(addon.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new)); noiseRegistry.register(addon.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new)); - + Map packSamplers = new LinkedHashMap<>(); Map packFunctions = new LinkedHashMap<>(); @@ -137,7 +138,9 @@ public class NoiseAddon implements AddonInitializer { NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate()); packSamplers.putAll(template.getSamplers()); packFunctions.putAll(template.getFunctions()); + event.getPack().getContext().put(template); }) + .priority(50) .failThrough(); } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java index 9855e5407..155f4c45c 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java @@ -17,10 +17,11 @@ import java.util.Map; import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; import com.dfsek.terra.api.config.meta.Meta; +import com.dfsek.terra.api.properties.Properties; @SuppressWarnings("FieldMayBeFinal") -public class NoiseConfigPackTemplate implements ConfigTemplate { +public class NoiseConfigPackTemplate implements ConfigTemplate, Properties { @Value("samplers") @Default private @Meta Map noiseBuilderMap = new LinkedHashMap<>();