1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-27 22:38:11 +01:00

All entity stuff in org.bukkit moved to org.bukkit.entity

By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
Bukkit/Spigot 2011-01-15 21:20:59 +00:00
parent 79b2b7fc32
commit e2fd2dfd00
46 changed files with 282 additions and 257 deletions

View file

@ -1,6 +1,7 @@
package org.bukkit; package org.bukkit;
import org.bukkit.entity.Player;
import java.util.List; import java.util.List;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;

View file

@ -1,6 +1,13 @@
package org.bukkit; package org.bukkit;
import org.bukkit.entity.ItemDrop;
import org.bukkit.entity.PoweredMinecart;
import org.bukkit.entity.Minecart;
import org.bukkit.entity.StorageMinecart;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Boat;
/** /**
* Represents a world. * Represents a world.
* *

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents an arrow. * Represents an arrow.

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents a boat entity. * Represents a boat entity.

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents an egg. * Represents an egg.

View file

@ -1,5 +1,8 @@
package org.bukkit; package org.bukkit.entity;
import org.bukkit.Location;
import org.bukkit.World;
/** /**
* Represents a base entity in the world * Represents a base entity in the world

View file

@ -1,5 +1,8 @@
package org.bukkit; package org.bukkit.entity;
import org.bukkit.ItemStack;
import org.bukkit.PlayerInventory;
/** /**
* Represents a human entity, such as an NPC or a player * Represents a human entity, such as an NPC or a player

View file

@ -1,4 +1,6 @@
package org.bukkit; package org.bukkit.entity;
import org.bukkit.ItemStack;
/** /**
* Represents a dropped item. * Represents a dropped item.

View file

@ -1,5 +1,5 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents a living entity, such as a monster or player * Represents a living entity, such as a monster or player

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents a minecart entity. * Represents a minecart entity.

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
public enum MobType { public enum MobType {
CHICKEN("Chicken"), CHICKEN("Chicken"),

View file

@ -1,5 +1,5 @@
package org.bukkit; package org.bukkit.entity;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Represents a powered minecart. * Represents a powered minecart.

View file

@ -1,4 +1,4 @@
package org.bukkit; package org.bukkit.entity;
/** /**
* Implements a snowball. * Implements a snowball.

View file

@ -1,4 +1,6 @@
package org.bukkit; package org.bukkit.entity;
import org.bukkit.Inventory;
/** /**
* Represents a storage minecart. * Represents a storage minecart.

View file

@ -1,4 +1,6 @@
package org.bukkit; package org.bukkit.entity;
import org.bukkit.Vector;
/** /**
* Represents a vehicle entity. * Represents a vehicle entity.

View file

@ -2,7 +2,7 @@ package org.bukkit.event.block;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.BlockDamageLevel; import org.bukkit.BlockDamageLevel;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.block; package org.bukkit.event.block;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View file

@ -1,8 +1,8 @@
package org.bukkit.event.block; package org.bukkit.event.block;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -2,7 +2,7 @@ package org.bukkit.event.block;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.ItemStack; import org.bukkit.ItemStack;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -3,7 +3,7 @@ package org.bukkit.event.block;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.BlockFace; import org.bukkit.BlockFace;
import org.bukkit.ItemStack; import org.bukkit.ItemStack;
import org.bukkit.Player; import org.bukkit.entity.Player;
/** /**
* Not implemented yet * Not implemented yet

View file

@ -1,6 +1,6 @@
package org.bukkit.event.entity; package org.bukkit.event.entity;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.entity; package org.bukkit.event.entity;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View file

@ -1,6 +1,6 @@
package org.bukkit.event.entity; package org.bukkit.event.entity;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View file

@ -1,6 +1,6 @@
package org.bukkit.event.entity; package org.bukkit.event.entity;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;

View file

@ -1,6 +1,6 @@
package org.bukkit.event.entity; package org.bukkit.event.entity;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.event.Event; import org.bukkit.event.Event;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.player; package org.bukkit.event.player;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.player; package org.bukkit.event.player;
import org.bukkit.MobType; import org.bukkit.entity.MobType;
import org.bukkit.Player; import org.bukkit.entity.Player;
/** /**

View file

@ -1,25 +1,25 @@
package org.bukkit.event.player; package org.bukkit.event.player;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
/** /**
* Represents a player related event * Represents a player related event
*/ */
public class PlayerEvent extends Event { public class PlayerEvent extends Event {
protected Player player; protected Player player;
public PlayerEvent(final Event.Type type, final Player who) { public PlayerEvent(final Event.Type type, final Player who) {
super(type); super(type);
player = who; player = who;
} }
/** /**
* Returns the player involved in this event * Returns the player involved in this event
* @return Player who is involved in this event * @return Player who is involved in this event
*/ */
public final Player getPlayer() { public final Player getPlayer() {
return player; return player;
} }
} }

