mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-03 13:27:23 +01:00
All entity stuff in org.bukkit.craftbukkit moved to org.bukkit.craftbukkit.entity
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
parent
dcbc0f4b64
commit
f4fdebbd4b
15 changed files with 45 additions and 13 deletions
paper-server/src/main/java/org/bukkit/craftbukkit
|
@ -1,5 +1,7 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
|
||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
||||
|
||||
/**
|
||||
* Indicates that an object has a method to get its CraftBukkit-equivalent
|
||||
* CraftEntity object from its Minecraft net.minecraft.server.Entity object.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
|
||||
import org.bukkit.craftbukkit.entity.CraftMinecart;
|
||||
import net.minecraft.server.EntityMinecart;
|
||||
import org.bukkit.entity.PoweredMinecart;
|
||||
|
||||
|
|
|
@ -1,5 +1,16 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
|
||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
||||
import org.bukkit.craftbukkit.entity.CraftEgg;
|
||||
import org.bukkit.craftbukkit.entity.CraftBoat;
|
||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
||||
import org.bukkit.craftbukkit.entity.CraftSnowball;
|
||||
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.entity.CraftArrow;
|
||||
import org.bukkit.craftbukkit.entity.CraftMinecart;
|
||||
import org.bukkit.craftbukkit.entity.CraftStorageMinecart;
|
||||
import org.bukkit.craftbukkit.entity.CraftItemDrop;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import org.bukkit.entity.Arrow;
|
||||
import net.minecraft.server.EntityArrow;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
|
||||
/**
|
||||
* Represents an arrow.
|
||||
|
@ -9,7 +10,7 @@ import net.minecraft.server.EntityArrow;
|
|||
* @author sk89q
|
||||
*/
|
||||
public class CraftArrow extends CraftEntity implements Arrow {
|
||||
CraftArrow(CraftServer server, EntityArrow entity) {
|
||||
public CraftArrow(CraftServer server, EntityArrow entity) {
|
||||
super(server, entity);
|
||||
}
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityBoat;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Boat;
|
||||
|
||||
/**
|
|
@ -1,6 +1,7 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityEgg;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Egg;
|
||||
|
||||
/**
|
|
@ -1,10 +1,11 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.Entity;
|
||||
import net.minecraft.server.WorldServer;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Vector;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
|
||||
public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
protected final CraftServer server;
|
|
@ -1,10 +1,12 @@
|
|||
|
||||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityPlayer;
|
||||
import org.bukkit.entity.HumanEntity;
|
||||
import org.bukkit.ItemStack;
|
||||
import org.bukkit.PlayerInventory;
|
||||
import org.bukkit.craftbukkit.CraftInventoryPlayer;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
|
||||
public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||
private EntityPlayer entity;
|
|
@ -1,8 +1,10 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityItem;
|
||||
import org.bukkit.entity.ItemDrop;
|
||||
import org.bukkit.ItemStack;
|
||||
import org.bukkit.craftbukkit.CraftItemStack;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
|
||||
/**
|
||||
* Represents an item drop.
|
|
@ -1,11 +1,13 @@
|
|||
|
||||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.Entity;
|
||||
import net.minecraft.server.EntityArrow;
|
||||
import net.minecraft.server.EntityEgg;
|
||||
import net.minecraft.server.EntityLiving;
|
||||
import net.minecraft.server.EntitySnowball;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.craftbukkit.CraftWorld;
|
||||
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Egg;
|
|
@ -1,6 +1,8 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityMinecart;
|
||||
import org.bukkit.craftbukkit.CraftPoweredMinecart;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Minecart;
|
||||
|
||||
/**
|
|
@ -1,4 +1,4 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketAddress;
|
||||
|
@ -6,6 +6,7 @@ import net.minecraft.server.EntityPlayer;
|
|||
import net.minecraft.server.EntityPlayerMP;
|
||||
import net.minecraft.server.Packet3Chat;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
@ -1,6 +1,7 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntitySnowball;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.Snowball;
|
||||
|
||||
/**
|
|
@ -1,8 +1,10 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import net.minecraft.server.EntityMinecart;
|
||||
|
||||
import org.bukkit.Inventory;
|
||||
import org.bukkit.craftbukkit.CraftInventory;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.entity.StorageMinecart;
|
||||
|
||||
/**
|
|
@ -1,5 +1,7 @@
|
|||
package org.bukkit.craftbukkit;
|
||||
package org.bukkit.craftbukkit.entity;
|
||||
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.craftbukkit.CraftWorld;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
|
Loading…
Add table
Reference in a new issue