Add Ctrl+V clipboard paste to UIControl_TextInput and UIScene_Keyboard

Previously paste only worked in the chat screen. Wire Screen::getClipboard() into the two remaining text input paths so Ctrl+V works for sign editing, seed entry, server IP/port, and world name fields.
Comment out FOV modification line, since the FOV is stored and doesn't need to be adjusted. (#1248 )
2026-03-16 11:40:49 -05:00 · 2026-03-15 18:14:15 -05:00 · 2026-03-15 18:13:11 -05:00 · 2026-03-15 18:13:03 -05:00 · 2026-03-15 18:12:53 -05:00 · 2026-03-15 18:11:55 -05:00
21 changed files with 600 additions and 631 deletions
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_TextInput.h"
+#include "..\..\Screen.h"

 UIControl_TextInput::UIControl_TextInput()
 {
@@ -211,6 +212,31 @@ UIControl_TextInput::EDirectEditResult UIControl_TextInput::tickDirectEdit()
 		}
 	}

+	// Paste from clipboard
+	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
+	{
+		wstring pasted = Screen::getClipboard();
+		wstring sanitized;
+		sanitized.reserve(pasted.length());
+
+		for (wchar_t pc : pasted)
+		{        
+			if (pc >= 0x20) // Keep printable characters
+			{
+				if (m_iCharLimit > 0 && (m_editBuffer.length() + sanitized.length()) >= (size_t)m_iCharLimit)
+					break;
+				sanitized += pc;
+			}
+		}
+
+		if (!sanitized.empty())
+		{
+			m_editBuffer.insert(m_iCursorPos, sanitized);
+			m_iCursorPos += (int)sanitized.length();
+			changed = true;
+		}
+	}
+
 	// Arrow keys, Home, End, Delete for cursor movement
 	if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
 	{
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_Keyboard.h"
+#include "..\..\Screen.h"

 #ifdef _WINDOWS64
 // Global buffer that stores the text entered in the native keyboard scene.
@@ -224,6 +225,38 @@ void UIScene_Keyboard::tick()
 		}
 	}

