diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index 523056e79..cd745658f 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -347,5 +347,5 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { return false; } - private static final String COMPATIBLE_MC_VERSION = "1.4"; + private static final String COMPATIBLE_MC_VERSION = "1.4.6"; } \ No newline at end of file diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java index 3dc29c7fb..785b825ef 100644 --- a/src/main/java/net/citizensnpcs/EventListen.java +++ b/src/main/java/net/citizensnpcs/EventListen.java @@ -25,13 +25,13 @@ import net.citizensnpcs.trait.CurrentLocation; import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.Messaging; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_4_5.EntityPlayer; +import net.minecraft.server.v1_4_6.EntityPlayer; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index e9b1801f5..926518c66 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -22,11 +22,11 @@ import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.Messaging; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityLiving; +import net.minecraft.server.v1_4_6.EntityLiving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.metadata.FixedMetadataValue; diff --git a/src/main/java/net/citizensnpcs/npc/MobEntityController.java b/src/main/java/net/citizensnpcs/npc/MobEntityController.java index 29a782155..ad6f6e2f4 100644 --- a/src/main/java/net/citizensnpcs/npc/MobEntityController.java +++ b/src/main/java/net/citizensnpcs/npc/MobEntityController.java @@ -5,12 +5,12 @@ import java.util.Map; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_4_5.EntityLiving; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityLiving; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_4_5.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; import org.bukkit.entity.LivingEntity; import com.google.common.collect.Maps; diff --git a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java index 5f7b6debf..fa8b54695 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java @@ -10,7 +10,7 @@ import net.citizensnpcs.api.astar.pathfinder.VectorGoal; import net.citizensnpcs.api.astar.pathfinder.VectorNode; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_4_5.EntityLiving; +import net.minecraft.server.v1_4_6.EntityLiving; import org.bukkit.Effect; import org.bukkit.Location; diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java index e13f99ff3..764bc95c6 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java @@ -4,12 +4,12 @@ import net.citizensnpcs.api.ai.NavigatorParameters; import net.citizensnpcs.api.ai.TargetType; import net.citizensnpcs.api.ai.event.CancelReason; import net.citizensnpcs.api.npc.NPC; -import net.minecraft.server.v1_4_5.EntityHuman; -import net.minecraft.server.v1_4_5.EntityLiving; -import net.minecraft.server.v1_4_5.Navigation; +import net.minecraft.server.v1_4_6.EntityHuman; +import net.minecraft.server.v1_4_6.EntityLiving; +import net.minecraft.server.v1_4_6.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; public class MCNavigationStrategy extends AbstractPathStrategy { private final Navigation navigation; diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java index 91c89d550..9c7de51b0 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java @@ -8,12 +8,12 @@ import net.citizensnpcs.api.ai.event.CancelReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.PlayerAnimation; -import net.minecraft.server.v1_4_5.EntityLiving; -import net.minecraft.server.v1_4_5.EntityPlayer; -import net.minecraft.server.v1_4_5.Navigation; +import net.minecraft.server.v1_4_6.EntityLiving; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; public class MCTargetStrategy implements PathStrategy, EntityTarget { diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java index 31c9e403c..404b9615f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BatController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityBat; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityBat; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftBat; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftBat; import org.bukkit.entity.Bat; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -68,7 +68,7 @@ public class BatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java index d7c9cdaa8..6af78f69e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityBlaze; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityBlaze; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftBlaze; import org.bukkit.entity.Blaze; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -66,7 +66,7 @@ public class BlazeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java index e6610b879..a99a507b9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityCaveSpider; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityCaveSpider; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftCaveSpider; import org.bukkit.entity.CaveSpider; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -75,7 +75,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java index b4dbfba2a..664c9e061 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityChicken; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityChicken; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftChicken; import org.bukkit.entity.Chicken; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -65,7 +65,7 @@ public class ChickenController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CowController.java b/src/main/java/net/citizensnpcs/npc/entity/CowController.java index ca8a6bf89..10959432b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CowController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityCow; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityCow; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftCow; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftCow; import org.bukkit.entity.Cow; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -65,7 +65,7 @@ public class CowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java index 4c409dcdf..8e123b302 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityCreeper; -import net.minecraft.server.v1_4_5.EntityLightning; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityCreeper; +import net.minecraft.server.v1_4_6.EntityLightning; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftCreeper; import org.bukkit.entity.Creeper; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -72,7 +72,7 @@ public class CreeperController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java index 46e02bd98..ec97df03e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityEnderDragon; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityEnderDragon; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftEnderDragon; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -72,7 +72,7 @@ public class EnderDragonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java index 7abde443a..72fb6e4e2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityEnderman; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityEnderman; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftEnderman; import org.bukkit.entity.Enderman; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -85,7 +85,7 @@ public class EndermanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java index 621ee7d0c..22cf86075 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java @@ -13,34 +13,34 @@ import net.citizensnpcs.npc.network.EmptyNetworkManager; import net.citizensnpcs.npc.network.EmptySocket; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityPlayer; -import net.minecraft.server.v1_4_5.EnumGamemode; -import net.minecraft.server.v1_4_5.ItemInWorldManager; -import net.minecraft.server.v1_4_5.MathHelper; -import net.minecraft.server.v1_4_5.MinecraftServer; -import net.minecraft.server.v1_4_5.Navigation; -import net.minecraft.server.v1_4_5.NetHandler; -import net.minecraft.server.v1_4_5.NetworkManager; -import net.minecraft.server.v1_4_5.Packet32EntityLook; -import net.minecraft.server.v1_4_5.Packet5EntityEquipment; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.EnumGamemode; +import net.minecraft.server.v1_4_6.PlayerInteractManager; +import net.minecraft.server.v1_4_6.MathHelper; +import net.minecraft.server.v1_4_6.MinecraftServer; +import net.minecraft.server.v1_4_6.Navigation; +import net.minecraft.server.v1_4_6.Connection; +import net.minecraft.server.v1_4_6.NetworkManager; +import net.minecraft.server.v1_4_6.Packet32EntityLook; +import net.minecraft.server.v1_4_6.Packet5EntityEquipment; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; public class EntityHumanNPC extends EntityPlayer implements NPCHolder { private final CitizensNPC npc; - private final net.minecraft.server.v1_4_5.ItemStack[] previousEquipment = { null, null, null, null, null }; + private final net.minecraft.server.v1_4_6.ItemStack[] previousEquipment = { null, null, null, null, null }; public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string, - ItemInWorldManager itemInWorldManager, NPC npc) { - super(minecraftServer, world, string, itemInWorldManager); - itemInWorldManager.setGameMode(EnumGamemode.SURVIVAL); + PlayerInteractManager playerInteractManager, NPC npc) { + super(minecraftServer, world, string, playerInteractManager); + playerInteractManager.setGameMode(EnumGamemode.SURVIVAL); this.npc = (CitizensNPC) npc; if (npc != null) @@ -53,7 +53,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -97,16 +97,16 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { private void initialise(MinecraftServer minecraftServer) { Socket socket = new EmptySocket(); - NetworkManager netMgr = null; + NetworkManager conn = null; try { - netMgr = new EmptyNetworkManager(socket, "npc mgr", new NetHandler() { + conn = new EmptyNetworkManager(socket, "npc mgr", new Connection() { @Override public boolean a() { return false; } }, server.F().getPrivate()); - netServerHandler = new EmptyNetHandler(minecraftServer, netMgr, this); - netMgr.a(netServerHandler); + playerConnection = new EmptyNetHandler(minecraftServer, conn, this); + conn.a(playerConnection); } catch (IOException e) { // swallow } @@ -161,33 +161,33 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { private void moveOnCurrentHeading() { NMS.updateAI(this); // taken from EntityLiving update method - if (bE) { + if (bF) { /* boolean inLiquid = H() || J(); if (inLiquid) { motY += 0.04; } else //(handled elsewhere)*/ - if (onGround && bU == 0) { + if (onGround && bV == 0) { bi(); - bU = 10; + bV = 10; } } else - bU = 0; + bV = 0; - bB *= 0.98F; bC *= 0.98F; - bD *= 0.9F; + bD *= 0.98F; + bE *= 0.9F; - float prev = aM; - aM *= bB(); - e(bB, bC); // movement method - aM = prev; + float prev = aN; + aN *= bB(); + e(bC, bD); // movement method + aN = prev; NMS.setHeadYaw(this, yaw); } private void updateEquipment() { for (int i = 0; i < previousEquipment.length; i++) { - net.minecraft.server.v1_4_5.ItemStack previous = previousEquipment[i]; - net.minecraft.server.v1_4_5.ItemStack current = getEquipment(i); + net.minecraft.server.v1_4_6.ItemStack previous = previousEquipment[i]; + net.minecraft.server.v1_4_6.ItemStack current = getEquipment(i); if (previous != current) { NMS.sendPacketNearby(getBukkitEntity().getLocation(), new Packet5EntityEquipment(id, i, current)); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index a7c849f99..1f15a1595 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityGhast; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityGhast; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftGhast; import org.bukkit.entity.Entity; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; @@ -52,7 +52,7 @@ public class GhastController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java index 0266beed9..1ca9d360a 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityGiantZombie; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityGiantZombie; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftGiant; import org.bukkit.entity.Entity; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; @@ -52,7 +52,7 @@ public class GiantController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java index f919bed4c..1388ed929 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java @@ -6,12 +6,12 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.StringHelper; -import net.minecraft.server.v1_4_5.ItemInWorldManager; -import net.minecraft.server.v1_4_5.WorldServer; +import net.minecraft.server.v1_4_6.PlayerInteractManager; +import net.minecraft.server.v1_4_6.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_5.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -20,7 +20,7 @@ public class HumanController extends AbstractEntityController { protected LivingEntity createEntity(final Location at, final NPC npc) { WorldServer ws = ((CraftWorld) at.getWorld()).getHandle(); final EntityHumanNPC handle = new EntityHumanNPC(ws.getServer().getServer(), ws, - StringHelper.parseColors(npc.getFullName()), new ItemInWorldManager(ws), npc); + StringHelper.parseColors(npc.getFullName()), new PlayerInteractManager(ws), npc); handle.getBukkitEntity().teleport(at); Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() { @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index fcfcb00fc..22c55f398 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityIronGolem; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityIronGolem; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftIronGolem; import org.bukkit.entity.Entity; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; @@ -50,7 +50,7 @@ public class IronGolemController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java index bcb20c9ab..65bf209bb 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityMagmaCube; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityMagmaCube; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftMagmaCube; import org.bukkit.entity.Entity; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; @@ -62,7 +62,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java index e2fb9d721..32b5cb97f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityMushroomCow; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityMushroomCow; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftMushroomCow; import org.bukkit.entity.Entity; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; @@ -52,7 +52,7 @@ public class MushroomCowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java index f4107ee6e..e2c67eaf1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityOcelot; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityOcelot; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftOcelot; import org.bukkit.entity.Entity; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class OcelotController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java index 42f8687e1..4ec764403 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityLightning; -import net.minecraft.server.v1_4_5.EntityPig; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityLightning; +import net.minecraft.server.v1_4_6.EntityPig; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPig; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPig; import org.bukkit.entity.Entity; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; @@ -58,7 +58,7 @@ public class PigController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java index 06325e328..9d6851fa9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityPigZombie; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityPigZombie; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPigZombie; import org.bukkit.entity.Entity; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; @@ -62,7 +62,7 @@ public class PigZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java index 1f62f9a64..024545f7d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySheep; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySheep; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSheep; import org.bukkit.entity.Entity; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class SheepController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java index beeff5b51..04e5d6a8b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySilverfish; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySilverfish; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSilverfish; import org.bukkit.entity.Entity; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; @@ -61,7 +61,7 @@ public class SilverfishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java index b605f53f3..87caeb975 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySkeleton; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySkeleton; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSkeleton; import org.bukkit.entity.Entity; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class SkeletonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java index 0e3c05d0c..33f0b055f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySlime; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySlime; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSlime; import org.bukkit.entity.Entity; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; @@ -63,7 +63,7 @@ public class SlimeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java index f69cb0c66..d78fcc2fe 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySnowman; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySnowman; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSnowman; import org.bukkit.entity.Entity; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class SnowmanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java index dda7c39b1..2580d0977 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySpider; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySpider; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSpider; import org.bukkit.entity.Entity; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; @@ -61,7 +61,7 @@ public class SpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java index a38020e9e..adaa20253 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntitySquid; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntitySquid; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftSquid; import org.bukkit.entity.Entity; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; @@ -52,7 +52,7 @@ public class SquidController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java index 21c9235c2..a30de7c9b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityHuman; -import net.minecraft.server.v1_4_5.EntityVillager; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityHuman; +import net.minecraft.server.v1_4_6.EntityVillager; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftVillager; import org.bukkit.entity.Entity; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; @@ -59,7 +59,7 @@ public class VillagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java index 18efeefd6..a847124c9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityWitch; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityWitch; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftWitch; import org.bukkit.entity.Entity; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class WitchController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java index 913d0e3d5..f2be8d636 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityWither; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityWither; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftWither; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftWither; import org.bukkit.entity.Entity; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; @@ -57,7 +57,7 @@ public class WitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java index fd6959bd6..55e8e5c6f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityWolf; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityWolf; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftWolf; import org.bukkit.entity.Entity; import org.bukkit.entity.Wolf; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class WolfController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java index 1627d5020..12f5b3404 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java @@ -7,12 +7,12 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityZombie; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.EntityZombie; +import net.minecraft.server.v1_4_6.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftZombie; import org.bukkit.entity.Entity; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; @@ -51,7 +51,7 @@ public class ZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_4_5.Entity entity) { + public void collide(net.minecraft.server.v1_4_6.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java index bb03405b7..3515355b8 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java @@ -1,23 +1,23 @@ package net.citizensnpcs.npc.network; -import net.minecraft.server.v1_4_5.EntityPlayer; -import net.minecraft.server.v1_4_5.MinecraftServer; -import net.minecraft.server.v1_4_5.NetServerHandler; -import net.minecraft.server.v1_4_5.NetworkManager; -import net.minecraft.server.v1_4_5.Packet; -import net.minecraft.server.v1_4_5.Packet102WindowClick; -import net.minecraft.server.v1_4_5.Packet106Transaction; -import net.minecraft.server.v1_4_5.Packet10Flying; -import net.minecraft.server.v1_4_5.Packet130UpdateSign; -import net.minecraft.server.v1_4_5.Packet14BlockDig; -import net.minecraft.server.v1_4_5.Packet15Place; -import net.minecraft.server.v1_4_5.Packet16BlockItemSwitch; -import net.minecraft.server.v1_4_5.Packet255KickDisconnect; -import net.minecraft.server.v1_4_5.Packet28EntityVelocity; -import net.minecraft.server.v1_4_5.Packet3Chat; -import net.minecraft.server.v1_4_5.Packet51MapChunk; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.MinecraftServer; +import net.minecraft.server.v1_4_6.PlayerConnection; +import net.minecraft.server.v1_4_6.NetworkManager; +import net.minecraft.server.v1_4_6.Packet; +import net.minecraft.server.v1_4_6.Packet102WindowClick; +import net.minecraft.server.v1_4_6.Packet106Transaction; +import net.minecraft.server.v1_4_6.Packet10Flying; +import net.minecraft.server.v1_4_6.Packet130UpdateSign; +import net.minecraft.server.v1_4_6.Packet14BlockDig; +import net.minecraft.server.v1_4_6.Packet15Place; +import net.minecraft.server.v1_4_6.Packet16BlockItemSwitch; +import net.minecraft.server.v1_4_6.Packet255KickDisconnect; +import net.minecraft.server.v1_4_6.Packet28EntityVelocity; +import net.minecraft.server.v1_4_6.Packet3Chat; +import net.minecraft.server.v1_4_6.Packet51MapChunk; -public class EmptyNetHandler extends NetServerHandler { +public class EmptyNetHandler extends PlayerConnection { public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { super(minecraftServer, networkManager, entityPlayer); diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java index 5c2838b1a..880517470 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java @@ -5,15 +5,15 @@ import java.net.Socket; import java.security.PrivateKey; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_4_5.NetHandler; -import net.minecraft.server.v1_4_5.NetworkManager; -import net.minecraft.server.v1_4_5.Packet; +import net.minecraft.server.v1_4_6.Connection; +import net.minecraft.server.v1_4_6.NetworkManager; +import net.minecraft.server.v1_4_6.Packet; public class EmptyNetworkManager extends NetworkManager { - public EmptyNetworkManager(Socket socket, String string, NetHandler netHandler, PrivateKey key) + public EmptyNetworkManager(Socket socket, String string, Connection conn, PrivateKey key) throws IOException { - super(socket, string, netHandler, key); + super(socket, string, conn, key); NMS.stopNetworkThreads(this); } @@ -23,7 +23,7 @@ public class EmptyNetworkManager extends NetworkManager { } @Override - public void a(NetHandler netHandler) { + public void a(Connection conn) { } @Override diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java index 56ec5a1f1..e3ab3c8e1 100644 --- a/src/main/java/net/citizensnpcs/trait/Controllable.java +++ b/src/main/java/net/citizensnpcs/trait/Controllable.java @@ -12,11 +12,11 @@ import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.command.CommandConfigurable; import net.citizensnpcs.command.CommandContext; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_4_5.EntityLiving; -import net.minecraft.server.v1_4_5.EntityPlayer; +import net.minecraft.server.v1_4_6.EntityLiving; +import net.minecraft.server.v1_4_6.EntityPlayer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java index f6308799f..46b8eeb52 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java @@ -1,8 +1,8 @@ package net.citizensnpcs.trait.waypoint; -import net.minecraft.server.v1_4_5.DamageSource; -import net.minecraft.server.v1_4_5.EntityEnderCrystal; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.DamageSource; +import net.minecraft.server.v1_4_6.EntityEnderCrystal; +import net.minecraft.server.v1_4_6.World; public class EntityEnderCrystalMarker extends EntityEnderCrystal { public EntityEnderCrystalMarker(World world) { diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java index 362d7d9a7..04247c77f 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -9,31 +9,31 @@ import java.util.Set; import java.util.WeakHashMap; import net.citizensnpcs.api.npc.NPC; -import net.minecraft.server.v1_4_5.ControllerJump; -import net.minecraft.server.v1_4_5.ControllerLook; -import net.minecraft.server.v1_4_5.DamageSource; -import net.minecraft.server.v1_4_5.EnchantmentManager; -import net.minecraft.server.v1_4_5.Entity; -import net.minecraft.server.v1_4_5.EntityLiving; -import net.minecraft.server.v1_4_5.EntityMonster; -import net.minecraft.server.v1_4_5.EntityTypes; -import net.minecraft.server.v1_4_5.MathHelper; -import net.minecraft.server.v1_4_5.MobEffectList; -import net.minecraft.server.v1_4_5.Navigation; -import net.minecraft.server.v1_4_5.NetworkManager; -import net.minecraft.server.v1_4_5.Packet; -import net.minecraft.server.v1_4_5.PathfinderGoalSelector; -import net.minecraft.server.v1_4_5.World; +import net.minecraft.server.v1_4_6.ControllerJump; +import net.minecraft.server.v1_4_6.ControllerLook; +import net.minecraft.server.v1_4_6.DamageSource; +import net.minecraft.server.v1_4_6.EnchantmentManager; +import net.minecraft.server.v1_4_6.Entity; +import net.minecraft.server.v1_4_6.EntityLiving; +import net.minecraft.server.v1_4_6.EntityMonster; +import net.minecraft.server.v1_4_6.EntityTypes; +import net.minecraft.server.v1_4_6.MathHelper; +import net.minecraft.server.v1_4_6.MobEffectList; +import net.minecraft.server.v1_4_6.Navigation; +import net.minecraft.server.v1_4_6.NetworkManager; +import net.minecraft.server.v1_4_6.Packet; +import net.minecraft.server.v1_4_6.PathfinderGoalSelector; +import net.minecraft.server.v1_4_6.World; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.CraftWorld; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -238,7 +238,7 @@ public class NMS { } public static void sendPacket(Player player, Packet packet) { - ((CraftPlayer) player).getHandle().netServerHandler.sendPacket(packet); + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } public static void setDestination(LivingEntity bukkitEntity, double x, double y, double z, float speed) { diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java index 62e7e3204..a4460cd58 100644 --- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java +++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java @@ -1,12 +1,12 @@ package net.citizensnpcs.util; -import net.minecraft.server.v1_4_5.EntityPlayer; -import net.minecraft.server.v1_4_5.Packet; -import net.minecraft.server.v1_4_5.Packet17EntityLocationAction; -import net.minecraft.server.v1_4_5.Packet18ArmAnimation; -import net.minecraft.server.v1_4_5.Packet40EntityMetadata; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.Packet; +import net.minecraft.server.v1_4_6.Packet17EntityLocationAction; +import net.minecraft.server.v1_4_6.Packet18ArmAnimation; +import net.minecraft.server.v1_4_6.Packet40EntityMetadata; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.Player; public enum PlayerAnimation {