diff --git a/src/Tux2/TuxTwoLib/SpawnEggs.java b/src/Tux2/TuxTwoLib/SpawnEggs.java index 9f373fa..6705b8a 100644 --- a/src/Tux2/TuxTwoLib/SpawnEggs.java +++ b/src/Tux2/TuxTwoLib/SpawnEggs.java @@ -1,17 +1,17 @@ package Tux2.TuxTwoLib; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; import Tux2.TuxTwoLib.attributes.Attributes; -import net.minecraft.server.v1_9_R1.NBTTagCompound; +import net.minecraft.server.v1_9_R2.NBTTagCompound; public class SpawnEggs { public static ItemStack getSpawnEgg(EntityType type, int amount) { - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(new ItemStack(Material.MONSTER_EGG, amount)); + net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(new ItemStack(Material.MONSTER_EGG, amount)); String name = ""; switch (type) { case ARMOR_STAND: @@ -212,7 +212,7 @@ public static ItemStack getSpawnEgg(EntityType type, int amount) { } public static ItemStack getSpawnEgg(String name, int amount) { - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(new ItemStack(Material.MONSTER_EGG, amount)); + net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(new ItemStack(Material.MONSTER_EGG, amount)); NBTTagCompound tag = stack.getTag(); if(tag == null) { tag = new NBTTagCompound(); @@ -226,7 +226,7 @@ public static ItemStack getSpawnEgg(String name, int amount) { public static EntityType getSpawnEggType(ItemStack is) { EntityType type = null; - net.minecraft.server.v1_9_R1.ItemStack mcis = Attributes.getMinecraftItemStack(is); + net.minecraft.server.v1_9_R2.ItemStack mcis = Attributes.getMinecraftItemStack(is); if(mcis == null) { return null; } diff --git a/src/Tux2/TuxTwoLib/TuxTwoInventoryPlayer.java b/src/Tux2/TuxTwoLib/TuxTwoInventoryPlayer.java index 26a303b..9988e30 100644 --- a/src/Tux2/TuxTwoLib/TuxTwoInventoryPlayer.java +++ b/src/Tux2/TuxTwoLib/TuxTwoInventoryPlayer.java @@ -2,10 +2,10 @@ import java.util.HashMap; -import net.minecraft.server.v1_9_R1.PlayerInventory; +import net.minecraft.server.v1_9_R2.PlayerInventory; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventoryPlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/Tux2/TuxTwoLib/TuxTwoLib.java b/src/Tux2/TuxTwoLib/TuxTwoLib.java index c74b72e..282a27f 100644 --- a/src/Tux2/TuxTwoLib/TuxTwoLib.java +++ b/src/Tux2/TuxTwoLib/TuxTwoLib.java @@ -32,7 +32,7 @@ public class TuxTwoLib extends JavaPlugin { public boolean updatesuccessful = false; String currentMCversion = "1.9"; - String currentNMS = "v1_9_R1"; + String currentNMS = "v1_9_R2"; String versionName = null; private String versionLink = null; diff --git a/src/Tux2/TuxTwoLib/TuxTwoListener.java b/src/Tux2/TuxTwoLib/TuxTwoListener.java index 5608196..28dff0d 100644 --- a/src/Tux2/TuxTwoLib/TuxTwoListener.java +++ b/src/Tux2/TuxTwoLib/TuxTwoListener.java @@ -1,8 +1,8 @@ package Tux2.TuxTwoLib; import java.lang.reflect.Field; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventoryPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/Tux2/TuxTwoLib/TuxTwoPlayer.java b/src/Tux2/TuxTwoLib/TuxTwoPlayer.java index bdda68d..85d2827 100644 --- a/src/Tux2/TuxTwoLib/TuxTwoPlayer.java +++ b/src/Tux2/TuxTwoLib/TuxTwoPlayer.java @@ -2,15 +2,15 @@ import java.io.File; -import net.minecraft.server.v1_9_R1.EntityPlayer; -import net.minecraft.server.v1_9_R1.MinecraftServer; -import net.minecraft.server.v1_9_R1.PlayerInteractManager; -import net.minecraft.server.v1_9_R1.World; +import net.minecraft.server.v1_9_R2.EntityPlayer; +import net.minecraft.server.v1_9_R2.MinecraftServer; +import net.minecraft.server.v1_9_R2.PlayerInteractManager; +import net.minecraft.server.v1_9_R2.World; import com.mojang.authlib.GameProfile; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; -import org.bukkit.craftbukkit.v1_9_R1.CraftServer; +import org.bukkit.craftbukkit.v1_9_R2.CraftServer; import org.bukkit.entity.Player; public class TuxTwoPlayer { diff --git a/src/Tux2/TuxTwoLib/TuxTwoPlayerHead.java b/src/Tux2/TuxTwoLib/TuxTwoPlayerHead.java index 1c11198..b18009c 100644 --- a/src/Tux2/TuxTwoLib/TuxTwoPlayerHead.java +++ b/src/Tux2/TuxTwoLib/TuxTwoPlayerHead.java @@ -2,12 +2,12 @@ import java.util.UUID; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import Tux2.TuxTwoLib.attributes.Attributes; -import net.minecraft.server.v1_9_R1.NBTTagCompound; -import net.minecraft.server.v1_9_R1.NBTTagList; +import net.minecraft.server.v1_9_R2.NBTTagCompound; +import net.minecraft.server.v1_9_R2.NBTTagList; public class TuxTwoPlayerHead { @@ -16,7 +16,7 @@ public static ItemStack getHead(ItemStack is, NMSHeadData head) { } public static ItemStack getHead(ItemStack is, UUID id , String texture) { - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(is); + net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(is); NBTTagCompound tag = stack.getTag(); if(tag == null) { tag = new NBTTagCompound(); @@ -37,7 +37,7 @@ public static ItemStack getHead(ItemStack is, UUID id , String texture) { public static NMSHeadData getHeadData(ItemStack is) { try{ - net.minecraft.server.v1_9_R1.ItemStack mcis = Attributes.getMinecraftItemStack(is); + net.minecraft.server.v1_9_R2.ItemStack mcis = Attributes.getMinecraftItemStack(is); if(mcis == null) { return null; } diff --git a/src/Tux2/TuxTwoLib/attributes/Attribute.java b/src/Tux2/TuxTwoLib/attributes/Attribute.java index bfc621b..efac909 100644 --- a/src/Tux2/TuxTwoLib/attributes/Attribute.java +++ b/src/Tux2/TuxTwoLib/attributes/Attribute.java @@ -1,6 +1,6 @@ package Tux2.TuxTwoLib.attributes; -import net.minecraft.server.v1_9_R1.NBTTagCompound; +import net.minecraft.server.v1_9_R2.NBTTagCompound; import org.bukkit.inventory.ItemStack; diff --git a/src/Tux2/TuxTwoLib/attributes/Attributes.java b/src/Tux2/TuxTwoLib/attributes/Attributes.java index ff71a58..b914602 100644 --- a/src/Tux2/TuxTwoLib/attributes/Attributes.java +++ b/src/Tux2/TuxTwoLib/attributes/Attributes.java @@ -1,11 +1,11 @@ package Tux2.TuxTwoLib.attributes; -import net.minecraft.server.v1_9_R1.Item; -import net.minecraft.server.v1_9_R1.NBTTagCompound; -import net.minecraft.server.v1_9_R1.NBTTagList; +import net.minecraft.server.v1_9_R2.Item; +import net.minecraft.server.v1_9_R2.NBTTagCompound; +import net.minecraft.server.v1_9_R2.NBTTagList; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_9_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_9_R2.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; import java.lang.reflect.Field; @@ -48,7 +48,7 @@ public class Attributes { public static ItemStack apply(ItemStack original, Attribute attribute, boolean replace){ try { if(original instanceof CraftItemStack) { - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(original); + net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(original); NBTTagCompound tag = stack.getTag(); NBTTagList list; if(replace) { @@ -85,7 +85,7 @@ public static ItemStack apply(ItemStack original, Collection fromStack(ItemStack is){ try{ - net.minecraft.server.v1_9_R1.ItemStack mcis = getMinecraftItemStack(is); + net.minecraft.server.v1_9_R2.ItemStack mcis = getMinecraftItemStack(is); if(mcis == null) { return new ArrayList(); } @@ -145,7 +145,7 @@ public static ArrayList fromStack(ItemStack is){ } } - public static net.minecraft.server.v1_9_R1.ItemStack getMinecraftItemStack(ItemStack is) { + public static net.minecraft.server.v1_9_R2.ItemStack getMinecraftItemStack(ItemStack is) { if(!(is instanceof CraftItemStack)) { Item item = CraftMagicNumbers.getItem(is.getType()); @@ -154,13 +154,13 @@ public static net.minecraft.server.v1_9_R1.ItemStack getMinecraftItemStack(ItemS return null; } - net.minecraft.server.v1_9_R1.ItemStack stack = new net.minecraft.server.v1_9_R1.ItemStack(item, is.getAmount(), is.getDurability()); + net.minecraft.server.v1_9_R2.ItemStack stack = new net.minecraft.server.v1_9_R2.ItemStack(item, is.getAmount(), is.getDurability()); CraftItemStack cis = CraftItemStack.asCraftMirror(stack); try { Field handle = CraftItemStack.class.getDeclaredField("handle"); handle.setAccessible(true); - net.minecraft.server.v1_9_R1.ItemStack mis = (net.minecraft.server.v1_9_R1.ItemStack) handle.get(cis); + net.minecraft.server.v1_9_R2.ItemStack mis = (net.minecraft.server.v1_9_R2.ItemStack) handle.get(cis); if (is.hasItemMeta()) { CraftItemStack.setItemMeta(mis, is.getItemMeta()); } @@ -184,7 +184,7 @@ public static net.minecraft.server.v1_9_R1.ItemStack getMinecraftItemStack(ItemS try { Field handle = CraftItemStack.class.getDeclaredField("handle"); handle.setAccessible(true); - net.minecraft.server.v1_9_R1.ItemStack mis = (net.minecraft.server.v1_9_R1.ItemStack) handle.get(cis); + net.minecraft.server.v1_9_R2.ItemStack mis = (net.minecraft.server.v1_9_R2.ItemStack) handle.get(cis); return mis; } catch (NoSuchFieldException e1) { // TODO Auto-generated catch block