+	// Paste from clipboard
+	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
+	{
+		wstring pasted = Screen::getClipboard();
+		wstring sanitized;
+		sanitized.reserve(pasted.length());
+
+		for (wchar_t pc : pasted)
+		{
+			if (pc >= 0x20) // Keep printable characters
+			{
+				if (static_cast<int>(m_win64TextBuffer.length() + sanitized.length()) >= m_win64MaxChars)
+					break;
+				sanitized += pc;
+			}
+		}
+
+		if (!sanitized.empty())
+		{
+			if (m_bPCMode)
+			{
+				m_win64TextBuffer.insert(m_iCursorPos, sanitized);
+				m_iCursorPos += (int)sanitized.length();
+			}
+			else
+			{
+				m_win64TextBuffer += sanitized;
+			}
+			changed = true;
+		}
+	}
+
 	if (m_bPCMode)
 	{
 		// Arrow keys, Home, End, Delete for cursor movement
@@ -368,7 +368,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 			UINT uiIDA[2];
 			uiIDA[0]=IDS_CANCEL;
 			uiIDA[1]=IDS_OK;
-			ui.RequestErrorMessage(IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
+			ui.RequestErrorMessage(IDS_WINDOWS_EXIT, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
 		}
 		else
 		{
@@ -392,7 +392,7 @@ float GameRenderer::getFov(float a, bool applyEffects)
 	float fov = m_fov;//70;
 	if (applyEffects)
 	{
-		fov += mc->options->fov * 40;
+		//fov += mc->options->fov * 40;
 		fov *= oFov[playerIdx] + (this->fov[playerIdx] - oFov[playerIdx]) * a;
 	}
 	if (player->getHealth() <= 0)
@@ -657,7 +657,7 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 	setFlightAllowed(GetDedicatedServerBool(settings, L"allow-flight", true));

 	// 4J Stu - Enabling flight to stop it kicking us when we use it
-#ifdef _DEBUG_MENUS_ENABLED
+#if (defined _DEBUG_MENUS_ENABLED && defined _DEBUG)
 	setFlightAllowed(true);
 #endif

@@ -1715,330 +1715,345 @@ void MinecraftServer::setPlayerIdleTimeout(int playerIdleTimeout)
 extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
 void MinecraftServer::run(int64_t seed, void *lpParameter)
 {
-	NetworkGameInitData *initData = nullptr;
-	DWORD initSettings = 0;
-	bool findSeed = false;
+    NetworkGameInitData *initData = nullptr;
+    DWORD initSettings = 0;
+    bool findSeed = false;
 	if(lpParameter != nullptr)
-	{
-		initData = static_cast<NetworkGameInitData *>(lpParameter);
-		initSettings = app.GetGameHostOption(eGameHostOption_All);
-		findSeed = initData->findSeed;
-		m_texturePackId = initData->texturePackId;
-	}
-	//    try {		// 4J - removed try/catch/finally
-	bool didInit = false;
+    {
+        initData = static_cast<NetworkGameInitData *>(lpParameter);
+        initSettings = app.GetGameHostOption(eGameHostOption_All);
+        findSeed = initData->findSeed;
+        m_texturePackId = initData->texturePackId;
+    }
+    //    try {		// 4J - removed try/catch/finally
+    bool didInit = false;
 	if (initServer(seed, initData, initSettings,findSeed))
-	{
-		didInit = true;
-		ServerLevel *levelNormalDimension = levels[0];
-		// 4J-PB - Set the Stronghold position in the leveldata if there isn't one in there
-		Minecraft *pMinecraft = Minecraft::GetInstance();
+    {
+        didInit = true;
+        ServerLevel *levelNormalDimension = levels[0];
+        // 4J-PB - Set the Stronghold position in the leveldata if there isn't one in there
+        Minecraft *pMinecraft = Minecraft::GetInstance();
 		LevelData *pLevelData=levelNormalDimension->getLevelData();

 		if(pLevelData && pLevelData->getHasStronghold()==false)
-		{
+        {
 			int x,z;
 			if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
-			{
-				pLevelData->setXStronghold(x);
-				pLevelData->setZStronghold(z);
-				pLevelData->setHasStronghold();
-			}
-		}
+            {
+                pLevelData->setXStronghold(x);
+                pLevelData->setZStronghold(z);
+                pLevelData->setHasStronghold();
+            }
+        }

-		int64_t lastTime = getCurrentTimeMillis();
-		int64_t unprocessedTime = 0;
-		while (running && !s_bServerHalted)
-		{
-			int64_t now = getCurrentTimeMillis();
+        int64_t lastTime = getCurrentTimeMillis();
+        int64_t unprocessedTime = 0;
+        while (running && !s_bServerHalted)
+        {
+            int64_t now = getCurrentTimeMillis();

-			// 4J Stu - When we pause the server, we don't want to count that as time passed
-			// 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
+            // 4J Stu - When we pause the server, we don't want to count that as time passed
+            // 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
 			//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
 			//if(m_isServerPaused) lastTime = now;

-			int64_t passedTime = now - lastTime;
-			if (passedTime > MS_PER_TICK * 40)
-			{
-				//                logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
-				passedTime = MS_PER_TICK * 40;
-			}
-			if (passedTime < 0)
-			{
-				//                logger.warning("Time ran backwards! Did the system time change?");
-				passedTime = 0;
-			}
-			unprocessedTime += passedTime;
-			lastTime = now;
+            int64_t passedTime = now - lastTime;
+            if (passedTime > MS_PER_TICK * 40)
+            {
+                //                logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
+                passedTime = MS_PER_TICK * 40;
+            }
+            if (passedTime < 0)
+            {
+                //                logger.warning("Time ran backwards! Did the system time change?");
+                passedTime = 0;
+            }
+            unprocessedTime += passedTime;
+            lastTime = now;

-			// 4J Added ability to pause the server
+            // 4J Added ability to pause the server
 			if( !m_isServerPaused )
-			{
-				bool didTick = false;
-				if (levels[0]->allPlayersAreSleeping())
-				{
-					tick();
-					unprocessedTime = 0;
-				}
-				else
-				{
-					//					int tickcount = 0;
-					//					int64_t beforeall = System::currentTimeMillis();
-					while (unprocessedTime > MS_PER_TICK)
-					{
-						unprocessedTime -= MS_PER_TICK;
-						chunkPacketManagement_PreTick();
-//						int64_t before = System::currentTimeMillis();
-						tick();
-//						int64_t after = System::currentTimeMillis();
-//						PIXReportCounter(L"Server time",(float)(after-before));
+            {
+                bool didTick = false;
+                if (levels[0]->allPlayersAreSleeping())
+                {
+                    tick();
+                    unprocessedTime = 0;
+                }
+                else
+                {
+                    //					int tickcount = 0;
+                    //					int64_t beforeall = System::currentTimeMillis();
+                    while (unprocessedTime > MS_PER_TICK)
+                    {
+                        unprocessedTime -= MS_PER_TICK;
+                        chunkPacketManagement_PreTick();
+                        //						int64_t before = System::currentTimeMillis();
+                        tick();
+                        //						int64_t after = System::currentTimeMillis();
+                        //						PIXReportCounter(L"Server time",(float)(after-before));

-						chunkPacketManagement_PostTick();
-					}
-//					int64_t afterall = System::currentTimeMillis();
-//					PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
-//					PIXReportCounter(L"Server ticks",(float)tickcount);
-				}
-			}
-			else
-			{
-				// 4J Stu - TU1-hotfix
+                        chunkPacketManagement_PostTick();
+                    }
+                    //					int64_t afterall = System::currentTimeMillis();
+                    //					PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
+                    //					PIXReportCounter(L"Server ticks",(float)tickcount);
+                }
+            }
+            else
+            {
+                // 4J Stu - TU1-hotfix
 				//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
-				// The connections should tick at the same frequency even when paused
-				while (unprocessedTime > MS_PER_TICK)
-				{
-					unprocessedTime -= MS_PER_TICK;
-					// Keep ticking the connections to stop them timing out
-					connection->tick();
-				}
-			}
+                // The connections should tick at the same frequency even when paused
+                while (unprocessedTime > MS_PER_TICK)
+                {
+                    unprocessedTime -= MS_PER_TICK;
+                    // Keep ticking the connections to stop them timing out
+                    connection->tick();
+                }
+            }
 			if(MinecraftServer::setTimeAtEndOfTick)
-			{
-				MinecraftServer::setTimeAtEndOfTick = false;
-				for (unsigned int i = 0; i < levels.length; i++)
-				{
-					//					if (i == 0 || settings->getBoolean(L"allow-nether", true))		// 4J removed - we always have nether
-					{
-						ServerLevel *level = levels[i];
+            {
+                MinecraftServer::setTimeAtEndOfTick = false;
+                for (unsigned int i = 0; i < levels.length; i++)
+                {
+                    //					if (i == 0 || settings->getBoolean(L"allow-nether", true))		// 4J removed - we always have nether
+                    {
+                        ServerLevel *level = levels[i];
 						level->setGameTime( MinecraftServer::setTime );
-					}
-				}
-			}
+                    }
+                }
+            }
 			if(MinecraftServer::setTimeOfDayAtEndOfTick)
-			{
-				MinecraftServer::setTimeOfDayAtEndOfTick = false;
-				for (unsigned int i = 0; i < levels.length; i++)
-				{
-					if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
-					{
-						ServerLevel *level = levels[i];
+            {
+                MinecraftServer::setTimeOfDayAtEndOfTick = false;
+                for (unsigned int i = 0; i < levels.length; i++)
+                {
+                    if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
+                    {
+                        ServerLevel *level = levels[i];
 						level->setDayTime( MinecraftServer::setTimeOfDay );
-					}
-				}
-			}
+                    }
+                }
+            }

-			// Process delayed actions
-			eXuiServerAction eAction;
-			LPVOID param;
+            // Process delayed actions
+            eXuiServerAction eAction;
+            LPVOID param;
 			for(int i=0;i<XUSER_MAX_COUNT;i++)
-			{
-				eAction = app.GetXuiServerAction(i);
-				param = app.GetXuiServerActionParam(i);
+            {
+                eAction = app.GetXuiServerAction(i);
+                param = app.GetXuiServerActionParam(i);

 				switch(eAction)
-				{
-				case eXuiServerAction_AutoSaveGame:
+                {
+                case eXuiServerAction_AutoSaveGame:
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(MINECRAFT_SERVER_BUILD)
+                    {
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
-					{
-						PIXBeginNamedEvent(0,"Autosave");
+                        PIXBeginNamedEvent(0, "Autosave");

-						// Get the frequency of the timer
-						LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
-						float fElapsedTime = 0.0f;
-						QueryPerformanceFrequency( &qwTicksPerSec );
-						float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
+                        // Get the frequency of the timer
+                        LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
+                        float fElapsedTime = 0.0f;
+                        QueryPerformanceFrequency(&qwTicksPerSec);
+                        float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;

-						// Save the start time
-						QueryPerformanceCounter( &qwTime );
-
-						if (players != nullptr)
-						{
-							players->saveAll(nullptr);
-						}
-
-						for (unsigned int j = 0; j < levels.length; j++)
-						{
-							if( s_bServerHalted ) break;
-							// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
-							// with the data from the nethers leveldata.
-							// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
-							ServerLevel *level = levels[levels.length - 1 - j];
-							PIXBeginNamedEvent(0, "Saving level %d",levels.length - 1 - j);
-							level->save(false, nullptr, true);
-							PIXEndNamedEvent();
-						}
-						if( !s_bServerHalted )
-						{
-							PIXBeginNamedEvent(0,"Saving game rules");
-							saveGameRules();
-							PIXEndNamedEvent();
-
-							PIXBeginNamedEvent(0,"Save to disc");
-							levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
-							PIXEndNamedEvent();
-						}
-						PIXEndNamedEvent();
-
-						QueryPerformanceCounter( &qwNewTime );
-						qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
-						fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
-						app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
-					}
-					break;
+                        // Save the start time
+                        QueryPerformanceCounter(&qwTime);
 #endif
-				case eXuiServerAction_SaveGame:
-					app.EnterSaveNotificationSection();
-					if (players != nullptr)
-					{
-						players->saveAll(Minecraft::GetInstance()->progressRenderer);
-					}

-					players->broadcastAll(std::make_shared<UpdateProgressPacket>(20));
+                        if (players != nullptr)
+                        {
+                            players->saveAll(nullptr);
+                        }

-					for (unsigned int j = 0; j < levels.length; j++)
-					{
+                        for (unsigned int j = 0; j < levels.length; j++)
+                        {
+							if( s_bServerHalted ) break;
+                            // 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
+                            // with the data from the nethers leveldata.
+                            // Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
+                            ServerLevel *level = levels[levels.length - 1 - j];
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXBeginNamedEvent(0, "Saving level %d", levels.length - 1 - j);
+#endif
+                            level->save(false, nullptr, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+#endif
+                        }
+                        if (!s_bServerHalted)
+                        {
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXBeginNamedEvent(0, "Saving game rules");
+#endif
+                            saveGameRules();
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+
+                            PIXBeginNamedEvent(0, "Save to disc");
+#endif
+                            levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+#endif
+                        }
+
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                        PIXEndNamedEvent();
+
+                        QueryPerformanceCounter(&qwNewTime);
+                        qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
+                        fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
+                        app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
+#endif
+                    }
+                    break;
+#endif
+                case eXuiServerAction_SaveGame:
+                    app.EnterSaveNotificationSection();
+                    if (players != nullptr)
+                    {
+                        players->saveAll(Minecraft::GetInstance()->progressRenderer);
+                    }
+
+                    players->broadcastAll(std::make_shared<UpdateProgressPacket>(20));
+
+                    for (unsigned int j = 0; j < levels.length; j++)
+                    {
 						if( s_bServerHalted ) break;
-						// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
-						// with the data from the nethers leveldata.
-						// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
-						ServerLevel *level = levels[levels.length - 1 - j];
+                        // 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
+                        // with the data from the nethers leveldata.
+                        // Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
+                        ServerLevel *level = levels[levels.length - 1 - j];
 						level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));

-						players->broadcastAll(std::make_shared<UpdateProgressPacket>(33 + (j * 33)));
-					}
+                        players->broadcastAll(std::make_shared<UpdateProgressPacket>(33 + (j * 33)));
+                    }
 					if( !s_bServerHalted )
-					{
-						saveGameRules();
+                    {
+                        saveGameRules();

 						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
-					}
-					app.LeaveSaveNotificationSection();
-					break;
-				case eXuiServerAction_DropItem:
-					// Find the player, and drop the id at their feet
-					{
-						shared_ptr<ServerPlayer> player = players->players.at(0);
+                    }
+                    app.LeaveSaveNotificationSection();
+                    break;
+                case eXuiServerAction_DropItem:
+                    // Find the player, and drop the id at their feet
+                    {
+                        shared_ptr<ServerPlayer> player = players->players.at(0);
 						size_t id = (size_t) param;
-						player->drop(std::make_shared<ItemInstance>(id, 1, 0));
-					}
-					break;
-				case eXuiServerAction_SpawnMob:
-					{
-						shared_ptr<ServerPlayer> player = players->players.at(0);
-						eINSTANCEOF factory = static_cast<eINSTANCEOF>((size_t)param);
+                        player->drop(std::make_shared<ItemInstance>(id, 1, 0));
+                    }
+                    break;
+                case eXuiServerAction_SpawnMob:
+                    {
+                        shared_ptr<ServerPlayer> player = players->players.at(0);
+                        eINSTANCEOF factory = static_cast<eINSTANCEOF>((size_t)param);
 						shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(EntityIO::newByEnumType(factory,player->level ));
 						mob->moveTo(player->x+1, player->y, player->z+1, player->level->random->nextFloat() * 360, 0);
 						mob->setDespawnProtected();		// 4J added, default to being protected against despawning (has to be done after initial position is set)
-						player->level->addEntity(mob);
-					}
-					break;
-				case eXuiServerAction_PauseServer:
+                        player->level->addEntity(mob);
+                    }
+                    break;
+                case eXuiServerAction_PauseServer:
 					m_isServerPaused = ( (size_t) param == TRUE );
 					if( m_isServerPaused )
-					{
-						m_serverPausedEvent->Set();
-					}
-					break;
-				case eXuiServerAction_ToggleRain:
-					{
-						bool isRaining = levels[0]->getLevelData()->isRaining();
-						levels[0]->getLevelData()->setRaining(!isRaining);
-						levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
-					}
-					break;
-				case eXuiServerAction_ToggleThunder:
-					{
-						bool isThundering = levels[0]->getLevelData()->isThundering();
-						levels[0]->getLevelData()->setThundering(!isThundering);
-						levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
-					}
-					break;
-				case eXuiServerAction_ServerSettingChanged_Gamertags:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)));
-					break;
-				case eXuiServerAction_ServerSettingChanged_BedrockFog:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)));
-					break;
+                    {
+                        m_serverPausedEvent->Set();
+                    }
+                    break;
+                case eXuiServerAction_ToggleRain:
+                    {
+                        bool isRaining = levels[0]->getLevelData()->isRaining();
+                        levels[0]->getLevelData()->setRaining(!isRaining);
+                        levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
+                    }
+                    break;
+                case eXuiServerAction_ToggleThunder:
+                    {
+                        bool isThundering = levels[0]->getLevelData()->isThundering();
+                        levels[0]->getLevelData()->setThundering(!isThundering);
+                        levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
+                    }
+                    break;
+                case eXuiServerAction_ServerSettingChanged_Gamertags:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)));
+                    break;
+                case eXuiServerAction_ServerSettingChanged_BedrockFog:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)));
+                    break;

