mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
fixed imports on all Entities
This commit is contained in:
parent
d7d7a68f91
commit
26a590f030
29 changed files with 47 additions and 20 deletions
|
@ -1,10 +1,10 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.Event.Type;
|
import org.bukkit.event.Event.Type;
|
||||||
import org.bukkit.event.entity.EntityCombustEvent;
|
import org.bukkit.event.entity.EntityCombustEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageByBlockEvent;
|
import org.bukkit.event.entity.EntityDamageByBlockEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||||
//CraftBukkit end
|
//CraftBukkit end
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftAnimals;
|
import org.bukkit.craftbukkit.entity.CraftAnimals;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public abstract class EntityAnimals extends EntityCreature implements IAnimals {
|
public abstract class EntityAnimals extends EntityCreature implements IAnimals {
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftAnimals;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftChicken;
|
import org.bukkit.craftbukkit.entity.CraftChicken;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityChicken extends EntityAnimals {
|
public class EntityChicken extends EntityAnimals {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftCow;
|
import org.bukkit.craftbukkit.entity.CraftCow;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityCow extends EntityAnimals {
|
public class EntityCow extends EntityAnimals {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftCreature;
|
import org.bukkit.craftbukkit.entity.CraftCreature;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityCreature extends EntityLiving {
|
public class EntityCreature extends EntityLiving {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftCreeper;
|
import org.bukkit.craftbukkit.entity.CraftCreeper;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityCreeper extends EntityMobs {
|
public class EntityCreeper extends EntityMobs {
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,7 @@ import java.util.Random;
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
import org.bukkit.entity.MobType;
|
import org.bukkit.entity.MobType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.craftbukkit.entity.CraftArrow;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftEgg;
|
import org.bukkit.craftbukkit.entity.CraftEgg;
|
||||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.Event.Type;
|
import org.bukkit.event.Event.Type;
|
||||||
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftFallingSand;
|
import org.bukkit.craftbukkit.entity.CraftFallingSand;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityFallingSand extends Entity {
|
public class EntityFallingSand extends Entity {
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ package net.minecraft.server;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftFireball;
|
import org.bukkit.craftbukkit.entity.CraftFireball;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
||||||
|
|
|
@ -4,11 +4,7 @@ import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftEgg;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftFireball;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftFish;
|
import org.bukkit.craftbukkit.entity.CraftFish;
|
||||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftFlying;
|
import org.bukkit.craftbukkit.entity.CraftFlying;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityFlying extends EntityLiving {
|
public class EntityFlying extends EntityLiving {
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,10 @@ package net.minecraft.server;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftGhast;
|
import org.bukkit.craftbukkit.entity.CraftGhast;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityGhast extends EntityFlying implements IMobs {
|
public class EntityGhast extends EntityFlying implements IMobs {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftItem;
|
import org.bukkit.craftbukkit.entity.CraftItem;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityItem extends Entity {
|
public class EntityItem extends Entity {
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,10 @@ package net.minecraft.server;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public abstract class EntityLiving extends Entity {
|
public abstract class EntityLiving extends Entity {
|
||||||
|
|
||||||
|
|
|
@ -3,13 +3,9 @@ package net.minecraft.server;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
//CraftBukkit start
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftMinecart;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftMonster;
|
import org.bukkit.craftbukkit.entity.CraftMonster;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
|
|
||||||
import org.bukkit.event.entity.EntityDamageByBlockEvent;
|
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftPainting;
|
import org.bukkit.craftbukkit.entity.CraftPainting;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityPainting extends Entity {
|
public class EntityPainting extends Entity {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftPig;
|
import org.bukkit.craftbukkit.entity.CraftPig;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityPig extends EntityAnimals {
|
public class EntityPig extends EntityAnimals {
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,10 @@ package net.minecraft.server;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftPigZombie;
|
import org.bukkit.craftbukkit.entity.CraftPigZombie;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntityPigZombie extends EntityZombie {
|
public class EntityPigZombie extends EntityZombie {
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,13 @@ package net.minecraft.server;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
import org.bukkit.event.entity.EntityDamageEvent;
|
import org.bukkit.event.entity.EntityDamageEvent;
|
||||||
// CraftBukkit end
|
|
||||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public abstract class EntityPlayer extends EntityLiving {
|
public abstract class EntityPlayer extends EntityLiving {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSheep;
|
import org.bukkit.craftbukkit.entity.CraftSheep;
|
||||||
|
//CraftBukkit end
|
||||||
|
|
||||||
public class EntitySheep extends EntityAnimals {
|
public class EntitySheep extends EntityAnimals {
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftSkeleton;
|
import org.bukkit.craftbukkit.entity.CraftSkeleton;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.Event.Type;
|
import org.bukkit.event.Event.Type;
|
||||||
|
|
|
@ -2,9 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSkeleton;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftSlime;
|
import org.bukkit.craftbukkit.entity.CraftSlime;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntitySlime extends EntityLiving implements IMobs {
|
public class EntitySlime extends EntityLiving implements IMobs {
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,6 @@ import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
//CraftBukkit start
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSnowball;
|
import org.bukkit.craftbukkit.entity.CraftSnowball;
|
||||||
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSpider;
|
import org.bukkit.craftbukkit.entity.CraftSpider;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntitySpider extends EntityMobs {
|
public class EntitySpider extends EntityMobs {
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,10 @@ package net.minecraft.server;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSquid;
|
import org.bukkit.craftbukkit.entity.CraftSquid;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntitySquid extends EntityWaterMob {
|
public class EntitySquid extends EntityWaterMob {
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftSkeleton;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
|
import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntityTNTPrimed extends Entity {
|
public class EntityTNTPrimed extends Entity {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftWaterMob;
|
import org.bukkit.craftbukkit.entity.CraftWaterMob;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntityWaterMob extends EntityCreature implements IAnimals {
|
public class EntityWaterMob extends EntityCreature implements IAnimals {
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.entity.CraftZombie;
|
import org.bukkit.craftbukkit.entity.CraftZombie;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.event.Event.Type;
|
import org.bukkit.event.Event.Type;
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
|
//CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.entity.CraftGiant;
|
import org.bukkit.craftbukkit.entity.CraftGiant;
|
||||||
|
//CraftBukkit stop
|
||||||
|
|
||||||
public class EntityZombieSimple extends EntityMobs {
|
public class EntityZombieSimple extends EntityMobs {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue