Updated to CraftBukkit 1.9

This commit is contained in:
ShadowRanger 2016-03-04 13:45:54 +11:00
parent c4a9cb0a4a
commit 71ac05ae85
17 changed files with 115 additions and 72 deletions

View file

@ -13,6 +13,7 @@ import org.bukkit.configuration.file.FileConfiguration;
import com.lishid.openinv.utils.UUIDUtil; import com.lishid.openinv.utils.UUIDUtil;
public class ConfigUpdater { public class ConfigUpdater {
private final OpenInv plugin; private final OpenInv plugin;
private static final int CONFIG_VERSION = 2; private static final int CONFIG_VERSION = 2;
@ -33,8 +34,7 @@ public class ConfigUpdater {
if (isConfigOutdated()) { if (isConfigOutdated()) {
plugin.getLogger().info("[Config] Update found! Performing update..."); plugin.getLogger().info("[Config] Update found! Performing update...");
performUpdate(); performUpdate();
} } else {
else {
plugin.getLogger().info("[Config] Update not required."); plugin.getLogger().info("[Config] Update not required.");
} }
} }
@ -137,6 +137,7 @@ public class ConfigUpdater {
for (String playerName : keys) { for (String playerName : keys) {
UUID uuid = UUIDUtil.getUUIDOf(playerName); UUID uuid = UUIDUtil.getUUIDOf(playerName);
if (uuid != null) { if (uuid != null) {
boolean toggled = section.getBoolean(playerName + ".toggle", false); boolean toggled = section.getBoolean(playerName + ".toggle", false);
toggles.put(uuid, toggled); toggles.put(uuid, toggled);
@ -152,9 +153,11 @@ public class ConfigUpdater {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private Material getMaterialById(int id) { private Material getMaterialById(int id) {
Material material = Material.getMaterial(id); Material material = Material.getMaterial(id);
if (material == null) { if (material == null) {
material = Material.STICK; material = Material.STICK;
} }
return material; return material;
} }
} }

View file

@ -45,12 +45,8 @@ import com.lishid.openinv.listeners.OpenInvEntityListener;
import com.lishid.openinv.listeners.OpenInvInventoryListener; import com.lishid.openinv.listeners.OpenInvInventoryListener;
import com.lishid.openinv.listeners.OpenInvPlayerListener; import com.lishid.openinv.listeners.OpenInvPlayerListener;
/**
* Open other player's inventory
*
* @author lishid
*/
public class OpenInv extends JavaPlugin { public class OpenInv extends JavaPlugin {
public static final Map<UUID, SpecialPlayerInventory> inventories = new HashMap<UUID, SpecialPlayerInventory>(); public static final Map<UUID, SpecialPlayerInventory> inventories = new HashMap<UUID, SpecialPlayerInventory>();
public static final Map<UUID, SpecialEnderChest> enderChests = new HashMap<UUID, SpecialEnderChest>(); public static final Map<UUID, SpecialEnderChest> enderChests = new HashMap<UUID, SpecialEnderChest>();
@ -114,11 +110,11 @@ public class OpenInv extends JavaPlugin {
public static Object getFromConfig(String path, Object defaultValue) { public static Object getFromConfig(String path, Object defaultValue) {
Object val = mainPlugin.getConfig().get(path); Object val = mainPlugin.getConfig().get(path);
if (val == null) { if (val == null) {
mainPlugin.getConfig().set(path, defaultValue); mainPlugin.getConfig().set(path, defaultValue);
return defaultValue; return defaultValue;
} } else {
else {
return val; return val;
} }
} }
@ -216,12 +212,15 @@ public class OpenInv extends JavaPlugin {
public static boolean hasPermission(Permissible player, String permission) { public static boolean hasPermission(Permissible player, String permission) {
String[] parts = permission.split("\\."); String[] parts = permission.split("\\.");
String perm = ""; String perm = "";
for (int i = 0; i < parts.length; i++) { for (int i = 0; i < parts.length; i++) {
if (player.hasPermission(perm + "*")) { if (player.hasPermission(perm + "*")) {
return true; return true;
} }
perm += parts[i] + "."; perm += parts[i] + ".";
} }
return player.hasPermission(permission); return player.hasPermission(permission);
} }
} }

View file

@ -26,6 +26,7 @@ import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class AnyChestCommand implements CommandExecutor { public class AnyChestCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equalsIgnoreCase("anychest")) { if (command.getName().equalsIgnoreCase("anychest")) {

View file

@ -33,6 +33,7 @@ import com.lishid.openinv.internal.SpecialEnderChest;
import com.lishid.openinv.utils.UUIDUtil; import com.lishid.openinv.utils.UUIDUtil;
public class OpenEnderCommand implements CommandExecutor { public class OpenEnderCommand implements CommandExecutor {
private final OpenInv plugin; private final OpenInv plugin;
private final Map<UUID, UUID> openEnderHistory = new ConcurrentHashMap<UUID, UUID>(); private final Map<UUID, UUID> openEnderHistory = new ConcurrentHashMap<UUID, UUID>();
@ -73,8 +74,7 @@ public class OpenEnderCommand implements CommandExecutor {
if (args.length < 1) { if (args.length < 1) {
if (history != null) { if (history != null) {
uuid = history; uuid = history;
} } else {
else {
sender.sendMessage(ChatColor.RED + "OpenEnder history is empty!"); sender.sendMessage(ChatColor.RED + "OpenEnder history is empty!");
return true; return true;
} }
@ -111,6 +111,7 @@ public class OpenEnderCommand implements CommandExecutor {
if (player == null) { if (player == null) {
return; return;
} }
openInventory(player, target); openInventory(player, target);
} }
}); });

View file

@ -33,6 +33,7 @@ import com.lishid.openinv.internal.SpecialPlayerInventory;
import com.lishid.openinv.utils.UUIDUtil; import com.lishid.openinv.utils.UUIDUtil;
public class OpenInvCommand implements CommandExecutor { public class OpenInvCommand implements CommandExecutor {
private final OpenInv plugin; private final OpenInv plugin;
private final Map<UUID, UUID> openInvHistory = new ConcurrentHashMap<UUID, UUID>(); private final Map<UUID, UUID> openInvHistory = new ConcurrentHashMap<UUID, UUID>();

View file

@ -12,6 +12,7 @@ import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class SearchEnderCommand implements CommandExecutor { public class SearchEnderCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equalsIgnoreCase("searchender")) { if (command.getName().equalsIgnoreCase("searchender")) {
@ -30,11 +31,11 @@ public class SearchEnderCommand implements CommandExecutor {
gData = args[0].split(":"); gData = args[0].split(":");
material = Material.matchMaterial(gData[0]); material = Material.matchMaterial(gData[0]);
} }
if (args.length >= 2) { if (args.length >= 2) {
try { try {
count = Integer.parseInt(args[1]); count = Integer.parseInt(args[1]);
} } catch (NumberFormatException e) {
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!"); sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!");
return false; return false;
} }

View file

@ -28,6 +28,7 @@ import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class SearchInvCommand implements CommandExecutor { public class SearchInvCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equalsIgnoreCase("searchinv")) { if (command.getName().equalsIgnoreCase("searchinv")) {
@ -46,11 +47,11 @@ public class SearchInvCommand implements CommandExecutor {
gData = args[0].split(":"); gData = args[0].split(":");
material = Material.matchMaterial(gData[0]); material = Material.matchMaterial(gData[0]);
} }
if (args.length >= 2) { if (args.length >= 2) {
try { try {
count = Integer.parseInt(args[1]); count = Integer.parseInt(args[1]);
} } catch (NumberFormatException e) {
catch (NumberFormatException ex) {
sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!"); sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!");
return false; return false;
} }

View file

@ -26,6 +26,7 @@ import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class SilentChestCommand implements CommandExecutor { public class SilentChestCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equalsIgnoreCase("silentchest")) { if (command.getName().equalsIgnoreCase("silentchest")) {

View file

@ -26,6 +26,7 @@ import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class ToggleOpenInvCommand implements CommandExecutor { public class ToggleOpenInvCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (command.getName().equalsIgnoreCase("toggleopeninv")) { if (command.getName().equalsIgnoreCase("toggleopeninv")) {

View file

@ -29,6 +29,7 @@ import net.minecraft.server.v1_9_R1.BlockChest.Type;
import org.bukkit.craftbukkit.v1_9_R1.entity.*; import org.bukkit.craftbukkit.v1_9_R1.entity.*;
public class AnySilentChest { public class AnySilentChest {
public boolean isAnyChestNeeded(Player p, int x, int y, int z) { public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
BlockPosition position = new BlockPosition(x, y, z); BlockPosition position = new BlockPosition(x, y, z);
@ -37,16 +38,17 @@ public class AnySilentChest {
BlockChest chest = (BlockChest) (((BlockChest) world.getType(position).getBlock()).g == Type.TRAP ? BlockChest chest = (BlockChest) (((BlockChest) world.getType(position).getBlock()).g == Type.TRAP ?
Block.getByName("trapped_chest") : Block.getByName("chest")); Block.getByName("trapped_chest") : Block.getByName("chest"));
// If block on top // If a block is on top
if (topBlocking(world, position)) { if (topBlocking(world, position)) {
return true; return true;
} }
// If block next to chest is chest and has a block on top // If the block next to the chest is chest and has a block on top
for (EnumDirection direction : EnumDirectionList.HORIZONTAL) { for (EnumDirection direction : EnumDirectionList.HORIZONTAL) {
BlockPosition sidePosition = position.shift(direction); BlockPosition sidePosition = position.shift(direction);
Block var8 = world.getType(sidePosition).getBlock(); Block block = world.getType(sidePosition).getBlock();
if (var8 == chest) {
if (block == chest) {
if (this.topBlocking(world, sidePosition)) { if (this.topBlocking(world, sidePosition)) {
return true; return true;
} }
@ -55,6 +57,7 @@ public class AnySilentChest {
return false; return false;
} }
private boolean topBlocking(World world, BlockPosition position) { private boolean topBlocking(World world, BlockPosition position) {
return this.blockOnTop(world, position) || this.ocelotOnTop(world, position); return this.blockOnTop(world, position) || this.ocelotOnTop(world, position);
} }
@ -65,20 +68,22 @@ public class AnySilentChest {
} }
private boolean ocelotOnTop(World world, BlockPosition position) { private boolean ocelotOnTop(World world, BlockPosition position) {
Iterator var3 = world.a(EntityOcelot.class, Iterator iterator = world.a(EntityOcelot.class,
new AxisAlignedBB((double) position.getX(), (double) (position.getY() + 1), new AxisAlignedBB((double) position.getX(), (double) (position.getY() + 1),
(double) position.getZ(), (double) (position.getX() + 1), (double) position.getZ(), (double) (position.getX() + 1),
(double) (position.getY() + 2), (double) (position.getZ() + 1))).iterator(); (double) (position.getY() + 2), (double) (position.getZ() + 1))).iterator();
EntityOcelot var5; EntityOcelot entityOcelot;
do { do {
if (!var3.hasNext()) { if (!iterator.hasNext()) {
return false; return false;
} }
Entity var4 = (Entity) var3.next(); Entity entity = (Entity) iterator.next();
var5 = (EntityOcelot) var4;
} while (!var5.isSitting()); entityOcelot = (EntityOcelot) entity;
} while (!entityOcelot.isSitting());
return true; return true;
} }
@ -107,12 +112,14 @@ public class AnySilentChest {
for (EnumDirection direction : EnumDirectionList.HORIZONTAL) { for (EnumDirection direction : EnumDirectionList.HORIZONTAL) {
BlockPosition side = position.shift(direction); BlockPosition side = position.shift(direction);
Block block = world.getType(side).getBlock(); Block block = world.getType(side).getBlock();
if (block == chest) { if (block == chest) {
if (!anyChest && this.topBlocking(world, side)) { if (!anyChest && this.topBlocking(world, side)) {
return true; return true;
} }
TileEntity sideTileEntity = world.getTileEntity(side); TileEntity sideTileEntity = world.getTileEntity(side);
if (sideTileEntity instanceof TileEntityChest) { if (sideTileEntity instanceof TileEntityChest) {
if (direction != EnumDirection.WEST && direction != EnumDirection.NORTH) { if (direction != EnumDirection.WEST && direction != EnumDirection.NORTH) {
tileInventory = new InventoryLargeChest("container.chestDouble", tileInventory, (TileEntityChest) sideTileEntity); tileInventory = new InventoryLargeChest("container.chestDouble", tileInventory, (TileEntityChest) sideTileEntity);
@ -124,11 +131,14 @@ public class AnySilentChest {
} }
boolean returnValue = true; boolean returnValue = true;
if (silentChest) { if (silentChest) {
tileInventory = new SilentInventory(tileInventory); tileInventory = new SilentInventory(tileInventory);
if (OpenInv.notifySilentChest()) { if (OpenInv.notifySilentChest()) {
OpenInv.sendMessage(p, "You are opening a chest silently."); OpenInv.sendMessage(p, "You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }

View file

@ -8,6 +8,7 @@ import net.minecraft.server.v1_9_R1.EnumDirection;
import net.minecraft.server.v1_9_R1.EnumDirection.EnumDirectionLimit; import net.minecraft.server.v1_9_R1.EnumDirection.EnumDirectionLimit;
public enum EnumDirectionList implements Iterable<EnumDirection> { public enum EnumDirectionList implements Iterable<EnumDirection> {
HORIZONTAL(EnumDirectionLimit.HORIZONTAL), HORIZONTAL(EnumDirectionLimit.HORIZONTAL),
VERTICAL(EnumDirectionLimit.VERTICAL); VERTICAL(EnumDirectionLimit.VERTICAL);

View file

@ -30,6 +30,7 @@ import net.minecraft.server.v1_9_R1.*;
import org.bukkit.craftbukkit.v1_9_R1.inventory.*; import org.bukkit.craftbukkit.v1_9_R1.inventory.*;
public class InventoryAccess { public class InventoryAccess {
public boolean check(Inventory inventory, HumanEntity player) { public boolean check(Inventory inventory, HumanEntity player) {
IInventory inv = grabInventory(inventory); IInventory inv = grabInventory(inventory);
@ -62,12 +63,12 @@ public class InventoryAccess {
if (IInventory.class.isAssignableFrom(f.getDeclaringClass())) { if (IInventory.class.isAssignableFrom(f.getDeclaringClass())) {
try { try {
result = (IInventory) f.get(inventory); result = (IInventory) f.get(inventory);
} } catch (Exception e) {
catch (Exception e) {
OpenInv.log(e); OpenInv.log(e);
} }
} }
} }
return result; return result;
} }
} }

View file

@ -31,12 +31,14 @@ import net.minecraft.server.v1_9_R1.*;
import org.bukkit.craftbukkit.v1_9_R1.*; import org.bukkit.craftbukkit.v1_9_R1.*;
public class PlayerDataManager { public class PlayerDataManager {
public Player loadPlayer(UUID uuid) { public Player loadPlayer(UUID uuid) {
try { try {
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
if (player == null || !player.hasPlayedBefore()) { if (player == null || !player.hasPlayedBefore()) {
return null; return null;
} }
GameProfile profile = new GameProfile(uuid, player.getName()); GameProfile profile = new GameProfile(uuid, player.getName());
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer(); MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data // Create an entity to load the player data
@ -44,14 +46,15 @@ public class PlayerDataManager {
// Get the bukkit entity // Get the bukkit entity
Player target = entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} } catch (Exception e) {
catch (Exception e) {
OpenInv.log(e); OpenInv.log(e);
} }

View file

@ -20,6 +20,7 @@ package com.lishid.openinv.internal;
import net.minecraft.server.v1_9_R1.*; import net.minecraft.server.v1_9_R1.*;
public class SilentContainerChest extends ContainerChest { public class SilentContainerChest extends ContainerChest {
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman human) { public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman human) {

View file

@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder;
import net.minecraft.server.v1_9_R1.*; import net.minecraft.server.v1_9_R1.*;
public class SilentInventory implements ITileInventory { public class SilentInventory implements ITileInventory {
public ITileInventory inv; public ITileInventory inv;
public SilentInventory(ITileInventory inv) { public SilentInventory(ITileInventory inv) {

View file

@ -29,6 +29,7 @@ import org.bukkit.craftbukkit.v1_9_R1.entity.*;
import org.bukkit.craftbukkit.v1_9_R1.inventory.*; import org.bukkit.craftbukkit.v1_9_R1.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer { public class SpecialEnderChest extends InventorySubcontainer {
private final CraftInventory inventory = new CraftInventory(this); private final CraftInventory inventory = new CraftInventory(this);
private final InventoryEnderChest enderChest; private final InventoryEnderChest enderChest;
private final CraftPlayer owner; private final CraftPlayer owner;

View file

@ -16,40 +16,67 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import java.lang.reflect.Field;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import com.lishid.openinv.OpenInv;
// Volatile // Volatile
import net.minecraft.server.v1_9_R1.*; import net.minecraft.server.v1_9_R1.*;
import org.bukkit.craftbukkit.v1_9_R1.entity.*; import org.bukkit.craftbukkit.v1_9_R1.entity.*;
import org.bukkit.craftbukkit.v1_9_R1.inventory.*; import org.bukkit.craftbukkit.v1_9_R1.inventory.*;
/* import com.lishid.openinv.OpenInv;
* -----------------------------------------------
* This class still needs to be updated for 1.9.
*
* It has been partially updated, but is very buggy
* and does not work correctly.
* -----------------------------------------------
*/
public class SpecialPlayerInventory extends PlayerInventory { public class SpecialPlayerInventory extends PlayerInventory {
private final CraftInventory inventory = new CraftInventory(this); private final CraftInventory inventory = new CraftInventory(this);
private final ItemStack[] extra = new ItemStack[5]; private final ItemStack[] extra = new ItemStack[5];
private final ItemStack[][] g; private final ItemStack[][] arrays;
private final CraftPlayer owner; private final CraftPlayer owner;
private boolean playerOnline; private boolean playerOnline;
public SpecialPlayerInventory(Player p, boolean online) { public SpecialPlayerInventory(Player p, boolean online) {
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = (CraftPlayer) p; this.owner = (CraftPlayer) p;
System.arraycopy(player.inventory.items, 0, this.items, 0, this.items.length); // applyContents();
System.arraycopy(player.inventory.armor, 0, this.armor, 0, this.armor.length); reflectContents(getClass().getSuperclass(), player.inventory, this);
this.g = new ItemStack[][]{this.items, this.armor, this.extra}; this.arrays = new ItemStack[][] { this.items, this.armor, this.extra };
this.playerOnline = online; this.playerOnline = online;
// OpenInv.inventories.put(owner.getUniqueId(), this); OpenInv.inventories.put(owner.getUniqueId(), this);
}
private void reflectContents(Class clazz, PlayerInventory src, PlayerInventory dest) {
// Items
try {
Field itemsField = clazz.getDeclaredField("items");
itemsField.setAccessible(true);
itemsField.set(dest, src.items);
} catch (NoSuchFieldException e) {
e.printStackTrace();
} catch (SecurityException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
// Armor
try {
Field armorField = clazz.getDeclaredField("armor");
armorField.setAccessible(true);
armorField.set(dest, src.armor);
} catch (NoSuchFieldException e) {
e.printStackTrace();
} catch (SecurityException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
} }
public Inventory getBukkitInventory() { public Inventory getBukkitInventory() {
@ -57,19 +84,14 @@ public class SpecialPlayerInventory extends PlayerInventory {
} }
private void saveOnExit() { private void saveOnExit() {
if (playerOnline) {
linkInventory(player.inventory);
}
if (transaction.isEmpty() && !playerOnline) { if (transaction.isEmpty() && !playerOnline) {
owner.saveData(); owner.saveData();
// OpenInv.inventories.remove(owner.getUniqueId()); OpenInv.inventories.remove(owner.getUniqueId());
} }
} }
private void linkInventory(PlayerInventory inventory) { private void linkInventory(PlayerInventory inventory) {
System.arraycopy(this.items, 0, inventory.items, 0, inventory.items.length); reflectContents(inventory.getClass(), inventory, this);
System.arraycopy(this.armor, 0, inventory.armor, 0, inventory.armor.length);
} }
public void playerOnline(Player player) { public void playerOnline(Player player) {
@ -104,17 +126,18 @@ public class SpecialPlayerInventory extends PlayerInventory {
@Override @Override
public int getSize() { public int getSize() {
return super.getSize() + 5; // super.getSize() - this.extraSlots.length + 5; return super.getSize() - this.extraSlots.length + 5;
} }
@Override @Override
public ItemStack getItem(int i) { public ItemStack getItem(int i) {
ItemStack[] is = null; ItemStack[] is = null;
ItemStack[][] contents = this.g; ItemStack[][] contents = this.arrays;
int j = contents.length; int j = contents.length;
for (int k = 0; k < j; ++k) { for (int k = 0; k < j; ++k) {
ItemStack[] is2 = contents[k]; ItemStack[] is2 = contents[k];
if (i < is2.length) { if (i < is2.length) {
is = is2; is = is2;
break; break;
@ -137,11 +160,12 @@ public class SpecialPlayerInventory extends PlayerInventory {
@Override @Override
public ItemStack splitStack(int i, int j) { public ItemStack splitStack(int i, int j) {
ItemStack[] is = null; ItemStack[] is = null;
ItemStack[][] contents = this.g; ItemStack[][] contents = this.arrays;
int k = contents.length; int k = contents.length;
for (int l = 0; l < k; ++l) { for (int l = 0; l < k; ++l) {
ItemStack[] is2 = contents[l]; ItemStack[] is2 = contents[l];
if (i < is2.length) { if (i < is2.length) {
is = is2; is = is2;
break; break;
@ -164,11 +188,12 @@ public class SpecialPlayerInventory extends PlayerInventory {
@Override @Override
public ItemStack splitWithoutUpdate(int i) { public ItemStack splitWithoutUpdate(int i) {
ItemStack[] is = null; ItemStack[] is = null;
ItemStack[][] contents = this.g; ItemStack[][] contents = this.arrays;
int j = contents.length; int j = contents.length;
for (int object = 0; object < j; ++object) { for (int object = 0; object < j; ++object) {
ItemStack[] is2 = contents[object]; ItemStack[] is2 = contents[object];
if (i < is2.length) { if (i < is2.length) {
is = is2; is = is2;
break; break;
@ -177,7 +202,6 @@ public class SpecialPlayerInventory extends PlayerInventory {
i -= is2.length; i -= is2.length;
} }
if (is != null && is[i] != null) { if (is != null && is[i] != null) {
if (is == this.items) { if (is == this.items) {
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
@ -198,11 +222,12 @@ public class SpecialPlayerInventory extends PlayerInventory {
@Override @Override
public void setItem(int i, ItemStack itemStack) { public void setItem(int i, ItemStack itemStack) {
ItemStack[] is = null; ItemStack[] is = null;
ItemStack[][] contents = this.g; ItemStack[][] contents = this.arrays;
int j = contents.length; int j = contents.length;
for (int k = 0; k < j; ++k) { for (int k = 0; k < j; ++k) {
ItemStack[] is2 = contents[k]; ItemStack[] is2 = contents[k];
if (i < is2.length) { if (i < is2.length) {
is = is2; is = is2;
break; break;
@ -223,28 +248,19 @@ public class SpecialPlayerInventory extends PlayerInventory {
is[i] = itemStack; is[i] = itemStack;
// owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
} }
private int getReversedItemSlotNum(int i) { private int getReversedItemSlotNum(int i) {
if (i >= 27) return (i >= 27) ? (i - 27) : (i + 9);
return i - 27;
else
return i + 9;
} }
private int getReversedArmorSlotNum(int i) { private int getReversedArmorSlotNum(int i) {
if (i == 0) if (i == 0) return 3;
return 3; if (i == 1) return 2;
if (i == 1) if (i == 2) return 1;
return 2; return (i == 3) ? 0 : i;
if (i == 2)
return 1;
if (i == 3)
return 0;
else
return i;
} }
@Override @Override