Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various

Browse Source 
Fix brush scroll
Fix spline reset
Allow setting offhand brush settings (use -h flag)
This commit is contained in:
Jesse Boyd 2017-03-05 01:48:04 +11:00
parent 52740d1e1c
commit b3b86bd3df
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
5 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/com/boydti/fawe/bukkit/BrushListener.java
View File

@ -36,9 +36,6 @@ public class BrushListener implements Listener {
LocalSession session = fp.getSession();
Tool tool = session.getTool(player);
if (tool != null) {
if (tool instanceof ScrollTool) {
}
final int slot = event.getNewSlot();
final int oldSlot = event.getPreviousSlot();
final int ri;

2
core/src/main/java/com/boydti/fawe/config/BBC.java
View File

@ -122,7 +122,7 @@ public enum BBC {
BRUSH_SPHERE("Sphere brush shape equipped (%s0).", "WorldEdit.Brush"),
BRUSH_LINE("Line brush shape equipped (%s0).", "WorldEdit.Brush"),
BRUSH_SPLINE("Spline brush shape equipped (%s0). Right click an end to add a shape", "WorldEdit.Brush"),
BRUSH_SPLINE_PRIMARY("Added position, Click the same spot to join!", "WorldEdit.Brush"),
BRUSH_SPLINE_PRIMARY_2("Added position, Click the same spot to join!", "WorldEdit.Brush"),
BRUSH_SPLINE_SECONDARY_ERROR("Not enough positions set!", "WorldEdit.Brush"),
BRUSH_SPLINE_SECONDARY("Created spline", "WorldEdit.Brush"),
BRUSH_BLEND_BALL("Blend ball brush equipped (%s0).", "WorldEdit.Brush"),

8
core/src/main/java/com/boydti/fawe/object/brush/SplineBrush.java
View File

@ -101,7 +101,7 @@ public class SplineBrush implements Brush {
points.add(position);
}
this.positionSets.add(points);
player.print(BBC.getPrefix() + BBC.BRUSH_SPLINE_PRIMARY.s());
player.print(BBC.getPrefix() + BBC.BRUSH_SPLINE_PRIMARY_2.s());
if (!visualization) {
return;
}
@ -147,11 +147,11 @@ public class SplineBrush implements Brush {
}
player.print(BBC.getPrefix() + BBC.BRUSH_SPLINE_SECONDARY.s());
if (visualization) {
positionSets.clear();
numSplines = 0;
} else {
numSplines = originalSize;
positionSets.remove(positionSets.size() - 1);
} else {
positionSets.clear();
numSplines = 0;
}
}

84
core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
View File

@ -68,28 +68,35 @@ public class ToolUtilCommands {
max = -1
)
@CommandPermissions("worldedit.brush.options.mask")
public void mask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException {
public void mask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context, @Switch('h') boolean offHand) throws WorldEditException {
Tool tool = session.getTool(player.getItemInHand());
if (tool == null) {
player.print(BBC.getPrefix() + BBC.BRUSH_NONE.f());
return;
}
Mask mask;
if (context == null || context.argsLength() == 0) {
if (tool instanceof BrushTool) {
((BrushTool) tool).setMask(null);
}
BBC.BRUSH_MASK_DISABLED.send(player);
mask = null;
} else {
ParserContext parserContext = new ParserContext();
parserContext.setActor(player);
parserContext.setWorld(player.getWorld());
parserContext.setSession(session);
parserContext.setExtent(editSession);
Mask mask = we.getMaskFactory().parseFromInput(context.getJoinedStrings(0), parserContext);
if (tool instanceof BrushTool) {
mask = we.getMaskFactory().parseFromInput(context.getJoinedStrings(0), parserContext);
}
if (tool instanceof BrushTool) {
BrushTool bt = (BrushTool) tool;
if (offHand) {
bt.getSecondary().mask = mask;
} else {
((BrushTool) tool).setMask(mask);
}
BBC.BRUSH_MASK.send(player);
}
if (mask == null) {
BBC.BRUSH_SOURCE_MASK_DISABLED.send(player);
} else {
BBC.BRUSH_SOURCE_MASK.send(player);
}
}
@ -101,27 +108,34 @@ public class ToolUtilCommands {
max = -1
)
@CommandPermissions("worldedit.brush.options.mask")
public void smask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException {
public void smask(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context, @Switch('h') boolean offHand) throws WorldEditException {
Tool tool = session.getTool(player.getItemInHand());
if (tool == null) {
player.print(BBC.getPrefix() + BBC.BRUSH_NONE.f());
return;
}
Mask mask;
if (context == null || context.argsLength() == 0) {
if (tool instanceof BrushTool) {
((BrushTool) tool).setSourceMask(null);
}
BBC.BRUSH_SOURCE_MASK_DISABLED.send(player);
mask = null;
} else {
ParserContext parserContext = new ParserContext();
parserContext.setActor(player);
parserContext.setWorld(player.getWorld());
parserContext.setSession(session);
parserContext.setExtent(editSession);
Mask mask = we.getMaskFactory().parseFromInput(context.getJoinedStrings(0), parserContext);
if (tool instanceof BrushTool) {
mask = we.getMaskFactory().parseFromInput(context.getJoinedStrings(0), parserContext);
}
if (tool instanceof BrushTool) {
BrushTool bt = (BrushTool) tool;
if (offHand) {
bt.getSecondary().sourceMask = mask;
} else {
((BrushTool) tool).setSourceMask(mask);
}
}
if (mask == null) {
BBC.BRUSH_SOURCE_MASK_DISABLED.send(player);
} else {
BBC.BRUSH_SOURCE_MASK.send(player);
}
}
@ -134,26 +148,33 @@ public class ToolUtilCommands {
max = -1
)
@CommandPermissions("worldedit.brush.options.transform")
public void transform(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context) throws WorldEditException {
public void transform(Player player, LocalSession session, EditSession editSession, @Optional CommandContext context, @Switch('h') boolean offHand) throws WorldEditException {
Tool tool = session.getTool(player.getItemInHand());
if (tool == null) {
return;
}
ResettableExtent transform;
if (context == null || context.argsLength() == 0) {
if (tool instanceof BrushTool) {
((BrushTool) tool).setTransform(null);
}
BBC.BRUSH_TRANSFORM_DISABLED.send(player);
transform = null;
} else {
ParserContext parserContext = new ParserContext();
parserContext.setActor(player);
parserContext.setWorld(player.getWorld());
parserContext.setSession(session);
parserContext.setExtent(editSession);
ResettableExtent transform = transformParser.parseFromInput(context.getJoinedStrings(0), parserContext);
if (tool instanceof BrushTool) {
transform = transformParser.parseFromInput(context.getJoinedStrings(0), parserContext);
}
if (tool instanceof BrushTool) {
BrushTool bt = (BrushTool) tool;
if (offHand) {
bt.getSecondary().transform = transform;
} else {
((BrushTool) tool).setTransform(transform);
}
}
if (transform == null) {
BBC.BRUSH_TRANSFORM_DISABLED.send(player);
} else {
BBC.BRUSH_TRANSFORM.send(player);
}
}
@ -166,10 +187,15 @@ public class ToolUtilCommands {
max = 1
)
@CommandPermissions("worldedit.brush.options.material")
public void material(Player player, LocalSession session, Pattern pattern, @Switch('h') boolean hand) throws WorldEditException {
public void material(Player player, LocalSession session, Pattern pattern, @Switch('h') boolean offHand) throws WorldEditException {
Tool tool = session.getTool(player.getItemInHand());
if (tool instanceof BrushTool) {
((BrushTool) tool).setFill(pattern);
BrushTool bt = (BrushTool) tool;
if (offHand) {
bt.getSecondary().material = pattern;
} else {
((BrushTool) tool).setFill(pattern);
}
}
BBC.BRUSH_MATERIAL.send(player);
}
@ -186,6 +212,7 @@ public class ToolUtilCommands {
int range = Math.max(0, Math.min(256, args.getInteger(0)));
Tool tool = session.getTool(player.getItemInHand());
if (tool instanceof BrushTool) {
BrushTool bt = (BrushTool) tool;
((BrushTool) tool).setRange(range);
}
BBC.BRUSH_RANGE.send(player);
@ -199,14 +226,19 @@ public class ToolUtilCommands {
max = 1
)
@CommandPermissions("worldedit.brush.options.size")
public void size(Player player, LocalSession session, CommandContext args, @Switch('h') boolean hand) throws WorldEditException {
public void size(Player player, LocalSession session, CommandContext args, @Switch('h') boolean offHand) throws WorldEditException {
int radius = args.getInteger(0);
we.checkMaxBrushRadius(radius);
Tool tool = session.getTool(player.getItemInHand());
if (tool instanceof BrushTool) {
((BrushTool) tool).setSize(radius);
BrushTool bt = (BrushTool) tool;
if (offHand) {
bt.getSecondary().size = radius;
} else {
((BrushTool) tool).setSize(radius);
}
}
BBC.BRUSH_SIZE.send(player);
}

2
core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java
View File

@ -360,8 +360,8 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool
} catch (Throwable e) {
WorldEdit.getInstance().getPlatformManager().handleThrowable(e, player);
}
return true;
}
return true;
}
return false;
}