World unwrap

core/src/main/java/com/boydti/fawe/Fawe.java

@@ -98,6 +98,7 @@ import com.sk89q.worldedit.function.visitor.RecursiveVisitor;
 import com.sk89q.worldedit.function.visitor.RegionVisitor;
 import com.sk89q.worldedit.history.change.EntityCreate;
 import com.sk89q.worldedit.history.change.EntityRemove;
+import com.sk89q.worldedit.internal.LocalWorldAdapter;
 import com.sk89q.worldedit.math.convolution.HeightMap;
 import com.sk89q.worldedit.math.interpolation.KochanekBartelsInterpolation;
 import com.sk89q.worldedit.math.transform.AffineTransform;
@@ -445,6 +446,7 @@ public class Fawe {
             BlockTransformExtent.inject(); // Fix for cache not being mutable
             AbstractDelegateExtent.inject(); // Optimizations
             BlockBagExtent.inject(); // Fixes + Optimizations
+            LocalWorldAdapter.inject();
             // Vector
             BlockWorldVector.inject(); // Optimizations
             BlockVector.inject(); // Optimizations

core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java

@@ -18,11 +18,11 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.internal.LocalWorldAdapter;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TreeGenerator;
-import com.sk89q.worldedit.world.AbstractWorld;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 import com.sk89q.worldedit.world.registry.WorldData;
@@ -31,9 +31,9 @@ import javax.annotation.Nullable;
 
 public class WorldWrapper extends LocalWorld {
 
-    private final AbstractWorld parent;
+    private final World parent;
 
-    public static WorldWrapper wrap(AbstractWorld world) {
+    public static WorldWrapper wrap(World world) {
         if (world == null) {
             return null;
         }
@@ -45,16 +45,19 @@ public class WorldWrapper extends LocalWorld {
 
     public static World unwrap(World world) {
         if (world instanceof WorldWrapper) {
-            return ((WorldWrapper) world).getParent();
+            return unwrap(((WorldWrapper) world).getParent());
+        }
+        if (world instanceof LocalWorldAdapter) {
+            return unwrap(LocalWorldAdapter.unwrap(world));
         }
         return world;
     }
 
-    private WorldWrapper(AbstractWorld parent) {
+    private WorldWrapper(World parent) {
         this.parent = parent;
     }
 
-    public AbstractWorld getParent() {
+    public World getParent() {
         return parent instanceof WorldWrapper ? ((WorldWrapper) parent).getParent() : parent;
     }
 

core/src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java

@@ -0,0 +1,281 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.internal;
+
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalWorld;
+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.entity.BaseEntity;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.TreeGenerator.TreeType;
+import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.registry.WorldData;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Wraps {@link World}s into {@link LocalWorld}.
+ */
+@SuppressWarnings("deprecation")
+public class LocalWorldAdapter extends LocalWorld {
+
+    private final World world;
+
+    private LocalWorldAdapter(World world) {
+        checkNotNull(world);
+        this.world = world;
+    }
+
+    @Override
+    public String getName() {
+        return world.getName();
+    }
+
+    @Override
+    public int getMaxY() {
+        return world.getMaxY();
+    }
+
+    @Override
+    public boolean isValidBlockType(int id) {
+        return world.isValidBlockType(id);
+    }
+
+    @Override
+    public boolean usesBlockData(int id) {
+        return world.usesBlockData(id);
+    }
+
+    @Override
+    public Mask createLiquidMask() {
+        return world.createLiquidMask();
+    }
+
+    @Override
+    @Deprecated
+    public int getBlockType(Vector pt) {
+        return world.getBlockType(pt);
+    }
+
+    @Override
+    @Deprecated
+    public int getBlockData(Vector pt) {
+        return world.getBlockData(pt);
+    }
+
+    @Override
+    public boolean setBlock(Vector position, BaseBlock block, boolean notifyAndLight) throws WorldEditException {
+        return world.setBlock(position, block, notifyAndLight);
+    }
+
+    @Override
+    public int getBlockLightLevel(Vector position) {
+        return world.getBlockLightLevel(position);
+    }
+
+    @Override
+    public boolean clearContainerBlockContents(Vector position) {
+        return world.clearContainerBlockContents(position);
+    }
+
+    @Override
+    public BaseBiome getBiome(Vector2D position) {
+        return world.getBiome(position);
+    }
+
+    @Override
+    public boolean setBiome(Vector2D position, BaseBiome biome) {
+        return world.setBiome(position, biome);
+    }
+
+    @Override
+    public void dropItem(Vector position, BaseItemStack item, int count) {
+        world.dropItem(position, item, count);
+    }
+
+    @Override
+    public void dropItem(Vector position, BaseItemStack item) {
+        world.dropItem(position, item);
+    }
+
+    @Override
+    public void simulateBlockMine(Vector position) {
+        world.simulateBlockMine(position);
+    }
+
+    @Override
+    public boolean regenerate(Region region, EditSession editSession) {
+        return world.regenerate(region, editSession);
+    }
+
+    @Override
+    public boolean generateTree(TreeType type, EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateTree(type, editSession, position);
+    }
+
+    @Override
+    @Deprecated
+    public boolean generateTree(EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateTree(editSession, position);
+    }
+
+    @Override
+    @Deprecated
+    public boolean generateBigTree(EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateBigTree(editSession, position);
+    }
+
+    @Override
+    @Deprecated
+    public boolean generateBirchTree(EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateBirchTree(editSession, position);
+    }
+
+    @Override
+    @Deprecated
+    public boolean generateRedwoodTree(EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateRedwoodTree(editSession, position);
+    }
+
+    @Override
+    @Deprecated
+    public boolean generateTallRedwoodTree(EditSession editSession, Vector position) throws MaxChangedBlocksException {
+        return world.generateTallRedwoodTree(editSession, position);
+    }
+
+    @Override
+    public void checkLoadedChunk(Vector position) {
+        world.checkLoadedChunk(position);
+    }
+
+    @Override
+    public void fixAfterFastMode(Iterable<BlockVector2D> chunks) {
+        world.fixAfterFastMode(chunks);
+    }
+
+    @Override
+    public void fixLighting(Iterable<BlockVector2D> chunks) {
+        world.fixLighting(chunks);
+    }
+
+    @Override
+    public boolean playEffect(Vector position, int type, int data) {
+        return world.playEffect(position, type, data);
+    }
+
+    @Override
+    public boolean queueBlockBreakEffect(Platform server, Vector position, int blockId, double priority) {
+        return world.queueBlockBreakEffect(server, position, blockId, priority);
+    }
+
+    @Override
+    public WorldData getWorldData() {
+        return world.getWorldData();
+    }
+
+    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
+    @Override
+    public boolean equals(Object other) {
+        return world.equals(other);
+    }
+
+    @Override
+    public int hashCode() {
+        return world.hashCode();
+    }
+
+    @Override
+    public Vector getMinimumPoint() {
+        return world.getMinimumPoint();
+    }
+
+    @Override
+    public Vector getMaximumPoint() {
+        return world.getMaximumPoint();
+    }
+
+    @Override
+    public List<? extends Entity> getEntities(Region region) {
+        return world.getEntities(region);
+    }
+
+    @Override
+    public BaseBlock getBlock(Vector position) {
+        return world.getBlock(position);
+    }
+
+    @Override
+    public BaseBlock getLazyBlock(Vector position) {
+        return world.getLazyBlock(position);
+    }
+
+    @Override
+    @Nullable
+    public Operation commit() {
+        return world.commit();
+    }
+
+    @Override
+    @Nullable
+    public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
+        return world.createEntity(location, entity);
+    }
+
+    @Override
+    public List<? extends Entity> getEntities() {
+        return world.getEntities();
+    }
+
+    public static LocalWorldAdapter adapt(World world) {
+        return new LocalWorldAdapter(world);
+    }
+
+    public static LocalWorld wrap(World world) {
+        if (world instanceof LocalWorld) {
+            return (LocalWorld) world;
+        }
+        return new LocalWorldAdapter(world);
+    }
+
+    public static World unwrap(World world) {
+        if (world instanceof LocalWorldAdapter) {
+            return ((LocalWorldAdapter) world).world;
+        }
+        return world;
+    }
+
+    public static Class<?> inject() {
+        return LocalWorldAdapter.class;
+    }
+}