-				case eXuiServerAction_ServerSettingChanged_Difficulty:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty));
-					break;
-				case eXuiServerAction_ExportSchematic:
+                case eXuiServerAction_ServerSettingChanged_Difficulty:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty));
+                    break;
+                case eXuiServerAction_ExportSchematic:
 #ifndef _CONTENT_PACKAGE
-					app.EnterSaveNotificationSection();
+                    app.EnterSaveNotificationSection();

 					//players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(20) ) );

 					if( !s_bServerHalted )
-					{
-						ConsoleSchematicFile::XboxSchematicInitParam *initData = static_cast<ConsoleSchematicFile::XboxSchematicInitParam *>(param);
+                    {
+                        ConsoleSchematicFile::XboxSchematicInitParam *initData = static_cast<ConsoleSchematicFile::XboxSchematicInitParam *>(param);
 #ifdef _XBOX
-						File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
+                        File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
 #else
-						File targetFileDir(L"Schematics");
+                        File targetFileDir(L"Schematics");
 #endif
 						if(!targetFileDir.exists())	targetFileDir.mkdir();

-						wchar_t filename[128];
+                        wchar_t filename[128];
 						swprintf(filename,128,L"%ls%dx%dx%d.sch",initData->name,(initData->endX - initData->startX + 1), (initData->endY - initData->startY + 1), (initData->endZ - initData->startZ + 1));

 						File dataFile = File( targetFileDir, wstring(filename) );
 						if(dataFile.exists()) dataFile._delete();
-						FileOutputStream fos = FileOutputStream(dataFile);
-						DataOutputStream dos = DataOutputStream(&fos);
-						ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
-						dos.close();
+                        FileOutputStream fos = FileOutputStream(dataFile);
+                        DataOutputStream dos = DataOutputStream(&fos);
+                        ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
+                        dos.close();

-						delete initData;
-					}
-					app.LeaveSaveNotificationSection();
+                        delete initData;
+                    }
+                    app.LeaveSaveNotificationSection();
 #endif
-					break;
-				case eXuiServerAction_SetCameraLocation:
+                    break;
+                case eXuiServerAction_SetCameraLocation:
 #ifndef _CONTENT_PACKAGE
-					{
-						DebugSetCameraPosition *pos = static_cast<DebugSetCameraPosition *>(param);
+                    {
+                        DebugSetCameraPosition *pos = static_cast<DebugSetCameraPosition *>(param);

 						app.DebugPrintf(	"DEBUG: Player=%i\n", pos->player );
 						app.DebugPrintf(	"DEBUG: Teleporting to pos=(%f.2, %f.2, %f.2), looking at=(%f.2,%f.2)\n",
-							pos->m_camX, pos->m_camY, pos->m_camZ,
+                                        pos->m_camX, pos->m_camY, pos->m_camZ,
 							pos->m_yRot, pos->m_elev
 							);

-						shared_ptr<ServerPlayer> player = players->players.at(pos->player);
+                        shared_ptr<ServerPlayer> player = players->players.at(pos->player);
 						player->debug_setPosition(	pos->m_camX, pos->m_camY, pos->m_camZ,
 							pos->m_yRot, pos->m_elev	);

-						// Doesn't work
+                        // Doesn't work
 						//player->setYHeadRot(pos->m_yRot);
 						//player->absMoveTo(pos->m_camX, pos->m_camY, pos->m_camZ, pos->m_yRot, pos->m_elev);
-					}
+                    }
 #endif
-					break;
-				}
+                    break;
+                }

 				app.SetXuiServerAction(i,eXuiServerAction_Idle);
-			}
+            }

-			Sleep(1);
-		}
-	}
+            Sleep(1);
+        }
+    }
 	//else
-	//{
+    //{
 	//     while (running)
-	//	{
+    //	{
 	//        handleConsoleInputs();
-	//		Sleep(10);
+    //		Sleep(10);
 	//    }
 	//}
 #if 0
@@ -2065,9 +2080,9 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 }
 #endif

-	// 4J Stu - Stop the server when the loops complete, as the finally would do
-	stopServer(didInit);
-	stopped = true;
+    // 4J Stu - Stop the server when the loops complete, as the finally would do
+    stopServer(didInit);
+    stopped = true;
 }

 void MinecraftServer::broadcastStartSavingPacket()
@@ -2375,6 +2390,9 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 {
 	if( player == nullptr ) return false;

+#ifdef MINECRAFT_SERVER_BUILD
+	return true;
+#else
 	int time = GetTickCount();
 	DWORD currentPlayerCount = g_NetworkManager.GetPlayerCount();
 	if( currentPlayerCount == 0 ) return false;
@@ -2386,6 +2404,7 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 	}

 	return false;
+#endif
 }

 void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)
@@ -204,7 +204,7 @@ void Screen::updateEvents()
 		// Map to Screen::keyPressed
 		int mappedKey = -1;
 		wchar_t ch = 0;
-		if (vk == VK_ESCAPE)  mappedKey = Keyboard::KEY_ESCAPE;
+		if (vk == VK_ESCAPE)	   mappedKey = Keyboard::KEY_ESCAPE;
 		else if (vk == VK_RETURN)  mappedKey = Keyboard::KEY_RETURN;
 		else if (vk == VK_BACK)    mappedKey = Keyboard::KEY_BACK;
 		else if (vk == VK_UP)      mappedKey = Keyboard::KEY_UP;
@@ -146,7 +146,8 @@ void ServerPlayer::flagEntitiesToBeRemoved(unsigned int *flags, bool *removedFou
 	if( ( *removedFound ) == false )
 	{
 		*removedFound = true;
-		memset(flags, 0, 2048/32);
+		// before this left 192 bytes uninitialized!!!!!
+        memset(flags, 0, (2048 / 32) * sizeof(unsigned int));
 	}

 	for(int index : entitiesToRemove)
@@ -376,6 +377,9 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 //						connection->done);
 //				}

+#ifdef MINECRAFT_SERVER_BUILD
+				if (dontDelayChunks || (canSendToPlayer && !connection->done))
+#else
 				if( dontDelayChunks ||
 					(canSendToPlayer &&
 #ifdef _XBOX_ONE
@@ -390,21 +394,22 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 #endif
 					//(tickCount - lastBrupSendTickCount) > (connection->getNetworkPlayer()->GetCurrentRtt()>>4) &&
 					!connection->done) )
-				{
-					lastBrupSendTickCount = tickCount;
-					okToSend = true;
-					MinecraftServer::chunkPacketManagement_DidSendTo(connection->getNetworkPlayer());
+#endif
+                {
+                    lastBrupSendTickCount = tickCount;
+                    okToSend = true;
+                    MinecraftServer::chunkPacketManagement_DidSendTo(connection->getNetworkPlayer());

-//					static unordered_map<wstring,int64_t> mapLastTime;
-//					int64_t thisTime = System::currentTimeMillis();
-//					int64_t lastTime = mapLastTime[connection->getNetworkPlayer()->GetUID().toString()];
-//					app.DebugPrintf(" - OK to send (%d ms since last)\n", thisTime - lastTime);
-//					mapLastTime[connection->getNetworkPlayer()->GetUID().toString()] = thisTime;
-				}
-				else
-				{
-					//					app.DebugPrintf(" - <NOT OK>\n");
-				}
+                    //					static unordered_map<wstring,int64_t> mapLastTime;
+                    //					int64_t thisTime = System::currentTimeMillis();
+                    //					int64_t lastTime = mapLastTime[connection->getNetworkPlayer()->GetUID().toString()];
+                    //					app.DebugPrintf(" - OK to send (%d ms since last)\n", thisTime - lastTime);
+                    //					mapLastTime[connection->getNetworkPlayer()->GetUID().toString()] = thisTime;
+                }
+                else
+                {
+                    //					app.DebugPrintf(" - <NOT OK>\n");
+                }
 			}

 			if (okToSend)
@@ -25,12 +25,20 @@ public:
 	static const int KEY_DROP = 'Q';
 	static const int KEY_CRAFTING = 'C';
 	static const int KEY_CRAFTING_ALT = 'R';
+	static const int KEY_CHAT = 'T';
 	static const int KEY_CONFIRM = VK_RETURN;
 	static const int KEY_CANCEL = VK_ESCAPE;
 	static const int KEY_PAUSE = VK_ESCAPE;
-	static const int KEY_THIRD_PERSON = VK_F5;
+	static const int KEY_TOGGLE_HUD = VK_F1;
 	static const int KEY_DEBUG_INFO = VK_F3;
 	static const int KEY_DEBUG_MENU = VK_F4;
