update for 1.5.2

DenizenScript · May 3, 2013 · 0cda200 · 0cda200
1 parent 3422575
commit 0cda200
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 52 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/dNPC.java b/src/main/java/net/aufdemrand/denizen/npc/dNPC.java
@@ -15,9 +15,9 @@
 import net.citizensnpcs.api.ai.Navigator;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Owner;
-import net.minecraft.server.v1_5_R2.EntityLiving;
+import net.minecraft.server.v1_5_R3.EntityLiving;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

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_5_R2.EntityFishingHook;
-import net.minecraft.server.v1_5_R2.EntityHuman;
-import net.minecraft.server.v1_5_R2.EntityItem;
-import net.minecraft.server.v1_5_R2.Item;
-import net.minecraft.server.v1_5_R2.ItemStack;
-import net.minecraft.server.v1_5_R2.MathHelper;
-import net.minecraft.server.v1_5_R2.WorldServer;
+import net.minecraft.server.v1_5_R3.EntityFishingHook;
+import net.minecraft.server.v1_5_R3.EntityHuman;
+import net.minecraft.server.v1_5_R3.EntityItem;
+import net.minecraft.server.v1_5_R3.Item;
+import net.minecraft.server.v1_5_R3.ItemStack;
+import net.minecraft.server.v1_5_R3.MathHelper;
+import net.minecraft.server.v1_5_R3.WorldServer;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.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/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -10,12 +10,12 @@
 import net.citizensnpcs.api.event.NPCDeathEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_5_R2.EntityHuman;
+import net.minecraft.server.v1_5_R3.EntityHuman;
 
 import org.bukkit.Bukkit;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java
@@ -5,16 +5,16 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_5_R2.DataWatcher;
-import net.minecraft.server.v1_5_R2.EntityLiving;
+import net.minecraft.server.v1_5_R3.DataWatcher;
+import net.minecraft.server.v1_5_R3.EntityLiving;
 
 import org.bukkit.Effect;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 
 public class ParticlesTrait extends Trait {
@@ -87,7 +87,7 @@ public void run() {
 		case POTION:
 			/*
             if (!el.effects.isEmpty()) {
-                c = net.minecraft.server.v1_5_R2.PotionBrewer.a(el.effects.values());
+                c = net.minecraft.server.v1_5_R3.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
@@ -5,10 +5,10 @@
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_5_R2.EntityLiving;
+import net.minecraft.server.v1_5_R3.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.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_5_R2.EntityHuman;
-import net.minecraft.server.v1_5_R2.EntityPlayer;
+import net.minecraft.server.v1_5_R3.EntityHuman;
+import net.minecraft.server.v1_5_R3.EntityPlayer;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.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
@@ -4,10 +4,10 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_5_R2.EntityHuman;
-import net.minecraft.server.v1_5_R2.EntityPlayer;
+import net.minecraft.server.v1_5_R3.EntityHuman;
+import net.minecraft.server.v1_5_R3.EntityPlayer;
 
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Listener;
 

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

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java
@@ -10,7 +10,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_5_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 
 public class HurtCommand extends AbstractCommand {

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

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
@@ -7,12 +7,13 @@
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.npc.dNPC;
 import net.aufdemrand.denizen.utilities.arguments.aH;
-import net.minecraft.server.v1_5_R2.EntityLiving;
+import net.citizensnpcs.api.CitizensAPI;
+import net.minecraft.server.v1_5_R3.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -28,7 +29,8 @@
 public class Utilities {
 
     public static Location getWalkableLocationNear(Location location, int range) {
-        Location returnable;
+
+    	Location returnable;
         Random range_random  = new Random();
 
         int selected_x = range_random.nextInt(range * 2);
@@ -265,7 +267,7 @@ public static void rotate(Entity entity, float yaw, float pitch)
 
         else
         {
-            net.minecraft.server.v1_5_R2.Entity handle = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_5_R3.Entity handle = ((CraftEntity) entity).getHandle();
             handle.yaw = (float) yaw;
             handle.pitch = (float) pitch;
         }

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/aH.java b/src/main/java/net/aufdemrand/denizen/utilities/arguments/aH.java
@@ -7,12 +7,12 @@
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
-import net.minecraft.server.v1_5_R2.Entity;
+import net.minecraft.server.v1_5_R3.Entity;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dEntity.java b/src/main/java/net/aufdemrand/denizen/utilities/arguments/dEntity.java
@@ -5,11 +5,11 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.CitizensAPI;
-import net.minecraft.server.v1_5_R2.Entity;
+import net.minecraft.server.v1_5_R3.Entity;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 
 import java.util.HashMap;

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/NBTItem.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/NBTItem.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.utilities.nbt;
 
-import net.minecraft.server.v1_5_R2.EntityLiving;
-import net.minecraft.server.v1_5_R2.NBTTagCompound;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftItemStack;
+import net.minecraft.server.v1_5_R3.EntityLiving;
+import net.minecraft.server.v1_5_R3.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
@@ -21,7 +21,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) {
 
     public static boolean hasCustomNBT(ItemStack item, String key) {
         NBTTagCompound tag;
-        net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
         if (!cis.hasTag()) return false;
         tag = cis.getTag();
         // dB.echoDebug(tag.toString());
@@ -30,7 +30,7 @@ public static boolean hasCustomNBT(ItemStack item, String key) {
     }
 
     public static String getCustomNBT(ItemStack item, String key) {
-        net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
             cis.setTag(new NBTTagCompound());
@@ -42,7 +42,7 @@ public static String getCustomNBT(ItemStack item, String key) {
     }
 
     public static ItemStack removeCustomNBT(ItemStack item, String key) {
-        net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
             cis.setTag(new NBTTagCompound());
@@ -53,7 +53,7 @@ public static ItemStack removeCustomNBT(ItemStack item, String key) {
     }
 
     public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
-        net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag = null;
         // Do stuff with tag
         if (!cis.hasTag())
@@ -65,7 +65,7 @@ public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
 
     public static LivingEntity addCustomNBT(LivingEntity entity, String key, String value) {
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -81,7 +81,7 @@ public static LivingEntity addCustomNBT(LivingEntity entity, String key, String
 
     public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -97,7 +97,7 @@ public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
 
     public static boolean hasCustomNBT(LivingEntity entity, String key) {
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag
@@ -109,7 +109,7 @@ public static boolean hasCustomNBT(LivingEntity entity, String key) {
 
     public static String getCustomNBT(LivingEntity entity, String key) {
         Entity bukkitEntity = entity;
-        net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
+        net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
 
         // Writes the entity's NBT data to tag