diff --git a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h
index dfd70dc98..294180e9f 100644
--- a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h
+++ b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h
@@ -15,14 +15,14 @@ private:
 
 public:
 	virtual bool requiresTexturePack() {return m_bRequiresTexturePack;}
-	virtual UINT getRequiredTexturePackId() {return m_requiredTexturePackId;}
+	virtual std::uint32_t getRequiredTexturePackId() {return m_requiredTexturePackId;}
 	virtual std::wstring getDefaultSaveName() {return m_defaultSaveName;}
-	virtual LPCWSTR getWorldName() {return m_worldName.c_str();}
-	virtual LPCWSTR getDisplayName() {return m_displayName.c_str();}
+	virtual const wchar_t *getWorldName() {return m_worldName.c_str();}
+	virtual const wchar_t *getDisplayName() {return m_displayName.c_str();}
 	virtual std::wstring getGrfPath() {return L"GameRules.grf";}
 
 	virtual void setRequiresTexturePack(bool x) {m_bRequiresTexturePack = x;}
-	virtual void setRequiredTexturePackId(UINT x) {m_requiredTexturePackId = x;}
+	virtual void setRequiredTexturePackId(std::uint32_t x) {m_requiredTexturePackId = x;}
 	virtual void setDefaultSaveName(const std::wstring &x) {m_defaultSaveName = x;}
 	virtual void setWorldName(const std::wstring & x) {m_worldName = x;}
 	virtual void setDisplayName(const std::wstring & x) {m_displayName = x;}
diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
index b6bf2a390..d2790f1bd 100644
--- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
+++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
@@ -23,16 +23,16 @@ JustGrSource::JustGrSource()
 }
 
 bool JustGrSource::requiresTexturePack() {return m_bRequiresTexturePack;}
-UINT JustGrSource::getRequiredTexturePackId() {return m_requiredTexturePackId;}
+std::uint32_t JustGrSource::getRequiredTexturePackId() {return m_requiredTexturePackId;}
 std::wstring JustGrSource::getDefaultSaveName() {return m_defaultSaveName;}
-LPCWSTR JustGrSource::getWorldName() {return m_worldName.c_str();}
-LPCWSTR JustGrSource::getDisplayName() {return m_displayName.c_str();}
+const wchar_t *JustGrSource::getWorldName() {return m_worldName.c_str();}
+const wchar_t *JustGrSource::getDisplayName() {return m_displayName.c_str();}
 std::wstring JustGrSource::getGrfPath() {return m_grfPath;}
 bool JustGrSource::requiresBaseSave() { return m_bRequiresBaseSave; };
 std::wstring JustGrSource::getBaseSavePath() { return m_baseSavePath; };
 
 void JustGrSource::setRequiresTexturePack(bool x) {m_bRequiresTexturePack = x;}
-void JustGrSource::setRequiredTexturePackId(UINT x) {m_requiredTexturePackId = x;}
+void JustGrSource::setRequiredTexturePackId(std::uint32_t x) {m_requiredTexturePackId = x;}
 void JustGrSource::setDefaultSaveName(const std::wstring &x) {m_defaultSaveName = x;}
 void JustGrSource::setWorldName(const std::wstring &x) {m_worldName = x;}
 void JustGrSource::setDisplayName(const std::wstring &x) {m_displayName = x;}
@@ -477,10 +477,10 @@ bool LevelGenerationOptions::isFromSave() { return getSrc() == eSrc_fromSave; }
 bool LevelGenerationOptions::isFromDLC() { return getSrc() == eSrc_fromDLC; }
 
 bool LevelGenerationOptions::requiresTexturePack() { return info()->requiresTexturePack(); }
-UINT LevelGenerationOptions::getRequiredTexturePackId() { return info()->getRequiredTexturePackId(); }
+std::uint32_t LevelGenerationOptions::getRequiredTexturePackId() { return info()->getRequiredTexturePackId(); }
 std::wstring LevelGenerationOptions::getDefaultSaveName() { return info()->getDefaultSaveName(); }
-LPCWSTR LevelGenerationOptions::getWorldName() { return info()->getWorldName(); }
-LPCWSTR LevelGenerationOptions::getDisplayName() { return info()->getDisplayName(); }
+const wchar_t *LevelGenerationOptions::getWorldName() { return info()->getWorldName(); }
+const wchar_t *LevelGenerationOptions::getDisplayName() { return info()->getDisplayName(); }
 std::wstring LevelGenerationOptions::getGrfPath() {	return info()->getGrfPath(); }
 bool LevelGenerationOptions::requiresBaseSave() { return info()->requiresBaseSave(); }
 std::wstring LevelGenerationOptions::getBaseSavePath() { return info()->getBaseSavePath(); }
