fix some more compilation issues

worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java

@@ -30,6 +30,7 @@ import com.sk89q.worldedit.extent.buffer.ForgetfulExtentBuffer;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.operation.OperationQueue;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -116,9 +117,14 @@ public class AbstractDelegateExtent implements Extent, LightingExtent {
         }
     }
 
+    @Override
+    public World getWorld() {
+        return getExtent().getWorld();
+    }
+
     /*
-    Bounds
-     */
+        Bounds
+         */
     @Override
     public BlockVector3 getMinimumPoint() {
         return extent.getMinimumPoint();

worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java

@@ -52,6 +52,7 @@ import com.sk89q.worldedit.registry.state.PropertyGroup;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.util.Countable;
 import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -496,23 +497,11 @@ public interface Extent extends InputExtent, OutputExtent {
         checkNotNull(block);
         boolean hasNbt = block instanceof BaseBlock && ((BaseBlock)block).hasNbtData();
 
-        if (canBypassAll(region, false, true) && !hasNbt) {
-            return changes = queue.setBlocks((CuboidRegion) region, block.getInternalId());
-        }
-        try {
-            if (hasExtraExtents()) {
-                RegionVisitor visitor = new RegionVisitor(region, new BlockReplace(getExtent(), (block)), this);
-                Operations.completeBlindly(visitor);
-                this.changes += visitor.getAffected();
-            } else {
-                for (BlockVector3 blockVector3 : region) {
-                    if (getExtent().setBlock(blockVector3, block)) {
-                        changes++;
-                    }
-                }
+        int changes = 0;
+        for (BlockVector3 pos : region) {
+            if (setBlock(pos, block)) {
+                changes++;
             }
-        } catch (final WorldEditException e) {
-            throw new RuntimeException("Unexpected exception", e);
         }
         return changes;
     }
@@ -534,10 +523,13 @@ public interface Extent extends InputExtent, OutputExtent {
         if (pattern instanceof BlockStateHolder) {
             return setBlocks(region, (BlockStateHolder) pattern);
         }
-        BlockReplace replace = new BlockReplace(this, pattern);
-        RegionVisitor visitor = new RegionVisitor(region, replace, queue instanceof MappedIQueueExtent ? (MappedIQueueExtent) queue : null);
-        Operations.completeBlindly(visitor);
-        return this.changes = visitor.getAffected();
+        int count = 0;
+        for (BlockVector3 pos : region) {
+            if (pattern.apply(this, pos, pos)) {
+                count++;
+            }
+        }
+        return count;
     }
 
     /**
@@ -616,9 +608,20 @@ public interface Extent extends InputExtent, OutputExtent {
     }
 
     default int setBlocks(final Set<BlockVector3> vset, final Pattern pattern) {
-        RegionVisitor visitor = new RegionVisitor(vset, new BlockReplace(getExtent(), pattern));
-        Operations.completeBlindly(visitor);
-        return 0;
+        if (vset instanceof Region) {
+            return setBlocks((Region) vset, pattern);
+        }
+        int count = 0;
+        for (BlockVector3 pos : vset) {
+            if (pattern.apply(this, pos, pos)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    default World getWorld() {
+        return null;
     }
 
 }

worldedit-core/src/main/java/com/sk89q/worldedit/extent/PassthroughExtent.java

@@ -1,177 +0,0 @@
-package com.sk89q.worldedit.extent;
-
-import com.boydti.fawe.jnbt.anvil.generator.GenBase;
-import com.boydti.fawe.jnbt.anvil.generator.Resource;
-import com.boydti.fawe.object.extent.LightingExtent;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.function.operation.Operation;
-import com.sk89q.worldedit.function.operation.OperationQueue;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.Countable;
-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 com.sk89q.worldedit.world.block.BlockType;
-
-import javax.annotation.Nullable;
-import java.util.List;
-
-public class PassthroughExtent extends AbstractDelegateExtent {
-    private final Extent extent;
-
-    public PassthroughExtent(Extent parent) {
-        super(parent);
-        this.extent = parent;
-    }
-
-    @Override
-    public List<? extends Entity> getEntities(Region region) {
-        return extent.getEntities(region);
-    }
-
-    @Override
-    public List<? extends Entity> getEntities() {
-        return extent.getEntities();
-    }
-
-    @Override
-    @Nullable
-    public Entity createEntity(Location location, BaseEntity entity) {
-        return extent.createEntity(location, entity);
-    }
-
-    @Override
-    public int getHighestTerrainBlock(int x, int z, int minY, int maxY) {
-        return extent.getHighestTerrainBlock(x, z, minY, maxY);
-    }
-
-    @Override
-    public int getHighestTerrainBlock(int x, int z, int minY, int maxY, Mask filter) {
-        return extent.getHighestTerrainBlock(x, z, minY, maxY, filter);
-    }
-
-    @Override
-    public int getNearestSurfaceLayer(int x, int z, int y, int minY, int maxY) {
-        return extent.getNearestSurfaceLayer(x, z, y, minY, maxY);
-    }
-
-    @Override
-    public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, boolean ignoreAir) {
-        return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, ignoreAir);
-    }
-
-    @Override
-    public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY) {
-        return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY);
-    }
-
-    @Override
-    public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax) {
-        return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax);
-    }
-
-    @Override
-    public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax, Mask mask) {
-        return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, mask);
-    }
-
-    @Override
-    public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax, boolean ignoreAir) {
-        return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, ignoreAir);
-    }
-
-    @Override
-    public void addCaves(Region region) throws WorldEditException {
-        extent.addCaves(region);
-    }
-
-    @Override
-    public void generate(Region region, GenBase gen) throws WorldEditException {
-        extent.generate(region, gen);
-    }
-
-    @Override
-    public void addSchems(Region region, Mask mask, List<ClipboardHolder> clipboards, int rarity, boolean rotate) throws WorldEditException {
-        extent.addSchems(region, mask, clipboards, rarity, rotate);
-    }
-
-    @Override
-    public void spawnResource(Region region, Resource gen, int rarity, int frequency) throws WorldEditException {
-        extent.spawnResource(region, gen, rarity, frequency);
-    }
-
-    @Override
-    public boolean contains(BlockVector3 pt) {
-        return extent.contains(pt);
-    }
-
-    @Override
-    public void addOre(Region region, Mask mask, Pattern material, int size, int frequency, int rarity, int minY, int maxY) throws WorldEditException {
-        extent.addOre(region, mask, material, size, frequency, rarity, minY, maxY);
-    }
-
-    @Override
-    public void addOres(Region region, Mask mask) throws WorldEditException {
-        extent.addOres(region, mask);
-    }
-
-    @Override
-    public List<Countable<BlockType>> getBlockDistribution(Region region) {
-        return extent.getBlockDistribution(region);
-    }
-
-    @Override
-    public List<Countable<BlockState>> getBlockDistributionWithData(Region region) {
-        return extent.getBlockDistributionWithData(region);
-    }
-
-    @Override
-    public BlockArrayClipboard lazyCopy(Region region) {
-        return extent.lazyCopy(region);
-    }
-
-    @Override
-    public BlockState getBlock(BlockVector3 position) {
-        return extent.getBlock(position);
-    }
-
-    @Override
-    public BlockType getBlockType(BlockVector3 position) {
-        return extent.getBlockType(position);
-    }
-
-    @Override
-    public BaseBlock getFullBlock(BlockVector3 position) {
-        return extent.getFullBlock(position);
-    }
-
-    @Override
-    public BiomeType getBiome(BlockVector2 position) {
-        return extent.getBiome(position);
-    }
-
-    @Override
-    public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 position, T block) throws WorldEditException {
-        return extent.setBlock(position, block);
-    }
-
-    @Override
-    public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block) throws WorldEditException {
-        return extent.setBlock(x, y, z, block);
-    }
-
-    @Override
-    public boolean setBiome(BlockVector2 position, BiomeType biome) {
-        return extent.setBiome(position, biome);
-    }
-}

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java

@@ -53,7 +53,7 @@ import java.util.UUID;
  * Stores block data as a multi-dimensional array of {@link BlockState}s and
  * other data as lists or maps.
  */
-public class BlockArrayClipboard implements Clipboard, LightingExtent, Closeable {
+public class BlockArrayClipboard implements Clipboard, Closeable {
 
 	private Region region;
     private BlockVector3 origin;
@@ -260,29 +260,4 @@ public class BlockArrayClipboard implements Clipboard, LightingExtent, Closeable
     public Operation commit() {
         return null;
     }
-
-    @Override
-    public int getLight(int x, int y, int z) {
-        return getBlockLight(x, y, z);
-    }
-
-    @Override
-    public int getSkyLight(int x, int y, int z) {
-        return 0;
-    }
-
-    @Override
-    public int getBlockLight(int x, int y, int z) {
-        return getBrightness(x, y, z);
-    }
-
-    @Override
-    public int getOpacity(int x, int y, int z) {
-        return getBlock(x, y, z).getBlockType().getMaterial().getLightOpacity();
-    }
-
-    @Override
-    public int getBrightness(int x, int y, int z) {
-        return getBlock(x, y, z).getBlockType().getMaterial().getLightValue();
-    }
 }