Updated to 1.4.6

src/com/lishid/openinv/OpenInv.java

@@ -67,7 +67,7 @@ public class OpenInv extends JavaPlugin
         if(!success)
         {
             OpenInv.log("Your version of CraftBukkit is not supported.");
-            OpenInv.log("Please look for an updated version of Orebfuscator.");
+            OpenInv.log("Please look for an updated version of OpenInv.");
             pm.disablePlugin(this);
             return;
         }

src/com/lishid/openinv/internal/InternalAccessor.java

@@ -37,7 +37,7 @@ public class InternalAccessor
         
         try
         {
-            Class.forName("com.lishid.orebfuscator.internal." + Instance.version + ".PlayerHook");
+            Class.forName("com.lishid.openinv.internal." + Instance.version + ".AnySilentChest");
             return true;
         }
         catch (Exception e)

src/com/lishid/openinv/internal/v1_4_6/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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+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_6.*;
+import org.bukkit.craftbukkit.v1_4_6.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;
+    }
+}

src/com/lishid/openinv/internal/v1_4_6/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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+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_6.*;
+import org.bukkit.craftbukkit.v1_4_6.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;
+    }
+}

src/com/lishid/openinv/internal/v1_4_6/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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+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_6.*;
+import org.bukkit.craftbukkit.v1_4_6.*;
+
+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<File> 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;
+    }
+}

src/com/lishid/openinv/internal/v1_4_6/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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+//Volatile
+import net.minecraft.server.v1_4_6.*;
+
+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
+    }
+}

src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java

@@ -0,0 +1,146 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+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_6.*;
+import org.bukkit.craftbukkit.v1_4_6.entity.*;
+import org.bukkit.craftbukkit.v1_4_6.inventory.*;
+
+public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest
+{
+    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+    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();
+    }
+    
+    public Inventory getBukkitInventory()
+    {
+        return inventory;
+    }
+    
+    public void InventoryRemovalCheck()
+    {
+        if (transaction.isEmpty() && !playerOnline)
+        {
+            owner.saveData();
+            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);
+    }
+    
+    public List<HumanEntity> 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();
+    }
+}

src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -0,0 +1,298 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_4_6;
+
+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_6.*;
+import org.bukkit.craftbukkit.v1_4_6.entity.*;
+import org.bukkit.craftbukkit.v1_4_6.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;
+    }
+    
+    @Override
+    public Inventory getBukkitInventory()
+    {
+        return inventory;
+    }
+    
+    @Override
+    public void InventoryRemovalCheck()
+    {
+        if (transaction.isEmpty() && !playerOnline)
+        {
+            owner.saveData();
+            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;
+    }
+    
+    @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)
+         * {
+         * if(i == 0)
+         * {
+         * itemstack.setData(0);
+         * }
+         * }
+         */
+        
+        is[i] = itemstack;
+    }
+    
+    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;
+    }
+}

src/plugin.yml

@@ -1,6 +1,6 @@
 name: OpenInv
 main: com.lishid.openinv.OpenInv
-version: 1.9.2
+version: 1.9.4
 author: lishid
 description: >
              This plugin allows you to open a player's inventory as a chest and interact with it in real time.