From 5f87949e0b5a6b8a7efae145be68b2708773f329 Mon Sep 17 00:00:00 2001 From: lishid Date: Tue, 19 Mar 2013 10:36:56 -0400 Subject: [PATCH] Update to 1.5_R1 --- .../lishid/openinv/OpenInvPlayerListener.java | 2 - .../commands/OpenEnderPluginCommand.java | 2 - .../commands/OpenInvPluginCommand.java | 2 - .../craftbukkit/SpecialEnderChest.java | 4 +- .../craftbukkit/SpecialPlayerInventory.java | 4 +- .../internal/v1_4_5/SpecialEnderChest.java | 4 +- .../v1_4_5/SpecialPlayerInventory.java | 4 +- .../internal/v1_4_6/SpecialEnderChest.java | 4 +- .../v1_4_6/SpecialPlayerInventory.java | 4 +- .../internal/v1_4_R1/AnySilentChest.java | 125 ++++++++ .../internal/v1_4_R1/InventoryAccess.java | 53 ++++ .../internal/v1_4_R1/PlayerDataManager.java | 110 +++++++ .../v1_4_R1/SilentContainerChest.java | 39 +++ .../internal/v1_4_R1/SpecialEnderChest.java | 148 +++++++++ .../v1_4_R1/SpecialPlayerInventory.java | 297 ++++++++++++++++++ .../internal/v1_5_R1/AnySilentChest.java | 125 ++++++++ .../internal/v1_5_R1/InventoryAccess.java | 53 ++++ .../internal/v1_5_R1/PlayerDataManager.java | 110 +++++++ .../v1_5_R1/SilentContainerChest.java | 39 +++ .../internal/v1_5_R1/SpecialEnderChest.java | 148 +++++++++ .../v1_5_R1/SpecialPlayerInventory.java | 297 ++++++++++++++++++ src/com/lishid/openinv/utils/Metrics.java | 21 +- .../lishid/openinv/utils/UpdateManager.java | 2 +- src/plugin.yml | 2 +- 24 files changed, 1575 insertions(+), 24 deletions(-) create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/AnySilentChest.java create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java create mode 100644 src/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/AnySilentChest.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/InventoryAccess.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/PlayerDataManager.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/SilentContainerChest.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/SpecialEnderChest.java create mode 100644 src/com/lishid/openinv/internal/v1_5_R1/SpecialPlayerInventory.java diff --git a/src/com/lishid/openinv/OpenInvPlayerListener.java b/src/com/lishid/openinv/OpenInvPlayerListener.java index a197d7d..f55dcec 100644 --- a/src/com/lishid/openinv/OpenInvPlayerListener.java +++ b/src/com/lishid/openinv/OpenInvPlayerListener.java @@ -59,13 +59,11 @@ public class OpenInvPlayerListener implements Listener if (inventory != null) { inventory.PlayerGoOffline(); - inventory.InventoryRemovalCheck(); } ISpecialEnderChest chest = OpenInv.enderChests.get(event.getPlayer().getName().toLowerCase()); if (chest != null) { chest.PlayerGoOffline(); - chest.InventoryRemovalCheck(); } } diff --git a/src/com/lishid/openinv/commands/OpenEnderPluginCommand.java b/src/com/lishid/openinv/commands/OpenEnderPluginCommand.java index f494284..2b7a85f 100644 --- a/src/com/lishid/openinv/commands/OpenEnderPluginCommand.java +++ b/src/com/lishid/openinv/commands/OpenEnderPluginCommand.java @@ -117,8 +117,6 @@ public class OpenEnderPluginCommand implements CommandExecutor if (chest == null) { chest = InternalAccessor.Instance.newSpecialEnderChest(target, !offline); - - OpenInv.enderChests.put(target.getName().toLowerCase(), chest); } // Open the inventory diff --git a/src/com/lishid/openinv/commands/OpenInvPluginCommand.java b/src/com/lishid/openinv/commands/OpenInvPluginCommand.java index 9ef100e..cbceaa2 100644 --- a/src/com/lishid/openinv/commands/OpenInvPluginCommand.java +++ b/src/com/lishid/openinv/commands/OpenInvPluginCommand.java @@ -132,8 +132,6 @@ public class OpenInvPluginCommand implements CommandExecutor if (inv == null) { inv = InternalAccessor.Instance.newSpecialPlayerInventory(target, !offline); - - OpenInv.inventories.put(target.getName().toLowerCase(), inv); } // Open the inventory diff --git a/src/com/lishid/openinv/internal/craftbukkit/SpecialEnderChest.java b/src/com/lishid/openinv/internal/craftbukkit/SpecialEnderChest.java index 9a36361..e4913c4 100644 --- a/src/com/lishid/openinv/internal/craftbukkit/SpecialEnderChest.java +++ b/src/com/lishid/openinv/internal/craftbukkit/SpecialEnderChest.java @@ -49,6 +49,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento this.enderChest = player.getHandle().getEnderChest(); this.owner = player; this.items = enderChest.getContents(); + OpenInv.enderChests.put(owner.getName().toLowerCase(), this); } public Inventory getBukkitInventory() @@ -58,9 +59,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.enderChests.remove(owner.getName().toLowerCase()); } } @@ -102,6 +103,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void onClose(CraftHumanEntity who) { transaction.remove(who); + this.InventoryRemovalCheck(); } public List getViewers() diff --git a/src/com/lishid/openinv/internal/craftbukkit/SpecialPlayerInventory.java b/src/com/lishid/openinv/internal/craftbukkit/SpecialPlayerInventory.java index c9f1d70..48f278a 100644 --- a/src/com/lishid/openinv/internal/craftbukkit/SpecialPlayerInventory.java +++ b/src/com/lishid/openinv/internal/craftbukkit/SpecialPlayerInventory.java @@ -41,6 +41,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP this.playerOnline = online; this.items = player.inventory.items; this.armor = player.inventory.armor; + OpenInv.inventories.put(owner.getName().toLowerCase(), this); } @Override @@ -52,9 +53,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP @Override public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.inventories.remove(owner.getName().toLowerCase()); } } @@ -76,6 +77,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP public void PlayerGoOffline() { playerOnline = false; + this.InventoryRemovalCheck(); } @Override diff --git a/src/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java b/src/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java index e114941..75face2 100644 --- a/src/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java +++ b/src/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java @@ -49,6 +49,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento this.enderChest = player.getHandle().getEnderChest(); this.owner = player; this.items = enderChest.getContents(); + OpenInv.enderChests.put(owner.getName().toLowerCase(), this); } public Inventory getBukkitInventory() @@ -58,9 +59,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.enderChests.remove(owner.getName().toLowerCase()); } } @@ -102,6 +103,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void onClose(CraftHumanEntity who) { transaction.remove(who); + this.InventoryRemovalCheck(); } public List getViewers() diff --git a/src/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java b/src/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java index f888014..eeb4a7d 100644 --- a/src/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java +++ b/src/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java @@ -41,6 +41,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP this.playerOnline = online; this.items = player.inventory.items; this.armor = player.inventory.armor; + OpenInv.inventories.put(owner.getName().toLowerCase(), this); } @Override @@ -52,9 +53,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP @Override public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.inventories.remove(owner.getName().toLowerCase()); } } @@ -76,6 +77,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP public void PlayerGoOffline() { playerOnline = false; + this.InventoryRemovalCheck(); } @Override diff --git a/src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java b/src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java index 031f015..c670dd9 100644 --- a/src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java +++ b/src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java @@ -49,6 +49,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento this.enderChest = player.getHandle().getEnderChest(); this.owner = player; this.items = enderChest.getContents(); + OpenInv.enderChests.put(owner.getName().toLowerCase(), this); } public Inventory getBukkitInventory() @@ -58,9 +59,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.enderChests.remove(owner.getName().toLowerCase()); } } @@ -102,6 +103,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento public void onClose(CraftHumanEntity who) { transaction.remove(who); + this.InventoryRemovalCheck(); } public List getViewers() diff --git a/src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java b/src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java index 7ba25f2..d58c8dd 100644 --- a/src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java +++ b/src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java @@ -41,6 +41,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP this.playerOnline = online; this.items = player.inventory.items; this.armor = player.inventory.armor; + OpenInv.inventories.put(owner.getName().toLowerCase(), this); } @Override @@ -52,9 +53,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP @Override public void InventoryRemovalCheck() { + owner.saveData(); if (transaction.isEmpty() && !playerOnline) { - owner.saveData(); OpenInv.inventories.remove(owner.getName().toLowerCase()); } } @@ -76,6 +77,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP public void PlayerGoOffline() { playerOnline = false; + this.InventoryRemovalCheck(); } @Override diff --git a/src/com/lishid/openinv/internal/v1_4_R1/AnySilentChest.java b/src/com/lishid/openinv/internal/v1_4_R1/AnySilentChest.java new file mode 100644 index 0000000..bceb1c9 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/AnySilentChest.java @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +import java.lang.reflect.Field; + +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +import com.lishid.openinv.internal.IAnySilentChest; + +//Volatile +import net.minecraft.server.v1_4_R1.*; +import org.bukkit.craftbukkit.v1_4_R1.entity.*; + +public class AnySilentChest implements IAnySilentChest +{ + public boolean IsAnyChestNeeded(Player p, int x, int y, int z) + { + // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest + EntityPlayer player = ((CraftPlayer) p).getHandle(); + World world = player.world; + // If block on top + if (world.s(x, y + 1, z)) + return true; + + // If block next to chest is chest and has a block on top + if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) + return true; + if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z))) + return true; + if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1))) + return true; + if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1))) + return true; + + return false; + } + + public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) + { + EntityPlayer player = ((CraftPlayer) p).getHandle(); + World world = player.world; + Object chest = (TileEntityChest) world.getTileEntity(x, y, z); + if (chest == null) + return true; + + if (!anychest) + { + if (world.s(x, y + 1, z)) + return true; + if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) + return true; + if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.s(x + 1, y + 1, z))) + return true; + if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.s(x, y + 1, z - 1))) + return true; + if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.s(x, y + 1, z + 1))) + return true; + } + + if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest); + if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z)); + if (world.getTypeId(x, y, z - 1) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest); + if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); + + if (!silentchest) + { + player.openContainer((IInventory) chest); + } + else + { + try + { + int id = 0; + try + { + Field windowID = player.getClass().getDeclaredField("containerCounter"); + windowID.setAccessible(true); + id = windowID.getInt(player); + id = id % 100 + 1; + windowID.setInt(player, id); + } + catch (NoSuchFieldException e) + { + } + + player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize())); + player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); + player.activeContainer.windowId = id; + player.activeContainer.addSlotListener(player); + // event.getPlayer().sendMessage("You are opening a chest silently."); + return false; + } + catch (Exception e) + { + e.printStackTrace(); + p.sendMessage(ChatColor.RED + "Error while sending silent chest."); + } + } + + if (anychest) + p.sendMessage("You are opening a blocked chest."); + + return true; + } +} diff --git a/src/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java b/src/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java new file mode 100644 index 0000000..ec2e757 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.Inventory; + +import com.lishid.openinv.Permissions; +import com.lishid.openinv.internal.IInventoryAccess; + +//Volatile +import net.minecraft.server.v1_4_R1.*; +import org.bukkit.craftbukkit.v1_4_R1.inventory.*; + +public class InventoryAccess implements IInventoryAccess +{ + public boolean check(Inventory inventory, HumanEntity player) + { + IInventory inv = ((CraftInventory) inventory).getInventory(); + + if (inv instanceof SpecialPlayerInventory) + { + if (!player.hasPermission(Permissions.PERM_EDITINV)) + { + return false; + } + } + + else if (inv instanceof SpecialEnderChest) + { + if (!player.hasPermission(Permissions.PERM_EDITENDER)) + { + return false; + } + } + + return true; + } +} diff --git a/src/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java b/src/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java new file mode 100644 index 0000000..6210b29 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +import java.io.File; +import java.util.Arrays; +import java.util.Collection; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.IPlayerDataManager; + +//Volatile +import net.minecraft.server.v1_4_R1.*; +import org.bukkit.craftbukkit.v1_4_R1.*; + +public class PlayerDataManager implements IPlayerDataManager +{ + public Player loadPlayer(String name) + { + try + { + // Default player folder + File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); + if (!playerfolder.exists()) + { + return null; + } + + String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); + + if (playername == null) + { + return null; + } + + MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer(); + + // Create an entity to load the player data + EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername, new PlayerInteractManager(server.getWorldServer(0))); + + // Get the bukkit entity + Player target = (entity == null) ? null : entity.getBukkitEntity(); + if (target != null) + { + // Load data + target.loadData(); + // Return the entity + return target; + } + } + catch (Exception e) + { + OpenInv.log(e); + } + + return null; + } + + /** + * @author Balor (aka Antoine Aflalo) + */ + private static String matchUser(final Collection container, final String search) + { + String found = null; + if (search == null) + { + return found; + } + final String lowerSearch = search.toLowerCase(); + int delta = Integer.MAX_VALUE; + for (final File file : container) + { + final String filename = file.getName(); + final String str = filename.substring(0, filename.length() - 4); + if (!str.toLowerCase().startsWith(lowerSearch)) + { + continue; + } + final int curDelta = str.length() - lowerSearch.length(); + if (curDelta < delta) + { + found = str; + delta = curDelta; + } + if (curDelta == 0) + { + break; + } + + } + return found; + } +} diff --git a/src/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java b/src/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java new file mode 100644 index 0000000..1d7223d --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +//Volatile +import net.minecraft.server.v1_4_R1.*; + +public class SilentContainerChest extends ContainerChest +{ + public IInventory inv; + + public SilentContainerChest(IInventory i1, IInventory i2) + { + super(i1, i2); + inv = i2; + // close signal + inv.f(); + } + + @Override + public void b(EntityHuman paramEntityHuman) + { + // Don't send close signal twice, might screw up + } +} \ No newline at end of file diff --git a/src/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java b/src/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java new file mode 100644 index 0000000..e783e5b --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.ISpecialEnderChest; + +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; + +//Volatile +import net.minecraft.server.v1_4_R1.*; +import org.bukkit.craftbukkit.v1_4_R1.entity.*; +import org.bukkit.craftbukkit.v1_4_R1.inventory.*; + +public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest +{ + public List transaction = new ArrayList(); + public boolean playerOnline = false; + private CraftPlayer owner; + private InventoryEnderChest enderChest; + private int maxStack = MAX_STACK; + private CraftInventory inventory = new CraftInventory(this); + + public SpecialEnderChest(Player p, Boolean online) + { + super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); + CraftPlayer player = (CraftPlayer) p; + this.enderChest = player.getHandle().getEnderChest(); + this.owner = player; + this.items = enderChest.getContents(); + OpenInv.enderChests.put(owner.getName().toLowerCase(), this); + } + + public Inventory getBukkitInventory() + { + return inventory; + } + + public void InventoryRemovalCheck() + { + owner.saveData(); + if (transaction.isEmpty() && !playerOnline) + { + OpenInv.enderChests.remove(owner.getName().toLowerCase()); + } + } + + public void PlayerGoOnline(Player p) + { + if (!playerOnline) + { + try + { + InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); + Field field = playerEnderChest.getClass().getField("items"); + field.setAccessible(true); + field.set(playerEnderChest, this.items); + } + catch (Exception e) + { + } + p.saveData(); + playerOnline = true; + } + } + + public void PlayerGoOffline() + { + playerOnline = false; + } + + public ItemStack[] getContents() + { + return this.items; + } + + public void onOpen(CraftHumanEntity who) + { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) + { + transaction.remove(who); + this.InventoryRemovalCheck(); + } + + public List getViewers() + { + return transaction; + } + + public InventoryHolder getOwner() + { + return this.owner; + } + + public void setMaxStackSize(int size) + { + maxStack = size; + } + + public int getMaxStackSize() + { + return maxStack; + } + + public boolean a(EntityHuman entityhuman) + { + return true; + } + + public void startOpen() + { + + } + + public void f() + { + + } + + public void update() + { + enderChest.update(); + } +} diff --git a/src/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java b/src/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java new file mode 100644 index 0000000..f0cde95 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java @@ -0,0 +1,297 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_4_R1; + +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.ISpecialPlayerInventory; + +//Volatile +import net.minecraft.server.v1_4_R1.*; +import org.bukkit.craftbukkit.v1_4_R1.entity.*; +import org.bukkit.craftbukkit.v1_4_R1.inventory.*; + +public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory +{ + CraftPlayer owner; + public boolean playerOnline = false; + private ItemStack[] extra = new ItemStack[5]; + private CraftInventory inventory = new CraftInventory(this); + + public SpecialPlayerInventory(Player p, Boolean online) + { + super(((CraftPlayer) p).getHandle()); + this.owner = ((CraftPlayer) p); + this.playerOnline = online; + this.items = player.inventory.items; + this.armor = player.inventory.armor; + OpenInv.inventories.put(owner.getName().toLowerCase(), this); + } + + @Override + public Inventory getBukkitInventory() + { + return inventory; + } + + @Override + public void InventoryRemovalCheck() + { + owner.saveData(); + if (transaction.isEmpty() && !playerOnline) + { + OpenInv.inventories.remove(owner.getName().toLowerCase()); + } + } + + @Override + public void PlayerGoOnline(Player player) + { + if (!playerOnline) + { + CraftPlayer p = (CraftPlayer) player; + p.getHandle().inventory.items = this.items; + p.getHandle().inventory.armor = this.armor; + p.saveData(); + playerOnline = true; + } + } + + @Override + public void PlayerGoOffline() + { + playerOnline = false; + this.InventoryRemovalCheck(); + } + + @Override + public void onClose(CraftHumanEntity who) + { + super.onClose(who); + this.InventoryRemovalCheck(); + } + + @Override + public ItemStack[] getContents() + { + ItemStack[] C = new ItemStack[getSize()]; + System.arraycopy(items, 0, C, 0, items.length); + System.arraycopy(items, 0, C, items.length, armor.length); + return C; + } + + @Override + public int getSize() + { + return super.getSize() + 5; + } + + @Override + public ItemStack getItem(int i) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + return is[i]; + } + + @Override + public ItemStack splitStack(int i, int j) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + if (is[i] != null) + { + ItemStack itemstack; + + if (is[i].count <= j) + { + itemstack = is[i]; + is[i] = null; + return itemstack; + } + else + { + itemstack = is[i].a(j); + if (is[i].count == 0) + { + is[i] = null; + } + + return itemstack; + } + } + else + { + return null; + } + } + + @Override + public ItemStack splitWithoutUpdate(int i) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + if (is[i] != null) + { + ItemStack itemstack = is[i]; + + is[i] = null; + return itemstack; + } + else + { + return null; + } + } + + @Override + public void setItem(int i, ItemStack itemstack) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + // Effects + if (is == this.extra) + { + owner.getHandle().drop(itemstack); + itemstack = null; + } + + is[i] = itemstack; + + owner.getHandle().defaultContainer.b(); + } + + private int getReversedItemSlotNum(int i) + { + if (i >= 27) + return i - 27; + else + return i + 9; + } + + private int getReversedArmorSlotNum(int i) + { + if (i == 0) + return 3; + if (i == 1) + return 2; + if (i == 2) + return 1; + if (i == 3) + return 0; + else + return i; + } + + @Override + public String getName() + { + if (player.name.length() > 16) + { + return player.name.substring(0, 16); + } + return player.name; + } + + @Override + public boolean a_(EntityHuman entityhuman) + { + return true; + } +} \ No newline at end of file diff --git a/src/com/lishid/openinv/internal/v1_5_R1/AnySilentChest.java b/src/com/lishid/openinv/internal/v1_5_R1/AnySilentChest.java new file mode 100644 index 0000000..5f23147 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/AnySilentChest.java @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +import java.lang.reflect.Field; + +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +import com.lishid.openinv.internal.IAnySilentChest; + +//Volatile +import net.minecraft.server.v1_5_R1.*; +import org.bukkit.craftbukkit.v1_5_R1.entity.*; + +public class AnySilentChest implements IAnySilentChest +{ + public boolean IsAnyChestNeeded(Player p, int x, int y, int z) + { + // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest + EntityPlayer player = ((CraftPlayer) p).getHandle(); + World world = player.world; + // If block on top + if (world.t(x, y + 1, z)) + return true; + + // If block next to chest is chest and has a block on top + if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.t(x - 1, y + 1, z))) + return true; + if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.t(x + 1, y + 1, z))) + return true; + if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.t(x, y + 1, z - 1))) + return true; + if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.t(x, y + 1, z + 1))) + return true; + + return false; + } + + public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) + { + EntityPlayer player = ((CraftPlayer) p).getHandle(); + World world = player.world; + Object chest = (TileEntityChest) world.getTileEntity(x, y, z); + if (chest == null) + return true; + + if (!anychest) + { + if (world.t(x, y + 1, z)) + return true; + if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.t(x - 1, y + 1, z))) + return true; + if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.t(x + 1, y + 1, z))) + return true; + if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.t(x, y + 1, z - 1))) + return true; + if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.t(x, y + 1, z + 1))) + return true; + } + + if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest); + if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z)); + if (world.getTypeId(x, y, z - 1) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest); + if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) + chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); + + if (!silentchest) + { + player.openContainer((IInventory) chest); + } + else + { + try + { + int id = 0; + try + { + Field windowID = player.getClass().getDeclaredField("containerCounter"); + windowID.setAccessible(true); + id = windowID.getInt(player); + id = id % 100 + 1; + windowID.setInt(player, id); + } + catch (NoSuchFieldException e) + { + } + + player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); + player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); + player.activeContainer.windowId = id; + player.activeContainer.addSlotListener(player); + // event.getPlayer().sendMessage("You are opening a chest silently."); + return false; + } + catch (Exception e) + { + e.printStackTrace(); + p.sendMessage(ChatColor.RED + "Error while sending silent chest."); + } + } + + if (anychest) + p.sendMessage("You are opening a blocked chest."); + + return true; + } +} diff --git a/src/com/lishid/openinv/internal/v1_5_R1/InventoryAccess.java b/src/com/lishid/openinv/internal/v1_5_R1/InventoryAccess.java new file mode 100644 index 0000000..13b0c2e --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/InventoryAccess.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.Inventory; + +import com.lishid.openinv.Permissions; +import com.lishid.openinv.internal.IInventoryAccess; + +//Volatile +import net.minecraft.server.v1_5_R1.*; +import org.bukkit.craftbukkit.v1_5_R1.inventory.*; + +public class InventoryAccess implements IInventoryAccess +{ + public boolean check(Inventory inventory, HumanEntity player) + { + IInventory inv = ((CraftInventory) inventory).getInventory(); + + if (inv instanceof SpecialPlayerInventory) + { + if (!player.hasPermission(Permissions.PERM_EDITINV)) + { + return false; + } + } + + else if (inv instanceof SpecialEnderChest) + { + if (!player.hasPermission(Permissions.PERM_EDITENDER)) + { + return false; + } + } + + return true; + } +} diff --git a/src/com/lishid/openinv/internal/v1_5_R1/PlayerDataManager.java b/src/com/lishid/openinv/internal/v1_5_R1/PlayerDataManager.java new file mode 100644 index 0000000..dc7ead5 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/PlayerDataManager.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +import java.io.File; +import java.util.Arrays; +import java.util.Collection; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.IPlayerDataManager; + +//Volatile +import net.minecraft.server.v1_5_R1.*; +import org.bukkit.craftbukkit.v1_5_R1.*; + +public class PlayerDataManager implements IPlayerDataManager +{ + public Player loadPlayer(String name) + { + try + { + // Default player folder + File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); + if (!playerfolder.exists()) + { + return null; + } + + String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); + + if (playername == null) + { + return null; + } + + MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer(); + + // Create an entity to load the player data + EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername, new PlayerInteractManager(server.getWorldServer(0))); + + // Get the bukkit entity + Player target = (entity == null) ? null : entity.getBukkitEntity(); + if (target != null) + { + // Load data + target.loadData(); + // Return the entity + return target; + } + } + catch (Exception e) + { + OpenInv.log(e); + } + + return null; + } + + /** + * @author Balor (aka Antoine Aflalo) + */ + private static String matchUser(final Collection container, final String search) + { + String found = null; + if (search == null) + { + return found; + } + final String lowerSearch = search.toLowerCase(); + int delta = Integer.MAX_VALUE; + for (final File file : container) + { + final String filename = file.getName(); + final String str = filename.substring(0, filename.length() - 4); + if (!str.toLowerCase().startsWith(lowerSearch)) + { + continue; + } + final int curDelta = str.length() - lowerSearch.length(); + if (curDelta < delta) + { + found = str; + delta = curDelta; + } + if (curDelta == 0) + { + break; + } + + } + return found; + } +} diff --git a/src/com/lishid/openinv/internal/v1_5_R1/SilentContainerChest.java b/src/com/lishid/openinv/internal/v1_5_R1/SilentContainerChest.java new file mode 100644 index 0000000..f196959 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/SilentContainerChest.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +//Volatile +import net.minecraft.server.v1_5_R1.*; + +public class SilentContainerChest extends ContainerChest +{ + public IInventory inv; + + public SilentContainerChest(IInventory i1, IInventory i2) + { + super(i1, i2); + inv = i2; + // close signal + inv.g(); + } + + @Override + public void b(EntityHuman paramEntityHuman) + { + // Don't send close signal twice, might screw up + } +} \ No newline at end of file diff --git a/src/com/lishid/openinv/internal/v1_5_R1/SpecialEnderChest.java b/src/com/lishid/openinv/internal/v1_5_R1/SpecialEnderChest.java new file mode 100644 index 0000000..c9ca26f --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/SpecialEnderChest.java @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.ISpecialEnderChest; + +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; + +//Volatile +import net.minecraft.server.v1_5_R1.*; +import org.bukkit.craftbukkit.v1_5_R1.entity.*; +import org.bukkit.craftbukkit.v1_5_R1.inventory.*; + +public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest +{ + public List transaction = new ArrayList(); + public boolean playerOnline = false; + private CraftPlayer owner; + private InventoryEnderChest enderChest; + private int maxStack = MAX_STACK; + private CraftInventory inventory = new CraftInventory(this); + + public SpecialEnderChest(Player p, Boolean online) + { + super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); + CraftPlayer player = (CraftPlayer) p; + this.enderChest = player.getHandle().getEnderChest(); + this.owner = player; + this.items = enderChest.getContents(); + OpenInv.enderChests.put(owner.getName().toLowerCase(), this); + } + + public Inventory getBukkitInventory() + { + return inventory; + } + + public void InventoryRemovalCheck() + { + owner.saveData(); + if (transaction.isEmpty() && !playerOnline) + { + OpenInv.enderChests.remove(owner.getName().toLowerCase()); + } + } + + public void PlayerGoOnline(Player p) + { + if (!playerOnline) + { + try + { + InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); + Field field = playerEnderChest.getClass().getField("items"); + field.setAccessible(true); + field.set(playerEnderChest, this.items); + } + catch (Exception e) + { + } + p.saveData(); + playerOnline = true; + } + } + + public void PlayerGoOffline() + { + playerOnline = false; + } + + public ItemStack[] getContents() + { + return this.items; + } + + public void onOpen(CraftHumanEntity who) + { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) + { + transaction.remove(who); + this.InventoryRemovalCheck(); + } + + public List getViewers() + { + return transaction; + } + + public InventoryHolder getOwner() + { + return this.owner; + } + + public void setMaxStackSize(int size) + { + maxStack = size; + } + + public int getMaxStackSize() + { + return maxStack; + } + + public boolean a(EntityHuman entityhuman) + { + return true; + } + + public void startOpen() + { + + } + + public void f() + { + + } + + public void update() + { + enderChest.update(); + } +} diff --git a/src/com/lishid/openinv/internal/v1_5_R1/SpecialPlayerInventory.java b/src/com/lishid/openinv/internal/v1_5_R1/SpecialPlayerInventory.java new file mode 100644 index 0000000..c042c75 --- /dev/null +++ b/src/com/lishid/openinv/internal/v1_5_R1/SpecialPlayerInventory.java @@ -0,0 +1,297 @@ +/* + * Copyright (C) 2011-2012 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.internal.v1_5_R1; + +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.internal.ISpecialPlayerInventory; + +//Volatile +import net.minecraft.server.v1_5_R1.*; +import org.bukkit.craftbukkit.v1_5_R1.entity.*; +import org.bukkit.craftbukkit.v1_5_R1.inventory.*; + +public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory +{ + CraftPlayer owner; + public boolean playerOnline = false; + private ItemStack[] extra = new ItemStack[5]; + private CraftInventory inventory = new CraftInventory(this); + + public SpecialPlayerInventory(Player p, Boolean online) + { + super(((CraftPlayer) p).getHandle()); + this.owner = ((CraftPlayer) p); + this.playerOnline = online; + this.items = player.inventory.items; + this.armor = player.inventory.armor; + OpenInv.inventories.put(owner.getName().toLowerCase(), this); + } + + @Override + public Inventory getBukkitInventory() + { + return inventory; + } + + @Override + public void InventoryRemovalCheck() + { + owner.saveData(); + if (transaction.isEmpty() && !playerOnline) + { + OpenInv.inventories.remove(owner.getName().toLowerCase()); + } + } + + @Override + public void PlayerGoOnline(Player player) + { + if (!playerOnline) + { + CraftPlayer p = (CraftPlayer) player; + p.getHandle().inventory.items = this.items; + p.getHandle().inventory.armor = this.armor; + p.saveData(); + playerOnline = true; + } + } + + @Override + public void PlayerGoOffline() + { + playerOnline = false; + this.InventoryRemovalCheck(); + } + + @Override + public void onClose(CraftHumanEntity who) + { + super.onClose(who); + this.InventoryRemovalCheck(); + } + + @Override + public ItemStack[] getContents() + { + ItemStack[] C = new ItemStack[getSize()]; + System.arraycopy(items, 0, C, 0, items.length); + System.arraycopy(items, 0, C, items.length, armor.length); + return C; + } + + @Override + public int getSize() + { + return super.getSize() + 5; + } + + @Override + public ItemStack getItem(int i) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + return is[i]; + } + + @Override + public ItemStack splitStack(int i, int j) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + if (is[i] != null) + { + ItemStack itemstack; + + if (is[i].count <= j) + { + itemstack = is[i]; + is[i] = null; + return itemstack; + } + else + { + itemstack = is[i].a(j); + if (is[i].count == 0) + { + is[i] = null; + } + + return itemstack; + } + } + else + { + return null; + } + } + + @Override + public ItemStack splitWithoutUpdate(int i) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + if (is[i] != null) + { + ItemStack itemstack = is[i]; + + is[i] = null; + return itemstack; + } + else + { + return null; + } + } + + @Override + public void setItem(int i, ItemStack itemstack) + { + ItemStack[] is = this.items; + + if (i >= is.length) + { + i -= is.length; + is = this.armor; + } + else + { + i = getReversedItemSlotNum(i); + } + + if (i >= is.length) + { + i -= is.length; + is = this.extra; + } + else if (is == this.armor) + { + i = getReversedArmorSlotNum(i); + } + + // Effects + if (is == this.extra) + { + owner.getHandle().drop(itemstack); + itemstack = null; + } + + is[i] = itemstack; + + owner.getHandle().defaultContainer.b(); + } + + private int getReversedItemSlotNum(int i) + { + if (i >= 27) + return i - 27; + else + return i + 9; + } + + private int getReversedArmorSlotNum(int i) + { + if (i == 0) + return 3; + if (i == 1) + return 2; + if (i == 2) + return 1; + if (i == 3) + return 0; + else + return i; + } + + @Override + public String getName() + { + if (player.name.length() > 16) + { + return player.name.substring(0, 16); + } + return player.name; + } + + @Override + public boolean a(EntityHuman entityhuman) + { + return true; + } +} \ No newline at end of file diff --git a/src/com/lishid/openinv/utils/Metrics.java b/src/com/lishid/openinv/utils/Metrics.java index 7bcce5b..a4b69f0 100644 --- a/src/com/lishid/openinv/utils/Metrics.java +++ b/src/com/lishid/openinv/utils/Metrics.java @@ -33,6 +33,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.scheduler.BukkitTask; import java.io.BufferedReader; import java.io.File; @@ -137,7 +138,7 @@ public class Metrics /** * Id of the scheduled task */ - private volatile int taskId = -1; + private volatile BukkitTask taskId; public Metrics(final Plugin plugin) throws IOException { @@ -243,13 +244,13 @@ public class Metrics } // Is metrics already running? - if (taskId >= 0) + if (taskId != null) { return true; } // Begin hitting the server with glorious data - taskId = plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() + taskId = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { private boolean firstPost = true; @@ -262,10 +263,10 @@ public class Metrics synchronized (optOutLock) { // Disable Task, if it is running and the server owner decided to opt-out - if (isOptOut() && taskId > 0) + if (isOptOut() && taskId != null) { - plugin.getServer().getScheduler().cancelTask(taskId); - taskId = -1; + taskId.cancel(); + taskId = null; // Tell all plotters to stop gathering information. for (Graph graph : graphs) { @@ -340,7 +341,7 @@ public class Metrics } // Enable Task, if it is not running - if (taskId < 0) + if (taskId == null) { start(); } @@ -365,10 +366,10 @@ public class Metrics } // Disable Task, if it is running - if (taskId > 0) + if (taskId != null) { - this.plugin.getServer().getScheduler().cancelTask(taskId); - taskId = -1; + taskId.cancel(); + taskId = null; } } } diff --git a/src/com/lishid/openinv/utils/UpdateManager.java b/src/com/lishid/openinv/utils/UpdateManager.java index e41f16f..92f9fcd 100644 --- a/src/com/lishid/openinv/utils/UpdateManager.java +++ b/src/com/lishid/openinv/utils/UpdateManager.java @@ -15,7 +15,7 @@ public class UpdateManager updater = new Updater(plugin, OpenInv.logger, "openinv", file); // Create task to update - plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() + plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() { @Override public void run() diff --git a/src/plugin.yml b/src/plugin.yml index 6187799..4ff2ffd 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: OpenInv main: com.lishid.openinv.OpenInv -version: 1.9.5 +version: 1.9.8 author: lishid description: > This plugin allows you to open a player's inventory as a chest and interact with it in real time.