feat: durango ui parity & setting name

and abit of PS3 only stuff from PSVita

.gitea/workflows/release-windows64.yaml

@@ -0,0 +1,114 @@
+name: Build & Release Windows64
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version tag for release (e.g. v1.0.0).'
+        required: true
+        default: ''
+      notes:
+        description: 'URL to notes for release.'
+        required: false
+        default: ''
+
+jobs:
+  validate:
+    runs-on: windows-2022
+    steps:
+      - name: Validate version format
+        run: |
+          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
+            Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
+            exit 1
+          }
+
+  build:
+    needs: validate
+    strategy:
+      matrix:
+        configuration: [ContentPackage]
+        platform: [Windows64]
+        include:
+        - platform: Windows64
+          sdk_label: windows-2022 # str1k3r - can run on any runner
+
+    runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
+
+    steps:
+      - name: Checkout Repository
+        uses: https://github.com/actions/checkout@v4
+        with:
+          fetch-depth: 1
+          clean: false
+          lfs: false
+          submodules: true
+
+      - name: Build Cafeberry
+        run: |
+          & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
+            /p:Configuration=${{ matrix.configuration }} `
+            /p:Platform=${{ matrix.platform }} `
+            /m
+
+      - name: Zip Build
+        run: |
+            7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk" "-x!*.lib" "-x!*.exp"
+
+      - name: Stage artifacts
+        run: |
+          New-Item -ItemType Directory -Force -Path staging
+          Copy-Item "LCE${{ matrix.platform }}.zip" staging/
+          Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
+
+      - name: Upload artifacts
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
+        with:
+          name: build-${{ matrix.platform }}
+          path: staging/*
+          compression-level: 0
+
+  release:
+    needs: build
+    runs-on: windows-2022
+    steps:
+      - name: Download all build artifacts
+        uses: https://github.com/christopherHX/gitea-download-artifact@v4
+        with:
+          path: downloaded
+
+      - name: Fetch release notes
+        id: notes
+        run: |
+          $notesSource = "${{ inputs.notes }}"
+          $fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
+
+          if ($notesSource -match '^https?://') {
+            try {
+              $body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
+              if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
+            } catch {
+              $body = $fallback
+            }
+          } else {
+            $body = $fallback
+          }
+
+          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
+          $content = "description<<$delimiter`n$body`n$delimiter`n"
+
+          $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
+          [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)
+
+      - name: Publish Release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: ${{ inputs.version }}
+          server_url: ${{ gitea.server_url }}
+          repository: ${{ gitea.repository }}
+          token: ${{ gitea.token }}
+          tag_name: ${{ inputs.version }}
+          prerelease: false
+          verbose: true
+          files: downloaded/**/*
+          body: ${{ steps.notes.outputs.description }}

.gitea/workflows/release.yaml

@@ -45,11 +45,12 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: https://github.com/actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
           clean: false
           lfs: false
+          submodules: recursive
 
       - name: Build Cafeberry
         run: |

.gitignore

