flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Prepare for 1.15+ (#4856)

Browse Source 
+ Add type-safe container for states
* Split registry Blocks into BlockTypes, BlockStates so the block types enumeration can be #included without too much penalty
* Ensure Registry uses type-safe container
This commit is contained in:
Tiger Wang
2020-12-21 13:54:04 +00:00
committed by GitHub
parent 5b6bed6b00
commit 9518a27357
26 changed files with 72531 additions and 66530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Protocol/ChunkDataSerializer.cpp
+3 -3
View File
@@ -42,17 +42,17 @@ namespace
auto Palette393(const BLOCKTYPE a_BlockType, const NIBBLETYPE a_Meta)
{
return Palette_1_13::FromBlock(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
return Palette_1_13::From(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
}
auto Palette401(const BLOCKTYPE a_BlockType, const NIBBLETYPE a_Meta)
{
return Palette_1_13_1::FromBlock(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
return Palette_1_13_1::From(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
}
auto Palette477(const BLOCKTYPE a_BlockType, const NIBBLETYPE a_Meta)
{
return Palette_1_14::FromBlock(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
return Palette_1_14::From(PaletteUpgrade::FromBlock(a_BlockType, a_Meta));
}
}