mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-21 18:36:40 +00:00
Code Issues Projects Releases Wiki Activity

CraftingDataCache: Replace hardcoded recipe block names with constants from BedrockProtocol

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-08-29 16:26:18 +01:00
parent 510b75ef38
commit b4e23a57d2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,9 @@ use pocketmine\item\Item;
use pocketmine\network\mcpe\convert\TypeConverter; use pocketmine\network\mcpe\convert\TypeConverter;
use pocketmine\network\mcpe\protocol\CraftingDataPacket; use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\network\mcpe\protocol\types\inventory\ItemStack; 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\FurnaceRecipe as ProtocolFurnaceRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipeBlockName;
use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient; use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
use pocketmine\network\mcpe\protocol\types\recipe\ShapedRecipe as ProtocolShapedRecipe; use pocketmine\network\mcpe\protocol\types\recipe\ShapedRecipe as ProtocolShapedRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\ShapelessRecipe as ProtocolShapelessRecipe; use pocketmine\network\mcpe\protocol\types\recipe\ShapelessRecipe as ProtocolShapelessRecipe;
@ -87,7 +89,7 @@ final class CraftingDataCache{
return $converter->coreItemStackToNet($item); return $converter->coreItemStackToNet($item);
}, $recipe->getResults()), }, $recipe->getResults()),
$nullUUID, $nullUUID,
"crafting_table", CraftingRecipeBlockName::CRAFTING_TABLE,
50, 50,
$counter $counter
); );
@ -110,7 +112,7 @@ final class CraftingDataCache{
return $converter->coreItemStackToNet($item); return $converter->coreItemStackToNet($item);
}, $recipe->getResults()), }, $recipe->getResults()),
$nullUUID, $nullUUID,
"crafting_table", CraftingRecipeBlockName::CRAFTING_TABLE,
50, 50,
$counter $counter
); );
@ -119,9 +121,9 @@ final class CraftingDataCache{
foreach(FurnaceType::getAll() as $furnaceType){ foreach(FurnaceType::getAll() as $furnaceType){
$typeTag = match($furnaceType->id()){ $typeTag = match($furnaceType->id()){
FurnaceType::FURNACE()->id() => "furnace", FurnaceType::FURNACE()->id() => FurnaceRecipeBlockName::FURNACE,
FurnaceType::BLAST_FURNACE()->id() => "blast_furnace", FurnaceType::BLAST_FURNACE()->id() => FurnaceRecipeBlockName::BLAST_FURNACE,
FurnaceType::SMOKER()->id() => "smoker", FurnaceType::SMOKER()->id() => FurnaceRecipeBlockName::SMOKER,
default => throw new AssumptionFailedError("Unreachable"), default => throw new AssumptionFailedError("Unreachable"),
}; };
foreach($manager->getFurnaceRecipeManager($furnaceType)->getAll() as $recipe){ foreach($manager->getFurnaceRecipeManager($furnaceType)->getAll() as $recipe){