3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-25 18:40:05 +01:00

Merge remote-tracking branch 'origin/breaking' into breaking

Dieser Commit ist enthalten in:
MattBDev 2019-06-06 18:40:14 -04:00
Commit 3169592332
62 geänderte Dateien mit 29 neuen und 148 gelöschten Zeilen

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.ChatColor;
/** /**
* A brush that creates a solid ball. * A brush that creates a solid ball.
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Ball_Brush
*
* @author Piotr * @author Piotr
*/ */
public class BallBrush extends PerformBrush { public class BallBrush extends PerformBrush {
@ -111,7 +109,7 @@ public class BallBrush extends PerformBrush {
this.trueCircle = TRUE_CIRCLE_OFF_VALUE; this.trueCircle = TRUE_CIRCLE_OFF_VALUE;
v.sendMessage(ChatColor.AQUA + "True circle mode OFF."); v.sendMessage(ChatColor.AQUA + "True circle mode OFF.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -6,9 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.Undo; import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Blend_Brushes
*/
public class BlendBallBrush extends BlendBrushBase { public class BlendBallBrush extends BlendBrushBase {
/** /**
* *

Datei anzeigen

@ -6,9 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.Undo; import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Blend_Brushes
*/
public class BlendDiscBrush extends BlendBrushBase { public class BlendDiscBrush extends BlendBrushBase {
/** /**
* *

Datei anzeigen

@ -6,9 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.Undo; import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Blend_Brushes
*/
public class BlendVoxelBrush extends BlendBrushBase { public class BlendVoxelBrush extends BlendBrushBase {
/** /**
* *

Datei anzeigen

@ -6,9 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.Undo; import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Blend_Brushes
*/
public class BlendVoxelDiscBrush extends BlendBrushBase { public class BlendVoxelDiscBrush extends BlendBrushBase {
/** /**
* *

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.ChatColor;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Blob_Brush
*
* @author Giltwist * @author Giltwist
*/ */
public class BlobBrush extends PerformBrush { public class BlobBrush extends PerformBrush {
@ -233,7 +231,7 @@ public class BlobBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Growth percent must be an integer " + GROW_PERCENT_MIN + "-" + GROW_PERCENT_MAX + "!"); v.sendMessage(ChatColor.RED + "Growth percent must be an integer " + GROW_PERCENT_MIN + "-" + GROW_PERCENT_MAX + "!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -12,8 +12,6 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_CANYONATOR
*
* @author Voxel * @author Voxel
*/ */
public class CanyonBrush extends Brush { public class CanyonBrush extends Brush {

Datei anzeigen

@ -7,8 +7,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Chunk; import org.bukkit.Chunk;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Canyon_Selection_Brush
*
* @author Voxel * @author Voxel
*/ */
public class CanyonSelectionBrush extends CanyonBrush { public class CanyonSelectionBrush extends CanyonBrush {

Datei anzeigen

@ -69,7 +69,7 @@ public class CheckerVoxelDiscBrush extends PerformBrush {
this.useWorldCoordinates = false; this.useWorldCoordinates = false;
v.sendMessage(ChatColor.AQUA + "Disabled using World Coordinates."); v.sendMessage(ChatColor.AQUA + "Disabled using World Coordinates.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
break; break;
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Clean_Snow_Brush
*
* @author psanker * @author psanker
*/ */
public class CleanSnowBrush extends Brush { public class CleanSnowBrush extends Brush {
@ -80,7 +78,7 @@ public class CleanSnowBrush extends Brush {
this.trueCircle = 0; this.trueCircle = 0;
v.sendMessage(ChatColor.AQUA + "True circle mode OFF."); v.sendMessage(ChatColor.AQUA + "True circle mode OFF.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -6,8 +6,6 @@ import org.bukkit.ChatColor;
/** /**
* The CloneStamp class is used to create a collection of blocks in a cylinder shape according to the selection the player has set. * The CloneStamp class is used to create a collection of blocks in a cylinder shape according to the selection the player has set.
* http://www.voxelwiki.com/minecraft/Voxelsniper#Clone_and_CopyPasta_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class CloneStampBrush extends StampBrush { public class CloneStampBrush extends StampBrush {

Datei anzeigen

@ -8,8 +8,6 @@ import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#CopyPasta_Brush
*
* @author giltwist * @author giltwist
*/ */
public class CopyPastaBrush extends Brush { public class CopyPastaBrush extends Brush {

Datei anzeigen

@ -104,7 +104,7 @@ public class CylinderBrush extends PerformBrush {
v.setcCen((int) Double.parseDouble(parameter.replace("c", ""))); v.setcCen((int) Double.parseDouble(parameter.replace("c", "")));
v.sendMessage(ChatColor.AQUA + "Cylinder origin set to: " + v.getcCen()); v.sendMessage(ChatColor.AQUA + "Cylinder origin set to: " + v.getcCen());
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.block.Block;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Disc_Brush
*
* @author Voxel * @author Voxel
*/ */
public class DiscBrush extends PerformBrush { public class DiscBrush extends PerformBrush {
@ -76,7 +74,7 @@ public class DiscBrush extends PerformBrush {
this.trueCircle = 0; this.trueCircle = 0;
v.sendMessage(ChatColor.AQUA + "True circle mode OFF."); v.sendMessage(ChatColor.AQUA + "True circle mode OFF.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.ChatColor;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Disc_Face_Brush
*
* @author Voxel * @author Voxel
*/ */
public class DiscFaceBrush extends PerformBrush { public class DiscFaceBrush extends PerformBrush {
@ -139,7 +137,7 @@ public class DiscFaceBrush extends PerformBrush {
this.trueCircle = 0; this.trueCircle = 0;
v.sendMessage(ChatColor.AQUA + "True circle mode OFF."); v.sendMessage(ChatColor.AQUA + "True circle mode OFF.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -12,8 +12,6 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Dome_Brush
*
* @author Gavjenks * @author Gavjenks
* @author MikeMatrix * @author MikeMatrix
*/ */

Datei anzeigen

@ -7,8 +7,6 @@ import com.thevoxelbox.voxelsniper.Undo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Drain_Brush
*
* @author Gavjenks * @author Gavjenks
* @author psanker * @author psanker
*/ */
@ -123,7 +121,7 @@ public class DrainBrush extends Brush {
v.sendMessage(ChatColor.AQUA + "Disc drain mode ON"); v.sendMessage(ChatColor.AQUA + "Disc drain mode ON");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -7,8 +7,6 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Ellipse_Brush
*
* @author psanker * @author psanker
*/ */
public class EllipseBrush extends PerformBrush { public class EllipseBrush extends PerformBrush {

Datei anzeigen

@ -6,9 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Ellipsoid_Brush
*/
public class EllipsoidBrush extends PerformBrush { public class EllipsoidBrush extends PerformBrush {
private double xRad; private double xRad;
private double yRad; private double yRad;

Datei anzeigen

@ -6,8 +6,6 @@ import org.bukkit.ChatColor;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Entity_Brush
*
* @author Piotr * @author Piotr
*/ */
public class EntityBrush extends Brush { public class EntityBrush extends Brush {

Datei anzeigen

@ -11,8 +11,6 @@ import java.util.EnumSet;
import java.util.Set; import java.util.Set;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Eraser_Brush
*
* @author Voxel * @author Voxel
*/ */
public class EraserBrush extends Brush { public class EraserBrush extends Brush {

Datei anzeigen

@ -23,8 +23,6 @@ import org.bukkit.util.Vector;
import java.util.*; import java.util.*;
/** /**
* http://www.voxelwiki.com/minecraft/VoxelSniper#The_Erosion_Brush
*
* @author Piotr * @author Piotr
* @author MikeMatrix * @author MikeMatrix
*/ */

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Extrude_Brush
*
* @author psanker * @author psanker
*/ */
public class ExtrudeBrush extends Brush { public class ExtrudeBrush extends Brush {

Datei anzeigen

@ -110,7 +110,7 @@ public class FillDownBrush extends PerformBrush {
this.fromExisting = !this.fromExisting; this.fromExisting = !this.fromExisting;
v.sendMessage(ChatColor.AQUA + "Now filling down from " + ((this.fromExisting) ? "existing" : "all") + " blocks."); v.sendMessage(ChatColor.AQUA + "Now filling down from " + ((this.fromExisting) ? "existing" : "all") + " blocks.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -15,8 +15,6 @@ import java.util.Random;
// Proposal: Use /v and /vr for leave and wood material // or two more parameters -- Monofraps // Proposal: Use /v and /vr for leave and wood material // or two more parameters -- Monofraps
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#VoxelTrees_Brush
*
* @author Ghost8700 @ Voxel * @author Ghost8700 @ Voxel
*/ */
public class GenerateTreeBrush extends Brush { public class GenerateTreeBrush extends Brush {
@ -626,7 +624,7 @@ public class GenerateTreeBrush extends Brush {
this.nodeMin = 3; this.nodeMin = 3;
v.sendMessage(ChatColor.GOLD + "Brush reset to default parameters."); v.sendMessage(ChatColor.GOLD + "Brush reset to default parameters.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} catch (final Exception exception) { } catch (final Exception exception) {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! \"" + par[i] + "\" is not a valid statement. Please use the 'info' parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! \"" + par[i] + "\" is not a valid statement. Please use the 'info' parameter to display parameter info.");

Datei anzeigen

@ -14,8 +14,6 @@ import java.util.ArrayList;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Heat_Ray
*
* @author Gavjenks * @author Gavjenks
*/ */
public class HeatRayBrush extends Brush { public class HeatRayBrush extends Brush {

Datei anzeigen

@ -13,8 +13,6 @@ import org.bukkit.util.Vector;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Jagged_Line_Brush
*
* @author Giltwist * @author Giltwist
* @author Monofraps * @author Monofraps
*/ */

Datei anzeigen

@ -13,8 +13,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
import java.util.List; import java.util.List;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Jockey_Brush
*
* @author Voxel * @author Voxel
* @author Monofraps * @author Monofraps
*/ */

Datei anzeigen

@ -11,8 +11,6 @@ import org.bukkit.util.NumberConversions;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Line_Brush
*
* @author Gavjenks * @author Gavjenks
* @author giltwist * @author giltwist
* @author MikeMatrix * @author MikeMatrix

Datei anzeigen

@ -17,7 +17,6 @@ import java.util.HashSet;
/** /**
* Moves a selection blockPositionY a certain amount. * Moves a selection blockPositionY a certain amount.
* http://www.voxelwiki.com/minecraft/Voxelsniper#Move_Brush
* *
* @author MikeMatrix * @author MikeMatrix
*/ */

Datei anzeigen

@ -10,8 +10,6 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_OCEANATOR_5000
*
* @author Voxel * @author Voxel
*/ */
public class OceanBrush extends Brush { public class OceanBrush extends Brush {

Datei anzeigen

@ -11,8 +11,6 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Overlay_.2F_Topsoil_Brush
*
* @author Gavjenks * @author Gavjenks
*/ */
public class OverlayBrush extends PerformBrush { public class OverlayBrush extends PerformBrush {
@ -207,7 +205,7 @@ public class OverlayBrush extends PerformBrush {
ChatColor.BLUE + "Will overlay only natural block types." + this.depth); ChatColor.BLUE + "Will overlay only natural block types." + this.depth);
} else { } else {
v.sendMessage(ChatColor.RED v.sendMessage(ChatColor.RED
+ "Invalid brush parameters! use the info parameter to display parameter info."); + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -6,8 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
/** /**
* Painting scrolling Brush. * Painting scrolling Brush.
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Painting_Picker_Brush
*
* @author Voxel * @author Voxel
*/ */
public class PaintingBrush extends Brush { public class PaintingBrush extends Brush {

Datei anzeigen

@ -20,8 +20,6 @@ import java.util.List;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Punish_Brush
*
* @author Monofraps * @author Monofraps
* @author Deamon * @author Deamon
* @author MikeMatrix * @author MikeMatrix
@ -213,7 +211,7 @@ public class PunishBrush extends PerformBrush {
} }
} catch (final Exception exception) { } catch (final Exception exception) {
exception.printStackTrace(); exception.printStackTrace();
v.sendMessage("An error occured."); v.sendMessage("An error occurred.");
return; return;
} }
} else if (v.getBrushSize() == PunishBrush.INFINIPUNISH_SIZE) { } else if (v.getBrushSize() == PunishBrush.INFINIPUNISH_SIZE) {

Datei anzeigen

@ -9,8 +9,6 @@ import com.thevoxelbox.voxelsniper.Undo;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Random-Erode_Brush
*
* @author Piotr * @author Piotr
* @author Giltwist (Randomized blockPositionY) * @author Giltwist (Randomized blockPositionY)
*/ */

Datei anzeigen

@ -7,8 +7,6 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Ring_Brush
*
* @author Voxel * @author Voxel
*/ */
public class RingBrush extends PerformBrush { public class RingBrush extends PerformBrush {
@ -83,7 +81,7 @@ public class RingBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "The parameters included are invalid."); v.sendMessage(ChatColor.RED + "The parameters included are invalid.");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -7,8 +7,6 @@ import org.bukkit.ChatColor;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Ruler_Brush
*
* @author Gavjenks * @author Gavjenks
*/ */
public class RulerBrush extends Brush { public class RulerBrush extends Brush {
@ -93,7 +91,7 @@ public class RulerBrush extends Brush {
this.xOff = 0; this.xOff = 0;
v.sendMessage(ChatColor.BLUE + "Ruler mode."); v.sendMessage(ChatColor.BLUE + "Ruler mode.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -150,7 +150,7 @@ public class ScannerBrush extends Brush {
this.depth = this.clamp(Integer.parseInt(par[i].substring(1)), DEPTH_MIN, DEPTH_MAX); this.depth = this.clamp(Integer.parseInt(par[i].substring(1)), DEPTH_MIN, DEPTH_MAX);
v.sendMessage(ChatColor.AQUA + "Scanner depth set to " + this.depth); v.sendMessage(ChatColor.AQUA + "Scanner depth set to " + this.depth);
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -7,8 +7,6 @@ import org.bukkit.ChatColor;
import org.bukkit.block.Block; import org.bukkit.block.Block;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Set_Brush
*
* @author Voxel * @author Voxel
*/ */
public class SetBrush extends PerformBrush { public class SetBrush extends PerformBrush {

Datei anzeigen

@ -110,7 +110,7 @@ public class SetRedstoneFlipBrush extends Brush {
this.northSouth = false; this.northSouth = false;
v.sendMessage(ChatColor.AQUA + "Flip direction set to east/west."); v.sendMessage(ChatColor.AQUA + "Flip direction set to east/west.");
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.block.Block;
/** /**
* THIS BRUSH SHOULD NOT USE PERFORMERS. * THIS BRUSH SHOULD NOT USE PERFORMERS.
* http://www.voxelwiki.com/minecraft/Voxelsniper#Shell_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class ShellBallBrush extends Brush { public class ShellBallBrush extends Brush {
@ -103,7 +101,7 @@ public class ShellBallBrush extends Brush {
} }
v.owner().storeUndo(undo); v.owner().storeUndo(undo);
// This is needed because most uses of this brush will not be sible to the sniper. // This is needed because most uses of this brush will not be sible to the sible sniper.
v.owner().getPlayer().sendMessage(ChatColor.AQUA + "Shell complete."); v.owner().getPlayer().sendMessage(ChatColor.AQUA + "Shell complete.");
} }

Datei anzeigen

@ -10,8 +10,6 @@ import org.bukkit.block.Block;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Shell_Brushes
*
* @author Piotr * @author Piotr
*/ */
public class ShellSetBrush extends Brush { public class ShellSetBrush extends Brush {

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.block.Block;
/** /**
* THIS BRUSH SHOULD NOT USE PERFORMERS. * THIS BRUSH SHOULD NOT USE PERFORMERS.
* http://www.voxelwiki.com/minecraft/Voxelsniper#Shell_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class ShellVoxelBrush extends Brush { public class ShellVoxelBrush extends Brush {

Datei anzeigen

@ -11,9 +11,7 @@ import java.io.*;
import java.util.Arrays; import java.util.Arrays;
/** /**
* Overwrites signs. (Wiki: * Overwrites signs.
* http://www.voxelwiki.com/minecraft/VoxelSniper#Sign_Overwrite_Brush)
*
* @author Monofraps * @author Monofraps
*/ */
public class SignOverwriteBrush extends Brush { public class SignOverwriteBrush extends Brush {

Datei anzeigen

@ -5,8 +5,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Snipe_Brush
*
* @author Voxel * @author Voxel
*/ */
public class SnipeBrush extends PerformBrush { public class SnipeBrush extends PerformBrush {

Datei anzeigen

@ -13,8 +13,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Snow_cone_brush
*
* @author Voxel * @author Voxel
*/ */
public class SnowConeBrush extends Brush { public class SnowConeBrush extends Brush {

Datei anzeigen

@ -10,8 +10,6 @@ import org.bukkit.ChatColor;
import org.bukkit.block.Block; import org.bukkit.block.Block;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Spiral_Staircase_Brush
*
* @author giltwist * @author giltwist
*/ */
public class SpiralStaircaseBrush extends Brush { public class SpiralStaircaseBrush extends Brush {
@ -540,7 +538,7 @@ public class SpiralStaircaseBrush extends Brush {
this.sopen = par[i]; this.sopen = par[i];
v.sendMessage(ChatColor.BLUE + "Staircase opens: " + this.sopen); v.sendMessage(ChatColor.BLUE + "Staircase opens: " + this.sopen);
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -9,8 +9,6 @@ import org.bukkit.ChatColor;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Splatter_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class SplatterBallBrush extends PerformBrush { public class SplatterBallBrush extends PerformBrush {
@ -211,7 +209,7 @@ public class SplatterBallBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!"); v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -9,8 +9,6 @@ import org.bukkit.ChatColor;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Splatter_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class SplatterDiscBrush extends PerformBrush { public class SplatterDiscBrush extends PerformBrush {
@ -186,7 +184,7 @@ public class SplatterDiscBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!"); v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -11,8 +11,6 @@ import org.bukkit.ChatColor;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Splatter_Overlay_Brush
*
* @author Gavjenks Splatterized blockPositionY Giltwist * @author Gavjenks Splatterized blockPositionY Giltwist
*/ */
public class SplatterOverlayBrush extends PerformBrush { public class SplatterOverlayBrush extends PerformBrush {
@ -338,10 +336,10 @@ public class SplatterOverlayBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!"); v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} catch (Exception exception) { } catch (Exception exception) {
v.sendMessage(String.format("An error occured while processing parameter %s.", parameter)); v.sendMessage(String.format("An error occurred while processing parameter %s.", parameter));
} }
} }
} }

Datei anzeigen

@ -9,8 +9,6 @@ import org.bukkit.ChatColor;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Splatter_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class SplatterVoxelBrush extends PerformBrush { public class SplatterVoxelBrush extends PerformBrush {
@ -201,7 +199,7 @@ public class SplatterVoxelBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!"); v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -9,8 +9,6 @@ import org.bukkit.block.Block;
import java.util.Random; import java.util.Random;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Splatter_Brushes
*
* @author Voxel * @author Voxel
*/ */
public class SplatterVoxelDiscBrush extends PerformBrush { public class SplatterVoxelDiscBrush extends PerformBrush {
@ -184,7 +182,7 @@ public class SplatterVoxelDiscBrush extends PerformBrush {
v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!"); v.sendMessage(ChatColor.RED + "Recursions must be an integer 1-10!");
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -181,7 +181,7 @@ public class SplineBrush extends PerformBrush {
this.render(v); this.render(v);
} }
} else { } else {
v.sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.util.NumberConversions;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Three-Point_Circle_Brush
*
* @author Giltwist * @author Giltwist
*/ */
public class ThreePointCircleBrush extends PerformBrush { public class ThreePointCircleBrush extends PerformBrush {

Datei anzeigen

@ -14,8 +14,6 @@ import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Tree_Brush
*
* @author Mick * @author Mick
*/ */
public class TreeSnipeBrush extends Brush { public class TreeSnipeBrush extends Brush {

Datei anzeigen

@ -6,8 +6,6 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Triangle_Brush
*
* @author Giltwist * @author Giltwist
*/ */
public class TriangleBrush extends PerformBrush { public class TriangleBrush extends PerformBrush {

Datei anzeigen

@ -8,8 +8,6 @@ import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#Underlay_Brush
*
* @author jmck95 Credit to GavJenks for framework and 95 of code. Big Thank you to GavJenks * @author jmck95 Credit to GavJenks for framework and 95 of code. Big Thank you to GavJenks
*/ */
@ -148,7 +146,7 @@ public class UnderlayBrush extends PerformBrush {
this.allBlocks = false; this.allBlocks = false;
v.owner().getPlayer().sendMessage(ChatColor.BLUE + "Will underlay only natural block types." + this.depth); v.owner().getPlayer().sendMessage(ChatColor.BLUE + "Will underlay only natural block types." + this.depth);
} else { } else {
v.owner().getPlayer().sendMessage(ChatColor.RED + "Invalid brush parameters! use the info parameter to display parameter info."); v.owner().getPlayer().sendMessage(ChatColor.RED + "Invalid brush parameters! Use the info parameter to display parameter info.");
} }
} }
} }

Datei anzeigen

@ -8,8 +8,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Volt-Meter_Brush
*
* @author Gavjenks * @author Gavjenks
*/ */
public class VoltMeterBrush extends Brush { public class VoltMeterBrush extends Brush {

Datei anzeigen

@ -5,8 +5,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Voxel_Brush
*
* @author Piotr * @author Piotr
*/ */
public class VoxelBrush extends PerformBrush { public class VoxelBrush extends PerformBrush {

Datei anzeigen

@ -6,8 +6,6 @@ import com.thevoxelbox.voxelsniper.SnipeData;
import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush; import com.thevoxelbox.voxelsniper.brush.perform.PerformBrush;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Voxel_Disc_Brush
*
* @author Voxel * @author Voxel
*/ */
public class VoxelDiscBrush extends PerformBrush { public class VoxelDiscBrush extends PerformBrush {

Datei anzeigen

@ -7,8 +7,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
/** /**
* http://www.voxelwiki.com/minecraft/Voxelsniper#The_Voxel_Disc_Face_Brush
*
* @author Voxel * @author Voxel
*/ */
public class VoxelDiscFaceBrush extends PerformBrush { public class VoxelDiscFaceBrush extends PerformBrush {

Datei anzeigen

@ -22,13 +22,8 @@ package com.sk89q.worldedit.util;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.math.Vector3;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.*;
/** /**
* A collection of cardinal, ordinal, and secondary-ordinal directions. * A collection of cardinal, ordinal, and secondary-ordinal directions.
@ -87,7 +82,7 @@ public enum Direction {
} }
public static Direction get(CharSequence sequence) { public static Direction get(CharSequence sequence) {
return map.get((String)sequence); return map.get(sequence.toString());
} }
public Direction getLeft() { public Direction getLeft() {