+	static const int KEY_THIRD_PERSON = VK_F5;
+	static const int KEY_DEBUG_CONSOLE = VK_F6;
+	static const int KEY_HOST_SETTINGS = VK_F8;
+	static const int KEY_FULLSCREEN = VK_F11;
+
+	// todo: implement and shi
+	static const int KEY_SCREENSHOT = VK_F2;

 	void Init();
 	void Tick();
@@ -121,7 +121,6 @@ static WINDOWPLACEMENT g_wpPrev = { sizeof(g_wpPrev) };
 struct Win64LaunchOptions
 {
 	int screenMode;
-	bool serverMode;
 	bool fullscreen;
 };

@@ -207,13 +206,9 @@ static Win64LaunchOptions ParseLaunchOptions()
 {
 	Win64LaunchOptions options = {};
 	options.screenMode = 0;
-	options.serverMode = false;

 	g_Win64MultiplayerJoin = false;
 	g_Win64MultiplayerPort = WIN64_NET_DEFAULT_PORT;
-	g_Win64DedicatedServer = false;
-	g_Win64DedicatedServerPort = WIN64_NET_DEFAULT_PORT;
-	g_Win64DedicatedServerBindIP[0] = 0;

 	int argc = 0;
 	LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
@@ -226,17 +221,6 @@ static Win64LaunchOptions ParseLaunchOptions()
 			options.screenMode = argv[1][0] - L'0';
 	}

-	for (int i = 1; i < argc; ++i)
-	{
-		if (_wcsicmp(argv[i], L"-server") == 0)
-		{
-			options.serverMode = true;
-			break;
-		}
-	}
-
-	g_Win64DedicatedServer = options.serverMode;
-
 	for (int i = 1; i < argc; ++i)
 	{
 		if (_wcsicmp(argv[i], L"-name") == 0 && (i + 1) < argc)
@@ -247,15 +231,8 @@ static Win64LaunchOptions ParseLaunchOptions()
 		{
 			char ipBuf[256];
 			CopyWideArgToAnsi(argv[++i], ipBuf, sizeof(ipBuf));
-			if (options.serverMode)
-			{
-				strncpy_s(g_Win64DedicatedServerBindIP, sizeof(g_Win64DedicatedServerBindIP), ipBuf, _TRUNCATE);
-			}
-			else
-			{
-				strncpy_s(g_Win64MultiplayerIP, sizeof(g_Win64MultiplayerIP), ipBuf, _TRUNCATE);
-				g_Win64MultiplayerJoin = true;
-			}
+			strncpy_s(g_Win64MultiplayerIP, sizeof(g_Win64MultiplayerIP), ipBuf, _TRUNCATE);
+			g_Win64MultiplayerJoin = true;
 		}
 		else if (_wcsicmp(argv[i], L"-port") == 0 && (i + 1) < argc)
 		{
@@ -263,10 +240,7 @@ static Win64LaunchOptions ParseLaunchOptions()
 			const long port = wcstol(argv[++i], &endPtr, 10);
 			if (endPtr != argv[i] && *endPtr == 0 && port > 0 && port <= 65535)
 			{
-				if (options.serverMode)
-					g_Win64DedicatedServerPort = static_cast<int>(port);
-				else
-					g_Win64MultiplayerPort = static_cast<int>(port);
+				g_Win64MultiplayerPort = static_cast<int>(port);
 			}
 		}
 		else if (_wcsicmp(argv[i], L"-fullscreen") == 0)
@@ -277,36 +251,6 @@ static Win64LaunchOptions ParseLaunchOptions()
 	return options;
 }

-static BOOL WINAPI HeadlessServerCtrlHandler(DWORD ctrlType)
-{
-	switch (ctrlType)
-	{
-	case CTRL_C_EVENT:
-	case CTRL_BREAK_EVENT:
-	case CTRL_CLOSE_EVENT:
-	case CTRL_SHUTDOWN_EVENT:
-		app.m_bShutdown = true;
-		MinecraftServer::HaltServer();
-		return TRUE;
-	default:
-		return FALSE;
-	}
-}
-
-static void SetupHeadlessServerConsole()
-{
-	if (AllocConsole())
-	{
-		FILE* stream = nullptr;
-		freopen_s(&stream, "CONIN$", "r", stdin);
-		freopen_s(&stream, "CONOUT$", "w", stdout);
-		freopen_s(&stream, "CONOUT$", "w", stderr);
-		SetConsoleTitleA("Minecraft Server");
-	}
-
-	SetConsoleCtrlHandler(HeadlessServerCtrlHandler, TRUE);
-}
-
 void DefineActions(void)
 {
 	// The app needs to define the actions required, and the possible mappings for these
@@ -1350,161 +1294,6 @@ static Minecraft* InitialiseMinecraftRuntime()
 	return pMinecraft;
 }

-static int HeadlessServerConsoleThreadProc(void* lpParameter)
-{
-	UNREFERENCED_PARAMETER(lpParameter);
-
-	std::string line;
-	while (!app.m_bShutdown)
-	{
-		if (!std::getline(std::cin, line))
-		{
-			if (std::cin.eof())
-			{
-				break;
-			}
-
-			std::cin.clear();
-			Sleep(50);
-			continue;
-		}
-
-		wstring command = trimString(convStringToWstring(line));
-		if (command.empty())
-			continue;
-
-		MinecraftServer* server = MinecraftServer::getInstance();
-		if (server != nullptr)
-		{
-			server->handleConsoleInput(command, server);
-		}
-	}
-
-	return 0;
-}
-
-static int RunHeadlessServer()
-{
-	SetupHeadlessServerConsole();
-
-	Settings serverSettings(new File(L"server.properties"));
-	const wstring configuredBindIp = serverSettings.getString(L"server-ip", L"");
-
-	const char* bindIp = "*";
-	if (g_Win64DedicatedServerBindIP[0] != 0)
-	{
-		bindIp = g_Win64DedicatedServerBindIP;
-	}
-	else if (!configuredBindIp.empty())
-	{
-		bindIp = wstringtochararray(configuredBindIp);
-	}
-
-	const int port = g_Win64DedicatedServerPort > 0 ? g_Win64DedicatedServerPort : serverSettings.getInt(L"server-port", WIN64_NET_DEFAULT_PORT);
-
-	printf("Starting headless server on %s:%d\n", bindIp, port);
-	fflush(stdout);
-
-	const Minecraft* pMinecraft = InitialiseMinecraftRuntime();
-	if (pMinecraft == nullptr)
-	{
-		fprintf(stderr, "Failed to initialise the Minecraft runtime.\n");
-		return 1;
-	}
-
-	app.SetGameHostOption(eGameHostOption_Difficulty, serverSettings.getInt(L"difficulty", 1));
-	app.SetGameHostOption(eGameHostOption_Gamertags, 1);
-	app.SetGameHostOption(eGameHostOption_GameType, serverSettings.getInt(L"gamemode", 0));
-	app.SetGameHostOption(eGameHostOption_LevelType, 0);
-	app.SetGameHostOption(eGameHostOption_Structures, serverSettings.getBoolean(L"generate-structures", true) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_BonusChest, serverSettings.getBoolean(L"bonus-chest", false) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_PvP, serverSettings.getBoolean(L"pvp", true) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_TrustPlayers, serverSettings.getBoolean(L"trust-players", true) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_FireSpreads, serverSettings.getBoolean(L"fire-spreads", true) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_TNT, serverSettings.getBoolean(L"tnt", true) ? 1 : 0);
-	app.SetGameHostOption(eGameHostOption_HostCanFly, 1);
-	app.SetGameHostOption(eGameHostOption_HostCanChangeHunger, 1);
-	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible, 1);
-	app.SetGameHostOption(eGameHostOption_MobGriefing, 1);
-	app.SetGameHostOption(eGameHostOption_KeepInventory, 0);
-	app.SetGameHostOption(eGameHostOption_DoMobSpawning, 1);
-	app.SetGameHostOption(eGameHostOption_DoMobLoot, 1);
-	app.SetGameHostOption(eGameHostOption_DoTileDrops, 1);
-	app.SetGameHostOption(eGameHostOption_NaturalRegeneration, 1);
-	app.SetGameHostOption(eGameHostOption_DoDaylightCycle, 1);
-
-	MinecraftServer::resetFlags();
-	g_NetworkManager.HostGame(0, false, true, MINECRAFT_NET_MAX_PLAYERS, 0);
-
-	if (!WinsockNetLayer::IsActive())
-	{
-		fprintf(stderr, "Failed to bind the server socket on %s:%d.\n", bindIp, port);
-		return 1;
-	}
-
-	g_NetworkManager.FakeLocalPlayerJoined();
-
-	NetworkGameInitData* param = new NetworkGameInitData();
-	param->seed = 0;
-	param->settings = app.GetGameHostOption(eGameHostOption_All);
-
-	g_NetworkManager.ServerStoppedCreate(true);
-	g_NetworkManager.ServerReadyCreate(true);
-
-	C4JThread* thread = new C4JThread(&CGameNetworkManager::ServerThreadProc, param, "Server", 256 * 1024);
-	thread->SetProcessor(CPU_CORE_SERVER);
-	thread->Run();
-
-	g_NetworkManager.ServerReadyWait();
-	g_NetworkManager.ServerReadyDestroy();
-
-	if (MinecraftServer::serverHalted())
-	{
-		fprintf(stderr, "The server halted during startup.\n");
-		g_NetworkManager.LeaveGame(false);
-		return 1;
-	}
-
-	app.SetGameStarted(true);
-	g_NetworkManager.DoWork();
-
-	printf("Server ready on %s:%d\n", bindIp, port);
-	printf("Type 'help' for server commands.\n");
-	fflush(stdout);
-
-	C4JThread* consoleThread = new C4JThread(&HeadlessServerConsoleThreadProc, nullptr, "Server console", 128 * 1024);
-	consoleThread->Run();
-
-	MSG msg = { 0 };
-	while (WM_QUIT != msg.message && !app.m_bShutdown && !MinecraftServer::serverHalted())
-	{
-		if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE))
-		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-			continue;
-		}
-
-		app.UpdateTime();
-		ProfileManager.Tick();
-		StorageManager.Tick();
-		RenderManager.Tick();
-		ui.tick();
-		g_NetworkManager.DoWork();
-		app.HandleXuiActions();
-
-		Sleep(10);
-	}
-
-	printf("Stopping server...\n");
-	fflush(stdout);
-
-	app.m_bShutdown = true;
-	MinecraftServer::HaltServer();
-	g_NetworkManager.LeaveGame(false);
-	return 0;
-}
-
 int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 					   _In_opt_ HINSTANCE hPrevInstance,
 					   _In_ LPTSTR    lpCmdLine,
