From 1089032e4a5b8ff8349887348106b4975cd70e7b Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 2 Jul 2013 15:29:12 +1200 Subject: [PATCH] Update LibsDisguises to 1.6 --- pom.xml | 7 +++++- .../libraryaddict/disguise/DisguiseAPI.java | 24 +++++++++---------- .../disguise/DisguiseTypes/Disguise.java | 22 ++++++++--------- .../disguise/DisguiseTypes/DisguiseSound.java | 2 +- .../disguise/DisguiseTypes/FlagWatcher.java | 8 +++---- .../disguise/DisguiseTypes/WatcherValues.java | 2 +- .../Watchers/DroppedItemWatcher.java | 4 ++-- .../Watchers/ItemFrameWatcher.java | 4 ++-- .../DisguiseTypes/Watchers/LivingWatcher.java | 4 ++-- .../libraryaddict/disguise/LibsDisguises.java | 2 +- 10 files changed, 42 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index a24e84ac..dfd5e6c9 100644 --- a/pom.xml +++ b/pom.xml @@ -54,10 +54,15 @@ ProtocolLib 2.4.3 + + org.bukkit + bukkit + 1.5.1-R0.2 + org.bukkit craftbukkit - 1.5.2-R0.1-SNAPSHOT + 1.6.1-R0.1-SNAPSHOT \ No newline at end of file diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java index 8a453270..c1148681 100644 --- a/src/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/me/libraryaddict/disguise/DisguiseAPI.java @@ -4,17 +4,17 @@ import java.util.HashMap; import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound; import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType; -import net.minecraft.server.v1_5_R3.Block; -import net.minecraft.server.v1_5_R3.EntityPlayer; -import net.minecraft.server.v1_5_R3.EntityTrackerEntry; -import net.minecraft.server.v1_5_R3.World; -import net.minecraft.server.v1_5_R3.WorldServer; +import net.minecraft.server.v1_6_R1.Block; +import net.minecraft.server.v1_6_R1.EntityPlayer; +import net.minecraft.server.v1_6_R1.EntityTrackerEntry; +import net.minecraft.server.v1_6_R1.World; +import net.minecraft.server.v1_6_R1.WorldServer; import org.bukkit.Location; import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_5_R3.CraftSound; -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.CraftSound; +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; @@ -120,11 +120,11 @@ public class DisguiseAPI { } else { boolean hasInvun = false; if (entity instanceof LivingEntity) { - net.minecraft.server.v1_5_R3.EntityLiving e = ((CraftLivingEntity) entity) + net.minecraft.server.v1_6_R1.EntityLiving e = ((CraftLivingEntity) entity) .getHandle(); - hasInvun = e.noDamageTicks == e.maxNoDamageTicks; + hasInvun = (e.noDamageTicks == e.maxNoDamageTicks); } else { - net.minecraft.server.v1_5_R3.Entity e = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_6_R1.Entity e = ((CraftEntity) entity).getHandle(); hasInvun = e.isInvulnerable(); } soundType = disSound.getType(soundName, !hasInvun); @@ -137,7 +137,7 @@ public class DisguiseAPI { soundType = null; disguisedEntity = entity; break; - }*/ + }*/ } } } diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java index 7fe82726..8b3ada5e 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java @@ -9,18 +9,18 @@ import java.util.Random; import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher; import me.libraryaddict.disguise.DisguiseTypes.Watchers.LivingWatcher; -import net.minecraft.server.v1_5_R3.DataWatcher; -import net.minecraft.server.v1_5_R3.Entity; -import net.minecraft.server.v1_5_R3.EntityLiving; -import net.minecraft.server.v1_5_R3.EntityTypes; -import net.minecraft.server.v1_5_R3.ItemStack; -import net.minecraft.server.v1_5_R3.MathHelper; -import net.minecraft.server.v1_5_R3.EnumArt; -import net.minecraft.server.v1_5_R3.WatchableObject; +import net.minecraft.server.v1_6_R1.DataWatcher; +import net.minecraft.server.v1_6_R1.Entity; +import net.minecraft.server.v1_6_R1.EntityLiving; +import net.minecraft.server.v1_6_R1.EntityTypes; +import net.minecraft.server.v1_6_R1.ItemStack; +import net.minecraft.server.v1_6_R1.MathHelper; +import net.minecraft.server.v1_6_R1.EnumArt; +import net.minecraft.server.v1_6_R1.WatchableObject; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.util.Vector; @@ -110,7 +110,7 @@ public class Disguise { else if (disguiseType == DisguiseType.FIREBALL) name = "LargeFireball"; try { - Class entityClass = Class.forName("net.minecraft.server.v1_5_R3.Entity" + name); + Class entityClass = Class.forName("net.minecraft.server.v1_6_R1.Entity" + name); Field field = EntityTypes.class.getDeclaredField("e"); field.setAccessible(true); Map map = (Map) field.get(null); diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java index 7b7b91b5..038c29a4 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_5_R3.CraftSound; +import org.bukkit.craftbukkit.v1_6_R1.CraftSound; public enum DisguiseSound { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java index 1b677b1e..f059b7c4 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java @@ -7,12 +7,12 @@ import java.util.Iterator; import java.util.List; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer; import org.bukkit.entity.Player; -import net.minecraft.server.v1_5_R3.ItemStack; -import net.minecraft.server.v1_5_R3.Packet40EntityMetadata; -import net.minecraft.server.v1_5_R3.WatchableObject; +import net.minecraft.server.v1_6_R1.ItemStack; +import net.minecraft.server.v1_6_R1.Packet40EntityMetadata; +import net.minecraft.server.v1_6_R1.WatchableObject; public class FlagWatcher { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/WatcherValues.java b/src/me/libraryaddict/disguise/DisguiseTypes/WatcherValues.java index 6d5aec1c..167c8c68 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/WatcherValues.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/WatcherValues.java @@ -3,7 +3,7 @@ package me.libraryaddict.disguise.DisguiseTypes; import java.util.HashMap; import java.util.Set; -import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; public enum WatcherValues { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java index 49c9b71e..57a46d06 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java @@ -1,6 +1,6 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; @@ -13,7 +13,7 @@ public class DroppedItemWatcher extends FlagWatcher { } public ItemStack getItemStack() { - return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_5_R3.ItemStack) getValue(10)); + return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R1.ItemStack) getValue(10)); } public void setItemStack(ItemStack item) { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java index 2379478f..431725e5 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java @@ -1,6 +1,6 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; -import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; @@ -16,7 +16,7 @@ public class ItemFrameWatcher extends FlagWatcher { public ItemStack getItemStack() { if (getValue(3) instanceof Integer) return new ItemStack(0); - return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_5_R3.ItemStack) getValue(3)); + return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R1.ItemStack) getValue(3)); } public void setItemStack(ItemStack newItem) { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java index 22b6fc2e..459a6494 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java @@ -3,8 +3,8 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers; import java.util.HashSet; import java.util.Iterator; -import net.minecraft.server.v1_5_R3.MobEffect; -import net.minecraft.server.v1_5_R3.PotionBrewer; +import net.minecraft.server.v1_6_R1.MobEffect; +import net.minecraft.server.v1_6_R1.PotionBrewer; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java index 1b36688a..4a11a33d 100644 --- a/src/me/libraryaddict/disguise/LibsDisguises.java +++ b/src/me/libraryaddict/disguise/LibsDisguises.java @@ -9,7 +9,7 @@ import me.libraryaddict.disguise.Commands.UndisguisePlayerCommand; import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; -import net.minecraft.server.v1_5_R3.WatchableObject; +import net.minecraft.server.v1_6_R1.WatchableObject; import org.bukkit.Bukkit; import org.bukkit.ChatColor;