Update for 1.6.2

CitizensDev · Jul 9, 2013 · bb46c81 · bb46c81
1 parent 289e29b
commit bb46c81
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 82 deletions.
diff --git a/libs/craftbukkit2.jar b/libs/craftbukkit2.jar
diff --git a/src/core/net/citizensnpcs/commands/BasicCommands.java b/src/core/net/citizensnpcs/commands/BasicCommands.java
@@ -35,7 +35,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
@@ -123,7 +123,7 @@ public static void clean(CommandContext args, CommandSender sender, HumanNPC npc
         int count = 0;
         for (World world : Bukkit.getServer().getWorlds()) {
             for (Entity entity : world.getEntities()) {
-                net.minecraft.server.v1_6_R1.Entity mcEntity = ((CraftEntity) entity).getHandle();
+                net.minecraft.server.v1_6_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
                 if (!(mcEntity instanceof CraftNPC) || mcEntity instanceof CreatureNPC)
                     continue;
                 HumanNPC found = ((CraftNPC) mcEntity).npc;

diff --git a/src/core/net/citizensnpcs/listeners/EntityListen.java b/src/core/net/citizensnpcs/listeners/EntityListen.java
@@ -14,7 +14,7 @@
 import net.citizensnpcs.utils.Messaging;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/core/net/citizensnpcs/properties/properties/BasicProperties.java b/src/core/net/citizensnpcs/properties/properties/BasicProperties.java
@@ -27,7 +27,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
@@ -89,7 +89,7 @@ private PlayerInventory getInventory(int UID) {
                 }
             }
         }
-        PlayerInventory inv = new CraftInventoryPlayer(new net.minecraft.server.v1_6_R1.PlayerInventory(null));
+        PlayerInventory inv = new CraftInventoryPlayer(new net.minecraft.server.v1_6_R2.PlayerInventory(null));
         ItemStack[] stacks = inv.getContents();
         inv.setContents(array.toArray(stacks));
         return inv;

diff --git a/src/core/net/citizensnpcs/resources/npclib/AutoPathfinder.java b/src/core/net/citizensnpcs/resources/npclib/AutoPathfinder.java
@@ -1,6 +1,6 @@
 package net.citizensnpcs.resources.npclib;
 
-import net.minecraft.server.v1_6_R1.PathEntity;
+import net.minecraft.server.v1_6_R2.PathEntity;
 
 public interface AutoPathfinder {
     PathEntity find(PathNPC npc);

diff --git a/src/core/net/citizensnpcs/resources/npclib/CraftNPC.java b/src/core/net/citizensnpcs/resources/npclib/CraftNPC.java
@@ -3,12 +3,12 @@
 import java.io.IOException;
 
 import net.citizensnpcs.resources.npclib.NPCAnimator.Animation;
-import net.minecraft.server.v1_6_R1.Connection;
-import net.minecraft.server.v1_6_R1.EnumGamemode;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.NetworkManager;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.Connection;
+import net.minecraft.server.v1_6_R2.EnumGamemode;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.NetworkManager;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.entity.LivingEntity;
 

diff --git a/src/core/net/citizensnpcs/resources/npclib/HumanNPC.java b/src/core/net/citizensnpcs/resources/npclib/HumanNPC.java
@@ -13,7 +13,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;

diff --git a/src/core/net/citizensnpcs/resources/npclib/MinecraftAutoPathfinder.java b/src/core/net/citizensnpcs/resources/npclib/MinecraftAutoPathfinder.java
@@ -2,8 +2,8 @@
 
 import java.util.Random;
 
-import net.minecraft.server.v1_6_R1.MathHelper;
-import net.minecraft.server.v1_6_R1.PathEntity;
+import net.minecraft.server.v1_6_R2.MathHelper;
+import net.minecraft.server.v1_6_R2.PathEntity;
 
 public class MinecraftAutoPathfinder implements AutoPathfinder {
     private final Random random = new Random();

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCAnimator.java b/src/core/net/citizensnpcs/resources/npclib/NPCAnimator.java
@@ -1,10 +1,10 @@
 package net.citizensnpcs.resources.npclib;
 
 import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R1.DataWatcher;
-import net.minecraft.server.v1_6_R1.Packet17EntityLocationAction;
-import net.minecraft.server.v1_6_R1.Packet18ArmAnimation;
-import net.minecraft.server.v1_6_R1.Packet40EntityMetadata;
+import net.minecraft.server.v1_6_R2.DataWatcher;
+import net.minecraft.server.v1_6_R2.Packet17EntityLocationAction;
+import net.minecraft.server.v1_6_R2.Packet18ArmAnimation;
+import net.minecraft.server.v1_6_R2.Packet40EntityMetadata;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCList.java b/src/core/net/citizensnpcs/resources/npclib/NPCList.java
@@ -2,7 +2,7 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 
 public class NPCList extends ConcurrentHashMap<Integer, HumanNPC> {
@@ -14,7 +14,7 @@ public HumanNPC getNPC(Entity entity) {
         if (entity == null) {
             return null;
         }
-        net.minecraft.server.v1_6_R1.Entity mcEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_6_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
         if (mcEntity instanceof CraftNPC) {
             HumanNPC npc = ((CraftNPC) mcEntity).npc;
             if (npc == null)

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCManager.java b/src/core/net/citizensnpcs/resources/npclib/NPCManager.java
@@ -13,7 +13,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCNetHandler.java b/src/core/net/citizensnpcs/resources/npclib/NPCNetHandler.java
@@ -1,21 +1,21 @@
 package net.citizensnpcs.resources.npclib;
 
-import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.NetworkManager;
-import net.minecraft.server.v1_6_R1.Packet;
-import net.minecraft.server.v1_6_R1.Packet102WindowClick;
-import net.minecraft.server.v1_6_R1.Packet106Transaction;
-import net.minecraft.server.v1_6_R1.Packet10Flying;
-import net.minecraft.server.v1_6_R1.Packet130UpdateSign;
-import net.minecraft.server.v1_6_R1.Packet14BlockDig;
-import net.minecraft.server.v1_6_R1.Packet15Place;
-import net.minecraft.server.v1_6_R1.Packet16BlockItemSwitch;
-import net.minecraft.server.v1_6_R1.Packet255KickDisconnect;
-import net.minecraft.server.v1_6_R1.Packet28EntityVelocity;
-import net.minecraft.server.v1_6_R1.Packet3Chat;
-import net.minecraft.server.v1_6_R1.Packet51MapChunk;
-import net.minecraft.server.v1_6_R1.PlayerConnection;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.NetworkManager;
+import net.minecraft.server.v1_6_R2.Packet;
+import net.minecraft.server.v1_6_R2.Packet102WindowClick;
+import net.minecraft.server.v1_6_R2.Packet106Transaction;
+import net.minecraft.server.v1_6_R2.Packet10Flying;
+import net.minecraft.server.v1_6_R2.Packet130UpdateSign;
+import net.minecraft.server.v1_6_R2.Packet14BlockDig;
+import net.minecraft.server.v1_6_R2.Packet15Place;
+import net.minecraft.server.v1_6_R2.Packet16BlockItemSwitch;
+import net.minecraft.server.v1_6_R2.Packet255KickDisconnect;
+import net.minecraft.server.v1_6_R2.Packet28EntityVelocity;
+import net.minecraft.server.v1_6_R2.Packet3Chat;
+import net.minecraft.server.v1_6_R2.Packet51MapChunk;
+import net.minecraft.server.v1_6_R2.PlayerConnection;
 
 public class NPCNetHandler extends PlayerConnection {
     public NPCNetHandler(MinecraftServer minecraftserver, EntityPlayer entityplayer, NetworkManager netMgr) {

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCNetworkManager.java b/src/core/net/citizensnpcs/resources/npclib/NPCNetworkManager.java
@@ -5,10 +5,10 @@
 import java.net.Socket;
 import java.security.PrivateKey;
 
-import net.minecraft.server.v1_6_R1.Connection;
-import net.minecraft.server.v1_6_R1.IConsoleLogManager;
-import net.minecraft.server.v1_6_R1.NetworkManager;
-import net.minecraft.server.v1_6_R1.Packet;
+import net.minecraft.server.v1_6_R2.Connection;
+import net.minecraft.server.v1_6_R2.IConsoleLogManager;
+import net.minecraft.server.v1_6_R2.NetworkManager;
+import net.minecraft.server.v1_6_R2.Packet;
 
 public class NPCNetworkManager extends NetworkManager {
     public NPCNetworkManager(IConsoleLogManager mgr, Socket paramSocket, String paramString,

diff --git a/src/core/net/citizensnpcs/resources/npclib/NPCSpawner.java b/src/core/net/citizensnpcs/resources/npclib/NPCSpawner.java
@@ -6,16 +6,16 @@
 import net.citizensnpcs.resources.npclib.creatures.CreatureNPCType;
 import net.citizensnpcs.utils.Messaging;
 import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.Packet29DestroyEntity;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.Packet29DestroyEntity;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
 
 public class NPCSpawner {
     public static void despawnNPC(CraftNPC npc, NPCRemoveReason reason) {

diff --git a/src/core/net/citizensnpcs/resources/npclib/PathNPC.java b/src/core/net/citizensnpcs/resources/npclib/PathNPC.java
@@ -5,21 +5,21 @@
 import net.citizensnpcs.resources.npclib.NPCAnimator.Animation;
 import net.citizensnpcs.resources.npclib.creatures.CreatureNPC;
 import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R1.Entity;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_6_R1.GenericAttributes;
-import net.minecraft.server.v1_6_R1.MathHelper;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.Packet5EntityEquipment;
-import net.minecraft.server.v1_6_R1.PathEntity;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.Vec3D;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.Entity;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
+import net.minecraft.server.v1_6_R2.GenericAttributes;
+import net.minecraft.server.v1_6_R2.MathHelper;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.Packet5EntityEquipment;
+import net.minecraft.server.v1_6_R2.PathEntity;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.Vec3D;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -31,24 +31,21 @@ public class PathNPC extends EntityPlayer {
     protected final NPCAnimator animations = new NPCAnimator(this);
     private int attackTimes = 0;
     private int attackTimesLimit = -1;
-
     private AutoPathfinder autoPathfinder;
     protected boolean autoPathToTarget = true;
     private Location dest;
     private boolean hasAttacked = false;
     public HumanNPC npc;
     private PathEntity path;
-
     protected float pathingRange = 16;
     private int pathTickLimit = -1;
     private int pathTicks = 0;
-    private final net.minecraft.server.v1_6_R1.ItemStack[] previousEquipment = { null, null, null, null, null };
+    private final net.minecraft.server.v1_6_R2.ItemStack[] previousEquipment = { null, null, null, null, null };
     private int prevX, prevY, prevZ;
     protected boolean randomPather = false;
     private int stationaryTickLimit = -1;
     private int stationaryTicks = 0;
     protected boolean targetAggro = false;
-
     protected Entity targetEntity;
 
     public PathNPC(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager iteminworldmanager) {
@@ -77,7 +74,7 @@ private void attackEntity(Entity entity) {
         } else {
             this.performAction(Animation.SWING_ARM);
             LivingEntity other = (LivingEntity) entity.getBukkitEntity();
-            other.damage(this.a(GenericAttributes.e).e());
+            other.damage(this.getAttributeInstance(GenericAttributes.e).getValue());
         }
         hasAttacked = true;
 
@@ -143,7 +140,7 @@ private float getYawDifference(double diffZ, double diffX) {
         float vectorYaw = (float) (Math.atan2(diffZ, diffX) * 180.0D / Math.PI) - 90.0F;
         float diffYaw = vectorYaw - this.yaw;
 
-        this.bf = (float) this.a(GenericAttributes.d).e();
+        this.bf = (float) this.getAttributeInstance(GenericAttributes.d).getValue();
         while (diffYaw >= 180.0F) {
             diffYaw -= 360.0F;
         }
@@ -302,8 +299,8 @@ public boolean toggleAutoPathfinder() {
 
     private void updateEquipment() {
         for (int i = 0; i < previousEquipment.length; i++) {
-            net.minecraft.server.v1_6_R1.ItemStack previous = previousEquipment[i];
-            net.minecraft.server.v1_6_R1.ItemStack current = getEquipment(i);
+            net.minecraft.server.v1_6_R2.ItemStack previous = previousEquipment[i];
+            net.minecraft.server.v1_6_R2.ItemStack current = getEquipment(i);
             if (previous != current) {
                 PacketUtils.sendPacketNearby(getBukkitEntity().getLocation(), 64, new Packet5EntityEquipment(id, i,
                         current));

diff --git a/src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPC.java b/src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPC.java
@@ -1,12 +1,12 @@
 package net.citizensnpcs.resources.npclib.creatures;
 
 import net.citizensnpcs.resources.npclib.CraftNPC;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPCType.java b/src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPCType.java
@@ -10,9 +10,9 @@
 import net.citizensnpcs.resources.npclib.HumanNPC;
 import net.citizensnpcs.utils.Messaging;
 import net.citizensnpcs.utils.StringUtils;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.Location;
 

diff --git a/src/core/net/citizensnpcs/resources/npclib/creatures/EvilCreatureNPC.java b/src/core/net/citizensnpcs/resources/npclib/creatures/EvilCreatureNPC.java
@@ -10,10 +10,10 @@
 import net.citizensnpcs.utils.MessageUtils;
 import net.citizensnpcs.utils.Messaging;
 import net.citizensnpcs.utils.StringUtils;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.MinecraftServer;
-import net.minecraft.server.v1_6_R1.PlayerInteractManager;
-import net.minecraft.server.v1_6_R1.World;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_R2.PlayerInteractManager;
+import net.minecraft.server.v1_6_R2.World;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;

diff --git a/src/core/net/citizensnpcs/utils/PacketUtils.java b/src/core/net/citizensnpcs/utils/PacketUtils.java
@@ -1,11 +1,11 @@
 package net.citizensnpcs.utils;
 
-import net.minecraft.server.v1_6_R1.Packet;
+import net.minecraft.server.v1_6_R2.Packet;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 public class PacketUtils {

diff --git a/src/guard/net/citizensnpcs/guards/Guard.java b/src/guard/net/citizensnpcs/guards/Guard.java
@@ -14,7 +14,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;