@@ -1566,11 +1355,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	const Win64LaunchOptions launchOptions = ParseLaunchOptions();
 	ApplyScreenMode(launchOptions.screenMode);

-	// Ensure uid.dat exists from startup in client mode (before any multiplayer/login path).
-	if (!launchOptions.serverMode)
-	{
-		Win64Xuid::ResolvePersistentXuid();
-	}
+	// Ensure uid.dat exists from startup (before any multiplayer/login path).
+	Win64Xuid::ResolvePersistentXuid();

 	// If no username, let's fall back
 	if (g_Win64Username[0] == 0)
@@ -1651,7 +1437,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	MyRegisterClass(hInstance);

 	// Perform application initialization:
-	if (!InitInstance (hInstance, launchOptions.serverMode ? SW_HIDE : nCmdShow))
+	if (!InitInstance (hInstance, nCmdShow))
 	{
 		return FALSE;
 	}
@@ -1670,13 +1456,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		ToggleFullscreen();
 	}

-	if (launchOptions.serverMode)
-	{
-		const int serverResult = RunHeadlessServer();
-		CleanupDevice();
-		return serverResult;
-	}
-
 #if 0
 	// Main message loop
 	MSG msg = {0};
@@ -1986,7 +1765,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		}

 		// F1 toggles the HUD
-		if (g_KBMInput.IsKeyPressed(VK_F1))
+		if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_TOGGLE_HUD))
 		{
 			const int primaryPad = ProfileManager.GetPrimaryPad();
 			const unsigned char displayHud = app.GetGameSettings(primaryPad, eGameSetting_DisplayHUD);
@@ -1995,7 +1774,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		}

 		// F3 toggles onscreen debug info
-		if (g_KBMInput.IsKeyPressed(VK_F3))
+		if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_INFO))
 		{
 			if (const Minecraft* pMinecraft = Minecraft::GetInstance())
 			{
@@ -2008,7 +1787,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,

 #ifdef _DEBUG_MENUS_ENABLED
        // F6 Open debug console
-        if (g_KBMInput.IsKeyPressed(VK_F6))
+        if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_CONSOLE))
        {
        	static bool s_debugConsole = false;
        	s_debugConsole = !s_debugConsole;
@@ -2016,14 +1795,14 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
        }
 #endif

-		// F11 Toggle fullscreen
-		if (g_KBMInput.IsKeyPressed(VK_F11))
+		// toggle fullscreen
+		if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_FULLSCREEN))
 		{
 			ToggleFullscreen();
 		}

 		// TAB opens game info menu. - Vvis :3 - Updated by detectiveren
