From 1fd7e0431b0b867dde7e18cdaf6fc7fc7137a967 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sat, 24 May 2014 01:30:58 +0200
Subject: [PATCH] Added CustomInventory, StoneCutter inventory type, network
 IDs, fixed viewer list bugs

---
 src/pocketmine/inventory/BaseInventory.php    |  4 +--
 .../inventory/ContainerInventory.php          | 24 ++++++--------
 src/pocketmine/inventory/CustomInventory.php  | 29 +++++++++++++++++
 src/pocketmine/inventory/InventoryType.php    | 31 ++++++++++++++-----
 src/pocketmine/inventory/PlayerInventory.php  | 15 +++------
 5 files changed, 70 insertions(+), 33 deletions(-)
 create mode 100644 src/pocketmine/inventory/CustomInventory.php

diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php
index b043bc238..fe698c2d6 100644
--- a/src/pocketmine/inventory/BaseInventory.php
+++ b/src/pocketmine/inventory/BaseInventory.php
@@ -319,11 +319,11 @@ abstract class BaseInventory implements Inventory{
 	}
 
 	public function onOpen(Player $who){
-
+		$this->viewers->attach($who);
 	}
 
 	public function onClose(Player $who){
-
+		$this->viewers->detach($who);
 	}
 
 	public function onSlotChange($index, $before){
diff --git a/src/pocketmine/inventory/ContainerInventory.php b/src/pocketmine/inventory/ContainerInventory.php
index 907db93fb..848749805 100644
--- a/src/pocketmine/inventory/ContainerInventory.php
+++ b/src/pocketmine/inventory/ContainerInventory.php
@@ -24,26 +24,22 @@ namespace pocketmine\inventory;
 use pocketmine\network\protocol\ContainerClosePacket;
 use pocketmine\network\protocol\ContainerOpenPacket;
 use pocketmine\Player;
-use pocketmine\tile\Chest;
-use pocketmine\tile\Furnace;
+use pocketmine\math\Vector3;
 
 abstract class ContainerInventory extends BaseInventory{
-
-	/**
-	 * @return Chest|Furnace
-	 */
-	public function getHolder(){
-		return $this->holder;
-	}
-
 	public function onOpen(Player $who){
 		$pk = new ContainerOpenPacket;
 		$pk->windowid = $who->getWindowId($this);
-		$pk->type = 0;
+		$pk->type = $this->getType()->getNetworkType();
 		$pk->slots = $this->getSize();
-		$pk->x = $this->getHolder()->getX();
-		$pk->y = $this->getHolder()->getY();
-		$pk->z = $this->getHolder()->getZ();
+		if($this->holder instanceof Vector3){
+			$pk->x = $this->holder->getX();
+			$pk->y = $this->holder->getY();
+			$pk->z = $this->holder->getZ();
+		}else{
+			$pk->x = $pk->y = $pk->z = 0;
+		}
+
 		$who->dataPacket($pk);
 	}
 
diff --git a/src/pocketmine/inventory/CustomInventory.php b/src/pocketmine/inventory/CustomInventory.php
new file mode 100644
index 000000000..6f94fc746
--- /dev/null
+++ b/src/pocketmine/inventory/CustomInventory.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\inventory;
+
+/**
+ * All plugins that want to create their custom inventory should use this class as a base
+ */
+abstract class CustomInventory extends ContainerInventory{
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/inventory/InventoryType.php b/src/pocketmine/inventory/InventoryType.php
index e10b50ec9..1cc07946a 100644
--- a/src/pocketmine/inventory/InventoryType.php
+++ b/src/pocketmine/inventory/InventoryType.php
@@ -31,12 +31,19 @@ class InventoryType{
 	const FURNACE = 3;
 	const CRAFTING = 4;
 	const WORKBENCH = 5;
+	const STONECUTTER = 6;
 
 	private static $default = [];
 
 	private $size;
 	private $title;
+	private $typeId;
 
+	/**
+	 * @param $index
+	 *
+	 * @return InventoryType
+	 */
 	public static function get($index){
 		return isset(static::$default[$index]) ? static::$default[$index] : null;
 	}
@@ -46,21 +53,24 @@ class InventoryType{
 			return;
 		}
 
-		static::$default[static::CHEST] = new InventoryType(27, "Chest");
-		static::$default[static::DOUBLE_CHEST] = new InventoryType(27 + 27, "Double Chest");
-		static::$default[static::PLAYER] = new InventoryType(31, "Player"); //27 CONTAINER, 4 ARMOR (9 reference HOTBAR slots)
-		static::$default[static::FURNACE] = new InventoryType(3, "Furnace");
-		static::$default[static::CRAFTING] = new InventoryType(5, "Crafting"); //4 CRAFTING slots, 1 RESULT
-		static::$default[static::WORKBENCH] = new InventoryType(10, "Crafting"); //9 CRAFTING slots, 1 RESULT
+		static::$default[static::CHEST] = new InventoryType(27, "Chest", 0);
+		static::$default[static::DOUBLE_CHEST] = new InventoryType(27 + 27, "Double Chest", 0);
+		static::$default[static::PLAYER] = new InventoryType(31, "Player", 0); //27 CONTAINER, 4 ARMOR (9 reference HOTBAR slots)
+		static::$default[static::FURNACE] = new InventoryType(3, "Furnace", 2);
+		static::$default[static::CRAFTING] = new InventoryType(5, "Crafting", 1); //4 CRAFTING slots, 1 RESULT
+		static::$default[static::WORKBENCH] = new InventoryType(10, "Crafting", 1); //9 CRAFTING slots, 1 RESULT
+		static::$default[static::STONECUTTER] = new InventoryType(10, "Crafting", 3); //9 CRAFTING slots, 1 RESULT
 	}
 
 	/**
 	 * @param int    $defaultSize
 	 * @param string $defaultTitle
+	 * @param int    $typeId
 	 */
-	private function __construct($defaultSize, $defaultTitle){
+	private function __construct($defaultSize, $defaultTitle, $typeId = 0){
 		$this->size = $defaultSize;
 		$this->title = $defaultTitle;
+		$this->typeId = $typeId;
 	}
 
 	/**
@@ -76,4 +86,11 @@ class InventoryType{
 	public function getDefaultTitle(){
 		return $this->title;
 	}
+
+	/**
+	 * @return int
+	 */
+	public function getNetworkType(){
+		return $this->typeId;
+	}
 }
\ No newline at end of file
diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php
index 56df20047..9c27505c2 100644
--- a/src/pocketmine/inventory/PlayerInventory.php
+++ b/src/pocketmine/inventory/PlayerInventory.php
@@ -141,7 +141,7 @@ class PlayerInventory extends BaseInventory{
 			if($player === $this->getHolder()){
 				//TODO: Check if Mojang enabled sending a single slot this
 				//$this->sendSlot($this->getHeldItemSlot());
-				$this->sendContents($this->getHolder());
+				$this->sendContents($player);
 			}else{
 				$player->dataPacket(clone $pk);
 			}
@@ -153,11 +153,6 @@ class PlayerInventory extends BaseInventory{
 
 		if($index >= $this->getSize()){
 			$this->sendArmorContents($this->getHolder()->getViewers());
-			if($this->getHolder() instanceof Player){
-				$this->sendArmorContents($this->getHolder());
-			}
-		}elseif($this->getHolder() instanceof Player){
-			$this->sendSlot($index, $this->getHolder());
 		}
 	}
 
@@ -213,8 +208,8 @@ class PlayerInventory extends BaseInventory{
 		if($index >= $this->getSize()){ //Armor change
 			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityArmorChangeEvent($this->getHolder(), $this->getItem($index), $item, $index));
 			if($ev->isCancelled() and $this->getHolder() instanceof Player){
-				$this->sendArmorContents($this->getHolder());
-				$this->sendContents($this->getHolder());
+				$this->sendArmorContents($this->getViewers());
+				$this->sendContents($this->getViewers());
 
 				return false;
 			}
@@ -235,8 +230,8 @@ class PlayerInventory extends BaseInventory{
 			if($index >= $this->getSize() and $index < $this->size){ //Armor change
 				Server::getInstance()->getPluginManager()->callEvent($ev = new EntityArmorChangeEvent($this->getHolder(), $old, $item, $index));
 				if($ev->isCancelled()){
-					$this->sendArmorContents($this);
-					$this->sendContents($this);
+					$this->sendArmorContents($this->getViewers());
+					$this->sendContents($this->getViewers());
 
 					return;
 				}