Move GDExtension menu-related functions to MenuSingletonmenu-singleton

7 files changed, 366 insertions, 250 deletions

diff --git a/extension/src/openvic-extension/register_types.cpp b/extension/src/openvic-extension/register_types.cpp
index 750cc53..fffb370 100644
--- a/extension/src/openvic-extension/register_types.cpp
+++ b/extension/src/openvic-extension/register_types.cpp
@@ -15,14 +15,16 @@
 #include "openvic-extension/singletons/Checksum.hpp"
 #include "openvic-extension/singletons/GameSingleton.hpp"
 #include "openvic-extension/singletons/LoadLocalisation.hpp"
+#include "openvic-extension/singletons/MenuSingleton.hpp"
 
 using namespace godot;
 using namespace OpenVic;
 
-static Checksum* _checksum_singleton;
-static LoadLocalisation* _load_localisation;
-static GameSingleton* _game_singleton;
-static AssetManager* _asset_manager_singleton;
+static Checksum* _checksum_singleton = nullptr;
+static LoadLocalisation* _load_localisation = nullptr;
+static GameSingleton* _game_singleton = nullptr;
+static MenuSingleton* _menu_singleton = nullptr;
+static AssetManager* _asset_manager_singleton = nullptr;
 
 void initialize_openvic_types(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
@@ -41,6 +43,10 @@ void initialize_openvic_types(ModuleInitializationLevel p_level) {
 	_game_singleton = memnew(GameSingleton);
 	Engine::get_singleton()->register_singleton("GameSingleton", GameSingleton::get_singleton());
 
+	ClassDB::register_class<MenuSingleton>();
+	_menu_singleton = memnew(MenuSingleton);
+	Engine::get_singleton()->register_singleton("MenuSingleton", MenuSingleton::get_singleton());
+
 	ClassDB::register_class<AssetManager>();
 	_asset_manager_singleton = memnew(AssetManager);
 	Engine::get_singleton()->register_singleton("AssetManager", AssetManager::get_singleton());
@@ -77,6 +83,9 @@ void uninitialize_openvic_types(ModuleInitializationLevel p_level) {
 	Engine::get_singleton()->unregister_singleton("GameSingleton");
 	memdelete(_game_singleton);
 
+	Engine::get_singleton()->unregister_singleton("MenuSingleton");
+	memdelete(_menu_singleton);
+
 	Engine::get_singleton()->unregister_singleton("AssetManager");
 	memdelete(_asset_manager_singleton);
 }
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.cpp b/extension/src/openvic-extension/singletons/GameSingleton.cpp
index 8893f75..459b2c8 100644
--- a/extension/src/openvic-extension/singletons/GameSingleton.cpp
+++ b/extension/src/openvic-extension/singletons/GameSingleton.cpp
@@ -2,13 +2,11 @@
 
 #include <functional>
 
-#include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
 
 #include <openvic-simulation/utility/Logger.hpp>
 
-#include "openvic-extension/classes/GFXPieChartTexture.hpp"
 #include "openvic-extension/singletons/AssetManager.hpp"
 #include "openvic-extension/singletons/LoadLocalisation.hpp"
 #include "openvic-extension/utility/ClassBindings.hpp"
@@ -49,7 +47,6 @@ void GameSingleton::_bind_methods() {
 	OV_BIND_METHOD(GameSingleton::setup_game, { "bookmark_index" });
 
 	OV_BIND_METHOD(GameSingleton::get_province_index_from_uv_coords, { "coords" });
-	OV_BIND_METHOD(GameSingleton::get_province_info_from_index, { "index" });
 
 	OV_BIND_METHOD(GameSingleton::get_map_width);
 	OV_BIND_METHOD(GameSingleton::get_map_height);
@@ -66,22 +63,6 @@ void GameSingleton::_bind_methods() {
 	OV_BIND_METHOD(GameSingleton::get_selected_province_index);
 	OV_BIND_METHOD(GameSingleton::set_selected_province, { "index" });
 
-	OV_BIND_METHOD(GameSingleton::get_province_building_count);
-	OV_BIND_METHOD(GameSingleton::get_province_building_identifier, { "building_index" });
-	OV_BIND_METHOD(GameSingleton::expand_selected_province_building, { "building_index" });
-	OV_BIND_METHOD(GameSingleton::get_slave_pop_icon_index);
-	OV_BIND_METHOD(GameSingleton::get_administrative_pop_icon_index);
-	OV_BIND_METHOD(GameSingleton::get_rgo_owner_pop_icon_index);
-
-	OV_BIND_METHOD(GameSingleton::set_paused, { "paused" });
-	OV_BIND_METHOD(GameSingleton::toggle_paused);
-	OV_BIND_METHOD(GameSingleton::is_paused);
-	OV_BIND_METHOD(GameSingleton::increase_speed);
-	OV_BIND_METHOD(GameSingleton::decrease_speed);
-	OV_BIND_METHOD(GameSingleton::get_speed);
-	OV_BIND_METHOD(GameSingleton::can_increase_speed);
-	OV_BIND_METHOD(GameSingleton::can_decrease_speed);
-	OV_BIND_METHOD(GameSingleton::get_longform_date);
 	OV_BIND_METHOD(GameSingleton::try_tick);
 
 	ADD_SIGNAL(MethodInfo(_signal_gamestate_updated()));
@@ -112,6 +93,7 @@ GameSingleton::GameSingleton()
 	ERR_FAIL_COND(singleton != nullptr);
 	singleton = this;
 }
+
 GameSingleton::~GameSingleton() {
 	ERR_FAIL_COND(singleton != this);
 	singleton = nullptr;
@@ -149,122 +131,6 @@ int32_t GameSingleton::get_province_index_from_uv_coords(Vector2 const& coords)
 	return game_manager.get_map().get_province_index_at(x_mod_w, y_mod_h);
 }
 
-Dictionary GameSingleton::get_province_info_from_index(int32_t index) const {
-	static const StringName province_info_province_key = "province";
-	static const StringName province_info_region_key = "region";
-	static const StringName province_info_slave_status_key = "slave_status";
-	static const StringName province_info_colony_status_key = "colony_status";
-	static const StringName province_info_terrain_type_key = "terrain_type";
-	static const StringName province_info_life_rating_key = "life_rating";
-	static const StringName province_info_controller_key = "controller";
-	static const StringName province_info_rgo_name_key = "rgo_name";
-	static const StringName province_info_rgo_icon_key = "rgo_icon";
-	static const StringName province_info_crime_name_key = "crime_name";
-	static const StringName province_info_crime_icon_key = "crime_icon";
-	static const StringName province_info_total_population_key = "total_population";
-	static const StringName province_info_pop_types_key = "pop_types";
-	static const StringName province_info_pop_ideologies_key = "pop_ideologies";
-	static const StringName province_info_pop_cultures_key = "pop_cultures";
-	static const StringName province_info_cores_key = "cores";
-	static const StringName province_info_buildings_key = "buildings";
-
-	Province const* province = game_manager.get_map().get_province_by_index(index);
-	if (province == nullptr) {
-		return {};
-	}
-	Dictionary ret;
-
-	ret[province_info_province_key] = std_view_to_godot_string(province->get_identifier());
-
-	Region const* region = province->get_region();
-	if (region != nullptr) {
-		ret[province_info_region_key] = std_view_to_godot_string(region->get_identifier());
-	}
-
-	ret[province_info_slave_status_key] = province->get_slave();
-
-	ret[province_info_colony_status_key] = static_cast<int32_t>(province->get_colony_status());
-
-	TerrainType const* terrain_type = province->get_terrain_type();
-	if (terrain_type != nullptr) {
-		ret[province_info_terrain_type_key] = std_view_to_godot_string(terrain_type->get_identifier());
-	}
-
-	ret[province_info_life_rating_key] = province->get_life_rating();
-
-	Country const* controller = province->get_controller();
-	if (controller != nullptr) {
-		ret[province_info_controller_key] = std_view_to_godot_string(controller->get_identifier());
-	}
-
-	Good const* rgo = province->get_rgo();
-	if (rgo != nullptr) {
-		ret[province_info_rgo_name_key] = std_view_to_godot_string(rgo->get_identifier());
-		ret[province_info_rgo_icon_key] = static_cast<int32_t>(rgo->get_index());
-	}
-
-	Crime const* crime = province->get_crime();
-	if (crime != nullptr) {
-		ret[province_info_crime_name_key] = std_view_to_godot_string(crime->get_identifier());
-		ret[province_info_crime_icon_key] = static_cast<int32_t>(crime->get_icon());
-	}
-
-	ret[province_info_total_population_key] = province->get_total_population();
-
-	fixed_point_map_t<PopType const*> const& pop_types = province->get_pop_type_distribution();
-	if (!pop_types.empty()) {
-		ret[province_info_pop_types_key] = GFXPieChartTexture::distribution_to_slices_array(pop_types);
-	}
-
-	fixed_point_map_t<Ideology const*> const& ideologies = province->get_ideology_distribution();
-	if (!ideologies.empty()) {
-		ret[province_info_pop_ideologies_key] = GFXPieChartTexture::distribution_to_slices_array(ideologies);
-	}
-
-	fixed_point_map_t<Culture const*> const& cultures = province->get_culture_distribution();
-	if (!cultures.empty()) {
-		ret[province_info_pop_cultures_key] = GFXPieChartTexture::distribution_to_slices_array(cultures);
-	}
-
-	std::vector<Country const*> const& cores = province->get_cores();
-	if (!cores.empty()) {
-		PackedStringArray cores_array;
-		cores_array.resize(cores.size());
-		for (size_t idx = 0; idx < cores.size(); ++idx) {
-			cores_array[idx] = std_view_to_godot_string(cores[idx]->get_identifier());
-		}
-		ret[province_info_cores_key] = cores_array;
-	}
-
-	static const StringName building_info_level_key = "level";
-	static const StringName building_info_expansion_state_key = "expansion_state";
-	static const StringName building_info_start_date_key = "start_date";
-	static const StringName building_info_end_date_key = "end_date";
-	static const StringName building_info_expansion_progress_key = "expansion_progress";
-
-	std::vector<BuildingInstance> const& buildings = province->get_buildings();
-	if (!buildings.empty()) {
-		/* This system relies on the province buildings all being present in the right order. It will have to
-		 * be changed if we want to support variable combinations and permutations of province buildings. */
-		TypedArray<Dictionary> buildings_array;
-		buildings_array.resize(buildings.size());
-		for (size_t idx = 0; idx < buildings.size(); ++idx) {
-			BuildingInstance const& building = buildings[idx];
-
-			Dictionary building_dict;
-			building_dict[building_info_level_key] = static_cast<int32_t>(building.get_level());
-			building_dict[building_info_expansion_state_key] = static_cast<int32_t>(building.get_expansion_state());
-			building_dict[building_info_start_date_key] = std_to_godot_string(building.get_start_date().to_string());
-			building_dict[building_info_end_date_key] = std_to_godot_string(building.get_end_date().to_string());
-			building_dict[building_info_expansion_progress_key] = building.get_expansion_progress();
-
-			buildings_array[idx] = building_dict;
-		}
-		ret[province_info_buildings_key] = buildings_array;
-	}
-	return ret;
-}
-
 int32_t GameSingleton::get_map_width() const {
 	return game_manager.get_map().get_width();
 }
@@ -385,81 +251,6 @@ void GameSingleton::set_selected_province(int32_t index) {
 	emit_signal(_signal_province_selected(), index);
 }
 
-int32_t GameSingleton::get_province_building_count() const {
-	return game_manager.get_economy_manager().get_building_type_manager().get_province_building_types().size();
-}
-
-String GameSingleton::get_province_building_identifier(int32_t index) const {
-	std::vector<BuildingType const*> const& province_building_types =
-		game_manager.get_economy_manager().get_building_type_manager().get_province_building_types();
-	ERR_FAIL_COND_V_MSG(
-		index < 0 || index >= province_building_types.size(), {}, vformat("Invalid province building index: %d", index)
-	);
-	return std_view_to_godot_string(province_building_types[index]->get_identifier());
-}
-
-Error GameSingleton::expand_selected_province_building(int32_t building_index) {
-	ERR_FAIL_COND_V_MSG(
-		!game_manager.expand_selected_province_building(building_index), FAILED,
-		vformat("Failed to expand the currently selected province's building index %d", building_index)
-	);
-	return OK;
-}
-
-int32_t GameSingleton::get_slave_pop_icon_index() const {
-	const PopType::sprite_t sprite = game_manager.get_pop_manager().get_slave_sprite();
-	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "Slave sprite unset!");
-	return sprite;
-}
-
-int32_t GameSingleton::get_administrative_pop_icon_index() const {
-	const PopType::sprite_t sprite = game_manager.get_pop_manager().get_administrative_sprite();
-	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "Administrative sprite unset!");
-	return sprite;
-}
-
-int32_t GameSingleton::get_rgo_owner_pop_icon_index() const {
-	const PopType::sprite_t sprite = game_manager.get_economy_manager().get_production_type_manager().get_rgo_owner_sprite();
-	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "RGO owner sprite unset!");
-	return sprite;
-}
-
-void GameSingleton::set_paused(bool paused) {
-	game_manager.get_simulation_clock().set_paused(paused);
-}
-
-void GameSingleton::toggle_paused() {
-	game_manager.get_simulation_clock().toggle_paused();
-}
-
-bool GameSingleton::is_paused() const {
-	return game_manager.get_simulation_clock().is_paused();
-}
-
-void GameSingleton::increase_speed() {
-	game_manager.get_simulation_clock().increase_simulation_speed();
-}
-
-void GameSingleton::decrease_speed() {
-	game_manager.get_simulation_clock().decrease_simulation_speed();
-}
-
-int32_t GameSingleton::get_speed() const {
-	return game_manager.get_simulation_clock().get_simulation_speed();
-}
-
-bool GameSingleton::can_increase_speed() const {
-	return game_manager.get_simulation_clock().can_increase_simulation_speed();
-}
-
-bool GameSingleton::can_decrease_speed() const {
-	return game_manager.get_simulation_clock().can_decrease_simulation_speed();
-}
-
-String GameSingleton::get_longform_date() const {
-	return Utilities::date_to_formatted_string(game_manager.get_today());
-}
-
 void GameSingleton::try_tick() {
 	game_manager.get_simulation_clock().conditionally_advance_game();
 }
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.hpp b/extension/src/openvic-extension/singletons/GameSingleton.hpp
index a2b15cd..e84e366 100644
--- a/extension/src/openvic-extension/singletons/GameSingleton.hpp
+++ b/extension/src/openvic-extension/singletons/GameSingleton.hpp
@@ -13,7 +13,7 @@ namespace OpenVic {
 
 		static inline GameSingleton* singleton = nullptr;
 
-		GameManager PROPERTY(game_manager);
+		GameManager PROPERTY_REF(game_manager);
 		Dataloader PROPERTY(dataloader);
 
 		godot::Vector2i image_subdivisions;
@@ -59,10 +59,6 @@ namespace OpenVic {
 
 		int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const;
 
-		/* Get info to display in Province Overview Panel, packaged in
-		 * a Dictionary using StringName constants as keys. */
-		godot::Dictionary get_province_info_from_index(int32_t index) const;
-
 		int32_t get_map_width() const;
 		int32_t get_map_height() const;
 		float get_map_aspect_ratio() const;
@@ -94,22 +90,6 @@ namespace OpenVic {
 		int32_t get_selected_province_index() const;
 		void set_selected_province(int32_t index);
 
-		int32_t get_province_building_count() const;
-		godot::String get_province_building_identifier(int32_t building_index) const;
-		godot::Error expand_selected_province_building(int32_t building_index);
-		int32_t get_slave_pop_icon_index() const;
-		int32_t get_administrative_pop_icon_index() const;
-		int32_t get_rgo_owner_pop_icon_index() const;
-
-		void set_paused(bool paused);
-		void toggle_paused();
-		bool is_paused() const;
-		void increase_speed();
-		void decrease_speed();
-		int32_t get_speed() const;
-		bool can_increase_speed() const;
-		bool can_decrease_speed() const;
-		godot::String get_longform_date() const;
 		void try_tick();
 	};
 }
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp
new file mode 100644
index 0000000..52fb6af
--- /dev/null
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp
@@ -0,0 +1,288 @@
+#include "MenuSingleton.hpp"
+
+#include <godot_cpp/variant/utility_functions.hpp>
+
+#include <openvic-simulation/GameManager.hpp>
+
+#include "openvic-extension/classes/GFXPieChartTexture.hpp"
+#include "openvic-extension/singletons/GameSingleton.hpp"
+#include "openvic-extension/utility/ClassBindings.hpp"
+#include "openvic-extension/utility/Utilities.hpp"
+
+using namespace godot;
+using namespace OpenVic;
+
+using OpenVic::Utilities::std_to_godot_string;
+using OpenVic::Utilities::std_view_to_godot_string;
+
+void MenuSingleton::_bind_methods() {
+	/* PROVINCE OVERVIEW PANEL */
+	OV_BIND_METHOD(MenuSingleton::get_province_info_from_index, { "index" });
+	OV_BIND_METHOD(MenuSingleton::get_province_building_count);
+	OV_BIND_METHOD(MenuSingleton::get_province_building_identifier, { "building_index" });
+	OV_BIND_METHOD(MenuSingleton::expand_selected_province_building, { "building_index" });
+	OV_BIND_METHOD(MenuSingleton::get_slave_pop_icon_index);
+	OV_BIND_METHOD(MenuSingleton::get_administrative_pop_icon_index);
+	OV_BIND_METHOD(MenuSingleton::get_rgo_owner_pop_icon_index);
+
+	/* TIME/SPEED CONTROL PANEL */
+	OV_BIND_METHOD(MenuSingleton::set_paused, { "paused" });
+	OV_BIND_METHOD(MenuSingleton::toggle_paused);
+	OV_BIND_METHOD(MenuSingleton::is_paused);
+	OV_BIND_METHOD(MenuSingleton::increase_speed);
+	OV_BIND_METHOD(MenuSingleton::decrease_speed);
+	OV_BIND_METHOD(MenuSingleton::get_speed);
+	OV_BIND_METHOD(MenuSingleton::can_increase_speed);
+	OV_BIND_METHOD(MenuSingleton::can_decrease_speed);
+	OV_BIND_METHOD(MenuSingleton::get_longform_date);
+}
+
+MenuSingleton* MenuSingleton::get_singleton() {
+	return singleton;
+}
+
+MenuSingleton::MenuSingleton() : game_manager {
+	[]() -> GameManager* {
+		GameSingleton* game_singleton = GameSingleton::get_singleton();
+		ERR_FAIL_NULL_V_MSG(
+			game_singleton, nullptr, "Cannot initialise MenuSingleton's GameManager pointer - GameSingleton not initialised!"
+		);
+		return &game_singleton->get_game_manager();
+	}()
+} {
+	ERR_FAIL_COND(singleton != nullptr);
+	singleton = this;
+}
+
+MenuSingleton::~MenuSingleton() {
+	ERR_FAIL_COND(singleton != this);
+	singleton = nullptr;
+}
+
+/* PROVINCE OVERVIEW PANEL */
+
+Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const {
+	ERR_FAIL_NULL_V(game_manager, {});
+
+	static const StringName province_info_province_key = "province";
+	static const StringName province_info_region_key = "region";
+	static const StringName province_info_slave_status_key = "slave_status";
+	static const StringName province_info_colony_status_key = "colony_status";
+	static const StringName province_info_terrain_type_key = "terrain_type";
+	static const StringName province_info_life_rating_key = "life_rating";
+	static const StringName province_info_controller_key = "controller";
+	static const StringName province_info_rgo_name_key = "rgo_name";
+	static const StringName province_info_rgo_icon_key = "rgo_icon";
+	static const StringName province_info_crime_name_key = "crime_name";
+	static const StringName province_info_crime_icon_key = "crime_icon";
+	static const StringName province_info_total_population_key = "total_population";
+	static const StringName province_info_pop_types_key = "pop_types";
+	static const StringName province_info_pop_ideologies_key = "pop_ideologies";
+	static const StringName province_info_pop_cultures_key = "pop_cultures";
+	static const StringName province_info_cores_key = "cores";
+	static const StringName province_info_buildings_key = "buildings";
+
+	Province const* province = game_manager->get_map().get_province_by_index(index);
+	if (province == nullptr) {
+		return {};
+	}
+	Dictionary ret;
+
+	ret[province_info_province_key] = std_view_to_godot_string(province->get_identifier());
+
+	Region const* region = province->get_region();
+	if (region != nullptr) {
+		ret[province_info_region_key] = std_view_to_godot_string(region->get_identifier());
+	}
+
+	ret[province_info_slave_status_key] = province->get_slave();
+
+	ret[province_info_colony_status_key] = static_cast<int32_t>(province->get_colony_status());
+
+	TerrainType const* terrain_type = province->get_terrain_type();
+	if (terrain_type != nullptr) {
+		ret[province_info_terrain_type_key] = std_view_to_godot_string(terrain_type->get_identifier());
+	}
+
+	ret[province_info_life_rating_key] = province->get_life_rating();
+
+	Country const* controller = province->get_controller();
+	if (controller != nullptr) {
+		ret[province_info_controller_key] = std_view_to_godot_string(controller->get_identifier());
+	}
+
+	Good const* rgo = province->get_rgo();
+	if (rgo != nullptr) {
+		ret[province_info_rgo_name_key] = std_view_to_godot_string(rgo->get_identifier());
+		ret[province_info_rgo_icon_key] = static_cast<int32_t>(rgo->get_index());
+	}
+
+	Crime const* crime = province->get_crime();
+	if (crime != nullptr) {
+		ret[province_info_crime_name_key] = std_view_to_godot_string(crime->get_identifier());
+		ret[province_info_crime_icon_key] = static_cast<int32_t>(crime->get_icon());
+	}
+
+	ret[province_info_total_population_key] = province->get_total_population();
+
+	fixed_point_map_t<PopType const*> const& pop_types = province->get_pop_type_distribution();
+	if (!pop_types.empty()) {
+		ret[province_info_pop_types_key] = GFXPieChartTexture::distribution_to_slices_array(pop_types);
+	}
+
+	fixed_point_map_t<Ideology const*> const& ideologies = province->get_ideology_distribution();
+	if (!ideologies.empty()) {
+		ret[province_info_pop_ideologies_key] = GFXPieChartTexture::distribution_to_slices_array(ideologies);
+	}
+
+	fixed_point_map_t<Culture const*> const& cultures = province->get_culture_distribution();
+	if (!cultures.empty()) {
+		ret[province_info_pop_cultures_key] = GFXPieChartTexture::distribution_to_slices_array(cultures);
+	}
+
+	std::vector<Country const*> const& cores = province->get_cores();
+	if (!cores.empty()) {
+		PackedStringArray cores_array;
+		cores_array.resize(cores.size());
+		for (size_t idx = 0; idx < cores.size(); ++idx) {
+			cores_array[idx] = std_view_to_godot_string(cores[idx]->get_identifier());
+		}
+		ret[province_info_cores_key] = cores_array;
+	}
+
+	static const StringName building_info_level_key = "level";
+	static const StringName building_info_expansion_state_key = "expansion_state";
+	static const StringName building_info_start_date_key = "start_date";
+	static const StringName building_info_end_date_key = "end_date";
+	static const StringName building_info_expansion_progress_key = "expansion_progress";
+
+	std::vector<BuildingInstance> const& buildings = province->get_buildings();
+	if (!buildings.empty()) {
+		/* This system relies on the province buildings all being present in the right order. It will have to
+		 * be changed if we want to support variable combinations and permutations of province buildings. */
+		TypedArray<Dictionary> buildings_array;
+		buildings_array.resize(buildings.size());
+		for (size_t idx = 0; idx < buildings.size(); ++idx) {
+			BuildingInstance const& building = buildings[idx];
+
+			Dictionary building_dict;
+			building_dict[building_info_level_key] = static_cast<int32_t>(building.get_level());
+			building_dict[building_info_expansion_state_key] = static_cast<int32_t>(building.get_expansion_state());
+			building_dict[building_info_start_date_key] = std_to_godot_string(building.get_start_date().to_string());
+			building_dict[building_info_end_date_key] = std_to_godot_string(building.get_end_date().to_string());
+			building_dict[building_info_expansion_progress_key] = building.get_expansion_progress();
+
+			buildings_array[idx] = building_dict;
+		}
+		ret[province_info_buildings_key] = buildings_array;
+	}
+	return ret;
+}
+
+int32_t MenuSingleton::get_province_building_count() const {
+	ERR_FAIL_NULL_V(game_manager, 0);
+
+	return game_manager->get_economy_manager().get_building_type_manager().get_province_building_types().size();
+}
+
+String MenuSingleton::get_province_building_identifier(int32_t building_index) const {
+	ERR_FAIL_NULL_V(game_manager, {});
+
+	std::vector<BuildingType const*> const& province_building_types =
+		game_manager->get_economy_manager().get_building_type_manager().get_province_building_types();
+	ERR_FAIL_COND_V_MSG(
+		building_index < 0 || building_index >= province_building_types.size(), {},
+		vformat("Invalid province building index: %d", building_index)
+	);
+	return std_view_to_godot_string(province_building_types[building_index]->get_identifier());
+}
+
+Error MenuSingleton::expand_selected_province_building(int32_t building_index) {
+	ERR_FAIL_NULL_V(game_manager, FAILED);
+
+	ERR_FAIL_COND_V_MSG(
+		!game_manager->expand_selected_province_building(building_index), FAILED,
+		vformat("Failed to expand the currently selected province's building index %d", building_index)
+	);
+	return OK;
+}
+
+int32_t MenuSingleton::get_slave_pop_icon_index() const {
+	ERR_FAIL_NULL_V(game_manager, 0);
+
+	const PopType::sprite_t sprite = game_manager->get_pop_manager().get_slave_sprite();
+	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "Slave sprite unset!");
+	return sprite;
+}
+
+int32_t MenuSingleton::get_administrative_pop_icon_index() const {
+	ERR_FAIL_NULL_V(game_manager, 0);
+
+	const PopType::sprite_t sprite = game_manager->get_pop_manager().get_administrative_sprite();
+	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "Administrative sprite unset!");
+	return sprite;
+}
+
+int32_t MenuSingleton::get_rgo_owner_pop_icon_index() const {
+	ERR_FAIL_NULL_V(game_manager, 0);
+
+	const PopType::sprite_t sprite = game_manager->get_economy_manager().get_production_type_manager().get_rgo_owner_sprite();
+	ERR_FAIL_COND_V_MSG(sprite <= 0, 0, "RGO owner sprite unset!");
+	return sprite;
+}
+
+/* TIME/SPEED CONTROL PANEL */
+
+void MenuSingleton::set_paused(bool paused) {
+	ERR_FAIL_NULL(game_manager);
+
+	game_manager->get_simulation_clock().set_paused(paused);
+}
+
+void MenuSingleton::toggle_paused() {
+	ERR_FAIL_NULL(game_manager);
+
+	game_manager->get_simulation_clock().toggle_paused();
+}
+
+bool MenuSingleton::is_paused() const {
+	ERR_FAIL_NULL_V(game_manager, true);
+
+	return game_manager->get_simulation_clock().is_paused();
+}
+
+void MenuSingleton::increase_speed() {
+	ERR_FAIL_NULL(game_manager);
+
+	game_manager->get_simulation_clock().increase_simulation_speed();
+}
+
+void MenuSingleton::decrease_speed() {
+	ERR_FAIL_NULL(game_manager);
+
+	game_manager->get_simulation_clock().decrease_simulation_speed();
+}
+
+int32_t MenuSingleton::get_speed() const {
+	ERR_FAIL_NULL_V(game_manager, 0);
+
+	return game_manager->get_simulation_clock().get_simulation_speed();
+}
+
+bool MenuSingleton::can_increase_speed() const {
+	ERR_FAIL_NULL_V(game_manager, false);
+
+	return game_manager->get_simulation_clock().can_increase_simulation_speed();
+}
+
+bool MenuSingleton::can_decrease_speed() const {
+	ERR_FAIL_NULL_V(game_manager, false);
+
+	return game_manager->get_simulation_clock().can_decrease_simulation_speed();
+}
+
+String MenuSingleton::get_longform_date() const {
+	ERR_FAIL_NULL_V(game_manager, {});
+
+	return Utilities::date_to_formatted_string(game_manager->get_today());
+}
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
new file mode 100644
index 0000000..6bd90c5
--- /dev/null
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <godot_cpp/classes/image.hpp>
+
+#include <openvic-simulation/types/OrderedContainers.hpp>
+
+namespace OpenVic {
+	struct GameManager;
+
+	class MenuSingleton : public godot::Object {
+		GDCLASS(MenuSingleton, godot::Object)
+
+		static inline MenuSingleton* singleton = nullptr;
+
+		GameManager* game_manager;
+
+	protected:
+		static void _bind_methods();
+
+	public:
+		static MenuSingleton* get_singleton();
+
+		/* This should only be called AFTER GameSingleton has been initialised! */
+		MenuSingleton();
+		~MenuSingleton();
+
+		/* PROVINCE OVERVIEW PANEL */
+		/* Get info to display in Province Overview Panel, packaged in a Dictionary using StringName constants as keys. */
+		godot::Dictionary get_province_info_from_index(int32_t index) const;
+		int32_t get_province_building_count() const;
+		godot::String get_province_building_identifier(int32_t building_index) const;
+		godot::Error expand_selected_province_building(int32_t building_index);
+		int32_t get_slave_pop_icon_index() const;
+		int32_t get_administrative_pop_icon_index() const;
+		int32_t get_rgo_owner_pop_icon_index() const;
+
+		/* TIME/SPEED CONTROL PANEL */
+		void set_paused(bool paused);
+		void toggle_paused();
+		bool is_paused() const;
+		void increase_speed();
+		void decrease_speed();
+		int32_t get_speed() const;
+		bool can_increase_speed() const;
+		bool can_decrease_speed() const;
+		godot::String get_longform_date() const;
+	};
+}
diff --git a/game/src/Game/GameSession/ProvinceOverviewPanel.gd b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
index 54591a3..731d02c 100644
--- a/game/src/Game/GameSession/ProvinceOverviewPanel.gd
+++ b/game/src/Game/GameSession/ProvinceOverviewPanel.gd
@@ -60,7 +60,7 @@ class BuildingSlot:
 			return
 		_slot_node = new_slot_node
 
