From 35e4553a63f11b0198a3758ca8594e847b75faa1 Mon Sep 17 00:00:00 2001
From: SuperCoder7979 <k.pranav@gmail.com>
Date: Fri, 25 Oct 2019 10:01:06 -0400
Subject: [PATCH] cleanup

---
 SatisfactoryModLoader.vcxproj                 |  2 --
 .../SatisfactoryModLoader.cpp                 |  1 -
 SatisfactoryModLoader/mod/Coremods.h          |  1 -
 SatisfactoryModLoader/mod/ModHandler.cpp      |  1 -
 SatisfactoryModLoader/util/FKey.h             |  3 +--
 SatisfactoryModLoader/util/JsonConfig.h       |  9 ++++++--
 SatisfactoryModLoader/util/Reflection.cpp     | 14 -------------
 SatisfactoryModLoader/util/Reflection.h       | 21 -------------------
 8 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 SatisfactoryModLoader/util/Reflection.cpp
 delete mode 100644 SatisfactoryModLoader/util/Reflection.h

diff --git a/SatisfactoryModLoader.vcxproj b/SatisfactoryModLoader.vcxproj
index 4b5f1f084f..7e2f25c457 100644
--- a/SatisfactoryModLoader.vcxproj
+++ b/SatisfactoryModLoader.vcxproj
@@ -183,7 +183,6 @@
     <ClInclude Include="SatisfactoryModLoader\util\FString.h" />
     <ClInclude Include="SatisfactoryModLoader\util\json.hpp" />
     <ClInclude Include="SatisfactoryModLoader\util\JsonConfig.h" />
-    <ClInclude Include="SatisfactoryModLoader\util\Reflection.h" />
     <ClInclude Include="SatisfactoryModLoader\util\Utility.h" />
     <ClInclude Include="SatisfactoryModLoader\assets\SatisfactoryPakLoader.h" />
     <ClInclude Include="SatisfactorySDK\SDK.hpp" />
@@ -208,7 +207,6 @@
     <ClCompile Include="SatisfactoryModLoader\stdafx.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\EnvironmentValidity.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\FString.cpp" />
-    <ClCompile Include="SatisfactoryModLoader\util\Reflection.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\Utility.cpp" />
     <ClCompile Include="SatisfactoryModLoader\assets\SatisfactoryPakLoader.cpp" />
     <ClCompile Include="SatisfactorySDK\SDK\FG_Basic.cpp" />
diff --git a/SatisfactoryModLoader/SatisfactoryModLoader.cpp b/SatisfactoryModLoader/SatisfactoryModLoader.cpp
index 347c695505..5b9388ceef 100644
--- a/SatisfactoryModLoader/SatisfactoryModLoader.cpp
+++ b/SatisfactoryModLoader/SatisfactoryModLoader.cpp
@@ -27,7 +27,6 @@
 #include <thread>
 #include <assets/AssetLoader.h>
 #include <util/Utility.h>
-#include <util/Reflection.h>
 #include <util/JsonConfig.h>
 #include <util/EnvironmentValidity.h>
 #include <mod/Hooks.h>
diff --git a/SatisfactoryModLoader/mod/Coremods.h b/SatisfactoryModLoader/mod/Coremods.h
index bffc9c0040..42e9666cb5 100644
--- a/SatisfactoryModLoader/mod/Coremods.h
+++ b/SatisfactoryModLoader/mod/Coremods.h
@@ -11,6 +11,5 @@ namespace SML {
 		void startLoadingCoremods(const char* currentPath);
 
 		void loadCoremodsInternal(std::string path);
-
 	};
 };
\ No newline at end of file
diff --git a/SatisfactoryModLoader/mod/ModHandler.cpp b/SatisfactoryModLoader/mod/ModHandler.cpp
index 9bd2bbdced..2d05d3d6af 100644
--- a/SatisfactoryModLoader/mod/ModHandler.cpp
+++ b/SatisfactoryModLoader/mod/ModHandler.cpp
@@ -1,7 +1,6 @@
 #include <stdafx.h>
 #include <filesystem>
 #include <util/Utility.h>
-#include <util/Reflection.h>
 #include <SatisfactoryModLoader.h>
 #include "ModHandler.h"
 
diff --git a/SatisfactoryModLoader/util/FKey.h b/SatisfactoryModLoader/util/FKey.h
index dfb81fef6c..a78ebc5f67 100644
--- a/SatisfactoryModLoader/util/FKey.h
+++ b/SatisfactoryModLoader/util/FKey.h
@@ -8,8 +8,7 @@ namespace SML {
 	namespace Objects {
 		struct ITextData {
 		public:
-			virtual ~ITextData()
-			{
+			virtual ~ITextData() {
 			}
 
 			/**
diff --git a/SatisfactoryModLoader/util/JsonConfig.h b/SatisfactoryModLoader/util/JsonConfig.h
index eb3fbd3698..87a98113f7 100644
--- a/SatisfactoryModLoader/util/JsonConfig.h
+++ b/SatisfactoryModLoader/util/JsonConfig.h
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <util/json.hpp>
 #include <direct.h>
+#include <SatisfactoryModLoader.h>
 
 using json = nlohmann::json;
 
@@ -12,7 +13,9 @@ namespace SML {
 		class JsonConfig {
 		public:
 			static void save(const std::string& name, const json& data, bool useDefaultPath = true) {
-				//info("Saving: " + name);
+				if (debugOutput) {
+					info("Saving config: " + name);
+				}
 
 				if (useDefaultPath) {
 					std::string stringpath = defaultPath;
@@ -36,7 +39,9 @@ namespace SML {
 				out.close();
 			}
 			static json load(const std::string& name, const json& defaultValues, bool useDefaultPath = true) {
-				//info("Loading: " + name);
+				if (debugOutput) {
+					info("Loading config: " + name);
+				}
 
 				if (!exists(name, useDefaultPath)) {
 					save(name, defaultValues, useDefaultPath);
diff --git a/SatisfactoryModLoader/util/Reflection.cpp b/SatisfactoryModLoader/util/Reflection.cpp
deleted file mode 100644
index f4184b3e28..0000000000
--- a/SatisfactoryModLoader/util/Reflection.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#define WIN32_LEAN_AND_MEAN
-
-#include <stdafx.h>
-#include "Reflection.h"
-
-#include <windows.h>
-
-namespace SML {
-	namespace Utility {
-		void* get_field_value(void* module, const char* procName) {
-			return GetProcAddress((HMODULE)module, procName);
-		}
-	}
-}
\ No newline at end of file
diff --git a/SatisfactoryModLoader/util/Reflection.h b/SatisfactoryModLoader/util/Reflection.h
deleted file mode 100644
index dd2e1dc5c8..0000000000
--- a/SatisfactoryModLoader/util/Reflection.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-namespace SML {
-	namespace Utility {
-		static const char* gameModule = "FactoryGame-Win64-Shipping.exe";
-
-		void* get_field_value(void* module, const char* procName);
-
-		// gets a field's value
-		template <typename O>
-		bool get_field_value(void* module, const char* procName, O& value) {
-			void* proc = get_field_value(module, procName);
-			if (proc == nullptr) {
-				return false;
-			}
-
-			value = *(O*)proc;
-			return true;
-		}
-	}
-}
\ No newline at end of file