From b63bb2f694af8a0d6ef698534b1cf02a62514940 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 2 Jan 2020 15:11:49 +0100 Subject: Root: Load the UpgradeBlockTypePalette on startup. --- src/Root.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/Root.h') diff --git a/src/Root.h b/src/Root.h index 169a78194..1d3a6a347 100644 --- a/src/Root.h +++ b/src/Root.h @@ -28,6 +28,7 @@ class cCompositeChat; class cSettingsRepositoryInterface; class cDeadlockDetect; class cUUID; +class BlockTypePalette; using cPlayerListCallback = cFunctionRef; using cWorldListCallback = cFunctionRef; @@ -92,6 +93,9 @@ public: /** Returns the (read-write) storage for registered block types. */ BlockTypeRegistry & GetBlockTypeRegistry() { return m_BlockTypeRegistry; } + /** Returns the block type palette used for upgrading blocks from pre-1.13 data. */ + const BlockTypePalette & GetUpgradeBlockTypePalette() const { return *m_UpgradeBlockTypePalette; } + /** Returns the number of ticks for how long the item would fuel a furnace. Returns zero if not a fuel */ static int GetFurnaceFuelBurnTime(const cItem & a_Fuel); // tolua_export @@ -234,6 +238,9 @@ private: /** The storage for all registered block types. */ BlockTypeRegistry m_BlockTypeRegistry; + /** The upgrade palette for pre-1.13 blocks. */ + std::unique_ptr m_UpgradeBlockTypePalette; + void LoadGlobalSettings(); -- cgit v1.2.3