Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-03 11:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted API over to use new World.

Browse Source 
This breaks backwards compatibility for all getWorld() methods, but
shim methods were added for binary compatibility with method calls that
use LocalWorld.
This commit is contained in:
sk89q
2014-04-05 02:59:38 -07:00
parent 63a2ca824d
commit 24f8fbc92a
49 changed files with 827 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java
View File

@ -19,12 +19,12 @@
package com.sk89q.worldedit.extent.inventory;
import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;
import java.util.HashMap;
@ -37,7 +37,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class BlockBagExtent extends AbstractDelegateExtent {
private final LocalWorld world;
private Map<Integer, Integer> missingBlocks = new HashMap<Integer, Integer>();
private BlockBag blockBag;
@ -48,10 +47,8 @@ public class BlockBagExtent extends AbstractDelegateExtent {
* @param world the world
* @param blockBag the block bag
*/
public BlockBagExtent(Extent extent, LocalWorld world, @Nullable BlockBag blockBag) {
public BlockBagExtent(Extent extent, @Nullable BlockBag blockBag) {
super(extent);
checkNotNull(world);
this.world = world;
this.blockBag = blockBag;
}

6
src/main/java/com/sk89q/worldedit/extent/validation/DataValidatorExtent.java
View File

@ -19,12 +19,12 @@
package com.sk89q.worldedit.extent.validation;
import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
@ -33,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class DataValidatorExtent extends AbstractDelegateExtent {
private final LocalWorld world;
private final World world;
/**
* Create a new instance.
@ -41,7 +41,7 @@ public class DataValidatorExtent extends AbstractDelegateExtent {
* @param extent the extent
* @param world the world
*/
public DataValidatorExtent(Extent extent, LocalWorld world) {
public DataValidatorExtent(Extent extent, World world) {
super(extent);
checkNotNull(world);
this.world = world;

6
src/main/java/com/sk89q/worldedit/extent/world/BlockQuirkExtent.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit.extent.world;
import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
@ -27,6 +26,7 @@ import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
@ -36,7 +36,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class BlockQuirkExtent extends AbstractDelegateExtent {
private final LocalWorld world;
private final World world;
/**
* Create a new instance.
@ -44,7 +44,7 @@ public class BlockQuirkExtent extends AbstractDelegateExtent {
* @param extent the extent
* @param world the world
*/
public BlockQuirkExtent(Extent extent, LocalWorld world) {
public BlockQuirkExtent(Extent extent, World world) {
super(extent);
checkNotNull(world);
this.world = world;

8
src/main/java/com/sk89q/worldedit/extent/world/ChunkLoadingExtent.java
View File

@ -19,12 +19,12 @@
package com.sk89q.worldedit.extent.world;
import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
@ -33,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class ChunkLoadingExtent extends AbstractDelegateExtent {
private final LocalWorld world;
private final World world;
private boolean enabled;
/**
@ -43,7 +43,7 @@ public class ChunkLoadingExtent extends AbstractDelegateExtent {
* @param world the world
* @param enabled true to enable
*/
public ChunkLoadingExtent(Extent extent, LocalWorld world, boolean enabled) {
public ChunkLoadingExtent(Extent extent, World world, boolean enabled) {
super(extent);
checkNotNull(world);
this.enabled = enabled;
@ -56,7 +56,7 @@ public class ChunkLoadingExtent extends AbstractDelegateExtent {
* @param extent the extent
* @param world the world
*/
public ChunkLoadingExtent(Extent extent, LocalWorld world) {
public ChunkLoadingExtent(Extent extent, World world) {
this(extent, world, true);
}

8
src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java
View File

@ -20,13 +20,13 @@
package com.sk89q.worldedit.extent.world;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.RunContext;
import com.sk89q.worldedit.world.World;
import java.util.HashSet;
import java.util.Set;
@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class FastModeExtent extends AbstractDelegateExtent {
private final LocalWorld world;
private final World world;
private final Set<BlockVector2D> dirtyChunks = new HashSet<BlockVector2D>();
private boolean enabled = true;
@ -47,7 +47,7 @@ public class FastModeExtent extends AbstractDelegateExtent {
*
* @param world the world
*/
public FastModeExtent(LocalWorld world) {
public FastModeExtent(World world) {
this(world, true);
}
@ -57,7 +57,7 @@ public class FastModeExtent extends AbstractDelegateExtent {
* @param world the world
* @param enabled true to enable fast mode
*/
public FastModeExtent(LocalWorld world, boolean enabled) {
public FastModeExtent(World world, boolean enabled) {
super(world);
checkNotNull(world);
this.world = world;