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

Migrate all but two remaining legacy enums to native PHP 8.1 enums

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-09-07 19:32:45 +01:00
parent ae564e445d
commit 94d98fb5c4
57 changed files with 1027 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
View File

@ -134,44 +134,44 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
private function registerCandleDeserializers() : void{
$this->map(Ids::CANDLE, fn(Reader $in) => Helper::decodeCandle(Blocks::CANDLE(), $in));
foreach([
Ids::BLACK_CANDLE => DyeColor::BLACK(),
Ids::BLUE_CANDLE => DyeColor::BLUE(),
Ids::BROWN_CANDLE => DyeColor::BROWN(),
Ids::CYAN_CANDLE => DyeColor::CYAN(),
Ids::GRAY_CANDLE => DyeColor::GRAY(),
Ids::GREEN_CANDLE => DyeColor::GREEN(),
Ids::LIGHT_BLUE_CANDLE => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_CANDLE => DyeColor::LIGHT_GRAY(),
Ids::LIME_CANDLE => DyeColor::LIME(),
Ids::MAGENTA_CANDLE => DyeColor::MAGENTA(),
Ids::ORANGE_CANDLE => DyeColor::ORANGE(),
Ids::PINK_CANDLE => DyeColor::PINK(),
Ids::PURPLE_CANDLE => DyeColor::PURPLE(),
Ids::RED_CANDLE => DyeColor::RED(),
Ids::WHITE_CANDLE => DyeColor::WHITE(),
Ids::YELLOW_CANDLE => DyeColor::YELLOW(),
Ids::BLACK_CANDLE => DyeColor::BLACK,
Ids::BLUE_CANDLE => DyeColor::BLUE,
Ids::BROWN_CANDLE => DyeColor::BROWN,
Ids::CYAN_CANDLE => DyeColor::CYAN,
Ids::GRAY_CANDLE => DyeColor::GRAY,
Ids::GREEN_CANDLE => DyeColor::GREEN,
Ids::LIGHT_BLUE_CANDLE => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_CANDLE => DyeColor::LIGHT_GRAY,
Ids::LIME_CANDLE => DyeColor::LIME,
Ids::MAGENTA_CANDLE => DyeColor::MAGENTA,
Ids::ORANGE_CANDLE => DyeColor::ORANGE,
Ids::PINK_CANDLE => DyeColor::PINK,
Ids::PURPLE_CANDLE => DyeColor::PURPLE,
Ids::RED_CANDLE => DyeColor::RED,
Ids::WHITE_CANDLE => DyeColor::WHITE,
Ids::YELLOW_CANDLE => DyeColor::YELLOW,
] as $id => $color){
$this->map($id, fn(Reader $in) => Helper::decodeCandle(Blocks::DYED_CANDLE()->setColor($color), $in));
}
$this->map(Ids::CANDLE_CAKE, fn(Reader $in) => Blocks::CAKE_WITH_CANDLE()->setLit($in->readBool(StateNames::LIT)));
foreach([
Ids::BLACK_CANDLE_CAKE => DyeColor::BLACK(),
Ids::BLUE_CANDLE_CAKE => DyeColor::BLUE(),
Ids::BROWN_CANDLE_CAKE => DyeColor::BROWN(),
Ids::CYAN_CANDLE_CAKE => DyeColor::CYAN(),
Ids::GRAY_CANDLE_CAKE => DyeColor::GRAY(),
Ids::GREEN_CANDLE_CAKE => DyeColor::GREEN(),
Ids::LIGHT_BLUE_CANDLE_CAKE => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_CANDLE_CAKE => DyeColor::LIGHT_GRAY(),
Ids::LIME_CANDLE_CAKE => DyeColor::LIME(),
Ids::MAGENTA_CANDLE_CAKE => DyeColor::MAGENTA(),
Ids::ORANGE_CANDLE_CAKE => DyeColor::ORANGE(),
Ids::PINK_CANDLE_CAKE => DyeColor::PINK(),
Ids::PURPLE_CANDLE_CAKE => DyeColor::PURPLE(),
Ids::RED_CANDLE_CAKE => DyeColor::RED(),
Ids::WHITE_CANDLE_CAKE => DyeColor::WHITE(),
Ids::YELLOW_CANDLE_CAKE => DyeColor::YELLOW(),
Ids::BLACK_CANDLE_CAKE => DyeColor::BLACK,
Ids::BLUE_CANDLE_CAKE => DyeColor::BLUE,
Ids::BROWN_CANDLE_CAKE => DyeColor::BROWN,
Ids::CYAN_CANDLE_CAKE => DyeColor::CYAN,
Ids::GRAY_CANDLE_CAKE => DyeColor::GRAY,
Ids::GREEN_CANDLE_CAKE => DyeColor::GREEN,
Ids::LIGHT_BLUE_CANDLE_CAKE => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_CANDLE_CAKE => DyeColor::LIGHT_GRAY,
Ids::LIME_CANDLE_CAKE => DyeColor::LIME,
Ids::MAGENTA_CANDLE_CAKE => DyeColor::MAGENTA,
Ids::ORANGE_CANDLE_CAKE => DyeColor::ORANGE,
Ids::PINK_CANDLE_CAKE => DyeColor::PINK,
Ids::PURPLE_CANDLE_CAKE => DyeColor::PURPLE,
Ids::RED_CANDLE_CAKE => DyeColor::RED,
Ids::WHITE_CANDLE_CAKE => DyeColor::WHITE,
Ids::YELLOW_CANDLE_CAKE => DyeColor::YELLOW,
] as $id => $color){
$this->map($id, fn(Reader $in) => Blocks::CAKE_WITH_DYED_CANDLE()
->setColor($color)
@ -182,22 +182,22 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
private function registerFlatColorBlockDeserializers() : void{
foreach([
Ids::BLACK_GLAZED_TERRACOTTA => DyeColor::BLACK(),
Ids::BLUE_GLAZED_TERRACOTTA => DyeColor::BLUE(),
Ids::BROWN_GLAZED_TERRACOTTA => DyeColor::BROWN(),
Ids::CYAN_GLAZED_TERRACOTTA => DyeColor::CYAN(),
Ids::GRAY_GLAZED_TERRACOTTA => DyeColor::GRAY(),
Ids::GREEN_GLAZED_TERRACOTTA => DyeColor::GREEN(),
Ids::LIGHT_BLUE_GLAZED_TERRACOTTA => DyeColor::LIGHT_BLUE(),
Ids::SILVER_GLAZED_TERRACOTTA => DyeColor::LIGHT_GRAY(),
Ids::LIME_GLAZED_TERRACOTTA => DyeColor::LIME(),
Ids::MAGENTA_GLAZED_TERRACOTTA => DyeColor::MAGENTA(),
Ids::ORANGE_GLAZED_TERRACOTTA => DyeColor::ORANGE(),
Ids::PINK_GLAZED_TERRACOTTA => DyeColor::PINK(),
Ids::PURPLE_GLAZED_TERRACOTTA => DyeColor::PURPLE(),
Ids::RED_GLAZED_TERRACOTTA => DyeColor::RED(),
Ids::WHITE_GLAZED_TERRACOTTA => DyeColor::WHITE(),
Ids::YELLOW_GLAZED_TERRACOTTA => DyeColor::YELLOW(),
Ids::BLACK_GLAZED_TERRACOTTA => DyeColor::BLACK,
Ids::BLUE_GLAZED_TERRACOTTA => DyeColor::BLUE,
Ids::BROWN_GLAZED_TERRACOTTA => DyeColor::BROWN,
Ids::CYAN_GLAZED_TERRACOTTA => DyeColor::CYAN,
Ids::GRAY_GLAZED_TERRACOTTA => DyeColor::GRAY,
Ids::GREEN_GLAZED_TERRACOTTA => DyeColor::GREEN,
Ids::LIGHT_BLUE_GLAZED_TERRACOTTA => DyeColor::LIGHT_BLUE,
Ids::SILVER_GLAZED_TERRACOTTA => DyeColor::LIGHT_GRAY,
Ids::LIME_GLAZED_TERRACOTTA => DyeColor::LIME,
Ids::MAGENTA_GLAZED_TERRACOTTA => DyeColor::MAGENTA,
Ids::ORANGE_GLAZED_TERRACOTTA => DyeColor::ORANGE,
Ids::PINK_GLAZED_TERRACOTTA => DyeColor::PINK,
Ids::PURPLE_GLAZED_TERRACOTTA => DyeColor::PURPLE,
Ids::RED_GLAZED_TERRACOTTA => DyeColor::RED,
Ids::WHITE_GLAZED_TERRACOTTA => DyeColor::WHITE,
Ids::YELLOW_GLAZED_TERRACOTTA => DyeColor::YELLOW,
] as $id => $color){
$this->map($id, fn(Reader $in) => Blocks::GLAZED_TERRACOTTA()
->setColor($color)
@ -206,85 +206,85 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
}
foreach([
Ids::BLACK_WOOL => DyeColor::BLACK(),
Ids::BLUE_WOOL => DyeColor::BLUE(),
Ids::BROWN_WOOL => DyeColor::BROWN(),
Ids::CYAN_WOOL => DyeColor::CYAN(),
Ids::GRAY_WOOL => DyeColor::GRAY(),
Ids::GREEN_WOOL => DyeColor::GREEN(),
Ids::LIGHT_BLUE_WOOL => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_WOOL => DyeColor::LIGHT_GRAY(),
Ids::LIME_WOOL => DyeColor::LIME(),
Ids::MAGENTA_WOOL => DyeColor::MAGENTA(),
Ids::ORANGE_WOOL => DyeColor::ORANGE(),
Ids::PINK_WOOL => DyeColor::PINK(),
Ids::PURPLE_WOOL => DyeColor::PURPLE(),
Ids::RED_WOOL => DyeColor::RED(),
Ids::WHITE_WOOL => DyeColor::WHITE(),
Ids::YELLOW_WOOL => DyeColor::YELLOW(),
Ids::BLACK_WOOL => DyeColor::BLACK,
Ids::BLUE_WOOL => DyeColor::BLUE,
Ids::BROWN_WOOL => DyeColor::BROWN,
Ids::CYAN_WOOL => DyeColor::CYAN,
Ids::GRAY_WOOL => DyeColor::GRAY,
Ids::GREEN_WOOL => DyeColor::GREEN,
Ids::LIGHT_BLUE_WOOL => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_WOOL => DyeColor::LIGHT_GRAY,
Ids::LIME_WOOL => DyeColor::LIME,
Ids::MAGENTA_WOOL => DyeColor::MAGENTA,
Ids::ORANGE_WOOL => DyeColor::ORANGE,
Ids::PINK_WOOL => DyeColor::PINK,
Ids::PURPLE_WOOL => DyeColor::PURPLE,
Ids::RED_WOOL => DyeColor::RED,
Ids::WHITE_WOOL => DyeColor::WHITE,
Ids::YELLOW_WOOL => DyeColor::YELLOW,
] as $id => $color){
$this->mapSimple($id, fn() => Blocks::WOOL()->setColor($color));
}
foreach([
Ids::BLACK_CARPET => DyeColor::BLACK(),
Ids::BLUE_CARPET => DyeColor::BLUE(),
Ids::BROWN_CARPET => DyeColor::BROWN(),
Ids::CYAN_CARPET => DyeColor::CYAN(),
Ids::GRAY_CARPET => DyeColor::GRAY(),
Ids::GREEN_CARPET => DyeColor::GREEN(),
Ids::LIGHT_BLUE_CARPET => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_CARPET => DyeColor::LIGHT_GRAY(),
Ids::LIME_CARPET => DyeColor::LIME(),
Ids::MAGENTA_CARPET => DyeColor::MAGENTA(),
Ids::ORANGE_CARPET => DyeColor::ORANGE(),
Ids::PINK_CARPET => DyeColor::PINK(),
Ids::PURPLE_CARPET => DyeColor::PURPLE(),
Ids::RED_CARPET => DyeColor::RED(),
Ids::WHITE_CARPET => DyeColor::WHITE(),
Ids::YELLOW_CARPET => DyeColor::YELLOW(),
Ids::BLACK_CARPET => DyeColor::BLACK,
Ids::BLUE_CARPET => DyeColor::BLUE,
Ids::BROWN_CARPET => DyeColor::BROWN,
Ids::CYAN_CARPET => DyeColor::CYAN,
Ids::GRAY_CARPET => DyeColor::GRAY,
Ids::GREEN_CARPET => DyeColor::GREEN,
Ids::LIGHT_BLUE_CARPET => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_CARPET => DyeColor::LIGHT_GRAY,
Ids::LIME_CARPET => DyeColor::LIME,
Ids::MAGENTA_CARPET => DyeColor::MAGENTA,
Ids::ORANGE_CARPET => DyeColor::ORANGE,
Ids::PINK_CARPET => DyeColor::PINK,
Ids::PURPLE_CARPET => DyeColor::PURPLE,
Ids::RED_CARPET => DyeColor::RED,
Ids::WHITE_CARPET => DyeColor::WHITE,
Ids::YELLOW_CARPET => DyeColor::YELLOW,
] as $id => $color){
$this->mapSimple($id, fn() => Blocks::CARPET()->setColor($color));
}
foreach([
Ids::BLACK_SHULKER_BOX => DyeColor::BLACK(),
Ids::BLUE_SHULKER_BOX => DyeColor::BLUE(),
Ids::BROWN_SHULKER_BOX => DyeColor::BROWN(),
Ids::CYAN_SHULKER_BOX => DyeColor::CYAN(),
Ids::GRAY_SHULKER_BOX => DyeColor::GRAY(),
Ids::GREEN_SHULKER_BOX => DyeColor::GREEN(),
Ids::LIGHT_BLUE_SHULKER_BOX => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_SHULKER_BOX => DyeColor::LIGHT_GRAY(),
Ids::LIME_SHULKER_BOX => DyeColor::LIME(),
Ids::MAGENTA_SHULKER_BOX => DyeColor::MAGENTA(),
Ids::ORANGE_SHULKER_BOX => DyeColor::ORANGE(),
Ids::PINK_SHULKER_BOX => DyeColor::PINK(),
Ids::PURPLE_SHULKER_BOX => DyeColor::PURPLE(),
Ids::RED_SHULKER_BOX => DyeColor::RED(),
Ids::WHITE_SHULKER_BOX => DyeColor::WHITE(),
Ids::YELLOW_SHULKER_BOX => DyeColor::YELLOW(),
Ids::BLACK_SHULKER_BOX => DyeColor::BLACK,
Ids::BLUE_SHULKER_BOX => DyeColor::BLUE,
Ids::BROWN_SHULKER_BOX => DyeColor::BROWN,
Ids::CYAN_SHULKER_BOX => DyeColor::CYAN,
Ids::GRAY_SHULKER_BOX => DyeColor::GRAY,
Ids::GREEN_SHULKER_BOX => DyeColor::GREEN,
Ids::LIGHT_BLUE_SHULKER_BOX => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_SHULKER_BOX => DyeColor::LIGHT_GRAY,
Ids::LIME_SHULKER_BOX => DyeColor::LIME,
Ids::MAGENTA_SHULKER_BOX => DyeColor::MAGENTA,
Ids::ORANGE_SHULKER_BOX => DyeColor::ORANGE,
Ids::PINK_SHULKER_BOX => DyeColor::PINK,
Ids::PURPLE_SHULKER_BOX => DyeColor::PURPLE,
Ids::RED_SHULKER_BOX => DyeColor::RED,
Ids::WHITE_SHULKER_BOX => DyeColor::WHITE,
Ids::YELLOW_SHULKER_BOX => DyeColor::YELLOW,
] as $id => $color){
$this->mapSimple($id, fn() => Blocks::DYED_SHULKER_BOX()->setColor($color));
}
foreach([
Ids::BLACK_CONCRETE => DyeColor::BLACK(),
Ids::BLUE_CONCRETE => DyeColor::BLUE(),
Ids::BROWN_CONCRETE => DyeColor::BROWN(),
Ids::CYAN_CONCRETE => DyeColor::CYAN(),
Ids::GRAY_CONCRETE => DyeColor::GRAY(),
Ids::GREEN_CONCRETE => DyeColor::GREEN(),
Ids::LIGHT_BLUE_CONCRETE => DyeColor::LIGHT_BLUE(),
Ids::LIGHT_GRAY_CONCRETE => DyeColor::LIGHT_GRAY(),
Ids::LIME_CONCRETE => DyeColor::LIME(),
Ids::MAGENTA_CONCRETE => DyeColor::MAGENTA(),
Ids::ORANGE_CONCRETE => DyeColor::ORANGE(),
Ids::PINK_CONCRETE => DyeColor::PINK(),
Ids::PURPLE_CONCRETE => DyeColor::PURPLE(),
Ids::RED_CONCRETE => DyeColor::RED(),
Ids::WHITE_CONCRETE => DyeColor::WHITE(),
Ids::YELLOW_CONCRETE => DyeColor::YELLOW(),
Ids::BLACK_CONCRETE => DyeColor::BLACK,
Ids::BLUE_CONCRETE => DyeColor::BLUE,
Ids::BROWN_CONCRETE => DyeColor::BROWN,
Ids::CYAN_CONCRETE => DyeColor::CYAN,
Ids::GRAY_CONCRETE => DyeColor::GRAY,
Ids::GREEN_CONCRETE => DyeColor::GREEN,
Ids::LIGHT_BLUE_CONCRETE => DyeColor::LIGHT_BLUE,
Ids::LIGHT_GRAY_CONCRETE => DyeColor::LIGHT_GRAY,
Ids::LIME_CONCRETE => DyeColor::LIME,
Ids::MAGENTA_CONCRETE => DyeColor::MAGENTA,
Ids::ORANGE_CONCRETE => DyeColor::ORANGE,
Ids::PINK_CONCRETE => DyeColor::PINK,
Ids::PURPLE_CONCRETE => DyeColor::PURPLE,
Ids::RED_CONCRETE => DyeColor::RED,
Ids::WHITE_CONCRETE => DyeColor::WHITE,
Ids::YELLOW_CONCRETE => DyeColor::YELLOW,
] as $id => $color){
$this->mapSimple($id, fn() => Blocks::CONCRETE()->setColor($color));
}