diff --git a/src/main/java/com/dfsek/terra/TerraWorld.java b/src/main/java/com/dfsek/terra/TerraWorld.java index 7ac2eb8bf..31acd97ee 100644 --- a/src/main/java/com/dfsek/terra/TerraWorld.java +++ b/src/main/java/com/dfsek/terra/TerraWorld.java @@ -38,7 +38,8 @@ public class TerraWorld { String partName = template.getGrids().get(i); try { BiomeGridBuilder g = config.getBiomeGrid(partName); - definedGrids[i] = g.build(w, worldConfig); + BiomeGrid b = g.build(w, worldConfig); + definedGrids[i] = b; } catch(NullPointerException e) { safe = false; Debug.stack(e); @@ -53,7 +54,8 @@ public class TerraWorld { if(template.isErode()) { try { BiomeGridBuilder g = Objects.requireNonNull(config.getBiomeGrid(erosionName)); - erosion = g.build(w, worldConfig); + BiomeGrid b = g.build(w, worldConfig); + erosion = b; } catch(NullPointerException e) { safe = false; Debug.stack(e); diff --git a/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java b/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java index 019e9ef1b..521934076 100644 --- a/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java +++ b/src/main/java/com/dfsek/terra/config/loaders/NoiseBuilderLoader.java @@ -5,6 +5,7 @@ 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.terra.Debug; import com.dfsek.terra.generation.config.NoiseBuilder; import org.polydev.gaea.math.FastNoiseLite; @@ -28,10 +29,14 @@ public class NoiseBuilderLoader implements TypeLoader { public NoiseBuilder load(Type type, Object o, ConfigLoader configLoader) throws LoadException { NoiseBuilder builder = new NoiseBuilder(); try { + Debug.info(o + ""); LOADER.load(builder, new Configuration((Map) o)); } catch(ConfigException e) { throw new LoadException("Could not load noise", e); } + Debug.info("FREQ: " + builder.getFrequency()); + Debug.info("FRAC: " + builder.getFractalType()); + Debug.info("OCT:" + builder.getOctaves()); return builder; } } diff --git a/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java b/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java index 6c47026c5..e8e957a43 100644 --- a/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java +++ b/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java @@ -10,7 +10,7 @@ public class NoiseBuilder implements ConfigTemplate { @Default private FastNoiseLite.NoiseType type = FastNoiseLite.NoiseType.OpenSimplex2; - @Value("octaves") + @Value("fractal.octaves") @Default private int octaves = 1;