From 7b5f3049333ec2bbbf9e62d729e30fd6e8934705 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 17 Jan 2013 20:46:56 +0800 Subject: [PATCH] 1.4.7 compat --- .../java/net/citizensnpcs/EventListen.java | 6 +-- .../citizensnpcs/editor/SheepEquipper.java | 4 +- .../net/citizensnpcs/npc/CitizensNPC.java | 4 +- .../citizensnpcs/npc/MobEntityController.java | 6 +-- .../npc/ai/AStarNavigationStrategy.java | 2 +- .../npc/ai/MCNavigationStrategy.java | 8 ++-- .../citizensnpcs/npc/ai/MCTargetStrategy.java | 8 ++-- .../npc/entity/BatController.java | 10 ++--- .../npc/entity/BlazeController.java | 10 ++--- .../npc/entity/CaveSpiderController.java | 10 ++--- .../npc/entity/ChickenController.java | 10 ++--- .../npc/entity/CowController.java | 10 ++--- .../npc/entity/CreeperController.java | 12 +++--- .../npc/entity/EnderDragonController.java | 10 ++--- .../npc/entity/EndermanController.java | 10 ++--- .../npc/entity/EntityHumanNPC.java | 34 ++++++++-------- .../npc/entity/GhastController.java | 10 ++--- .../npc/entity/GiantController.java | 10 ++--- .../npc/entity/HumanController.java | 6 +-- .../npc/entity/IronGolemController.java | 10 ++--- .../npc/entity/MagmaCubeController.java | 10 ++--- .../npc/entity/MushroomCowController.java | 10 ++--- .../npc/entity/OcelotController.java | 10 ++--- .../npc/entity/PigController.java | 12 +++--- .../npc/entity/PigZombieController.java | 10 ++--- .../npc/entity/SheepController.java | 10 ++--- .../npc/entity/SilverfishController.java | 10 ++--- .../npc/entity/SkeletonController.java | 10 ++--- .../npc/entity/SlimeController.java | 10 ++--- .../npc/entity/SnowmanController.java | 10 ++--- .../npc/entity/SpiderController.java | 10 ++--- .../npc/entity/SquidController.java | 10 ++--- .../npc/entity/VillagerController.java | 12 +++--- .../npc/entity/WitchController.java | 10 ++--- .../npc/entity/WitherController.java | 10 ++--- .../npc/entity/WolfController.java | 10 ++--- .../npc/entity/ZombieController.java | 10 ++--- .../npc/network/EmptyNetHandler.java | 32 +++++++-------- .../npc/network/EmptyNetworkManager.java | 6 +-- .../net/citizensnpcs/trait/Controllable.java | 8 ++-- .../waypoint/EntityEnderCrystalMarker.java | 6 +-- src/main/java/net/citizensnpcs/util/NMS.java | 40 +++++++++---------- .../citizensnpcs/util/PlayerAnimation.java | 12 +++--- 43 files changed, 234 insertions(+), 234 deletions(-) diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java index 3240059b7..b147d5c99 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_6.EntityPlayer; +import net.minecraft.server.v1_4_R1.EntityPlayer; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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/editor/SheepEquipper.java b/src/main/java/net/citizensnpcs/editor/SheepEquipper.java index a49881c82..32863205d 100644 --- a/src/main/java/net/citizensnpcs/editor/SheepEquipper.java +++ b/src/main/java/net/citizensnpcs/editor/SheepEquipper.java @@ -21,10 +21,10 @@ public class SheepEquipper implements Equipper { Messaging.sendTr(equipper, toEquip.getTrait(Sheared.class).toggle() ? Messages.SHEARED_SET : Messages.SHEARED_STOPPED, toEquip.getName()); } else if (hand.getType() == Material.INK_SACK) { - if (sheep.getColor() == DyeColor.getByData((byte) (15 - hand.getData().getData()))) + if (sheep.getColor() == DyeColor.getByWoolData((byte) (15 - hand.getData().getData()))) return; - DyeColor color = DyeColor.getByData((byte) (15 - hand.getData().getData())); + DyeColor color = DyeColor.getByWoolData((byte) (15 - hand.getData().getData())); toEquip.getTrait(WoolColor.class).setColor(color); Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_SHEEP_COLOURED, toEquip.getName(), color.name() .toLowerCase().replace("_", " ")); diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index f72f304c6..55bce1abb 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -23,11 +23,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_6.EntityLiving; +import net.minecraft.server.v1_4_R1.EntityLiving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_R1.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 ad6f6e2f4..8bcbfc572 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_6.EntityLiving; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityLiving; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_4_6.CraftWorld; +import org.bukkit.craftbukkit.v1_4_R1.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 f34a7313a..978ae782b 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_6.EntityLiving; +import net.minecraft.server.v1_4_R1.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 764bc95c6..5d0470e9d 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_6.EntityHuman; -import net.minecraft.server.v1_4_6.EntityLiving; -import net.minecraft.server.v1_4_6.Navigation; +import net.minecraft.server.v1_4_R1.EntityHuman; +import net.minecraft.server.v1_4_R1.EntityLiving; +import net.minecraft.server.v1_4_R1.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_R1.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 59ca25e07..1e7c4f8e8 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_6.EntityLiving; -import net.minecraft.server.v1_4_6.EntityPlayer; -import net.minecraft.server.v1_4_6.Navigation; +import net.minecraft.server.v1_4_R1.EntityLiving; +import net.minecraft.server.v1_4_R1.EntityPlayer; +import net.minecraft.server.v1_4_R1.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_R1.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 404b9615f..7c2826318 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_6.EntityBat; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityBat; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftBat; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 6af78f69e..6d48676b8 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_6.EntityBlaze; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityBlaze; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 a99a507b9..4f80e607c 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_6.EntityCaveSpider; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityCaveSpider; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 664c9e061..bce615406 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_6.EntityChicken; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityChicken; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 10959432b..4c05bfae2 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_6.EntityCow; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityCow; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftCow; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 8e123b302..37c72cd94 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_6.EntityCreeper; -import net.minecraft.server.v1_4_6.EntityLightning; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityCreeper; +import net.minecraft.server.v1_4_R1.EntityLightning; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 ec97df03e..ef24b0519 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_6.EntityEnderDragon; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityEnderDragon; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 72fb6e4e2..ba05a0b94 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_6.EntityEnderman; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityEnderman; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 2fbbfc728..d81391899 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java @@ -13,29 +13,29 @@ 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_6.Connection; -import net.minecraft.server.v1_4_6.EntityPlayer; -import net.minecraft.server.v1_4_6.EnumGamemode; -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.NetworkManager; -import net.minecraft.server.v1_4_6.Packet32EntityLook; -import net.minecraft.server.v1_4_6.Packet5EntityEquipment; -import net.minecraft.server.v1_4_6.PlayerInteractManager; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.Connection; +import net.minecraft.server.v1_4_R1.EntityPlayer; +import net.minecraft.server.v1_4_R1.EnumGamemode; +import net.minecraft.server.v1_4_R1.MathHelper; +import net.minecraft.server.v1_4_R1.MinecraftServer; +import net.minecraft.server.v1_4_R1.Navigation; +import net.minecraft.server.v1_4_R1.NetworkManager; +import net.minecraft.server.v1_4_R1.Packet32EntityLook; +import net.minecraft.server.v1_4_R1.Packet5EntityEquipment; +import net.minecraft.server.v1_4_R1.PlayerInteractManager; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.ItemStack[] previousEquipment = { null, null, null, null, null }; + private final net.minecraft.server.v1_4_R1.ItemStack[] previousEquipment = { null, null, null, null, null }; public EntityHumanNPC(MinecraftServer minecraftServer, World world, String string, PlayerInteractManager playerInteractManager, NPC npc) { @@ -53,7 +53,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } @Override - public void collide(net.minecraft.server.v1_4_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -186,8 +186,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { private void updateEquipment() { for (int i = 0; i < previousEquipment.length; i++) { - net.minecraft.server.v1_4_6.ItemStack previous = previousEquipment[i]; - net.minecraft.server.v1_4_6.ItemStack current = getEquipment(i); + net.minecraft.server.v1_4_R1.ItemStack previous = previousEquipment[i]; + net.minecraft.server.v1_4_R1.ItemStack current = getEquipment(i); if (previous != current) { NMS.sendPacketNearby(getBukkitEntity().getLocation(), new Packet5EntityEquipment(id, i, current)); previousEquipment[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 1f15a1595..6a488e193 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_6.EntityGhast; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityGhast; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 1ca9d360a..a0ad500de 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_6.EntityGiantZombie; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityGiantZombie; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 62dea7663..39ae5ed0d 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_6.PlayerInteractManager; -import net.minecraft.server.v1_4_6.WorldServer; +import net.minecraft.server.v1_4_R1.PlayerInteractManager; +import net.minecraft.server.v1_4_R1.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_4_6.CraftWorld; +import org.bukkit.craftbukkit.v1_4_R1.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 22c55f398..3e4d4b8d8 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_6.EntityIronGolem; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityIronGolem; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 65bf209bb..262a47eda 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_6.EntityMagmaCube; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityMagmaCube; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 32b5cb97f..ec2da03f8 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_6.EntityMushroomCow; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityMushroomCow; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 e2c67eaf1..deb957610 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_6.EntityOcelot; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityOcelot; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 4ec764403..2e52e506b 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_6.EntityLightning; -import net.minecraft.server.v1_4_6.EntityPig; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityLightning; +import net.minecraft.server.v1_4_R1.EntityPig; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPig; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 9d6851fa9..21505a6e9 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_6.EntityPigZombie; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityPigZombie; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 024545f7d..5a7d4d605 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_6.EntitySheep; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySheep; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 04e5d6a8b..00715b050 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_6.EntitySilverfish; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySilverfish; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 87caeb975..49fc9dec5 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_6.EntitySkeleton; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySkeleton; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 33f0b055f..cd1e8a104 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_6.EntitySlime; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySlime; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 d78fcc2fe..f5f02771b 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_6.EntitySnowman; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySnowman; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 2580d0977..f60180b54 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_6.EntitySpider; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySpider; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 adaa20253..af9c14e2c 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_6.EntitySquid; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntitySquid; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 a30de7c9b..da053fb1f 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_6.EntityHuman; -import net.minecraft.server.v1_4_6.EntityVillager; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityHuman; +import net.minecraft.server.v1_4_R1.EntityVillager; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 a847124c9..aa92e92ae 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_6.EntityWitch; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityWitch; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 f2be8d636..4159fd860 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_6.EntityWither; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityWither; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftWither; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 55e8e5c6f..b988b3f1f 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_6.EntityWolf; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityWolf; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 12f5b3404..3f45b0a3a 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_6.EntityZombie; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.EntityZombie; +import net.minecraft.server.v1_4_R1.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_6.CraftServer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.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_6.Entity entity) { + public void collide(net.minecraft.server.v1_4_R1.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 7c16718d7..b40c97d44 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_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; +import net.minecraft.server.v1_4_R1.EntityPlayer; +import net.minecraft.server.v1_4_R1.MinecraftServer; +import net.minecraft.server.v1_4_R1.PlayerConnection; +import net.minecraft.server.v1_4_R1.NetworkManager; +import net.minecraft.server.v1_4_R1.Packet; +import net.minecraft.server.v1_4_R1.Packet102WindowClick; +import net.minecraft.server.v1_4_R1.Packet106Transaction; +import net.minecraft.server.v1_4_R1.Packet10Flying; +import net.minecraft.server.v1_4_R1.Packet130UpdateSign; +import net.minecraft.server.v1_4_R1.Packet14BlockDig; +import net.minecraft.server.v1_4_R1.Packet15Place; +import net.minecraft.server.v1_4_R1.Packet16BlockItemSwitch; +import net.minecraft.server.v1_4_R1.Packet255KickDisconnect; +import net.minecraft.server.v1_4_R1.Packet28EntityVelocity; +import net.minecraft.server.v1_4_R1.Packet3Chat; +import net.minecraft.server.v1_4_R1.Packet51MapChunk; 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 84c1c78b7..0e1709bf5 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java @@ -5,9 +5,9 @@ import java.net.Socket; import java.security.PrivateKey; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_4_6.Connection; -import net.minecraft.server.v1_4_6.NetworkManager; -import net.minecraft.server.v1_4_6.Packet; +import net.minecraft.server.v1_4_R1.Connection; +import net.minecraft.server.v1_4_R1.NetworkManager; +import net.minecraft.server.v1_4_R1.Packet; public class EmptyNetworkManager extends NetworkManager { diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java index 0b4104373..e3aeb25ae 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_6.EntityLiving; -import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_R1.EntityLiving; +import net.minecraft.server.v1_4_R1.EntityPlayer; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_R1.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 46b8eeb52..d259cee7e 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_6.DamageSource; -import net.minecraft.server.v1_4_6.EntityEnderCrystal; -import net.minecraft.server.v1_4_6.World; +import net.minecraft.server.v1_4_R1.DamageSource; +import net.minecraft.server.v1_4_R1.EntityEnderCrystal; +import net.minecraft.server.v1_4_R1.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 24c597afc..a398f2505 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_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 net.minecraft.server.v1_4_R1.ControllerJump; +import net.minecraft.server.v1_4_R1.ControllerLook; +import net.minecraft.server.v1_4_R1.DamageSource; +import net.minecraft.server.v1_4_R1.EnchantmentManager; +import net.minecraft.server.v1_4_R1.Entity; +import net.minecraft.server.v1_4_R1.EntityLiving; +import net.minecraft.server.v1_4_R1.EntityMonster; +import net.minecraft.server.v1_4_R1.EntityTypes; +import net.minecraft.server.v1_4_R1.MathHelper; +import net.minecraft.server.v1_4_R1.MobEffectList; +import net.minecraft.server.v1_4_R1.Navigation; +import net.minecraft.server.v1_4_R1.NetworkManager; +import net.minecraft.server.v1_4_R1.Packet; +import net.minecraft.server.v1_4_R1.PathfinderGoalSelector; +import net.minecraft.server.v1_4_R1.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_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.craftbukkit.v1_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_4_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_4_R1.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 05a2dcecc..af3b3e4a9 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_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 net.minecraft.server.v1_4_R1.EntityPlayer; +import net.minecraft.server.v1_4_R1.Packet; +import net.minecraft.server.v1_4_R1.Packet17EntityLocationAction; +import net.minecraft.server.v1_4_R1.Packet18ArmAnimation; +import net.minecraft.server.v1_4_R1.Packet40EntityMetadata; -import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer; import org.bukkit.entity.Player; public enum PlayerAnimation {