Changed all tabs to 4 spaces

By: durron597 <martin.jared@gmail.com>
This commit is contained in:
Bukkit/Spigot
2011-01-01 08:01:07 -05:00
parent cf3973a5f9
commit 76ab7321fd
19 changed files with 203 additions and 204 deletions

View File

@@ -1,6 +1,6 @@
package org.bukkit.event;
public interface Cancellable {
public boolean isCancelled();
public void setCancelled(boolean cancel);
public boolean isCancelled();
public void setCancelled(boolean cancel);
}

View File

@@ -16,7 +16,7 @@ public abstract class Event {
* @return Server which this event was triggered on
*/
public Type getType() {
return type;
return type;
}
/**
@@ -48,23 +48,23 @@ public abstract class Event {
*/
Lowest
}
public enum Category {
PLAYER,
BLOCK,
ITEM,
ENVIRONMENT,
ENTITY,
VEHICLE,
INVENTORY,
SIGN,
CUSTOM;
PLAYER,
BLOCK,
ITEM,
ENVIRONMENT,
ENTITY,
VEHICLE,
INVENTORY,
SIGN,
CUSTOM;
}
public enum Type {
/**
* Player Events
*/
/**
* Player Events
*/
PLAYER_JOIN (Category.PLAYER),
PLAYER_LOGIN (Category.PLAYER),
PLAYER_CHAT (Category.PLAYER),
@@ -74,8 +74,8 @@ public abstract class Event {
//PLAYER_ANIMATION (Category.PLAYER),
PLAYER_TELEPORT (Category.PLAYER),
/**
* Block Events
*/
* Block Events
*/
BLOCK_BROKEN (Category.BLOCK),
BLOCK_CANBUILD (Category.BLOCK),
BLOCK_FLOW (Category.BLOCK),
@@ -84,31 +84,31 @@ public abstract class Event {
BLOCK_PLACED (Category.BLOCK),
BLOCK_RIGHTCLICKED (Category.BLOCK),
REDSTONE_CHANGE (Category.BLOCK);
/**
* Item Events
* Item Events
ITEM_DROP (Category.ITEM),
ITEM_PICK_UP (Category.ITEM),
ITEM_USE (Category.ITEM),
/**
* Environment Events
* Environment Events
IGNITE (Category.ENVIRONMENT),
FLOW (Category.ENVIRONMENT),
EXPLODE (Category.ENVIRONMENT),
LIQUID_DESTROY (Category.ENVIRONMENT),
/**
* Non-player Entity Events
* Non-player Entity Events
MOB_SPAWN (Category.ENTITY),
DAMAGE (Category.ENTITY),
HEALTH_CHANGE (Category.ENTITY),
ATTACK (Category.ENTITY), // Need to look into this category more
/**
* Vehicle Events
* Vehicle Events
VEHICLE_CREATE (Category.VEHICLE),
VEHICLE_UPDATE (Category.VEHICLE),
VEHICLE_DAMAGE (Category.VEHICLE),
@@ -117,24 +117,24 @@ public abstract class Event {
VEHICLE_ENTERED (Category.VEHICLE),
VEHICLE_POSITIONCHANGE (Category.VEHICLE),
/**
* Inventory Events
* Inventory Events
OPEN_INVENTORY (Category.INVENTORY),
/**
* Sign Events (Item events??)
* Sign Events (Item events??)
SIGN_SHOW (Category.SIGN),
SIGN_CHANGE (Category.SIGN);
*/
private Category category;
private Type(Category category) {
this.category = category;
this.category = category;
}
public Category getCategory() {
return category;
return category;
}
}
}

View File

@@ -1,8 +1,8 @@
package org.bukkit.event;
public class EventException extends Exception {
private static final long serialVersionUID = 3532808232324183999L;
private final Throwable cause;
private static final long serialVersionUID = 3532808232324183999L;
private final Throwable cause;
/**
* Constructs a new EventException based on the given Exception
@@ -24,18 +24,18 @@ public class EventException extends Exception {
* Constructs a new EventException with the given message
*/
public EventException(Throwable cause, String message) {
super(message);
this.cause = cause;
super(message);
this.cause = cause;
}
/**
* Constructs a new EventException with the given message
*/
public EventException(String message) {
super(message);
cause = null;
super(message);
cause = null;
}
/**
* If applicable, returns the Exception that triggered this Exception
*

View File

@@ -7,7 +7,7 @@ import org.bukkit.Block;
*/
public class BlockBrokenEvent extends BlockEvent {
public BlockBrokenEvent(Type type, Block block ) {
super(type, block);
}
public BlockBrokenEvent(Type type, Block block ) {
super(type, block);
}
}

View File

@@ -10,37 +10,37 @@ import org.bukkit.Material;
* @author durron597
*/
public class BlockCanBuildEvent extends BlockEvent {
protected boolean buildable;
protected int material;
public BlockCanBuildEvent(Type type, Block block, int id, boolean canBuild) {
super(type, block);
buildable = canBuild;
material = id;
}
protected boolean buildable;
protected int material;
/**
* Returns whether or not the block can be built here. By default, returns
* Minecraft's answer on whether the block can be built
*
* @return boolean whether or not the block can be built
*/
public boolean isBuildable() {
return buildable;
}
/**
* Set whether the block can be built here.
*/
public void setBuildable(boolean cancel) {
this.buildable = cancel;
}
public Material getMaterial() {
return Material.getMaterial(material);
}
public int getMaterialID() {
return material;
}
public BlockCanBuildEvent(Type type, Block block, int id, boolean canBuild) {
super(type, block);
buildable = canBuild;
material = id;
}
/**
* Returns whether or not the block can be built here. By default, returns
* Minecraft's answer on whether the block can be built
*
* @return boolean whether or not the block can be built
*/
public boolean isBuildable() {
return buildable;
}
/**
* Set whether the block can be built here.
*/
public void setBuildable(boolean cancel) {
this.buildable = cancel;
}
public Material getMaterial() {
return Material.getMaterial(material);
}
public int getMaterialID() {
return material;
}
}

View File

@@ -10,9 +10,9 @@ import org.bukkit.event.Event;
*/
public class BlockFromToEvent extends BlockEvent implements Cancellable {
protected Block from;
protected BlockFace face;
protected boolean cancel;
protected BlockFace face;
protected boolean cancel;
public BlockFromToEvent(final Event.Type type, final Block block, final BlockFace face) {
super(type, block);
this.face = face;
@@ -28,21 +28,21 @@ public class BlockFromToEvent extends BlockEvent implements Cancellable {
public BlockFace getFace() {
return face;
}
/**
* Convenience method for getting the faced block
*
* @return Block the faced block
*/
public Block getFromBlock() {
return from;
return from;
}
public boolean isCancelled() {
return cancel;
}
public boolean isCancelled() {
return cancel;
}
public void setCancelled(boolean cancel) {
this.cancel = cancel;
}
public void setCancelled(boolean cancel) {
this.cancel = cancel;
}
}

View File

@@ -8,12 +8,12 @@ import org.bukkit.event.Event;
*/
public class BlockIgniteEvent extends Event {
/**
* @param type
*/
public BlockIgniteEvent(Type type) {
super(type);
// TODO Auto-generated constructor stub
}
/**
* @param type
*/
public BlockIgniteEvent(Type type) {
super(type);
// TODO Auto-generated constructor stub
}
}

View File

@@ -8,12 +8,12 @@ import org.bukkit.event.Listener;
* @author durron597
*/
public class BlockListener implements Listener {
/**
* Default Constructor
*/
public BlockListener() {
/**
* Default Constructor
*/
public BlockListener() {
}
/**
* Called when a block is broken (or destroyed)
*
@@ -27,7 +27,7 @@ public class BlockListener implements Listener {
*/
public void onBlockCanBuild(BlockCanBuildEvent event) {
}
/**
* Called when a block flows (water/lava)
*
@@ -43,7 +43,7 @@ public class BlockListener implements Listener {
*/
public void onBlockIgnite(BlockIgniteEvent event) {
}
/**
* Called when block physics occurs
*
@@ -51,7 +51,7 @@ public class BlockListener implements Listener {
*/
public void onBlockPhysics(BlockPhysicsEvent event) {
}
/**
* Called when a player places a block
*
@@ -69,7 +69,7 @@ public class BlockListener implements Listener {
*/
public void onBlockRedstoneChange(BlockFromToEvent event) {
}
/**
* Called when a player right clicks a block
*

View File

@@ -7,24 +7,24 @@ import org.bukkit.event.Cancellable;
* Not implemented yet
*/
public class BlockPlacedEvent extends BlockEvent implements Cancellable {
private boolean cancel;
/**
* @param type
* @param theBlock
*/
public BlockPlacedEvent(Type type, Block theBlock) {
super(type, theBlock);
cancel = false;
}
private boolean cancel;
public boolean isCancelled() {
// TODO Auto-generated method stub
return cancel;
}
/**
* @param type
* @param theBlock
*/
public BlockPlacedEvent(Type type, Block theBlock) {
super(type, theBlock);
cancel = false;
}
public void setCancelled(boolean cancel) {
this.cancel = cancel;
}
public boolean isCancelled() {
// TODO Auto-generated method stub
return cancel;
}
public void setCancelled(boolean cancel) {
this.cancel = cancel;
}
}

View File

@@ -12,42 +12,42 @@ import org.bukkit.Player;
* @author durron597
*/
public class BlockRightClickedEvent extends BlockEvent {
protected Player clicker;
protected BlockFace direction;
protected ItemStack clickedWith;
/**
* @param type The type of event this is
* @param theBlock The clicked block
* @param direction The face we clicked from
* @param clicker The player who clicked a block
* @param clickedWith Item in player's hand
*/
public BlockRightClickedEvent(Type type, Block theBlock, BlockFace direction, Player clicker, ItemStack clickedWith) {
super(type, theBlock);
this.direction = direction;
this.clicker = clicker;
this.clickedWith = clickedWith;
}
protected Player clicker;
protected BlockFace direction;
protected ItemStack clickedWith;
/**
* @return the clicker
*/
public Player getClicker() {
return clicker;
}
/**
* @param type The type of event this is
* @param theBlock The clicked block
* @param direction The face we clicked from
* @param clicker The player who clicked a block
* @param clickedWith Item in player's hand
*/
public BlockRightClickedEvent(Type type, Block theBlock, BlockFace direction, Player clicker, ItemStack clickedWith) {
super(type, theBlock);
this.direction = direction;
this.clicker = clicker;
this.clickedWith = clickedWith;
}
/**
* @return the direction
*/
public BlockFace getDirection() {
return direction;
}
/**
* @return the clicker
*/
public Player getClicker() {
return clicker;
}
/**
* @return the clickedWith
*/
public ItemStack getClickedWith() {
return clickedWith;
}
/**
* @return the direction
*/
public BlockFace getDirection() {
return direction;
}
/**
* @return the clickedWith
*/
public ItemStack getClickedWith() {
return clickedWith;
}
}