Added block break tool type, fixed falling sand, fixed duplicated jun…

…gle leaves
PocketMine · Jul 27, 2015 · 0380e90 · 0380e90
1 parent 866fde5
commit 0380e90
Show file tree

Hide file tree

Showing 75 changed files with 378 additions and 4 deletions.
diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
@@ -52,6 +53,10 @@ public function getName(){
 		return "Chest";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x + 0.0625,

diff --git a/src/pocketmine/block/Clay.php b/src/pocketmine/block/Clay.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Clay extends Solid{
 
@@ -35,6 +36,10 @@ public function getHardness(){
 		return 0.6;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		return "Clay Block";
 	}

diff --git a/src/pocketmine/block/Coal.php b/src/pocketmine/block/Coal.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Coal extends Solid{
 
@@ -35,6 +36,10 @@ public function getHardness(){
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Coal Block";
 	}

diff --git a/src/pocketmine/block/CoalOre.php b/src/pocketmine/block/CoalOre.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class CoalOre extends Solid{
 
@@ -35,6 +36,10 @@ public function getHardness(){
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Coal Ore";
 	}

diff --git a/src/pocketmine/block/CobblestoneStairs.php b/src/pocketmine/block/CobblestoneStairs.php
@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class CobblestoneStairs extends Stair{
 
 	protected $id = self::COBBLESTONE_STAIRS;
@@ -34,6 +36,10 @@ public function getHardness(){
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Cobblestone Stairs";
 	}

diff --git a/src/pocketmine/block/Cobweb.php b/src/pocketmine/block/Cobweb.php
@@ -23,6 +23,7 @@
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobweb extends Flowable{
 
@@ -44,6 +45,10 @@ public function getHardness(){
 		return 4;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SWORD;
+	}
+
 	public function onEntityCollide(Entity $entity){
 		$entity->resetFallDistance();
 	}

diff --git a/src/pocketmine/block/DarkOakWoodStairs.php b/src/pocketmine/block/DarkOakWoodStairs.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DarkOakWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ public function getName(){
 		return "Dark Oak Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

diff --git a/src/pocketmine/block/Diamond.php b/src/pocketmine/block/Diamond.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Diamond extends Solid{
 
@@ -39,6 +40,10 @@ public function getName(){
 		return "Diamond Block";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

diff --git a/src/pocketmine/block/DiamondOre.php b/src/pocketmine/block/DiamondOre.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DiamondOre extends Solid{
 
@@ -39,6 +40,10 @@ public function getName(){
 		return "Diamond Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

diff --git a/src/pocketmine/block/DoubleSlab.php b/src/pocketmine/block/DoubleSlab.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DoubleSlab extends Solid{
 
@@ -35,6 +36,10 @@ public function getHardness(){
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Stone",

diff --git a/src/pocketmine/block/DoubleWoodSlab.php b/src/pocketmine/block/DoubleWoodSlab.php
@@ -35,6 +35,10 @@ public function getHardness(){
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Oak",

diff --git a/src/pocketmine/block/Emerald.php b/src/pocketmine/block/Emerald.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Emerald extends Solid{
 
@@ -35,6 +36,10 @@ public function getHardness(){
 		return 5;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Emerald Block";
 	}

diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EmeraldOre extends Solid{
 
@@ -35,6 +36,10 @@ public function getName(){
 		return "Emerald Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

diff --git a/src/pocketmine/block/EndStone.php b/src/pocketmine/block/EndStone.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EndStone extends Solid{
 
@@ -35,6 +36,10 @@ public function getName(){
 		return "End Stone";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
 		return 3;
 	}

diff --git a/src/pocketmine/block/Fallable.php b/src/pocketmine/block/Fallable.php
@@ -24,6 +24,7 @@
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
@@ -42,7 +43,7 @@ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy,
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
+			$down = $this->getSide(Vector3::SIDE_DOWN);
 			if($down->getId() === self::AIR or ($down instanceof Liquid)){
 				$fall = Entity::createEntity("FallingSand", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
 					"Pos" => new Enum("Pos", [

diff --git a/src/pocketmine/block/Farmland.php b/src/pocketmine/block/Farmland.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class Farmland extends Solid{
@@ -40,6 +41,10 @@ public function getHardness(){
 		return 0.6;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x,

diff --git a/src/pocketmine/block/Fence.php b/src/pocketmine/block/Fence.php
@@ -21,6 +21,7 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -36,6 +37,10 @@ public function getHardness(){
 		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 
 	public function getName(){
 		static $names = [

diff --git a/src/pocketmine/block/FenceGate.php b/src/pocketmine/block/FenceGate.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -45,6 +46,10 @@ public function canBeActivated(){
 		return true;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 
 	protected function recalculateBoundingBox(){
 

diff --git a/src/pocketmine/block/GlowingRedstoneOre.php b/src/pocketmine/block/GlowingRedstoneOre.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class GlowingRedstoneOre extends Solid{
@@ -40,6 +41,10 @@ public function getName(){
 		return "Glowing Redstone Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getLightLevel(){
 		return 9;
 	}

diff --git a/src/pocketmine/block/Glowstone.php b/src/pocketmine/block/Glowstone.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
 
@@ -39,6 +40,10 @@ public function getHardness(){
 		return 0.3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getLightLevel(){
 		return 15;
 	}

diff --git a/src/pocketmine/block/Gold.php b/src/pocketmine/block/Gold.php
@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Gold extends Solid{
 
@@ -39,6 +40,10 @@ public function getHardness(){
 		return 3;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [