World -> ServerWorld

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.access.World;
+import com.dfsek.terra.api.world.access.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 
 
@@ -48,14 +48,14 @@ public class BukkitEntity implements Entity {
     }
     
     @Override
-    public void world(World world) {
+    public void world(ServerWorld world) {
         Location newLoc = entity.getLocation().clone();
         newLoc.setWorld(BukkitAdapter.adapt(world));
         entity.teleport(newLoc);
     }
     
     @Override
-    public World world() {
+    public ServerWorld world() {
         return BukkitAdapter.adapt(entity.getWorld());
     }
     

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.access.World;
+import com.dfsek.terra.api.world.access.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 
 
@@ -49,14 +49,14 @@ public class BukkitPlayer implements Player {
     }
     
     @Override
-    public void world(World world) {
+    public void world(ServerWorld world) {
         Location newLoc = delegate.getLocation().clone();
         newLoc.setWorld(BukkitAdapter.adapt(world));
         delegate.teleport(newLoc);
     }
     
     @Override
-    public World world() {
+    public ServerWorld world() {
         return BukkitAdapter.adapt(delegate.getWorld());
     }
     

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java

@@ -18,6 +18,8 @@
 package com.dfsek.terra.bukkit.world;
 
 
+import com.dfsek.terra.api.world.access.ServerWorld;
+
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.TreeType;
@@ -36,7 +38,6 @@ 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.access.World;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitEntity;
 import com.dfsek.terra.bukkit.BukkitPlayer;
@@ -173,11 +174,11 @@ public final class BukkitAdapter {
         return ((BukkitCommandSender) sender).getHandle();
     }
     
-    public static World adapt(org.bukkit.World world) {
-        return new BukkitWorld(world);
+    public static ServerWorld adapt(org.bukkit.World world) {
+        return new BukkitServerWorld(world);
     }
     
-    public static org.bukkit.World adapt(World world) {
+    public static org.bukkit.World adapt(ServerWorld world) {
         return (org.bukkit.World) world.getHandle();
     }
     

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.access.World;
+import com.dfsek.terra.api.world.access.ServerWorld;
 
 
 public class BukkitChunk implements Chunk {
@@ -63,7 +63,7 @@ public class BukkitChunk implements Chunk {
     }
     
     @Override
-    public World getWorld() {
+    public ServerWorld getWorld() {
         return BukkitAdapter.adapt(delegate.getWorld());
     }
 }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java

@@ -5,8 +5,7 @@ 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.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.chunk.generation.ChunkGenerator;
 import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
@@ -99,7 +98,7 @@ public class BukkitProtoWorld implements ProtoWorld {
     }
     
     @Override
-    public World getWorld() {
-        return new BukkitWorld(delegate.getWorld());
+    public ServerWorld getWorld() {
+        return new BukkitServerWorld(delegate.getWorld());
     }
 }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java

@@ -25,9 +25,8 @@ 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.access.ServerWorld;
 import com.dfsek.terra.api.world.chunk.Chunk;
-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;
@@ -38,10 +37,10 @@ import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 import org.bukkit.Location;
 
 
-public class BukkitWorld implements World {
+public class BukkitServerWorld implements ServerWorld {
     private final org.bukkit.World delegate;
     
-    public BukkitWorld(org.bukkit.World delegate) {
+    public BukkitServerWorld(org.bukkit.World delegate) {
         this.delegate = delegate;
     }
     
@@ -125,7 +124,7 @@ public class BukkitWorld implements World {
     
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof BukkitWorld other)) return false;
+        if(!(obj instanceof BukkitServerWorld other)) return false;
         return other.getHandle().equals(delegate);
     }