clean up chunkgenerator stuff

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.chunkgenerator;
 
+import com.dfsek.terra.addons.chunkgenerator.config.NoiseChunkGeneratorPackConfigTemplate;
 import com.dfsek.terra.addons.chunkgenerator.generation.generators.NoiseChunkGenerator3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderLoader;
@@ -36,12 +37,16 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                 .getHandler(FunctionalEventHandler.class)
                 .register(addon, ConfigPackPreLoadEvent.class)
                 .then(event -> {
-                    event.getPack().getOrCreateRegistry(ChunkGeneratorProvider.class).register("NOISE_3D",
-                                                                                               pack -> new NoiseChunkGenerator3D(pack,
-                                                                                                                                 platform));
+                    NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
+            
+                    event.getPack()
+                         .getOrCreateRegistry(ChunkGeneratorProvider.class)
+                         .register("NOISE_3D",
+                                   pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend()));
                     event.getPack()
                          .applyLoader(SlantHolder.class, new SlantHolderLoader())
                          .applyLoader(PaletteHolder.class, new PaletteHolderLoader());
+            
                 })
                 .failThrough();
         

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java

@@ -11,6 +11,8 @@ import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.WritableWorld;
 
+import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;
+
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
@@ -39,12 +41,17 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
     private final Platform platform;
     private final List<GenerationStage> generationStages = new ArrayList<>();
     
+    private final int elevationBlend;
+    
+    private final SamplerProvider samplerCache;
+    
     private final BlockState air;
     
-    public NoiseChunkGenerator3D(ConfigPack c, Platform platform) {
+    public NoiseChunkGenerator3D(ConfigPack c, Platform platform, int elevationBlend) {
         this.configPack = c;
         this.platform = platform;
         this.air = platform.getWorldHandle().air();
+        this.elevationBlend = elevationBlend;
         c.getStages().forEach(stage -> generationStages.add(stage.newInstance(c)));
     }
     
@@ -59,7 +66,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
             int xOrig = (chunkX << 4);
             int zOrig = (chunkZ << 4);
             
-            Sampler sampler = world.getConfig().getSamplerCache().getChunk(chunkX, chunkZ);
+            Sampler sampler = samplerCache.getChunk(chunkX, chunkZ);
             
             long seed = world.getSeed();
             

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProviderImpl.java

@@ -0,0 +1,62 @@
+/*
+ * This file is part of Terra.
+ *
+ * Terra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Terra is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
+
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import net.jafama.FastMath;
+import org.jetbrains.annotations.NotNull;
+
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.util.MathUtil;
+import com.dfsek.terra.api.util.math.Sampler;
+
+
+public class SamplerProviderImpl implements SamplerProvider {
+    private final LoadingCache<Long, Sampler> cache;
+    
+    public SamplerProviderImpl(Platform platform, ServerWorld world) {
+        cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getSamplerCache())
+                            .build(new CacheLoader<>() {
+                                @Override
+                                public Sampler load(@NotNull Long key) {
+                                    int cx = (int) (key >> 32);
+                                    int cz = (int) key.longValue();
+                                    return world.getGenerator().createSampler(cx, cz, world.getBiomeProvider(), world,
+                                                                              world.getConfig().elevationBlend());
+                                }
+                            });
+    }
+    
+    @Override
+    public Sampler get(int x, int z) {
+        int cx = FastMath.floorDiv(x, 16);
+        int cz = FastMath.floorDiv(z, 16);
+        return getChunk(cx, cz);
+    }
+    
+    @Override
+    public Sampler getChunk(int cx, int cz) {
+        long key = MathUtil.squash(cx, cz);
+        return cache.getUnchecked(key);
+    }
+}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java

@@ -109,8 +109,7 @@ public class NoiseAddon implements AddonInitializer {
                   noiseRegistry.register("EXPRESSION", () -> new ExpressionFunctionTemplate(packSamplers, packFunctions));
             
             
-                  NoiseConfigPackTemplate template = new NoiseConfigPackTemplate();
-                  event.loadTemplate(template);
+                  NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate());
                   packSamplers.putAll(template.getSamplers());
                   packFunctions.putAll(template.getFunctions());
               })