From 4aef80b47eb6941d7fc41e57efe147af0ece1f9b Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 3 Jan 2020 17:31:13 +0100 Subject: Added temporary block type mapping for 1.13+ protocols. --- src/Root.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/Root.h') diff --git a/src/Root.h b/src/Root.h index 1d3a6a347..90676a7df 100644 --- a/src/Root.h +++ b/src/Root.h @@ -29,6 +29,7 @@ class cSettingsRepositoryInterface; class cDeadlockDetect; class cUUID; class BlockTypePalette; +class ProtocolPalettes; using cPlayerListCallback = cFunctionRef; using cWorldListCallback = cFunctionRef; @@ -96,6 +97,9 @@ public: /** Returns the block type palette used for upgrading blocks from pre-1.13 data. */ const BlockTypePalette & GetUpgradeBlockTypePalette() const { return *m_UpgradeBlockTypePalette; } + /** Returns the per-protocol palettes manager. */ + ProtocolPalettes & GetProtocolPalettes() const { return *m_ProtocolPalettes; } + /** 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 @@ -241,9 +245,16 @@ private: /** The upgrade palette for pre-1.13 blocks. */ std::unique_ptr m_UpgradeBlockTypePalette; + /** The per-protocol palettes manager. */ + std::unique_ptr m_ProtocolPalettes; + void LoadGlobalSettings(); + /** Loads the upgrade palette and the per-protocol palettes. + The aProtocolFolder is the path to the folder containing the per-protocol palettes. */ + void LoadPalettes(const AString & aProtocolFolder); + /** Loads the worlds from settings.ini, creates the worldmap */ void LoadWorlds(cDeadlockDetect & a_dd, cSettingsRepositoryInterface & a_Settings, bool a_IsNewIniFile); -- cgit v1.2.3