Implement unregister functions in CraftingManager

src/crafting/CraftingManager.php

@@ -29,6 +29,8 @@
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\DestructorCallbackTrait;
 use pocketmine\utils\ObjectSet;
+use function array_search;
+use function count;
 use function usort;
 
 class CraftingManager{
@@ -78,25 +80,39 @@ class CraftingManager{
 	/** @phpstan-var ObjectSet<\Closure() : void> */
 	private ObjectSet $recipeRegisteredCallbacks;
 
+	/** @phpstan-var ObjectSet<\Closure() : void> */
+	private ObjectSet $recipeUnregisteredCallbacks;
+
 	public function __construct(){
 		$this->recipeRegisteredCallbacks = new ObjectSet();
+		$this->recipeUnregisteredCallbacks = new ObjectSet();
+
 		foreach(FurnaceType::getAll() as $furnaceType){
 			$this->furnaceRecipeManagers[$furnaceType->id()] = new FurnaceRecipeManager();
 		}
 
 		$recipeRegisteredCallbacks = $this->recipeRegisteredCallbacks;
+		$recipeUnregisteredCallbacks = $this->recipeUnregisteredCallbacks;
 		foreach($this->furnaceRecipeManagers as $furnaceRecipeManager){
 			$furnaceRecipeManager->getRecipeRegisteredCallbacks()->add(static function(FurnaceRecipe $recipe) use ($recipeRegisteredCallbacks) : void{
 				foreach($recipeRegisteredCallbacks as $callback){
 					$callback();
 				}
 			});
+			$furnaceRecipeManager->getRecipeUnregisteredCallbacks()->add(static function(FurnaceRecipe $recipe) use ($recipeUnregisteredCallbacks) : void{
+				foreach($recipeUnregisteredCallbacks as $callback){
+					$callback();
+				}
+			});
 		}
 	}
 
 	/** @phpstan-return ObjectSet<\Closure() : void> */
 	public function getRecipeRegisteredCallbacks() : ObjectSet{ return $this->recipeRegisteredCallbacks; }
 
+	/** @phpstan-return ObjectSet<\Closure() : void> */
+	public function getRecipeUnregisteredCallbacks() : ObjectSet{ return $this->recipeUnregisteredCallbacks; }
+
 	/**
 	 * Function used to arrange Shapeless Recipe ingredient lists into a consistent order.
 	 */
@@ -205,6 +221,34 @@ public function registerShapedRecipe(ShapedRecipe $recipe) : void{
 		}
 	}
 
+	public function unregisterShapedRecipe(ShapedRecipe $recipe) : void{
+		$edited = false;
+		$hash = self::hashOutputs($recipe->getResults());
+
+		foreach($this->shapedRecipes[$hash] ?? [] as $i => $r){
+			if($r === $recipe){
+				unset($this->shapedRecipes[$hash][$i]);
+				if(count($this->shapedRecipes[$hash]) === 0){
+					unset($this->shapedRecipes[$hash]);
+					$edited = true;
+				}
+				break;
+			}
+		}
+
+		$index = array_search($recipe, $this->craftingRecipeIndex, true);
+		if($index !== false){
+			unset($this->craftingRecipeIndex[$index]);
+			$edited = true;
+		}
+
+		if($edited){
+			foreach($this->recipeUnregisteredCallbacks as $callback){
+				$callback();
+			}
+		}
+	}
+
 	public function registerShapelessRecipe(ShapelessRecipe $recipe) : void{
 		$this->shapelessRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
 		$this->craftingRecipeIndex[] = $recipe;
@@ -214,6 +258,34 @@ public function registerShapelessRecipe(ShapelessRecipe $recipe) : void{
 		}
 	}
 
+	public function unregisterShapelessRecipe(ShapelessRecipe $recipe) : void{
+		$edited = false;
+		$hash = self::hashOutputs($recipe->getResults());
+
+		foreach($this->shapelessRecipes[$hash] ?? [] as $i => $r){
+			if($r === $recipe){
+				unset($this->shapelessRecipes[$hash][$i]);
+				if(count($this->shapelessRecipes[$hash]) === 0){
+					unset($this->shapelessRecipes[$hash]);
+					$edited = true;
+				}
+				break;
+			}
+		}
+
+		$index = array_search($recipe, $this->craftingRecipeIndex, true);
+		if($index !== false){
+			unset($this->craftingRecipeIndex[$index]);
+			$edited = true;
+		}
+
+		if($edited){
+			foreach($this->recipeUnregisteredCallbacks as $callback){
+				$callback();
+			}
+		}
+	}
+
 	public function registerPotionTypeRecipe(PotionTypeRecipe $recipe) : void{
 		$this->potionTypeRecipes[] = $recipe;
 
@@ -222,6 +294,17 @@ public function registerPotionTypeRecipe(PotionTypeRecipe $recipe) : void{
 		}
 	}
 
+	public function unregisterPotionTypeRecipe(PotionTypeRecipe $recipe) : void{
+		$recipeIndex = array_search($recipe, $this->potionTypeRecipes, true);
+		if($recipeIndex !== false){
+			unset($this->potionTypeRecipes[$recipeIndex]);
+
+			foreach($this->recipeUnregisteredCallbacks as $callback){
+				$callback();
+			}
+		}
+	}
+
 	public function registerPotionContainerChangeRecipe(PotionContainerChangeRecipe $recipe) : void{
 		$this->potionContainerChangeRecipes[] = $recipe;
 
@@ -230,6 +313,17 @@ public function registerPotionContainerChangeRecipe(PotionContainerChangeRecipe
 		}
 	}
 
+	public function unregisterPotionContainerChangeRecipe(PotionContainerChangeRecipe $recipe) : void{
+		$recipeIndex = array_search($recipe, $this->potionContainerChangeRecipes, true);
+		if($recipeIndex !== false){
+			unset($this->potionContainerChangeRecipes[$recipeIndex]);
+
+			foreach($this->recipeUnregisteredCallbacks as $callback){
+				$callback();
+			}
+		}
+	}
+
 	/**
 	 * @param Item[] $outputs
 	 */

src/crafting/FurnaceRecipeManager.php

@@ -25,6 +25,7 @@
 
 use pocketmine\item\Item;
 use pocketmine\utils\ObjectSet;
+use function array_search;
 
 final class FurnaceRecipeManager{
 	/** @var FurnaceRecipe[] */
@@ -39,8 +40,12 @@ final class FurnaceRecipeManager{
 	/** @phpstan-var ObjectSet<\Closure(FurnaceRecipe) : void> */
 	private ObjectSet $recipeRegisteredCallbacks;
 
+	/** @phpstan-var ObjectSet<\Closure(FurnaceRecipe) : void> */
+	private ObjectSet $recipeUnregisteredCallbacks;
+
 	public function __construct(){
 		$this->recipeRegisteredCallbacks = new ObjectSet();
+		$this->recipeUnregisteredCallbacks = new ObjectSet();
 	}
 
 	/**
@@ -50,6 +55,13 @@ public function getRecipeRegisteredCallbacks() : ObjectSet{
 		return $this->recipeRegisteredCallbacks;
 	}
 
+	/**
+	 * @phpstan-return ObjectSet<\Closure(FurnaceRecipe) : void>
+	 */
+	public function getRecipeUnregisteredCallbacks() : ObjectSet{
+		return $this->recipeUnregisteredCallbacks;
+	}
+
 	/**
 	 * @return FurnaceRecipe[]
 	 */
@@ -64,6 +76,17 @@ public function register(FurnaceRecipe $recipe) : void{
 		}
 	}
 
+	public function unregister(FurnaceRecipe $recipe) : void{
+		$index = array_search($recipe, $this->furnaceRecipes, true);
+		if($index !== false){
+			unset($this->furnaceRecipes[$index]);
+
+			foreach($this->recipeUnregisteredCallbacks as $callback){
+				$callback($recipe);
+			}
+		}
+	}
+
 	public function match(Item $input) : ?FurnaceRecipe{
 		$index = $input->getStateId();
 		$simpleRecipe = $this->lookupCache[$index] ?? null;

src/network/mcpe/cache/CraftingDataCache.php

@@ -68,6 +68,9 @@ public function getCache(CraftingManager $manager) : CraftingDataPacket{
 			$manager->getRecipeRegisteredCallbacks()->add(function() use ($id) : void{
 				unset($this->caches[$id]);
 			});
+			$manager->getRecipeUnregisteredCallbacks()->add(function() use ($id) : void{
+				unset($this->caches[$id]);
+			});
 			$this->caches[$id] = $this->buildCraftingDataCache($manager);
 		}
 		return $this->caches[$id];