@@ -28,6 +28,10 @@
 /Minecraft.Client/PS3/SPU_Tasks/*/Release
 /Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
+# Xbox 360 XZP & XURs
+Minecraft.Client/XboxMedia/XZP
+Minecraft.Client/Common/Media/XURs
+
 # Misc
 *.ppu.o
 *.pkg
@@ -38,4 +42,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/cafeberry/4JLibs.git
+	ignore = untracked
+	branch = main

Minecraft.Client/ClientConnection.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Common\LivePrivileges.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLevel.h"
 #include "MultiPlayerLocalPlayer.h"
@@ -51,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"
@@ -787,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;
@@ -955,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]);
@@ -1834,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
@@ -1850,14 +1784,16 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 		app.SetGameHostOption(eGameHostOption_All,packet->m_serverSettings);
 
 		// 4J-PB - if we go straight in from the menus via an invite, we won't have the DLC info
+		//str1k3r - TMS only exists on Xbox 360 therefore, we only need this on Xbox 360.
+#ifdef _XBOX
 		if(app.GetTMSGlobalFileListRead()==false)
 		{
 			app.SetTMSAction(ProfileManager.GetPrimaryPad(),eTMSAction_TMSPP_RetrieveFiles_RunPlayGame);
 		}
+#endif
 	}
 
-// A LAN build has no Live friends list or UGC entitlements
-#if defined _XBOX && !defined _DISABLE_XBLIVE
+#ifdef _XBOX
 	if(!g_NetworkManager.IsHost() && !app.GetGameHostOption(eGameHostOption_FriendsOfFriends))
 	{
 		if(m_userIndex == ProfileManager.GetPrimaryPad() )
@@ -2008,7 +1944,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))
 	{
@@ -2289,9 +2225,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
 			ProfileManager.GetXUID(m_userIndex,&offlineXUID,false);
 		}
 		BOOL allAllowed, friendsAllowed;
-		Live_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),
+		ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
+		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_enums.h

@@ -875,7 +875,8 @@ enum EControllerActions
 	MINECRAFT_ACTION_SPAWN_CREEPER,
 	MINECRAFT_ACTION_CHANGE_SKIN,
 	MINECRAFT_ACTION_FLY_TOGGLE,
-	MINECRAFT_ACTION_RENDER_DEBUG
+	MINECRAFT_ACTION_RENDER_DEBUG,
+	MINECRAFT_ACTION_RENDER_DEBUG_SCREEN
 };
 
 enum eMCLang

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/Audio/SoundEngine.cpp

@@ -59,7 +59,7 @@ void SoundEngine::playMusicTick() {};
 #ifdef _WINDOWS64
 char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
-char SoundEngine::m_szRedistName[]={"redist64"};
+char SoundEngine::m_szRedistName[]={"Windows64\\redist64"}; //str1k3r - moved this to a the Windows64 dir so its out of plain view
 #elif defined _DURANGO
 char SoundEngine::m_szSoundPath[]={"Sound\\"};
 char SoundEngine::m_szMusicPath[]={"music\\"};
@@ -791,7 +791,9 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
 	char *SoundName = (char *)ConvertSoundPathToName(name);
 	strcat((char *)szSoundName,SoundName);
 
-//	app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#ifdef _DEBUG
+	app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
+#endif
 
 	AUDIO_INFO AudioInfo;
 	AudioInfo.x=x;
@@ -846,9 +848,11 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 
 	char *SoundName = (char *)ConvertSoundPathToName(name);
 	strcat((char *)szSoundName,SoundName);
-//	app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
 
-	//app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#ifdef _DEBUG
+	app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
+	app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
+#endif
 
 	AUDIO_INFO AudioInfo;
 	memset(&AudioInfo,0,sizeof(AUDIO_INFO));
@@ -1136,10 +1140,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 	SoundEngine *soundEngine = (SoundEngine *)lpParameter;
 	soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
 
+#ifdef _DEBUG
 	if(soundEngine->m_hStream==0)
 	{
 		app.DebugPrintf("SoundEngine::OpenStreamThreadProc - Could not open - %s\n",soundEngine->m_szStreamName);
 	}
+#endif
 	return 0;
 }
 
@@ -1160,13 +1166,17 @@ void SoundEngine::playMusicTick()
 void SoundEngine::playMusicUpdate() 
 {
 	//return;
-	static bool firstCall = true;
 	static float fMusicVol = 0.0f;
+#ifndef _WINDOWS64 //str1k3r - if used on windows64 volume doesnt update
+	static bool firstCall = true;
 	if( firstCall )
 	{
 		fMusicVol = getMasterMusicVolume();
 		firstCall = false;
 	}
+#else
+	fMusicVol = getMasterMusicVolume();
+#endif
 
 	switch(m_StreamState)
 	{
@@ -1514,7 +1524,9 @@ void SoundEngine::playMusicUpdate()
 				}
 
 				// volume change required?
-				if(fMusicVol!=getMasterMusicVolume())
+#ifndef _WINDOWS64
+				if(fMusicVol!=getMasterMusicVolume()) //str1k3r - if used on windows64 music doesnt update its volume
+#endif
 				{
 					fMusicVol=getMasterMusicVolume();
 					HSAMPLE hSample = AIL_stream_sample_handle( m_hStream); 

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."
+}