From 7d48f6936a977ca92f17c29f7b675d3fff00bf12 Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Wed, 26 Nov 2025 15:38:39 -0500
Subject: [PATCH] Refactor utility error headers to core/error path

---
 src/openvic-simulation/console/ConsoleInstance.cpp            | 2 +-
 src/openvic-simulation/{utility => core/error}/Error.hpp      | 0
 .../{utility => core/error}/ErrorMacros.hpp                   | 0
 src/openvic-simulation/{utility => core/error}/ErrorSet.hpp   | 2 +-
 src/openvic-simulation/country/CountryInstance.cpp            | 2 +-
 src/openvic-simulation/dataloader/ModManager.cpp              | 2 +-
 src/openvic-simulation/economy/production/ProductionType.cpp  | 2 +-
 src/openvic-simulation/map/State.cpp                          | 2 +-
 src/openvic-simulation/pathfinding/PathingBase.hpp            | 2 +-
 src/openvic-simulation/pathfinding/PointMap.cpp               | 2 +-
 src/openvic-simulation/population/Pop.cpp                     | 2 +-
 src/openvic-simulation/types/Date.hpp                         | 2 +-
 tests/src/{utility => core/error}/ErrorSet.cpp                | 4 ++--
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename src/openvic-simulation/{utility => core/error}/Error.hpp (100%)
 rename src/openvic-simulation/{utility => core/error}/ErrorMacros.hpp (100%)
 rename src/openvic-simulation/{utility => core/error}/ErrorSet.hpp (98%)
 rename tests/src/{utility => core/error}/ErrorSet.cpp (96%)

diff --git a/src/openvic-simulation/console/ConsoleInstance.cpp b/src/openvic-simulation/console/ConsoleInstance.cpp
index 495f91848..6f0393770 100644
--- a/src/openvic-simulation/console/ConsoleInstance.cpp
+++ b/src/openvic-simulation/console/ConsoleInstance.cpp
@@ -11,6 +11,7 @@
 
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
@@ -21,7 +22,6 @@
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 
 using namespace OpenVic;
 using namespace std::string_view_literals;
diff --git a/src/openvic-simulation/utility/Error.hpp b/src/openvic-simulation/core/error/Error.hpp
similarity index 100%
rename from src/openvic-simulation/utility/Error.hpp
rename to src/openvic-simulation/core/error/Error.hpp
diff --git a/src/openvic-simulation/utility/ErrorMacros.hpp b/src/openvic-simulation/core/error/ErrorMacros.hpp
similarity index 100%
rename from src/openvic-simulation/utility/ErrorMacros.hpp
rename to src/openvic-simulation/core/error/ErrorMacros.hpp
diff --git a/src/openvic-simulation/utility/ErrorSet.hpp b/src/openvic-simulation/core/error/ErrorSet.hpp
similarity index 98%
rename from src/openvic-simulation/utility/ErrorSet.hpp
rename to src/openvic-simulation/core/error/ErrorSet.hpp
index 1bb693f6e..33292328b 100644
--- a/src/openvic-simulation/utility/ErrorSet.hpp
+++ b/src/openvic-simulation/core/error/ErrorSet.hpp
@@ -3,8 +3,8 @@
 #include <bitset>
 #include <cstddef>
 
