diff options
19 files changed, 203 insertions, 204 deletions
diff --git a/src/main/java/org/bukkit/Block.java b/src/main/java/org/bukkit/Block.java index 0c32c321..683400d7 100644 --- a/src/main/java/org/bukkit/Block.java +++ b/src/main/java/org/bukkit/Block.java @@ -1,4 +1,3 @@ - package org.bukkit; /** diff --git a/src/main/java/org/bukkit/Entity.java b/src/main/java/org/bukkit/Entity.java index 849bdd2d..773354d0 100644 --- a/src/main/java/org/bukkit/Entity.java +++ b/src/main/java/org/bukkit/Entity.java @@ -25,7 +25,7 @@ public interface Entity { * @param location New location to teleport this entity to */ public void teleportTo(Location location); - + /** * Returns a unique ID for this entity * diff --git a/src/main/java/org/bukkit/HumanEntity.java b/src/main/java/org/bukkit/HumanEntity.java index 349251d7..0cc7c1f5 100644 --- a/src/main/java/org/bukkit/HumanEntity.java +++ b/src/main/java/org/bukkit/HumanEntity.java @@ -11,7 +11,7 @@ public interface HumanEntity extends LivingEntity { * @return Player name */ public String getName(); - + /** * Gets the item this entity has currently selected, which will be shown in * their hand diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index 1b6323d7..d114d042 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -181,7 +181,7 @@ public enum Material { CookedFish(350), GoldRecord(2256), GreenRecord(2257); - + private final int id; private static final Map<Integer, Material> lookup = new HashMap<Integer, Material>(); diff --git a/src/main/java/org/bukkit/event/Cancellable.java b/src/main/java/org/bukkit/event/Cancellable.java index 985dc1de..91407a9a 100644 --- a/src/main/java/org/bukkit/event/Cancellable.java +++ b/src/main/java/org/bukkit/event/Cancellable.java @@ -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); } diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java index 2362a31d..b97ebd94 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -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; } } } diff --git a/src/main/java/org/bukkit/event/EventException.java b/src/main/java/org/bukkit/event/EventException.java index 2abd7d94..2084e98b 100644 --- a/src/main/java/org/bukkit/event/EventException.java +++ b/src/main/java/org/bukkit/event/EventException.java @@ -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 * diff --git a/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java b/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java index 800b84d8..1cd4615f 100644 --- a/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java @@ -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);
+ }
}
diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java index bed31d33..1627a2be 100644 --- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java @@ -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; + } } diff --git a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java index 2b5044dd..928c842a 100644 --- a/src/main/java/org/bukkit/event/block/BlockFromToEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockFromToEvent.java @@ -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; + } } diff --git a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java index 90347096..c8b3f884 100644 --- a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java @@ -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
+ }
}
diff --git a/src/main/java/org/bukkit/event/block/BlockListener.java b/src/main/java/org/bukkit/event/block/BlockListener.java index cef040c3..c7607588 100644 --- a/src/main/java/org/bukkit/event/block/BlockListener.java +++ b/src/main/java/org/bukkit/event/block/BlockListener.java @@ -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 * diff --git a/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java b/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java index 8bb409a2..a5ec3299 100644 --- a/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java @@ -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; + } } diff --git a/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java b/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java index 4f43492c..bce2e1ae 100644 --- a/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java @@ -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;
+ }
}
diff --git a/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java b/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java index e6f03892..11797212 100644 --- a/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java +++ b/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java @@ -5,8 +5,8 @@ package org.bukkit.plugin; * Thrown when attempting to load an invalid PluginDescriptionFile */ public class InvalidDescriptionException extends Exception { - private static final long serialVersionUID = 5721389122281775894L; - private final Throwable cause; + private static final long serialVersionUID = 5721389122281775894L; + private final Throwable cause; /** * Constructs a new InvalidDescriptionException based on the given Exception diff --git a/src/main/java/org/bukkit/plugin/InvalidPluginException.java b/src/main/java/org/bukkit/plugin/InvalidPluginException.java index 4155723a..5ac81079 100644 --- a/src/main/java/org/bukkit/plugin/InvalidPluginException.java +++ b/src/main/java/org/bukkit/plugin/InvalidPluginException.java @@ -5,8 +5,8 @@ package org.bukkit.plugin; * Thrown when attempting to load an invalid Plugin file */ public class InvalidPluginException extends Exception { - private static final long serialVersionUID = -8242141640709409542L; - private final Throwable cause; + private static final long serialVersionUID = -8242141640709409542L; + private final Throwable cause; /** * Constructs a new InvalidPluginException based on the given Exception diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index d2c4b770..08fed37f 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -81,7 +81,7 @@ public final class SimplePluginManager implements PluginManager { } catch (InvalidPluginException ex) { Logger.getLogger(SimplePluginManager.class.getName()).log(Level.SEVERE, "Could not load " + file.getPath() + " in " + directory.getPath(), ex); } - + if (plugin != null) { result.add(plugin); } @@ -120,7 +120,7 @@ public final class SimplePluginManager implements PluginManager { return result; } - + /** * Checks if the given plugin is loaded and returns it when applicable * @@ -203,7 +203,7 @@ public final class SimplePluginManager implements PluginManager { if (registration.getPriority().compareTo(priority) < 0) { break; } - + position++; } } else { diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 40753b02..021a396d 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -24,13 +24,13 @@ import org.bukkit.plugin.*; public final class JavaPluginLoader implements PluginLoader { private final Server server; private final Pattern[] fileFilters = new Pattern[] { - Pattern.compile("\\.jar$"), + Pattern.compile("\\.jar$"), }; - + public JavaPluginLoader(Server instance) { server = instance; } - + public Plugin loadPlugin(File file) throws InvalidPluginException { JavaPlugin result = null; PluginDescriptionFile description = null; @@ -82,41 +82,41 @@ public final class JavaPluginLoader implements PluginLoader { PlayerListener trueListener = (PlayerListener)listener; switch (event.getType()) { - case PLAYER_JOIN: - trueListener.onPlayerJoin((PlayerEvent)event); - break; - case PLAYER_QUIT: - trueListener.onPlayerQuit((PlayerEvent)event); - break; - case PLAYER_COMMAND: - trueListener.onPlayerCommand((PlayerChatEvent)event); - break; - case PLAYER_CHAT: - trueListener.onPlayerChat((PlayerChatEvent)event); - break; - case PLAYER_MOVE: - trueListener.onPlayerMove((PlayerMoveEvent)event); - break; - case PLAYER_TELEPORT: - trueListener.onPlayerTeleport((PlayerMoveEvent)event); - break; - case PLAYER_LOGIN: - trueListener.onPlayerLogin((PlayerLoginEvent)event); - break; + case PLAYER_JOIN: + trueListener.onPlayerJoin((PlayerEvent)event); + break; + case PLAYER_QUIT: + trueListener.onPlayerQuit((PlayerEvent)event); + break; + case PLAYER_COMMAND: + trueListener.onPlayerCommand((PlayerChatEvent)event); + break; + case PLAYER_CHAT: + trueListener.onPlayerChat((PlayerChatEvent)event); + break; + case PLAYER_MOVE: + trueListener.onPlayerMove((PlayerMoveEvent)event); + break; + case PLAYER_TELEPORT: + trueListener.onPlayerTeleport((PlayerMoveEvent)event); + break; + case PLAYER_LOGIN: + trueListener.onPlayerLogin((PlayerLoginEvent)event); + break; } } else if (listener instanceof BlockListener) { BlockListener trueListener = (BlockListener)listener; switch (event.getType()) { - case BLOCK_PHYSICS: - trueListener.onBlockPhysics((BlockPhysicsEvent)event); - break; - case BLOCK_CANBUILD: - trueListener.onBlockCanBuild((BlockCanBuildEvent)event); - break; - case BLOCK_FLOW: - trueListener.onBlockFlow((BlockFromToEvent)event); - break; + case BLOCK_PHYSICS: + trueListener.onBlockPhysics((BlockPhysicsEvent)event); + break; + case BLOCK_CANBUILD: + trueListener.onBlockCanBuild((BlockCanBuildEvent)event); + break; + case BLOCK_FLOW: + trueListener.onBlockFlow((BlockFromToEvent)event); + break; } } } |