-		for icon_index : int in GameSingleton.get_province_building_count():
+		for icon_index : int in MenuSingleton.get_province_building_count():
 			var icon := _slot_node.get_node("build_icon%d" % icon_index)
 			if icon:
 				if icon_index == _slot_index:
@@ -70,10 +70,10 @@ class BuildingSlot:
 
 		var building_name := GUINode.get_label_from_node(_slot_node.get_node(^"./description"))
 		if building_name:
-			building_name.text = GameSingleton.get_province_building_identifier(_slot_index)
+			building_name.text = MenuSingleton.get_province_building_identifier(_slot_index)
 		_expand_button = GUINode.get_button_from_node(_slot_node.get_node(^"./expand"))
 		if _expand_button:
-			_expand_button.pressed.connect(func() -> void: GameSingleton.expand_selected_province_building(_slot_index))
+			_expand_button.pressed.connect(func() -> void: MenuSingleton.expand_selected_province_building(_slot_index))
 		_expanding_icon = GUINode.get_texture_rect_from_node(_slot_node.get_node(^"./underconstruction_icon"))
 		_expanding_progress_bar = GUINode.get_progress_bar_from_node(_slot_node.get_node(^"./building_progress"))
 		if _expanding_progress_bar:
@@ -135,12 +135,12 @@ func _ready() -> void:
 	_slave_status_icon = get_texture_rect_from_nodepath(^"./province_view/province_view_header/slave_state_icon")
 	var slave_status_icon_texture : GFXSpriteTexture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_view_header/slave_state_icon")
 	if slave_status_icon_texture:
