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.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Protocol/Palettes/Upgrade.cpp') diff --git a/src/Protocol/Palettes/Upgrade.cpp b/src/Protocol/Palettes/Upgrade.cpp index 8805a7d31..7dbeea8e5 100644 --- a/src/Protocol/Palettes/Upgrade.cpp +++ b/src/Protocol/Palettes/Upgrade.cpp @@ -1,11 +1,11 @@ #include "Globals.h" #include "Upgrade.h" -#include "../../Registries/Blocks.h" +#include "Registries/BlockStates.h" namespace PaletteUpgrade { - short FromBlock(BLOCKTYPE Block, NIBBLETYPE Meta) + BlockState FromBlock(const BLOCKTYPE Block, const NIBBLETYPE Meta) { using namespace Block; @@ -1705,7 +1705,7 @@ namespace PaletteUpgrade } } - Item FromItem(short Item, short Damage) + Item FromItem(const short Item, const short Damage) { switch ((Item << 16) | Damage) { @@ -2516,7 +2516,7 @@ namespace PaletteUpgrade } } - std::pair ToItem(Item ID) + std::pair ToItem(const Item ID) { switch (ID) { -- cgit v1.2.3