-		if (g_KBMInput.IsKeyPressed(VK_TAB) && !ui.GetMenuDisplayed(0))
+		if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_HOST_SETTINGS) && !ui.GetMenuDisplayed(0))
 		{
 			if (Minecraft* pMinecraft = Minecraft::GetInstance())
 			{
@@ -2035,7 +1814,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		}

 		// Open chat
-		if (g_KBMInput.IsKeyPressed('T') && app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL)
+		if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_CHAT) && app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL)
 		{
 			g_KBMInput.ClearCharBuffer();
 			pMinecraft->setScreen(new ChatScreen());
@@ -8811,4 +8811,7 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
 	<data name="IDS_TOOLTIPS_CURE">
 		<value>Cure</value>
 	</data>	
+	<data name="IDS_WINDOWS_EXIT">
+		<value>Exit Minecraft</value>
+	</data>	
 </root>
@@ -1,7 +1,7 @@
 #pragma once
 // Auto-generated by StringTable builder — do not edit manually.
 // Source language: en-US
-// Total strings:   2286
+// Total strings:   2287

 #define IDS_NULL                                               0
 #define IDS_OK                                                 1
@@ -2165,127 +2165,128 @@
 #define IDS_TUTORIAL_TASK_MINECART_PUSHING                     2159
 #define IDS_CONNECTION_FAILED_NO_SD_SPLITSCREEN                2160
 #define IDS_TOOLTIPS_CURE                                      2161
-#define IDS_LANG_SYSTEM                                        2162
-#define IDS_LANG_ENGLISH                                       2163
-#define IDS_LANG_GERMAN                                        2164
-#define IDS_LANG_SPANISH                                       2165
-#define IDS_LANG_SPANISH_SPAIN                                 2166
-#define IDS_LANG_SPANISH_LATIN_AMERICA                         2167
-#define IDS_LANG_FRENCH                                        2168
-#define IDS_LANG_ITALIAN                                       2169
-#define IDS_LANG_PORTUGUESE                                    2170
-#define IDS_LANG_PORTUGUESE_PORTUGAL                           2171
-#define IDS_LANG_PORTUGUESE_BRAZIL                             2172
-#define IDS_LANG_JAPANESE                                      2173
-#define IDS_LANG_KOREAN                                        2174
-#define IDS_LANG_CHINESE_TRADITIONAL                           2175
-#define IDS_LANG_CHINESE_SIMPLIFIED                            2176
-#define IDS_LANG_DANISH                                        2177
-#define IDS_LANG_FINISH                                        2178
-#define IDS_LANG_DUTCH                                         2179
-#define IDS_LANG_POLISH                                        2180
-#define IDS_LANG_RUSSIAN                                       2181
-#define IDS_LANG_SWEDISH                                       2182
-#define IDS_LANG_NORWEGIAN                                     2183
-#define IDS_LANG_GREEK                                         2184
-#define IDS_LANG_TURKISH                                       2185
-#define IDS_LEADERBOARD_KILLS_EASY                             2186
-#define IDS_LEADERBOARD_KILLS_NORMAL                           2187
-#define IDS_LEADERBOARD_KILLS_HARD                             2188
-#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL                 2189
-#define IDS_LEADERBOARD_MINING_BLOCKS_EASY                     2190
-#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL                   2191
-#define IDS_LEADERBOARD_MINING_BLOCKS_HARD                     2192
-#define IDS_LEADERBOARD_FARMING_PEACEFUL                       2193
-#define IDS_LEADERBOARD_FARMING_EASY                           2194
-#define IDS_LEADERBOARD_FARMING_NORMAL                         2195
-#define IDS_LEADERBOARD_FARMING_HARD                           2196
-#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL                    2197
-#define IDS_LEADERBOARD_TRAVELLING_EASY                        2198
-#define IDS_LEADERBOARD_TRAVELLING_NORMAL                      2199
-#define IDS_LEADERBOARD_TRAVELLING_HARD                        2200
-#define IDS_TIPS_GAMETIP_0                                     2201
-#define IDS_TIPS_GAMETIP_1                                     2202
-#define IDS_TIPS_GAMETIP_48                                    2203
-#define IDS_TIPS_GAMETIP_44                                    2204
-#define IDS_TIPS_GAMETIP_45                                    2205
-#define IDS_TIPS_TRIVIA_4                                      2206
-#define IDS_TIPS_TRIVIA_17                                     2207
-#define IDS_HOW_TO_PLAY_MULTIPLAYER                            2208
-#define IDS_HOW_TO_PLAY_SOCIALMEDIA                            2209
-#define IDS_HOW_TO_PLAY_CREATIVE                               2210
-#define IDS_TUTORIAL_TASK_FLY                                  2211
-#define IDS_TOOLTIPS_SELECTDEVICE                              2212
-#define IDS_TOOLTIPS_CHANGEDEVICE                              2213
-#define IDS_TOOLTIPS_VIEW_GAMERCARD                            2214
-#define IDS_TOOLTIPS_VIEW_GAMERPROFILE                         2215
-#define IDS_TOOLTIPS_INVITE_PARTY                              2216
-#define IDS_CONFIRM_START_CREATIVE                             2217
-#define IDS_CONFIRM_START_SAVEDINCREATIVE                      2218
-#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE             2219
-#define IDS_CONFIRM_START_HOST_PRIVILEGES                      2220
-#define IDS_CONNECTION_LOST_LIVE                               2221
-#define IDS_CONNECTION_LOST_LIVE_NO_EXIT                       2222
-#define IDS_AWARD_AVATAR1                                      2223
-#define IDS_AWARD_AVATAR2                                      2224
-#define IDS_AWARD_AVATAR3                                      2225
-#define IDS_AWARD_THEME                                        2226
-#define IDS_UNLOCK_ACHIEVEMENT_TEXT                            2227
-#define IDS_UNLOCK_AVATAR_TEXT                                 2228
-#define IDS_UNLOCK_GAMERPIC_TEXT                               2229
-#define IDS_UNLOCK_THEME_TEXT                                  2230
-#define IDS_UNLOCK_ACCEPT_INVITE                               2231
-#define IDS_UNLOCK_GUEST_TEXT                                  2232
-#define IDS_LEADERBOARD_GAMERTAG                               2233
-#define IDS_GROUPNAME_POTIONS_480                              2234
-#define IDS_RETURNEDTOTITLESCREEN_TEXT                         2235
-#define IDS_TRIALOVER_TEXT                                     2236
-#define IDS_FATAL_ERROR_TEXT                                   2237
-#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT                 2238
-#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT                 2239
-#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL     2240
-#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL        2241
-#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE           2242
-#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE           2243
-#define IDS_SAVE_ICON_MESSAGE                                  2244
-#define IDS_GAMEOPTION_HOST_PRIVILEGES                         2245
-#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS              2246
-#define IDS_ACHIEVEMENTS                                       2247
-#define IDS_LABEL_GAMERTAGS                                    2248
-#define IDS_IN_GAME_GAMERTAGS                                  2249
-#define IDS_SOCIAL_DEFAULT_DESCRIPTION                         2250
-#define IDS_TITLE_UPDATE_NAME                                  2251
-#define IDS_PLATFORM_NAME                                      2252
-#define IDS_BACK_BUTTON                                        2253
-#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS                  2254
-#define IDS_KICK_PLAYER_DESCRIPTION                            2255
-#define IDS_USING_TRIAL_TEXUREPACK_WARNING                     2256
-#define IDS_WORLD_SIZE_TITLE_SMALL                             2257
-#define IDS_WORLD_SIZE_TITLE_MEDIUM                            2258
-#define IDS_WORLD_SIZE_TITLE_LARGE                             2259
-#define IDS_WORLD_SIZE_TITLE_CLASSIC                           2260
-#define IDS_WORLD_SIZE                                         2261
-#define IDS_GAMEOPTION_WORLD_SIZE                              2262
-#define IDS_DISABLE_SAVING                                     2263
-#define IDS_GAMEOPTION_DISABLE_SAVING                          2264
-#define IDS_RICHPRESENCE_GAMESTATE                             2265
-#define IDS_RICHPRESENCE_IDLE                                  2266
-#define IDS_RICHPRESENCE_MENUS                                 2267
-#define IDS_RICHPRESENCE_MULTIPLAYER                           2268
-#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE                    2269
-#define IDS_RICHPRESENCE_MULTIPLAYER_1P                        2270
-#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE                 2271
-#define IDS_RICHPRESENCESTATE_BLANK                            2272
-#define IDS_RICHPRESENCESTATE_RIDING_PIG                       2273
-#define IDS_RICHPRESENCESTATE_RIDING_MINECART                  2274
-#define IDS_RICHPRESENCESTATE_BOATING                          2275
-#define IDS_RICHPRESENCESTATE_FISHING                          2276
-#define IDS_RICHPRESENCESTATE_CRAFTING                         2277
-#define IDS_RICHPRESENCESTATE_FORGING                          2278
-#define IDS_RICHPRESENCESTATE_NETHER                           2279
-#define IDS_RICHPRESENCESTATE_CD                               2280
-#define IDS_RICHPRESENCESTATE_MAP                              2281
-#define IDS_RICHPRESENCESTATE_ENCHANTING                       2282
-#define IDS_RICHPRESENCESTATE_BREWING                          2283
-#define IDS_RICHPRESENCESTATE_ANVIL                            2284
-#define IDS_RICHPRESENCESTATE_TRADING                          2285
+#define IDS_WINDOWS_EXIT                                       2162
+#define IDS_LANG_SYSTEM                                        2163
+#define IDS_LANG_ENGLISH                                       2164
+#define IDS_LANG_GERMAN                                        2165
+#define IDS_LANG_SPANISH                                       2166
+#define IDS_LANG_SPANISH_SPAIN                                 2167
+#define IDS_LANG_SPANISH_LATIN_AMERICA                         2168
+#define IDS_LANG_FRENCH                                        2169
+#define IDS_LANG_ITALIAN                                       2170
+#define IDS_LANG_PORTUGUESE                                    2171
+#define IDS_LANG_PORTUGUESE_PORTUGAL                           2172
+#define IDS_LANG_PORTUGUESE_BRAZIL                             2173
+#define IDS_LANG_JAPANESE                                      2174
+#define IDS_LANG_KOREAN                                        2175
+#define IDS_LANG_CHINESE_TRADITIONAL                           2176
+#define IDS_LANG_CHINESE_SIMPLIFIED                            2177
+#define IDS_LANG_DANISH                                        2178
+#define IDS_LANG_FINISH                                        2179
+#define IDS_LANG_DUTCH                                         2180
+#define IDS_LANG_POLISH                                        2181
+#define IDS_LANG_RUSSIAN                                       2182
+#define IDS_LANG_SWEDISH                                       2183
+#define IDS_LANG_NORWEGIAN                                     2184
+#define IDS_LANG_GREEK                                         2185
+#define IDS_LANG_TURKISH                                       2186
+#define IDS_LEADERBOARD_KILLS_EASY                             2187
+#define IDS_LEADERBOARD_KILLS_NORMAL                           2188
+#define IDS_LEADERBOARD_KILLS_HARD                             2189
+#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL                 2190
+#define IDS_LEADERBOARD_MINING_BLOCKS_EASY                     2191
+#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL                   2192
+#define IDS_LEADERBOARD_MINING_BLOCKS_HARD                     2193
+#define IDS_LEADERBOARD_FARMING_PEACEFUL                       2194
+#define IDS_LEADERBOARD_FARMING_EASY                           2195
+#define IDS_LEADERBOARD_FARMING_NORMAL                         2196
+#define IDS_LEADERBOARD_FARMING_HARD                           2197
+#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL                    2198
+#define IDS_LEADERBOARD_TRAVELLING_EASY                        2199
+#define IDS_LEADERBOARD_TRAVELLING_NORMAL                      2200
+#define IDS_LEADERBOARD_TRAVELLING_HARD                        2201
+#define IDS_TIPS_GAMETIP_0                                     2202
+#define IDS_TIPS_GAMETIP_1                                     2203
+#define IDS_TIPS_GAMETIP_48                                    2204
+#define IDS_TIPS_GAMETIP_44                                    2205
+#define IDS_TIPS_GAMETIP_45                                    2206
+#define IDS_TIPS_TRIVIA_4                                      2207
+#define IDS_TIPS_TRIVIA_17                                     2208
+#define IDS_HOW_TO_PLAY_MULTIPLAYER                            2209
+#define IDS_HOW_TO_PLAY_SOCIALMEDIA                            2210
+#define IDS_HOW_TO_PLAY_CREATIVE                               2211
+#define IDS_TUTORIAL_TASK_FLY                                  2212
+#define IDS_TOOLTIPS_SELECTDEVICE                              2213
+#define IDS_TOOLTIPS_CHANGEDEVICE                              2214
+#define IDS_TOOLTIPS_VIEW_GAMERCARD                            2215
+#define IDS_TOOLTIPS_VIEW_GAMERPROFILE                         2216
+#define IDS_TOOLTIPS_INVITE_PARTY                              2217
+#define IDS_CONFIRM_START_CREATIVE                             2218
+#define IDS_CONFIRM_START_SAVEDINCREATIVE                      2219
+#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE             2220
+#define IDS_CONFIRM_START_HOST_PRIVILEGES                      2221
+#define IDS_CONNECTION_LOST_LIVE                               2222
+#define IDS_CONNECTION_LOST_LIVE_NO_EXIT                       2223
+#define IDS_AWARD_AVATAR1                                      2224
+#define IDS_AWARD_AVATAR2                                      2225
+#define IDS_AWARD_AVATAR3                                      2226
+#define IDS_AWARD_THEME                                        2227
+#define IDS_UNLOCK_ACHIEVEMENT_TEXT                            2228
+#define IDS_UNLOCK_AVATAR_TEXT                                 2229
+#define IDS_UNLOCK_GAMERPIC_TEXT                               2230
+#define IDS_UNLOCK_THEME_TEXT                                  2231
+#define IDS_UNLOCK_ACCEPT_INVITE                               2232
+#define IDS_UNLOCK_GUEST_TEXT                                  2233
+#define IDS_LEADERBOARD_GAMERTAG                               2234
+#define IDS_GROUPNAME_POTIONS_480                              2235
+#define IDS_RETURNEDTOTITLESCREEN_TEXT                         2236
+#define IDS_TRIALOVER_TEXT                                     2237
+#define IDS_FATAL_ERROR_TEXT                                   2238
+#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT                 2239
+#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT                 2240
+#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL     2241
+#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL        2242
+#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE           2243
+#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE           2244
+#define IDS_SAVE_ICON_MESSAGE                                  2245
+#define IDS_GAMEOPTION_HOST_PRIVILEGES                         2246
+#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS              2247
+#define IDS_ACHIEVEMENTS                                       2248
+#define IDS_LABEL_GAMERTAGS                                    2249
+#define IDS_IN_GAME_GAMERTAGS                                  2250
+#define IDS_SOCIAL_DEFAULT_DESCRIPTION                         2251
+#define IDS_TITLE_UPDATE_NAME                                  2252
+#define IDS_PLATFORM_NAME                                      2253
+#define IDS_BACK_BUTTON                                        2254
+#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS                  2255
+#define IDS_KICK_PLAYER_DESCRIPTION                            2256
+#define IDS_USING_TRIAL_TEXUREPACK_WARNING                     2257
+#define IDS_WORLD_SIZE_TITLE_SMALL                             2258
+#define IDS_WORLD_SIZE_TITLE_MEDIUM                            2259
+#define IDS_WORLD_SIZE_TITLE_LARGE                             2260
+#define IDS_WORLD_SIZE_TITLE_CLASSIC                           2261
+#define IDS_WORLD_SIZE                                         2262
+#define IDS_GAMEOPTION_WORLD_SIZE                              2263
+#define IDS_DISABLE_SAVING                                     2264
+#define IDS_GAMEOPTION_DISABLE_SAVING                          2265
+#define IDS_RICHPRESENCE_GAMESTATE                             2266
+#define IDS_RICHPRESENCE_IDLE                                  2267
+#define IDS_RICHPRESENCE_MENUS                                 2268
+#define IDS_RICHPRESENCE_MULTIPLAYER                           2269
+#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE                    2270
+#define IDS_RICHPRESENCE_MULTIPLAYER_1P                        2271
+#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE                 2272
+#define IDS_RICHPRESENCESTATE_BLANK                            2273
+#define IDS_RICHPRESENCESTATE_RIDING_PIG                       2274
+#define IDS_RICHPRESENCESTATE_RIDING_MINECART                  2275
+#define IDS_RICHPRESENCESTATE_BOATING                          2276
+#define IDS_RICHPRESENCESTATE_FISHING                          2277
+#define IDS_RICHPRESENCESTATE_CRAFTING                         2278
+#define IDS_RICHPRESENCESTATE_FORGING                          2279
+#define IDS_RICHPRESENCESTATE_NETHER                           2280
+#define IDS_RICHPRESENCESTATE_CD                               2281
+#define IDS_RICHPRESENCESTATE_MAP                              2282
+#define IDS_RICHPRESENCESTATE_ENCHANTING                       2283
+#define IDS_RICHPRESENCESTATE_BREWING                          2284
+#define IDS_RICHPRESENCESTATE_ANVIL                            2285
+#define IDS_RICHPRESENCESTATE_TRADING                          2286
@@ -30,7 +30,7 @@ void Bat::defineSynchedData()

 float Bat::getSoundVolume()
 {
-	return 0.1f;
+	return 0.8f;
 }

 float Bat::getVoicePitch()
@@ -72,7 +72,7 @@ void Cow::playStepSound(int xt, int yt, int zt, int t)

 float Cow::getSoundVolume() 
 {
-	return 0.4f;
+	return 1.f;
 }

 int Cow::getDeathLoot() 
@@ -96,9 +96,20 @@ int Entity::getSmallId()
 		puiUsedFlags++;
 	}