-		slave_status_icon_texture.set_icon_index(GameSingleton.get_slave_pop_icon_index())
+		slave_status_icon_texture.set_icon_index(MenuSingleton.get_slave_pop_icon_index())
 	_colony_status_button = get_button_from_nodepath(^"./province_view/province_view_header/colony_button")
 	_colony_status_button_texture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_view_header/colony_button")
 	var admin_icon_texture : GFXSpriteTexture = get_gfx_sprite_texture_from_nodepath(^"./province_view/province_view_header/admin_icon")
 	if admin_icon_texture:
-		admin_icon_texture.set_icon_index(GameSingleton.get_administrative_pop_icon_index())
+		admin_icon_texture.set_icon_index(MenuSingleton.get_administrative_pop_icon_index())
 	_administrative_percentage_label = get_label_from_nodepath(^"./province_view/province_view_header/admin_efficiency")
 	_owner_percentage_label = get_label_from_nodepath(^"./province_view/province_view_header/owner_presence")
 	_province_modifiers_overlapping_elements_box = get_gui_overlapping_elements_box_from_nodepath(^"./province_view/province_view_header/province_modifiers")
@@ -173,7 +173,7 @@ func _ready() -> void:
 
 	_buildings_panel = get_panel_from_nodepath(^"./province_view/province_buildings")
 	if _buildings_panel:
