Permit private mutable registry functions

Add InventionManager as afriend of TechnologyManager
Remove const_cast from `InventionManager::generate_invention_links`
Remove non-const accessor registry function macros

Author: Spartan322

src/openvic-simulation/map/MapDefinition.hpp

@@ -76,7 +76,6 @@ namespace OpenVic {
 			return pos.x + pos.y * dims.x;
 		}
 
-		IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS(province_definition);
 		ProvinceDefinition* get_province_definition_from_number(
 			const ProvinceDefinition::province_number_t province_number
 		);

src/openvic-simulation/research/Invention.cpp

@@ -146,11 +146,11 @@ bool InventionManager::generate_invention_links(TechnologyManager& tech_manager)
 
 	for (Invention& invention : inventions.get_items()) {
 		for (const memory::string& tech_id : invention.raw_associated_tech_identifiers) {
-			Technology const* tech = tech_manager.get_technology_by_identifier(tech_id);
-			if (tech) {
-				auto* mutable_tech = const_cast<Technology*>(tech);
-				mutable_tech->add_invention(&invention);
+			Technology* tech = tech_manager.get_technology_by_identifier(tech_id);
+			if (tech == nullptr) {
+				continue;
 			}
+			tech->add_invention(&invention);
 		}
 
 		invention.raw_associated_tech_identifiers.clear();

src/openvic-simulation/research/Technology.hpp

@@ -96,6 +96,8 @@ namespace OpenVic {
 	};
 
 	struct TechnologyManager {
+		friend struct InventionManager;
+
 		IdentifierRegistry<TechnologyFolder> IDENTIFIER_REGISTRY(technology_folder);
 		IdentifierRegistry<TechnologyArea> IDENTIFIER_REGISTRY(technology_area);
 		IdentifierRegistry<Technology> IDENTIFIER_REGISTRY_CUSTOM_PLURAL(technology, technologies);
@@ -132,4 +134,4 @@ namespace OpenVic {
 
 		bool parse_scripts(DefinitionManager const& definition_manager);
 	};
-}
+}

src/openvic-simulation/types/IdentifierRegistry.hpp

@@ -245,7 +245,7 @@ namespace OpenVic {
 			emplace_identifier_index();
 			return true;
 		}
-		
+
 		constexpr bool emplace_via_copy(item_type const& item_to_copy) {
 			return emplace_item(
 				ValueInfo::get_identifier(ItemInfo::get_value(item_to_copy)),
@@ -659,17 +659,7 @@ public: \
 		return registry.expect_item_decimal_map(callback, fixed_point_functor); \
 	} \
 	IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry, const) \
-private:
-
-/* Macros to generate non-constant accessor methods for a UniqueKeyRegistry member variable. */
-
-#define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS(name) \
-	IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_PLURAL(name, name##s)
-
-#define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_PLURAL(singular, plural) \
-	IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(singular, plural, plural, plural)
-
-#define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(singular, plural, registry, debug_name) \
+private: \
 	IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry,)
 
 #define IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry, const_kw) \