@@ -488,7 +488,7 @@ std::wstring LevelGenerationOptions::getBaseSavePath() { return info()->getBaseS
 void LevelGenerationOptions::setGrSource(GrSource *grs) { m_pSrc = grs; }
 
 void LevelGenerationOptions::setRequiresTexturePack(bool x) { info()->setRequiresTexturePack(x); }
-void LevelGenerationOptions::setRequiredTexturePackId(UINT x) { info()->setRequiredTexturePackId(x); }
+void LevelGenerationOptions::setRequiredTexturePackId(std::uint32_t x) { info()->setRequiredTexturePackId(x); }
 void LevelGenerationOptions::setDefaultSaveName(const std::wstring &x) { info()->setDefaultSaveName(x); }
 void LevelGenerationOptions::setWorldName(const std::wstring &x) { info()->setWorldName(x); }
 void LevelGenerationOptions::setDisplayName(const std::wstring &x) { info()->setDisplayName(x); }
@@ -511,4 +511,4 @@ bool LevelGenerationOptions::getuseFlatWorld() { return m_useFlatWorld; }
 
 bool LevelGenerationOptions::requiresGameRules() { return m_bRequiresGameRules; }
 void LevelGenerationOptions::setRequiredGameRules(LevelRuleset *rules) { m_requiredGameRules = rules; m_bRequiresGameRules = true; }
-LevelRuleset *LevelGenerationOptions::getRequiredGameRules() { return m_requiredGameRules; }
\ No newline at end of file
+LevelRuleset *LevelGenerationOptions::getRequiredGameRules() { return m_requiredGameRules; }
diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h
index d81436bee..47cc6a649 100644
--- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h
+++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h
@@ -3,6 +3,8 @@
 
 // #pragma message("LevelGenerationOptions.h ")
 
+#include <cstdint>
+
 #include "GameRuleDefinition.h"
 #include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
 
@@ -23,16 +25,16 @@ public:
 	// completely different lifespans.
 
 	virtual bool requiresTexturePack()=0;
-	virtual UINT getRequiredTexturePackId()=0;
+	virtual std::uint32_t getRequiredTexturePackId()=0;
 	virtual std::wstring getDefaultSaveName()=0;
-	virtual LPCWSTR getWorldName()=0;
-	virtual LPCWSTR getDisplayName()=0;
+	virtual const wchar_t *getWorldName()=0;
+	virtual const wchar_t *getDisplayName()=0;
 	virtual std::wstring getGrfPath()=0;
 	virtual bool requiresBaseSave() = 0;
 	virtual std::wstring getBaseSavePath() = 0;
 
 	virtual void setRequiresTexturePack(bool)=0;
-	virtual void setRequiredTexturePackId(UINT)=0;
+	virtual void setRequiredTexturePackId(std::uint32_t)=0;
 	virtual void setDefaultSaveName(const std::wstring &)=0;
 	virtual void setWorldName(const std::wstring &)=0;
 	virtual void setDisplayName(const std::wstring &)=0;
@@ -51,23 +53,23 @@ protected:
 	std::wstring m_displayName;
 	std::wstring m_defaultSaveName;
 	bool m_bRequiresTexturePack;
-	int m_requiredTexturePackId;
+	std::uint32_t m_requiredTexturePackId;
 	std::wstring m_grfPath;
 	std::wstring m_baseSavePath;
 	bool m_bRequiresBaseSave;
 
 public:
 	virtual bool requiresTexturePack();
-	virtual UINT getRequiredTexturePackId();
+	virtual std::uint32_t getRequiredTexturePackId();
 	virtual std::wstring getDefaultSaveName();
-	virtual LPCWSTR getWorldName();
-	virtual LPCWSTR getDisplayName();
+	virtual const wchar_t *getWorldName();
+	virtual const wchar_t *getDisplayName();
 	virtual std::wstring getGrfPath();
 	virtual bool requiresBaseSave();
 	virtual std::wstring getBaseSavePath();
 
 	virtual void setRequiresTexturePack(bool x);
-	virtual void setRequiredTexturePackId(UINT x);
+	virtual void setRequiredTexturePackId(std::uint32_t x);
 	virtual void setDefaultSaveName(const std::wstring &x);
 	virtual void setWorldName(const std::wstring &x);
 	virtual void setDisplayName(const std::wstring &x);
@@ -116,10 +118,10 @@ public:
 	bool isFromDLC();
 
 	bool requiresTexturePack();
-	UINT getRequiredTexturePackId();
+	std::uint32_t getRequiredTexturePackId();
 	std::wstring getDefaultSaveName();
-	LPCWSTR getWorldName();
-	LPCWSTR getDisplayName();
+	const wchar_t *getWorldName();
+	const wchar_t *getDisplayName();
 	std::wstring getGrfPath();
 	bool requiresBaseSave();
 	std::wstring getBaseSavePath();
@@ -127,7 +129,7 @@ public:
 	void setGrSource(GrSource *grs);
 
 	void setRequiresTexturePack(bool x);
-	void setRequiredTexturePackId(UINT x);
+	void setRequiredTexturePackId(std::uint32_t x);
 	void setDefaultSaveName(const std::wstring &x);
 	void setWorldName(const std::wstring &x);
 	void setDisplayName(const std::wstring &x);