From 7b1853823c1ce9d94653bf9dac370bc9a345a69d Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Tue, 20 Jul 2021 16:08:58 -0700
Subject: [PATCH] remove unneeded NoiseSamplerBuilderLoader

---
 .../dfsek/terra/addons/noise/NoiseAddon.java  |  7 ----
 .../config/NoiseSamplerBuilderLoader.java     | 38 -------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/NoiseSamplerBuilderLoader.java

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 68420f7c0..0af3b2782 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
@@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise;
 
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.NoiseSamplerBuilderLoader;
 import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
 import com.dfsek.terra.addons.noise.config.templates.ImageSamplerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.KernelTemplate;
@@ -59,14 +58,8 @@ public class NoiseAddon extends TerraAddon implements EventListener {
     public void packPreLoad(ConfigPackPreLoadEvent event) {
         CheckedRegistry<Supplier<ObjectTemplate<NoiseSampler>>> noiseRegistry = event.getPack().getOrCreateRegistry(NOISE_SAMPLER_TOKEN);
         event.getPack()
-                .applyLoader(NoiseSampler.class, new NoiseSamplerBuilderLoader(noiseRegistry))
-                .applyLoader(ImageSamplerTemplate.class, ImageSamplerTemplate::new)
                 .applyLoader(CellularSampler.DistanceFunction.class, (t, o, l) -> CellularSampler.DistanceFunction.valueOf((String) o))
                 .applyLoader(CellularSampler.ReturnType.class, (t, o, l) -> CellularSampler.ReturnType.valueOf((String) o))
-                .applyLoader(DomainWarpTemplate.class, DomainWarpTemplate::new)
-                .applyLoader(LinearNormalizerTemplate.class, LinearNormalizerTemplate::new)
-                .applyLoader(NormalNormalizerTemplate.class, NormalNormalizerTemplate::new)
-                .applyLoader(ClampNormalizerTemplate.class, ClampNormalizerTemplate::new)
                 .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new);
 
         noiseRegistry.register("LINEAR", LinearNormalizerTemplate::new);
diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/NoiseSamplerBuilderLoader.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/NoiseSamplerBuilderLoader.java
deleted file mode 100644
index 8d057043e..000000000
--- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/NoiseSamplerBuilderLoader.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.dfsek.terra.addons.noise.config;
-
-import com.dfsek.tectonic.config.MapConfiguration;
-import com.dfsek.tectonic.exception.ConfigException;
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.registry.Registry;
-
-import java.lang.reflect.AnnotatedType;
-import java.util.Map;
-import java.util.function.Supplier;
-
-@SuppressWarnings("unchecked")
-public class NoiseSamplerBuilderLoader implements TypeLoader<NoiseSampler> {
-    private final Registry<Supplier<ObjectTemplate<NoiseSampler>>> noiseRegistry;
-
-    public NoiseSamplerBuilderLoader(Registry<Supplier<ObjectTemplate<NoiseSampler>>> noiseRegistry) {
-        this.noiseRegistry = noiseRegistry;
-    }
-
-    @Override
-    public NoiseSampler load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException {
-        Map<String, Object> map = (Map<String, Object>) c;
-        try {
-            if(!noiseRegistry.contains((String) map.get("type"))) {
-                throw new LoadException("No such noise function: " + map.get("type"));
-            }
-            ObjectTemplate<NoiseSampler> normalizerTemplate = noiseRegistry.get(((String) map.get("type"))).get();
-            loader.load(normalizerTemplate, new MapConfiguration(map));
-            return normalizerTemplate.get();
-        } catch(ConfigException e) {
-            throw new LoadException("Unable to load noise function: ", e);
-        }
-    }
-}