refactor world API

2026-04-17 13:49:57 +00:00 · 2021-11-27 17:15:20 -07:00
parent a30451597c
commit bf0ac5afe2
72 changed files with 73 additions and 77 deletions
--- 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;
--- 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;

--- 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 {
--- 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 {
--- 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;

--- 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;

--- 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;

--- 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;

--- 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 {
--- 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;

--- 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 {
--- 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 {
--- 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;


--- 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;


--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/access/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;

--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/access/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;
--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/access/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;
--- 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;

--- 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;


--- 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 {
--- 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 {