From 798e04a64480fc762d2699fd4a5bb9189136e68d Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 19 Feb 2020 13:44:39 -0500 Subject: [PATCH] Remove DelegateClipboard --- .../object/clipboard/DelegateClipboard.java | 164 ------------------ .../extent/clipboard/BlockArrayClipboard.java | 25 ++- 2 files changed, 20 insertions(+), 169 deletions(-) delete mode 100644 worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DelegateClipboard.java diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DelegateClipboard.java b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DelegateClipboard.java deleted file mode 100644 index 61b83b29d..000000000 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DelegateClipboard.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.boydti.fawe.object.clipboard; - -import com.sk89q.jnbt.CompoundTag; -import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.entity.BaseEntity; -import com.sk89q.worldedit.entity.Entity; -import com.sk89q.worldedit.extent.clipboard.Clipboard; -import com.sk89q.worldedit.math.BlockVector2; -import com.sk89q.worldedit.math.BlockVector3; -import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.util.Location; -import com.sk89q.worldedit.world.biome.BiomeType; -import com.sk89q.worldedit.world.block.BaseBlock; -import com.sk89q.worldedit.world.block.BlockState; -import com.sk89q.worldedit.world.block.BlockStateHolder; - -import javax.annotation.Nullable; -import java.net.URI; -import java.util.List; -import java.util.UUID; - -public class DelegateClipboard implements Clipboard { - private final Clipboard parent; - - public DelegateClipboard(Clipboard parent) { - this.parent = parent; - } - - public Clipboard getParent() { - return parent; - } - - @Override - public URI getURI() { - return parent.getURI(); - } - - @Override - public void setOrigin(BlockVector3 offset) { - parent.setOrigin(offset); - } - - @Override - public BlockVector3 getDimensions() { - return parent.getDimensions(); - } - - @Override - public Region getRegion() { - return parent.getRegion(); - } - - @Override - public BlockVector3 getOrigin() { - return parent.getOrigin(); - } - - @Override - public boolean hasBiomes() { - return parent.hasBiomes(); - } - - @Override - public void removeEntity(Entity entity) { - parent.removeEntity(entity); - } - - @Override - public BlockVector3 getMinimumPoint() { - return parent.getMinimumPoint(); - } - - @Override - public BlockVector3 getMaximumPoint() { - return parent.getMaximumPoint(); - } - - @Override - public List getEntities(Region region) { - return parent.getEntities(region); - } - - @Override - public List getEntities() { - return parent.getEntities(); - } - - @Override - @Nullable - public Entity createEntity(Location location, BaseEntity entity) { - return parent.createEntity(location, entity); - } - - @Override - public void removeEntity(int x, int y, int z, UUID uuid) { - parent.removeEntity(x, y, z, uuid); - } - - @Override - public boolean isWorld() { - return parent.isWorld(); - } - - @Override - public BlockState getBlock(BlockVector3 position) { - return parent.getBlock(position); - } - - @Override - public BlockState getBlock(int x, int y, int z) { - return parent.getBlock(x, y, z); - } - - @Override - public BaseBlock getFullBlock(BlockVector3 position) { - return parent.getFullBlock(position); - } - - @Override - public BaseBlock getFullBlock(int x, int y, int z) { - return parent.getFullBlock(x, y, z); - } - - @Override - public BiomeType getBiome(BlockVector2 position) { - return parent.getBiome(position); - } - - @Override - public BiomeType getBiomeType(int x, int y, int z) { - return parent.getBiomeType(x, y, z); - } - - @Override - @Deprecated - public > boolean setBlock(BlockVector3 position, T block) throws WorldEditException { - return parent.setBlock(position, block); - } - - @Override - public > boolean setBlock(int x, int y, int z, T block) throws WorldEditException { - return parent.setBlock(x, y, z, block); - } - - @Override - public boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException { - return parent.setTile(x, y, z, tile); - } - - @Override - public boolean setBiome(BlockVector2 position, BiomeType biome) { - return parent.setBiome(position, biome); - } - - @Override - public boolean setBiome(int x, int y, int z, BiomeType biome) { - return parent.setBiome(x, y, z, biome); - } - - @Override - public void close() { - parent.close(); - } -} diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java index 600253738..b03d6d124 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java @@ -19,7 +19,6 @@ package com.sk89q.worldedit.extent.clipboard; -import com.boydti.fawe.object.clipboard.DelegateClipboard; import com.google.common.collect.Iterators; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.WorldEditException; @@ -51,17 +50,18 @@ import static com.google.common.base.Preconditions.checkNotNull; * Stores block data as a multi-dimensional array of {@link BlockState}s and * other data as lists or maps. */ -public class BlockArrayClipboard extends DelegateClipboard implements Clipboard { +public class BlockArrayClipboard implements Clipboard { private final Region region; private final BlockVector3 origin; + private final Clipboard parent; public BlockArrayClipboard(Region region) { this(region, UUID.randomUUID()); } public BlockArrayClipboard(Clipboard clipboard, BlockVector3 offset) { - super(clipboard); + this.parent = clipboard; Region shifted = clipboard.getRegion(); shifted.shift(offset); this.region = shifted; @@ -80,8 +80,9 @@ public class BlockArrayClipboard extends DelegateClipboard implements Clipboard } public BlockArrayClipboard(Region region, Clipboard clipboard) { - super(clipboard); + checkNotNull(clipboard); checkNotNull(region); + this.parent = clipboard; this.region = region; this.origin = region.getMinimumPoint(); } @@ -163,7 +164,7 @@ public class BlockArrayClipboard extends DelegateClipboard implements Clipboard x -= origin.getX(); y -= origin.getY(); z -= origin.getZ(); - return getParent().setBlock(x, y, z, block); + return parent.setBlock(x, y, z, block); } @Override @@ -256,6 +257,20 @@ public class BlockArrayClipboard extends DelegateClipboard implements Clipboard return Iterators.transform(getParent().iterator(order), mutable::init); } + @Override + public BlockVector3 getDimensions() { + return this.parent.getDimensions(); + } + + @Override + public void removeEntity(Entity entity) { + this.parent.removeEntity(entity); + } + + public Clipboard getParent() { + return parent; + } + /** * Stores entity data. */