From 9f953a81ed9066cd19a0e19e100917268727b563 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 3 May 2013 12:25:15 +0800 Subject: [PATCH] Update to MC 1.4.2 --- .../citizensnpcs/commands/NPCCommands.java | 4 +- .../net/citizensnpcs/npc/CitizensNPC.java | 4 +- .../citizensnpcs/npc/MobEntityController.java | 6 +-- .../npc/ai/AStarNavigationStrategy.java | 2 +- .../net/citizensnpcs/npc/ai/BlockBreaker.java | 22 +++++----- .../npc/ai/MCNavigationStrategy.java | 6 +-- .../citizensnpcs/npc/ai/MCTargetStrategy.java | 14 +++---- .../npc/entity/BatController.java | 12 +++--- .../npc/entity/BlazeController.java | 12 +++--- .../npc/entity/CaveSpiderController.java | 12 +++--- .../npc/entity/ChickenController.java | 12 +++--- .../npc/entity/CowController.java | 12 +++--- .../npc/entity/CreeperController.java | 14 +++---- .../npc/entity/EnderDragonController.java | 12 +++--- .../npc/entity/EndermanController.java | 12 +++--- .../npc/entity/EntityHumanNPC.java | 30 ++++++------- .../npc/entity/GhastController.java | 12 +++--- .../npc/entity/GiantController.java | 12 +++--- .../npc/entity/HumanController.java | 6 +-- .../npc/entity/IronGolemController.java | 12 +++--- .../npc/entity/MagmaCubeController.java | 12 +++--- .../npc/entity/MushroomCowController.java | 12 +++--- .../npc/entity/OcelotController.java | 12 +++--- .../npc/entity/PigController.java | 14 +++---- .../npc/entity/PigZombieController.java | 12 +++--- .../npc/entity/SheepController.java | 12 +++--- .../npc/entity/SilverfishController.java | 12 +++--- .../npc/entity/SkeletonController.java | 12 +++--- .../npc/entity/SlimeController.java | 12 +++--- .../npc/entity/SnowmanController.java | 12 +++--- .../npc/entity/SpiderController.java | 12 +++--- .../npc/entity/SquidController.java | 12 +++--- .../npc/entity/VillagerController.java | 14 +++---- .../npc/entity/WitchController.java | 12 +++--- .../npc/entity/WitherController.java | 12 +++--- .../npc/entity/WolfController.java | 12 +++--- .../npc/entity/ZombieController.java | 12 +++--- .../npc/network/EmptyNetHandler.java | 32 +++++++------- .../npc/network/EmptyNetworkManager.java | 8 ++-- .../net/citizensnpcs/trait/Controllable.java | 10 ++--- .../waypoint/EntityEnderCrystalMarker.java | 6 +-- src/main/java/net/citizensnpcs/util/NMS.java | 42 +++++++++---------- .../citizensnpcs/util/PlayerAnimation.java | 12 +++--- 43 files changed, 273 insertions(+), 273 deletions(-) diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java index c0c07f42d..da2e9022a 100644 --- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -902,9 +902,9 @@ public class NPCCommands { if (test.getName().equalsIgnoreCase(name)) possible.add(test); } - if (possible.size() == 1) + if (possible.size() == 1) { toSelect = possible.get(0); - else if (possible.size() > 1) { + } else if (possible.size() > 1) { SelectionPrompt.start(selector, (Player) sender, possible); return; } diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index ed6b7d3e9..982d5970e 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.trait.CurrentLocation; import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_5_R2.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityLiving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; diff --git a/src/main/java/net/citizensnpcs/npc/MobEntityController.java b/src/main/java/net/citizensnpcs/npc/MobEntityController.java index 2790823cb..ab746cc19 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_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R3.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 27107a73b..a8708cc3e 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_5_R2.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityLiving; import org.bukkit.Effect; import org.bukkit.Location; diff --git a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java index 15550c6ba..b47decec5 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java +++ b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java @@ -3,17 +3,17 @@ package net.citizensnpcs.npc.ai; import net.citizensnpcs.api.ai.tree.BehaviorGoalAdapter; import net.citizensnpcs.api.ai.tree.BehaviorStatus; import net.citizensnpcs.util.PlayerAnimation; -import net.minecraft.server.v1_5_R2.Block; -import net.minecraft.server.v1_5_R2.Enchantment; -import net.minecraft.server.v1_5_R2.EnchantmentManager; -import net.minecraft.server.v1_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.ItemStack; -import net.minecraft.server.v1_5_R2.Material; -import net.minecraft.server.v1_5_R2.MobEffectList; +import net.minecraft.server.v1_5_R3.Block; +import net.minecraft.server.v1_5_R3.Enchantment; +import net.minecraft.server.v1_5_R3.EnchantmentManager; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.ItemStack; +import net.minecraft.server.v1_5_R3.Material; +import net.minecraft.server.v1_5_R3.MobEffectList; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -39,7 +39,7 @@ public class BlockBreaker extends BehaviorGoalAdapter { return Math.pow(entity.locX - x, 2) + Math.pow(entity.locY - y, 2) + Math.pow(entity.locZ - z, 2); } - private net.minecraft.server.v1_5_R2.ItemStack getCurrentItem() { + private net.minecraft.server.v1_5_R3.ItemStack getCurrentItem() { return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) : entity.getEquipment(0); } diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java index d0352ccba..160f94ac6 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java @@ -4,11 +4,11 @@ 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_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.Navigation; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.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 625b6202c..04508c8fd 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java @@ -10,15 +10,15 @@ 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_5_R2.Entity; -import net.minecraft.server.v1_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.Navigation; -import net.minecraft.server.v1_5_R2.PathEntity; +import net.minecraft.server.v1_5_R3.Entity; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.Navigation; +import net.minecraft.server.v1_5_R3.PathEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.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 b7beb79d5..dcb398238 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BatController.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_5_R2.EntityBat; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityBat; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftBat; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftBat; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Bat; import org.bukkit.util.Vector; @@ -73,7 +73,7 @@ public class BatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 28407b5a4..f9477b447 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.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_5_R2.EntityBlaze; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityBlaze; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Blaze; import org.bukkit.util.Vector; @@ -72,7 +72,7 @@ public class BlazeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 5095a646b..87b95c5f6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.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_5_R2.EntityCaveSpider; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityCaveSpider; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.CaveSpider; import org.bukkit.util.Vector; @@ -80,7 +80,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 86732a4b0..c72cd118b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.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_5_R2.EntityChicken; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityChicken; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Chicken; import org.bukkit.util.Vector; @@ -70,7 +70,7 @@ public class ChickenController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 ae1ae5ff7..8a3cb2123 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CowController.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_5_R2.EntityCow; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityCow; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftCow; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftCow; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Cow; import org.bukkit.util.Vector; @@ -70,7 +70,7 @@ public class CowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 301cf895b..c3c38865e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java @@ -7,14 +7,14 @@ 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_5_R2.EntityCreeper; -import net.minecraft.server.v1_5_R2.EntityLightning; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityCreeper; +import net.minecraft.server.v1_5_R3.EntityLightning; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Creeper; import org.bukkit.util.Vector; @@ -76,7 +76,7 @@ public class CreeperController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 fe35264df..147d2314f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.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_5_R2.EntityEnderDragon; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityEnderDragon; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.EnderDragon; import org.bukkit.util.Vector; @@ -83,7 +83,7 @@ public class EnderDragonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 f474146e4..71d5b2daf 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.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_5_R2.EntityEnderman; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityEnderman; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; import org.bukkit.entity.Enderman; import org.bukkit.util.Vector; @@ -89,7 +89,7 @@ public class EndermanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 851bfa22a..cc4464b52 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java @@ -13,23 +13,23 @@ 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_5_R2.Connection; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.EnumGamemode; -import net.minecraft.server.v1_5_R2.MathHelper; -import net.minecraft.server.v1_5_R2.MinecraftServer; -import net.minecraft.server.v1_5_R2.Navigation; -import net.minecraft.server.v1_5_R2.NetworkManager; -import net.minecraft.server.v1_5_R2.Packet; -import net.minecraft.server.v1_5_R2.Packet35EntityHeadRotation; -import net.minecraft.server.v1_5_R2.Packet5EntityEquipment; -import net.minecraft.server.v1_5_R2.PlayerInteractManager; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.Connection; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.EnumGamemode; +import net.minecraft.server.v1_5_R3.MathHelper; +import net.minecraft.server.v1_5_R3.MinecraftServer; +import net.minecraft.server.v1_5_R3.Navigation; +import net.minecraft.server.v1_5_R3.NetworkManager; +import net.minecraft.server.v1_5_R3.Packet; +import net.minecraft.server.v1_5_R3.Packet35EntityHeadRotation; +import net.minecraft.server.v1_5_R3.Packet5EntityEquipment; +import net.minecraft.server.v1_5_R3.PlayerInteractManager; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index 7a3922fd9..2d7aa9f4f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GhastController.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_5_R2.EntityGhast; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityGhast; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftGhast; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class GhastController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 cd5807572..c994d5d97 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GiantController.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_5_R2.EntityGiantZombie; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityGiantZombie; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftGiant; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; @@ -58,7 +58,7 @@ public class GiantController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 07b6e9259..086701826 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.api.util.Colorizer; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_5_R2.PlayerInteractManager; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.PlayerInteractManager; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R3.CraftWorld; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index 97bef533d..0ff2464ec 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.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_5_R2.EntityIronGolem; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityIronGolem; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftIronGolem; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class IronGolemController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 31321842b..236415ea1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.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_5_R2.EntityMagmaCube; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityMagmaCube; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftMagmaCube; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; @@ -66,7 +66,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 854503e1e..74bfc9a8c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.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_5_R2.EntityMushroomCow; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityMushroomCow; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftMushroomCow; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class MushroomCowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 42a30a221..fe2a4ce4b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.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_5_R2.EntityOcelot; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityOcelot; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftOcelot; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class OcelotController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 3cef64ab7..14113a346 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigController.java @@ -7,14 +7,14 @@ 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_5_R2.EntityLightning; -import net.minecraft.server.v1_5_R2.EntityPig; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityLightning; +import net.minecraft.server.v1_5_R3.EntityPig; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPig; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPig; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; @@ -62,7 +62,7 @@ public class PigController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 e9b3e3805..11ec46998 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.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_5_R2.EntityPigZombie; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityPigZombie; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPigZombie; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; @@ -66,7 +66,7 @@ public class PigZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 1f41438cf..4cfb9f076 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SheepController.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_5_R2.EntitySheep; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySheep; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSheep; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class SheepController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 2c969d713..b0f371f7a 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.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_5_R2.EntitySilverfish; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySilverfish; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSilverfish; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; @@ -66,7 +66,7 @@ public class SilverfishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 7f80906d7..b4ab52c67 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.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_5_R2.EntitySkeleton; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySkeleton; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSkeleton; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class SkeletonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 82d676756..bef76317b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.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_5_R2.EntitySlime; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySlime; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSlime; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; @@ -67,7 +67,7 @@ public class SlimeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 71f21389b..4edd2a551 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.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_5_R2.EntitySnowman; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySnowman; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSnowman; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class SnowmanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 5eae5448d..52749e361 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.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_5_R2.EntitySpider; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySpider; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSpider; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; @@ -65,7 +65,7 @@ public class SpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 51a75358e..60131f7b1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SquidController.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_5_R2.EntitySquid; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntitySquid; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftSquid; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; @@ -56,7 +56,7 @@ public class SquidController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 d58763b53..3a4f54b6f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java @@ -7,14 +7,14 @@ 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_5_R2.EntityHuman; -import net.minecraft.server.v1_5_R2.EntityVillager; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityHuman; +import net.minecraft.server.v1_5_R3.EntityVillager; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftVillager; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; @@ -61,7 +61,7 @@ public class VillagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 c0d7d388d..11e597f89 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitchController.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_5_R2.EntityWitch; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityWitch; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftWitch; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class WitchController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 31ea3481d..69a9dfdae 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.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_5_R2.EntityWither; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityWither; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftWither; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftWither; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; @@ -61,7 +61,7 @@ public class WitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 7adc8c573..3ac477978 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WolfController.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_5_R2.EntityWolf; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityWolf; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftWolf; import org.bukkit.entity.Wolf; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class WolfController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 28554fbe5..587b26655 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.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_5_R2.EntityZombie; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.EntityZombie; +import net.minecraft.server.v1_5_R3.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftZombie; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; @@ -55,7 +55,7 @@ public class ZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_5_R2.Entity entity) { + public void collide(net.minecraft.server.v1_5_R3.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 c98c7872f..981f82c55 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java @@ -1,21 +1,21 @@ package net.citizensnpcs.npc.network; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.MinecraftServer; -import net.minecraft.server.v1_5_R2.NetworkManager; -import net.minecraft.server.v1_5_R2.Packet; -import net.minecraft.server.v1_5_R2.Packet102WindowClick; -import net.minecraft.server.v1_5_R2.Packet106Transaction; -import net.minecraft.server.v1_5_R2.Packet10Flying; -import net.minecraft.server.v1_5_R2.Packet130UpdateSign; -import net.minecraft.server.v1_5_R2.Packet14BlockDig; -import net.minecraft.server.v1_5_R2.Packet15Place; -import net.minecraft.server.v1_5_R2.Packet16BlockItemSwitch; -import net.minecraft.server.v1_5_R2.Packet255KickDisconnect; -import net.minecraft.server.v1_5_R2.Packet28EntityVelocity; -import net.minecraft.server.v1_5_R2.Packet3Chat; -import net.minecraft.server.v1_5_R2.Packet51MapChunk; -import net.minecraft.server.v1_5_R2.PlayerConnection; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.MinecraftServer; +import net.minecraft.server.v1_5_R3.NetworkManager; +import net.minecraft.server.v1_5_R3.Packet; +import net.minecraft.server.v1_5_R3.Packet102WindowClick; +import net.minecraft.server.v1_5_R3.Packet106Transaction; +import net.minecraft.server.v1_5_R3.Packet10Flying; +import net.minecraft.server.v1_5_R3.Packet130UpdateSign; +import net.minecraft.server.v1_5_R3.Packet14BlockDig; +import net.minecraft.server.v1_5_R3.Packet15Place; +import net.minecraft.server.v1_5_R3.Packet16BlockItemSwitch; +import net.minecraft.server.v1_5_R3.Packet255KickDisconnect; +import net.minecraft.server.v1_5_R3.Packet28EntityVelocity; +import net.minecraft.server.v1_5_R3.Packet3Chat; +import net.minecraft.server.v1_5_R3.Packet51MapChunk; +import net.minecraft.server.v1_5_R3.PlayerConnection; public class EmptyNetHandler extends PlayerConnection { public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java index 3d3759850..f98fcf514 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java @@ -5,10 +5,10 @@ import java.net.Socket; import java.security.PrivateKey; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_5_R2.Connection; -import net.minecraft.server.v1_5_R2.IConsoleLogManager; -import net.minecraft.server.v1_5_R2.NetworkManager; -import net.minecraft.server.v1_5_R2.Packet; +import net.minecraft.server.v1_5_R3.Connection; +import net.minecraft.server.v1_5_R3.IConsoleLogManager; +import net.minecraft.server.v1_5_R3.NetworkManager; +import net.minecraft.server.v1_5_R3.Packet; public class EmptyNetworkManager extends NetworkManager { public EmptyNetworkManager(IConsoleLogManager logManager, Socket socket, String string, Connection conn, diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java index e1c074519..a8d1bf591 100644 --- a/src/main/java/net/citizensnpcs/trait/Controllable.java +++ b/src/main/java/net/citizensnpcs/trait/Controllable.java @@ -13,12 +13,12 @@ import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_5_R2.EntityEnderDragon; -import net.minecraft.server.v1_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.EntityPlayer; +import net.minecraft.server.v1_5_R3.EntityEnderDragon; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityPlayer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.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 0feed499f..57968f407 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_5_R2.DamageSource; -import net.minecraft.server.v1_5_R2.EntityEnderCrystal; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.DamageSource; +import net.minecraft.server.v1_5_R3.EntityEnderCrystal; +import net.minecraft.server.v1_5_R3.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 4192b7a73..a6ea773f0 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -11,31 +11,31 @@ import java.util.WeakHashMap; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.Messaging; -import net.minecraft.server.v1_5_R2.ControllerJump; -import net.minecraft.server.v1_5_R2.DamageSource; -import net.minecraft.server.v1_5_R2.EnchantmentManager; -import net.minecraft.server.v1_5_R2.Entity; -import net.minecraft.server.v1_5_R2.EntityHuman; -import net.minecraft.server.v1_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.EntityMonster; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.EntityTypes; -import net.minecraft.server.v1_5_R2.MathHelper; -import net.minecraft.server.v1_5_R2.MobEffectList; -import net.minecraft.server.v1_5_R2.Navigation; -import net.minecraft.server.v1_5_R2.NetworkManager; -import net.minecraft.server.v1_5_R2.Packet; -import net.minecraft.server.v1_5_R2.PathfinderGoalSelector; -import net.minecraft.server.v1_5_R2.World; +import net.minecraft.server.v1_5_R3.ControllerJump; +import net.minecraft.server.v1_5_R3.DamageSource; +import net.minecraft.server.v1_5_R3.EnchantmentManager; +import net.minecraft.server.v1_5_R3.Entity; +import net.minecraft.server.v1_5_R3.EntityHuman; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.EntityMonster; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.EntityTypes; +import net.minecraft.server.v1_5_R3.MathHelper; +import net.minecraft.server.v1_5_R3.MobEffectList; +import net.minecraft.server.v1_5_R3.Navigation; +import net.minecraft.server.v1_5_R3.NetworkManager; +import net.minecraft.server.v1_5_R3.Packet; +import net.minecraft.server.v1_5_R3.PathfinderGoalSelector; +import net.minecraft.server.v1_5_R3.World; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R2.CraftServer; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_R3.CraftServer; +import org.bukkit.craftbukkit.v1_5_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java index 7988f84db..e216d50c5 100644 --- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java +++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java @@ -2,13 +2,13 @@ package net.citizensnpcs.util; import java.util.Arrays; -import net.minecraft.server.v1_5_R2.EntityPlayer; -import net.minecraft.server.v1_5_R2.Packet; -import net.minecraft.server.v1_5_R2.Packet17EntityLocationAction; -import net.minecraft.server.v1_5_R2.Packet18ArmAnimation; -import net.minecraft.server.v1_5_R2.Packet40EntityMetadata; +import net.minecraft.server.v1_5_R3.EntityPlayer; +import net.minecraft.server.v1_5_R3.Packet; +import net.minecraft.server.v1_5_R3.Packet17EntityLocationAction; +import net.minecraft.server.v1_5_R3.Packet18ArmAnimation; +import net.minecraft.server.v1_5_R3.Packet40EntityMetadata; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; import org.bukkit.entity.Player; public enum PlayerAnimation {