diff --git a/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java index 9ebba87..9f63344 100644 --- a/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R1/src/main/java/de/studiocode/inventoryaccess/r1/util/ItemUtilsImpl.java @@ -12,14 +12,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -30,12 +27,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream out, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound nbt = nmsStack.save(new NBTTagCompound()); if (compressed) { @@ -46,7 +38,7 @@ public class ItemUtilsImpl implements ItemUtils { } out.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java index 07463a4..805ddd8 100644 --- a/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R2/src/main/java/de/studiocode/inventoryaccess/r2/util/ItemUtilsImpl.java @@ -12,14 +12,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -30,12 +27,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream out, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound nbt = nmsStack.save(new NBTTagCompound()); if (compressed) { @@ -46,7 +38,7 @@ public class ItemUtilsImpl implements ItemUtils { } out.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java index 18256cb..6fe4573 100644 --- a/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R3/src/main/java/de/studiocode/inventoryaccess/r3/util/ItemUtilsImpl.java @@ -12,14 +12,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -30,12 +27,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream out, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound nbt = nmsStack.save(new NBTTagCompound()); if (compressed) { @@ -46,7 +38,7 @@ public class ItemUtilsImpl implements ItemUtils { } out.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java index 13ef22c..121a165 100644 --- a/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R4/src/main/java/de/studiocode/inventoryaccess/r4/util/ItemUtilsImpl.java @@ -12,14 +12,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -30,12 +27,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream out, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound nbt = nmsStack.save(new NBTTagCompound()); if (compressed) { @@ -46,7 +38,7 @@ public class ItemUtilsImpl implements ItemUtils { } out.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java index 094df4e..6097a64 100644 --- a/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R5/src/main/java/de/studiocode/inventoryaccess/r5/util/ItemUtilsImpl.java @@ -13,14 +13,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -31,12 +28,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream out, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound nbt = nmsStack.save(new NBTTagCompound()); if (compressed) { @@ -47,7 +39,7 @@ public class ItemUtilsImpl implements ItemUtils { } out.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java index 1faf146..2d2e684 100644 --- a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/ItemUtilsImpl.java @@ -13,14 +13,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -31,12 +28,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream outputStream, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); CompoundTag nbt = nmsStack.save(new CompoundTag()); if (compressed) { @@ -47,7 +39,7 @@ public class ItemUtilsImpl implements ItemUtils { } outputStream.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java index e3ec61a..e54a470 100644 --- a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/ItemUtilsImpl.java @@ -13,14 +13,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -31,12 +28,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream outputStream, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); CompoundTag nbt = nmsStack.save(new CompoundTag()); if (compressed) { @@ -47,7 +39,7 @@ public class ItemUtilsImpl implements ItemUtils { } outputStream.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } } diff --git a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/ItemUtilsImpl.java b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/ItemUtilsImpl.java index 4b48111..f7b801e 100644 --- a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/ItemUtilsImpl.java +++ b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/ItemUtilsImpl.java @@ -13,14 +13,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; public class ItemUtilsImpl implements ItemUtils { - private static final Field CRAFT_ITEM_STACK_HANDLE_FIELD = ReflectionUtils.getField(CraftItemStack.class, true, "handle"); - @Override public byte[] serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, boolean compressed) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -31,12 +28,7 @@ public class ItemUtilsImpl implements ItemUtils { @Override public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack, @NotNull OutputStream outputStream, boolean compressed) { try { - ItemStack nmsStack; - - if (itemStack instanceof CraftItemStack) - nmsStack = (ItemStack) CRAFT_ITEM_STACK_HANDLE_FIELD.get(itemStack); - else nmsStack = CraftItemStack.asNMSCopy(itemStack); - + ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); CompoundTag nbt = nmsStack.save(new CompoundTag()); if (compressed) { @@ -47,7 +39,7 @@ public class ItemUtilsImpl implements ItemUtils { } outputStream.flush(); - } catch (IllegalAccessException | IOException e) { + } catch (IOException e) { e.printStackTrace(); } }