Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 15 insertions, 8 deletions

diff --git a/Minecraft.World/StringHelpers.h b/Minecraft.World/StringHelpers.h
index 609fdf5a..1b364118 100644
--- a/Minecraft.World/StringHelpers.h
+++ b/Minecraft.World/StringHelpers.h
@@ -13,23 +13,30 @@ template <class T> std::wstring _toString(T t)
 	oss << std::dec << t;
 	return oss.str();
 }
+template <class T> std::wstring _toHexString(T t)
+{
+	std::wostringstream oss;
+	oss << std::hex << t;
+	return oss.str();
+}
 template <class T> T _fromString(const std::wstring& s)
 {
-    std::wistringstream stream (s);
-    T t;
-    stream >> t;
-    return t;
+	std::wistringstream stream (s);
+	T t;
+	stream >> t;
+	return t;
 }
 template <class T> T _fromHEXString(const std::wstring& s)
 {
-    std::wistringstream stream (s);
-    T t;
-    stream >> std::hex >> t;
-    return t;
+	std::wistringstream stream (s);
+	T t;
+	stream >> std::hex >> t;
+	return t;
 }
 
 wstring convStringToWstring(const string& converting);
 const char *wstringtofilename(const wstring& name);
+const char *wstringtochararray(const wstring& name);
 wstring filenametowstring(const char *name);
 
 std::vector<std::wstring> &stringSplit(const std::wstring &s, wchar_t delim, std::vector<std::wstring> &elems);