+#ifdef MINECRAFT_SERVER_BUILD
+	// in mc server dedi, a server with 8+ playerrs can cause this to go wack
+    int fallbackId = Entity::entityCounter++;
+
+    if (entityCounter == 0x7ffffff)
+    {
+        entityCounter = 2048;
+    }
+    return fallbackId;
+#else
 	app.DebugPrintf("Out of small entity Ids... possible leak?\n");
 	__debugbreak();
 	return -1;
+#endif
 }

 void Entity::countFlagsForPIX()
@@ -37,6 +37,7 @@ void FireworksRecipe::ReleaseThreadStorage()
 void FireworksRecipe::setResultItem(shared_ptr<ItemInstance> item)
 {
 	ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(tlsIdx));
+	if (tls == nullptr) tls = tlsDefault;
 	tls->resultItem = item;
 }

@@ -269,6 +270,7 @@ bool FireworksRecipe::matches(shared_ptr<CraftingContainer> craftSlots, Level *l
 shared_ptr<ItemInstance> FireworksRecipe::assemble(shared_ptr<CraftingContainer> craftSlots)
 {
 	ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(tlsIdx));
+	if (tls == nullptr) tls = tlsDefault;
 	return tls->resultItem->copy();
 	//return resultItem->copy();
 }
@@ -281,6 +283,7 @@ int FireworksRecipe::size()
 const ItemInstance *FireworksRecipe::getResultItem()
 {
 	ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(tlsIdx));
+	if (tls == nullptr) tls = tlsDefault;
 	return tls->resultItem.get();
 	//return resultItem.get();
 }
@@ -16,7 +16,12 @@ using namespace std;

 // 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites,
 // however it does seem way too large for what is actually needed. Needs further investigation
+#ifdef MINECRAFT_SERVER_BUILD
+// fixes a crash when 8+ players are present
+#define LEVEL_CHUNKS_TO_UPDATE_MAX (32*32*8)
+#else
 #define LEVEL_CHUNKS_TO_UPDATE_MAX (19*19*8)
+#endif

 class Vec3;
 class ChunkSource;
@@ -30,6 +30,65 @@ ensure_persist_file() {
  ln -sfn "${persist_path}" "${runtime_path}"
 }

+wait_for_xvfb_ready() {
+  local display="$1"
+  local xvfb_pid="$2"
+  local wait_seconds="${XVFB_WAIT_SECONDS:-10}"
+  local wait_ticks=$((wait_seconds * 10))
+  local display_number="${display#:}"
+  display_number="${display_number%%.*}"
+
+  if [ -z "${display_number}" ] || ! [[ "${display_number}" =~ ^[0-9]+$ ]]; then
+    echo "[error] Invalid DISPLAY format for Xvfb wait: ${display}" >&2
+    return 1
+  fi
+
+  local socket_path="/tmp/.X11-unix/X${display_number}"
+  local elapsed=0
+
+  while [ "${elapsed}" -lt "${wait_ticks}" ]; do
+    if ! kill -0 "${xvfb_pid}" 2>/dev/null; then
+      echo "[error] Xvfb exited before the display became ready." >&2
+      if [ -f /tmp/xvfb.log ]; then
+        echo "[error] ---- /tmp/xvfb.log ----" >&2
+        tail -n 200 /tmp/xvfb.log >&2 || true
+        echo "[error] ----------------------" >&2
+      fi
+      return 1
+    fi
+
+    if [ -S "${socket_path}" ]; then
+      # Keep a short extra delay so Wine does not race display handshake.
+      sleep 0.2
+      if kill -0 "${xvfb_pid}" 2>/dev/null && [ -S "${socket_path}" ]; then
+        return 0
+      fi
+    fi
+
+    # One more liveness check after the ready probe branch.
+    if ! kill -0 "${xvfb_pid}" 2>/dev/null; then
+      echo "[error] Xvfb exited during display readiness probe." >&2
+      if [ -f /tmp/xvfb.log ]; then
+        echo "[error] ---- /tmp/xvfb.log ----" >&2
+        tail -n 200 /tmp/xvfb.log >&2 || true
+        echo "[error] ----------------------" >&2
+      fi
+      return 1
+    fi
+
+    sleep 0.1
+    elapsed=$((elapsed + 1))
+  done
+
+  echo "[error] Timed out waiting for Xvfb display ${display}." >&2
+  if [ -f /tmp/xvfb.log ]; then
+    echo "[error] ---- /tmp/xvfb.log ----" >&2
+    tail -n 200 /tmp/xvfb.log >&2 || true
+    echo "[error] ----------------------" >&2
+  fi
+  return 1
+}
+
 if [ ! -d "$SERVER_DIR" ]; then
  echo "[error] Server directory not found: $SERVER_DIR" >&2
  exit 1
@@ -78,8 +137,25 @@ fi
 if [ -z "${DISPLAY:-}" ]; then
  export DISPLAY="${XVFB_DISPLAY:-:99}"
  XVFB_SCREEN="${XVFB_SCREEN:-64x64x16}"
+  DISPLAY_NUMBER="${DISPLAY#:}"
+  DISPLAY_NUMBER="${DISPLAY_NUMBER%%.*}"
+  if [ -z "${DISPLAY_NUMBER}" ] || ! [[ "${DISPLAY_NUMBER}" =~ ^[0-9]+$ ]]; then
+    echo "[error] Invalid XVFB_DISPLAY format: ${DISPLAY}" >&2
+    exit 1
+  fi
+  XVFB_SOCKET="/tmp/.X11-unix/X${DISPLAY_NUMBER}"
+  XVFB_LOCK="/tmp/.X${DISPLAY_NUMBER}-lock"
+  # The check is performed assuming the same container will be restarted.
+  if [ -S "${XVFB_SOCKET}" ] || [ -e "${XVFB_LOCK}" ]; then
+    echo "[warn] Removing stale Xvfb state for ${DISPLAY} before startup." >&2
+    rm -f "${XVFB_SOCKET}" "${XVFB_LOCK}"
+  fi
  Xvfb "${DISPLAY}" -nolisten tcp -screen 0 "${XVFB_SCREEN}" >/tmp/xvfb.log 2>&1 &
