mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-13 03:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

World -> ServerWorld

Browse Source
This commit is contained in:
dfsek
2021-11-28 16:36:29 -07:00
parent da34aeed42
commit 4287ff8a3c
37 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
View File

@@ -21,14 +21,14 @@ 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.World;
import com.dfsek.terra.api.world.access.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;
public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolder, StringIdentifiable {
WorldConfig toWorldConfig(World world);
WorldConfig toWorldConfig(ServerWorld world);
void registerConfigType(ConfigType<?, ?> type, String id, int priority);

4
common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java
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.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.SamplerCache;
@@ -31,7 +31,7 @@ public interface WorldConfig extends StringIdentifiable {
<T> Registry<T> getRegistry(Class<T> clazz);
World getWorld();
ServerWorld getWorld();
SamplerCache getSamplerCache();

6
common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java
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.World;
import com.dfsek.terra.api.world.access.ServerWorld;
public interface Entity extends CommandSender {
@@ -16,7 +16,7 @@ public interface Entity extends CommandSender {
void position(Vector3 position);
void world(World world);
void world(ServerWorld world);
World world();
ServerWorld world();
}

4
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java
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.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.ApiStatus.Experimental;
public interface Buffer {
void paste(Vector3 origin, Chunk chunk);
void paste(Vector3 origin, World world);
void paste(Vector3 origin, ServerWorld world);
Buffer addItem(BufferedItem item, Vector3 location);

4
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java
View File

@@ -15,7 +15,7 @@ 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.chunk.Chunk;
import com.dfsek.terra.api.world.access.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import org.jetbrains.annotations.ApiStatus.Experimental;
@@ -40,7 +40,7 @@ public class DirectBuffer implements Buffer {
}
@Override
public void paste(Vector3 origin, World world) {
public void paste(Vector3 origin, ServerWorld world) {
// no-op
}

5
common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java
View File

@@ -7,6 +7,8 @@
package com.dfsek.terra.api.structure.buffer.buffers;
import com.dfsek.terra.api.world.access.ServerWorld;
import net.jafama.FastMath;
import java.util.LinkedHashMap;
@@ -17,7 +19,6 @@ 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.access.World;
import org.jetbrains.annotations.ApiStatus.Experimental;
@@ -41,7 +42,7 @@ public class StructureBuffer implements Buffer {
}));
}
public void paste(Vector3 origin, World world) {
public void paste(Vector3 origin, ServerWorld world) {
bufferedItemMap.forEach(((vector3, item) -> item.paste(origin.clone().add(vector3), world)));
}

4
common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java
View File

@@ -8,10 +8,10 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.world.access.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.chunk.ChunkAccess;
public interface Carver {
void carve(World world, int chunkX, int chunkZ, ChunkAccess chunk);
void carve(ServerWorld world, int chunkX, int chunkZ, ChunkAccess chunk);
}

4
common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java
View File

@@ -11,12 +11,12 @@ 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.access.ServerWorld;
import com.dfsek.terra.api.world.chunk.Chunk;
public interface Flora {
boolean plant(Vector3 l, World world);
boolean plant(Vector3 l, ServerWorld world);
List<Vector3> getValidSpawnsAt(Chunk chunk, int x, int z, Range check);
}

2
common/api/core/src/main/java/com/dfsek/terra/api/world/access/World.java → common/api/core/src/main/java/com/dfsek/terra/api/world/access/ServerWorld.java
View File

@@ -11,7 +11,7 @@ import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.world.chunk.Chunk;
public interface World extends WritableWorld {
public interface ServerWorld extends WritableWorld {
Chunk getChunkAt(int x, int z);
default Chunk getChunkAt(Vector3 location) {

4
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java
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.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import org.jetbrains.annotations.NotNull;
@@ -27,5 +27,5 @@ public interface Chunk extends ChunkAccess {
int getZ();
World getWorld();
ServerWorld getWorld();
}

10
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java
View File

@@ -9,6 +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.ServerWorld;
import com.dfsek.terra.api.world.access.WritableWorld;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
@@ -21,14 +22,13 @@ 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.access.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public interface ChunkGenerator {
void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world,
int chunkZ, int chunkX);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, ServerWorld world, int elevationSmooth);
ConfigPack getConfigPack();
@@ -36,13 +36,13 @@ public interface ChunkGenerator {
List<GenerationStage> getGenerationStages();
BlockState getBlock(World world, int x, int y, int z);
BlockState getBlock(ServerWorld world, int x, int y, int z);
default BlockState getBlock(World world, Vector3 vector3) {
default BlockState getBlock(ServerWorld world, Vector3 vector3) {
return getBlock(world, vector3.getBlockX(), vector3.getBlockY(), vector3.getBlockZ());
}
default BlockState getBlock(World world, Vector3Int vector3) {
default BlockState getBlock(ServerWorld world, Vector3Int vector3) {
return getBlock(world, vector3.getX(), vector3.getY(), vector3.getZ());
}
}

4
common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.api.world.chunk.generation;
import com.dfsek.terra.api.world.access.World;
import com.dfsek.terra.api.world.access.ServerWorld;
import com.dfsek.terra.api.world.access.WritableWorld;
@@ -15,5 +15,5 @@ public interface ProtoWorld extends WritableWorld {
* <b>Do not read from/write to this world!</b>
* @return The world
*/
World getWorld();
ServerWorld getWorld();
}