From 9518a273570e8d38438c2a29aa10f987e7d44ce1 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 21 Dec 2020 13:54:04 +0000 Subject: Prepare for 1.15+ (#4856) + 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 --- src/Protocol/ChunkDataSerializer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Protocol/ChunkDataSerializer.cpp') diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp index d2b8489ea..ac740a145 100644 --- a/src/Protocol/ChunkDataSerializer.cpp +++ b/src/Protocol/ChunkDataSerializer.cpp @@ -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)); } } -- cgit v1.2.3