1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-31 03:50:36 +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;
import org.bukkit.entity.Player;
import java.util.List;
import org.bukkit.plugin.PluginManager;

View file

@ -1,6 +1,13 @@
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.
*

View file

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

View file

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

View file

@ -1,4 +1,4 @@
package org.bukkit;
package org.bukkit.entity;
/**
* 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

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

View file

@ -1,4 +1,6 @@
package org.bukkit;
package org.bukkit.entity;
import org.bukkit.ItemStack;
/**
* 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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,6 @@
package org.bukkit;
package org.bukkit.entity;
import org.bukkit.Inventory;
/**
* 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.

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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