View file

@ -4,7 +4,7 @@ import org.bukkit.Block;
import org.bukkit.BlockFace; import org.bukkit.BlockFace;
import org.bukkit.ItemStack; import org.bukkit.ItemStack;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,104 +1,104 @@
package org.bukkit.event.player; package org.bukkit.event.player;
import org.bukkit.Player; import org.bukkit.entity.Player;
/** /**
* Stores details for players attempting to log in * Stores details for players attempting to log in
*/ */
public class PlayerLoginEvent extends PlayerEvent { public class PlayerLoginEvent extends PlayerEvent {
private Result result; private Result result;
private String message; private String message;
public PlayerLoginEvent(final Type type, final Player player) { public PlayerLoginEvent(final Type type, final Player player) {
super(type, player); super(type, player);
this.result = Result.ALLOWED; this.result = Result.ALLOWED;
this.message = ""; this.message = "";
} }
public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) { public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) {
super(type, player); super(type, player);
this.result = result; this.result = result;
this.message = message; this.message = message;
} }
/** /**
* Gets the current result of the login, as an enum * Gets the current result of the login, as an enum
* *
* @return Current Result of the login * @return Current Result of the login
*/ */
public Result getResult() { public Result getResult() {
return result; return result;
} }
/** /**
* Sets the new result of the login, as an enum * Sets the new result of the login, as an enum
* *
* @param result New result to set * @param result New result to set
*/ */
public void setResult(final Result result) { public void setResult(final Result result) {
this.result = result; this.result = result;
} }
/** /**
* Gets the current kick message that will be used if getResult() != Result.ALLOWED * Gets the current kick message that will be used if getResult() != Result.ALLOWED
* *
* @return Current kick message * @return Current kick message
*/ */
public String getKickMessage() { public String getKickMessage() {
return message; return message;
} }
/** /**
* Sets the kick message to display if getResult() != Result.ALLOWED * Sets the kick message to display if getResult() != Result.ALLOWED
* *
* @param message New kick message * @param message New kick message
*/ */
public void setKickMessage(final String message) { public void setKickMessage(final String message) {
this.message = message; this.message = message;
} }
/** /**
* Allows the player to log in * Allows the player to log in
*/ */
public void allow() { public void allow() {
result = Result.ALLOWED; result = Result.ALLOWED;
message = ""; message = "";
} }
/** /**
* Disallows the player from logging in, with the given reason * Disallows the player from logging in, with the given reason
* *
* @param result New result for disallowing the player * @param result New result for disallowing the player
* @param message Kick message to display to the user * @param message Kick message to display to the user
*/ */
public void disallow(final Result result, final String message) { public void disallow(final Result result, final String message) {
this.result = result; this.result = result;
this.message = message; this.message = message;
} }
/** /**
* Basic kick reasons for communicating to plugins * Basic kick reasons for communicating to plugins
*/ */
public enum Result { public enum Result {
/** /**
* The player is allowed to log in * The player is allowed to log in
*/ */
ALLOWED, ALLOWED,
/** /**
* The player is not allowed to log in, due to the server being full * The player is not allowed to log in, due to the server being full
*/ */
KICK_FULL, KICK_FULL,
/** /**
* The player is not allowed to log in, due to them being banned * The player is not allowed to log in, due to them being banned
*/ */
KICK_BANNED, KICK_BANNED,
/** /**
* The player is not allowed to log in, for reasons undefined * The player is not allowed to log in, for reasons undefined
*/ */
KICK_OTHER KICK_OTHER
} }
} }

View file

