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

Item is no longer JsonSerializable

Browse Source 
before anyone starts screaming:

1) it's easy to create your own wrapper that converts items to arrays
2) there is no longer a single standard way to encode items.
3) the way that item serialization now works requires an ItemSerializer, which, barring singleton use, must be dependency-injected. Since there's no way to inject dependencies into jsonSerialize(), this means that its behaviour cannot be customized.
This commit is contained in:
Dylan K. Taylor
2022-06-30 19:16:20 +01:00
parent 4bd087fc83
commit db2b523762
3 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/crafting/CraftingManagerFromDataHelper.php
View File

@ -57,7 +57,7 @@ final class CraftingManagerFromDataHelper{
//TODO: we need to stop using jsonDeserialize for this
try{
$item = Item::jsonDeserialize($data);
$item = Item::legacyJsonDeserialize($data);
}catch(SavedDataLoadingException){
//unknown item
return null;
@ -74,7 +74,7 @@ final class CraftingManagerFromDataHelper{
$result = new CraftingManager();
$ingredientDeserializerFunc = \Closure::fromCallable([self::class, "deserializeIngredient"]);
$itemDeserializerFunc = \Closure::fromCallable([Item::class, 'jsonDeserialize']);
$itemDeserializerFunc = \Closure::fromCallable([Item::class, 'legacyJsonDeserialize']);
foreach($recipes["shapeless"] as $recipe){
$recipeType = match($recipe["block"]){
@ -142,7 +142,7 @@ final class CraftingManagerFromDataHelper{
continue;
}
try{
$output = Item::jsonDeserialize($recipe["output"]);
$output = Item::legacyJsonDeserialize($recipe["output"]);
}catch(SavedDataLoadingException){
continue;
}
@ -157,9 +157,9 @@ final class CraftingManagerFromDataHelper{
}
foreach($recipes["potion_type"] as $recipe){
try{
$input = Item::jsonDeserialize($recipe["input"]);
$ingredient = Item::jsonDeserialize($recipe["ingredient"]);
$output = Item::jsonDeserialize($recipe["output"]);
$input = Item::legacyJsonDeserialize($recipe["input"]);
$ingredient = Item::legacyJsonDeserialize($recipe["ingredient"]);
$output = Item::legacyJsonDeserialize($recipe["output"]);
}catch(SavedDataLoadingException){
//unknown item
continue;
@ -172,7 +172,7 @@ final class CraftingManagerFromDataHelper{
}
foreach($recipes["potion_container_change"] as $recipe){
try{
$ingredient = Item::jsonDeserialize($recipe["ingredient"]);
$ingredient = Item::legacyJsonDeserialize($recipe["ingredient"]);
}catch(SavedDataLoadingException){
//unknown item
continue;