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/Palettes/Upgrade.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Protocol/Palettes/Upgrade.h') diff --git a/src/Protocol/Palettes/Upgrade.h b/src/Protocol/Palettes/Upgrade.h index 4d75009ee..f0aa87095 100644 --- a/src/Protocol/Palettes/Upgrade.h +++ b/src/Protocol/Palettes/Upgrade.h @@ -1,11 +1,12 @@ #pragma once -#include "../../BlockType.h" -#include "../../Registries/Items.h" +#include "ChunkDef.h" +#include "BlockState.h" +#include "Registries/Items.h" namespace PaletteUpgrade { - short FromBlock(BLOCKTYPE Block, NIBBLETYPE Meta); + BlockState FromBlock(BLOCKTYPE Block, NIBBLETYPE Meta); Item FromItem(short Item, short Damage); std::pair ToItem(Item ID); } -- cgit v1.2.3