@ -1,86 +1,86 @@
package org.bukkit.event.player; package org.bukkit.event.player;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
/** /**
* Holds information for player movement and teleportation events * Holds information for player movement and teleportation events
*/ */
public class PlayerMoveEvent extends PlayerEvent implements Cancellable { public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
private boolean cancel = false; private boolean cancel = false;
private Location from; private Location from;
private Location to; private Location to;
public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) { public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) {
super(type, player); super(type, player);
this.from = from; this.from = from;
this.to = to; this.to = to;
} }
/** /**
* Gets the cancellation state of this event. A cancelled event will not * Gets the cancellation state of this event. A cancelled event will not
* be executed in the server, but will still pass to other plugins * be executed in the server, but will still pass to other plugins
* *
* If a move or teleport event is cancelled, the player will be moved or * If a move or teleport event is cancelled, the player will be moved or
* teleported back to the Location as defined by getFrom(). This will not * teleported back to the Location as defined by getFrom(). This will not
* fire an event * fire an event
* *
* @return true if this event is cancelled * @return true if this event is cancelled
*/ */
public boolean isCancelled() { public boolean isCancelled() {
return cancel; return cancel;
} }
/** /**
* Sets the cancellation state of this event. A cancelled event will not * Sets the cancellation state of this event. A cancelled event will not
* be executed in the server, but will still pass to other plugins * be executed in the server, but will still pass to other plugins
* *
* If a move or teleport event is cancelled, the player will be moved or * If a move or teleport event is cancelled, the player will be moved or
* teleported back to the Location as defined by getFrom(). This will not * teleported back to the Location as defined by getFrom(). This will not
* fire an event * fire an event
* *
* @param cancel true if you wish to cancel this event * @param cancel true if you wish to cancel this event
*/ */
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
this.cancel = cancel; this.cancel = cancel;
} }
/** /**
* Gets the location this player moved from * Gets the location this player moved from
* *
* @return Location the player moved from * @return Location the player moved from
*/ */
public Location getFrom() { public Location getFrom() {
return from; return from;
} }
/** /**
* Sets the location to mark as where the player moved from * Sets the location to mark as where the player moved from
* *
* @param from New location to mark as the players previous location * @param from New location to mark as the players previous location
*/ */
public void setFrom(Location from) { public void setFrom(Location from) {
this.from = from; this.from = from;
} }
/** /**
* Gets the location this player moved to * Gets the location this player moved to
* *
* @return Location the player moved to * @return Location the player moved to
*/ */
public Location getTo() { public Location getTo() {
return to; return to;
} }
/** /**
* Sets the location that this player will move to * Sets the location that this player will move to
* *
* @param to New Location this player will move to * @param to New Location this player will move to
*/ */
public void setTo(Location to) { public void setTo(Location to) {
this.to = to; this.to = to;
} }
} }

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Block; import org.bukkit.Block;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
/** /**
* Raised when a vehicle collides with a block. * Raised when a vehicle collides with a block.

View file

@ -1,6 +1,6 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
/** /**
* Raised when a vehicle collides. * Raised when a vehicle collides.

View file

@ -1,6 +1,6 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
/** /**
* Raised when a vehicle is created. * Raised when a vehicle is created.

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Entity; import org.bukkit.entity.Entity;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,6 +1,6 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Event; import org.bukkit.event.Event;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
/** /**

View file

@ -1,7 +1,7 @@
package org.bukkit.event.vehicle; package org.bukkit.event.vehicle;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Vehicle; import org.bukkit.entity.Vehicle;
/** /**
* Raised when a vehicle moves. * Raised when a vehicle moves.

View file

@ -1,5 +1,6 @@
package org.bukkit.fillr; package org.bukkit.fillr;
import org.bukkit.entity.Player;
import java.io.*; import java.io.*;
import java.util.jar.*; import java.util.jar.*;
import org.bukkit.*; import org.bukkit.*;

View file

@ -1,5 +1,6 @@
package org.bukkit.fillr; package org.bukkit.fillr;
import org.bukkit.entity.Player;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;

View file

@ -1,5 +1,6 @@
package org.bukkit.fillr; package org.bukkit.fillr;
import org.bukkit.entity.Player;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;

View file

@ -1,5 +1,6 @@
package org.bukkit.fillr; package org.bukkit.fillr;
import org.bukkit.entity.Player;
import java.io.File; import java.io.File;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;

View file

@ -1,5 +1,6 @@
package org.bukkit.fillr; package org.bukkit.fillr;
import org.bukkit.entity.Player;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.plugin.*; import org.bukkit.plugin.*;