-		var target_slot_count : int = GameSingleton.get_province_building_count()
+		var target_slot_count : int = MenuSingleton.get_province_building_count()
 		var slot_y : float = 0.0
 		for current_slot_count : int in target_slot_count:
 			var slot := GUINode.generate_gui_element("province_interface", "building", "building_slot_%d" % current_slot_count)
@@ -247,7 +247,7 @@ func _update_info() -> void:
 
 	const _missing_suffix : String = "_MISSING"
 
-	_province_info = GameSingleton.get_province_info_from_index(_selected_index)
+	_province_info = MenuSingleton.get_province_info_from_index(_selected_index)
 	if _province_info:
 		# Header
 		if _province_name_label:
diff --git a/game/src/Game/GameSession/Topbar.gd b/game/src/Game/GameSession/Topbar.gd
index b61af28..92ee75a 100644
--- a/game/src/Game/GameSession/Topbar.gd
+++ b/game/src/Game/GameSession/Topbar.gd
@@ -91,40 +91,40 @@ func _notification(what : int) -> void:
 
 func _update_info() -> void:
 	if _date_label:
-		_date_label.text = GameSingleton.get_longform_date()
+		_date_label.text = MenuSingleton.get_longform_date()
 
 func _update_speed_controls() -> void:
 	#  TODO - decide whether to disable these or not
 	# (they don't appear to get disabled in the base game)
 	#if _speed_up_button:
