begin tectonic update process

This commit is contained in:
dfsek
2021-07-13 15:23:28 -07:00
parent 27d9716c5d
commit 0dfde174ad
22 changed files with 63 additions and 116 deletions
@@ -1,6 +1,6 @@
package com.dfsek.terra.addons.noise.config;
import com.dfsek.tectonic.config.Configuration;
import com.dfsek.tectonic.config.MapConfiguration;
import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
@@ -10,7 +10,7 @@ import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.seeded.NoiseProvider;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import java.lang.reflect.Type;
import java.lang.reflect.AnnotatedType;
import java.util.Locale;
import java.util.Map;
@@ -23,14 +23,14 @@ public class NoiseSamplerBuilderLoader implements TypeLoader<NoiseSeeded> {
}
@Override
public NoiseSeeded load(Type t, Object c, ConfigLoader loader) throws LoadException {
public NoiseSeeded 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<NoiseSeeded> normalizerTemplate = noiseRegistry.get(((String) map.get("type")).toUpperCase(Locale.ROOT)).get();
loader.load(normalizerTemplate, new Configuration(map));
loader.load(normalizerTemplate, new MapConfiguration(map));
return normalizerTemplate.get();
} catch(ConfigException e) {
throw new LoadException("Unable to load noise function: ", e);