diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java index 9fef993a..82951cf0 100644 --- a/src/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/me/libraryaddict/disguise/DisguiseAPI.java @@ -7,28 +7,28 @@ import java.util.Iterator; import me.libraryaddict.disguise.DisguiseTypes.Disguise; import me.libraryaddict.disguise.Events.DisguiseEvent; import me.libraryaddict.disguise.Events.UndisguiseEvent; -import net.minecraft.server.v1_6_R2.AttributeMapServer; -import net.minecraft.server.v1_6_R2.EntityHuman; -import net.minecraft.server.v1_6_R2.EntityInsentient; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.EntityTrackerEntry; -import net.minecraft.server.v1_6_R2.ItemStack; -import net.minecraft.server.v1_6_R2.MobEffect; -import net.minecraft.server.v1_6_R2.Packet17EntityLocationAction; -import net.minecraft.server.v1_6_R2.Packet20NamedEntitySpawn; -import net.minecraft.server.v1_6_R2.Packet28EntityVelocity; -import net.minecraft.server.v1_6_R2.Packet35EntityHeadRotation; -import net.minecraft.server.v1_6_R2.Packet39AttachEntity; -import net.minecraft.server.v1_6_R2.Packet40EntityMetadata; -import net.minecraft.server.v1_6_R2.Packet41MobEffect; -import net.minecraft.server.v1_6_R2.Packet44UpdateAttributes; -import net.minecraft.server.v1_6_R2.Packet5EntityEquipment; -import net.minecraft.server.v1_6_R2.WorldServer; +import net.minecraft.server.v1_6_R3.AttributeMapServer; +import net.minecraft.server.v1_6_R3.EntityHuman; +import net.minecraft.server.v1_6_R3.EntityInsentient; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.EntityTrackerEntry; +import net.minecraft.server.v1_6_R3.ItemStack; +import net.minecraft.server.v1_6_R3.MobEffect; +import net.minecraft.server.v1_6_R3.Packet17EntityLocationAction; +import net.minecraft.server.v1_6_R3.Packet20NamedEntitySpawn; +import net.minecraft.server.v1_6_R3.Packet28EntityVelocity; +import net.minecraft.server.v1_6_R3.Packet35EntityHeadRotation; +import net.minecraft.server.v1_6_R3.Packet39AttachEntity; +import net.minecraft.server.v1_6_R3.Packet40EntityMetadata; +import net.minecraft.server.v1_6_R3.Packet41MobEffect; +import net.minecraft.server.v1_6_R3.Packet44UpdateAttributes; +import net.minecraft.server.v1_6_R3.Packet5EntityEquipment; +import net.minecraft.server.v1_6_R3.WorldServer; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -62,7 +62,7 @@ public class DisguiseAPI { disguise = disguise.clone(); } try { - Field field = net.minecraft.server.v1_6_R2.Entity.class.getDeclaredField("entityCount"); + Field field = net.minecraft.server.v1_6_R3.Entity.class.getDeclaredField("entityCount"); field.setAccessible(true); int id = field.getInt(null); disguises.put(id, disguise); @@ -259,7 +259,7 @@ public class DisguiseAPI { tracker.trackedPlayers.add(entityplayer); try { // Grab the entity ID the fake disguise will use - Field field = net.minecraft.server.v1_6_R2.Entity.class.getDeclaredField("entityCount"); + Field field = net.minecraft.server.v1_6_R3.Entity.class.getDeclaredField("entityCount"); field.setAccessible(true); int id = field.getInt(null); // Set the entitycount plus one so we don't have the id being reused @@ -277,7 +277,7 @@ public class DisguiseAPI { } // Send himself some entity attributes if (tracker.tracker instanceof EntityLiving) { - AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) tracker.tracker).aW(); + AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) tracker.tracker).aX(); Collection collection = attributemapserver.c(); if (!collection.isEmpty()) { @@ -310,9 +310,9 @@ public class DisguiseAPI { entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, tracker.tracker.passenger, tracker.tracker)); } - if (tracker.tracker instanceof EntityInsentient && ((EntityInsentient) tracker.tracker).bI() != null) { + if (tracker.tracker instanceof EntityInsentient && ((EntityInsentient) tracker.tracker).getLeashHolder() != null) { entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(1, tracker.tracker, - ((EntityInsentient) tracker.tracker).bI())); + ((EntityInsentient) tracker.tracker).getLeashHolder())); } // Resend the armor diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java index 8c6b171f..c992440b 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java @@ -10,15 +10,15 @@ import me.libraryaddict.disguise.PacketsManager; import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher; import me.libraryaddict.disguise.DisguiseTypes.Watchers.HorseWatcher; import me.libraryaddict.disguise.DisguiseTypes.Watchers.ZombieWatcher; -import net.minecraft.server.v1_6_R2.EntityAgeable; -import net.minecraft.server.v1_6_R2.EntityInsentient; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.EntityTrackerEntry; -import net.minecraft.server.v1_6_R2.WorldServer; +import net.minecraft.server.v1_6_R3.EntityAgeable; +import net.minecraft.server.v1_6_R3.EntityInsentient; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.EntityTrackerEntry; +import net.minecraft.server.v1_6_R3.WorldServer; 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.Horse.Variant; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java index d7cf6f82..f3414148 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_6_R2.CraftSound; +import org.bukkit.craftbukkit.v1_6_R3.CraftSound; public enum DisguiseSound { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java index b1e8afc3..2c80b646 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -18,10 +18,10 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.reflect.StructureModifier; import me.libraryaddict.disguise.DisguiseAPI; -import net.minecraft.server.v1_6_R2.ChunkCoordinates; -import net.minecraft.server.v1_6_R2.EntityPlayer; -import net.minecraft.server.v1_6_R2.ItemStack; -import net.minecraft.server.v1_6_R2.WatchableObject; +import net.minecraft.server.v1_6_R3.ChunkCoordinates; +import net.minecraft.server.v1_6_R3.EntityPlayer; +import net.minecraft.server.v1_6_R3.ItemStack; +import net.minecraft.server.v1_6_R3.WatchableObject; public class FlagWatcher { public enum SlotType { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Values.java b/src/me/libraryaddict/disguise/DisguiseTypes/Values.java index 6228ce40..9c30e7a5 100644 --- a/src/me/libraryaddict/disguise/DisguiseTypes/Values.java +++ b/src/me/libraryaddict/disguise/DisguiseTypes/Values.java @@ -2,7 +2,7 @@ package me.libraryaddict.disguise.DisguiseTypes; import java.util.HashMap; -import net.minecraft.server.v1_6_R2.EnumEntitySize; +import net.minecraft.server.v1_6_R3.EnumEntitySize; public class Values { diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java index acbbb61a..63bde4c9 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_6_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import me.libraryaddict.disguise.DisguiseTypes.Disguise; @@ -13,7 +13,7 @@ public class DroppedItemWatcher extends FlagWatcher { } public ItemStack getItemStack() { - return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R2.ItemStack) getValue(10, + return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R3.ItemStack) getValue(10, CraftItemStack.asNMSCopy(new ItemStack(1)))); } diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java index eafedbcf..8aadd771 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_6_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import me.libraryaddict.disguise.DisguiseTypes.Disguise; @@ -15,7 +15,7 @@ public class ItemFrameWatcher extends FlagWatcher { public ItemStack getItemStack() { if (getValue(3, (byte) 0) instanceof Integer) return new ItemStack(0); - return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R2.ItemStack) getValue(3, null)); + return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_6_R3.ItemStack) getValue(3, null)); } 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 246b0887..d62b7304 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_6_R2.MobEffect; -import net.minecraft.server.v1_6_R2.PotionBrewer; +import net.minecraft.server.v1_6_R3.MobEffect; +import net.minecraft.server.v1_6_R3.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 c2dec8e2..96306449 100644 --- a/src/me/libraryaddict/disguise/LibsDisguises.java +++ b/src/me/libraryaddict/disguise/LibsDisguises.java @@ -12,17 +12,17 @@ import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher; import me.libraryaddict.disguise.DisguiseTypes.Values; import me.libraryaddict.disguise.DisguiseTypes.Watchers.AgeableWatcher; import me.libraryaddict.disguise.DisguiseTypes.Watchers.LivingWatcher; -import net.minecraft.server.v1_6_R2.ChatMessage; -import net.minecraft.server.v1_6_R2.ChunkCoordinates; -import net.minecraft.server.v1_6_R2.EntityHuman; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.GenericAttributes; -import net.minecraft.server.v1_6_R2.WatchableObject; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.ChatMessage; +import net.minecraft.server.v1_6_R3.ChunkCoordinates; +import net.minecraft.server.v1_6_R3.EntityHuman; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.GenericAttributes; +import net.minecraft.server.v1_6_R3.WatchableObject; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; import org.bukkit.entity.Ageable; import org.bukkit.entity.LivingEntity; import org.bukkit.plugin.java.JavaPlugin; @@ -175,14 +175,14 @@ public class LibsDisguises extends JavaPlugin { break; } try { - net.minecraft.server.v1_6_R2.Entity entity = null; + net.minecraft.server.v1_6_R3.Entity entity = null; Class entityClass; if (disguiseType == DisguiseType.PLAYER) { entityClass = EntityHuman.class; entity = new DisguiseHuman(world); } else { - entityClass = Class.forName("net.minecraft.server.v1_6_R2.Entity" + name); - entity = (net.minecraft.server.v1_6_R2.Entity) entityClass.getConstructor(World.class).newInstance(world); + entityClass = Class.forName("net.minecraft.server.v1_6_R3.Entity" + name); + entity = (net.minecraft.server.v1_6_R3.Entity) entityClass.getConstructor(World.class).newInstance(world); } Values value = new Values(disguiseType, entityClass, entity.at); List watchers = entity.getDataWatcher().c(); diff --git a/src/me/libraryaddict/disguise/PacketsManager.java b/src/me/libraryaddict/disguise/PacketsManager.java index 184b3f15..d08f7f55 100644 --- a/src/me/libraryaddict/disguise/PacketsManager.java +++ b/src/me/libraryaddict/disguise/PacketsManager.java @@ -18,22 +18,22 @@ import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise; import me.libraryaddict.disguise.DisguiseTypes.Values; import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType; -import net.minecraft.server.v1_6_R2.AttributeSnapshot; -import net.minecraft.server.v1_6_R2.Block; -import net.minecraft.server.v1_6_R2.DataWatcher; -import net.minecraft.server.v1_6_R2.EntityLiving; -import net.minecraft.server.v1_6_R2.EnumArt; -import net.minecraft.server.v1_6_R2.EnumEntitySize; -import net.minecraft.server.v1_6_R2.ItemStack; -import net.minecraft.server.v1_6_R2.MathHelper; -import net.minecraft.server.v1_6_R2.WatchableObject; -import net.minecraft.server.v1_6_R2.World; +import net.minecraft.server.v1_6_R3.AttributeSnapshot; +import net.minecraft.server.v1_6_R3.Block; +import net.minecraft.server.v1_6_R3.DataWatcher; +import net.minecraft.server.v1_6_R3.EntityLiving; +import net.minecraft.server.v1_6_R3.EnumArt; +import net.minecraft.server.v1_6_R3.EnumEntitySize; +import net.minecraft.server.v1_6_R3.ItemStack; +import net.minecraft.server.v1_6_R3.MathHelper; +import net.minecraft.server.v1_6_R3.WatchableObject; +import net.minecraft.server.v1_6_R3.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftItemStack; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; import org.bukkit.entity.ExperienceOrb; @@ -127,7 +127,7 @@ public class PacketsManager { public static PacketContainer[] constructSpawnPackets(Disguise disguise, Entity disguisedEntity) { if (disguise.getEntity() == null) disguise.setEntity(disguisedEntity); - net.minecraft.server.v1_6_R2.Entity nmsEntity = ((CraftEntity) disguisedEntity).getHandle(); + net.minecraft.server.v1_6_R3.Entity nmsEntity = ((CraftEntity) disguisedEntity).getHandle(); ArrayList packets = new ArrayList(); for (int i = 0; i < 5; i++) { int slot = i - 1; @@ -427,11 +427,11 @@ public class PacketsManager { } else { boolean hasInvun = false; if (entity instanceof LivingEntity) { - net.minecraft.server.v1_6_R2.EntityLiving e = ((CraftLivingEntity) entity) + net.minecraft.server.v1_6_R3.EntityLiving e = ((CraftLivingEntity) entity) .getHandle(); hasInvun = (e.noDamageTicks == e.maxNoDamageTicks); } else { - net.minecraft.server.v1_6_R2.Entity e = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_6_R3.Entity e = ((CraftEntity) entity).getHandle(); hasInvun = e.isInvulnerable(); } soundType = entitySound.getType(soundName, !hasInvun);