mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next-minor' into next-major

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-09-21 15:07:11 +01:00
parent 2a982d48ad 89e29448ee
commit b39eaaf91f
16 changed files with 208 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/mcpe/cache/CraftingDataCache.php vendored
View File

@ -35,6 +35,7 @@ use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
use pocketmine\network\mcpe\protocol\types\recipe\CraftingRecipeBlockName;
use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipe as ProtocolFurnaceRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipeBlockName;
use pocketmine\network\mcpe\protocol\types\recipe\IntIdMetaItemDescriptor;
use pocketmine\network\mcpe\protocol\types\recipe\PotionContainerChangeRecipe as ProtocolPotionContainerChangeRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\PotionTypeRecipe as ProtocolPotionTypeRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient as ProtocolRecipeIngredient;
@ -138,7 +139,10 @@ final class CraftingDataCache{
default => throw new AssumptionFailedError("Unreachable"),
};
foreach($manager->getFurnaceRecipeManager($furnaceType)->getAll() as $recipe){
$input = $converter->coreRecipeIngredientToNet($recipe->getInput());
$input = $converter->coreRecipeIngredientToNet($recipe->getInput())->getDescriptor();
if(!$input instanceof IntIdMetaItemDescriptor){
throw new AssumptionFailedError();
}
$recipesWithTypeIds[] = new ProtocolFurnaceRecipe(
CraftingDataPacket::ENTRY_FURNACE_DATA,
$input->getId(),
@ -151,8 +155,11 @@ final class CraftingDataCache{
$potionTypeRecipes = [];
foreach($manager->getPotionTypeRecipes() as $recipe){
$input = $converter->coreRecipeIngredientToNet($recipe->getInput());
$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient());
$input = $converter->coreRecipeIngredientToNet($recipe->getInput())->getDescriptor();
$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient())->getDescriptor();
if(!$input instanceof IntIdMetaItemDescriptor || !$ingredient instanceof IntIdMetaItemDescriptor){
throw new AssumptionFailedError();
}
$output = $converter->coreItemStackToNet($recipe->getOutput());
$potionTypeRecipes[] = new ProtocolPotionTypeRecipe(
$input->getId(),
@ -168,7 +175,10 @@ final class CraftingDataCache{
$itemTypeDictionary = GlobalItemTypeDictionary::getInstance()->getDictionary();
foreach($manager->getPotionContainerChangeRecipes() as $recipe){
$input = $itemTypeDictionary->fromStringId($recipe->getInputItemId());
$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient());
$ingredient = $converter->coreRecipeIngredientToNet($recipe->getIngredient())->getDescriptor();
if(!$ingredient instanceof IntIdMetaItemDescriptor){
throw new AssumptionFailedError();
}
$output = $itemTypeDictionary->fromStringId($recipe->getOutputItemId());
$potionContainerChangeRecipes[] = new ProtocolPotionContainerChangeRecipe(
$input,