From 7f7d99501cf87fcc234a5d3af453e7e0642f96a3 Mon Sep 17 00:00:00 2001
From: void_17 <61356189+void2012@users.noreply.github.com>
Date: Tue, 3 Mar 2026 10:23:28 +0700
Subject: Revert "Win64: configurable username (username.txt) and persistent
 game setti…" (#234)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b8a7f816b52775fdcfb3503f0000accb8cd65765.
---
 Minecraft.Client/Windows64/Windows64_App.cpp | 57 +---------------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

(limited to 'Minecraft.Client/Windows64/Windows64_App.cpp')

diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp
index 461e8c34..dbc1bfc5 100644
--- a/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/Minecraft.Client/Windows64/Windows64_App.cpp
@@ -10,46 +10,11 @@
 #include "..\..\Minecraft.World\BiomeSource.h"
 #include "..\..\Minecraft.World\LevelType.h"
 
-wstring g_playerName;
-
 CConsoleMinecraftApp app;
 
-static void LoadPlayerName()
-{
-	if (!g_playerName.empty()) return;
-	g_playerName = L"Windows";
-
-	char exePath[MAX_PATH] = {};
-	GetModuleFileNameA(NULL, exePath, MAX_PATH);
-	char *lastSlash = strrchr(exePath, '\\');
-	if (lastSlash) *(lastSlash + 1) = '\0';
-	char filePath[MAX_PATH] = {};
-	_snprintf_s(filePath, sizeof(filePath), _TRUNCATE, "%susername.txt", exePath);
-
-	FILE *f = NULL;
-	if (fopen_s(&f, filePath, "r") == 0 && f)
-	{
-		char buf[128] = {};
-		if (fgets(buf, sizeof(buf), f))
-		{
-			int len = (int)strlen(buf);
-			while (len > 0 && (buf[len-1] == '\n' || buf[len-1] == '\r' || buf[len-1] == ' '))
-				buf[--len] = '\0';
-			if (len > 0)
-			{
-				wchar_t wbuf[128] = {};
-				mbstowcs(wbuf, buf, 127);
-				g_playerName = wbuf;
-			}
-		}
-		fclose(f);
-	}
-}
-
 CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
 {
 	m_bShutdown = false;
-	LoadPlayerName();
 }
 
 void CConsoleMinecraftApp::SetRichPresenceContext(int iPad, int contextId)
@@ -70,27 +35,9 @@ void CConsoleMinecraftApp::FatalLoadError()
 
 void CConsoleMinecraftApp::CaptureSaveThumbnail()
 {
-	RenderManager.CaptureThumbnail(&m_ThumbnailBuffer);
 }
 void CConsoleMinecraftApp::GetSaveThumbnail(PBYTE *pbData,DWORD *pdwSize)
 {
-	// On a save caused by a create world, the thumbnail capture won't have happened
-	if (m_ThumbnailBuffer.Allocated())
-	{
-		if (pbData)
-		{
-			*pbData  = new BYTE[m_ThumbnailBuffer.GetBufferSize()];
-			*pdwSize = m_ThumbnailBuffer.GetBufferSize();
-			memcpy(*pbData, m_ThumbnailBuffer.GetBufferPointer(), *pdwSize);
-		}
-		m_ThumbnailBuffer.Release();
-	}
-	else
-	{
-		// No capture happened (e.g. first save on world creation) leave thumbnail as NULL
-		if (pbData)  *pbData  = NULL;
-		if (pdwSize) *pdwSize = 0;
-	}
 }
 void CConsoleMinecraftApp::ReleaseSaveThumbnail()
 {
@@ -110,8 +57,8 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 	app.ReleaseSaveThumbnail();
 	ProfileManager.SetLockedProfile(0);
-	LoadPlayerName();
-	pMinecraft->user->name = g_playerName;
+	extern wchar_t g_Win64UsernameW[17];
+	pMinecraft->user->name = g_Win64UsernameW;
 	app.ApplyGameSettingsChanged(0);
 
 	////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameJoinLoad::OnInit
-- 
cgit v1.2.3