Enchantment: Implement Silk Touch (#1912)

src/pocketmine/block/Bed.php

@@ -207,6 +207,10 @@ class Bed extends Transparent{
 		return [];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
 	public function getAffectedBlocks() : array{
 		if(($other = $this->getOtherHalf()) !== null){
 			return [$this, $other];

src/pocketmine/block/Block.php

@@ -27,6 +27,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
@@ -433,6 +434,10 @@ class Block extends Position implements BlockIds, Metadatable{
 	 */
 	public function getDrops(Item $item) : array{
 		if($this->isCompatibleWithTool($item)){
+			if($this->isAffectedBySilkTouch() and $item->hasEnchantment(Enchantment::SILK_TOUCH)){
+				return $this->getSilkTouchDrops($item);
+			}
+
 			return $this->getDropsForCompatibleTool($item);
 		}
 
@@ -452,6 +457,29 @@ class Block extends Position implements BlockIds, Metadatable{
 		];
 	}
 
+	/**
+	 * Returns an array of Items to be dropped when the block is broken using a compatible Silk Touch-enchanted tool.
+	 *
+	 * @param Item $item
+	 *
+	 * @return Item[]
+	 */
+	public function getSilkTouchDrops(Item $item) : array{
+		return [
+			ItemFactory::get($this->getItemId(), $this->getVariant())
+		];
+	}
+
+	/**
+	 * Returns whether Silk Touch enchanted tools will cause this block to drop as itself. Since most blocks drop
+	 * themselves anyway, this is implicitly true.
+	 *
+	 * @return bool
+	 */
+	public function isAffectedBySilkTouch() : bool{
+		return true;
+	}
+
 	/**
 	 * Returns the item that players will equip when middle-clicking on this block.
 	 * @return Item

src/pocketmine/block/Cake.php

@@ -89,6 +89,10 @@ class Cake extends Transparent implements FoodSource{
 		return [];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player !== null){
 			$player->consumeObject($this);

src/pocketmine/block/CocoaBlock.php

@@ -44,4 +44,8 @@ class CocoaBlock extends Transparent{
 	}
 
 	//TODO
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Crops.php

@@ -95,4 +95,8 @@ abstract class Crops extends Flowable{
 
 		return false;
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Door.php

@@ -278,6 +278,10 @@ abstract class Door extends Transparent{
 		return [];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
+
 	public function getAffectedBlocks() : array{
 		if(($this->getDamage() & 0x08) === 0x08){
 			$down = $this->getSide(Vector3::SIDE_DOWN);

src/pocketmine/block/DoubleSlab.php

@@ -44,4 +44,7 @@ abstract class DoubleSlab extends Solid{
 		];
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Farmland.php

@@ -112,4 +112,8 @@ class Farmland extends Transparent{
 			ItemFactory::get(Item::DIRT)
 		];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/FlowerPot.php

@@ -114,4 +114,7 @@ class FlowerPot extends Flowable{
 		return $items;
 	}
 
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Ice.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
@@ -56,8 +57,11 @@ class Ice extends Transparent{
 	}
 
 	public function onBreak(Item $item, Player $player = null) : bool{
+		if(!$item->hasEnchantment(Enchantment::SILK_TOUCH)){
 			return $this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
 		}
+		return parent::onBreak($item, $player);
+	}
 
 	public function ticksRandomly() : bool{
 		return true;

src/pocketmine/block/ItemFrame.php

@@ -112,4 +112,8 @@ class ItemFrame extends Flowable{
 
 		return $drops;
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/MonsterSpawner.php

@@ -53,4 +53,8 @@ class MonsterSpawner extends Transparent{
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/NetherWartPlant.php

@@ -90,4 +90,8 @@ class NetherWartPlant extends Flowable{
 			ItemFactory::get($this->getItemId(), 0, ($this->getDamage() === 3 ? mt_rand(2, 4) : 1))
 		];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Skull.php

@@ -81,4 +81,8 @@ class Skull extends Flowable{
 
 		return [];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/SnowLayer.php

@@ -96,4 +96,8 @@ class SnowLayer extends Flowable{
 			ItemFactory::get(Item::SNOWBALL) //TODO: check layer count
 		];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/StandingBanner.php

@@ -105,4 +105,8 @@ class StandingBanner extends Transparent{
 
 		return [$drop];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/block/Tripwire.php

@@ -43,4 +43,8 @@ class Tripwire extends Flowable{
 			ItemFactory::get(Item::STRING)
 		];
 	}
+
+	public function isAffectedBySilkTouch() : bool{
+		return false;
+	}
 }

src/pocketmine/item/enchantment/Enchantment.php

@@ -95,7 +95,7 @@ class Enchantment{
 		self::registerEnchantment(new Enchantment(self::RESPIRATION, "%enchantment.oxygen", self::RARITY_RARE, self::SLOT_HEAD, 3));
 
 		self::registerEnchantment(new Enchantment(self::EFFICIENCY, "%enchantment.digging", self::RARITY_COMMON, self::SLOT_DIG | self::SLOT_SHEARS, 5));
-
+		self::registerEnchantment(new Enchantment(self::SILK_TOUCH, "%enchantment.untouching", self::RARITY_MYTHIC, self::SLOT_DIG | self::SLOT_SHEARS, 1));
 		self::registerEnchantment(new Enchantment(self::UNBREAKING, "%enchantment.durability", self::RARITY_UNCOMMON, self::SLOT_ALL, 3)); //TODO: item type flags need to be split up
 	}