feat: cleaned up workflow & fix xbox360 output paths

.gitea/workflows/release.yaml

@@ -24,12 +24,13 @@ jobs:
           }
 
   build:
+    needs: validate
     runs-on: windows-2022
 
     strategy:
       matrix:
         configuration: [Release]
-        platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
+        platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
 
     steps:
       - name: Checkout Repository
@@ -37,28 +38,41 @@ jobs:
 
       - name: Build Cafeberry
         run: |
+          $platform = if ("${{ matrix.platform }}" -eq "Xbox360") { "Xbox 360" } elseif ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" } else { "${{ matrix.platform }}" }
+
           & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
             /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=${{ matrix.platform }} `
+            "/p:Platform=$platform" `
             /m
 
-      - name: Zip Build (Consoles)
+      - name: Zip Build
-        if: matrix.platform != 'Windows64'
+        run: |
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
+          if ("${{ matrix.platform }}" -eq "Windows64") {
-
+            7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
-      - name: Zip Build (Windows64)
+          } elseif ("${{ matrix.platform }}" -eq "Orbis") {
-        if: matrix.platform == 'Windows64'
+            7z a -r "LCEOrbis.zip" "./ORBIS_${{ matrix.configuration }}/PS4_GAME/*"
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
+          } elseif ("${{ matrix.platform }}" -eq "PSVita") {
+            7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
+          } elseif ("${{ matrix.platform }}" -eq "PS3") {
+            7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*"
+          } elseif ("${{ matrix.platform }}" -eq "Xbox360") {
+            7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
+          } else {
+            7z a -r "LCE${{ matrix.platform }}.zip" "./${{ matrix.platform }}/${{ matrix.configuration }}/*" "-x!*.ipdb" "-x!*.iobj" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
+          }
 
       - name: Stage artifacts
         run: |
           New-Item -ItemType Directory -Force -Path staging
-          Copy-Item LCE${{ matrix.platform }}.zip staging/ 
+          Copy-Item "LCE${{ matrix.platform }}.zip" staging/
 
-      - name: Stage exe
+          if ("${{ matrix.platform }}" -eq "Windows64") {
-        if: matrix.platform == 'Windows64'
+            Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
-        run: |
+          } elseif ("${{ matrix.platform }}" -eq "PSVita") {
-          Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
+            Copy-Item "./PSVita_${{ matrix.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
+          } elseif ("${{ matrix.platform }}" -eq "Orbis") {
+            Copy-Item "./ORBIS_${{ matrix.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
+          }
 
       - name: Upload artifacts
         uses: https://github.com/actions/upload-artifact@v3
@@ -88,9 +102,14 @@ jobs:
             } catch {
               $body = $fallback
             }
+          } else {
+            $body = $fallback
           }
 
-          "description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
+          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
+          "description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          $body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          "$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
 
       - name: Publish Release
         uses: akkuman/gitea-release-action@v1

Minecraft.Client/Minecraft.Client.vcxproj

@@ -520,24 +520,32 @@
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">
     <LinkIncremental>false</LinkIncremental>
     <OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
     <ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\Xbox\Sentient\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(SolutionDir)X360_$(Configuration)\</OutDir>
+    <IntDir>X360_$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
     <LinkIncremental>false</LinkIncremental>
@@ -705,6 +713,9 @@
     <PostBuildEvent>
       <Message>Run Xbox postbuild script</Message>
     </PostBuildEvent>
+    <Deploy>
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </Deploy>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
     <ClCompile>
@@ -2044,7 +2055,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OptimizationLevel>Level2</OptimizationLevel>
       <AdditionalIncludeDirectories>Orbis\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies)</AdditionalDependencies>

MinecraftConsoles.sln

@@ -101,6 +101,7 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.ActiveCfg = Release|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.Build.0 = Release|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.Build.0 = Release|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS
@@ -166,6 +167,7 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Build.0 = Release|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Deploy.0 = Release|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.Build.0 = Release|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS