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 0445f307d..fa09c72de 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 @@ -22,7 +22,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.math.Sampler; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git 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 index bb177ede1..896950450 100644 --- 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 @@ -15,7 +15,7 @@ import java.util.function.BiFunction; import com.dfsek.terra.api.util.mutable.MutableInteger; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; 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; 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 86e5150d5..2ca8cccf5 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 @@ -15,7 +15,7 @@ import java.util.function.BiFunction; import com.dfsek.terra.api.util.mutable.MutableInteger; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; 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; 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 7c47ca6fb..1ea90d62a 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 @@ -7,7 +7,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; 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 43af843d9..084bfb8de 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 @@ -12,7 +12,7 @@ import net.jafama.FastMath; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator; import com.dfsek.terra.api.util.math.Sampler; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java index 9d7453789..4d2240cbc 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java @@ -13,7 +13,7 @@ import java.util.function.Consumer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java index a67770463..f382dbff3 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java @@ -22,7 +22,7 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java index 2fd7350a6..4f35ab687 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java @@ -22,7 +22,7 @@ import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.generation.stage.Chunkified; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java index a31670b03..dddb5be80 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java @@ -25,7 +25,7 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.ConstantRange; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class UserDefinedCarver extends Carver { diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java index c8405d9a0..9cf9ef9a0 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java @@ -13,7 +13,7 @@ import java.util.Random; import java.util.function.BiConsumer; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public abstract class Carver { diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java index fd75c0098..e3057cca9 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java @@ -13,7 +13,7 @@ import java.util.Random; import java.util.function.BiConsumer; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public abstract class Worm { diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java index 43af9ade3..ac3d72801 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.structure.feature.Distributor; import com.dfsek.terra.api.structure.feature.Feature; import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class ConfiguredFeature implements Feature { diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java index a77879319..ed5b64a44 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java @@ -25,7 +25,7 @@ import com.dfsek.terra.api.util.collection.MaterialSet; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class TerraFlora implements Structure { diff --git 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 index 3ad2a980b..f780f60fd 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public class Noise3DLocator implements Locator { diff --git 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 index c52dff2a3..4cd1edc10 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public class NoiseLocator implements Locator { diff --git 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 index a37e59103..c434d2569 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public class PatternLocator implements Locator { diff --git 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 index e78a620e2..4bca34591 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public class RandomLocator implements Locator { diff --git 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 index 6e244f55f..32767a6fe 100644 --- 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 @@ -7,12 +7,10 @@ package com.dfsek.terra.addons.feature.locator.locators; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.block.state.BlockState; 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.Column; +import com.dfsek.terra.api.world.access.Column; public class SurfaceLocator implements Locator { diff --git 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 index 6a661cfc2..3db4d0ca3 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public class MatchPattern implements Pattern { diff --git 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 index a7b18d2f4..797180629 100644 --- 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.Column; +import com.dfsek.terra.api.world.access.Column; public interface Pattern { diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java index 27fe53506..0b463c32f 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java @@ -16,7 +16,7 @@ import java.util.Random; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java index 75a280a2c..3c8ca43dc 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.stage.Chunkified; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java index 6422cdcf2..eb22950cb 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java @@ -14,7 +14,7 @@ import java.util.function.Consumer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git 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 index cd0231c0b..142319227 100644 --- 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,8 +11,8 @@ 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.Column; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.Column; +import com.dfsek.terra.api.world.access.World; public class ColumnImpl implements Column { diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java index 900fcfa19..3642b6af4 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java index bdbfab94b..551b51c28 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.generation.structure; import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java index c1641efa4..1042b2137 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java @@ -20,7 +20,7 @@ import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.integer.Vector2Int; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class SpongeStructure implements Structure { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java index 1f3e5f9b3..29eaf65f2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java @@ -11,7 +11,7 @@ import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class IntermediateBuffer implements Buffer { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java index 10ab76097..b803fa620 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class BufferedEntity implements BufferedItem { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java index e9b62e4b7..15a8fe03b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java index 2871c0b43..cd8e2037a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.terrascript.buffer.items; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class BufferedPulledBlock implements BufferedItem { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java index 625f9d9af..cee8148b3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java @@ -7,11 +7,10 @@ package com.dfsek.terra.addons.terrascript.buffer.items; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 95f8ddacd..52dda0578 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -51,7 +51,7 @@ import com.dfsek.terra.api.structure.buffer.buffers.StructureBuffer; import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java index c594fd5ce..bcdef551f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java @@ -12,7 +12,7 @@ import java.util.Random; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.util.Rotation; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class TerraImplementationArguments implements ImplementationArguments { diff --git 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 index 4a59428f5..1d506371a 100644 --- 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 @@ -21,7 +21,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.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.generator.SamplerCache; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 1313b6046..ed76ce93c 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.tectonic.LoaderHolder; import com.dfsek.terra.api.tectonic.LoaderRegistrar; import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider; import com.dfsek.terra.api.world.generator.GenerationStageProvider; 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 49b6ae5c2..485026516 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 @@ -11,7 +11,7 @@ import java.util.Map; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.util.StringIdentifiable; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.SamplerCache; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java index 6eec4b072..0ffd5c0fa 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java @@ -8,7 +8,7 @@ package com.dfsek.terra.api.entity; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public interface Entity extends CommandSender { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java index 4013b54e9..3f36eaa3b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public interface Structure extends StringIdentifiable { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java index 3aff916ce..9f28df8d3 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java @@ -9,7 +9,7 @@ package com.dfsek.terra.api.structure.buffer; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.ApiStatus.Experimental; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java index e757c04b9..50be5e9f9 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java @@ -8,7 +8,7 @@ package com.dfsek.terra.api.structure.buffer; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.ApiStatus.Experimental; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java index 4097bf114..37a88dbd7 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.ApiStatus.Experimental; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java index 162ae9fba..b4d5643c8 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.items.Cell; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.ApiStatus.Experimental; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java index 9bf4b388f..e078a3372 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java @@ -16,7 +16,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; @Experimental public class BufferedBlock implements BufferedItem { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java index 8ac958586..1940b3320 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java @@ -12,7 +12,7 @@ import java.util.List; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.ApiStatus.Experimental; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java index d3b7b1968..ecd258031 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java @@ -8,7 +8,7 @@ package com.dfsek.terra.api.structure.feature; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public interface Feature { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java index f87c4db8d..09f0e10d9 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java @@ -7,7 +7,7 @@ package com.dfsek.terra.api.structure.feature; -import com.dfsek.terra.api.world.Column; +import com.dfsek.terra.api.world.access.Column; public interface Locator { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java index 747b04cd0..1ba4bc0db 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java @@ -8,6 +8,7 @@ package com.dfsek.terra.api.world; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.ChunkAccess; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java index b6f83c574..45fc8abe5 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java @@ -11,6 +11,7 @@ import java.util.List; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.Chunk; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/Column.java similarity index 94% rename from common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/access/Column.java index 7e3396284..b91dbd664 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/Column.java @@ -5,7 +5,7 @@ * reference the LICENSE file in the common/api directory. */ -package com.dfsek.terra.api.world; +package com.dfsek.terra.api.world.access; import java.util.function.IntConsumer; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/World.java similarity index 84% rename from common/api/core/src/main/java/com/dfsek/terra/api/world/World.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/access/World.java index f8d856b58..a8a6e180d 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/World.java @@ -5,11 +5,8 @@ * reference the LICENSE file in the common/api directory. */ -package com.dfsek.terra.api.world; +package com.dfsek.terra.api.world.access; -import com.dfsek.terra.api.Handle; -import com.dfsek.terra.api.block.entity.BlockEntity; -import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/WorldAccess.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/WorldAccess.java similarity index 96% rename from common/api/core/src/main/java/com/dfsek/terra/api/world/WorldAccess.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/access/WorldAccess.java index 06a0496ba..64d030d7f 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/WorldAccess.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/access/WorldAccess.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.world; +package com.dfsek.terra.api.world.access; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.block.entity.BlockEntity; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java index 047740521..48e7abf85 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java @@ -9,7 +9,7 @@ package com.dfsek.terra.api.world.chunk; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import org.jetbrains.annotations.NotNull; 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 d4c79eea2..1d641e2c1 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 @@ -21,7 +21,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java index 6467899e4..3bfd8c249 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.world.chunk.generation; -import com.dfsek.terra.api.world.WorldAccess; +import com.dfsek.terra.api.world.access.WorldAccess; public interface ProtoWorld extends WorldAccess { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java index 0a55b914c..25b0ebc9b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java @@ -8,7 +8,7 @@ package com.dfsek.terra.api.world.chunk.generation.stage; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public interface GenerationStage { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java index 7864c73a5..d74cdc93c 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java @@ -24,7 +24,7 @@ import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index f40ae7585..658cd0fdc 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -73,7 +73,7 @@ import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.api.registry.meta.RegistryFactory; import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.api.util.reflection.ReflectionUtil; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider; import com.dfsek.terra.api.world.generator.GenerationStageProvider; 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 540148744..717ece2ab 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 @@ -25,7 +25,7 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.SamplerCache; import com.dfsek.terra.registry.LockedRegistryImpl; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java index e49912144..69657f660 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java @@ -28,7 +28,7 @@ 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; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class SamplerCacheImpl implements SamplerCache { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java index fd8b0ad13..b7fa34bb4 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java @@ -21,7 +21,7 @@ import org.bukkit.Location; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index 6a9850282..58392146e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -21,7 +21,7 @@ import org.bukkit.Location; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index d78f9ef74..35773a5b7 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -29,7 +29,7 @@ import java.util.Random; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.profiler.ProfileFrame; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.api.world.chunk.generation.stage.Chunkified; import com.dfsek.terra.bukkit.PlatformImpl; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 01acb04ca..466ceaed1 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -36,7 +36,7 @@ import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.BukkitPlayer; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java index bba482ffb..12485aef0 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java @@ -22,7 +22,7 @@ import com.dfsek.terra.api.world.chunk.Chunk; import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; public class BukkitChunk implements Chunk { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java index 288ef5856..ceb77d38b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java @@ -27,7 +27,7 @@ import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.bukkit.BukkitEntity; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 71a7bdfd7..8773b1a83 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -54,7 +54,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; 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.Chunkified; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java index 2844e161f..2d03837f8 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java @@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.fabric.block.FabricBlockState; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java index 4d92c438a..15cde57e6 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java @@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.fabric.block.FabricBlockState; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java index 45573c0be..5c99d9d67 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java @@ -30,7 +30,7 @@ import org.spongepowered.asm.mixin.Shadow; import java.util.UUID; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.fabric.util.FabricAdapter; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java index 0cc8b3ae7..93de53eab 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java @@ -47,7 +47,7 @@ import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.fabric.block.FabricBlockState; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java index 4f5cb6d79..011c09f1b 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java @@ -49,7 +49,7 @@ import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.access.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.fabric.block.FabricBlockState;