diff --git a/paper-api/.gitignore b/paper-api/.gitignore index 9ba47d064d..b5d9a1dc91 100644 --- a/paper-api/.gitignore +++ b/paper-api/.gitignore @@ -1,11 +1,20 @@ +# Eclipse stuff +/.classpath +/.project +/.settings -/build +# netbeans /nbproject -/build.xml -/manifest.mf -/dist + +# maven +/target + +# vim +.*.sw[a-p] + +# test stuff (do remove me!) /sample/test /sample/build.xml /sample/build /sample/dist -/sample/nbproject \ No newline at end of file +/sample/nbproject diff --git a/paper-api/pom.xml b/paper-api/pom.xml new file mode 100755 index 0000000000..43b118687c --- /dev/null +++ b/paper-api/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + org.bukkit + bukkit + 0.0.1-SNAPSHOT + Bukkit + http://www.bukkit.org + + + org.yaml + snakeyaml + 1.7 + jar + compile + + + diff --git a/paper-api/src/org/bukkit/Block.java b/paper-api/src/main/java/org/bukkit/Block.java similarity index 100% rename from paper-api/src/org/bukkit/Block.java rename to paper-api/src/main/java/org/bukkit/Block.java diff --git a/paper-api/src/org/bukkit/BlockFace.java b/paper-api/src/main/java/org/bukkit/BlockFace.java similarity index 100% rename from paper-api/src/org/bukkit/BlockFace.java rename to paper-api/src/main/java/org/bukkit/BlockFace.java diff --git a/paper-api/src/org/bukkit/Chunk.java b/paper-api/src/main/java/org/bukkit/Chunk.java similarity index 100% rename from paper-api/src/org/bukkit/Chunk.java rename to paper-api/src/main/java/org/bukkit/Chunk.java diff --git a/paper-api/src/org/bukkit/Entity.java b/paper-api/src/main/java/org/bukkit/Entity.java similarity index 99% rename from paper-api/src/org/bukkit/Entity.java rename to paper-api/src/main/java/org/bukkit/Entity.java index eaf41faa0c..849bdd2d6c 100644 --- a/paper-api/src/org/bukkit/Entity.java +++ b/paper-api/src/main/java/org/bukkit/Entity.java @@ -1,3 +1,4 @@ + package org.bukkit; /** @@ -24,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/paper-api/src/org/bukkit/HumanEntity.java b/paper-api/src/main/java/org/bukkit/HumanEntity.java similarity index 99% rename from paper-api/src/org/bukkit/HumanEntity.java rename to paper-api/src/main/java/org/bukkit/HumanEntity.java index 0cc7c1f51c..349251d71f 100644 --- a/paper-api/src/org/bukkit/HumanEntity.java +++ b/paper-api/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/paper-api/src/org/bukkit/ItemStack.java b/paper-api/src/main/java/org/bukkit/ItemStack.java similarity index 100% rename from paper-api/src/org/bukkit/ItemStack.java rename to paper-api/src/main/java/org/bukkit/ItemStack.java diff --git a/paper-api/src/org/bukkit/LivingEntity.java b/paper-api/src/main/java/org/bukkit/LivingEntity.java similarity index 100% rename from paper-api/src/org/bukkit/LivingEntity.java rename to paper-api/src/main/java/org/bukkit/LivingEntity.java diff --git a/paper-api/src/org/bukkit/Location.java b/paper-api/src/main/java/org/bukkit/Location.java similarity index 100% rename from paper-api/src/org/bukkit/Location.java rename to paper-api/src/main/java/org/bukkit/Location.java diff --git a/paper-api/src/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java similarity index 99% rename from paper-api/src/org/bukkit/Material.java rename to paper-api/src/main/java/org/bukkit/Material.java index d114d042d0..1b6323d74c 100644 --- a/paper-api/src/org/bukkit/Material.java +++ b/paper-api/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 lookup = new HashMap(); diff --git a/paper-api/src/org/bukkit/Player.java b/paper-api/src/main/java/org/bukkit/Player.java similarity index 100% rename from paper-api/src/org/bukkit/Player.java rename to paper-api/src/main/java/org/bukkit/Player.java diff --git a/paper-api/src/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java similarity index 100% rename from paper-api/src/org/bukkit/Server.java rename to paper-api/src/main/java/org/bukkit/Server.java diff --git a/paper-api/src/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java similarity index 100% rename from paper-api/src/org/bukkit/World.java rename to paper-api/src/main/java/org/bukkit/World.java diff --git a/paper-api/src/main/java/org/bukkit/event/Cancellable.java b/paper-api/src/main/java/org/bukkit/event/Cancellable.java new file mode 100644 index 0000000000..985dc1dea9 --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/event/Cancellable.java @@ -0,0 +1,6 @@ +package org.bukkit.event; + +public interface Cancellable { + public boolean isCancelled(); + public void setCancelled(boolean cancel); +} diff --git a/paper-api/src/org/bukkit/event/Event.java b/paper-api/src/main/java/org/bukkit/event/Event.java similarity index 83% rename from paper-api/src/org/bukkit/event/Event.java rename to paper-api/src/main/java/org/bukkit/event/Event.java index b97ebd94bf..2362a31d61 100644 --- a/paper-api/src/org/bukkit/event/Event.java +++ b/paper-api/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/paper-api/src/org/bukkit/event/EventException.java b/paper-api/src/main/java/org/bukkit/event/EventException.java similarity index 81% rename from paper-api/src/org/bukkit/event/EventException.java rename to paper-api/src/main/java/org/bukkit/event/EventException.java index 2084e98b3a..2abd7d9403 100644 --- a/paper-api/src/org/bukkit/event/EventException.java +++ b/paper-api/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/paper-api/src/org/bukkit/event/Listener.java b/paper-api/src/main/java/org/bukkit/event/Listener.java similarity index 100% rename from paper-api/src/org/bukkit/event/Listener.java rename to paper-api/src/main/java/org/bukkit/event/Listener.java diff --git a/paper-api/src/org/bukkit/event/block/BlockBrokenEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java similarity index 58% rename from paper-api/src/org/bukkit/event/block/BlockBrokenEvent.java rename to paper-api/src/main/java/org/bukkit/event/block/BlockBrokenEvent.java index 1cd4615fc6..800b84d8ab 100644 --- a/paper-api/src/org/bukkit/event/block/BlockBrokenEvent.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java new file mode 100644 index 0000000000..9853164ffb --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java @@ -0,0 +1,47 @@ +/** + * + */ +package org.bukkit.event.block; + +import org.bukkit.Block; +import org.bukkit.Material; +import org.bukkit.event.Cancellable; + +/** + * @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; + } + + /** + * 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/paper-api/src/org/bukkit/event/block/BlockEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java similarity index 100% rename from paper-api/src/org/bukkit/event/block/BlockEvent.java rename to paper-api/src/main/java/org/bukkit/event/block/BlockEvent.java diff --git a/paper-api/src/org/bukkit/event/block/BlockFromToEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java similarity index 80% rename from paper-api/src/org/bukkit/event/block/BlockFromToEvent.java rename to paper-api/src/main/java/org/bukkit/event/block/BlockFromToEvent.java index 928c842ab8..eb2846f9c6 100644 --- a/paper-api/src/org/bukkit/event/block/BlockFromToEvent.java +++ b/paper-api/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,23 @@ 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; - } + @Override + public boolean isCancelled() { + return cancel; + } - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } + @Override + public void setCancelled(boolean cancel) { + this.cancel = cancel; + } } diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java new file mode 100644 index 0000000000..90347096a1 --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java @@ -0,0 +1,19 @@ +package org.bukkit.event.block; + +import org.bukkit.event.Event; + +/** + * @author durron597 + * + */ +public class BlockIgniteEvent extends Event { + + /** + * @param type + */ + public BlockIgniteEvent(Type type) { + super(type); + // TODO Auto-generated constructor stub + } + +} diff --git a/paper-api/src/org/bukkit/event/block/BlockListener.java b/paper-api/src/main/java/org/bukkit/event/block/BlockListener.java similarity index 95% rename from paper-api/src/org/bukkit/event/block/BlockListener.java rename to paper-api/src/main/java/org/bukkit/event/block/BlockListener.java index c760758849..cef040c330 100644 --- a/paper-api/src/org/bukkit/event/block/BlockListener.java +++ b/paper-api/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/paper-api/src/org/bukkit/event/block/BlockPhysicsEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java similarity index 98% rename from paper-api/src/org/bukkit/event/block/BlockPhysicsEvent.java rename to paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java index 17c7b6bcab..addb6b18e0 100644 --- a/paper-api/src/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -1,6 +1,7 @@ package org.bukkit.event.block; import org.bukkit.Block; +import org.bukkit.ItemStack; import org.bukkit.Material; import org.bukkit.event.Event; diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java new file mode 100644 index 0000000000..de5d942789 --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/event/block/BlockPlacedEvent.java @@ -0,0 +1,32 @@ +package org.bukkit.event.block; + +import org.bukkit.Block; +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; + } + + @Override + public boolean isCancelled() { + // TODO Auto-generated method stub + return cancel; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancel = cancel; + } + +} diff --git a/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java b/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java new file mode 100644 index 0000000000..4f43492c7b --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/event/block/BlockRightClickedEvent.java @@ -0,0 +1,53 @@ +/** + * + */ +package org.bukkit.event.block; + +import org.bukkit.Block; +import org.bukkit.BlockFace; +import org.bukkit.ItemStack; +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; + } + + /** + * @return the clicker + */ + public Player getClicker() { + return clicker; + } + + /** + * @return the direction + */ + public BlockFace getDirection() { + return direction; + } + + /** + * @return the clickedWith + */ + public ItemStack getClickedWith() { + return clickedWith; + } +} diff --git a/paper-api/src/org/bukkit/event/player/PlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java similarity index 100% rename from paper-api/src/org/bukkit/event/player/PlayerChatEvent.java rename to paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java diff --git a/paper-api/src/org/bukkit/event/player/PlayerEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java similarity index 100% rename from paper-api/src/org/bukkit/event/player/PlayerEvent.java rename to paper-api/src/main/java/org/bukkit/event/player/PlayerEvent.java diff --git a/paper-api/src/org/bukkit/event/player/PlayerListener.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerListener.java similarity index 100% rename from paper-api/src/org/bukkit/event/player/PlayerListener.java rename to paper-api/src/main/java/org/bukkit/event/player/PlayerListener.java diff --git a/paper-api/src/org/bukkit/event/player/PlayerLoginEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java similarity index 100% rename from paper-api/src/org/bukkit/event/player/PlayerLoginEvent.java rename to paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java diff --git a/paper-api/src/org/bukkit/event/player/PlayerMoveEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java similarity index 100% rename from paper-api/src/org/bukkit/event/player/PlayerMoveEvent.java rename to paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java diff --git a/paper-api/src/org/bukkit/plugin/InvalidDescriptionException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java similarity index 88% rename from paper-api/src/org/bukkit/plugin/InvalidDescriptionException.java rename to paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java index 1179721285..e6f038927e 100644 --- a/paper-api/src/org/bukkit/plugin/InvalidDescriptionException.java +++ b/paper-api/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/paper-api/src/org/bukkit/plugin/InvalidPluginException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java similarity index 87% rename from paper-api/src/org/bukkit/plugin/InvalidPluginException.java rename to paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java index 5ac8107966..4155723abe 100644 --- a/paper-api/src/org/bukkit/plugin/InvalidPluginException.java +++ b/paper-api/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/paper-api/src/org/bukkit/plugin/Plugin.java b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/Plugin.java rename to paper-api/src/main/java/org/bukkit/plugin/Plugin.java diff --git a/paper-api/src/org/bukkit/plugin/PluginDescriptionFile.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/PluginDescriptionFile.java rename to paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java diff --git a/paper-api/src/org/bukkit/plugin/PluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/PluginLoader.java rename to paper-api/src/main/java/org/bukkit/plugin/PluginLoader.java diff --git a/paper-api/src/org/bukkit/plugin/PluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/PluginManager.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/PluginManager.java rename to paper-api/src/main/java/org/bukkit/plugin/PluginManager.java diff --git a/paper-api/src/org/bukkit/plugin/RegisteredListener.java b/paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/RegisteredListener.java rename to paper-api/src/main/java/org/bukkit/plugin/RegisteredListener.java diff --git a/paper-api/src/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java similarity index 99% rename from paper-api/src/org/bukkit/plugin/SimplePluginManager.java rename to paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 08fed37f5f..d2c4b770e6 100644 --- a/paper-api/src/org/bukkit/plugin/SimplePluginManager.java +++ b/paper-api/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/paper-api/src/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java similarity index 100% rename from paper-api/src/org/bukkit/plugin/java/JavaPlugin.java rename to paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java diff --git a/paper-api/src/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java similarity index 69% rename from paper-api/src/org/bukkit/plugin/java/JavaPluginLoader.java rename to paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 021a396d9d..40753b0271 100644 --- a/paper-api/src/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/paper-api/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; } } } diff --git a/paper-api/src/org/bukkit/event/Cancellable.java b/paper-api/src/org/bukkit/event/Cancellable.java deleted file mode 100644 index 91407a9a07..0000000000 --- a/paper-api/src/org/bukkit/event/Cancellable.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.bukkit.event; - -public interface Cancellable { - public boolean isCancelled(); - public void setCancelled(boolean cancel); -} diff --git a/paper-api/src/org/bukkit/event/block/BlockCanBuildEvent.java b/paper-api/src/org/bukkit/event/block/BlockCanBuildEvent.java deleted file mode 100644 index 1627a2be2f..0000000000 --- a/paper-api/src/org/bukkit/event/block/BlockCanBuildEvent.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * - */ -package org.bukkit.event.block; - -import org.bukkit.Block; -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; - } - - /** - * 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/paper-api/src/org/bukkit/event/block/BlockIgniteEvent.java b/paper-api/src/org/bukkit/event/block/BlockIgniteEvent.java deleted file mode 100644 index c8b3f88495..0000000000 --- a/paper-api/src/org/bukkit/event/block/BlockIgniteEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.bukkit.event.block; - -import org.bukkit.event.Event; - -/** - * @author durron597 - * - */ -public class BlockIgniteEvent extends Event { - - /** - * @param type - */ - public BlockIgniteEvent(Type type) { - super(type); - // TODO Auto-generated constructor stub - } - -} diff --git a/paper-api/src/org/bukkit/event/block/BlockPlacedEvent.java b/paper-api/src/org/bukkit/event/block/BlockPlacedEvent.java deleted file mode 100644 index ee21cf63e5..0000000000 --- a/paper-api/src/org/bukkit/event/block/BlockPlacedEvent.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.bukkit.event.block; - -import org.bukkit.Block; -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; - } - - @Override - public boolean isCancelled() { - // TODO Auto-generated method stub - return cancel; - } - - @Override - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } - -} diff --git a/paper-api/src/org/bukkit/event/block/BlockRightClickedEvent.java b/paper-api/src/org/bukkit/event/block/BlockRightClickedEvent.java deleted file mode 100644 index bce2e1aed5..0000000000 --- a/paper-api/src/org/bukkit/event/block/BlockRightClickedEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * - */ -package org.bukkit.event.block; - -import org.bukkit.Block; -import org.bukkit.BlockFace; -import org.bukkit.ItemStack; -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; - } - - /** - * @return the clicker - */ - public Player getClicker() { - return clicker; - } - - /** - * @return the direction - */ - public BlockFace getDirection() { - return direction; - } - - /** - * @return the clickedWith - */ - public ItemStack getClickedWith() { - return clickedWith; - } -}