Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-10-02 20:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a dynamic region mask

Browse Source
This commit is contained in:
aumgn 2012-03-21 10:15:29 +01:00 committed by zml2008
parent 84c1492b3f
commit eb14efd2df
11 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -686,6 +686,9 @@ public class LocalSession {
new EditSession(player.isPlayer() ? player.getWorld() : null,
getBlockChangeLimit(), blockBag);
editSession.setFastMode(fastMode);
if (mask != null) {
mask.prepare(this, player, null);
}
editSession.setMask(mask);
return editSession;

4
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -600,6 +600,10 @@ public class WorldEdit {
case '#':
if (component.equalsIgnoreCase("#existing")) {
return new ExistingBlockMask();
} else if (component.equalsIgnoreCase("#dregion")
|| component.equalsIgnoreCase("#dselection")
|| component.equalsIgnoreCase("#dsel")) {
return new DynamicRegionMask();
} else if (component.equalsIgnoreCase("#selection")
|| component.equalsIgnoreCase("#region")
|| component.equalsIgnoreCase("#sel")) {

5
src/main/java/com/sk89q/worldedit/masks/BiomeTypeMask.java
View File

@ -5,6 +5,8 @@ import java.util.Set;
import com.sk89q.worldedit.BiomeType;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
public class BiomeTypeMask implements Mask {
@ -19,6 +21,9 @@ public class BiomeTypeMask implements Mask {
this.biomes = biomes;
}
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
}
public boolean matches(EditSession editSession, Vector pos) {
BiomeType biome = editSession.getWorld().getBiome(pos.toVector2D());
return biomes.contains(biome);

5
src/main/java/com/sk89q/worldedit/masks/BlockTypeMask.java
View File

@ -22,6 +22,8 @@ package com.sk89q.worldedit.masks;
import java.util.HashSet;
import java.util.Set;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
/**
@ -49,6 +51,9 @@ public class BlockTypeMask implements Mask {
types.add(type);
}
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
}
public boolean matches(EditSession editSession, Vector pos) {
return types.contains(editSession.getBlockType(pos));
}

8
src/main/java/com/sk89q/worldedit/masks/CombinedMask.java
View File

@ -22,6 +22,8 @@ package com.sk89q.worldedit.masks;
import java.util.ArrayList;
import java.util.List;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
public class CombinedMask implements Mask {
@ -51,6 +53,12 @@ public class CombinedMask implements Mask {
return masks.contains(mask);
}
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
for (Mask mask : masks) {
mask.prepare(session, player, target);
}
}
public boolean matches(EditSession editSession, Vector pos) {
for (Mask mask : masks) {
if (!mask.matches(editSession, pos)) {

26
src/main/java/com/sk89q/worldedit/masks/DynamicRegionMask.java Normal file
View File

@ -0,0 +1,26 @@
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.IncompleteRegionException;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.regions.Region;
public class DynamicRegionMask implements Mask {
private Region region;
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
try {
region = session.getSelection(player.getWorld());
} catch (IncompleteRegionException exc) {
region = null;
}
}
@Override
public boolean matches(EditSession editSession, Vector pos) {
return region == null || region.contains(pos);
}
}

6
src/main/java/com/sk89q/worldedit/masks/ExistingBlockMask.java
View File

@ -20,10 +20,16 @@
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BlockID;
public class ExistingBlockMask implements Mask {
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
}
public boolean matches(EditSession editSession, Vector pos) {
return editSession.getBlockType(pos) != BlockID.AIR;
}

12
src/main/java/com/sk89q/worldedit/masks/Mask.java
View File

@ -20,6 +20,8 @@
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
/**
@ -29,6 +31,16 @@ import com.sk89q.worldedit.Vector;
* @author sk89q
*/
public interface Mask {
/**
* Called one time before each edit session.
*
* @param session
* @param player
* @param target target of the brush, null if not a brush mask
*/
public void prepare(LocalSession session, LocalPlayer player, Vector target);
/**
* Given a block position, this method returns true if the block at
* that position matches the filter. Block information is not provided

5
src/main/java/com/sk89q/worldedit/masks/RegionMask.java
View File

@ -20,6 +20,8 @@
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.regions.Region;
@ -31,6 +33,9 @@ public class RegionMask implements Mask {
this.region = region.clone();
}
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
}
public boolean matches(EditSession editSession, Vector pos) {
return region.contains(pos);
}

5
src/main/java/com/sk89q/worldedit/masks/UnderOverlayMask.java
View File

@ -23,6 +23,8 @@ import java.util.HashSet;
import java.util.Set;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BlockID;
@ -44,6 +46,9 @@ public class UnderOverlayMask implements Mask {
this.ids.addAll(ids);
}
public void prepare(LocalSession session, LocalPlayer player, Vector target) {
}
public boolean matches(EditSession editSession, Vector pos) {
int id = editSession.getBlock(pos.setY(pos.getBlockY() + (overlay ? -1 : 1))).getType();
return ids.isEmpty() ? id != BlockID.AIR : ids.contains(id);

1
src/main/java/com/sk89q/worldedit/tools/BrushTool.java
View File

@ -178,6 +178,7 @@ public class BrushTool implements TraceTool {
EditSession editSession = session.createEditSession(player);
if (mask != null) {
mask.prepare(session, player, target);
Mask existingMask = editSession.getMask();
if (existingMask == null) {
editSession.setMask(mask);