Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-10-02 17:07:42 +02:00
Code Issues Projects Releases Wiki Activity

Clean up the brush class

Browse Source
This commit is contained in:
Jesse Boyd 2017-01-08 23:53:46 +11:00
parent 1f83319c8f
commit c0cbe8b4cd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/boydti/fawe/object/brush/CommandBrush.java
View File

@ -20,12 +20,10 @@ import com.sk89q.worldedit.util.Location;
public class CommandBrush implements Brush { public class CommandBrush implements Brush {
private final String command; private final String command;
private final Player player;
private final int radius; private final int radius;
private final BrushTool tool; private final BrushTool tool;
public CommandBrush(Player player, BrushTool tool, String command, double radius) { public CommandBrush(BrushTool tool, String command, double radius) {
this.player = player;
this.command = command; this.command = command;
this.radius = (int) radius; this.radius = (int) radius;
this.tool = tool; this.tool = tool;
@ -40,13 +38,14 @@ public class CommandBrush implements Brush {
.replace("{world}", editSession.getQueue().getWorldName()) .replace("{world}", editSession.getQueue().getWorldName())
.replace("{size}", radius + ""); .replace("{size}", radius + "");
FawePlayer fp = editSession.getPlayer();
Player player = fp.getPlayer();
WorldVectorFace face = player.getBlockTraceFace(256, true); WorldVectorFace face = player.getBlockTraceFace(256, true);
if (face == null) { if (face == null) {
position = position.add(0, 1, 1); position = position.add(0, 1, 1);
} else { } else {
position = face.getFaceVector(); position = face.getFaceVector();
} }
FawePlayer<Object> fp = FawePlayer.wrap(player);
fp.setSelection(selector); fp.setSelection(selector);
PlayerWrapper wePlayer = new SilentPlayerWrapper(new LocationMaskedPlayerWrapper(player, new Location(player.getExtent(), position))); PlayerWrapper wePlayer = new SilentPlayerWrapper(new LocationMaskedPlayerWrapper(player, new Location(player.getExtent(), position)));
String[] cmds = replaced.split(";"); String[] cmds = replaced.split(";");

14
core/src/main/java/com/boydti/fawe/object/brush/CopyPastaBrush.java
View File

@ -1,6 +1,7 @@
package com.boydti.fawe.object.brush; package com.boydti.fawe.object.brush;
import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.BBC;
import com.boydti.fawe.object.FawePlayer;
import com.boydti.fawe.object.clipboard.ResizableClipboardBuilder; import com.boydti.fawe.object.clipboard.ResizableClipboardBuilder;
import com.boydti.fawe.object.exception.FaweException; import com.boydti.fawe.object.exception.FaweException;
import com.boydti.fawe.object.function.NullRegionFunction; import com.boydti.fawe.object.function.NullRegionFunction;
@ -11,7 +12,6 @@ import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extent.clipboard.Clipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.Masks; import com.sk89q.worldedit.function.mask.Masks;
@ -25,17 +25,15 @@ import com.sk89q.worldedit.session.ClipboardHolder;
public class CopyPastaBrush implements DoubleActionBrush { public class CopyPastaBrush implements DoubleActionBrush {
private final DoubleActionBrushTool tool; private final DoubleActionBrushTool tool;
private final LocalSession session;
private final Player player;
public CopyPastaBrush(Player player, LocalSession session, DoubleActionBrushTool tool) { public CopyPastaBrush(DoubleActionBrushTool tool) {
this.tool = tool; this.tool = tool;
this.session = session;
this.player = player;
} }
@Override @Override
public void build(DoubleActionBrushTool.BrushAction action, final EditSession editSession, Vector position, Pattern pattern, double size) throws MaxChangedBlocksException { public void build(DoubleActionBrushTool.BrushAction action, final EditSession editSession, Vector position, Pattern pattern, double size) throws MaxChangedBlocksException {
FawePlayer fp = editSession.getPlayer();
LocalSession session = fp.getSession();
switch (action) { switch (action) {
case SECONDARY: { case SECONDARY: {
Mask mask = tool.getMask(); Mask mask = tool.getMask();
@ -74,7 +72,7 @@ public class CopyPastaBrush implements DoubleActionBrush {
ClipboardHolder holder = new ClipboardHolder(clipboard, editSession.getWorld().getWorldData()); ClipboardHolder holder = new ClipboardHolder(clipboard, editSession.getWorld().getWorldData());
session.setClipboard(holder); session.setClipboard(holder);
int blocks = builder.size(); int blocks = builder.size();
player.print(BBC.getPrefix() + BBC.COMMAND_COPY.format(blocks)); BBC.COMMAND_COPY.send(fp, blocks);
return; return;
} }
case PRIMARY: { case PRIMARY: {
@ -90,7 +88,7 @@ public class CopyPastaBrush implements DoubleActionBrush {
.build(); .build();
Operations.completeLegacy(operation); Operations.completeLegacy(operation);
} catch (EmptyClipboardException e) { } catch (EmptyClipboardException e) {
player.print(BBC.getPrefix() + BBC.BRUSH_PASTE_NONE.s()); BBC.BRUSH_PASTE_NONE.send(fp);
} }
} }
} }

4
core/src/main/java/com/sk89q/worldedit/function/mask/Masks.java
View File

@ -22,6 +22,10 @@ public final class Masks {
private Masks() { private Masks() {
} }
public static boolean isNull(Mask mask) {
return mask == null || mask == ALWAYS_TRUE;
}
/** /**
* Return a 3D mask that always returns true; * Return a 3D mask that always returns true;
* *