mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-16 22:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

worldaccess -> WritableWorld

Browse Source
This commit is contained in:
dfsek
2021-11-28 16:32:59 -07:00
parent 27f472dd57
commit 402ac166ff
23 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java
+4 -4
View File
@@ -13,14 +13,14 @@ 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.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.chunk.Chunk;
public interface Structure extends StringIdentifiable {
boolean generate(Vector3 location, WorldAccess world, Chunk chunk, Random random, Rotation rotation);
boolean generate(Vector3 location, WritableWorld world, Chunk chunk, Random random, Rotation rotation);
boolean generate(Buffer buffer, WorldAccess world, Random random, Rotation rotation, int recursions);
boolean generate(Buffer buffer, WritableWorld world, Random random, Rotation rotation, int recursions);
boolean generate(Vector3 location, WorldAccess world, Random random, Rotation rotation);
boolean generate(Vector3 location, WritableWorld world, Random random, Rotation rotation);
}
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java
+2 -2
View File
@@ -9,12 +9,12 @@ package com.dfsek.terra.api.structure.buffer;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.access.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
@Experimental
public interface BufferedItem {
void paste(Vector3 origin, WorldAccess world);
void paste(Vector3 origin, WritableWorld world);
}
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java
+3 -3
View File
@@ -13,7 +13,7 @@ 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.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.chunk.Chunk;
import com.dfsek.terra.api.world.access.World;
@@ -26,10 +26,10 @@ import org.jetbrains.annotations.ApiStatus.Experimental;
@Experimental
public class DirectBuffer implements Buffer {
private final Vector3 origin;
private final WorldAccess target;
private final WritableWorld target;
private final Map<Vector3, String> marks = new LinkedHashMap<>();
public DirectBuffer(Vector3 origin, WorldAccess target) {
public DirectBuffer(Vector3 origin, WritableWorld target) {
this.origin = origin;
this.target = target;
}
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java
+2 -2
View File
@@ -7,7 +7,7 @@
package com.dfsek.terra.api.structure.buffer.items;
import com.dfsek.terra.api.world.access.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class BufferedBlock implements BufferedItem {
}
@Override
public void paste(Vector3 origin, WorldAccess world) {
public void paste(Vector3 origin, WritableWorld world) {
try {
BlockState current = world.getBlockData(origin);
if(overwrite || current.isAir()) {
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java
+2 -2
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.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
@@ -24,7 +24,7 @@ public class Cell implements BufferedItem {
private String mark;
@Override
public void paste(Vector3 origin, WorldAccess world) {
public void paste(Vector3 origin, WritableWorld world) {
items.forEach(item -> item.paste(origin.clone(), world));
}
common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java
+2 -3
View File
@@ -8,12 +8,11 @@
package com.dfsek.terra.api.structure.feature;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.world.access.World;
import com.dfsek.terra.api.world.access.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
public interface Feature {
Structure getStructure(WorldAccess world, int x, int y, int z);
Structure getStructure(WritableWorld world, int x, int y, int z);
Distributor getDistributor();
common/api/core/src/main/java/com/dfsek/terra/api/world/access/Column.java
+1 -1
View File
@@ -16,7 +16,7 @@ import com.dfsek.terra.api.structure.feature.BinaryColumn;
/**
* A single vertical column of a world.
*/
public interface Column<T extends WorldAccess> {
public interface Column<T extends WritableWorld> {
int getX();
int getZ();
common/api/core/src/main/java/com/dfsek/terra/api/world/access/World.java
+1 -6
View File
@@ -7,16 +7,11 @@
package com.dfsek.terra.api.world.access;
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.Chunk;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
public interface World extends WorldAccess {
public interface World extends WritableWorld {
Chunk getChunkAt(int x, int z);
default Chunk getChunkAt(Vector3 location) {
common/api/core/src/main/java/com/dfsek/terra/api/world/access/WorldAccess.java → common/api/core/src/main/java/com/dfsek/terra/api/world/access/WritableWorld.java
+1 -1
View File
@@ -11,7 +11,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
public interface WorldAccess extends Handle {
public interface WritableWorld extends Handle {
default void setBlockData(Vector3 position, BlockState data, boolean physics) {
setBlockData(position.getBlockX(), position.getBlockY(), position.getBlockZ(), data, physics);
}
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java
+2 -2
View File
@@ -9,7 +9,7 @@ package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.util.vector.integer.Vector3Int;
import com.dfsek.terra.api.world.access.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
import org.jetbrains.annotations.NotNull;
@@ -26,7 +26,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public interface ChunkGenerator {
void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WorldAccess world,
void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world,
int chunkZ, int chunkX);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java
+2 -2
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.world.access.World;
import com.dfsek.terra.api.world.access.WorldAccess;
import com.dfsek.terra.api.world.access.WritableWorld;
public interface ProtoWorld extends WorldAccess {
public interface ProtoWorld extends WritableWorld {
int centerChunkX();
int centerChunkZ();