-	#	_speed_up_button.disabled = not GameSingleton.can_increase_speed()
+	#	_speed_up_button.disabled = not MenuSingleton.can_increase_speed()
 
 	#if _speed_down_button:
-	#	_speed_down_button.disabled = not GameSingleton.can_decrease_speed()
+	#	_speed_down_button.disabled = not MenuSingleton.can_decrease_speed()
 
 	if _speed_indicator_button and _speed_indicator_texture:
 		var index : int = 1
-		if not GameSingleton.is_paused():
-			index += GameSingleton.get_speed() + 1
+		if not MenuSingleton.is_paused():
+			index += MenuSingleton.get_speed() + 1
 		_speed_indicator_texture.set_icon_index(index)
 
 # REQUIREMENTS:
 # * UIFUN-71
 func _on_play_pause_button_pressed() -> void:
 	print("Toggling pause!")
-	GameSingleton.toggle_paused()
+	MenuSingleton.toggle_paused()
 
 # REQUIREMENTS:
 # * UIFUN-72
 func _on_increase_speed_button_pressed() -> void:
 	print("Speed up!")
-	GameSingleton.increase_speed()
+	MenuSingleton.increase_speed()
 
 # REQUIREMENTS:
 # * UIFUN-73
 func _on_decrease_speed_button_pressed() -> void:
 	print("Speed down!")
-	GameSingleton.decrease_speed()
+	MenuSingleton.decrease_speed()
 
 func _on_update_active_nation_management_screen(active_screen : NationManagement.Screen) -> void:
 	for screen : NationManagement.Screen in _nation_management_buttons: