Fixed handling of recipes that require a crafting table

src/pocketmine/Player.php

@@ -71,8 +71,6 @@ use pocketmine\event\TextContainer;
 use pocketmine\event\Timings;
 use pocketmine\event\TranslationContainer;
 use pocketmine\inventory\BigCraftingGrid;
-use pocketmine\inventory\BigShapedRecipe;
-use pocketmine\inventory\BigShapelessRecipe;
 use pocketmine\inventory\CraftingGrid;
 use pocketmine\inventory\FurnaceInventory;
 use pocketmine\inventory\Inventory;
@@ -2775,7 +2773,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		$recipe = $this->server->getCraftingManager()->getRecipe($packet->id);
 
-		if($recipe === null or (($recipe instanceof BigShapelessRecipe or $recipe instanceof BigShapedRecipe) and $this->craftingType === 0) or count($packet->input) === 0){
+		if($recipe === null or ($recipe->requiresCraftingTable() and $this->craftingType === 0) or count($packet->input) === 0){
 			$this->inventory->sendContents($this);
 			return false;
 		}

src/pocketmine/inventory/BigShapedRecipe.php

@@ -1,28 +0,0 @@
-<?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/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\inventory;
-
-class BigShapedRecipe extends ShapedRecipe{
-
-}

src/pocketmine/inventory/BigShapelessRecipe.php

@@ -1,28 +0,0 @@
-<?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/
- *
- *
-*/
-
-declare(strict_types=1);
-
-namespace pocketmine\inventory;
-
-class BigShapelessRecipe extends ShapelessRecipe{
-
-}

src/pocketmine/inventory/CraftingRecipe.php

@@ -36,4 +36,6 @@ interface CraftingRecipe extends Recipe{
 	 * @param UUID $id
 	 */
 	public function setId(UUID $id);
+
+	public function requiresCraftingTable() : bool;
 }

src/pocketmine/inventory/ShapedRecipe.php

@@ -171,4 +171,8 @@ class ShapedRecipe implements CraftingRecipe{
 	public function registerToCraftingManager(CraftingManager $manager){
 		$manager->registerShapedRecipe($this);
 	}
+
+	public function requiresCraftingTable() : bool{
+		return $this->getHeight() > 2 or $this->getWidth() > 2;
+	}
 }

src/pocketmine/inventory/ShapelessRecipe.php

@@ -132,4 +132,8 @@ class ShapelessRecipe implements CraftingRecipe{
 	public function registerToCraftingManager(CraftingManager $manager){
 		$manager->registerShapelessRecipe($this);
 	}
+
+	public function requiresCraftingTable() : bool{
+		return count($this->ingredients) > 4;
+	}
 }