Update Denizen to CraftBukkit 1.6.1-R0.1

DenizenScript · Jul 2, 2013 · 5bd3757 · 5bd3757
1 parent 5e06cec
commit 5bd3757
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 74 deletions.
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_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 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 org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R1.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
@@ -6,17 +6,12 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.objects.Duration;
 import net.aufdemrand.denizen.objects.aH;
-import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.citizensnpcs.api.event.DespawnReason;
-import net.citizensnpcs.api.event.NPCDeathEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-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_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -128,7 +123,7 @@ public HealthTrait() {
      * @return current health points
      *
      */
-    public int getHealth() {
+    public double getHealth() {
     	if (!npc.isSpawned()) return 0;
     	else return npc.getBukkitEntity().getHealth();
     }
@@ -148,7 +143,7 @@ public void setMaxhealth(int newMax) {
      *
      * @return maximum health
      */
-    public int getMaxhealth() {
+    public double getMaxhealth() {
     	return npc.getBukkitEntity().getMaxHealth();
     }
 
@@ -174,7 +169,7 @@ public void setHealth() {
      *
      * @param health total health points
      */
-    public void setHealth(int health) {
+    public void setHealth(double health) {
         if (npc.getBukkitEntity() != null)
         	npc.getBukkitEntity().setHealth(health);
     }

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,12 @@
 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_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_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 
 public class ParticlesTrait extends Trait {
@@ -87,7 +83,7 @@ public void run() {
 		case POTION:
 			/*
             if (!el.effects.isEmpty()) {
-                c = net.minecraft.server.v1_5_R3.PotionBrewer.a(el.effects.values());
+                c = net.minecraft.server.v1_6_R1.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_5_R3.EntityLiving;
+import net.minecraft.server.v1_6_R1.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.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_R3.EntityHuman;
-import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R1.EntityHuman;
+import net.minecraft.server.v1_6_R1.EntityPlayer;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.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
@@ -1,13 +1,12 @@
 package net.aufdemrand.denizen.npc.traits;
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-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_R3.EntityHuman;
-import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R1.EntityHuman;
+import net.minecraft.server.v1_6_R1.EntityPlayer;
 
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.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,7 +13,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
@@ -473,7 +473,7 @@ public void setSubtype (Class<? extends Entity> entityClass, String typeName, St
     // Used to store some information about a livingEntity while it's despawned
     private class DespawnedEntity {
 
-        Integer health = null;
+        Double health = null;
         Location location = null;
         ItemStack[] equipment = null;
         String custom_script = null;
@@ -606,9 +606,9 @@ public String getAttribute(Attribute attribute) {
         if (attribute.startsWith("location"))
             return new dLocation(entity.getLocation())
                     .getAttribute(attribute.fulfill(1));
-
+        
         if (attribute.startsWith("health.formatted")) {
-            int maxHealth = getLivingEntity().getMaxHealth();
+            double maxHealth = getLivingEntity().getMaxHealth();
             if (attribute.hasContext(2))
                 maxHealth = attribute.getIntContext(2);
             if ((float) getLivingEntity().getHealth() / maxHealth < .10)
@@ -624,7 +624,7 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
         }
 
         if (attribute.startsWith("health.percentage")) {
-            int maxHealth = getLivingEntity().getMaxHealth();
+            double maxHealth = getLivingEntity().getMaxHealth();
             if (attribute.hasContext(2))
                 maxHealth = attribute.getIntContext(2);
             return new Element(String.valueOf(((float) getLivingEntity().getHealth() / maxHealth) * 100))

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -296,7 +296,7 @@ public String getAttribute(Attribute attribute) {
                     .getAttribute(attribute.fulfill(1));
 
         if (attribute.startsWith("food_level.formatted")) {
-            int maxHunger = getPlayerEntity().getMaxHealth();
+            double maxHunger = getPlayerEntity().getMaxHealth();
             if (attribute.hasContext(2))
                 maxHunger = attribute.getIntContext(2);
             if ((float) getPlayerEntity().getFoodLevel() / maxHunger < .10)

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_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 
 import net.aufdemrand.denizen.exceptions.CommandExecutionException;
@@ -46,8 +46,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
 
         for (String arg : scriptEntry.getArguments()) {
 
-            if (aH.matchesQuantity(arg) || aH.matchesInteger(arg)
-                    || aH.matchesValueArg("amt", arg, ArgumentType.Integer))
+            if (aH.matchesQuantity(arg) || aH.matchesDouble(arg)
+                    || aH.matchesValueArg("amt", arg, ArgumentType.Double))
                 amount = aH.getIntegerFrom(arg);
 
             else if (aH.matchesValueArg("target", arg, ArgumentType.String)) {
@@ -74,12 +74,12 @@ else if (targetType == TargetType.NPC && scriptEntry.getNPC() == null)
     public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
         TargetType target = (TargetType) scriptEntry.getObject("target");
-        Integer amount = (Integer) scriptEntry.getObject("amount");
+        Double amount = (Double) scriptEntry.getObject("amount");
 
         dB.report(getName(),
                 aH.debugObj("Target", (target == TargetType.PLAYER ? scriptEntry.getPlayer().getName()
                         : scriptEntry.getNPC().getName()))
-                        + aH.debugObj("Amount", (amount == Integer.MAX_VALUE ? "Full"
+                        + aH.debugObj("Amount", (amount == Double.MAX_VALUE ? "Full"
                         : String.valueOf(amount))));
 
         switch (target) {
@@ -99,7 +99,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                 // Set to max health
                 if (amount == Integer.MAX_VALUE) player.setHealth(player.getMaxHealth());
                     // else, increase health
-                else ((CraftLivingEntity) player).getHandle().setHealth(player.getHealth() + amount);
+                else ((CraftLivingEntity) player).getHandle().setHealth((float) (player.getHealth() + amount));
         }
 
     }

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_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 
 public class HurtCommand extends AbstractCommand {
@@ -24,8 +24,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
 
         for (String arg : scriptEntry.getArguments()) {
 
-            if (aH.matchesQuantity(arg) || aH.matchesInteger(arg)
-                    || aH.matchesValueArg("amt", arg, ArgumentType.Integer))
+            if (aH.matchesQuantity(arg) || aH.matchesDouble(arg)
+                    || aH.matchesValueArg("amt", arg, ArgumentType.Double))
                 amount = aH.getIntegerFrom(arg);
 
             else if (aH.matchesValueArg("target", arg, ArgumentType.String)) {
@@ -52,12 +52,12 @@ else if (targetType == TargetType.NPC && scriptEntry.getNPC() == null)
     public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
         TargetType target = (TargetType) scriptEntry.getObject("target");
-        Integer amount = (Integer) scriptEntry.getObject("amount");
+        Double amount = (Double) scriptEntry.getObject("amount");
 
         dB.report(getName(),
                 aH.debugObj("Target", (target == TargetType.PLAYER ? scriptEntry.getPlayer().getName()
                         : scriptEntry.getNPC().getName()))
-                        + aH.debugObj("Amount", (amount == Integer.MAX_VALUE ? "Full"
+                        + aH.debugObj("Amount", (amount == Double.MAX_VALUE ? "Full"
                         : String.valueOf(amount))));
 
         switch (target) {
@@ -71,7 +71,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             case PLAYER:
                 Player player = scriptEntry.getPlayer().getPlayerEntity();
                 // Injure player
-                ((CraftLivingEntity) player).getHandle().setHealth(player.getHealth() - amount);
+                ((CraftLivingEntity) player).getHandle().setHealth((float) (player.getHealth() - amount));
                 return;
         }
 

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_5_R3.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftCreature;
+import org.bukkit.craftbukkit.v1_6_R1.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_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.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_5_R3.Block;
+import net.minecraft.server.v1_6_R1.Block;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R1.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_5_R3.EntityLiving;
-import net.minecraft.server.v1_5_R3.NBTTagCompound;
+import net.minecraft.server.v1_6_R1.EntityLiving;
+import net.minecraft.server.v1_6_R1.NBTTagCompound;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R1.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_5_R3.EntityLiving;
+import net.minecraft.server.v1_6_R1.EntityLiving;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R1.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_5_R3.Entity handle = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_6_R1.Entity handle = ((CraftEntity) entity).getHandle();
             handle.yaw = (float) yaw;
             handle.pitch = (float) pitch;
         }