Update to 2.0.4

2013-07-05 21:58:42 -07:00
parent 5f87949e0b
commit 4597db93bd
24 changed files with 1699 additions and 75 deletions
--- a/src/com/lishid/openinv/internal/v1_5_R3/AnySilentChest.java
+++ b/src/com/lishid/openinv/internal/v1_5_R3/AnySilentChest.java
@@ -0,0 +1,138 @@
+/*
+ * 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_5_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;
+
+import com.lishid.openinv.internal.v1_5_R3.SilentContainerChest;
+
+//Volatile
+import net.minecraft.server.v1_5_R3.*;
+
+import org.bukkit.craftbukkit.v1_5_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.t(x, y + 1, z))
+            return true;
+        
+        int id = world.getTypeId(x, y, z);
+        
+        // If block next to chest is chest and has a block on top
+        if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+            return true;
+        if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+            return true;
+        if ((world.getTypeId(x, y, z + 1) == 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;
+        
+        int id = world.getTypeId(x, y, z);
+        
+        if (!anychest)
+        {
+            if (world.t(x, y + 1, z))
+                return true;
+            if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x + 1, y, z) == id) && (world.t(x + 1, y + 1, z)))
+                return true;
+            if ((world.getTypeId(x, y, z - 1) == id) && (world.t(x, y + 1, z - 1)))
+                return true;
+            if ((world.getTypeId(x, y, z + 1) == id) && (world.t(x, y + 1, z + 1)))
+                return true;
+        }
+        
+        if (world.getTypeId(x - 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
+        if (world.getTypeId(x + 1, y, z) == id)
+            chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+        if (world.getTypeId(x, y, z - 1) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+        if (world.getTypeId(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 Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((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;
+    }
+}