diff --git a/favs/src/main/java/com/boydti/fawe/bukkit/favs/PatternUtil.java b/favs/src/main/java/com/boydti/fawe/bukkit/favs/PatternUtil.java index 465fd64e7..c4c9c6172 100644 --- a/favs/src/main/java/com/boydti/fawe/bukkit/favs/PatternUtil.java +++ b/favs/src/main/java/com/boydti/fawe/bukkit/favs/PatternUtil.java @@ -1,6 +1,5 @@ package com.boydti.fawe.bukkit.favs; -import com.boydti.fawe.config.BBC; import com.boydti.fawe.object.FawePlayer; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/Message.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/Message.java index 211103c80..6fac69b6b 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/Message.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/Message.java @@ -3,9 +3,6 @@ package com.thevoxelbox.voxelsniper; import com.sk89q.worldedit.world.block.BlockTypes; import org.bukkit.ChatColor; -/** - * - */ public class Message { private static final int BRUSH_SIZE_WARNING_THRESHOLD = 20; private final SnipeData snipeData; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/PaintingWrapper.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/PaintingWrapper.java index d20ee7e8d..94eb54c57 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/PaintingWrapper.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/PaintingWrapper.java @@ -23,9 +23,9 @@ public final class PaintingWrapper { /** * The paint method used to scroll or set a painting to a specific type. * - * @param p The player executing the method - * @param auto Scroll automatically? If false will use 'choice' to try and set the painting - * @param back Scroll in reverse? + * @param p The player executing the method + * @param auto Scroll automatically? If false will use 'choice' to try and set the painting + * @param back Scroll in reverse? * @param choice Chosen index to set the painting to */ @SuppressWarnings("deprecation") diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/SnipeAction.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/SnipeAction.java index 9362ec448..1a11e4221 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/SnipeAction.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/SnipeAction.java @@ -1,8 +1,5 @@ package com.thevoxelbox.voxelsniper; -/** - * - */ public enum SnipeAction { ARROW, GUNPOWDER } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java index 79cb0003b..a024f7d23 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java @@ -128,10 +128,10 @@ public class Sniper { /** * Sniper execution call. * - * @param action Action player performed - * @param itemInHand Item in hand of player + * @param action Action player performed + * @param itemInHand Item in hand of player * @param clickedBlock Block that the player targeted/interacted with - * @param clickedFace Face of that targeted Block + * @param clickedFace Face of that targeted Block * @return true if command visibly processed, false otherwise. */ public boolean snipe(final Action action, final Material itemInHand, final Block clickedBlock, final BlockFace clickedFace) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/SniperManager.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/SniperManager.java index e71d9ad26..2ba2a3b4c 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/SniperManager.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/SniperManager.java @@ -6,9 +6,6 @@ import org.bukkit.entity.Player; import java.util.Map; import java.util.UUID; -/** - * - */ public class SniperManager { private Map sniperInstances = Maps.newHashMap(); private VoxelSniper plugin; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/VoxelSniperConfiguration.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/VoxelSniperConfiguration.java index 13a4c2614..1e1b58e63 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/VoxelSniperConfiguration.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/VoxelSniperConfiguration.java @@ -1,19 +1,14 @@ package com.thevoxelbox.voxelsniper; -import com.google.common.base.Preconditions; import org.bukkit.configuration.file.FileConfiguration; -import java.util.List; - /** * Configuration storage defining global configurations for VoxelSniper. */ public class VoxelSniperConfiguration { public static final String CONFIG_IDENTIFIER_LITESNIPER_MAX_BRUSH_SIZE = "litesniper-max-brush-size"; - public static final String CONFIG_IDENTIFIER_UNDO_CACHE_SIZE = "undo-cache-size"; public static final String CONFIG_IDENTIFIER_MESSAGE_ON_LOGIN_ENABLED = "message-on-login-enabled"; - public static final int DEFAULT_LITESNIPER_MAX_BRUSH_SIZE = 5; - public static final int DEFAULT_UNDO_CACHE_SIZE = 20; + public static final int DEFAULT_LITESNIPER_MAX_BRUSH_SIZE = 30; public static final boolean DEFAULT_MESSAGE_ON_LOGIN_ENABLED = true; private FileConfiguration configuration; @@ -24,24 +19,6 @@ public class VoxelSniperConfiguration { this.configuration = configuration; } - /** - * Returns the maximum amount of snipes stored in the undo cache of snipers. - * - * @return the maximum amount of snipes stored in the undo cache of snipers - */ - public int getUndoCacheSize() { - return configuration.getInt(CONFIG_IDENTIFIER_UNDO_CACHE_SIZE, DEFAULT_UNDO_CACHE_SIZE); - } - - /** - * Set the maximum amount of snipes stored in the undo cache of snipers. - * - * @param size size of undo cache - */ - public void setUndoCacheSize(int size) { - configuration.set(CONFIG_IDENTIFIER_UNDO_CACHE_SIZE, size); - } - /** * Returns maximum size of brushes that LiteSnipers can use. * @@ -51,15 +28,6 @@ public class VoxelSniperConfiguration { return configuration.getInt(CONFIG_IDENTIFIER_LITESNIPER_MAX_BRUSH_SIZE, DEFAULT_LITESNIPER_MAX_BRUSH_SIZE); } - /** - * Set maximum size of brushes that LiteSnipers can use. - * - * @param size maximum size - */ - public void setLiteSniperMaxBrushSize(int size) { - configuration.set(CONFIG_IDENTIFIER_LITESNIPER_MAX_BRUSH_SIZE, size); - } - /** * Returns if the login message is enabled. * @@ -68,13 +36,4 @@ public class VoxelSniperConfiguration { public boolean isMessageOnLoginEnabled() { return configuration.getBoolean(CONFIG_IDENTIFIER_MESSAGE_ON_LOGIN_ENABLED, DEFAULT_MESSAGE_ON_LOGIN_ENABLED); } - - /** - * Set the message on login to be enabled or disabled. - * - * @param enabled Message on Login enabled - */ - public void setMessageOnLoginEnabled(boolean enabled) { - configuration.set(CONFIG_IDENTIFIER_MESSAGE_ON_LOGIN_ENABLED, enabled); - } } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BiomeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BiomeBrush.java index ac7b22948..1f448c893 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BiomeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BiomeBrush.java @@ -6,15 +6,9 @@ import org.bukkit.ChatColor; import org.bukkit.block.Biome; import org.bukkit.block.Block; -/** - * - */ public class BiomeBrush extends Brush { - private Biome selectedBiome = Biome.PLAINS; - /** - * - */ + private Biome selectedBiome = Biome.PLAINS; public BiomeBrush() { this.setName("Biome (/b biome [Biome Name])"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendBallBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendBallBrush.java index 923ffb5ea..36bad9a4e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendBallBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendBallBrush.java @@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo; import org.bukkit.ChatColor; public class BlendBallBrush extends BlendBrushBase { - /** - * - */ + public BlendBallBrush() { this.setName("Blend Ball"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendDiscBrush.java index fce30ec1a..2c50ac304 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendDiscBrush.java @@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo; import org.bukkit.ChatColor; public class BlendDiscBrush extends BlendBrushBase { - /** - * - */ + public BlendDiscBrush() { this.setName("Blend Disc"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelBrush.java index 7e69d191f..ac85a497f 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelBrush.java @@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo; import org.bukkit.ChatColor; public class BlendVoxelBrush extends BlendBrushBase { - /** - * - */ + public BlendVoxelBrush() { this.setName("Blend Voxel"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelDiscBrush.java index 4beee24f7..eb6d17de1 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelDiscBrush.java @@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo; import org.bukkit.ChatColor; public class BlendVoxelDiscBrush extends BlendBrushBase { - /** - * - */ + public BlendVoxelDiscBrush() { this.setName("Blend Voxel Disc"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlobBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlobBrush.java index 8eb588b8b..985431b73 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlobBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlobBrush.java @@ -18,9 +18,6 @@ public class BlobBrush extends PerformBrush { private Random randomGenerator = new Random(); private int growPercent = GROW_PERCENT_DEFAULT; // chance block on recursion pass is made active - /** - * - */ public BlobBrush() { this.setName("Blob"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetBrush.java index 12bc00333..447ac2587 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetBrush.java @@ -36,9 +36,6 @@ public class BlockResetBrush extends Brush { BlockResetBrush.DENIED_UPDATES.add(Material.OAK_FENCE_GATE); } - /** - * - */ public BlockResetBrush() { this.setName("Block Reset Brush"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetSurfaceBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetSurfaceBrush.java index c2cc62ef0..c8e97539b 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetSurfaceBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetSurfaceBrush.java @@ -9,17 +9,17 @@ import com.thevoxelbox.voxelsniper.SnipeData; import org.bukkit.Material; /** - * This brush only looks for solid blocks, and then changes those plus any air blocks touching them. If it works, this brush should be faster than the original - * blockPositionY an amount proportional to the volume of a snipe selection area / the number of blocks touching air in the selection. This is because every solid block - * surrounded blockPositionY others should take equally long to check and not change as it would take MC to change them and then check and find no lighting to update. For - * air blocks surrounded blockPositionY other air blocks, this brush saves about 80-100 checks blockPositionY not updating them or their lighting. And for air blocks touching solids, - * this brush is slower, because it replaces the air once per solid block it is touching. I assume on average this is about 2 blocks. So every air block - * touching a solid negates one air block floating in air. Thus, for selections that have more air blocks surrounded blockPositionY air than air blocks touching solids, - * this brush will be faster, which is almost always the case, especially for undeveloped terrain and for larger brush sizes (unlike the original brush, this - * should only slow down blockPositionY the square of the brush size, not the cube of the brush size). For typical terrain, blockPositionY my calculations, overall speed increase is - * about a factor of 5-6 for a size 20 brush. For a complicated city or ship, etc., this may be only a factor of about 2. In a hypothetical worst case scenario - * of a 3d checkerboard of stone and air every other block, this brush should only be about 1.5x slower than the original brush. Savings increase for larger - * brushes. +This brush only looks for solid blocks, and then changes those plus any air blocks touching them. If it works, this brush should be faster than the original +blockPositionY an amount proportional to the volume of a snipe selection area / the number of blocks touching air in the selection. This is because every solid block +surrounded blockPositionY others should take equally long to check and not change as it would take MC to change them and then check and find no lighting to update. For +air blocks surrounded blockPositionY other air blocks, this brush saves about 80-100 checks blockPositionY not updating them or their lighting. And for air blocks touching solids, +this brush is slower, because it replaces the air once per solid block it is touching. I assume on average this is about 2 blocks. So every air block +touching a solid negates one air block floating in air. Thus, for selections that have more air blocks surrounded blockPositionY air than air blocks touching solids, +this brush will be faster, which is almost always the case, especially for undeveloped terrain and for larger brush sizes (unlike the original brush, this +should only slow down blockPositionY the square of the brush size, not the cube of the brush size). For typical terrain, blockPositionY my calculations, overall speed increase is +about a factor of 5-6 for a size 20 brush. For a complicated city or ship, etc., this may be only a factor of about 2. In a hypothetical worst case scenario +of a 3d checkerboard of stone and air every other block, this brush should only be about 1.5x slower than the original brush. Savings increase for larger +brushes. * * @author GavJenks */ diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Brush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Brush.java index 904794ecf..0c8825e41 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Brush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Brush.java @@ -33,9 +33,9 @@ public abstract class Brush implements IBrush { private String name = "Undefined"; /** - * @param x - * @param y - * @param z + * @param x X coordinate + * @param y Y coordinate + * @param z Z coordinate * @return {@link Block} */ public final AsyncBlock clampY(final int x, final int y, final int z) { @@ -103,9 +103,9 @@ public abstract class Brush implements IBrush { /** * Overridable getTarget method. * - * @param v - * @param clickedBlock - * @param clickedFace + * @param v Sniper caller + * @param clickedBlock Block that the player targeted/interacted with + * @param clickedFace Face of that targeted Block * @return boolean */ protected final boolean getTarget(final SnipeData v, final AsyncBlock clickedBlock, final BlockFace clickedFace) { @@ -243,9 +243,9 @@ public abstract class Brush implements IBrush { /** * Sets the Id of the block at the passed coordinate. * - * @param z Z coordinate - * @param x X coordinate - * @param y Y coordinate + * @param z Z coordinate + * @param x X coordinate + * @param y Y coordinate * @param id The id the block will be set to */ @SuppressWarnings("deprecation") @@ -256,10 +256,10 @@ public abstract class Brush implements IBrush { /** * Sets the id and data value of the block at the passed coordinate. * - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @param id The id the block will be set to + * @param x X coordinate + * @param y Y coordinate + * @param z Z coordinate + * @param id The id the block will be set to * @param data The data value the block will be set to */ @SuppressWarnings("deprecation") @@ -270,10 +270,10 @@ public abstract class Brush implements IBrush { /** * Sets the id and data value of the block at the passed coordinate. * - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @param id The id the block will be set to + * @param x X coordinate + * @param y Y coordinate + * @param z Z coordinate + * @param id The id the block will be set to * @param data The data value the block will be set to */ @SuppressWarnings("deprecation") diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonBrush.java index bbb5faa95..50dbae179 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonBrush.java @@ -19,9 +19,6 @@ public class CanyonBrush extends Brush { private static final int SHIFT_LEVEL_MAX = 60; private int yLevel = 10; - /** - * - */ public CanyonBrush() { this.setName("Canyon"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonSelectionBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonSelectionBrush.java index 7a2b8ab4d..d810f21f8 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonSelectionBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonSelectionBrush.java @@ -14,9 +14,6 @@ public class CanyonSelectionBrush extends CanyonBrush { private int fx; private int fz; - /** - * - */ public CanyonSelectionBrush() { this.setName("Canyon Selection"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CheckerVoxelDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CheckerVoxelDiscBrush.java index d5b94e765..ad45f4d27 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CheckerVoxelDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CheckerVoxelDiscBrush.java @@ -20,7 +20,7 @@ public class CheckerVoxelDiscBrush extends PerformBrush { } /** - * @param v + * @param v Snipe Data * @param target */ private void applyBrush(final SnipeData v, final Block target) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CleanSnowBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CleanSnowBrush.java index 322bc7a1f..24a15c64a 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CleanSnowBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CleanSnowBrush.java @@ -13,9 +13,6 @@ import org.bukkit.Material; public class CleanSnowBrush extends Brush { private double trueCircle = 0; - /** - * - */ public CleanSnowBrush() { this.setName("Clean Snow"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CloneStampBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CloneStampBrush.java index 13e24012e..35ba3b364 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CloneStampBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CloneStampBrush.java @@ -22,7 +22,7 @@ public class CloneStampBrush extends StampBrush { * x y z -- initial center of the selection v.brushSize -- the radius of the cylinder v.voxelHeight -- the heigth of the cylinder c.cCen -- the offset on * the Y axis of the selection ( bottom of the cylinder ) as blockPositionY: Bottom_Y = targetBlock.y + v.cCen; * - * @param v the caller + * @param v Sniper Caller */ private void clone(final SnipeData v) { final int brushSize = v.getBrushSize(); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CometBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CometBrush.java index ca5c55956..78665cec4 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CometBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CometBrush.java @@ -16,9 +16,6 @@ import org.bukkit.util.Vector; public class CometBrush extends Brush { private boolean useBigBalls = false; - /** - * - */ public CometBrush() { this.setName("Comet"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CopyPastaBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CopyPastaBrush.java index 02d01195f..7bf2d6559 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CopyPastaBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CopyPastaBrush.java @@ -25,9 +25,6 @@ public class CopyPastaBrush extends Brush { private int[] arraySize = new int[3]; private int pivot = 0; // ccw degrees - /** - * - */ public CopyPastaBrush() { this.setName("CopyPasta"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CylinderBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CylinderBrush.java index 80f4a7df8..92a1f58a3 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CylinderBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CylinderBrush.java @@ -12,9 +12,6 @@ import org.bukkit.block.Block; public class CylinderBrush extends PerformBrush { private double trueCircle = 0; - /** - * - */ public CylinderBrush() { this.setName("Cylinder"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscBrush.java index fea8020fb..6d36846dd 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscBrush.java @@ -23,7 +23,7 @@ public class DiscBrush extends PerformBrush { /** * Disc executor. * - * @param v + * @param v Snipe Data */ private void disc(final SnipeData v, final Block targetBlock) { final double radiusSquared = (v.getBrushSize() + this.trueCircle) * (v.getBrushSize() + this.trueCircle); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscFaceBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscFaceBrush.java index f24ee23b6..efba98bd8 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscFaceBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscFaceBrush.java @@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace; public class DiscFaceBrush extends PerformBrush { private double trueCircle = 0; - /** - * - */ public DiscFaceBrush() { this.setName("Disc Face"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DomeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DomeBrush.java index 6210ac5b6..e23c12bc7 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DomeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DomeBrush.java @@ -16,9 +16,7 @@ import java.util.Set; * @author MikeMatrix */ public class DomeBrush extends Brush { - /** - * - */ + public DomeBrush() { this.setName("Dome"); } @@ -32,8 +30,8 @@ public class DomeBrush extends Brush { } /** - * @param v - * @param targetBlock + * @param v Snipe Data + * @param targetBlock the targetBlock to set */ @SuppressWarnings("deprecation") private void generateDome(final SnipeData v, final Block targetBlock) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DrainBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DrainBrush.java index c16fdc2c8..8deb15d07 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DrainBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DrainBrush.java @@ -14,9 +14,6 @@ public class DrainBrush extends Brush { private double trueCircle = 0; private boolean disc = false; - /** - * - */ public DrainBrush() { this.setName("Drain"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipseBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipseBrush.java index d59f1c706..cf16cc68a 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipseBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipseBrush.java @@ -23,9 +23,6 @@ public class EllipseBrush extends PerformBrush { private double stepSize; private boolean fill; - /** - * - */ public EllipseBrush() { this.setName("Ellipse"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipsoidBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipsoidBrush.java index 10c6709de..ea8e8296d 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipsoidBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipsoidBrush.java @@ -12,9 +12,6 @@ public class EllipsoidBrush extends PerformBrush { private double zRad; private boolean istrue; - /** - * - */ public EllipsoidBrush() { this.setName("Ellipsoid"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityBrush.java index 40cae9326..d5a8214c0 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityBrush.java @@ -11,9 +11,6 @@ import org.bukkit.entity.EntityType; public class EntityBrush extends Brush { private EntityType entityType = EntityType.ZOMBIE; - /** - * - */ public EntityBrush() { this.setName("Entity"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityRemovalBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityRemovalBrush.java index e235281f0..ef6c78762 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityRemovalBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityRemovalBrush.java @@ -11,15 +11,9 @@ import java.util.Iterator; import java.util.List; import java.util.regex.PatternSyntaxException; -/** - * - */ public class EntityRemovalBrush extends Brush { private final List exemptions = new ArrayList<>(3); - /** - * - */ public EntityRemovalBrush() { this.setName("Entity Removal"); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EraserBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EraserBrush.java index 3301b714c..edeccf1ad 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EraserBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EraserBrush.java @@ -20,9 +20,6 @@ public class EraserBrush extends Brush { private static final Set EXCLUSIVE_LIQUIDS = EnumSet.of( Material.WATER, Material.WATER, Material.LAVA, Material.LAVA); - /** - * - */ public EraserBrush() { this.setName("Eraser"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ErodeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ErodeBrush.java index 700ae3819..b0a9981b4 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ErodeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ErodeBrush.java @@ -31,9 +31,6 @@ public class ErodeBrush extends Brush { private final HelpJSAP parser = new HelpJSAP("/b e", "Brush for eroding landscape.", ChatPaginator.GUARANTEED_NO_WRAP_CHAT_PAGE_WIDTH); private ErosionPreset currentPreset = new ErosionPreset(0, 1, 0, 1); - /** - * - */ public ErodeBrush() { this.setName("Erode"); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ExtrudeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ExtrudeBrush.java index 88c965928..00a878464 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ExtrudeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ExtrudeBrush.java @@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace; public class ExtrudeBrush extends Brush { private double trueCircle; - /** - * - */ public ExtrudeBrush() { this.setName("Extrude"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FillDownBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FillDownBrush.java index b99ec1241..9337c6fa7 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FillDownBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FillDownBrush.java @@ -16,9 +16,6 @@ public class FillDownBrush extends PerformBrush { private boolean fillLiquid = true; private boolean fromExisting = false; - /** - * - */ public FillDownBrush() { this.setName("Fill Down"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FlatOceanBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FlatOceanBrush.java index 8a6a2018c..66217eb72 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FlatOceanBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FlatOceanBrush.java @@ -15,9 +15,6 @@ public class FlatOceanBrush extends Brush { private int waterLevel = DEFAULT_WATER_LEVEL; private int floorLevel = DEFAULT_FLOOR_LEVEL; - /** - * - */ public FlatOceanBrush() { this.setName("FlatOcean"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/IBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/IBrush.java index fa0c905a0..b2cfd6107 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/IBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/IBrush.java @@ -19,7 +19,7 @@ public interface IBrush { * Handles parameters passed to brushes. * * @param par Array of string containing parameters - * @param v Snipe Data + * @param v Snipe Data */ void parameters(String[] par, SnipeData v); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JaggedLineBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JaggedLineBrush.java index 59b3ba4f3..b24c4bf31 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JaggedLineBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JaggedLineBrush.java @@ -29,9 +29,6 @@ public class JaggedLineBrush extends PerformBrush { private int recursion = RECURSION_DEFAULT; private int spread = SPREAD_DEFAULT; - /** - * - */ public JaggedLineBrush() { this.setName("Jagged Line"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JockeyBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JockeyBrush.java index ac09825e5..5050e3655 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JockeyBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JockeyBrush.java @@ -21,9 +21,6 @@ public class JockeyBrush extends Brush { private JockeyType jockeyType = JockeyType.NORMAL_ALL_ENTITIES; private Entity jockeyedEntity = null; - /** - * - */ public JockeyBrush() { this.setName("Jockey"); } @@ -137,7 +134,6 @@ public class JockeyBrush extends Brush { public final void info(final Message vm) { vm.brushName(this.getName()); vm.custom("Current jockey mode: " + ChatColor.GREEN + jockeyType.toString()); - vm.custom(ChatColor.GREEN + "Help: " + ChatColor.AQUA + "http://www.voxelwiki.com/minecraft/Voxelsniper#The_Jockey_Brush"); } @Override diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LightningBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LightningBrush.java index 75cef7cbb..fdfd5e7fd 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LightningBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LightningBrush.java @@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.SnipeData; * @author Gavjenks */ public class LightningBrush extends Brush { - /** - * - */ + public LightningBrush() { this.setName("Lightning"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LineBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LineBrush.java index 0d6d36ff3..e8e49be5b 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LineBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LineBrush.java @@ -21,9 +21,6 @@ public class LineBrush extends PerformBrush { private Vector targetCoords = new Vector(); private AsyncWorld targetWorld; - /** - * - */ public LineBrush() { this.setName("Line"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/MoveBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/MoveBrush.java index 76c6718ac..236e2d794 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/MoveBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/MoveBrush.java @@ -30,9 +30,6 @@ public class MoveBrush extends Brush { */ private Selection selection = null; - /** - * - */ public MoveBrush() { this.setName("Move"); } @@ -181,13 +178,7 @@ public class MoveBrush extends Brush { * Calculated BlockStates of the selection. */ private final ArrayList blockStates = new ArrayList<>(); - /** - * - */ private Location location1 = null; - /** - * - */ private Location location2 = null; /** @@ -206,7 +197,7 @@ public class MoveBrush extends Brush { final int highY = Math.max(this.location1.getBlockY(), this.location2.getBlockY()); final int highZ = Math.max(this.location1.getBlockZ(), this.location2.getBlockZ()); if (Math.abs(highX - lowX) * Math.abs(highZ - lowZ) * Math.abs(highY - lowY) > Selection.MAX_BLOCK_COUNT) { - throw new Exception(ChatColor.RED + "Selection size above hardcoded limit, please use a smaller selection."); + throw new Exception(ChatColor.RED + "Selection size above hardcoded limit of 5000000, please use a smaller selection."); } final AsyncWorld world = (AsyncWorld) this.location1.getWorld(); for (int y = lowY; y <= highY; y++) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OceanBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OceanBrush.java index 4236f1a2e..0f067677a 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OceanBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OceanBrush.java @@ -20,9 +20,6 @@ public class OceanBrush extends Brush { private int waterLevel = WATER_LEVEL_DEFAULT; private boolean coverFloor = false; - /** - * - */ public OceanBrush() { this.setName("OCEANATOR 5000(tm)"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OverlayBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OverlayBrush.java index 807ee5473..b09a3b476 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OverlayBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OverlayBrush.java @@ -18,9 +18,6 @@ public class OverlayBrush extends PerformBrush { private int depth = DEFAULT_DEPTH; private boolean allBlocks = false; - /** - * - */ public OverlayBrush() { this.setName("Overlay (Topsoil Filling)"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/PaintingBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/PaintingBrush.java index 18e5bdaa2..6dd8a507a 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/PaintingBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/PaintingBrush.java @@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.SnipeData; * @author Voxel */ public class PaintingBrush extends Brush { - /** - * - */ + public PaintingBrush() { this.setName("Painting"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RandomErodeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RandomErodeBrush.java index 9261f33e6..fc296fd8e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RandomErodeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RandomErodeBrush.java @@ -24,9 +24,6 @@ public class RandomErodeBrush extends Brush { private int fillRecursion = 1; private Random generator = new Random(); - /** - * - */ public RandomErodeBrush() { this.setName("RandomErode"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RegenerateChunkBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RegenerateChunkBrush.java index 3ebf913b8..4653caee2 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RegenerateChunkBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RegenerateChunkBrush.java @@ -11,9 +11,7 @@ import org.bukkit.Chunk; * @author Mick */ public class RegenerateChunkBrush extends Brush { - /** - * - */ + public RegenerateChunkBrush() { this.setName("Chunk Generator 40k"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RingBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RingBrush.java index 4f89e89d5..4e032b846 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RingBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RingBrush.java @@ -13,9 +13,6 @@ public class RingBrush extends PerformBrush { private double trueCircle = 0; private double innerSize = 0; - /** - * - */ public RingBrush() { this.setName("Ring"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DBrush.java index 0981b3a13..fb7dcf687 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DBrush.java @@ -17,9 +17,6 @@ public class Rot2DBrush extends Brush { private BlockWrapper[][][] snap; private double se; - /** - * - */ public Rot2DBrush() { this.setName("2D Rotation"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DvertBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DvertBrush.java index ce26d0e39..65e5bac36 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DvertBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DvertBrush.java @@ -20,9 +20,6 @@ public class Rot2DvertBrush extends Brush { private BlockWrapper[][][] snap; private double se; - /** - * - */ public Rot2DvertBrush() { this.setName("2D Rotation"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot3DBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot3DBrush.java index 954e4a3df..008d32d9e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot3DBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot3DBrush.java @@ -8,9 +8,6 @@ import com.thevoxelbox.voxelsniper.Undo; import com.thevoxelbox.voxelsniper.util.BlockWrapper; import org.bukkit.ChatColor; -/** - * - */ public class Rot3DBrush extends Brush { private final int mode = 0; private int bSize; @@ -20,9 +17,6 @@ public class Rot3DBrush extends Brush { private double sePitch; private double seRoll; - /** - * - */ public Rot3DBrush() { this.setName("3D Rotation"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RulerBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RulerBrush.java index 5b9cc55bc..082efab7c 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RulerBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RulerBrush.java @@ -17,9 +17,6 @@ public class RulerBrush extends Brush { private int yOff = 0; private int zOff = 0; - /** - * - */ public RulerBrush() { this.setName("Ruler"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ScannerBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ScannerBrush.java index 5282c6a32..1bdf5a206 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ScannerBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ScannerBrush.java @@ -19,9 +19,6 @@ public class ScannerBrush extends Brush { private int depth = DEPTH_DEFAULT; private Material checkFor = Material.AIR; - /** - * - */ public ScannerBrush() { this.setName("Scanner"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetBrush.java index 453c64e44..8ea300481 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetBrush.java @@ -13,9 +13,6 @@ public class SetBrush extends PerformBrush { private static final int SELECTION_SIZE_MAX = 5000000; private Block block = null; - /** - * - */ public SetBrush() { this.setName("Set"); } @@ -38,7 +35,7 @@ public class SetBrush extends PerformBrush { final int highZ = Math.max(this.block.getZ(), bl.getZ()); if (Math.abs(highX - lowX) * Math.abs(highZ - lowZ) * Math.abs(highY - lowY) > SELECTION_SIZE_MAX) { - v.sendMessage(ChatColor.RED + "Selection size above hardcoded limit, please use a smaller selection."); + v.sendMessage(ChatColor.RED + "Selection size above hardcoded limit of 5000000, please use a smaller selection."); } else { for (int y = lowY; y <= highY; y++) { for (int x = lowX; x <= highX; x++) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneFlipBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneFlipBrush.java index fcd0e0465..36e4c3af1 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneFlipBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneFlipBrush.java @@ -16,9 +16,6 @@ public class SetRedstoneFlipBrush extends Brush { private Undo undo; private boolean northSouth = true; - /** - * - */ public SetRedstoneFlipBrush() { this.setName("Set Redstone Flip"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneRotateBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneRotateBrush.java index f151cfeac..86eb8e13a 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneRotateBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneRotateBrush.java @@ -15,9 +15,6 @@ public class SetRedstoneRotateBrush extends Brush { private Block block = null; private Undo undo; - /** - * - */ public SetRedstoneRotateBrush() { this.setName("Set Redstone Rotate"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellBallBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellBallBrush.java index b15802e76..fe1f2aece 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellBallBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellBallBrush.java @@ -11,9 +11,7 @@ import org.bukkit.block.Block; * @author Voxel */ public class ShellBallBrush extends Brush { - /** - * - */ + public ShellBallBrush() { this.setName("Shell Ball"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellSetBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellSetBrush.java index 461cf9808..9195f3ca0 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellSetBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellSetBrush.java @@ -16,9 +16,6 @@ public class ShellSetBrush extends Brush { private static final int MAX_SIZE = 5000000; private Block block = null; - /** - * - */ public ShellSetBrush() { this.setName("Shell Set"); } @@ -44,7 +41,7 @@ public class ShellSetBrush extends Brush { int selectionSize = Math.abs(highX - lowX) * Math.abs(highZ - lowZ) * Math.abs(highY - lowY); if (selectionSize > MAX_SIZE) { - v.sendMessage(ChatColor.RED + "Selection size above hardcoded limit, please use a smaller selection."); + v.sendMessage(ChatColor.RED + "Selection size above hardcoded limit of 5000000, please use a smaller selection."); } else { final ArrayList blocks = new ArrayList<>(selectionSize / 2); for (int y = lowY; y <= highY; y++) { diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellVoxelBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellVoxelBrush.java index b07114213..079ec8b10 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellVoxelBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellVoxelBrush.java @@ -11,9 +11,7 @@ import org.bukkit.block.Block; * @author Voxel */ public class ShellVoxelBrush extends Brush { - /** - * - */ + public ShellVoxelBrush() { this.setName("Shell Voxel"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SignOverwriteBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SignOverwriteBrush.java index 022460179..8b671a99c 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SignOverwriteBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SignOverwriteBrush.java @@ -26,9 +26,6 @@ public class SignOverwriteBrush extends Brush { private boolean[] signLinesEnabled = new boolean[NUM_SIGN_LINES]; private boolean rangedMode = false; - /** - * - */ public SignOverwriteBrush() { this.setName("Sign Overwrite Brush"); @@ -133,7 +130,7 @@ public class SignOverwriteBrush extends Brush { try { if (parameter.equalsIgnoreCase("info")) { v.sendMessage(ChatColor.AQUA + "Sign Overwrite Brush Powder/Arrow:"); - v.sendMessage(ChatColor.BLUE + "The arrow writes the internal line buffer to the tearget sign."); + v.sendMessage(ChatColor.BLUE + "The arrow writes the internal line buffer to the target sign."); v.sendMessage(ChatColor.BLUE + "The powder reads the text of the target sign into the internal buffer."); v.sendMessage(ChatColor.AQUA + "Sign Overwrite Brush Parameters:"); v.sendMessage(ChatColor.GREEN + "-1[:(enabled|disabled)] ... " + ChatColor.BLUE + "-- Sets the text of the first sign line. (e.g. -1 Blah Blah)"); diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SnipeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SnipeBrush.java index 871b736b2..376544283 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SnipeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SnipeBrush.java @@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; * @author Voxel */ public class SnipeBrush extends PerformBrush { - /** - * - */ + public SnipeBrush() { this.setName("Snipe"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SpiralStaircaseBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SpiralStaircaseBrush.java index d6627956f..27ccaa856 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SpiralStaircaseBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SpiralStaircaseBrush.java @@ -17,9 +17,6 @@ public class SpiralStaircaseBrush extends Brush { private String sdirect = "c"; // "c" clockwise (default), "cc" counter-clockwise private String sopen = "n"; // "n" north (default), "e" east, "world" south, "world" west - /** - * - */ public SpiralStaircaseBrush() { this.setName("Spiral Staircase"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterBallBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterBallBrush.java index ecef9498b..e8d71c817 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterBallBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterBallBrush.java @@ -26,9 +26,6 @@ public class SplatterBallBrush extends PerformBrush { private int splatterRecursions; // How many times you grow the seeds private Random generator = new Random(); - /** - * - */ public SplatterBallBrush() { this.setName("Splatter Ball"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterDiscBrush.java index 0b09d4a25..ebb8d06ee 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterDiscBrush.java @@ -26,9 +26,6 @@ public class SplatterDiscBrush extends PerformBrush { private int splatterRecursions; // How many times you grow the seeds private Random generator = new Random(); - /** - * - */ public SplatterDiscBrush() { this.setName("Splatter Disc"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterOverlayBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterOverlayBrush.java index e0c0dabc9..9bd7e5ec0 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterOverlayBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterOverlayBrush.java @@ -32,9 +32,6 @@ public class SplatterOverlayBrush extends PerformBrush { private int depth = 3; private boolean allBlocks = false; - /** - * - */ public SplatterOverlayBrush() { this.setName("Splatter Overlay"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelBrush.java index 227515c5a..955c8532e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelBrush.java @@ -26,9 +26,6 @@ public class SplatterVoxelBrush extends PerformBrush { private int splatterRecursions; // How many times you grow the seeds private Random generator = new Random(); - /** - * - */ public SplatterVoxelBrush() { this.setName("Splatter Voxel"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelDiscBrush.java index ab46d683f..9ac3ea57b 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelDiscBrush.java @@ -26,9 +26,6 @@ public class SplatterVoxelDiscBrush extends PerformBrush { private int splatterRecursions; // How many times you grow the seeds private Random generator = new Random(); - /** - * - */ public SplatterVoxelDiscBrush() { this.setName("Splatter Voxel Disc"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StampBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StampBrush.java index 56b54c0b8..70d25f96d 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StampBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StampBrush.java @@ -9,9 +9,6 @@ import org.bukkit.ChatColor; import java.util.HashSet; -/** - * - */ public class StampBrush extends Brush { protected HashSet clone = new HashSet<>(); protected HashSet fall = new HashSet<>(); @@ -20,16 +17,12 @@ public class StampBrush extends Brush { protected Undo undo; protected boolean sorted = false; protected StampType stamp = StampType.DEFAULT; - /** - * - */ + public StampBrush() { this.setName("Stamp"); } - /** - * - */ + public final void reSort() { this.sorted = false; } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StencilListBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StencilListBrush.java index 3aced5cf1..15c4a6f32 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StencilListBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StencilListBrush.java @@ -27,9 +27,6 @@ public class StencilListBrush extends Brush { private byte pasteParam = 0; private HashMap stencilList = new HashMap<>(); - /** - * - */ public StencilListBrush() { this.setName("StencilList"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TreeSnipeBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TreeSnipeBrush.java index f1e8af909..530142441 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TreeSnipeBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TreeSnipeBrush.java @@ -19,9 +19,6 @@ import org.bukkit.block.BlockFace; public class TreeSnipeBrush extends Brush { private TreeType treeType = TreeType.TREE; - /** - * - */ public TreeSnipeBrush() { this.setName("Tree Snipe"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TriangleBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TriangleBrush.java index d3c46ebff..846651a94 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TriangleBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TriangleBrush.java @@ -19,9 +19,6 @@ public class TriangleBrush extends PerformBrush { private double[] vectorThree = new double[3]; // Point 2 to 3, for area calculations private double[] normalVector = new double[3]; - /** - * - */ public TriangleBrush() { this.setName("Triangle"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/UnderlayBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/UnderlayBrush.java index 5e6324dbe..925f6f51c 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/UnderlayBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/UnderlayBrush.java @@ -16,9 +16,6 @@ public class UnderlayBrush extends PerformBrush { private int depth = DEFAULT_DEPTH; private boolean allBlocks = false; - /** - * - */ public UnderlayBrush() { this.setName("Underlay (Reverse Overlay)"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoltMeterBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoltMeterBrush.java index 049937bdd..702af9de3 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoltMeterBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoltMeterBrush.java @@ -11,9 +11,7 @@ import org.bukkit.block.BlockFace; * @author Gavjenks */ public class VoltMeterBrush extends Brush { - /** - * - */ + public VoltMeterBrush() { this.setName("VoltMeter"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelBrush.java index 6aa422c91..c515ffc72 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelBrush.java @@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; * @author Piotr */ public class VoxelBrush extends PerformBrush { - /** - * - */ + public VoxelBrush() { this.setName("Voxel"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscBrush.java index 75d188cc6..d01c6dba8 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscBrush.java @@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; * @author Voxel */ public class VoxelDiscBrush extends PerformBrush { - /** - * - */ + public VoxelDiscBrush() { this.setName("Voxel Disc"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscFaceBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscFaceBrush.java index 3f277eb90..b5ce2b8d6 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscFaceBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscFaceBrush.java @@ -10,9 +10,7 @@ import org.bukkit.block.BlockFace; * @author Voxel */ public class VoxelDiscFaceBrush extends PerformBrush { - /** - * - */ + public VoxelDiscFaceBrush() { this.setName("Voxel Disc Face"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/WarpBrush.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/WarpBrush.java index 34d796c90..ee2925ed6 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/WarpBrush.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/brush/WarpBrush.java @@ -36,9 +36,7 @@ import org.bukkit.entity.Player; * @author MikeMatrix */ public class WarpBrush extends Brush { - /** - * - */ + public WarpBrush() { this.setName("Warp"); } diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelReplaceCommand.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelReplaceCommand.java index 0e040ce4e..4bed75c2e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelReplaceCommand.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelReplaceCommand.java @@ -1,6 +1,5 @@ package com.thevoxelbox.voxelsniper.command; -import com.bekvon.bukkit.residence.commands.material; import com.boydti.fawe.bukkit.wrapper.AsyncBlock; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -9,9 +8,6 @@ import com.thevoxelbox.voxelsniper.SnipeData; import com.thevoxelbox.voxelsniper.Sniper; import com.thevoxelbox.voxelsniper.VoxelSniper; import com.thevoxelbox.voxelsniper.api.command.VoxelCommand; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.entity.Player; public class VoxelReplaceCommand extends VoxelCommand diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelVoxelCommand.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelVoxelCommand.java index b574ced6c..1910ee2ef 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelVoxelCommand.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelVoxelCommand.java @@ -25,7 +25,6 @@ package com.thevoxelbox.voxelsniper.command; -import com.bekvon.bukkit.residence.commands.material; import com.boydti.fawe.bukkit.favs.PatternUtil; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.BukkitAdapter; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/event/SniperBrushSizeChangedEvent.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/event/SniperBrushSizeChangedEvent.java index 3980b4e92..d7513a6a4 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/event/SniperBrushSizeChangedEvent.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/event/SniperBrushSizeChangedEvent.java @@ -4,9 +4,6 @@ import com.thevoxelbox.voxelsniper.Sniper; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -/** - * - */ public class SniperBrushSizeChangedEvent extends Event { private static final HandlerList handlers = new HandlerList(); private final Sniper sniper; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/UndoDelegate.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/UndoDelegate.java index 0cf10403c..e9e30cffe 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/UndoDelegate.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/UndoDelegate.java @@ -6,9 +6,6 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; -/** - * - */ public class UndoDelegate implements BlockChangeDelegate { private final World targetWorld; private Undo currentUndo; diff --git a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/VoxelList.java b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/VoxelList.java index 34fd3c4d0..a5874f10e 100644 --- a/favs/src/main/java/com/thevoxelbox/voxelsniper/util/VoxelList.java +++ b/favs/src/main/java/com/thevoxelbox/voxelsniper/util/VoxelList.java @@ -1,18 +1,11 @@ package com.thevoxelbox.voxelsniper.util; -import com.google.common.collect.ImmutableList; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.extent.NullExtent; import com.sk89q.worldedit.function.mask.BlockMask; -import com.sk89q.worldedit.function.mask.BlockMaskBuilder; import com.sk89q.worldedit.world.block.BlockState; -import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Container class for multiple ID/Datavalue pairs. */ diff --git a/favs/src/main/resources/config.yml b/favs/src/main/resources/config.yml index 0f9d5b5a4..ca761cbb6 100644 --- a/favs/src/main/resources/config.yml +++ b/favs/src/main/resources/config.yml @@ -1,3 +1,4 @@ -litesniper-max-brush-size: 5 -undo-cache-size: 20 +# Max. brush size for FAVS brushes +litesniper-max-brush-size: 30 +# Enable or disable the brush dump on login message-on-login-enabled: true \ No newline at end of file