-  sleep 0.2
+  XVFB_PID=$!
+  wait_for_xvfb_ready "${DISPLAY}" "${XVFB_PID}"
+  echo "[info] Xvfb ready on ${DISPLAY} (pid=${XVFB_PID}, screen=${XVFB_SCREEN})"
+else
+  echo "[info] Using existing DISPLAY=${DISPLAY}; skipping Xvfb startup"
 fi

 args=(
Author	SHA1	Message	Date
Revela	49c1f2c1da	Add Ctrl+V clipboard paste to UIControl_TextInput and UIScene_Keyboard Previously paste only worked in the chat screen. Wire Screen::getClipboard() into the two remaining text input paths so Ctrl+V works for sign editing, seed entry, server IP/port, and world name fields.	2026-03-16 11:40:49 -05:00
ZorpLemon	43d520f692	Comment out FOV modification line, since the FOV is stored and doesn't need to be adjusted. (#1248 ) I guess this line was just the games way of applying modifications the player made to the FOV. But since whenever ago someone changed the way the FOV stuff is saved, so this line just adds the difference again causing issues when the FOV is set above 70. Setting your FOV to 80 actually sets it to 90, and setting it to 110 actually sets it to 150.	2026-03-15 18:14:15 -05:00
Ananasloll3	0b0d74a638	Fix audio volume levels for cows and bats (#1225 ) Cow volume 0.4f to 1.f Bat volume 0.1f to 0.8f	2026-03-15 18:13:11 -05:00
iris	b27cb536a5	Fix game crashing when crafting fireworks (#1230 ) (#1240 )	2026-03-15 18:13:03 -05:00
Xenovyy	15ea3dc85c	Adjusted Exit Game title (#1277 ) * Adjusted Exit Game title Replaced "Return to Xbox Dashboard" with "Exit Minecraft" on the exit game screen. * Fixed Blending on Intro Sequence Fixed Blocky, Crappy blending on the ESRB and Mojang Logos in the Intro Sequence.	2026-03-15 18:12:53 -05:00
retucio	9fde19eca0	organized keybinds a lil bit (#1279 )	2026-03-15 18:11:55 -05:00
kuwa	e9f5b4b6f0	Fix server DedicatedServer issues (#1266 ) * add: Dedicated Server implementation - Introduced `ServerMain.cpp` for the dedicated server logic, handling command-line arguments, server initialization, and network management. - Created `postbuild_server.ps1` script for post-build tasks, including copying necessary resources and DLLs for the dedicated server. - Added `CopyServerAssets.cmake` to manage the copying of server assets during the build process, ensuring required files are available for the dedicated server. - Defined project filters in `Minecraft.Server.vcxproj.filters` for better organization of server-related files. * add: refactor world loader & add server properties - Introduced ServerLogger for logging startup steps and world I/O operations. - Implemented ServerProperties for loading and saving server configuration from `server.properties`. - Added WorldManager to handle world loading and creation based on server properties. - Updated ServerMain to integrate server properties loading and world management. - Enhanced project files to include new source and header files for the server components. * update: implement enhanced logging functionality with configurable log levels * update: update keyboard and mouse input initialization `1dc8a005ed` * fix: change virtual screen resolution to 1920x1080(HD) Since 31881af56936aeef38ff322b975fd0 , `skinHud.swf` for 720 is not included in `MediaWindows64.arc`, the app crashes unless the virtual screen is set to HD. * fix: dedicated server build settings for miniaudio migration and missing sources - remove stale Windows64 Miles (mss64) link/copy references from server build - add Common/Filesystem/Filesystem.cpp to Minecraft.Server.vcxproj - add Windows64/PostProcesser.cpp to Minecraft.Server.vcxproj - fix unresolved externals (PostProcesser::, FileExists) in dedicated server build update: changed the virtual screen to 720p Since the crash caused by the 720p `skinHud.swf` not being included in `MediaWindows64.arc` has been resolved, switching back to 720p to reduce resource usage. * add: add Docker support for Dedicated Server add with entrypoint and build scripts * fix: add initial save for newly created worlds in dedicated server on the server side, I fixed the behavior introduced after commit `aadb511`, where newly created worlds are intentionally not saved to disk immediately. * update: add basically all configuration options that are implemented in the classes to `server.properties` * update: add LAN advertising configuration for server.properties LAN-Discovery, which isn’t needed in server mode and could potentially be a security risk, has also been disabled(only server mode). * add: add implementing interactive command line using linenoise - Integrated linenoise library for line editing and completion in the server console. - Updated ServerLogger to handle external writes safely during logging. - Modified ServerMain to initialize and manage the ServerCli for command input. - The implementation is separate from everything else, so it doesn't affect anything else. - The command input section and execution section are separated into threads. * update: enhance command line completion with predictive hints Like most command line tools, it highlights predictions in gray. * add: implement `StringUtils` for string manipulation and refactor usages Unified the scattered utility functions. * fix: send DisconnectPacket on shutdown and fix Win64 recv-thread teardown race Before this change, server/host shutdown closed sockets directly in ServerConnection::stop(), which bypassed the normal disconnect flow. As a result, clients could be dropped without receiving a proper DisconnectPacket during stop/kill/world-close paths. Also, WinsockNetLayer::Shutdown() could destroy synchronization objects while host-side recv threads were still exiting, causing a crash in RecvThreadProc (access violation on world close in host mode). * fix: return client to menus when Win64 host connection drops - Add client-side host disconnect handling in CPlatformNetworkManagerStub::DoWork() for _WINDOWS64. - When in QNET_STATE_GAME_PLAY as a non-host and WinsockNetLayer::IsConnected() becomes false, trigger g_NetworkManager.HandleDisconnect(false) to enter the normal disconnect/UI flow. - Use m_bLeaveGameOnTick as a one-shot guard to prevent repeated disconnect handling while the link remains down. - Reset m_bLeaveGameOnTick on LeaveGame(), HostGame(), and JoinGame() to avoid stale state across sessions. * update: converted Japanese comments to English * add: create `Minecraft.Server` developer guide in English and Japanese * update: add note about issue * add: add `nlohmann/json` json lib * add: add FileUtils Moved file operations to `utils`. * add: Dedicated Server BAN access manager with persistent player and IP bans - add Access frontend that publishes thread-safe ban manager snapshots for dedicated server use - add BanManager storage for banned-players.json and banned-ips.json with load/save/update flows - add persistent player and IP ban checks during dedicated server connection handling - add UTF-8 BOM-safe JSON parsing and shared file helpers backed by nlohmann/json - add Unicode-safe ban file read/write and safer atomic replacement behavior on Windows - add active-ban snapshot APIs and expiry-aware filtering for expires metadata - add RAII-based dedicated access shutdown handling during server startup and teardown * update: changed file read/write operations to use `FileUtils`. - As a side effect, saving has become faster! * fix: Re-added the source that had somehow disappeared. * add: significantly improved the dedicated server logging system - add ServerLogManager to Minecraft.Server as the single entry point for dedicated-server log output - forward CMinecraftApp logger output to the server logger when running with g_Win64DedicatedServer - add named network logs for incoming, accepted, rejected, and disconnected connections - cache connection metadata by smallId so player name and remote IP remain available for disconnect logs - keep Minecraft.Client changes minimal by using lightweight hook points and handling log orchestration on the server side * fix: added the updated library source * add: add `ban` and `pardon` commands for Player and IP * fix: fix stop command shutdown process add dedicated server shutdown request handling * fix: fixed the save logic during server shutdown Removed redundant repeated saves and eliminated the risks of async writes. * update: added new sever files to Docker entrypoint * fix: replace shutdown flag with atomic variable for thread safety * update: update Dedicated Server developer guide English is machine translated. Please forgive me. * update: check for the existence of `GameHDD` and create * add: add Whitelist to Dedicated Server * refactor: clean up and refactor the code - unify duplicated implementations that were copied repeatedly - update outdated patterns to more modern ones * fix: include UI header (new update fix) * fix: fix the detection range for excessive logging `getHighestNonEmptyY()` returning `-1` occurs normally when the chunk is entirely air. The caller (`Minecraft.World/LevelChunk.cpp:2400`) normalizes `-1` to `0`. * update: add world size config to dedicated server properties * update: update README add explanation of `server.properties` & launch arguments * update: add nightly release workflow for dedicated server and client builds to Actions * fix: update name for workflow * add random seed generation * add: add Docker nightly workflow for Dedicated Server publish to GitHub Container Registry * fix: ghost player when clients disconnect out of order #4 * fix: fix 7zip option * fix: fix Docker workflow for Dedicated Server artifact handling * add: add no build Dedicated Server startup scripts and Docker Compose * update: add README for Docker Dedicated Server setup with no local build * refactor: refactor command path structure As the number of commands has increased and become harder to navigate, each command has been organized into separate folders. * update: support stream(file stdin) input mode for server CLI Support for the stream (file stdin) required when attaching a tty to a Docker container on Linux. * add: add new CLI Console Commands for Dedicated Server Most of these commands are executed using the command dispatcher implemented on the `Minecraft.World` side. When registering them with the dispatcher, the sender uses a permission-enabled configuration that treats the CLI as a player. - default game. - enchant - experience. - give - kill(currently, getting a permission error for some reason) - time - weather. - update tp & gamemode command * fix: change player map icon to random select * update: increase the player limit * add: restore the basic anti-cheat implementation and add spawn protection Added the following anti-cheat measures and add spawn protection to `server.properties`. - instant break - speed - reach * fix: fix Docker image tag * make chunks delay less for dedi * fix: prevent overwriting allow-flight value on server startup * fix: mitigate entity id overflow and crash for max chunk updates * remove autosave prompt for dedicated server * fix: fix `Failed to create window instance.` Wait for Xvfb to be fully ready before starting. * Revert wrong readme order --------- Co-authored-by: sylvessa <225480449+sylvessa@users.noreply.github.com> Co-authored-by: Loki Rautio <lokirautio@gmail.com>	2026-03-15 15:50:12 -05:00
Matthew Toro	7b643cdd75	fix: removed headlesss server logic in favor of the new server exe. (#1265 )	2026-03-15 15:43:27 -05:00