Update to 1.6.2

DenizenScript · Jul 9, 2013 · 2eacd78 · 2eacd78
1 parent 9fd372b
commit 2eacd78
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 50 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.6.1-R0.1-SNAPSHOT</craftbukkit.version>
+		<craftbukkit.version>1.6.2-R0.1-SNAPSHOT</craftbukkit.version>
 		<json.version>20090211</json.version>
 		<citizens.version>2.0.8-SNAPSHOT</citizens.version>
 		<build.number>Unknown</build.number>

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
@@ -8,17 +8,17 @@
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.util.PlayerAnimation;
-import net.minecraft.server.v1_6_R1.EntityFishingHook;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.EntityItem;
-import net.minecraft.server.v1_6_R1.Item;
-import net.minecraft.server.v1_6_R1.ItemStack;
-import net.minecraft.server.v1_6_R1.MathHelper;
-import net.minecraft.server.v1_6_R1.WorldServer;
+import net.minecraft.server.v1_6_R2.EntityFishingHook;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.EntityItem;
+import net.minecraft.server.v1_6_R2.Item;
+import net.minecraft.server.v1_6_R2.ItemStack;
+import net.minecraft.server.v1_6_R2.MathHelper;
+import net.minecraft.server.v1_6_R2.WorldServer;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.util.Vector;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java
@@ -10,7 +10,7 @@
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 
 public class ParticlesTrait extends Trait {
@@ -83,7 +83,7 @@ public void run() {
 		case POTION:
 			/*
             if (!el.effects.isEmpty()) {
-                c = net.minecraft.server.v1_6_R1.PotionBrewer.a(el.effects.values());
+                c = net.minecraft.server.v1_6_R2.PotionBrewer.a(el.effects.values());
             }
             dw.watch(8, Integer.valueOf(c));
             */

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java
@@ -6,10 +6,10 @@
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_6_R1.EntityLiving;
+import net.minecraft.server.v1_6_R2.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java
@@ -5,11 +5,11 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java
@@ -3,10 +3,10 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_6_R1.EntityHuman;
-import net.minecraft.server.v1_6_R1.EntityPlayer;
+import net.minecraft.server.v1_6_R2.EntityHuman;
+import net.minecraft.server.v1_6_R2.EntityPlayer;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Listener;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -13,8 +13,8 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftAnimals;
+import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftAnimals;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -20,10 +20,10 @@
 import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.trait.Anchors;
 import net.citizensnpcs.util.Anchor;
-import net.minecraft.server.v1_6_R1.EntityLiving;
+import net.minecraft.server.v1_6_R2.EntityLiving;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HealCommand.java
@@ -1,6 +1,6 @@
 package net.aufdemrand.denizen.scripts.commands.entity;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 
 import net.aufdemrand.denizen.exceptions.CommandExecutionException;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/HurtCommand.java
@@ -9,7 +9,7 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
 import net.citizensnpcs.api.npc.NPC;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 
 public class HurtCommand extends AbstractCommand {

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java
@@ -11,8 +11,8 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftCreature;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/HealthCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/npc/HealthCommand.java
@@ -9,7 +9,7 @@
 import net.aufdemrand.denizen.objects.aH.ArgumentType;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 
 public class HealthCommand extends AbstractCommand {
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java
@@ -8,10 +8,10 @@
 import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
-import net.minecraft.server.v1_6_R1.Block;
+import net.minecraft.server.v1_6_R2.Block;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java
@@ -4,10 +4,10 @@
 import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.minecraft.server.v1_6_R1.EntityLiving;
-import net.minecraft.server.v1_6_R1.NBTTagCompound;
+import net.minecraft.server.v1_6_R2.EntityLiving;
+import net.minecraft.server.v1_6_R2.NBTTagCompound;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
 import org.bukkit.entity.Player;
 
 public class EntityScriptContainer extends ScriptContainer {

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java
@@ -1,10 +1,10 @@
 package net.aufdemrand.denizen.utilities.entity;
 
-import net.minecraft.server.v1_6_R1.EntityLiving;
+import net.minecraft.server.v1_6_R2.EntityLiving;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -71,7 +71,7 @@ public static void rotate(Entity entity, float yaw, float pitch)
 
         else
         {
-            net.minecraft.server.v1_6_R1.Entity handle = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_6_R2.Entity handle = ((CraftEntity) entity).getHandle();
             handle.yaw = (float) yaw;
             handle.pitch = (float) pitch;
         }

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.utilities.nbt;
 
-import net.minecraft.server.v1_6_R1.EntityLiving;
-import net.minecraft.server.v1_6_R1.NBTTagCompound;
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftItemStack;
+import net.minecraft.server.v1_6_R2.EntityLiving;
+import net.minecraft.server.v1_6_R2.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
@@ -22,7 +22,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) {
     public static boolean hasCustomNBT(ItemStack item, String key) {
         if (item == null) return false;
         NBTTagCompound tag;
-        net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_6_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
         if (!cis.hasTag()) return false;
         tag = cis.getTag();
         // dB.echoDebug(tag.toString());
@@ -32,7 +32,7 @@ public static boolean hasCustomNBT(ItemStack item, String key) {
 
     public static String getCustomNBT(ItemStack item, String key) {
         if (item == null) return null;
-        net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_6_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
             cis.setTag(new NBTTagCompound());
@@ -45,7 +45,7 @@ public static String getCustomNBT(ItemStack item, String key) {
 
     public static ItemStack removeCustomNBT(ItemStack item, String key) {
         if (item == null) return null;
-        net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_6_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
             cis.setTag(new NBTTagCompound());
@@ -57,7 +57,7 @@ public static ItemStack removeCustomNBT(ItemStack item, String key) {
 
     public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
         if (item == null) return null;
-        net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_6_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag = null;
         // Do stuff with tag
         if (!cis.hasTag())
@@ -70,7 +70,7 @@ public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
     public static LivingEntity addCustomNBT(LivingEntity entity, String key, String value) {
         if (entity == null) return null;
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -87,7 +87,7 @@ public static LivingEntity addCustomNBT(LivingEntity entity, String key, String
     public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
         if (entity == null) return null;
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -104,7 +104,7 @@ public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
     public static boolean hasCustomNBT(LivingEntity entity, String key) {
         if (entity == null) return false;
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -117,7 +117,7 @@ public static boolean hasCustomNBT(LivingEntity entity, String key) {
     public static String getCustomNBT(LivingEntity entity, String key) {
         if (entity == null) return null;
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag