finish refactoring world api

2026-04-17 13:49:57 +00:00 · 2021-11-28 16:51:04 -07:00
parent 6b9dfc5d43
commit 397c464fb2
47 changed files with 60 additions and 70 deletions
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/BiomePaletteTemplate.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/BiomePaletteTemplate.java
@@ -15,7 +15,7 @@ import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java
@@ -20,7 +20,7 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
+import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;


 public class NoiseChunkGenerator3DAddon implements AddonInitializer {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java
@@ -12,7 +12,7 @@ import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.util.math.Sampler;
 import com.dfsek.terra.api.world.biome.GenerationSettings;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public final class PaletteUtil {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
@@ -30,7 +30,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class NoiseChunkGenerator3D implements ChunkGenerator {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java
@@ -18,7 +18,7 @@ import com.dfsek.terra.api.util.mutable.MutableInteger;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.biome.GenerationSettings;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generator.ChunkInterpolator;
+import com.dfsek.terra.api.world.chunk.generation.util.math.ChunkInterpolator;


 /**
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java
@@ -18,7 +18,7 @@ import com.dfsek.terra.api.util.mutable.MutableInteger;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.biome.GenerationSettings;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generator.ChunkInterpolator;
+import com.dfsek.terra.api.world.chunk.generation.util.math.ChunkInterpolator;


 /**
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java
@@ -7,7 +7,7 @@

 package com.dfsek.terra.addons.chunkgenerator.palette;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolder {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolderBuilder.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolderBuilder.java
@@ -12,7 +12,7 @@ import net.jafama.FastMath;
 import java.util.Map;
 import java.util.TreeMap;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolderBuilder {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolderLoader.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolderLoader.java
@@ -15,7 +15,7 @@ import java.lang.reflect.AnnotatedType;
 import java.util.List;
 import java.util.Map;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolderLoader implements TypeLoader<PaletteHolder> {
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteInfo.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteInfo.java
@@ -8,7 +8,7 @@
 package com.dfsek.terra.addons.chunkgenerator.palette;

 import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteInfo implements Properties {
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
@@ -28,7 +28,7 @@ import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


@SuppressWarnings({ "FieldMayBeFinal", "unused" })
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java
@@ -9,7 +9,7 @@ package com.dfsek.terra.addons.biome;

 import com.dfsek.terra.addons.biome.holder.PaletteHolder;
 import com.dfsek.terra.api.world.biome.PaletteSettings;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteSettingsImpl implements PaletteSettings {
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java
@@ -7,7 +7,7 @@

 package com.dfsek.terra.addons.biome.holder;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolder {
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java
@@ -12,7 +12,7 @@ import net.jafama.FastMath;
 import java.util.Map;
 import java.util.TreeMap;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolderBuilder {
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java
@@ -15,7 +15,7 @@ import java.lang.reflect.AnnotatedType;
 import java.util.List;
 import java.util.Map;

-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteHolderLoader implements TypeLoader<PaletteHolder> {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.feature.locator.locators;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class Noise3DLocator implements Locator {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java
@@ -14,7 +14,7 @@ import java.util.List;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class NoiseLocator implements Locator {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java
@@ -11,7 +11,7 @@ import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class PatternLocator implements Locator {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java
@@ -12,7 +12,7 @@ import java.util.Random;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class RandomLocator implements Locator {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.feature.locator.locators;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class SurfaceLocator implements Locator {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java
@@ -11,7 +11,7 @@ import java.util.function.Predicate;

 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public class MatchPattern implements Pattern {
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java
@@ -7,7 +7,7 @@

 package com.dfsek.terra.addons.feature.locator.patterns;

-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;


 public interface Pattern {
--- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java
+++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java
@@ -13,7 +13,6 @@ import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.world.generator.GenerationStageProvider;


 public class OreAddon implements AddonInitializer {
--- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
+++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java
@@ -19,7 +19,7 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
--- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java
+++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java
@@ -11,7 +11,7 @@ import com.dfsek.terra.addons.palette.palette.NoisePalette;
 import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 public class PaletteFactory implements ConfigFactory<PaletteTemplate, Palette> {
--- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java
+++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java
@@ -13,7 +13,7 @@ import java.util.List;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;


 /**
--- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java
+++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java
@@ -11,7 +11,7 @@ import java.util.function.IntConsumer;

 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
-import com.dfsek.terra.api.world.access.Column;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;
 import com.dfsek.terra.api.world.WritableWorld;


--- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java
+++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java
@@ -16,7 +16,7 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.generator.GenerationStageProvider;
+import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider;


 public class FeatureGenerationAddon implements AddonInitializer {
--- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java
+++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java
@@ -9,7 +9,7 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.generator.GenerationStageProvider;
+import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider;


 public class StructureGenerationAddon implements AddonInitializer {
--- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java
+++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java
@@ -23,7 +23,7 @@ import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.util.vector.Vector2;
 import com.dfsek.terra.api.util.vector.Vector3;
-import com.dfsek.terra.api.world.generator.SamplerCache;
+import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;


 public class CheckFunction implements Function<String> {
@@ -72,7 +72,7 @@ public class CheckFunction implements Function<String> {
    private String apply(Vector3 vector, WritableWorld world) {
        int y = vector.getBlockY();
        if(y >= world.getMaxHeight() || y < 0) return "AIR";
-        SamplerCache cache = world.getConfig().getSamplerCache();
+        SamplerProvider cache = world.getConfig().getSamplerCache();
        double comp = sample(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ(), cache);
        
        if(comp > 0) return "LAND"; // If noise val is greater than zero, location will always be land.
@@ -85,7 +85,7 @@ public class CheckFunction implements Function<String> {
        //return "OCEAN"; // Below sea level
    }
    
-    private double sample(int x, int y, int z, SamplerCache cache) {
+    private double sample(int x, int y, int z, SamplerProvider cache) {
        int cx = FastMath.floorDiv(x, 16);
        int cz = FastMath.floorDiv(z, 16);
        return cache.get(x, z).sample(x - (cx << 4), y, z - (cz << 4));