revert perf + fix: windows performance optimizations + x360 fixes + ps3 hdd corruption fix (#27)

revert perf + fix: windows performance optimizations + x360 fixes + ps3 hdd corruption fix (#27)

windows optimizations include:

- adding WPO/LTCG
- fixing potential memory leaks
- reducing unneeded busy waits

xbox 360 fixes include:

- all item names displaying as black
- adding newer dlcs crashing game

ps3 fix was that, when holding the ps button, it'd corrupt the hdd. NEEDS TESTING! just a guess fix since I don't have a PS3.

---------

Co-authored-by: pieeebot <piebot00@gmail.com>
Co-authored-by: piebot <piebot00@gmail.com>
Co-authored-by: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com>
Co-authored-by: str1k3r <1+str1k3r@noreply.localhost>
Co-authored-by: pieeebot <10+pieeebot@noreply.neolegacy.dev>
Co-authored-by: qloak <53+qloak@noreply.neolegacy.dev>
Reviewed-on: cafeberry/cafeberry#27
Co-authored-by: qloak <realminecart@gmail.com>

.gitignore

@@ -38,4 +38,5 @@
 *.sdf
 *.opensdf
 *.v11.suo
-*.vcxproj.user
+*.vcxproj.user
+*.aps

.gitmodules

@@ -0,0 +1,5 @@
+[submodule "Minecraft.Client/Windows64/4JLibs"]
+	path = Minecraft.Client/Windows64/4JLibs
+	url = https://gitea.str1k3r.xyz/pieeebot/Cafeberry-4JLibs
+	ignore = untracked
+	branch = main

Minecraft.Client/ClientConnection.cpp

@@ -50,16 +50,11 @@
 #else
 #include "Common\UI\UI.h"
 #endif
-#if defined __PS3__ && !defined DISABLE_PSN
+#ifdef __PS3__
 #include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-#include "Xbox\Network\NetworkPlayerXbox.h"
-#include "Common\Network\PlatformNetworkManager.h"
-#endif
-
 #ifdef _DURANGO
 #include "..\Minecraft.World\DurangoStats.h"
 #include "..\Minecraft.World\GenericStats.h"
@@ -786,32 +781,6 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
 	player->m_displayName = player->name;
 #endif
 
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-	{
-		PlayerUID pktXuid = player->getXuid();
-		const PlayerUID WIN64_XUID_BASE = (PlayerUID)0xe000d45248242f2e;
-		if (pktXuid >= WIN64_XUID_BASE && pktXuid < WIN64_XUID_BASE + MINECRAFT_NET_MAX_PLAYERS)
-		{
-			BYTE smallId = (BYTE)(pktXuid - WIN64_XUID_BASE);
-			INetworkPlayer *np = g_NetworkManager.GetPlayerBySmallId(smallId);
-			if (np != NULL)
-			{
-				NetworkPlayerXbox *npx = (NetworkPlayerXbox *)np;
-				IQNetPlayer *qp = npx->GetQNetPlayer();
-				if (qp != NULL)
-				{
-					wcsncpy(qp->m_gamertag, packet->name.c_str(), 31);
-					qp->m_gamertag[31] = L'\0';
-					if (g_NetworkManager.IsHost())
-					{
-						g_NetworkManager.UpdateAndSetGameSessionData();
-					}
-				}
-			}
-		}
-	}
-#endif
-
 	//	printf("\t\t\t\t%d: Add player\n",packet->id,packet->yRot);
 
 	int item = packet->carriedItem;
@@ -954,39 +923,6 @@ void ClientConnection::handleMoveEntitySmall(shared_ptr<MoveEntityPacketSmall> p
 
 void ClientConnection::handleRemoveEntity(shared_ptr<RemoveEntitiesPacket> packet)
 {
-#if defined _WINDOWS64 || defined DISABLE_PSN || defined _DISABLE_XBLIVE
-	if (!g_NetworkManager.IsHost())
-	{
-		for (int i = 0; i < packet->ids.length; i++)
-		{
-			shared_ptr<Entity> entity = getEntity(packet->ids[i]);
-			if (entity != NULL && entity->GetType() == eTYPE_PLAYER)
-			{
-				shared_ptr<Player> player = dynamic_pointer_cast<Player>(entity);
-				if (player != NULL)
-				{
-					PlayerUID xuid = player->getXuid();
-					INetworkPlayer *np = g_NetworkManager.GetPlayerByXuid(xuid);
-					if (np != NULL)
-					{
-						NetworkPlayerXbox *npx = (NetworkPlayerXbox *)np;
-						IQNetPlayer *qp = npx->GetQNetPlayer();
-						if (qp != NULL)
-						{
-							extern CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
-							g_pPlatformNetworkManager->NotifyPlayerLeaving(qp);
-							qp->m_smallId = 0;
-							qp->m_isRemote = false;
-							qp->m_isHostPlayer = false;
-							qp->m_gamertag[0] = 0;
-							qp->SetCustomDataValue(0);
-						}
-					}
-				}
-			}
-		}
-	}
-#endif
 	for (int i = 0; i < packet->ids.length; i++)
 	{
 		level->removeEntity(packet->ids[i]);
@@ -1833,7 +1769,6 @@ void ClientConnection::handleEntityActionAtPosition(shared_ptr<EntityActionAtPos
 
 void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 {
-	app.DebugPrintf("ClientConnection::handlePreLogin ENTER (user %d)\n", m_userIndex);
 //	printf("Client: handlePreLogin\n");
 #if 1
 	// 4J - Check that we can play with all the players already in the game who have Friends-Only UGC set
@@ -1856,7 +1791,6 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	}
 
 #ifdef _XBOX
-#if !defined(_DISABLE_XBLIVE)
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
 		if(m_userIndex == ProfileManager.GetPrimaryPad() )
@@ -2000,16 +1934,6 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 			}
 		}
 	}
-#else
-	// Offline/system-link games have no Xbox Live friend list, so grant all
-	// pre-login permissions (the Xbox Live-only checks above would otherwise
-	// fail and reject the client's own pre-login before Login is ever sent).
-	canPlay = TRUE;
-	canPlayLocal = TRUE;
-	isAtLeastOneFriend = TRUE;
-	isFriendsWithHost = TRUE;
-	cantPlayContentRestricted = FALSE;
-#endif // _DISABLE_XBLIVE
 #else
 	// TODO - handle this kind of things for non-360 platforms
 	canPlay = TRUE;
@@ -2017,7 +1941,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 	isAtLeastOneFriend = TRUE;
 	cantPlayContentRestricted= FALSE;
 
-#if !defined DISABLE_PSN && ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
+#if ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
 
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
@@ -2299,8 +2223,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		}
 		BOOL allAllowed, friendsAllowed;
 		ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
-		app.DebugPrintf("ClientConnection::handlePreLogin SENDING LoginPacket (user %d)\n", m_userIndex);
-		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE),
+		send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE), 
 			packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), ProfileManager.IsGuest( m_userIndex ))));
 
 		if(!g_NetworkManager.IsHost() )

