mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-11-18 01:46:11 +00:00
Favs cleanup
- 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:
parent
20d624a571
commit
2f9ece3268
@ -1,6 +1,5 @@
|
|||||||
package com.boydti.fawe.bukkit.favs;
|
package com.boydti.fawe.bukkit.favs;
|
||||||
|
|
||||||
import com.boydti.fawe.config.BBC;
|
|
||||||
import com.boydti.fawe.object.FawePlayer;
|
import com.boydti.fawe.object.FawePlayer;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.extension.input.InputParseException;
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
@ -3,9 +3,6 @@ package com.thevoxelbox.voxelsniper;
|
|||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class Message {
|
public class Message {
|
||||||
private static final int BRUSH_SIZE_WARNING_THRESHOLD = 20;
|
private static final int BRUSH_SIZE_WARNING_THRESHOLD = 20;
|
||||||
private final SnipeData snipeData;
|
private final SnipeData snipeData;
|
||||||
|
@ -23,9 +23,9 @@ public final class PaintingWrapper {
|
|||||||
/**
|
/**
|
||||||
* The paint method used to scroll or set a painting to a specific type.
|
* The paint method used to scroll or set a painting to a specific type.
|
||||||
*
|
*
|
||||||
* @param p The player executing the method
|
* @param p The player executing the method
|
||||||
* @param auto Scroll automatically? If false will use 'choice' to try and set the painting
|
* @param auto Scroll automatically? If false will use 'choice' to try and set the painting
|
||||||
* @param back Scroll in reverse?
|
* @param back Scroll in reverse?
|
||||||
* @param choice Chosen index to set the painting to
|
* @param choice Chosen index to set the painting to
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
package com.thevoxelbox.voxelsniper;
|
package com.thevoxelbox.voxelsniper;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public enum SnipeAction {
|
public enum SnipeAction {
|
||||||
ARROW, GUNPOWDER
|
ARROW, GUNPOWDER
|
||||||
}
|
}
|
||||||
|
@ -128,10 +128,10 @@ public class Sniper {
|
|||||||
/**
|
/**
|
||||||
* Sniper execution call.
|
* Sniper execution call.
|
||||||
*
|
*
|
||||||
* @param action Action player performed
|
* @param action Action player performed
|
||||||
* @param itemInHand Item in hand of player
|
* @param itemInHand Item in hand of player
|
||||||
* @param clickedBlock Block that the player targeted/interacted with
|
* @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.
|
* @return true if command visibly processed, false otherwise.
|
||||||
*/
|
*/
|
||||||
public boolean snipe(final Action action, final Material itemInHand, final Block clickedBlock, final BlockFace clickedFace) {
|
public boolean snipe(final Action action, final Material itemInHand, final Block clickedBlock, final BlockFace clickedFace) {
|
||||||
|
@ -6,9 +6,6 @@ import org.bukkit.entity.Player;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class SniperManager {
|
public class SniperManager {
|
||||||
private Map<UUID, Sniper> sniperInstances = Maps.newHashMap();
|
private Map<UUID, Sniper> sniperInstances = Maps.newHashMap();
|
||||||
private VoxelSniper plugin;
|
private VoxelSniper plugin;
|
||||||
|
@ -1,19 +1,14 @@
|
|||||||
package com.thevoxelbox.voxelsniper;
|
package com.thevoxelbox.voxelsniper;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration storage defining global configurations for VoxelSniper.
|
* Configuration storage defining global configurations for VoxelSniper.
|
||||||
*/
|
*/
|
||||||
public class VoxelSniperConfiguration {
|
public class VoxelSniperConfiguration {
|
||||||
public static final String CONFIG_IDENTIFIER_LITESNIPER_MAX_BRUSH_SIZE = "litesniper-max-brush-size";
|
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 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_LITESNIPER_MAX_BRUSH_SIZE = 30;
|
||||||
public static final int DEFAULT_UNDO_CACHE_SIZE = 20;
|
|
||||||
public static final boolean DEFAULT_MESSAGE_ON_LOGIN_ENABLED = true;
|
public static final boolean DEFAULT_MESSAGE_ON_LOGIN_ENABLED = true;
|
||||||
private FileConfiguration configuration;
|
private FileConfiguration configuration;
|
||||||
|
|
||||||
@ -24,24 +19,6 @@ public class VoxelSniperConfiguration {
|
|||||||
this.configuration = configuration;
|
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.
|
* 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);
|
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.
|
* Returns if the login message is enabled.
|
||||||
*
|
*
|
||||||
@ -68,13 +36,4 @@ public class VoxelSniperConfiguration {
|
|||||||
public boolean isMessageOnLoginEnabled() {
|
public boolean isMessageOnLoginEnabled() {
|
||||||
return configuration.getBoolean(CONFIG_IDENTIFIER_MESSAGE_ON_LOGIN_ENABLED, DEFAULT_MESSAGE_ON_LOGIN_ENABLED);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -6,15 +6,9 @@ import org.bukkit.ChatColor;
|
|||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class BiomeBrush extends Brush {
|
public class BiomeBrush extends Brush {
|
||||||
private Biome selectedBiome = Biome.PLAINS;
|
|
||||||
|
|
||||||
/**
|
private Biome selectedBiome = Biome.PLAINS;
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BiomeBrush() {
|
public BiomeBrush() {
|
||||||
this.setName("Biome (/b biome [Biome Name])");
|
this.setName("Biome (/b biome [Biome Name])");
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
public class BlendBallBrush extends BlendBrushBase {
|
public class BlendBallBrush extends BlendBrushBase {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlendBallBrush() {
|
public BlendBallBrush() {
|
||||||
this.setName("Blend Ball");
|
this.setName("Blend Ball");
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
public class BlendDiscBrush extends BlendBrushBase {
|
public class BlendDiscBrush extends BlendBrushBase {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlendDiscBrush() {
|
public BlendDiscBrush() {
|
||||||
this.setName("Blend Disc");
|
this.setName("Blend Disc");
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
public class BlendVoxelBrush extends BlendBrushBase {
|
public class BlendVoxelBrush extends BlendBrushBase {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlendVoxelBrush() {
|
public BlendVoxelBrush() {
|
||||||
this.setName("Blend Voxel");
|
this.setName("Blend Voxel");
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.Undo;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
public class BlendVoxelDiscBrush extends BlendBrushBase {
|
public class BlendVoxelDiscBrush extends BlendBrushBase {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlendVoxelDiscBrush() {
|
public BlendVoxelDiscBrush() {
|
||||||
this.setName("Blend Voxel Disc");
|
this.setName("Blend Voxel Disc");
|
||||||
}
|
}
|
||||||
|
@ -18,9 +18,6 @@ public class BlobBrush extends PerformBrush {
|
|||||||
private Random randomGenerator = new Random();
|
private Random randomGenerator = new Random();
|
||||||
private int growPercent = GROW_PERCENT_DEFAULT; // chance block on recursion pass is made active
|
private int growPercent = GROW_PERCENT_DEFAULT; // chance block on recursion pass is made active
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlobBrush() {
|
public BlobBrush() {
|
||||||
this.setName("Blob");
|
this.setName("Blob");
|
||||||
}
|
}
|
||||||
|
@ -36,9 +36,6 @@ public class BlockResetBrush extends Brush {
|
|||||||
BlockResetBrush.DENIED_UPDATES.add(Material.OAK_FENCE_GATE);
|
BlockResetBrush.DENIED_UPDATES.add(Material.OAK_FENCE_GATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public BlockResetBrush() {
|
public BlockResetBrush() {
|
||||||
this.setName("Block Reset Brush");
|
this.setName("Block Reset Brush");
|
||||||
}
|
}
|
||||||
|
@ -9,17 +9,17 @@ import com.thevoxelbox.voxelsniper.SnipeData;
|
|||||||
import org.bukkit.Material;
|
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
|
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
|
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
|
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,
|
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
|
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,
|
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
|
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
|
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
|
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
|
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.
|
brushes.
|
||||||
*
|
*
|
||||||
* @author GavJenks
|
* @author GavJenks
|
||||||
*/
|
*/
|
||||||
|
@ -33,9 +33,9 @@ public abstract class Brush implements IBrush {
|
|||||||
private String name = "Undefined";
|
private String name = "Undefined";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param x
|
* @param x X coordinate
|
||||||
* @param y
|
* @param y Y coordinate
|
||||||
* @param z
|
* @param z Z coordinate
|
||||||
* @return {@link Block}
|
* @return {@link Block}
|
||||||
*/
|
*/
|
||||||
public final AsyncBlock clampY(final int x, final int y, final int z) {
|
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.
|
* Overridable getTarget method.
|
||||||
*
|
*
|
||||||
* @param v
|
* @param v Sniper caller
|
||||||
* @param clickedBlock
|
* @param clickedBlock Block that the player targeted/interacted with
|
||||||
* @param clickedFace
|
* @param clickedFace Face of that targeted Block
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
protected final boolean getTarget(final SnipeData v, final AsyncBlock clickedBlock, final BlockFace clickedFace) {
|
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.
|
* Sets the Id of the block at the passed coordinate.
|
||||||
*
|
*
|
||||||
* @param z Z coordinate
|
* @param z Z coordinate
|
||||||
* @param x X coordinate
|
* @param x X coordinate
|
||||||
* @param y Y coordinate
|
* @param y Y coordinate
|
||||||
* @param id The id the block will be set to
|
* @param id The id the block will be set to
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@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.
|
* Sets the id and data value of the block at the passed coordinate.
|
||||||
*
|
*
|
||||||
* @param x X coordinate
|
* @param x X coordinate
|
||||||
* @param y Y coordinate
|
* @param y Y coordinate
|
||||||
* @param z Z coordinate
|
* @param z Z coordinate
|
||||||
* @param id The id the block will be set to
|
* @param id The id the block will be set to
|
||||||
* @param data The data value the block will be set to
|
* @param data The data value the block will be set to
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@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.
|
* Sets the id and data value of the block at the passed coordinate.
|
||||||
*
|
*
|
||||||
* @param x X coordinate
|
* @param x X coordinate
|
||||||
* @param y Y coordinate
|
* @param y Y coordinate
|
||||||
* @param z Z coordinate
|
* @param z Z coordinate
|
||||||
* @param id The id the block will be set to
|
* @param id The id the block will be set to
|
||||||
* @param data The data value the block will be set to
|
* @param data The data value the block will be set to
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
|
@ -19,9 +19,6 @@ public class CanyonBrush extends Brush {
|
|||||||
private static final int SHIFT_LEVEL_MAX = 60;
|
private static final int SHIFT_LEVEL_MAX = 60;
|
||||||
private int yLevel = 10;
|
private int yLevel = 10;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CanyonBrush() {
|
public CanyonBrush() {
|
||||||
this.setName("Canyon");
|
this.setName("Canyon");
|
||||||
}
|
}
|
||||||
|
@ -14,9 +14,6 @@ public class CanyonSelectionBrush extends CanyonBrush {
|
|||||||
private int fx;
|
private int fx;
|
||||||
private int fz;
|
private int fz;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CanyonSelectionBrush() {
|
public CanyonSelectionBrush() {
|
||||||
this.setName("Canyon Selection");
|
this.setName("Canyon Selection");
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ public class CheckerVoxelDiscBrush extends PerformBrush {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param v
|
* @param v Snipe Data
|
||||||
* @param target
|
* @param target
|
||||||
*/
|
*/
|
||||||
private void applyBrush(final SnipeData v, final Block target) {
|
private void applyBrush(final SnipeData v, final Block target) {
|
||||||
|
@ -13,9 +13,6 @@ import org.bukkit.Material;
|
|||||||
public class CleanSnowBrush extends Brush {
|
public class CleanSnowBrush extends Brush {
|
||||||
private double trueCircle = 0;
|
private double trueCircle = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CleanSnowBrush() {
|
public CleanSnowBrush() {
|
||||||
this.setName("Clean Snow");
|
this.setName("Clean Snow");
|
||||||
}
|
}
|
||||||
|
@ -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
|
* 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;
|
* 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) {
|
private void clone(final SnipeData v) {
|
||||||
final int brushSize = v.getBrushSize();
|
final int brushSize = v.getBrushSize();
|
||||||
|
@ -16,9 +16,6 @@ import org.bukkit.util.Vector;
|
|||||||
public class CometBrush extends Brush {
|
public class CometBrush extends Brush {
|
||||||
private boolean useBigBalls = false;
|
private boolean useBigBalls = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CometBrush() {
|
public CometBrush() {
|
||||||
this.setName("Comet");
|
this.setName("Comet");
|
||||||
}
|
}
|
||||||
|
@ -25,9 +25,6 @@ public class CopyPastaBrush extends Brush {
|
|||||||
private int[] arraySize = new int[3];
|
private int[] arraySize = new int[3];
|
||||||
private int pivot = 0; // ccw degrees
|
private int pivot = 0; // ccw degrees
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CopyPastaBrush() {
|
public CopyPastaBrush() {
|
||||||
this.setName("CopyPasta");
|
this.setName("CopyPasta");
|
||||||
}
|
}
|
||||||
|
@ -12,9 +12,6 @@ import org.bukkit.block.Block;
|
|||||||
public class CylinderBrush extends PerformBrush {
|
public class CylinderBrush extends PerformBrush {
|
||||||
private double trueCircle = 0;
|
private double trueCircle = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public CylinderBrush() {
|
public CylinderBrush() {
|
||||||
this.setName("Cylinder");
|
this.setName("Cylinder");
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ public class DiscBrush extends PerformBrush {
|
|||||||
/**
|
/**
|
||||||
* Disc executor.
|
* Disc executor.
|
||||||
*
|
*
|
||||||
* @param v
|
* @param v Snipe Data
|
||||||
*/
|
*/
|
||||||
private void disc(final SnipeData v, final Block targetBlock) {
|
private void disc(final SnipeData v, final Block targetBlock) {
|
||||||
final double radiusSquared = (v.getBrushSize() + this.trueCircle) * (v.getBrushSize() + this.trueCircle);
|
final double radiusSquared = (v.getBrushSize() + this.trueCircle) * (v.getBrushSize() + this.trueCircle);
|
||||||
|
@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace;
|
|||||||
public class DiscFaceBrush extends PerformBrush {
|
public class DiscFaceBrush extends PerformBrush {
|
||||||
private double trueCircle = 0;
|
private double trueCircle = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public DiscFaceBrush() {
|
public DiscFaceBrush() {
|
||||||
this.setName("Disc Face");
|
this.setName("Disc Face");
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,7 @@ import java.util.Set;
|
|||||||
* @author MikeMatrix
|
* @author MikeMatrix
|
||||||
*/
|
*/
|
||||||
public class DomeBrush extends Brush {
|
public class DomeBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public DomeBrush() {
|
public DomeBrush() {
|
||||||
this.setName("Dome");
|
this.setName("Dome");
|
||||||
}
|
}
|
||||||
@ -32,8 +30,8 @@ public class DomeBrush extends Brush {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param v
|
* @param v Snipe Data
|
||||||
* @param targetBlock
|
* @param targetBlock the targetBlock to set
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private void generateDome(final SnipeData v, final Block targetBlock) {
|
private void generateDome(final SnipeData v, final Block targetBlock) {
|
||||||
|
@ -14,9 +14,6 @@ public class DrainBrush extends Brush {
|
|||||||
private double trueCircle = 0;
|
private double trueCircle = 0;
|
||||||
private boolean disc = false;
|
private boolean disc = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public DrainBrush() {
|
public DrainBrush() {
|
||||||
this.setName("Drain");
|
this.setName("Drain");
|
||||||
}
|
}
|
||||||
|
@ -23,9 +23,6 @@ public class EllipseBrush extends PerformBrush {
|
|||||||
private double stepSize;
|
private double stepSize;
|
||||||
private boolean fill;
|
private boolean fill;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public EllipseBrush() {
|
public EllipseBrush() {
|
||||||
this.setName("Ellipse");
|
this.setName("Ellipse");
|
||||||
}
|
}
|
||||||
|
@ -12,9 +12,6 @@ public class EllipsoidBrush extends PerformBrush {
|
|||||||
private double zRad;
|
private double zRad;
|
||||||
private boolean istrue;
|
private boolean istrue;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public EllipsoidBrush() {
|
public EllipsoidBrush() {
|
||||||
this.setName("Ellipsoid");
|
this.setName("Ellipsoid");
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,6 @@ import org.bukkit.entity.EntityType;
|
|||||||
public class EntityBrush extends Brush {
|
public class EntityBrush extends Brush {
|
||||||
private EntityType entityType = EntityType.ZOMBIE;
|
private EntityType entityType = EntityType.ZOMBIE;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public EntityBrush() {
|
public EntityBrush() {
|
||||||
this.setName("Entity");
|
this.setName("Entity");
|
||||||
}
|
}
|
||||||
|
@ -11,15 +11,9 @@ import java.util.Iterator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.regex.PatternSyntaxException;
|
import java.util.regex.PatternSyntaxException;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class EntityRemovalBrush extends Brush {
|
public class EntityRemovalBrush extends Brush {
|
||||||
private final List<String> exemptions = new ArrayList<>(3);
|
private final List<String> exemptions = new ArrayList<>(3);
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public EntityRemovalBrush() {
|
public EntityRemovalBrush() {
|
||||||
this.setName("Entity Removal");
|
this.setName("Entity Removal");
|
||||||
|
|
||||||
|
@ -20,9 +20,6 @@ public class EraserBrush extends Brush {
|
|||||||
private static final Set<Material> EXCLUSIVE_LIQUIDS = EnumSet.of(
|
private static final Set<Material> EXCLUSIVE_LIQUIDS = EnumSet.of(
|
||||||
Material.WATER, Material.WATER, Material.LAVA, Material.LAVA);
|
Material.WATER, Material.WATER, Material.LAVA, Material.LAVA);
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public EraserBrush() {
|
public EraserBrush() {
|
||||||
this.setName("Eraser");
|
this.setName("Eraser");
|
||||||
}
|
}
|
||||||
|
@ -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 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);
|
private ErosionPreset currentPreset = new ErosionPreset(0, 1, 0, 1);
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ErodeBrush() {
|
public ErodeBrush() {
|
||||||
this.setName("Erode");
|
this.setName("Erode");
|
||||||
|
|
||||||
|
@ -13,9 +13,6 @@ import org.bukkit.block.BlockFace;
|
|||||||
public class ExtrudeBrush extends Brush {
|
public class ExtrudeBrush extends Brush {
|
||||||
private double trueCircle;
|
private double trueCircle;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ExtrudeBrush() {
|
public ExtrudeBrush() {
|
||||||
this.setName("Extrude");
|
this.setName("Extrude");
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,6 @@ public class FillDownBrush extends PerformBrush {
|
|||||||
private boolean fillLiquid = true;
|
private boolean fillLiquid = true;
|
||||||
private boolean fromExisting = false;
|
private boolean fromExisting = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public FillDownBrush() {
|
public FillDownBrush() {
|
||||||
this.setName("Fill Down");
|
this.setName("Fill Down");
|
||||||
}
|
}
|
||||||
|
@ -15,9 +15,6 @@ public class FlatOceanBrush extends Brush {
|
|||||||
private int waterLevel = DEFAULT_WATER_LEVEL;
|
private int waterLevel = DEFAULT_WATER_LEVEL;
|
||||||
private int floorLevel = DEFAULT_FLOOR_LEVEL;
|
private int floorLevel = DEFAULT_FLOOR_LEVEL;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public FlatOceanBrush() {
|
public FlatOceanBrush() {
|
||||||
this.setName("FlatOcean");
|
this.setName("FlatOcean");
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ public interface IBrush {
|
|||||||
* Handles parameters passed to brushes.
|
* Handles parameters passed to brushes.
|
||||||
*
|
*
|
||||||
* @param par Array of string containing parameters
|
* @param par Array of string containing parameters
|
||||||
* @param v Snipe Data
|
* @param v Snipe Data
|
||||||
*/
|
*/
|
||||||
void parameters(String[] par, SnipeData v);
|
void parameters(String[] par, SnipeData v);
|
||||||
|
|
||||||
|
@ -29,9 +29,6 @@ public class JaggedLineBrush extends PerformBrush {
|
|||||||
private int recursion = RECURSION_DEFAULT;
|
private int recursion = RECURSION_DEFAULT;
|
||||||
private int spread = SPREAD_DEFAULT;
|
private int spread = SPREAD_DEFAULT;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public JaggedLineBrush() {
|
public JaggedLineBrush() {
|
||||||
this.setName("Jagged Line");
|
this.setName("Jagged Line");
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,6 @@ public class JockeyBrush extends Brush {
|
|||||||
private JockeyType jockeyType = JockeyType.NORMAL_ALL_ENTITIES;
|
private JockeyType jockeyType = JockeyType.NORMAL_ALL_ENTITIES;
|
||||||
private Entity jockeyedEntity = null;
|
private Entity jockeyedEntity = null;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public JockeyBrush() {
|
public JockeyBrush() {
|
||||||
this.setName("Jockey");
|
this.setName("Jockey");
|
||||||
}
|
}
|
||||||
@ -137,7 +134,6 @@ public class JockeyBrush extends Brush {
|
|||||||
public final void info(final Message vm) {
|
public final void info(final Message vm) {
|
||||||
vm.brushName(this.getName());
|
vm.brushName(this.getName());
|
||||||
vm.custom("Current jockey mode: " + ChatColor.GREEN + jockeyType.toString());
|
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
|
@Override
|
||||||
|
@ -7,9 +7,7 @@ import com.thevoxelbox.voxelsniper.SnipeData;
|
|||||||
* @author Gavjenks
|
* @author Gavjenks
|
||||||
*/
|
*/
|
||||||
public class LightningBrush extends Brush {
|
public class LightningBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public LightningBrush() {
|
public LightningBrush() {
|
||||||
this.setName("Lightning");
|
this.setName("Lightning");
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,6 @@ public class LineBrush extends PerformBrush {
|
|||||||
private Vector targetCoords = new Vector();
|
private Vector targetCoords = new Vector();
|
||||||
private AsyncWorld targetWorld;
|
private AsyncWorld targetWorld;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public LineBrush() {
|
public LineBrush() {
|
||||||
this.setName("Line");
|
this.setName("Line");
|
||||||
}
|
}
|
||||||
|
@ -30,9 +30,6 @@ public class MoveBrush extends Brush {
|
|||||||
*/
|
*/
|
||||||
private Selection selection = null;
|
private Selection selection = null;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public MoveBrush() {
|
public MoveBrush() {
|
||||||
this.setName("Move");
|
this.setName("Move");
|
||||||
}
|
}
|
||||||
@ -181,13 +178,7 @@ public class MoveBrush extends Brush {
|
|||||||
* Calculated BlockStates of the selection.
|
* Calculated BlockStates of the selection.
|
||||||
*/
|
*/
|
||||||
private final ArrayList<AsyncBlockState> blockStates = new ArrayList<>();
|
private final ArrayList<AsyncBlockState> blockStates = new ArrayList<>();
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
private Location location1 = null;
|
private Location location1 = null;
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
private Location location2 = 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 highY = Math.max(this.location1.getBlockY(), this.location2.getBlockY());
|
||||||
final int highZ = Math.max(this.location1.getBlockZ(), this.location2.getBlockZ());
|
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) {
|
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();
|
final AsyncWorld world = (AsyncWorld) this.location1.getWorld();
|
||||||
for (int y = lowY; y <= highY; y++) {
|
for (int y = lowY; y <= highY; y++) {
|
||||||
|
@ -20,9 +20,6 @@ public class OceanBrush extends Brush {
|
|||||||
private int waterLevel = WATER_LEVEL_DEFAULT;
|
private int waterLevel = WATER_LEVEL_DEFAULT;
|
||||||
private boolean coverFloor = false;
|
private boolean coverFloor = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public OceanBrush() {
|
public OceanBrush() {
|
||||||
this.setName("OCEANATOR 5000(tm)");
|
this.setName("OCEANATOR 5000(tm)");
|
||||||
}
|
}
|
||||||
|
@ -18,9 +18,6 @@ public class OverlayBrush extends PerformBrush {
|
|||||||
private int depth = DEFAULT_DEPTH;
|
private int depth = DEFAULT_DEPTH;
|
||||||
private boolean allBlocks = false;
|
private boolean allBlocks = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public OverlayBrush() {
|
public OverlayBrush() {
|
||||||
this.setName("Overlay (Topsoil Filling)");
|
this.setName("Overlay (Topsoil Filling)");
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.SnipeData;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class PaintingBrush extends Brush {
|
public class PaintingBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public PaintingBrush() {
|
public PaintingBrush() {
|
||||||
this.setName("Painting");
|
this.setName("Painting");
|
||||||
}
|
}
|
||||||
|
@ -24,9 +24,6 @@ public class RandomErodeBrush extends Brush {
|
|||||||
private int fillRecursion = 1;
|
private int fillRecursion = 1;
|
||||||
private Random generator = new Random();
|
private Random generator = new Random();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public RandomErodeBrush() {
|
public RandomErodeBrush() {
|
||||||
this.setName("RandomErode");
|
this.setName("RandomErode");
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,7 @@ import org.bukkit.Chunk;
|
|||||||
* @author Mick
|
* @author Mick
|
||||||
*/
|
*/
|
||||||
public class RegenerateChunkBrush extends Brush {
|
public class RegenerateChunkBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public RegenerateChunkBrush() {
|
public RegenerateChunkBrush() {
|
||||||
this.setName("Chunk Generator 40k");
|
this.setName("Chunk Generator 40k");
|
||||||
}
|
}
|
||||||
|
@ -13,9 +13,6 @@ public class RingBrush extends PerformBrush {
|
|||||||
private double trueCircle = 0;
|
private double trueCircle = 0;
|
||||||
private double innerSize = 0;
|
private double innerSize = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public RingBrush() {
|
public RingBrush() {
|
||||||
this.setName("Ring");
|
this.setName("Ring");
|
||||||
}
|
}
|
||||||
|
@ -17,9 +17,6 @@ public class Rot2DBrush extends Brush {
|
|||||||
private BlockWrapper[][][] snap;
|
private BlockWrapper[][][] snap;
|
||||||
private double se;
|
private double se;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Rot2DBrush() {
|
public Rot2DBrush() {
|
||||||
this.setName("2D Rotation");
|
this.setName("2D Rotation");
|
||||||
}
|
}
|
||||||
|
@ -20,9 +20,6 @@ public class Rot2DvertBrush extends Brush {
|
|||||||
private BlockWrapper[][][] snap;
|
private BlockWrapper[][][] snap;
|
||||||
private double se;
|
private double se;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Rot2DvertBrush() {
|
public Rot2DvertBrush() {
|
||||||
this.setName("2D Rotation");
|
this.setName("2D Rotation");
|
||||||
}
|
}
|
||||||
|
@ -8,9 +8,6 @@ import com.thevoxelbox.voxelsniper.Undo;
|
|||||||
import com.thevoxelbox.voxelsniper.util.BlockWrapper;
|
import com.thevoxelbox.voxelsniper.util.BlockWrapper;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class Rot3DBrush extends Brush {
|
public class Rot3DBrush extends Brush {
|
||||||
private final int mode = 0;
|
private final int mode = 0;
|
||||||
private int bSize;
|
private int bSize;
|
||||||
@ -20,9 +17,6 @@ public class Rot3DBrush extends Brush {
|
|||||||
private double sePitch;
|
private double sePitch;
|
||||||
private double seRoll;
|
private double seRoll;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Rot3DBrush() {
|
public Rot3DBrush() {
|
||||||
this.setName("3D Rotation");
|
this.setName("3D Rotation");
|
||||||
}
|
}
|
||||||
|
@ -17,9 +17,6 @@ public class RulerBrush extends Brush {
|
|||||||
private int yOff = 0;
|
private int yOff = 0;
|
||||||
private int zOff = 0;
|
private int zOff = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public RulerBrush() {
|
public RulerBrush() {
|
||||||
this.setName("Ruler");
|
this.setName("Ruler");
|
||||||
}
|
}
|
||||||
|
@ -19,9 +19,6 @@ public class ScannerBrush extends Brush {
|
|||||||
private int depth = DEPTH_DEFAULT;
|
private int depth = DEPTH_DEFAULT;
|
||||||
private Material checkFor = Material.AIR;
|
private Material checkFor = Material.AIR;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ScannerBrush() {
|
public ScannerBrush() {
|
||||||
this.setName("Scanner");
|
this.setName("Scanner");
|
||||||
}
|
}
|
||||||
|
@ -13,9 +13,6 @@ public class SetBrush extends PerformBrush {
|
|||||||
private static final int SELECTION_SIZE_MAX = 5000000;
|
private static final int SELECTION_SIZE_MAX = 5000000;
|
||||||
private Block block = null;
|
private Block block = null;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SetBrush() {
|
public SetBrush() {
|
||||||
this.setName("Set");
|
this.setName("Set");
|
||||||
}
|
}
|
||||||
@ -38,7 +35,7 @@ public class SetBrush extends PerformBrush {
|
|||||||
final int highZ = Math.max(this.block.getZ(), bl.getZ());
|
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) {
|
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 {
|
} else {
|
||||||
for (int y = lowY; y <= highY; y++) {
|
for (int y = lowY; y <= highY; y++) {
|
||||||
for (int x = lowX; x <= highX; x++) {
|
for (int x = lowX; x <= highX; x++) {
|
||||||
|
@ -16,9 +16,6 @@ public class SetRedstoneFlipBrush extends Brush {
|
|||||||
private Undo undo;
|
private Undo undo;
|
||||||
private boolean northSouth = true;
|
private boolean northSouth = true;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SetRedstoneFlipBrush() {
|
public SetRedstoneFlipBrush() {
|
||||||
this.setName("Set Redstone Flip");
|
this.setName("Set Redstone Flip");
|
||||||
}
|
}
|
||||||
|
@ -15,9 +15,6 @@ public class SetRedstoneRotateBrush extends Brush {
|
|||||||
private Block block = null;
|
private Block block = null;
|
||||||
private Undo undo;
|
private Undo undo;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SetRedstoneRotateBrush() {
|
public SetRedstoneRotateBrush() {
|
||||||
this.setName("Set Redstone Rotate");
|
this.setName("Set Redstone Rotate");
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,7 @@ import org.bukkit.block.Block;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class ShellBallBrush extends Brush {
|
public class ShellBallBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ShellBallBrush() {
|
public ShellBallBrush() {
|
||||||
this.setName("Shell Ball");
|
this.setName("Shell Ball");
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,6 @@ public class ShellSetBrush extends Brush {
|
|||||||
private static final int MAX_SIZE = 5000000;
|
private static final int MAX_SIZE = 5000000;
|
||||||
private Block block = null;
|
private Block block = null;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ShellSetBrush() {
|
public ShellSetBrush() {
|
||||||
this.setName("Shell Set");
|
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);
|
int selectionSize = Math.abs(highX - lowX) * Math.abs(highZ - lowZ) * Math.abs(highY - lowY);
|
||||||
if (selectionSize > MAX_SIZE) {
|
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 {
|
} else {
|
||||||
final ArrayList<AsyncBlock> blocks = new ArrayList<>(selectionSize / 2);
|
final ArrayList<AsyncBlock> blocks = new ArrayList<>(selectionSize / 2);
|
||||||
for (int y = lowY; y <= highY; y++) {
|
for (int y = lowY; y <= highY; y++) {
|
||||||
|
@ -11,9 +11,7 @@ import org.bukkit.block.Block;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class ShellVoxelBrush extends Brush {
|
public class ShellVoxelBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public ShellVoxelBrush() {
|
public ShellVoxelBrush() {
|
||||||
this.setName("Shell Voxel");
|
this.setName("Shell Voxel");
|
||||||
}
|
}
|
||||||
|
@ -26,9 +26,6 @@ public class SignOverwriteBrush extends Brush {
|
|||||||
private boolean[] signLinesEnabled = new boolean[NUM_SIGN_LINES];
|
private boolean[] signLinesEnabled = new boolean[NUM_SIGN_LINES];
|
||||||
private boolean rangedMode = false;
|
private boolean rangedMode = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SignOverwriteBrush() {
|
public SignOverwriteBrush() {
|
||||||
this.setName("Sign Overwrite Brush");
|
this.setName("Sign Overwrite Brush");
|
||||||
|
|
||||||
@ -133,7 +130,7 @@ public class SignOverwriteBrush extends Brush {
|
|||||||
try {
|
try {
|
||||||
if (parameter.equalsIgnoreCase("info")) {
|
if (parameter.equalsIgnoreCase("info")) {
|
||||||
v.sendMessage(ChatColor.AQUA + "Sign Overwrite Brush Powder/Arrow:");
|
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.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.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)");
|
v.sendMessage(ChatColor.GREEN + "-1[:(enabled|disabled)] ... " + ChatColor.BLUE + "-- Sets the text of the first sign line. (e.g. -1 Blah Blah)");
|
||||||
|
@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class SnipeBrush extends PerformBrush {
|
public class SnipeBrush extends PerformBrush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SnipeBrush() {
|
public SnipeBrush() {
|
||||||
this.setName("Snipe");
|
this.setName("Snipe");
|
||||||
}
|
}
|
||||||
|
@ -17,9 +17,6 @@ public class SpiralStaircaseBrush extends Brush {
|
|||||||
private String sdirect = "c"; // "c" clockwise (default), "cc" counter-clockwise
|
private String sdirect = "c"; // "c" clockwise (default), "cc" counter-clockwise
|
||||||
private String sopen = "n"; // "n" north (default), "e" east, "world" south, "world" west
|
private String sopen = "n"; // "n" north (default), "e" east, "world" south, "world" west
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SpiralStaircaseBrush() {
|
public SpiralStaircaseBrush() {
|
||||||
this.setName("Spiral Staircase");
|
this.setName("Spiral Staircase");
|
||||||
}
|
}
|
||||||
|
@ -26,9 +26,6 @@ public class SplatterBallBrush extends PerformBrush {
|
|||||||
private int splatterRecursions; // How many times you grow the seeds
|
private int splatterRecursions; // How many times you grow the seeds
|
||||||
private Random generator = new Random();
|
private Random generator = new Random();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SplatterBallBrush() {
|
public SplatterBallBrush() {
|
||||||
this.setName("Splatter Ball");
|
this.setName("Splatter Ball");
|
||||||
}
|
}
|
||||||
|
@ -26,9 +26,6 @@ public class SplatterDiscBrush extends PerformBrush {
|
|||||||
private int splatterRecursions; // How many times you grow the seeds
|
private int splatterRecursions; // How many times you grow the seeds
|
||||||
private Random generator = new Random();
|
private Random generator = new Random();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SplatterDiscBrush() {
|
public SplatterDiscBrush() {
|
||||||
this.setName("Splatter Disc");
|
this.setName("Splatter Disc");
|
||||||
}
|
}
|
||||||
|
@ -32,9 +32,6 @@ public class SplatterOverlayBrush extends PerformBrush {
|
|||||||
private int depth = 3;
|
private int depth = 3;
|
||||||
private boolean allBlocks = false;
|
private boolean allBlocks = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SplatterOverlayBrush() {
|
public SplatterOverlayBrush() {
|
||||||
this.setName("Splatter Overlay");
|
this.setName("Splatter Overlay");
|
||||||
}
|
}
|
||||||
|
@ -26,9 +26,6 @@ public class SplatterVoxelBrush extends PerformBrush {
|
|||||||
private int splatterRecursions; // How many times you grow the seeds
|
private int splatterRecursions; // How many times you grow the seeds
|
||||||
private Random generator = new Random();
|
private Random generator = new Random();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SplatterVoxelBrush() {
|
public SplatterVoxelBrush() {
|
||||||
this.setName("Splatter Voxel");
|
this.setName("Splatter Voxel");
|
||||||
}
|
}
|
||||||
|
@ -26,9 +26,6 @@ public class SplatterVoxelDiscBrush extends PerformBrush {
|
|||||||
private int splatterRecursions; // How many times you grow the seeds
|
private int splatterRecursions; // How many times you grow the seeds
|
||||||
private Random generator = new Random();
|
private Random generator = new Random();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public SplatterVoxelDiscBrush() {
|
public SplatterVoxelDiscBrush() {
|
||||||
this.setName("Splatter Voxel Disc");
|
this.setName("Splatter Voxel Disc");
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,6 @@ import org.bukkit.ChatColor;
|
|||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class StampBrush extends Brush {
|
public class StampBrush extends Brush {
|
||||||
protected HashSet<BlockWrapper> clone = new HashSet<>();
|
protected HashSet<BlockWrapper> clone = new HashSet<>();
|
||||||
protected HashSet<BlockWrapper> fall = new HashSet<>();
|
protected HashSet<BlockWrapper> fall = new HashSet<>();
|
||||||
@ -20,16 +17,12 @@ public class StampBrush extends Brush {
|
|||||||
protected Undo undo;
|
protected Undo undo;
|
||||||
protected boolean sorted = false;
|
protected boolean sorted = false;
|
||||||
protected StampType stamp = StampType.DEFAULT;
|
protected StampType stamp = StampType.DEFAULT;
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public StampBrush() {
|
public StampBrush() {
|
||||||
this.setName("Stamp");
|
this.setName("Stamp");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public final void reSort() {
|
public final void reSort() {
|
||||||
this.sorted = false;
|
this.sorted = false;
|
||||||
}
|
}
|
||||||
|
@ -27,9 +27,6 @@ public class StencilListBrush extends Brush {
|
|||||||
private byte pasteParam = 0;
|
private byte pasteParam = 0;
|
||||||
private HashMap<Integer, String> stencilList = new HashMap<>();
|
private HashMap<Integer, String> stencilList = new HashMap<>();
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public StencilListBrush() {
|
public StencilListBrush() {
|
||||||
this.setName("StencilList");
|
this.setName("StencilList");
|
||||||
}
|
}
|
||||||
|
@ -19,9 +19,6 @@ import org.bukkit.block.BlockFace;
|
|||||||
public class TreeSnipeBrush extends Brush {
|
public class TreeSnipeBrush extends Brush {
|
||||||
private TreeType treeType = TreeType.TREE;
|
private TreeType treeType = TreeType.TREE;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public TreeSnipeBrush() {
|
public TreeSnipeBrush() {
|
||||||
this.setName("Tree Snipe");
|
this.setName("Tree Snipe");
|
||||||
}
|
}
|
||||||
|
@ -19,9 +19,6 @@ public class TriangleBrush extends PerformBrush {
|
|||||||
private double[] vectorThree = new double[3]; // Point 2 to 3, for area calculations
|
private double[] vectorThree = new double[3]; // Point 2 to 3, for area calculations
|
||||||
private double[] normalVector = new double[3];
|
private double[] normalVector = new double[3];
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public TriangleBrush() {
|
public TriangleBrush() {
|
||||||
this.setName("Triangle");
|
this.setName("Triangle");
|
||||||
}
|
}
|
||||||
|
@ -16,9 +16,6 @@ public class UnderlayBrush extends PerformBrush {
|
|||||||
private int depth = DEFAULT_DEPTH;
|
private int depth = DEFAULT_DEPTH;
|
||||||
private boolean allBlocks = false;
|
private boolean allBlocks = false;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public UnderlayBrush() {
|
public UnderlayBrush() {
|
||||||
this.setName("Underlay (Reverse Overlay)");
|
this.setName("Underlay (Reverse Overlay)");
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,7 @@ import org.bukkit.block.BlockFace;
|
|||||||
* @author Gavjenks
|
* @author Gavjenks
|
||||||
*/
|
*/
|
||||||
public class VoltMeterBrush extends Brush {
|
public class VoltMeterBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public VoltMeterBrush() {
|
public VoltMeterBrush() {
|
||||||
this.setName("VoltMeter");
|
this.setName("VoltMeter");
|
||||||
}
|
}
|
||||||
|
@ -8,9 +8,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
|
|||||||
* @author Piotr
|
* @author Piotr
|
||||||
*/
|
*/
|
||||||
public class VoxelBrush extends PerformBrush {
|
public class VoxelBrush extends PerformBrush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public VoxelBrush() {
|
public VoxelBrush() {
|
||||||
this.setName("Voxel");
|
this.setName("Voxel");
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,7 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class VoxelDiscBrush extends PerformBrush {
|
public class VoxelDiscBrush extends PerformBrush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public VoxelDiscBrush() {
|
public VoxelDiscBrush() {
|
||||||
this.setName("Voxel Disc");
|
this.setName("Voxel Disc");
|
||||||
}
|
}
|
||||||
|
@ -10,9 +10,7 @@ import org.bukkit.block.BlockFace;
|
|||||||
* @author Voxel
|
* @author Voxel
|
||||||
*/
|
*/
|
||||||
public class VoxelDiscFaceBrush extends PerformBrush {
|
public class VoxelDiscFaceBrush extends PerformBrush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public VoxelDiscFaceBrush() {
|
public VoxelDiscFaceBrush() {
|
||||||
this.setName("Voxel Disc Face");
|
this.setName("Voxel Disc Face");
|
||||||
}
|
}
|
||||||
|
@ -36,9 +36,7 @@ import org.bukkit.entity.Player;
|
|||||||
* @author MikeMatrix
|
* @author MikeMatrix
|
||||||
*/
|
*/
|
||||||
public class WarpBrush extends Brush {
|
public class WarpBrush extends Brush {
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public WarpBrush() {
|
public WarpBrush() {
|
||||||
this.setName("Warp");
|
this.setName("Warp");
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package com.thevoxelbox.voxelsniper.command;
|
package com.thevoxelbox.voxelsniper.command;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.commands.material;
|
|
||||||
import com.boydti.fawe.bukkit.wrapper.AsyncBlock;
|
import com.boydti.fawe.bukkit.wrapper.AsyncBlock;
|
||||||
import com.sk89q.worldedit.world.block.BlockType;
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
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.Sniper;
|
||||||
import com.thevoxelbox.voxelsniper.VoxelSniper;
|
import com.thevoxelbox.voxelsniper.VoxelSniper;
|
||||||
import com.thevoxelbox.voxelsniper.api.command.VoxelCommand;
|
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;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class VoxelReplaceCommand extends VoxelCommand
|
public class VoxelReplaceCommand extends VoxelCommand
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
package com.thevoxelbox.voxelsniper.command;
|
package com.thevoxelbox.voxelsniper.command;
|
||||||
|
|
||||||
import com.bekvon.bukkit.residence.commands.material;
|
|
||||||
import com.boydti.fawe.bukkit.favs.PatternUtil;
|
import com.boydti.fawe.bukkit.favs.PatternUtil;
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
@ -4,9 +4,6 @@ import com.thevoxelbox.voxelsniper.Sniper;
|
|||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.HandlerList;
|
import org.bukkit.event.HandlerList;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class SniperBrushSizeChangedEvent extends Event {
|
public class SniperBrushSizeChangedEvent extends Event {
|
||||||
private static final HandlerList handlers = new HandlerList();
|
private static final HandlerList handlers = new HandlerList();
|
||||||
private final Sniper sniper;
|
private final Sniper sniper;
|
||||||
|
@ -6,9 +6,6 @@ import org.bukkit.World;
|
|||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class UndoDelegate implements BlockChangeDelegate {
|
public class UndoDelegate implements BlockChangeDelegate {
|
||||||
private final World targetWorld;
|
private final World targetWorld;
|
||||||
private Undo currentUndo;
|
private Undo currentUndo;
|
||||||
|
@ -1,18 +1,11 @@
|
|||||||
package com.thevoxelbox.voxelsniper.util;
|
package com.thevoxelbox.voxelsniper.util;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.extent.NullExtent;
|
import com.sk89q.worldedit.extent.NullExtent;
|
||||||
import com.sk89q.worldedit.function.mask.BlockMask;
|
import com.sk89q.worldedit.function.mask.BlockMask;
|
||||||
import com.sk89q.worldedit.function.mask.BlockMaskBuilder;
|
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.block.data.BlockData;
|
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.
|
* Container class for multiple ID/Datavalue pairs.
|
||||||
*/
|
*/
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
litesniper-max-brush-size: 5
|
# Max. brush size for FAVS brushes
|
||||||
undo-cache-size: 20
|
litesniper-max-brush-size: 30
|
||||||
|
# Enable or disable the brush dump on login
|
||||||
message-on-login-enabled: true
|
message-on-login-enabled: true
|
Loading…
Reference in New Issue
Block a user