diff --git a/common/addons/chunk-generator-layer/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/LayeredChunkGenerator.java b/common/addons/chunk-generator-layer/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/LayeredChunkGenerator.java index 676b63fbe..c51c26254 100644 --- a/common/addons/chunk-generator-layer/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/LayeredChunkGenerator.java +++ b/common/addons/chunk-generator-layer/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/LayeredChunkGenerator.java @@ -3,6 +3,7 @@ package com.dfsek.terra.addons.chunkgenerator.layer; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.math.Sampler; 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.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; @@ -21,7 +22,7 @@ public class LayeredChunkGenerator implements ChunkGenerator { } @Override - public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth) { + public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) { return null; } diff --git 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 index 18245f232..7cbd46d77 100644 --- 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 @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.generators; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.WritableWorld; import net.jafama.FastMath; @@ -99,7 +100,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { } @Override - public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth) { + public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) { return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth); } diff --git 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 index fb56f3627..e4f716306 100644 --- 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 @@ -8,6 +8,8 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.World; + import net.jafama.FastMath; import java.util.HashMap; @@ -39,7 +41,7 @@ public class ChunkInterpolator3D implements ChunkInterpolator { * @param chunkZ Z coordinate of the chunk. * @param provider Biome Provider to use for biome fetching. */ - public ChunkInterpolator3D(ServerWorld w, int chunkX, int chunkZ, BiomeProvider provider, + public ChunkInterpolator3D(World w, int chunkX, int chunkZ, BiomeProvider provider, BiFunction noiseGetter) { this.noiseGetter = noiseGetter; int xOrigin = chunkX << 4; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java index 85f1c3ed9..9fd501ea6 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -15,7 +16,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class ElevationInterpolator { private final double[][] values = new double[18][18]; - public ElevationInterpolator(ServerWorld world, int chunkX, int chunkZ, BiomeProvider provider, int smooth) { + public ElevationInterpolator(World world, int chunkX, int chunkZ, BiomeProvider provider, int smooth) { int xOrigin = chunkX << 4; int zOrigin = chunkZ << 4; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java index 104fb7d55..662a1240a 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java @@ -8,6 +8,8 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.World; + import net.jafama.FastMath; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D; @@ -20,7 +22,7 @@ public class Sampler3D implements Sampler { private final ChunkInterpolator3D interpolator; private final ElevationInterpolator elevationInterpolator; - public Sampler3D(int x, int z, BiomeProvider provider, ServerWorld world, int elevationSmooth) { + public Sampler3D(int x, int z, BiomeProvider provider, World world, int elevationSmooth) { this.interpolator = new ChunkInterpolator3D(world, x, z, provider, (generator, coord) -> generator.getBaseSampler() .noise(coord, world.getSeed())); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java index 27a0e0798..ae75c0675 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java @@ -19,16 +19,6 @@ import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider; public interface WorldConfig extends StringIdentifiable { int elevationBlend(); - boolean disableTrees(); - - boolean disableCarving(); - - boolean disableOres(); - - boolean disableFlora(); - - boolean disableStructures(); - Registry getRegistry(Class clazz); ServerWorld getWorld(); @@ -39,11 +29,5 @@ public interface WorldConfig extends StringIdentifiable { ConfigPack getPack(); - String getAuthor(); - - String getVersion(); - Map getLocatable(); - - boolean isDisableSaplings(); } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index 0989ec36b..eb2ea3807 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -7,6 +7,8 @@ package com.dfsek.terra.api.world.chunk.generation; +import com.dfsek.terra.api.world.World; + import org.jetbrains.annotations.NotNull; import java.util.List; @@ -24,7 +26,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; public interface ChunkGenerator { void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world, int chunkZ, int chunkX); - Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth); + Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth); List getGenerationStages(); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java index 3e0b8ba08..84f8461d6 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java @@ -57,31 +57,6 @@ public class WorldConfigImpl implements WorldConfig { return pack.getTemplate().getElevationBlend(); } - @Override - public boolean disableTrees() { - return pack.getTemplate().disableTrees(); - } - - @Override - public boolean disableCarving() { - return pack.getTemplate().disableCarvers(); - } - - @Override - public boolean disableOres() { - return pack.getTemplate().disableOres(); - } - - @Override - public boolean disableFlora() { - return pack.getTemplate().disableFlora(); - } - - @Override - public boolean disableStructures() { - return pack.getTemplate().disableStructures(); - } - @Override @SuppressWarnings("unchecked") public Registry getRegistry(Class clazz) { @@ -108,26 +83,11 @@ public class WorldConfigImpl implements WorldConfig { return pack; } - @Override - public String getAuthor() { - return pack.getAuthor(); - } - - @Override - public String getVersion() { - return pack.getVersion(); - } - @Override public Map getLocatable() { return pack.getLocatable(); } - @Override - public boolean isDisableSaplings() { - return getTemplate().isDisableSaplings(); - } - @Override public String getID() { return pack.getID();