Merge pull request #6 from Byteflux/1.7.8

1.7.8

src/com/lishid/openinv/internal/v1_7_R3/AnySilentChest.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+import java.lang.reflect.Field;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.internal.IAnySilentChest;
+
+//Volatile
+import net.minecraft.server.v1_7_R3.*;
+
+import org.bukkit.craftbukkit.v1_7_R3.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.getType(x, y + 1, z).c())
+            return true;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        // If block next to chest is chest and has a block on top
+        if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+            return true;
+        if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+            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;
+
+        int id = Block.b(world.getType(x, y, z));
+
+        if (!anychest) {
+            if (world.getType(x, y + 1, z).c())
+                return true;
+            if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x + 1, y, z)) == id) && (world.getType(x + 1, y + 1, z).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z - 1)) == id) && (world.getType(x, y + 1, z - 1).c()))
+                return true;
+            if ((Block.b(world.getType(x, y, z + 1)) == id) && (world.getType(x, y + 1, z + 1).c()))
+                return true;
+        }
+
+        if (Block.b(world.getType(x - 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (Block.b(world.getType(x + 1, y, z)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (Block.b(world.getType(x, y, z - 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (Block.b(world.getType(x, y, z + 1)) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                int windowId = 0;
+                try {
+                    Field windowID = player.getClass().getDeclaredField("containerCounter");
+                    windowID.setAccessible(true);
+                    windowId = windowID.getInt(player);
+                    windowId = windowId % 100 + 1;
+                    windowID.setInt(player, windowId);
+                }
+                catch (NoSuchFieldException e) {}
+
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
+                player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                if (OpenInv.NotifySilentChest()) {
+                    p.sendMessage("You are opening a chest silently.");
+                }
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        if (anychest && OpenInv.NotifyAnyChest()) {
+            p.sendMessage("You are opening a blocked chest.");
+        }
+
+        return returnValue;
+    }
+}

src/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+//Volatile
+import net.minecraft.server.v1_7_R3.*;
+import org.bukkit.craftbukkit.v1_7_R3.inventory.*;
+
+public class InventoryAccess implements IInventoryAccess {
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = ((CraftInventory) inventory).getInventory();
+
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

src/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+
+import net.minecraft.server.v1_7_R3.EntityPlayer;
+//Volatile
+import net.minecraft.server.v1_7_R3.MinecraftServer;
+import net.minecraft.server.v1_7_R3.PlayerInteractManager;
+import net.minecraft.util.com.mojang.authlib.GameProfile;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+public class PlayerDataManager implements IPlayerDataManager {
+    @Override
+	public Player loadPlayer(String name) {
+        try {
+            // Default player folder
+            File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata");
+            if (!playerfolder.exists()) {
+                return null;
+            }
+
+            OfflinePlayer player = Bukkit.getOfflinePlayer(name);
+
+            if (player == null || matchUser(Arrays.asList(playerfolder.listFiles()), player.getUniqueId().toString()) == null) {
+            	return null;
+            }
+
+            MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+
+            GameProfile profile = new GameProfile(player.getUniqueId(), player.getName());
+            // Create an entity to load the player data
+            EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, 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_7_R3/SilentContainerChest.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+//Volatile
+import net.minecraft.server.v1_7_R3.*;
+
+public class SilentContainerChest extends ContainerChest {
+    public IInventory inv;
+
+    public SilentContainerChest(IInventory i1, IInventory i2) {
+        super(i1, i2);
+        inv = i2;
+        // close signal
+        inv.l_();
+    }
+
+    @Override
+    public void b(EntityHuman paramEntityHuman) {
+        // Don't send close signal twice, might screw up
+    }
+}

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

@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+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_7_R3.*;
+import org.bukkit.craftbukkit.v1_7_R3.entity.*;
+import org.bukkit.craftbukkit.v1_7_R3.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().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((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<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_7_R3/SpecialPlayerInventory.java

@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2011-2014 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_7_R3;
+
+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_7_R3.*;
+import org.bukkit.craftbukkit.v1_7_R3.entity.*;
+import org.bukkit.craftbukkit.v1_7_R3.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, true);
+            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 getInventoryName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
+}