Skip to content

Commit

Permalink
Update to 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@aufdemrand
aufdemrand committed Sep 20, 2013
1 parent 8eeed22 commit 8a1a338
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -13,7 +13,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.6.2-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.6.4-R0.1-SNAPSHOT</craftbukkit.version>
<json.version>20090211</json.version>
<citizens.version>2.0.9-SNAPSHOT</citizens.version>
<build.number>Unknown</build.number>
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
View file
Expand Up @@ -7,17 +7,17 @@
import net.citizensnpcs.api.persistence.Persist;
import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.util.PlayerAnimation;
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 net.minecraft.server.v1_6_R3.EntityFishingHook;
import net.minecraft.server.v1_6_R3.EntityHuman;
import net.minecraft.server.v1_6_R3.EntityItem;
import net.minecraft.server.v1_6_R3.Item;
import net.minecraft.server.v1_6_R3.ItemStack;
import net.minecraft.server.v1_6_R3.MathHelper;
import net.minecraft.server.v1_6_R3.WorldServer;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.util.Vector;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java
View file
Expand Up @@ -10,7 +10,7 @@
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftWolf;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftWolf;
import org.bukkit.entity.Wolf;

public class ParticlesTrait extends Trait {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java
View file
Expand Up @@ -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_R2.EntityLiving;
import net.minecraft.server.v1_6_R3.EntityLiving;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java
View file
Expand Up @@ -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_R2.EntityHuman;
import net.minecraft.server.v1_6_R2.EntityPlayer;
import net.minecraft.server.v1_6_R3.EntityHuman;
import net.minecraft.server.v1_6_R3.EntityPlayer;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java
View file
Expand Up @@ -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_R2.EntityHuman;
import net.minecraft.server.v1_6_R2.EntityPlayer;
import net.minecraft.server.v1_6_R3.EntityHuman;
import net.minecraft.server.v1_6_R3.EntityPlayer;

import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.EntityType;
import org.bukkit.event.Listener;

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/aufdemrand/denizen/objects/dEntity.java
View file
Expand Up @@ -13,16 +13,16 @@
import net.aufdemrand.denizen.utilities.nbt.CustomNBT;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import net.minecraft.server.v1_6_R2.EntityLiving;
import net.minecraft.server.v1_6_R3.EntityLiving;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftCreature;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreature;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Enderman;
Expand Down Expand Up @@ -171,7 +171,7 @@ else if (entityGroup.matches("P@")) {
Entity entity = null;

for (World world : Bukkit.getWorlds()) {
net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(entityID);
net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(entityID);

// Make sure the nmsEntity is valid, to prevent
// unpleasant errors
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/dNPC.java
View file
Expand Up @@ -21,11 +21,11 @@
import net.citizensnpcs.api.trait.trait.Owner;
import net.citizensnpcs.trait.Anchors;
import net.citizensnpcs.util.Anchor;
import net.minecraft.server.v1_6_R2.EntityLiving;
import net.minecraft.server.v1_6_R3.EntityLiving;

import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java
View file
Expand Up @@ -10,10 +10,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_R2.Block;
import net.minecraft.server.v1_6_R3.Block;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java
View file
@@ -1,7 +1,7 @@
package net.aufdemrand.denizen.utilities.entity;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -48,7 +48,7 @@ public static void rotate(Entity entity, float yaw, float pitch)
}
else
{
net.minecraft.server.v1_6_R2.Entity handle = ((CraftEntity) entity).getHandle();
net.minecraft.server.v1_6_R3.Entity handle = ((CraftEntity) entity).getHandle();
handle.yaw = (float) yaw;
handle.pitch = (float) pitch;
}
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java
View file
@@ -1,9 +1,9 @@
package net.aufdemrand.denizen.utilities.nbt;

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 net.minecraft.server.v1_6_R3.EntityLiving;
import net.minecraft.server.v1_6_R3.NBTTagCompound;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.ItemStack;
Expand All @@ -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_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
net.minecraft.server.v1_6_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
if (!cis.hasTag()) return false;
tag = cis.getTag();
// dB.echoDebug(tag.toString());
Expand All @@ -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_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
net.minecraft.server.v1_6_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
NBTTagCompound tag;
if (!cis.hasTag())
cis.setTag(new NBTTagCompound());
Expand All @@ -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_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
net.minecraft.server.v1_6_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
NBTTagCompound tag;
if (!cis.hasTag())
cis.setTag(new NBTTagCompound());
Expand All @@ -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_R2.ItemStack cis = CraftItemStack.asNMSCopy(item);
net.minecraft.server.v1_6_R3.ItemStack cis = CraftItemStack.asNMSCopy(item);
NBTTagCompound tag = null;
// Do stuff with tag
if (!cis.hasTag())
Expand All @@ -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_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
NBTTagCompound tag = new NBTTagCompound();

// Writes the entity's NBT data to tag
Expand All @@ -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_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
NBTTagCompound tag = new NBTTagCompound();

// Writes the entity's NBT data to tag
Expand All @@ -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_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
NBTTagCompound tag = new NBTTagCompound();

// Writes the entity's NBT data to tag
Expand All @@ -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_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
NBTTagCompound tag = new NBTTagCompound();

// Writes the entity's NBT data to tag
Expand Down

0 comments on commit 8a1a338

Please sign in to comment.