Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-05 04:16:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Favs cleanup

Browse Source 
- Removed unnecessary config options
- Added config explanations
- Fixed Typos
- Minor code cleanup
- Removed outdated, hardcoded, voxelwiki links
- Minor message changes
This commit is contained in:
NotMyFault 2019-06-13 23:03:14 +02:00
parent 20d624a571
commit 2f9ece3268
84 changed files with 67 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
favs/src/main/java/com/boydti/fawe/bukkit/favs/PatternUtil.java
View File

@ -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;

3
favs/src/main/java/com/thevoxelbox/voxelsniper/Message.java
View File

@ -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;

6
favs/src/main/java/com/thevoxelbox/voxelsniper/PaintingWrapper.java
View File

@ -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")

3
favs/src/main/java/com/thevoxelbox/voxelsniper/SnipeAction.java
View File

@ -1,8 +1,5 @@
package com.thevoxelbox.voxelsniper;
/**
*
*/
public enum SnipeAction {
ARROW, GUNPOWDER
}

6
favs/src/main/java/com/thevoxelbox/voxelsniper/Sniper.java
View File

@ -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) {

3
favs/src/main/java/com/thevoxelbox/voxelsniper/SniperManager.java
View File

@ -6,9 +6,6 @@ import org.bukkit.entity.Player;
import java.util.Map;
import java.util.UUID;
/**
*
*/
public class SniperManager {
private Map<UUID, Sniper> sniperInstances = Maps.newHashMap();
private VoxelSniper plugin;

43
favs/src/main/java/com/thevoxelbox/voxelsniper/VoxelSniperConfiguration.java
View File

@ -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);
}
}

8
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BiomeBrush.java
View File

@ -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])");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendBallBrush.java
View File