Minecraft.Client/Common/App_structs.h

@@ -162,7 +162,7 @@ MOJANG_DATA;
 typedef struct  
 {
 	eDLCContentType eDLCType;
-#if !defined(DISABLE_PSN) && (defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__))
+#if defined( __PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
 	char chImageURL[256];//SCE_NP_COMMERCE2_URL_LEN
 #else
 

Minecraft.Client/Common/Buildsteps/4JLibs.ps1

@@ -0,0 +1,80 @@
+param(
+    [string]$ProjectDir,
+    [string]$Platform,
+    [string]$Configuration
+)
+
+if ($ProjectDir -match "Minecraft.World") {
+    $BaseDir = "$ProjectDir..\Minecraft.Client\"
+} elseif ($ProjectDir -match "Minecraft.Client") {
+    $BaseDir = $ProjectDir
+} else {
+    Write-Host "4JLibs: Unknown project directory: '$ProjectDir'"
+    exit 1
+}
+
+switch ($Platform) {
+    "x64"       { $LibsDir = Join-Path $BaseDir "Windows64\4JLibs\"; $ExpectedCount = 4; $PlatformName = "Windows64" }
+    "Durango"   { $LibsDir = Join-Path $BaseDir "Durango\4JLibs\";   $ExpectedCount = 4; $PlatformName = "Durango" }
+    "Xbox 360"  { $LibsDir = Join-Path $BaseDir "Xbox\4JLibs\";      $ExpectedCount = 5; $PlatformName = "Xbox" }
+    "PS3"       { $LibsDir = Join-Path $BaseDir "PS3\4JLibs\";       $ExpectedCount = 4; $PlatformName = "PS3" }
+    "Orbis"     { $LibsDir = Join-Path $BaseDir "Orbis\4JLibs\";     $ExpectedCount = 4; $PlatformName = "Orbis" }
+    "PSVita"    { $LibsDir = Join-Path $BaseDir "PSVita\4JLibs\";    $ExpectedCount = 4; $PlatformName = "PSVita" }
+    default     { Write-Host "4JLibs: Unknown platform: '$Platform'";   exit 1 }
+}
+
+if ($Configuration -match "ContentPackage" -or $Configuration -match "Release") {
+    $BuildConfig = "Release"
+} elseif ($Configuration -match "Debug") {
+    $BuildConfig = "Debug"
+} else {
+    Write-Host "4JLibs: Configuration did not match any known patterns, defaulting to Debug"
+    $BuildConfig = "Debug"
+}
+
+if (-not (Test-Path $LibsDir)) {
+    Write-Host "4JLibs: $PlatformName 4JLibs directory not found"
+    exit 1
+} elseif (-not (Test-Path "$LibsDir\Headers\$PlatformName")) {
+    Write-Host "4JLibs: $PlatformName 4JLibs Headers directory not found"
+    exit 1
+} elseif (-not (Test-Path "$LibsDir\Headers")) {
+    Write-Host "4JLibs: Headers directory not found"
+    exit 1
+}
+
+$incPath  = Join-Path $LibsDir "inc"
+$libsPath = Join-Path $LibsDir "libs"
+
+$incCount  = (Get-ChildItem -Path $incPath -Filter "*.h" -ErrorAction SilentlyContinue).Count
+
+if ($BuildConfig -eq "Release") {
+    $libCount = (Get-ChildItem -Path $libsPath -Filter "*_r.lib" -ErrorAction SilentlyContinue).Count
+} else {
+    $libCount = (Get-ChildItem -Path $libsPath -Filter "*_d.lib" -ErrorAction SilentlyContinue).Count
+}
+
+if ($incCount -lt $ExpectedCount) {
+    Write-Host "4JLibs: Copying header files for $PlatformName"
+    xcopy "$LibsDir\Headers\$PlatformName\*" "$incPath" /E /I /Y
+} else {
+    Write-Host "4JLibs: inc files already present, skipping copy."
+}
+
+if ($libCount -lt $ExpectedCount) {
+    Write-Host "4JLibs: Building 4JLibs for $PlatformName in $BuildConfig"
+
+    & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" `
+        (Join-Path $LibsDir "4JLibs.sln") `
+        /p:Configuration=$BuildConfig `
+        /p:Platform=$PlatformName `
+        /v:minimal `
+        /m
+    
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "4JLibs: Build failed with exit code: $LASTEXITCODE"
+        exit $LASTEXITCODE
+    }
+} else {
+    Write-Host "4JLibs: libs already present, skipping build."
+}