refactor world classes

This commit is contained in:
dfsek
2021-11-28 16:43:27 -07:00
parent b882e5e62b
commit 6b9dfc5d43
54 changed files with 59 additions and 64 deletions

View File

@@ -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.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
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;

View File

@@ -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.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.SamplerCache;

View File

@@ -8,7 +8,7 @@
package com.dfsek.terra.api.entity;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
public interface Entity extends CommandSender {

View File

@@ -13,7 +13,7 @@ import com.dfsek.terra.api.structure.buffer.Buffer;
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.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.chunk.Chunk;

View File

@@ -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.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;

View File

@@ -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.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;

View File

@@ -13,9 +13,9 @@ import java.util.Map;
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.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.chunk.Chunk;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;

View File

@@ -7,7 +7,7 @@
package com.dfsek.terra.api.structure.buffer.buffers;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
import net.jafama.FastMath;

View File

@@ -7,7 +7,7 @@
package com.dfsek.terra.api.structure.buffer.items;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
import org.slf4j.Logger;

View File

@@ -13,7 +13,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.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;

View File

@@ -8,7 +8,7 @@
package com.dfsek.terra.api.structure.feature;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.WritableWorld;
public interface Feature {

View File

@@ -1,6 +1,5 @@
package com.dfsek.terra.api.world.access;
package com.dfsek.terra.api.world;
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.util.vector.Vector3;

View File

@@ -5,7 +5,7 @@
* reference the LICENSE file in the common/api directory.
*/
package com.dfsek.terra.api.world.access;
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.chunk.Chunk;

View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.world.access;
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.config.WorldConfig;

View File

@@ -1,14 +1,9 @@
package com.dfsek.terra.api.world.access;
package com.dfsek.terra.api.world;
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;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
public interface WritableWorld extends ReadableWorld {

View File

@@ -11,6 +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.WritableWorld;
/**

View File

@@ -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.access.ServerWorld;
import com.dfsek.terra.api.world.ServerWorld;
import org.jetbrains.annotations.NotNull;

View File

@@ -9,8 +9,8 @@ package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.util.vector.integer.Vector3Int;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.WritableWorld;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.WritableWorld;
public interface ProtoWorld extends WritableWorld {