@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor;
public class BlendBallBrush extends BlendBrushBase {
/**
*
*/
public BlendBallBrush() {
this.setName("Blend Ball");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendDiscBrush.java
View File

@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor;
public class BlendDiscBrush extends BlendBrushBase {
/**
*
*/
public BlendDiscBrush() {
this.setName("Blend Disc");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelBrush.java
View File

@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor;
public class BlendVoxelBrush extends BlendBrushBase {
/**
*
*/
public BlendVoxelBrush() {
this.setName("Blend Voxel");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlendVoxelDiscBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlobBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetBrush.java
View File

@ -36,9 +36,6 @@ public class BlockResetBrush extends Brush {
BlockResetBrush.DENIED_UPDATES.add(Material.OAK_FENCE_GATE);
}
/**
*
*/
public BlockResetBrush() {
this.setName("Block Reset Brush");
}

22
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/BlockResetSurfaceBrush.java
View File

@ -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
*/

34
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Brush.java
View File

@ -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")

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CanyonSelectionBrush.java
View File

@ -14,9 +14,6 @@ public class CanyonSelectionBrush extends CanyonBrush {
private int fx;
private int fz;
/**
*
*/
public CanyonSelectionBrush() {
this.setName("Canyon Selection");
}

2
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CheckerVoxelDiscBrush.java
View File

@ -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) {

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CleanSnowBrush.java
View File

@ -13,9 +13,6 @@ import org.bukkit.Material;
public class CleanSnowBrush extends Brush {
private double trueCircle = 0;
/**
*
*/
public CleanSnowBrush() {
this.setName("Clean Snow");
}

2
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CloneStampBrush.java
View File

@ -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();

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CometBrush.java
View File

@ -16,9 +16,6 @@ import org.bukkit.util.Vector;
public class CometBrush extends Brush {
private boolean useBigBalls = false;
/**
*
*/
public CometBrush() {
this.setName("Comet");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CopyPastaBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/CylinderBrush.java
View File

@ -12,9 +12,6 @@ import org.bukkit.block.Block;
public class CylinderBrush extends PerformBrush {
private double trueCircle = 0;
/**
*
*/
public CylinderBrush() {
this.setName("Cylinder");
}

2
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscBrush.java
View File

@ -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);

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DiscFaceBrush.java
View File

@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace;
public class DiscFaceBrush extends PerformBrush {
private double trueCircle = 0;
/**
*
*/
public DiscFaceBrush() {
this.setName("Disc Face");
}

8
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DomeBrush.java
View File

@ -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) {

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/DrainBrush.java
View File

@ -14,9 +14,6 @@ public class DrainBrush extends Brush {
private double trueCircle = 0;
private boolean disc = false;
/**
*
*/
public DrainBrush() {
this.setName("Drain");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipseBrush.java
View File

@ -23,9 +23,6 @@ public class EllipseBrush extends PerformBrush {
private double stepSize;
private boolean fill;
/**
*
*/
public EllipseBrush() {
this.setName("Ellipse");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EllipsoidBrush.java
View File

@ -12,9 +12,6 @@ public class EllipsoidBrush extends PerformBrush {
private double zRad;
private boolean istrue;
/**
*
*/
public EllipsoidBrush() {
this.setName("Ellipsoid");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityBrush.java
View File

@ -11,9 +11,6 @@ import org.bukkit.entity.EntityType;
public class EntityBrush extends Brush {
private EntityType entityType = EntityType.ZOMBIE;
/**
*
*/
public EntityBrush() {
this.setName("Entity");
}

6
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EntityRemovalBrush.java
View File

@ -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<String> exemptions = new ArrayList<>(3);
/**
*
*/
public EntityRemovalBrush() {
this.setName("Entity Removal");

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/EraserBrush.java
View File

@ -20,9 +20,6 @@ public class EraserBrush extends Brush {
private static final Set<Material> EXCLUSIVE_LIQUIDS = EnumSet.of(
Material.WATER, Material.WATER, Material.LAVA, Material.LAVA);
/**
*
*/
public EraserBrush() {
this.setName("Eraser");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ErodeBrush.java
View File

@ -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");

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ExtrudeBrush.java
View File

@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace;
public class ExtrudeBrush extends Brush {
private double trueCircle;
/**
*
*/
public ExtrudeBrush() {
this.setName("Extrude");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FillDownBrush.java
View File

@ -16,9 +16,6 @@ public class FillDownBrush extends PerformBrush {
private boolean fillLiquid = true;
private boolean fromExisting = false;
/**
*
*/
public FillDownBrush() {
this.setName("Fill Down");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/FlatOceanBrush.java
View File

@ -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");
}

2
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/IBrush.java
View File

@ -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);

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JaggedLineBrush.java
View File

@ -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");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/JockeyBrush.java
View File

@ -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

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LightningBrush.java
View File

@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.SnipeData;
* @author Gavjenks
*/
public class LightningBrush extends Brush {
/**
*
*/
public LightningBrush() {
this.setName("Lightning");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/LineBrush.java
View File

@ -21,9 +21,6 @@ public class LineBrush extends PerformBrush {
private Vector targetCoords = new Vector();
private AsyncWorld targetWorld;
/**
*
*/
public LineBrush() {
this.setName("Line");
}

11
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/MoveBrush.java
View File

@ -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<AsyncBlockState> 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++) {

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OceanBrush.java
View File

@ -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)");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/OverlayBrush.java
View File

@ -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)");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/PaintingBrush.java
View File

@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.SnipeData;
* @author Voxel
*/
public class PaintingBrush extends Brush {
/**
*
*/
public PaintingBrush() {
this.setName("Painting");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RandomErodeBrush.java
View File

@ -24,9 +24,6 @@ public class RandomErodeBrush extends Brush {
private int fillRecursion = 1;
private Random generator = new Random();
/**
*
*/
public RandomErodeBrush() {
this.setName("RandomErode");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RegenerateChunkBrush.java
View File

@ -11,9 +11,7 @@ import org.bukkit.Chunk;
* @author Mick
*/
public class RegenerateChunkBrush extends Brush {
/**
*
*/
public RegenerateChunkBrush() {
this.setName("Chunk Generator 40k");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RingBrush.java
View File

@ -13,9 +13,6 @@ public class RingBrush extends PerformBrush {
private double trueCircle = 0;
private double innerSize = 0;
/**
*
*/
public RingBrush() {
this.setName("Ring");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DBrush.java
View File

@ -17,9 +17,6 @@ public class Rot2DBrush extends Brush {
private BlockWrapper[][][] snap;
private double se;
/**
*
*/
public Rot2DBrush() {
this.setName("2D Rotation");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot2DvertBrush.java
View File

@ -20,9 +20,6 @@ public class Rot2DvertBrush extends Brush {
private BlockWrapper[][][] snap;
private double se;
/**
*
*/
public Rot2DvertBrush() {
this.setName("2D Rotation");
}

6
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/Rot3DBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/RulerBrush.java
View File

@ -17,9 +17,6 @@ public class RulerBrush extends Brush {
private int yOff = 0;
private int zOff = 0;
/**
*
*/
public RulerBrush() {
this.setName("Ruler");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ScannerBrush.java
View File

@ -19,9 +19,6 @@ public class ScannerBrush extends Brush {
private int depth = DEPTH_DEFAULT;
private Material checkFor = Material.AIR;
/**
*
*/
public ScannerBrush() {
this.setName("Scanner");
}

5
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetBrush.java
View File

@ -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++) {

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneFlipBrush.java
View File

@ -16,9 +16,6 @@ public class SetRedstoneFlipBrush extends Brush {
private Undo undo;
private boolean northSouth = true;
/**
*
*/
public SetRedstoneFlipBrush() {
this.setName("Set Redstone Flip");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SetRedstoneRotateBrush.java
View File

@ -15,9 +15,6 @@ public class SetRedstoneRotateBrush extends Brush {
private Block block = null;
private Undo undo;
/**
*
*/
public SetRedstoneRotateBrush() {
this.setName("Set Redstone Rotate");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellBallBrush.java
View File

@ -11,9 +11,7 @@ import org.bukkit.block.Block;
* @author Voxel
*/
public class ShellBallBrush extends Brush {
/**
*
*/
public ShellBallBrush() {
this.setName("Shell Ball");
}

5
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellSetBrush.java
View File

@ -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<AsyncBlock> blocks = new ArrayList<>(selectionSize / 2);
for (int y = lowY; y <= highY; y++) {

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/ShellVoxelBrush.java
View File

@ -11,9 +11,7 @@ import org.bukkit.block.Block;
* @author Voxel
*/
public class ShellVoxelBrush extends Brush {
/**
*
*/
public ShellVoxelBrush() {
this.setName("Shell Voxel");
}

5
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SignOverwriteBrush.java
View File

@ -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)");

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SnipeBrush.java
View File

@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
* @author Voxel
*/
public class SnipeBrush extends PerformBrush {
/**
*
*/
public SnipeBrush() {
this.setName("Snipe");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SpiralStaircaseBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterBallBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterDiscBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterOverlayBrush.java
View File

@ -32,9 +32,6 @@ public class SplatterOverlayBrush extends PerformBrush {
private int depth = 3;
private boolean allBlocks = false;
/**
*
*/
public SplatterOverlayBrush() {
this.setName("Splatter Overlay");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/SplatterVoxelDiscBrush.java
View File

@ -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");
}

11
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StampBrush.java
View File

@ -9,9 +9,6 @@ import org.bukkit.ChatColor;
import java.util.HashSet;
/**
*
*/
public class StampBrush extends Brush {
protected HashSet<BlockWrapper> clone = new HashSet<>();
protected HashSet<BlockWrapper> 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;
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/StencilListBrush.java
View File

@ -27,9 +27,6 @@ public class StencilListBrush extends Brush {
private byte pasteParam = 0;
private HashMap<Integer, String> stencilList = new HashMap<>();
/**
*
*/
public StencilListBrush() {
this.setName("StencilList");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TreeSnipeBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/TriangleBrush.java
View File

@ -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");
}

3
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/UnderlayBrush.java
View File

@ -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)");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoltMeterBrush.java
View File

@ -11,9 +11,7 @@ import org.bukkit.block.BlockFace;
* @author Gavjenks
*/
public class VoltMeterBrush extends Brush {
/**
*
*/
public VoltMeterBrush() {
this.setName("VoltMeter");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelBrush.java
View File

@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
* @author Piotr
*/
public class VoxelBrush extends PerformBrush {
/**
*
*/
public VoxelBrush() {
this.setName("Voxel");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscBrush.java
View File

@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
* @author Voxel
*/
public class VoxelDiscBrush extends PerformBrush {
/**
*
*/
public VoxelDiscBrush() {
this.setName("Voxel Disc");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/VoxelDiscFaceBrush.java
View File

@ -10,9 +10,7 @@ import org.bukkit.block.BlockFace;
* @author Voxel
*/
public class VoxelDiscFaceBrush extends PerformBrush {
/**
*
*/
public VoxelDiscFaceBrush() {
this.setName("Voxel Disc Face");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/brush/WarpBrush.java
View File

@ -36,9 +36,7 @@ import org.bukkit.entity.Player;
* @author MikeMatrix
*/
public class WarpBrush extends Brush {
/**
*
*/
public WarpBrush() {
this.setName("Warp");
}

4
favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelReplaceCommand.java
View File

@ -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

1
favs/src/main/java/com/thevoxelbox/voxelsniper/command/VoxelVoxelCommand.java
View File

@ -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;

3
favs/src/main/java/com/thevoxelbox/voxelsniper/event/SniperBrushSizeChangedEvent.java
View File

@ -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;

3
favs/src/main/java/com/thevoxelbox/voxelsniper/util/UndoDelegate.java
View File

@ -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;

7
favs/src/main/java/com/thevoxelbox/voxelsniper/util/VoxelList.java
View File

@ -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.
*/

5
favs/src/main/resources/config.yml
View File

@ -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