From 437d5a2a4327b926680aecb36e4b74f8ce764e3b Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 17 Jun 2020 22:34:55 -0400 Subject: [PATCH] Minor image brush changes --- .../java/com/boydti/fawe/object/brush/ImageBrush.java | 10 ++++------ .../com/sk89q/worldedit/command/BrushCommands.java | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java index 74b020a54..d1c037745 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java @@ -27,8 +27,10 @@ import java.util.Arrays; public class ImageBrush implements Brush { private final LocalSession session; private final SummedColorTable table; - private final int width, height; - private final double centerX, centerZ; + private final int width; + private final int height; + private final double centerX; + private final double centerZ; private final ColorFunction colorFunction; @@ -66,10 +68,6 @@ public class ImageBrush implements Brush { int call(int x1, int z1, int x2, int z2, Extent extent, BlockVector3 pos); } - private interface BlockFunction { - void apply(int color, Extent extent, BlockVector3 pos); - } - @Override public void build(EditSession editSession, BlockVector3 position, Pattern pattern, double sizeDouble) throws MaxChangedBlocksException { TextureUtil texture = session.getTextureUtil(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index 01a43febb..e726217a7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -463,12 +463,11 @@ public class BrushCommands { @Command( name = "image", - aliases = {"color"}, desc = "Use a height map to paint a surface", descFooter = "Use a height map to paint any surface.\n") @CommandPermissions("worldedit.brush.stencil") public void imageBrush(LocalSession session, InjectedValueAccess context, - @Arg(desc = "Expression", def = "5") + @Arg(desc = "The size of the brush", def = "5") Expression radius, ProvideBindings.ImageUri imageUri, @Arg(def = "1", desc = "scale height")