From 33964e308161e13d709c5ff4610c627600eed28b Mon Sep 17 00:00:00 2001
From: ALittlePatate <maxime@patate.dev>
Date: Sat, 13 Apr 2024 18:07:02 +0200
Subject: [PATCH] fix: DebugLog hooks, works now

---
 IL2CppDLL.vcxproj         |  2 ++
 IL2CppDLL.vcxproj.filters |  9 +++++++++
 user/hooks/hooks.cpp      |  4 ++--
 user/utils/utils.cpp      | 12 ++++++++++++
 user/utils/utils.hpp      |  4 ++++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 user/utils/utils.cpp
 create mode 100644 user/utils/utils.hpp

diff --git a/IL2CppDLL.vcxproj b/IL2CppDLL.vcxproj
index fbdd7a3..2fff91c 100644
--- a/IL2CppDLL.vcxproj
+++ b/IL2CppDLL.vcxproj
@@ -56,6 +56,7 @@
     <ClCompile Include="user\hooks\hooks.cpp" />
     <ClCompile Include="user\main.cpp" />
     <ClCompile Include="user\settings\settings.cpp" />
+    <ClCompile Include="user\utils\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="appdata\il2cpp-api-functions.h" />
@@ -91,6 +92,7 @@
     <ClInclude Include="user\hooks\hooks.hpp" />
     <ClInclude Include="user\main.h" />
     <ClInclude Include="user\settings\settings.hpp" />
+    <ClInclude Include="user\utils\utils.hpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <!--<VCProjectVersion>16.0</VCProjectVersion>-->
diff --git a/IL2CppDLL.vcxproj.filters b/IL2CppDLL.vcxproj.filters
index 574541c..e3e2a6c 100644
--- a/IL2CppDLL.vcxproj.filters
+++ b/IL2CppDLL.vcxproj.filters
@@ -67,6 +67,9 @@
     <ClCompile Include="lib\ClientHelper.cpp">
       <Filter>lib</Filter>
     </ClCompile>
+    <ClCompile Include="user\utils\utils.cpp">
+      <Filter>user\utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="user\main.h">
@@ -168,6 +171,9 @@
     <ClInclude Include="lib\ClientHelper.h">
       <Filter>lib</Filter>
     </ClInclude>
+    <ClInclude Include="user\utils\utils.hpp">
+      <Filter>user\utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="appdata">
@@ -200,5 +206,8 @@
     <Filter Include="user\settings">
       <UniqueIdentifier>{64867ae6-a574-4a01-ac5f-22a732ca25e0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="user\utils">
+      <UniqueIdentifier>{05b8437a-8e9b-425b-acbc-3dd8bca051c3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/user/hooks/hooks.cpp b/user/hooks/hooks.cpp
index d6c6164..298564f 100644
--- a/user/hooks/hooks.cpp
+++ b/user/hooks/hooks.cpp
@@ -2,6 +2,7 @@
 #include "Hooks.hpp"
 #include "../features/menu.hpp"
 #include "../main.h"
+#include "../utils/utils.hpp"
 
 #include <iostream>
 #include "helpers.h"
@@ -39,8 +40,7 @@ TDebug_2_Log oDebug_2_Log = NULL;
 TDebug_2_Log oDebug_2_Warning = NULL;
 TDebug_2_Log oDebug_2_Error = NULL;
 void __stdcall hDebug_Log(app::Object* message, MethodInfo* method) {
-	std::string log = il2cppi_to_string(app::Object_ToString(message, nullptr));
-	std::cout << log << "\n";
+	std::cout << ToString(message) << std::endl;
 }
 
 void CreateHooks() {
diff --git a/user/utils/utils.cpp b/user/utils/utils.cpp
new file mode 100644
index 0000000..21b31d7
--- /dev/null
+++ b/user/utils/utils.cpp
@@ -0,0 +1,12 @@
+#include "pch-il2cpp.h"
+#include "utils.hpp"
+#include "helpers.h"
+
+std::string ToString(app::Object* object) {
+	std::string type = il2cppi_to_string(app::Object_ToString(object, NULL));
+	if (type == "System.String") {
+		return il2cppi_to_string((app::String*)object);
+	}
+	return type;
+}
+
diff --git a/user/utils/utils.hpp b/user/utils/utils.hpp
new file mode 100644
index 0000000..9ba964a
--- /dev/null
+++ b/user/utils/utils.hpp
@@ -0,0 +1,4 @@
+#pragma once
+#include <string>
+
+std::string ToString(app::Object* object);