+#include "openvic-simulation/core/error/Error.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/Error.hpp"
 
 namespace OpenVic {
 	// Set of all reported errors, if empty operates as if set to Error::OK
diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp
index c0c5a46ee..ad0510d2d 100644
--- a/src/openvic-simulation/country/CountryInstance.cpp
+++ b/src/openvic-simulation/country/CountryInstance.cpp
@@ -8,6 +8,7 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/country/SharedCountryValues.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/defines/CountryDefines.hpp"
@@ -44,7 +45,6 @@
 #include "openvic-simulation/types/PopSize.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/utility/Typedefs.hpp"
 
diff --git a/src/openvic-simulation/dataloader/ModManager.cpp b/src/openvic-simulation/dataloader/ModManager.cpp
index 33ef4ad49..3622ba4f3 100644
--- a/src/openvic-simulation/dataloader/ModManager.cpp
+++ b/src/openvic-simulation/dataloader/ModManager.cpp
@@ -2,11 +2,11 @@
 
 #include <string_view>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 #include "openvic-simulation/utility/FormatValidate.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/economy/production/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp
index d95e3a26e..d9bd08e83 100644
--- a/src/openvic-simulation/economy/production/ProductionType.cpp
+++ b/src/openvic-simulation/economy/production/ProductionType.cpp
@@ -2,12 +2,12 @@
 
 #include <openvic-dataloader/v2script/Parser.hpp>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/population/PopManager.hpp"
 #include "openvic-simulation/population/PopType.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/map/State.cpp b/src/openvic-simulation/map/State.cpp
index a8aa5ad09..403609e77 100644
--- a/src/openvic-simulation/map/State.cpp
+++ b/src/openvic-simulation/map/State.cpp
@@ -1,5 +1,6 @@
 #include "State.hpp"
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/MapDefinition.hpp"
 #include "openvic-simulation/map/MapInstance.hpp"
@@ -10,7 +11,6 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pathfinding/PathingBase.hpp b/src/openvic-simulation/pathfinding/PathingBase.hpp
index f8ababef5..3ab4f0bf4 100644
--- a/src/openvic-simulation/pathfinding/PathingBase.hpp
+++ b/src/openvic-simulation/pathfinding/PathingBase.hpp
@@ -4,11 +4,11 @@
 
 #include <fmt/core.h>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
 #include "openvic-simulation/types/Signal.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 
 #include <foonathan/memory/default_allocator.hpp>
 #include <foonathan/memory/std_allocator.hpp>
diff --git a/src/openvic-simulation/pathfinding/PointMap.cpp b/src/openvic-simulation/pathfinding/PointMap.cpp
index eb8498b10..9dee4f2d9 100644
--- a/src/openvic-simulation/pathfinding/PointMap.cpp
+++ b/src/openvic-simulation/pathfinding/PointMap.cpp
@@ -11,9 +11,9 @@
 
 #include <fmt/core.h>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 #include "openvic-simulation/utility/Typedefs.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/population/Pop.cpp b/src/openvic-simulation/population/Pop.cpp
index 3ea121fe5..24c295050 100644
--- a/src/openvic-simulation/population/Pop.cpp
+++ b/src/openvic-simulation/population/Pop.cpp
@@ -1,6 +1,5 @@
 #include "Pop.hpp"
 #include "PopDeps.hpp"
-#include "utility/ErrorMacros.hpp"
 
 #include <concepts> // IWYU pragma: keep for lambda
 #include <cstddef>
@@ -10,6 +9,7 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/country/CountryParty.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
diff --git a/src/openvic-simulation/types/Date.hpp b/src/openvic-simulation/types/Date.hpp
index a6a5e62b4..6ab0d4fd2 100644
--- a/src/openvic-simulation/types/Date.hpp
+++ b/src/openvic-simulation/types/Date.hpp
@@ -16,8 +16,8 @@
 
 #include <range/v3/algorithm/max_element.hpp>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/types/StackString.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/utility/Typedefs.hpp"
diff --git a/tests/src/utility/ErrorSet.cpp b/tests/src/core/error/ErrorSet.cpp
similarity index 96%
rename from tests/src/utility/ErrorSet.cpp
rename to tests/src/core/error/ErrorSet.cpp
index 15aadeae3..55986232c 100644
--- a/tests/src/utility/ErrorSet.cpp
+++ b/tests/src/core/error/ErrorSet.cpp
@@ -1,8 +1,8 @@
-#include "openvic-simulation/utility/ErrorSet.hpp"
+#include "openvic-simulation/core/error/ErrorSet.hpp"
 
 #include <string_view>
 
-#include "openvic-simulation/utility/Error.hpp"
+#include "openvic-simulation/core/error/Error.hpp"
 
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_test_case.hpp>