Skip to content

Updated NMS classes to v1_9_R2 to support MC 1.9.4 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AaronMcHale wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated NMS classes to v1_9_R2 to support MC 1.9.4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Tux2/TuxTwoLib/SpawnEggs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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();
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Tux2/TuxTwoLib/TuxTwoInventoryPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Tux2/TuxTwoLib/TuxTwoLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Tux2/TuxTwoLib/TuxTwoListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/Tux2/TuxTwoLib/TuxTwoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions src/Tux2/TuxTwoLib/TuxTwoPlayerHead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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();
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tux2/TuxTwoLib/attributes/Attribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
24 changes: 12 additions & 12 deletions src/Tux2/TuxTwoLib/attributes/Attributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -85,7 +85,7 @@ public static ItemStack apply(ItemStack original, Collection<? extends Attribute
return original;
}
try {
net.minecraft.server.v1_9_R1.ItemStack stack = getMinecraftItemStack(original);
net.minecraft.server.v1_9_R2.ItemStack stack = getMinecraftItemStack(original);
NBTTagCompound tag = stack.getTag();
if(tag == null) {
tag = new NBTTagCompound();
Expand Down Expand Up @@ -121,7 +121,7 @@ public static ItemStack apply(ItemStack original, Collection<? extends Attribute

public static ArrayList<Attribute> 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<Attribute>();
}
Expand All @@ -145,7 +145,7 @@ public static ArrayList<Attribute> 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());
Expand All @@ -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());
}
Expand All @@ -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
Expand Down