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

PM5-specific changes for 1.19.80

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-04-26 23:30:56 +01:00
parent 0dca85af44
commit a8dec1adb1
10 changed files with 152 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/generate-bedrock-data-from-packets.php
View File

@ -31,6 +31,7 @@ use pocketmine\crafting\json\RecipeIngredientData;
use pocketmine\crafting\json\ShapedRecipeData;
use pocketmine\crafting\json\ShapelessRecipeData;
use pocketmine\crafting\json\SmithingTransformRecipeData;
use pocketmine\crafting\json\SmithingTrimRecipeData;
use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\nbt\LittleEndianNbtSerializer;
use pocketmine\nbt\NBT;
@ -62,6 +63,7 @@ use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
use pocketmine\network\mcpe\protocol\types\recipe\ShapedRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\ShapelessRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\SmithingTransformRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\SmithingTrimRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\StringIdMetaItemDescriptor;
use pocketmine\network\mcpe\protocol\types\recipe\TagItemDescriptor;
use pocketmine\network\PacketHandlingException;
@ -348,6 +350,7 @@ class ParserPacketHandler extends PacketHandler{
private function smithingRecipeToJson(SmithingTransformRecipe $recipe) : SmithingTransformRecipeData{
return new SmithingTransformRecipeData(
$this->recipeIngredientToJson($recipe->getTemplate()),
$this->recipeIngredientToJson($recipe->getInput()),
$this->recipeIngredientToJson($recipe->getAddition()),
$this->itemStackToJson($recipe->getOutput()),
@ -355,6 +358,15 @@ class ParserPacketHandler extends PacketHandler{
);
}
private function smithingTrimRecipeToJson(SmithingTrimRecipe $recipe) : SmithingTrimRecipeData{
return new SmithingTrimRecipeData(
$this->recipeIngredientToJson($recipe->getTemplate()),
$this->recipeIngredientToJson($recipe->getInput()),
$this->recipeIngredientToJson($recipe->getAddition()),
$recipe->getBlockName()
);
}
public function handleCraftingData(CraftingDataPacket $packet) : bool{
echo "updating crafting data\n";
@ -374,6 +386,7 @@ class ParserPacketHandler extends PacketHandler{
CraftingDataPacket::ENTRY_SHAPELESS_CHEMISTRY => "shapeless_chemistry",
CraftingDataPacket::ENTRY_SHAPED_CHEMISTRY => "shaped_chemistry",
CraftingDataPacket::ENTRY_SMITHING_TRANSFORM => "smithing",
CraftingDataPacket::ENTRY_SMITHING_TRIM => "smithing_trim",
];
if(!isset($typeMap[$entry->getTypeId()])){
throw new \UnexpectedValueException("Unknown recipe type ID " . $entry->getTypeId());
@ -390,6 +403,8 @@ class ParserPacketHandler extends PacketHandler{
$recipes[$mappedType][] = $this->furnaceRecipeToJson($entry);
}elseif($entry instanceof SmithingTransformRecipe){
$recipes[$mappedType][] = $this->smithingRecipeToJson($entry);
}elseif($entry instanceof SmithingTrimRecipe){
$recipes[$mappedType][] = $this->smithingTrimRecipeToJson($entry);
}else{
throw new AssumptionFailedError("Unknown recipe type " . get_class($entry));
}