From bd0e20e8a78154b93dd73d08c4546fe71fc39d0d Mon Sep 17 00:00:00 2001 From: sk89q Date: Thu, 10 Jul 2014 02:58:04 -0700 Subject: [PATCH] Have Extent.createEntity() take a Vector rather than a Location. --- .../java/com/sk89q/worldedit/bukkit/BukkitWorld.java | 2 +- .../java/com/sk89q/worldedit/forge/ForgeWorld.java | 3 +-- src/main/java/com/sk89q/worldedit/EditSession.java | 4 ++-- .../worldedit/extent/AbstractDelegateExtent.java | 6 ++---- src/main/java/com/sk89q/worldedit/extent/Extent.java | 5 ++--- .../java/com/sk89q/worldedit/extent/NullExtent.java | 3 +-- .../extent/clipboard/BlockArrayClipboard.java | 4 ++-- .../sk89q/worldedit/internal/LocalWorldAdapter.java | 4 ++-- .../java/com/sk89q/worldedit/world/NullWorld.java | 11 ++++++++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 72a774ede..3a02fb266 100644 --- a/src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -233,7 +233,7 @@ public class BukkitWorld extends LocalWorld { @Nullable @Override - public com.sk89q.worldedit.entity.Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) { + public com.sk89q.worldedit.entity.Entity createEntity(Vector position, BaseEntity entity) { throw new UnsupportedOperationException("Not implemented yet"); } diff --git a/src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java b/src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java index 5087799a7..ad826f6c4 100644 --- a/src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java +++ b/src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java @@ -33,7 +33,6 @@ import com.sk89q.worldedit.blocks.LazyBlock; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.world.AbstractWorld; import com.sk89q.worldedit.world.registry.LegacyWorldData; @@ -510,7 +509,7 @@ public class ForgeWorld extends AbstractWorld { @Nullable @Override - public Entity createEntity(Location location, BaseEntity entity) { + public Entity createEntity(Vector position, BaseEntity entity) { World world = getWorld(); net.minecraft.entity.Entity createdEntity = EntityList.createEntityByName(entity.getTypeId(), world); if (createdEntity != null) { diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java index 7ad6b867f..1de0cfcd9 100644 --- a/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/src/main/java/com/sk89q/worldedit/EditSession.java @@ -589,8 +589,8 @@ public class EditSession implements Extent { @Override @Nullable - public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) { - return world.createEntity(location, entity); + public Entity createEntity(Vector position, BaseEntity entity) { + return world.createEntity(position, entity); } /** diff --git a/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java b/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java index 666c33872..445eeeebc 100644 --- a/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java +++ b/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java @@ -26,10 +26,8 @@ import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.OperationQueue; -import com.sk89q.worldedit.util.Location; import javax.annotation.Nullable; - import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; @@ -77,8 +75,8 @@ public abstract class AbstractDelegateExtent implements Extent { @Override @Nullable - public Entity createEntity(Location location, BaseEntity entity) { - return extent.createEntity(location, entity); + public Entity createEntity(Vector position, BaseEntity entity) { + return extent.createEntity(position, entity); } @Override diff --git a/src/main/java/com/sk89q/worldedit/extent/Extent.java b/src/main/java/com/sk89q/worldedit/extent/Extent.java index 14bacb425..2048ca007 100644 --- a/src/main/java/com/sk89q/worldedit/extent/Extent.java +++ b/src/main/java/com/sk89q/worldedit/extent/Extent.java @@ -22,7 +22,6 @@ package com.sk89q.worldedit.extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; -import com.sk89q.worldedit.util.Location; import javax.annotation.Nullable; import java.util.List; @@ -70,10 +69,10 @@ public interface Extent extends InputExtent, OutputExtent { /** * Create an entity at the given location. * + * @param position the position * @param entity the entity - * @param location the location * @return a reference to the created entity, or null if the entity could not be created */ - @Nullable Entity createEntity(Location location, BaseEntity entity); + @Nullable Entity createEntity(Vector position, BaseEntity entity); } diff --git a/src/main/java/com/sk89q/worldedit/extent/NullExtent.java b/src/main/java/com/sk89q/worldedit/extent/NullExtent.java index 5f8f84644..a24f4cf48 100644 --- a/src/main/java/com/sk89q/worldedit/extent/NullExtent.java +++ b/src/main/java/com/sk89q/worldedit/extent/NullExtent.java @@ -25,7 +25,6 @@ import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.function.operation.Operation; -import com.sk89q.worldedit.util.Location; import javax.annotation.Nullable; import java.util.Collections; @@ -56,7 +55,7 @@ public class NullExtent implements Extent { @Nullable @Override - public Entity createEntity(Location location, BaseEntity entity) { + public Entity createEntity(Vector position, BaseEntity entity) { return null; } diff --git a/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java index 5c40d42e2..29a66372a 100644 --- a/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java +++ b/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java @@ -99,8 +99,8 @@ public class BlockArrayClipboard implements Clipboard { @Nullable @Override - public Entity createEntity(Location location, BaseEntity entity) { - ClipboardEntity ret = new ClipboardEntity(location, entity); + public Entity createEntity(Vector position, BaseEntity entity) { + ClipboardEntity ret = new ClipboardEntity(new Location(this, position), entity); entities.add(ret); return ret; } diff --git a/src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java b/src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java index dd04767b5..30e7e00db 100644 --- a/src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java +++ b/src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java @@ -330,8 +330,8 @@ public class LocalWorldAdapter extends LocalWorld { @Override @Nullable - public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) { - return world.createEntity(location, entity); + public Entity createEntity(Vector position, BaseEntity entity) { + return world.createEntity(position, entity); } @Override diff --git a/src/main/java/com/sk89q/worldedit/world/NullWorld.java b/src/main/java/com/sk89q/worldedit/world/NullWorld.java index 937ba9c3b..b65aecd98 100644 --- a/src/main/java/com/sk89q/worldedit/world/NullWorld.java +++ b/src/main/java/com/sk89q/worldedit/world/NullWorld.java @@ -19,14 +19,19 @@ package com.sk89q.worldedit.world; -import com.sk89q.worldedit.*; +import com.sk89q.worldedit.BiomeType; +import com.sk89q.worldedit.EditSession; +import com.sk89q.worldedit.EntityType; +import com.sk89q.worldedit.MaxChangedBlocksException; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldedit.Vector2D; +import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.blocks.BlockID; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.WorldData; @@ -116,7 +121,7 @@ public class NullWorld extends AbstractWorld { @Nullable @Override - public Entity createEntity(Location location, BaseEntity entity) { + public Entity createEntity(Vector position, BaseEntity entity) { return null; } }