diff --git a/.gitignore b/.gitignore index 76482abb..92197f16 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ *.sdf *.opensdf *.v11.suo -*.vcxproj.user \ No newline at end of file +*.vcxproj.user +*.aps \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..0aa50f33 --- /dev/null +++ b/.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 diff --git a/Minecraft.Client/Common/Buildsteps/4JLibs.ps1 b/Minecraft.Client/Common/Buildsteps/4JLibs.ps1 new file mode 100644 index 00000000..032cf845 --- /dev/null +++ b/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." +} \ No newline at end of file diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/en-us/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/en-us/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-cn/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-cn/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SmallLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SmallLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SmallLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SmallLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SplashScreen.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SplashScreen.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/SplashScreen.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/SplashScreen.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/StoreLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/StoreLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/StoreLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/StoreLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/WideLogo.png b/Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/WideLogo.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Durango/StoreImages/zh-sg/WideLogo.png rename to Minecraft.Client/Common/Buildsteps/Contents/Durango/StoreImages/zh-sg/WideLogo.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_high.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_gls/standby_screen/standby_screen_resource_low.bsf diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/icon0.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/icon0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/icon0.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/icon0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/00/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/00/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/00/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/00/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/01/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/01/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/01/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/01/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/02/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/02/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/02/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/02/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/03/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/03/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/03/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/03/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/04/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/04/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/04/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/04/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/05/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/05/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/05/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/05/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/06/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/06/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/06/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/06/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/07/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/07/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/07/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/07/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/08/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/08/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/08/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/08/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/09/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/09/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/09/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/09/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/10/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/10/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/10/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/10/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/11/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/11/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/11/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/11/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/12/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/12/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/12/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/12/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/13/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/13/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/13/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/13/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/14/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/14/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/14/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/14/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/15/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/15/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/15/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/15/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/16/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/16/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/16/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/16/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/17/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/17/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/17/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/17/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/18/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/18/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/18/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/18/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/19/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/19/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/19/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/19/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/20/001.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/20/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keymap_rp/20/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keymap_rp/20/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keystone b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keystone similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/keystone rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/keystone diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/nptitle.dat b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/nptitle.dat similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/nptitle.dat rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/nptitle.dat diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/param.sfo similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/param.sfo diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic0.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic0.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic1.png b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic1.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pic1.png rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pic1.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.sig b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.sig similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.sig rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.sig diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.xml b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.xml similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/pronunciation.xml rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/pronunciation.xml diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/snd0.at9 b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/snd0.at9 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/snd0.at9 rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/snd0.at9 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/Trophy00.trp b/Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/trophy/Trophy00.trp similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/Trophy00.trp rename to Minecraft.Client/Common/Buildsteps/Contents/Orbis/sce_sys/trophy/Trophy00.trp diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_DISC.SFB b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_DISC.SFB similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_DISC.SFB rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_DISC.SFB diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/ICON0.PNG b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/ICON0.PNG similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/ICON0.PNG rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/ICON0.PNG diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/LICDIR/LIC.DAT diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PARAM.SFO b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PARAM.SFO similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PARAM.SFO rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PARAM.SFO diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PIC1.PNG b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PIC1.PNG similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PIC1.PNG rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PIC1.PNG diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG0 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG0 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG0 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG0 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG1 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG1 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.BG1 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.BG1 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.VR0 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.VR0 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3GAME.VR0 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3GAME.VR0 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3LOGO.DAT b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3LOGO.DAT similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/PS3LOGO.DAT rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/PS3LOGO.DAT diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/SND0.AT3 b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/SND0.AT3 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/SND0.AT3 rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/SND0.AT3 diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP b/Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP rename to Minecraft.Client/Common/Buildsteps/Contents/PS3/PS3_GAME/TROPDIR/NPWR05636_00/TROPHY.TRP diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/icon.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/icon.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/icon.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/icon.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/icon0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/icon0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/icon0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/icon0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/bg0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/bg0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/bg0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/bg0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_1.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_1.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_1.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_1.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_2.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_2.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/item_2.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/item_2.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/startup.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/startup.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/startup.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/startup.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/template.xml b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/template.xml similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/livearea/contents/template.xml rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/livearea/contents/template.xml diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/01/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/01/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/02/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/02/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/03/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/03/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/001.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/001.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/001.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/001.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/002.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/002.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/002.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/002.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/003.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/003.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/003.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/003.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/004.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/004.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/004.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/004.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/005.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/005.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/005.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/005.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/006.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/006.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/006.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/006.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/007.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/007.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/manual/17/007.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/manual/17/007.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/param.sfo b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/param.sfo similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/param.sfo rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/param.sfo diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/pic0.png b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/pic0.png similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/pic0.png rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/pic0.png diff --git a/Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP b/Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP rename to Minecraft.Client/Common/Buildsteps/Contents/PSVita/sce_sys/trophy/NPWR06859_00/TROPHY.TRP diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/iggy_w64.dll b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/iggy_w64.dll rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/mss64.dll b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/mss64.dll similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/mss64.dll rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/mss64.dll diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/binkawin64.asi b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/binkawin64.asi rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dolby.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dolby.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64ds3d.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64ds3d.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dsp.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64dsp.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64eax.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64eax.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64srs.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Contents/Windows64/redist64/mss64srs.flt rename to Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt diff --git a/Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 similarity index 97% rename from Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 index fd3aba56..001cfb11 100644 --- a/Minecraft.Client/Common/Postbuilds/Durango-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1 @@ -86,7 +86,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 similarity index 89% rename from Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 index 434b8359..45f78399 100644 --- a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1 @@ -30,8 +30,8 @@ $folderCopies = @( @{ Source = "Orbis\DLCImages"; Dest = "PS4_GAME\Orbis\DLCImages" }, @{ Source = "OrbisMedia\Tutorial"; Dest = "PS4_GAME\Orbis\Tutorial" }, @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module"; Dest = "PS4_GAME\sce_module" }, - @{ Source = "Common\Postbuilds\Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" }, - @{ Source = "Common\Postbuilds\Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" } + @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" }, + @{ Source = Join-Path $PSScriptRoot "Contents\Orbis\sce_sys"; Dest = "PS4_GAME\sce_sys" } ) foreach ($copy in $folderCopies) { @@ -100,7 +100,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } @@ -127,6 +127,8 @@ if (-not (Test-Path $genGp4)) { Write-Host "Orbis Postbuild: '$pkgSrc' not found, skipping PKG creation." } else { Write-Host "Orbis Postbuild: Generating GP4..." + + Copy-Item -Path (Join-Path $pkgSrc "\sce_sys\param.sfo") -Destination (Join-Path $OutDir "param.sfo.bak") -Force $proc = Start-Process -FilePath $genGp4 -ArgumentList $pkgSrc ` -WorkingDirectory (Split-Path $pkgSrc -Parent) ` -NoNewWindow -Wait -PassThru @@ -148,6 +150,7 @@ if (-not (Test-Path $genGp4)) { & $pubCmd img_create $gp4File $pkgPath (Get-Content $gp4File) -replace 'default_id="1"', 'default_id="0"' | Set-Content $gp4File # str1k3r - ran again so we can open the GP4 file without it throwing a error. + Copy-Item -Path (Join-Path $OutDir "param.sfo.bak") -Destination (Join-Path $pkgSrc "\sce_sys\param.sfo") -Force # str1k3r - forces the .bak to replace the .sfo so we dont run into "Failed to get TITLE_ID". Write-Host "Orbis Postbuild: PKG created at $pkgPath" } \ No newline at end of file diff --git a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 similarity index 71% rename from Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 index 65723d49..c5158822 100644 --- a/Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1 @@ -26,8 +26,8 @@ $folderCopies = @( @{ Source = "PS3Media\DLC"; Dest = "PS3_GAME\USRDIR\DLC" }, @{ Source = "PS3\Sound"; Dest = "PS3_GAME\USRDIR\PS3\Sound" }, #@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" } + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\LICDIR"; Dest = "PS3_GAME\LICDIR" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" } ) foreach ($copy in $folderCopies) { @@ -41,15 +41,15 @@ foreach ($copy in $folderCopies) { $fileCopies = @( @{ Source = "PS3\PS3ProductCodes.bin"; Dest = "PS3_GAME\USRDIR\PS3\PS3ProductCodes.bin" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_DISC.SFB"; Dest = "PS3_DISC.SFB" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\ICON0.PNG"; Dest = "PS3_GAME\ICON0.PNG" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PARAM.SFO"; Dest = "PS3_GAME\PARAM.SFO" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PIC1.PNG"; Dest = "PS3_GAME\PIC1.PNG" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.BG0"; Dest = "PS3_GAME\PS3GAME.BG0" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.BG1"; Dest = "PS3_GAME\PS3GAME.BG1" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3GAME.VR0"; Dest = "PS3_GAME\PS3GAME.VR0" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\PS3LOGO.DAT"; Dest = "PS3_GAME\PS3GAME.DAT" }, - @{ Source = "Common\Postbuilds\Contents\PS3\PS3_GAME\SND0.AT3"; Dest = "PS3_GAME\SND0.AT3" } + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_DISC.SFB"; Dest = "PS3_DISC.SFB" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\ICON0.PNG"; Dest = "PS3_GAME\ICON0.PNG" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PARAM.SFO"; Dest = "PS3_GAME\PARAM.SFO" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PIC1.PNG"; Dest = "PS3_GAME\PIC1.PNG" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PS3GAME.BG0"; Dest = "PS3_GAME\PS3GAME.BG0" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PS3GAME.BG1"; Dest = "PS3_GAME\PS3GAME.BG1" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PS3GAME.VR0"; Dest = "PS3_GAME\PS3GAME.VR0" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PS3LOGO.DAT"; Dest = "PS3_GAME\PS3GAME.DAT" }, + @{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\SND0.AT3"; Dest = "PS3_GAME\SND0.AT3" } ) foreach ($copy in $fileCopies) { @@ -105,7 +105,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 similarity index 97% rename from Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 index aeabac4d..39bc2a37 100644 --- a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1 @@ -27,7 +27,7 @@ $folderCopies = @( @{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" }, @{ Source = "PSVita\Tutorial"; Dest = "PSVITA_GAME\PSVita\Tutorial" }, @{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module"; Dest = "PSVITA_GAME\sce_module" }, - @{ Source = "Common\Postbuilds\Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" } + @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" } ) foreach ($copy in $folderCopies) { diff --git a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 similarity index 79% rename from Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 index f2a2f647..77a84ad2 100644 --- a/Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 @@ -26,7 +26,7 @@ $folderCopies = @( @{ Source = "Windows64Media"; Dest = "Windows64Media" }, #@{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru @{ Source = "Windows64\Sound"; Dest = "Windows64Media\Sound" }, - @{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" } + @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\redist64"; Dest = "redist64" } ) foreach ($copy in $folderCopies) { @@ -39,17 +39,19 @@ foreach ($copy in $folderCopies) { } $fileCopies = @( - @{ Source = "Common\Postbuilds\Contents\Windows64\Effects.msscmp"; Dest = "Effects.msscmp" }, - @{ Source = "Common\Postbuilds\Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" }, - @{ Source = "Common\Postbuilds\Contents\Windows64\mss64.dll"; Dest = "mss64.dll" } + @{ Source = Join-Path $ProjectDir "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" }, + @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" }, + @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" } ) foreach ($copy in $fileCopies) { - $src = Join-Path $ProjectDir $copy.Source + $src = $copy.Source $dst = Join-Path $OutDir $copy.Dest if (Test-Path $src) { Copy-Item -Path $src -Destination $dst -Force - } + } else { + Write-Host "Windows64 Postbuild: source not found, skipping: $src" + } } $deleteDirs = @( @@ -82,7 +84,7 @@ foreach ($dir in $delDirs) { if ($delDirs -contains $dir) { $path = Join-Path $OutDir $dir if (Test-Path $path) { - Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | + Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File | Remove-Item -Force -ErrorAction SilentlyContinue } } diff --git a/Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 similarity index 100% rename from Minecraft.Client/Common/Postbuilds/Xbox-postbuild.ps1 rename to Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1 diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 4308ecbd..5724e19e 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -10034,11 +10034,11 @@ enum ETitleUpdateTexturePacks #ifdef _WINDOWS64 wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; #elif defined(__ORBIS__) -wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/"; +wstring titleUpdateTexturePackRoot = L"app0/Orbis/DLC/"; #elif defined(__PSVITA__) -wstring titleUpdateTexturePackRoot = L"PSVita/CU/DLC/"; +wstring titleUpdateTexturePackRoot = L"PSVita/DLC/"; #elif defined(__PS3__) -wstring titleUpdateTexturePackRoot = L"PS3/CU/DLC/"; +wstring titleUpdateTexturePackRoot = L"PS3/DLC/"; #else wstring titleUpdateTexturePackRoot = L"CU\\DLC\\"; #endif diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/Effects.msscmp b/Minecraft.Client/Common/Postbuilds/Contents/Windows64/Effects.msscmp deleted file mode 100644 index 8eb4b915..00000000 Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Windows64/Effects.msscmp and /dev/null differ diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index bec19c1c..8671a530 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -13,6 +13,8 @@ #include "UIFontData.h" #ifdef __PSVITA__ #include +#elif _WINDOWS64 +#include "Windows64\Windows64_Minecraft.h" #endif // 4J Stu - Enable this to override the Iggy Allocator @@ -179,10 +181,17 @@ UIController::UIController() #endif // 4J Stu - This is a bit of a hack until we change the Minecraft initialisation to store the proper screen size for other platforms -#if defined _WINDOWS64 || defined _DURANGO || defined __ORBIS__ +#if defined _DURANGO || defined __ORBIS__ m_fScreenWidth = 1920.0f; m_fScreenHeight = 1080.0f; m_bScreenWidthSetup = true; +#elif _WINDOWS64 + m_fScreenWidth = g_iScreenWidth; + m_fScreenHeight = g_iScreenHeight; + m_bScreenWidthSetup = true; +#ifdef _DEBUG + app.DebugPrintf("[UIController] Width: %d, Height: %d\n", static_cast(m_fScreenWidth), static_cast(m_fScreenHeight)); +#endif #else m_fScreenWidth = 1280.0f; m_fScreenHeight = 720.0f; @@ -316,7 +325,7 @@ UIController::EFont UIController::getFontForLanguage(int language) switch(language) { case XC_LANGUAGE_JAPANESE: return eFont_Japanese; -#ifdef _DURANGO +#if defined(_DURANGO) || defined(_WINDOWS64) case XC_LANGUAGE_SCHINESE: return eFont_SimpChinese; #endif case XC_LANGUAGE_TCHINESE: return eFont_TradChinese; @@ -331,12 +340,11 @@ UITTFFont *UIController::createFont(EFont fontLanguage) { #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Common/Media/font/JPN/DF-DotDotGothic16.ttf", 0x203B); // JPN - // case eFont_SimpChinese: Simplified Chinese is unsupported. case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Common/Media/font/CHT/DFTT_R5.TTC", 0x203B); // CHT case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", "Common/Media/font/KOR/candadite2.ttf", 0x203B); // KOR #else case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN -#ifdef _DURANGO +#if defined(_DURANGO) || defined(_WINDOWS64) case eFont_SimpChinese: return new UITTFFont("Mojangled_TTF_cnCN", "Common/Media/font/CHS/MSYH.ttf", 0x2022); // CHS #endif case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Common/Media/font/CHT/DFHeiMedium-B5.ttf", 0x2022); // CHT @@ -500,7 +508,7 @@ void UIController::loadSkins() #elif defined __PSVITA__ platformSkinPath = L"skinVita.swf"; #elif defined _WINDOWS64 - if(m_fScreenHeight==1080.0f) + if(m_fScreenWidth >= 1920.0f) { platformSkinPath = L"skinHDWin.swf"; } @@ -531,7 +539,7 @@ void UIController::loadSkins() // str1k3r - Fixes 720p/480p Crashes on Windows64, also allows this to be used on 1080p consoles instead of just Windows64 // This also cleans up some 4J code and turns 3 if statements into 1. - if (m_fScreenHeight >= 1080.0f) + if (m_fScreenWidth >= 1920.0f) { m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf"); m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf"); @@ -611,17 +619,19 @@ void UIController::ReloadSkin() m_iggyLibraries[i] = IGGY_INVALID_LIBRARY; } -#ifdef _WINDOWS64 - // 4J Stu - Don't load on a thread on windows. I haven't investigated this in detail, so a quick fix - reloadSkinThreadProc(this); -#else - m_reloadSkinThread = new C4JThread(reloadSkinThreadProc, (void*)this, "Reload skin thread"); m_reloadSkinThread->SetProcessor(CPU_CORE_UI_SCENE); // Navigate to the timer scene so that we can display something while the loading is happening + // str1k3r - Exclude this from windows64 as its not needed +#ifndef _WINDOWS64 ui.NavigateToScene(0,eUIScene_Timer,(void *)1,eUILayer_Tooltips,eUIGroup_Fullscreen); - //m_reloadSkinThread->Run(); +#endif + +// str1k3r - Fixes 4J's issue with the screen staying on the timer scene if on another thread on windows64 +#ifdef _WINDOWS64 + m_reloadSkinThread->Run(); +#endif //// Load new skin //loadSkins(); @@ -634,7 +644,6 @@ void UIController::ReloadSkin() //// Always reload the fullscreen group //m_groups[eUIGroup_Fullscreen]->ReloadAll(); -#endif } void UIController::StartReloadSkinThread() @@ -1401,6 +1410,17 @@ GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void * #if (defined __ORBIS__ || defined _DURANGO ) *width = 96; *height = 96; + #elif _WINDOWS64 + if(ui.getScreenWidth() >= 1920) + { + *width = 96; + *height = 96; + } + else + { + *width = 64; + *height = 64; + } #else *width = 64; *height = 64; diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp index a32f4739..1d34195f 100644 --- a/Minecraft.Client/Common/UI/UIScene.cpp +++ b/Minecraft.Client/Common/UI/UIScene.cpp @@ -285,25 +285,25 @@ void UIScene::loadMovie() moviePath.append(L"Vita.swf"); m_loadedResolution = eSceneResolution_Vita; #elif defined _WINDOWS64 - if(ui.getScreenHeight() == 720) + if(ui.getScreenWidth() >= 1920) + { + moviePath.append(L"1080.swf"); + m_loadedResolution = eSceneResolution_1080; + } + else if(ui.getScreenWidth() >= 1280) { moviePath.append(L"720.swf"); m_loadedResolution = eSceneResolution_720; } - else if(ui.getScreenHeight() == 480) - { - moviePath.append(L"480.swf"); - m_loadedResolution = eSceneResolution_480; - } - else if(ui.getScreenHeight() < 720) + else if(ui.getScreenWidth() >= 960) { moviePath.append(L"Vita.swf"); m_loadedResolution = eSceneResolution_Vita; } else { - moviePath.append(L"1080.swf"); - m_loadedResolution = eSceneResolution_1080; + moviePath.append(L"480.swf"); + m_loadedResolution = eSceneResolution_480; } #else moviePath.append(L"1080.swf"); diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp index 93bfe78a..e61f1d1e 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp @@ -198,7 +198,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye else { -#if defined(__PS3__) || defined(__ORBIS__)|| defined(_DURANGO) || defined (__PSVITA__) +#if defined(__PS3__) || defined(__ORBIS__)|| defined(_DURANGO) || defined (__PSVITA__) || defined(_WINDOWS64) // convert to utf16 uint16_t u16Message[MAX_SAVEFILENAME_LENGTH]; size_t srclen,dstlen; @@ -209,7 +209,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye #elif defined(_DURANGO) // Already utf16 on durango memcpy(u16Message,params->saveDetails->UTF16SaveFilename, MAX_SAVEFILENAME_LENGTH); -#else // __ORBIS__ +#elif defined(__ORBIS__) // __ORBIS__ { SceCesUcsContext Context; sceCesUcsContextInit( &Context ); @@ -218,6 +218,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye } #endif m_thumbnailName = (wchar_t *)u16Message; +#ifndef _WINDOWS64 if(params->saveDetails->pbThumbnailData) { m_pbThumbnailData = params->saveDetails->pbThumbnailData; @@ -225,6 +226,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye m_bSaveThumbnailReady = true; } else +#endif { app.DebugPrintf("Requesting the save thumbnail\n"); // set the save to load diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp index bbcdaf57..8e863519 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -113,8 +113,9 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer m_controlJoinTimer.setVisible( true ); -#if defined(_XBOX_ONE) || defined(__ORBIS__) - m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) ); + +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) + m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) ); #endif m_bUpdateSaveSize = false; @@ -583,7 +584,7 @@ void UIScene_LoadOrJoinMenu::tick() if(m_eSaveTransferState == eSaveTransfer_Idle) m_bSaveTransferRunning = false; #endif -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) if(m_bUpdateSaveSize) { if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC)) @@ -604,7 +605,7 @@ void UIScene_LoadOrJoinMenu::tick() if(m_pSaveDetails!=NULL) { //CD - Fix - Adding define for ORBIS/XBOXONE -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) m_spaceIndicatorSaves.reset(); #endif @@ -632,6 +633,26 @@ void UIScene_LoadOrJoinMenu::tick() m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].totalSize); #elif defined(__ORBIS__) m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024) ); +#elif defined(_WINDOWS64) + ZeroMemory(m_saveDetails[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH); + memcpy(m_saveDetails[i].UTF8SaveFilename, m_pSaveDetails->SaveInfoA[i].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1); + wstring folderPath = wstring(L"Windows64\\GameHDD\\") + app.UTF8ToWide(m_saveDetails[i].UTF8SaveFilename) + L"\\*"; + + DWORD fileSize = 0; + WIN32_FIND_DATAW findData; + HANDLE hFile = FindFirstFileW(folderPath.c_str(), &findData); + + if (hFile != INVALID_HANDLE_VALUE) { + do { + if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + fileSize = findData.nFileSizeLow; + break; + } + } while (FindNextFileW(hFile, &findData)); + FindClose(hFile); + } + m_spaceIndicatorSaves.addSave(fileSize); #endif #ifdef _DURANGO m_buttonListSaves.addItem(m_pSaveDetails->SaveInfoA[i].UTF16SaveTitle, L""); diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h index bb655a38..3d832f33 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h @@ -20,7 +20,7 @@ private: { eControl_SavesList, eControl_GamesList, -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) eControl_SpaceIndicator, #endif }; @@ -52,7 +52,7 @@ protected: UIControl_SaveList m_buttonListGames; UIControl_Label m_labelSavesListTitle, m_labelJoinListTitle, m_labelNoGames; UIControl m_controlSavesTimer, m_controlJoinTimer; -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) UIControl_SpaceIndicatorBar m_spaceIndicatorSaves; #endif @@ -68,7 +68,7 @@ private: UI_MAP_ELEMENT( m_controlSavesTimer, "SavesTimer") UI_MAP_ELEMENT( m_controlJoinTimer, "JoinTimer") -#if defined(_XBOX_ONE) || defined(__ORBIS__) +#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64) UI_MAP_ELEMENT( m_spaceIndicatorSaves, "SaveSizeBar") #endif UI_END_MAP_ELEMENTS_AND_NAMES() diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp index 0603360a..19505e73 100644 --- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp @@ -359,7 +359,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) m_eAction=eAction_RunUnlockOrDLC; signInReturnedFunc = &UIScene_MainMenu::UnlockFullGame_SignInReturned; break; -#if defined _XBOX +#if defined(_XBOX) || defined(_WINDOWS64) case eControl_Exit: if( ProfileManager.IsFullVersion() ) { @@ -370,9 +370,6 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId) } else { -#ifdef _XBOX_ONE - ui.ShowPlayerDisplayname(true); -#endif ui.NavigateToScene(primaryPad,eUIScene_TrialExitUpsell); } break; diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index a6fd5b4b..34d9a696 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -501,7 +501,7 @@ - true + false $(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath) @@ -708,7 +708,7 @@ xavatar2d.lib;xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;xuirund.lib;xuirenderd.lib;xuihtmld.lib;xonline.lib;xhvd2.lib;qnetxaudio2d.lib;xpartyd.lib;..\Minecraft.World\Debug\Minecraft.World.lib;xbox\4JLibs\libs\4J_Input_d.lib;xbox\4JLibs\libs\4J_Storage_d.lib;xbox\4JLibs\libs\4J_Profile_d.lib;xbox\4JLibs\libs\4J_Render_d.lib;xsocialpostd.lib;xrnmd.lib;xbox\Sentient\libs\SenCoreD.lib;xbox\Sentient\libs\SenNewsD.lib;xbox\Sentient\libs\SenUGCD.lib;xbox\Sentient\libs\SenBoxArtD.lib;nuiapid.lib;STd.lib;NuiFitnessApid.lib;NuiHandlesd.lib;NuiSpeechd.lib;xhttpd.lib;xauthd.lib;xgetserviceendpointd.lib;xavd.lib;xjsond.lib;xbox\4JLibs\libs\4J_XTMS_d.lib;%(AdditionalDependencies) - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -767,7 +767,7 @@ Run Xbox postbuild script - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" @@ -806,7 +806,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -854,7 +854,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -899,7 +899,7 @@ - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -937,11 +937,16 @@ false - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1044,11 +1049,16 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1158,7 +1168,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1206,7 +1216,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1254,7 +1264,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1303,7 +1313,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Xbox-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Xbox postbuild script @@ -1352,7 +1362,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1402,7 +1412,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUNone - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1449,7 +1459,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1505,7 +1515,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1554,7 +1564,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1610,7 +1620,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripSymsAndDebug - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1651,7 +1661,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PS3-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" -Configuration "$(Configuration)" Run PS3 postbuild script @@ -1699,7 +1709,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU--strip-duplicates - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -1739,11 +1749,16 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUUseLinkTimeCodeGeneration - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1776,11 +1791,16 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1809,11 +1829,16 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1846,11 +1871,16 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Windows64-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Windows64 postbuild script + + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -2102,7 +2132,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2134,7 +2164,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2161,7 +2191,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUStripFuncsAndData - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2188,7 +2218,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU..\Minecraft.World\ORBIS_ReleaseForArt\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_rtti;-lSceNpToolkitUtils_rtti;-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 - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2204,7 +2234,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2229,7 +2259,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUfalse - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/Orbis-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run Orbis postbuild script @@ -2273,7 +2303,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUNone - powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Postbuilds/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" + powershell -ExecutionPolicy Bypass -File "$(ProjectDir)/Common/Buildsteps/PSVita-postbuild.ps1" -OutDir "$(OutDir)/" -ProjectDir "$(ProjectDir)/" Run PSVita postbuild script @@ -2285,12 +2315,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUXML Designer - - - - - - + + + + + + + true true @@ -16132,6 +16163,43 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true true @@ -34290,7 +34358,45 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true - + + true + true + true + true + true + true + true + true + false + true + false + true + false + false + false + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + true true true @@ -34320,6 +34426,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true true @@ -34351,9 +34464,91 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true - - + + true + true + true + true + true + true + true + true + false + true + false + true + false + false + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + false + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + true true true @@ -34396,8 +34591,15 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true - + true true true @@ -34427,8 +34629,15 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true - + true true true @@ -34460,6 +34669,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true true @@ -34493,6 +34709,13 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue true true + true + true + true + true + true + true + true true diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters index 628815bf..ab858593 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj.filters +++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters @@ -726,6 +726,9 @@ {889a84db-3009-4a7c-8234-4bf93d412690} + + {e5d64ee9-2601-46fd-9b18-254dae9cd85e} + @@ -884,12 +887,27 @@ PSVita\Iggy\gdraw - - - - - - + + Buildsteps + + + Buildsteps + + + Buildsteps + + + Buildsteps + + + Buildsteps + + + Buildsteps + + + Buildsteps + @@ -1351,9 +1369,6 @@ Xbox\GameConfig - - Xbox\Source Files - net\minecraft\server\network @@ -2950,9 +2965,6 @@ Common\Source Files\UI\Scenes\Debug - - Xbox\Source Files - Common\Source Files\Network @@ -3775,6 +3787,15 @@ PSVita + + Windows64\Source Files + + + Xbox + + + Xbox + @@ -4218,9 +4239,6 @@ Source Files - - Xbox\Source Files - Xbox\Source Files @@ -5184,9 +5202,6 @@ Common\Source Files\UI\Scenes\Debug - - Xbox\Source Files - Common\Source Files\Network @@ -5919,6 +5934,12 @@ PSVita + + Xbox + + + Xbox + @@ -5966,15 +5987,6 @@ Durango\4JLibs\libs - - Windows64\4JLibs\libs - - - Windows64\4JLibs\libs - - - Windows64\4JLibs\libs - Windows64\4JLibs\libs @@ -6077,9 +6089,6 @@ Durango\4JLibs\libs - - Windows64\4JLibs\libs - Windows64\4JLibs\libs @@ -6176,7 +6185,33 @@ PSVita\4JLibs\libs - + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + + + Windows64\4JLibs\libs + diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index 4df5141c..d7ac027f 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -753,10 +753,13 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false; + //str1k3r - if used on windows64 a orphaned save gets left behind if you exit without saving +#ifndef _WINDOWS64 if( levels[0]->isNew || levels[1]->isNew || levels[2]->isNew ) { levels[0]->saveToDisc(mcprogress, false); } +#endif if( s_bServerHalted || !g_NetworkManager.IsInSession() ) return false; diff --git a/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h index 2739b5f6..3c97a951 100644 --- a/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h +++ b/Minecraft.Client/PSVita/PSVitaExtras/OldSdk.h @@ -1,6 +1,4 @@ #pragma once -#ifndef _OLD_SDK_H -#define _OLD_SDK_H 1 #include #include @@ -48,6 +46,4 @@ int sceNpBasicGetRequestedFriendRequestEntryCount(SceSize *count); int sceNpBasicGetRequestedFriendRequestEntries(unsigned int startIndex, SceNpId *entries, SceSize numEntries, SceSize *retrieved); SceInt32 sceAppUtilAppEventParseNpBasicJoinablePresence(const SceAppUtilAppEventParam *eventParam, SceAppUtilNpBasicJoinablePresenceParam *param); -#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE (3) - -#endif \ No newline at end of file +#define SCE_APPUTIL_APPEVENT_TYPE_NP_BASIC_JOINABLE_PRESENCE (3) \ No newline at end of file diff --git a/Minecraft.Client/StatsCounter.cpp b/Minecraft.Client/StatsCounter.cpp index 050f533e..aae8d0c1 100644 --- a/Minecraft.Client/StatsCounter.cpp +++ b/Minecraft.Client/StatsCounter.cpp @@ -67,7 +67,9 @@ void StatsCounter::award(Stat* stat, unsigned int difficulty, unsigned int count unordered_map::iterator leaderboardEntry = statBoards.find(stat); if( leaderboardEntry != statBoards.end() ) { +#ifdef _DEBUG app.DebugPrintf("[StatsCounter] award(): %X\n", leaderboardEntry->second << difficulty); +#endif modifiedBoards |= (leaderboardEntry->second << difficulty); if( flushCounter == 0 ) flushCounter = FLUSH_DELAY; diff --git a/Minecraft.Client/Windows64/4JLibs b/Minecraft.Client/Windows64/4JLibs new file mode 160000 index 00000000..f549c757 --- /dev/null +++ b/Minecraft.Client/Windows64/4JLibs @@ -0,0 +1 @@ +Subproject commit f549c757b925bf0ff5bda9be506e643dceea3f13 diff --git a/Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h b/Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h deleted file mode 100644 index f7c38f7a..00000000 --- a/Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h +++ /dev/null @@ -1,137 +0,0 @@ -#pragma once - -#define MAP_STYLE_0 0 -#define MAP_STYLE_1 1 -#define MAP_STYLE_2 2 - -#define _360_JOY_BUTTON_A 0x00000001 -#define _360_JOY_BUTTON_B 0x00000002 -#define _360_JOY_BUTTON_X 0x00000004 -#define _360_JOY_BUTTON_Y 0x00000008 - -#define _360_JOY_BUTTON_START 0x00000010 -#define _360_JOY_BUTTON_BACK 0x00000020 -#define _360_JOY_BUTTON_RB 0x00000040 -#define _360_JOY_BUTTON_LB 0x00000080 - -#define _360_JOY_BUTTON_RTHUMB 0x00000100 -#define _360_JOY_BUTTON_LTHUMB 0x00000200 -#define _360_JOY_BUTTON_DPAD_UP 0x00000400 -#define _360_JOY_BUTTON_DPAD_DOWN 0x00000800 - -#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000 -#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000 -// fake digital versions of analog values -#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000 -#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000 - -#define _360_JOY_BUTTON_RSTICK_DOWN 0x00010000 -#define _360_JOY_BUTTON_RSTICK_UP 0x00020000 -#define _360_JOY_BUTTON_RSTICK_RIGHT 0x00040000 -#define _360_JOY_BUTTON_RSTICK_LEFT 0x00080000 - -#define _360_JOY_BUTTON_LSTICK_DOWN 0x00100000 -#define _360_JOY_BUTTON_LSTICK_UP 0x00200000 -#define _360_JOY_BUTTON_RT 0x00400000 -#define _360_JOY_BUTTON_LT 0x00800000 - -// Stick axis maps - to allow changes for SouthPaw in-game axis mapping -#define AXIS_MAP_LX 0 -#define AXIS_MAP_LY 1 -#define AXIS_MAP_RX 2 -#define AXIS_MAP_RY 3 - -// Trigger map - to allow for swap triggers in-game -#define TRIGGER_MAP_0 0 -#define TRIGGER_MAP_1 1 - -enum EKeyboardResult -{ - EKeyboard_Pending, - EKeyboard_Cancelled, - EKeyboard_ResultAccept, - EKeyboard_ResultDecline, -}; - -typedef struct _STRING_VERIFY_RESPONSE -{ - WORD wNumStrings; - HRESULT *pStringResult; -} -STRING_VERIFY_RESPONSE; - -class C_4JInput -{ -public: - - - enum EKeyboardMode - { - EKeyboardMode_Default, - EKeyboardMode_Numeric, - EKeyboardMode_Password, - EKeyboardMode_Alphabet, - EKeyboardMode_Full, - EKeyboardMode_Alphabet_Extended, - EKeyboardMode_IP_Address, - EKeyboardMode_Phone - }; - - void Initialise( int iInputStateC, unsigned char ucMapC,unsigned char ucActionC, unsigned char ucMenuActionC ); - void Tick(void); - void SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax ); - void SetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction,unsigned int uiActionVal); - unsigned int GetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction); - void SetJoypadMapVal(int iPad,unsigned char ucMap); - unsigned char GetJoypadMapVal(int iPad); - void SetJoypadSensitivity(int iPad, float fSensitivity); - unsigned int GetValue(int iPad,unsigned char ucAction, bool bRepeat=false); - bool ButtonPressed(int iPad,unsigned char ucAction=255); // toggled - bool ButtonReleased(int iPad,unsigned char ucAction); //toggled - bool ButtonDown(int iPad,unsigned char ucAction=255); // button held down - // Functions to remap the axis and triggers for in-game (not menus) - SouthPaw, etc - void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo); - void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); - void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); - void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam ); - FLOAT GetIdleSeconds(int iPad); - bool IsPadConnected(int iPad); - - // In-Game values which may have been remapped due to Southpaw, swap triggers, etc - float GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay=true); - float GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay=true); - float GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay=true); - float GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay=true); - unsigned char GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay=true); - unsigned char GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay=true); - - void SetMenuDisplayed(int iPad, bool bVal); - -// EKeyboardResult RequestKeyboard(UINT uiTitle, UINT uiText, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam,EKeyboardMode eMode,C4JStringTable *pStringTable=NULL); -// EKeyboardResult RequestKeyboard(UINT uiTitle, LPCWSTR pwchDefault, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam, EKeyboardMode eMode,C4JStringTable *pStringTable=NULL); - EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int( *Func)(LPVOID,const bool),LPVOID lpParam,C_4JInput::EKeyboardMode eMode); - void GetText(uint16_t *UTF16String); - - // Online check strings against offensive list - TCR 92 - // TCR # 092 CMTV Player Text String Verification - // Requirement Any player-entered text visible to another player on Xbox LIVE must be verified using the Xbox LIVE service before being transmitted. Text that is rejected by the Xbox LIVE service must not be displayed. - // - // Remarks - // This requirement applies to any player-entered string that can be exposed to other players on Xbox LIVE. It includes session names, content descriptions, text messages, tags, team names, mottos, comments, and so on. - // - // Games may decide to not send the text, blank it out, or use generic text if the text was rejected by the Xbox LIVE service. - // - // Games verify the text by calling the XStringVerify function. - // - // Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat. - // - // Intent Protect players from inappropriate language. - bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam); - void CancelAllVerifyInProgress(void); - - //bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput); -}; - -// Singleton -extern C_4JInput InputManager; diff --git a/Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h b/Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h deleted file mode 100644 index fc29c5ea..00000000 --- a/Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h +++ /dev/null @@ -1,128 +0,0 @@ -#pragma once - -enum eAwardType -{ - eAwardType_Achievement = 0, - eAwardType_GamerPic, - eAwardType_Theme, - eAwardType_AvatarItem, -}; - -enum eUpsellType -{ - eUpsellType_Custom = 0, // This is the default, and means that the upsell dialog was initiated in the app code - eUpsellType_Achievement, - eUpsellType_GamerPic, - eUpsellType_Theme, - eUpsellType_AvatarItem, -}; - -enum eUpsellResponse -{ - eUpsellResponse_Declined, - eUpsellResponse_Accepted_NoPurchase, - eUpsellResponse_Accepted_Purchase, -}; - - - -class C_4JProfile -{ -public: - struct PROFILESETTINGS - { - int iYAxisInversion; - int iControllerSensitivity; - int iVibration; - bool bSwapSticks; - }; - - - // 4 players have game defined data, puiGameDefinedDataChangedBitmask needs to be checked by the game side to see if there's an update needed - it'll have the bits set for players to be updated - void Initialise( DWORD dwTitleID, - DWORD dwOfferID, - unsigned short usProfileVersion, - UINT uiProfileValuesC, - UINT uiProfileSettingsC, - DWORD *pdwProfileSettingsA, - int iGameDefinedDataSizeX4, - unsigned int *puiGameDefinedDataChangedBitmask); - void SetTrialTextStringTable(CXuiStringTable *pStringTable,int iAccept,int iReject); - void SetTrialAwardText(eAwardType AwardType,int iTitle,int iText); // achievement popup in the trial game - int GetLockedProfile(); - void SetLockedProfile(int iProf); - bool IsSignedIn(int iQuadrant); - bool IsSignedInLive(int iProf); - bool IsGuest(int iQuadrant); - UINT RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY); - UINT DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY); - UINT RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY); - void SetPrimaryPlayerChanged(bool bVal); - bool QuerySigninStatus(void); - void GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid); - BOOL AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2); - BOOL XUIDIsGuest(PlayerUID xuid); - bool AllowedToPlayMultiplayer(int iProf); - bool GetChatAndContentRestrictions(int iPad,bool *pbChatRestricted,bool *pbContentRestricted,int *piAge); - void StartTrialGame(); // disables saves and leaderboard, and change state to readyforgame from pregame - void AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, BOOL *allAllowed, BOOL *friendsAllowed); - BOOL CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount ); - void ShowProfileCard(int iPad, PlayerUID targetUid); - bool GetProfileAvatar(int iPad,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam); - void CancelProfileAvatarRequest(); - - - // SYS - int GetPrimaryPad(); - void SetPrimaryPad(int iPad); - char* GetGamertag(int iPad); - wstring GetDisplayName(int iPad); - bool IsFullVersion(); - void SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam); - void SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam); - bool RegionIsNorthAmerica(void); - bool LocaleIsUSorCanada(void); - HRESULT GetLiveConnectionStatus(); - bool IsSystemUIDisplayed(); - void SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam); - - - // PROFILE DATA - int SetDefaultOptionsCallback(int( *Func)(LPVOID,PROFILESETTINGS *, const int iPad),LPVOID lpParam); - int SetOldProfileVersionCallback(int( *Func)(LPVOID,unsigned char *, const unsigned short,const int),LPVOID lpParam); - PROFILESETTINGS * GetDashboardProfileSettings(int iPad); - void WriteToProfile(int iQuadrant, bool bGameDefinedDataChanged=false, bool bOverride5MinuteLimitOnProfileWrites=false); - void ForceQueuedProfileWrites(int iPad=XUSER_INDEX_ANY); - void *GetGameDefinedProfileData(int iQuadrant); - void ResetProfileProcessState(); // after a sign out from the primary player, call this - void Tick( void ); - - // ACHIEVEMENTS & AWARDS - - void RegisterAward(int iAwardNumber,int iGamerconfigID, eAwardType eType, bool bLeaderboardAffected=false, - CXuiStringTable*pStringTable=NULL, int iTitleStr=-1, int iTextStr=-1, int iAcceptStr=-1, char *pszThemeName=NULL, unsigned int uiThemeSize=0L); - int GetAwardId(int iAwardNumber); - eAwardType GetAwardType(int iAwardNumber); - bool CanBeAwarded(int iQuadrant, int iAwardNumber); - void Award(int iQuadrant, int iAwardNumber, bool bForce=false); - bool IsAwardsFlagSet(int iQuadrant, int iAward); - - // RICH PRESENCE - - void RichPresenceInit(int iPresenceCount, int iContextCount); - void RegisterRichPresenceContext(int iGameConfigContextID); - void SetRichPresenceContextValue(int iPad,int iContextID, int iVal); - void SetCurrentGameActivity(int iPad,int iNewPresence, bool bSetOthersToIdle=false); - - // PURCHASE - void DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam = -1); - void SetUpsellCallback(void ( *Func)(LPVOID lpParam, eUpsellType type, eUpsellResponse response, int iUserData),LPVOID lpParam); - - // Debug - void SetDebugFullOverride(bool bVal); // To override the license version (trail/full). Only in debug/release, not ContentPackage - -}; - -// Singleton -extern C_4JProfile ProfileManager; - diff --git a/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h b/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h deleted file mode 100644 index 6c0c81af..00000000 --- a/Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h +++ /dev/null @@ -1,302 +0,0 @@ -#pragma once - -class ImageFileBuffer -{ -public: - enum EImageType - { - e_typePNG, - e_typeJPG - }; - - EImageType m_type; - void* m_pBuffer; - int m_bufferSize; - - int GetType() { return m_type; } - void *GetBufferPointer() { return m_pBuffer; } - int GetBufferSize() { return m_bufferSize; } - void Release() { free(m_pBuffer); m_pBuffer = NULL; } - bool Allocated() { return m_pBuffer != NULL; } -}; - -typedef struct -{ - int Width; - int Height; -}D3DXIMAGE_INFO; - -typedef struct _XSOCIAL_PREVIEWIMAGE { - BYTE *pBytes; - DWORD Pitch; - DWORD Width; - DWORD Height; -// D3DFORMAT Format; -} XSOCIAL_PREVIEWIMAGE, *PXSOCIAL_PREVIEWIMAGE; - -class C4JRender -{ -public: - void Tick(); - void UpdateGamma(unsigned short usGamma); - - // Matrix stack - void MatrixMode(int type); - void MatrixSetIdentity(); - void MatrixTranslate(float x,float y,float z); - void MatrixRotate(float angle, float x, float y, float z); - void MatrixScale(float x, float y, float z); - void MatrixPerspective(float fovy, float aspect, float zNear, float zFar); - void MatrixOrthogonal(float left,float right,float bottom,float top,float zNear,float zFar); - void MatrixPop(); - void MatrixPush(); - void MatrixMult(float *mat); - const float *MatrixGet(int type); - void Set_matrixDirty(); - - // Core - void Initialise(ID3D11Device *pDevice, IDXGISwapChain *pSwapChain); - void InitialiseContext(); - void StartFrame(); - void DoScreenGrabOnNextPresent(); - void Present(); - void Clear(int flags, D3D11_RECT *pRect = NULL); - void SetClearColour(const float colourRGBA[4]); - bool IsWidescreen(); - bool IsHiDef(); - void CaptureThumbnail(ImageFileBuffer *pngOut); - void CaptureScreen(ImageFileBuffer *jpgOut, XSOCIAL_PREVIEWIMAGE *previewOut); - void BeginConditionalSurvey(int identifier); - void EndConditionalSurvey(); - void BeginConditionalRendering(int identifier); - void EndConditionalRendering(); - - // Vertex data handling - typedef enum - { - VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, // Position 3 x float, texture 2 x float, colour 4 x byte, normal 4 x byte, padding 1 DWORD - VERTEX_TYPE_COMPRESSED, // Compressed format - see comment at top of VS_PS3_TS2_CS1.hlsl for description of layout - VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with lighting applied, - VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with tex gen - VERTEX_TYPE_COUNT - } eVertexType; - - // Pixel shader - typedef enum - { - PIXEL_SHADER_TYPE_STANDARD, - PIXEL_SHADER_TYPE_PROJECTION, - PIXEL_SHADER_TYPE_FORCELOD, - PIXEL_SHADER_COUNT - } ePixelShaderType; - - typedef enum - { - VIEWPORT_TYPE_FULLSCREEN, - VIEWPORT_TYPE_SPLIT_TOP, - VIEWPORT_TYPE_SPLIT_BOTTOM, - VIEWPORT_TYPE_SPLIT_LEFT, - VIEWPORT_TYPE_SPLIT_RIGHT, - VIEWPORT_TYPE_QUADRANT_TOP_LEFT, - VIEWPORT_TYPE_QUADRANT_TOP_RIGHT, - VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT, - VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT, - } eViewportType; - - typedef enum - { - PRIMITIVE_TYPE_TRIANGLE_LIST, - PRIMITIVE_TYPE_TRIANGLE_STRIP, - PRIMITIVE_TYPE_TRIANGLE_FAN, - PRIMITIVE_TYPE_QUAD_LIST, - PRIMITIVE_TYPE_LINE_LIST, - PRIMITIVE_TYPE_LINE_STRIP, - PRIMITIVE_TYPE_COUNT - } ePrimitiveType; - - void DrawVertices(ePrimitiveType PrimitiveType, int count, void *dataIn, eVertexType vType, C4JRender::ePixelShaderType psType); - void DrawVertexBuffer(ePrimitiveType PrimitiveType, int count, ID3D11Buffer *buffer, C4JRender::eVertexType vType, C4JRender::ePixelShaderType psType); - - // Command buffers - void CBuffLockStaticCreations(); - int CBuffCreate(int count); - void CBuffDelete(int first, int count); - void CBuffStart(int index, bool full = false); - void CBuffClear(int index); - int CBuffSize(int index); - void CBuffEnd(); - bool CBuffCall(int index, bool full = true); - void CBuffTick(); - void CBuffDeferredModeStart(); - void CBuffDeferredModeEnd(); - - typedef enum - { - TEXTURE_FORMAT_RxGyBzAw, // Normal 32-bit RGBA texture, 8 bits per component - /* Don't think these are all directly available on D3D 11 - leaving for now - TEXTURE_FORMAT_R0G0B0Ax, // One 8-bit component mapped to alpha channel, R=G=B=0 - TEXTURE_FORMAT_R1G1B1Ax, // One 8-bit component mapped to alpha channel, R=G=B=1 - TEXTURE_FORMAT_RxGxBxAx, // One 8-bit component mapped to all channels - */ - MAX_TEXTURE_FORMATS - } eTextureFormat; - - // Textures - int TextureCreate(); - void TextureFree(int idx); - void TextureBind(int idx); - void TextureBindVertex(int idx); - void TextureSetTextureLevels(int levels); - int TextureGetTextureLevels(); - void TextureData(int width, int height, void *data, int level, eTextureFormat format = TEXTURE_FORMAT_RxGyBzAw); - void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void *data, int level); - void TextureSetParam(int param, int value); - void TextureDynamicUpdateStart(); - void TextureDynamicUpdateEnd(); - HRESULT LoadTextureData(const char *szFilename,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); - HRESULT LoadTextureData(BYTE *pbData, DWORD dwBytes,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); - HRESULT SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut); - HRESULT SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn); - void TextureGetStats(); - ID3D11ShaderResourceView *TextureGetTexture(int idx); - - // State control - void StateSetColour(float r, float g, float b, float a); - void StateSetDepthMask(bool enable); - void StateSetBlendEnable(bool enable); - void StateSetBlendFunc(int src, int dst); - void StateSetBlendFactor(unsigned int colour); - void StateSetAlphaFunc(int func, float param); - void StateSetDepthFunc(int func); - void StateSetFaceCull(bool enable); - void StateSetFaceCullCW(bool enable); - void StateSetLineWidth(float width); - void StateSetWriteEnable(bool red, bool green, bool blue, bool alpha); - void StateSetDepthTestEnable(bool enable); - void StateSetAlphaTestEnable(bool enable); - void StateSetDepthSlopeAndBias(float slope, float bias); - void StateSetFogEnable(bool enable); - void StateSetFogMode(int mode); - void StateSetFogNearDistance(float dist); - void StateSetFogFarDistance(float dist); - void StateSetFogDensity(float density); - void StateSetFogColour(float red, float green, float blue); - void StateSetLightingEnable(bool enable); - void StateSetVertexTextureUV( float u, float v); - void StateSetLightColour(int light, float red, float green, float blue); - void StateSetLightAmbientColour(float red, float green, float blue); - void StateSetLightDirection(int light, float x, float y, float z); - void StateSetLightEnable(int light, bool enable); - void StateSetViewport(eViewportType viewportType); - void StateSetEnableViewportClipPlanes(bool enable); - void StateSetTexGenCol(int col, float x, float y, float z, float w, bool eyeSpace); - void StateSetStencil(int Function, uint8_t stencil_ref, uint8_t stencil_func_mask, uint8_t stencil_write_mask); - void StateSetForceLOD(int LOD); - - // Event tracking - void BeginEvent(LPCWSTR eventName); - void EndEvent(); - - // PLM event handling - void Suspend(); - bool Suspended(); - void Resume(); -}; - - -const int GL_MODELVIEW_MATRIX = 0; -const int GL_PROJECTION_MATRIX = 1; -const int GL_MODELVIEW = 0; -const int GL_PROJECTION = 1; -const int GL_TEXTURE = 2; - -// These things required for tex gen - -const int GL_S = 0; -const int GL_T = 1; -const int GL_R = 2; -const int GL_Q = 3; - -const int GL_TEXTURE_GEN_S = 0; -const int GL_TEXTURE_GEN_T = 1; -const int GL_TEXTURE_GEN_Q = 2; -const int GL_TEXTURE_GEN_R = 3; - -const int GL_TEXTURE_GEN_MODE = 0; -const int GL_OBJECT_LINEAR = 0; -const int GL_EYE_LINEAR = 1; -const int GL_OBJECT_PLANE = 0; -const int GL_EYE_PLANE = 1; - - -// These things are used by glEnable/glDisable so must be different and non-zero (zero is used by things we haven't assigned yet) -const int GL_TEXTURE_2D = 1; -const int GL_BLEND = 2; -const int GL_CULL_FACE = 3; -const int GL_ALPHA_TEST = 4; -const int GL_DEPTH_TEST = 5; -const int GL_FOG = 6; -const int GL_LIGHTING = 7; -const int GL_LIGHT0 = 8; -const int GL_LIGHT1 = 9; - -const int CLEAR_DEPTH_FLAG = 1; -const int CLEAR_COLOUR_FLAG = 2; - -const int GL_DEPTH_BUFFER_BIT = CLEAR_DEPTH_FLAG; -const int GL_COLOR_BUFFER_BIT = CLEAR_COLOUR_FLAG; - -const int GL_SRC_ALPHA = D3D11_BLEND_SRC_ALPHA; -const int GL_ONE_MINUS_SRC_ALPHA = D3D11_BLEND_INV_SRC_ALPHA; -const int GL_ONE = D3D11_BLEND_ONE; -const int GL_ZERO = D3D11_BLEND_ZERO; -const int GL_DST_ALPHA = D3D11_BLEND_DEST_ALPHA; -const int GL_SRC_COLOR = D3D11_BLEND_SRC_COLOR; -const int GL_DST_COLOR = D3D11_BLEND_DEST_COLOR; -const int GL_ONE_MINUS_DST_COLOR = D3D11_BLEND_INV_DEST_COLOR; -const int GL_ONE_MINUS_SRC_COLOR = D3D11_BLEND_INV_SRC_COLOR; -const int GL_CONSTANT_ALPHA = D3D11_BLEND_BLEND_FACTOR; -const int GL_ONE_MINUS_CONSTANT_ALPHA = D3D11_BLEND_INV_BLEND_FACTOR; - -const int GL_GREATER = D3D11_COMPARISON_GREATER; -const int GL_EQUAL = D3D11_COMPARISON_EQUAL; -const int GL_LEQUAL = D3D11_COMPARISON_LESS_EQUAL; -const int GL_GEQUAL = D3D11_COMPARISON_GREATER_EQUAL; -const int GL_ALWAYS = D3D11_COMPARISON_ALWAYS; - -const int GL_TEXTURE_MIN_FILTER = 1; -const int GL_TEXTURE_MAG_FILTER = 2; -const int GL_TEXTURE_WRAP_S = 3; -const int GL_TEXTURE_WRAP_T = 4; - -const int GL_NEAREST = 0; -const int GL_LINEAR = 1; -const int GL_EXP = 2; -const int GL_NEAREST_MIPMAP_LINEAR = 0; // TODO - mipmapping bit of this - -const int GL_CLAMP = 0; -const int GL_REPEAT = 1; - -const int GL_FOG_START = 1; -const int GL_FOG_END = 2; -const int GL_FOG_MODE = 3; -const int GL_FOG_DENSITY = 4; -const int GL_FOG_COLOR = 5; - -const int GL_POSITION = 1; -const int GL_AMBIENT = 2; -const int GL_DIFFUSE = 3; -const int GL_SPECULAR = 4; - -const int GL_LIGHT_MODEL_AMBIENT = 1; - -const int GL_LINES = C4JRender::PRIMITIVE_TYPE_LINE_LIST; -const int GL_LINE_STRIP = C4JRender::PRIMITIVE_TYPE_LINE_STRIP; -const int GL_QUADS = C4JRender::PRIMITIVE_TYPE_QUAD_LIST; -const int GL_TRIANGLE_FAN = C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN; -const int GL_TRIANGLE_STRIP = C4JRender::PRIMITIVE_TYPE_TRIANGLE_STRIP; - -// Singleton -extern C4JRender RenderManager; - - diff --git a/Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h b/Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h deleted file mode 100644 index 4e25397a..00000000 --- a/Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h +++ /dev/null @@ -1,344 +0,0 @@ -#pragma once -#include -//#include -class C4JStringTable; - -#define MAX_DISPLAYNAME_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3 -#define MAX_DETAILS_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3 -#define MAX_SAVEFILENAME_LENGTH 32 // CELL_SAVEDATA_DIRNAME_SIZE - -typedef struct -{ - time_t modifiedTime; - unsigned int dataSize; - unsigned int thumbnailSize; -} -CONTAINER_METADATA; - -typedef struct -{ - char UTF8SaveFilename[MAX_SAVEFILENAME_LENGTH]; - char UTF8SaveTitle[MAX_DISPLAYNAME_LENGTH]; - CONTAINER_METADATA metaData; - PBYTE thumbnailData; -} -SAVE_INFO,*PSAVE_INFO; - -typedef struct -{ - int iSaveC; - PSAVE_INFO SaveInfoA; -} -SAVE_DETAILS,*PSAVE_DETAILS; - -typedef std::vector OfferDataArray; -typedef std::vector XContentDataArray; -//typedef std::vector SaveDetailsArray; - -// Current version of the dlc data creator -#define CURRENT_DLC_VERSION_NUM 3 - -class C4JStorage -{ - -public: - // Structs defined in the DLC_Creator, but added here to be used in the app - typedef struct - { - unsigned int uiFileSize; - DWORD dwType; - DWORD dwWchCount; // count of WCHAR in next array - WCHAR wchFile[1]; - } - DLC_FILE_DETAILS, *PDLC_FILE_DETAILS; - - typedef struct - { - DWORD dwType; - DWORD dwWchCount; // count of WCHAR in next array; - WCHAR wchData[1]; // will be an array of size dwBytes - } - DLC_FILE_PARAM, *PDLC_FILE_PARAM; - // End of DLC_Creator structs - - typedef struct - { - WCHAR wchDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; - CHAR szFileName[XCONTENT_MAX_FILENAME_LENGTH]; - DWORD dwImageOffset; - DWORD dwImageBytes; - } - CACHEINFOSTRUCT; - - // structure to hold DLC info in TMS - typedef struct - { - DWORD dwVersion; - DWORD dwNewOffers; - DWORD dwTotalOffers; - DWORD dwInstalledTotalOffers; - BYTE bPadding[1024-sizeof(DWORD)*4]; // future expansion - } - DLC_TMS_DETAILS; - - enum eGTS_FileTypes - { - eGTS_Type_Skin=0, - eGTS_Type_Cape, - eGTS_Type_MAX - }; - - enum eGlobalStorage - { - //eGlobalStorage_GameClip=0, - eGlobalStorage_Title=0, - eGlobalStorage_TitleUser, - eGlobalStorage_Max - }; - - enum EMessageResult - { - EMessage_Undefined=0, - EMessage_Busy, - EMessage_Pending, - EMessage_Cancelled, - EMessage_ResultAccept, - EMessage_ResultDecline, - EMessage_ResultThirdOption, - EMessage_ResultFourthOption - }; - - enum ESaveGameControlState - { - ESaveGameControl_Idle=0, - ESaveGameControl_Save, - ESaveGameControl_InternalRequestingDevice, - ESaveGameControl_InternalGetSaveName, - ESaveGameControl_InternalSaving, - ESaveGameControl_CopySave, - ESaveGameControl_CopyingSave, - }; - - enum ESaveGameState - { - ESaveGame_Idle=0, - ESaveGame_Save, - ESaveGame_InternalRequestingDevice, - ESaveGame_InternalGetSaveName, - ESaveGame_InternalSaving, - ESaveGame_CopySave, - ESaveGame_CopyingSave, - ESaveGame_Load, - ESaveGame_GetSavesInfo, - ESaveGame_Rename, - ESaveGame_Delete, - - ESaveGame_GetSaveThumbnail // Not used as an actual state in the PS4, but the game expects this to be returned to indicate success when getting a thumbnail - - }; - enum ELoadGameStatus - { - ELoadGame_Idle=0, - ELoadGame_InProgress, - ELoadGame_NoSaves, - ELoadGame_ChangedDevice, - ELoadGame_DeviceRemoved - }; - - enum EDeleteGameStatus - { - EDeleteGame_Idle=0, - EDeleteGame_InProgress, - }; - - - enum ESGIStatus - { - ESGIStatus_Error=0, - ESGIStatus_Idle, - ESGIStatus_ReadInProgress, - ESGIStatus_NoSaves, - }; - - enum EDLCStatus - { - EDLC_Error=0, - EDLC_Idle, - EDLC_NoOffers, - EDLC_AlreadyEnumeratedAllOffers, - EDLC_NoInstalledDLC, - EDLC_Pending, - EDLC_LoadInProgress, - EDLC_Loaded, - EDLC_ChangedDevice - }; - - enum ESavingMessage - { - ESavingMessage_None=0, - ESavingMessage_Short, - ESavingMessage_Long - }; - - enum ETMSStatus - { - ETMSStatus_Idle=0, - ETMSStatus_Fail, - ETMSStatus_Fail_ReadInProgress, - ETMSStatus_Fail_WriteInProgress, - ETMSStatus_Pending, - }; - - enum eTMS_FileType - { - eTMS_FileType_Normal=0, - eTMS_FileType_Graphic, - }; - - enum eTMS_FILETYPEVAL - { - TMS_FILETYPE_BINARY, - TMS_FILETYPE_CONFIG, - TMS_FILETYPE_JSON, - TMS_FILETYPE_MAX - }; - enum eTMS_UGCTYPE - { - TMS_UGCTYPE_NONE, - TMS_UGCTYPE_IMAGE, - TMS_UGCTYPE_MAX - }; - - - typedef struct - { - CHAR szFilename[256]; - int iFileSize; - eTMS_FILETYPEVAL eFileTypeVal; - } - TMSPP_FILE_DETAILS, *PTMSPP_FILE_DETAILS; - - typedef struct - { - int iCount; - PTMSPP_FILE_DETAILS FileDetailsA; - } - TMSPP_FILE_LIST, *PTMSPP_FILE_LIST; - - typedef struct - { - DWORD dwSize; - PBYTE pbData; - } - TMSPP_FILEDATA, *PTMSPP_FILEDATA; - - - C4JStorage(); - - void Tick(void); - - // Messages - C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, - int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, C4JStringTable *pStringTable=NULL, WCHAR *pwchFormatString=NULL,DWORD dwFocusButton=0); - - - C4JStorage::EMessageResult GetMessageBoxResult(); - - // save device - bool SetSaveDevice(int( *Func)(LPVOID,const bool),LPVOID lpParam, bool bForceResetOfSaveDevice=false); - - // savegame - void Init(unsigned int uiSaveVersion,LPCWSTR pwchDefaultSaveName,char *pszSavePackName,int iMinimumSaveSize,int( *Func)(LPVOID, const ESavingMessage, int),LPVOID lpParam,LPCSTR szGroupID); - void ResetSaveData(); // Call before a new save to clear out stored save file name - void SetDefaultSaveNameForKeyboardDisplay(LPCWSTR pwchDefaultSaveName); - void SetSaveTitle(LPCWSTR pwchDefaultSaveName); - bool GetSaveUniqueNumber(INT *piVal); - bool GetSaveUniqueFilename(char *pszName); - void SetSaveUniqueFilename(char *szFilename); - void SetState(ESaveGameControlState eControlState,int( *Func)(LPVOID,const bool),LPVOID lpParam); - void SetSaveDisabled(bool bDisable); - bool GetSaveDisabled(void); - unsigned int GetSaveSize(); - void GetSaveData(void *pvData,unsigned int *puiBytes); - PVOID AllocateSaveData(unsigned int uiBytes); - void SetSaveImages( PBYTE pbThumbnail,DWORD dwThumbnailBytes,PBYTE pbImage,DWORD dwImageBytes, PBYTE pbTextData ,DWORD dwTextDataBytes); // Sets the thumbnail & image for the save, optionally setting the metadata in the png - C4JStorage::ESaveGameState SaveSaveData(int( *Func)(LPVOID ,const bool),LPVOID lpParam); - void CopySaveDataToNewSave(PBYTE pbThumbnail,DWORD cbThumbnail,WCHAR *wchNewName,int ( *Func)(LPVOID lpParam, bool), LPVOID lpParam); - void SetSaveDeviceSelected(unsigned int uiPad,bool bSelected); - bool GetSaveDeviceSelected(unsigned int iPad); - C4JStorage::ESaveGameState DoesSaveExist(bool *pbExists); - bool EnoughSpaceForAMinSaveGame(); - - void SetSaveMessageVPosition(float fY); // The 'Saving' message will display at a default position unless changed - // Get the info for the saves - C4JStorage::ESaveGameState GetSavesInfo(int iPad,int ( *Func)(LPVOID lpParam,SAVE_DETAILS *pSaveDetails,const bool),LPVOID lpParam,char *pszSavePackName); - PSAVE_DETAILS ReturnSavesInfo(); - void ClearSavesInfo(); // Clears results - C4JStorage::ESaveGameState LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam); // Get the thumbnail for an individual save referenced by pSaveInfo - - void GetSaveCacheFileInfo(DWORD dwFile,XCONTENT_DATA &xContentData); - void GetSaveCacheFileInfo(DWORD dwFile, PBYTE *ppbImageData, DWORD *pdwImageBytes); - - // Load the save. Need to call GetSaveData once the callback is called - C4JStorage::ESaveGameState LoadSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool, const bool), LPVOID lpParam); - C4JStorage::ESaveGameState DeleteSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool), LPVOID lpParam); - - // DLC - void RegisterMarketplaceCountsCallback(int ( *Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS *, int), LPVOID lpParam ); - void SetDLCPackageRoot(char *pszDLCRoot); - C4JStorage::EDLCStatus GetDLCOffers(int iPad,int( *Func)(LPVOID, int, DWORD, int),LPVOID lpParam, DWORD dwOfferTypesBitmask=XMARKETPLACE_OFFERING_TYPE_CONTENT); - DWORD CancelGetDLCOffers(); - void ClearDLCOffers(); - XMARKETPLACE_CONTENTOFFER_INFO& GetOffer(DWORD dw); - int GetOfferCount(); - DWORD InstallOffer(int iOfferIDC, __uint64 *ullOfferIDA,int( *Func)(LPVOID, int, int),LPVOID lpParam, bool bTrial=false); - DWORD GetAvailableDLCCount( int iPad); - - C4JStorage::EDLCStatus GetInstalledDLC(int iPad,int( *Func)(LPVOID, int, int),LPVOID lpParam); - XCONTENT_DATA& GetDLC(DWORD dw); - DWORD MountInstalledDLC(int iPad,DWORD dwDLC,int( *Func)(LPVOID, int, DWORD,DWORD),LPVOID lpParam,LPCSTR szMountDrive=NULL); - DWORD UnmountInstalledDLC(LPCSTR szMountDrive = NULL); - void GetMountedDLCFileList(const char* szMountDrive, std::vector& fileList); - std::string GetMountedPath(std::string szMount); - - // Global title storage - C4JStorage::ETMSStatus ReadTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,C4JStorage::eTMS_FileType eFileType, - WCHAR *pwchFilename,BYTE **ppBuffer,DWORD *pdwBufferSize,int( *Func)(LPVOID, WCHAR *,int, bool, int)=NULL,LPVOID lpParam=NULL, int iAction=0); - bool WriteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,WCHAR *pwchFilename,BYTE *pBuffer,DWORD dwBufferSize); - bool DeleteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,WCHAR *pwchFilename); - void StoreTMSPathName(WCHAR *pwchName=NULL); - - // TMS++ -#ifdef _XBOX - C4JStorage::ETMSStatus WriteTMSFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FileType eFileType,CHAR *pchFilePath,CHAR *pchBuffer,DWORD dwBufferSize,TMSCLIENT_CALLBACK Func,LPVOID lpParam); - HRESULT GetUserQuotaInfo(int iPad,TMSCLIENT_CALLBACK Func,LPVOID lpParam); -#endif - - // C4JStorage::ETMSStatus TMSPP_WriteFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,C4JStorage::eTMS_UGCTYPE eUGCType,CHAR *pchFilePath,CHAR *pchBuffer,DWORD dwBufferSize,int( *Func)(LPVOID,int,int)=NULL,LPVOID lpParam=NULL, int iUserData=0); - // C4JStorage::ETMSStatus TMSPP_GetUserQuotaInfo(int iPad,TMSCLIENT_CALLBACK Func,LPVOID lpParam, int iUserData=0); - C4JStorage::ETMSStatus TMSPP_ReadFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,LPCSTR szFilename,int( *Func)(LPVOID,int,int,PTMSPP_FILEDATA, LPCSTR)=NULL,LPVOID lpParam=NULL, int iUserData=0); - // C4JStorage::ETMSStatus TMSPP_ReadFileList(int iPad,C4JStorage::eGlobalStorage eStorageFacility,CHAR *pchFilePath,int( *Func)(LPVOID,int,int,PTMSPP_FILE_LIST)=NULL,LPVOID lpParam=NULL, int iUserData=0); - // C4JStorage::ETMSStatus TMSPP_DeleteFile(int iPad,LPCSTR szFilePath,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,int( *Func)(LPVOID,int,int),LPVOID lpParam=NULL, int iUserData=0); - // bool TMSPP_InFileList(eGlobalStorage eStorageFacility, int iPad,const wstring &Filename); - // unsigned int CRC(unsigned char *buf, int len); - -// enum eXBLWS -// { -// eXBLWS_GET, -// eXBLWS_POST, -// eXBLWS_PUT, -// eXBLWS_DELETE, -// }; - //bool XBLWS_Command(eXBLWS eCommand); - - - unsigned int CRC(unsigned char *buf, int len); - -// #ifdef _DEBUG -// void SetSaveName(int i); -// #endif - // string table for all the Storage problems. Loaded by the application - C4JStringTable *m_pStringTable; -}; - -extern C4JStorage StorageManager; diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib deleted file mode 100644 index 5fecd971..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib deleted file mode 100644 index 6b3303b4..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_r.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_r.lib deleted file mode 100644 index cae46c31..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_r.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib deleted file mode 100644 index b3286efb..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib deleted file mode 100644 index 962f69e9..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_r.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_r.lib deleted file mode 100644 index 4b9b716a..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_r.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render.lib deleted file mode 100644 index ddfe91fe..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib deleted file mode 100644 index e46e7f93..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib deleted file mode 100644 index aa2118d3..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_d.lib deleted file mode 100644 index 27a799f8..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_d.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib deleted file mode 100644 index e1d70b87..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib deleted file mode 100644 index 17f457ea..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_r.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_r.lib deleted file mode 100644 index 1d7e6b72..00000000 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_r.lib and /dev/null differ diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp index 50f66826..24f729e2 100644 --- a/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/Minecraft.Client/Windows64/Windows64_App.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Windows64_Minecraft.h" #include "..\Common\Consoles_App.h" #include "..\User.h" #include "..\..\Minecraft.Client\Minecraft.h" @@ -26,16 +27,36 @@ void CConsoleMinecraftApp::StoreLaunchData() } void CConsoleMinecraftApp::ExitGame() { + if (g_pd3dDevice != NULL) + { + g_pd3dDevice->Release(); + g_pd3dDevice = NULL; + } + + CleanupDevice(); + + ExitProcess(0); } void CConsoleMinecraftApp::FatalLoadError() { } -void CConsoleMinecraftApp::CaptureSaveThumbnail() -{ -} -void CConsoleMinecraftApp::GetSaveThumbnail(PBYTE *pbData,DWORD *pdwSize) -{ +void CConsoleMinecraftApp::CaptureSaveThumbnail() +{ + RenderManager.CaptureThumbnail(&m_ThumbnailBuffer); +} +void CConsoleMinecraftApp::GetSaveThumbnail(PBYTE *pbData,DWORD *pdwSize) +{ + if (m_ThumbnailBuffer.Allocated()) + { + if (pbData) + { + *pbData = new BYTE[m_ThumbnailBuffer.GetBufferSize()]; + *pdwSize = m_ThumbnailBuffer.GetBufferSize(); + memcpy(*pbData, m_ThumbnailBuffer.GetBufferPointer(), *pdwSize); + } + m_ThumbnailBuffer.Release(); + } } void CConsoleMinecraftApp::ReleaseSaveThumbnail() { @@ -45,74 +66,6 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) { } -void CConsoleMinecraftApp::TemporaryCreateGameStart() -{ - ////////////////////////////////////////////////////////////////////////////////////////////// From CScene_Main::OnInit - - app.setLevelGenerationOptions(NULL); - - // From CScene_Main::RunPlayGame - Minecraft *pMinecraft=Minecraft::GetInstance(); - app.ReleaseSaveThumbnail(); - ProfileManager.SetLockedProfile(0); - pMinecraft->user->name = L"Windows"; - app.ApplyGameSettingsChanged(0); - - ////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameJoinLoad::OnInit - MinecraftServer::resetFlags(); - - // From CScene_MultiGameJoinLoad::OnNotifyPressEx - app.SetTutorialMode( false ); - app.SetCorruptSaveDeleted(false); - - ////////////////////////////////////////////////////////////////////////////////////////////// From CScene_MultiGameCreate::CreateGame - - app.ClearTerrainFeaturePosition(); - wstring wWorldName = L"TestWorld"; - - StorageManager.ResetSaveData(); - StorageManager.SetSaveTitle(wWorldName.c_str()); - - bool isFlat = false; - __int64 seedValue = 0; // BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal); // 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements - - NetworkGameInitData *param = new NetworkGameInitData(); - param->seed = seedValue; - param->saveData = NULL; - - app.SetGameHostOption(eGameHostOption_Difficulty,0); - app.SetGameHostOption(eGameHostOption_FriendsOfFriends,0); - app.SetGameHostOption(eGameHostOption_Gamertags,1); - app.SetGameHostOption(eGameHostOption_BedrockFog,1); - - app.SetGameHostOption(eGameHostOption_GameType,GameType::CREATIVE->getId() ); // LevelSettings::GAMETYPE_SURVIVAL - app.SetGameHostOption(eGameHostOption_LevelType, 0 ); - app.SetGameHostOption(eGameHostOption_Structures, 1 ); - app.SetGameHostOption(eGameHostOption_BonusChest, 0 ); - - app.SetGameHostOption(eGameHostOption_PvP, 1); - app.SetGameHostOption(eGameHostOption_TrustPlayers, 1 ); - app.SetGameHostOption(eGameHostOption_FireSpreads, 1 ); - app.SetGameHostOption(eGameHostOption_TNT, 1 ); - app.SetGameHostOption(eGameHostOption_HostCanFly, 1); - app.SetGameHostOption(eGameHostOption_HostCanChangeHunger, 1); - app.SetGameHostOption(eGameHostOption_HostCanBeInvisible, 1 ); - - param->settings = app.GetGameHostOption( eGameHostOption_All ); - - g_NetworkManager.FakeLocalPlayerJoined(); - - LoadingInputParams *loadingParams = new LoadingInputParams(); - loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc; - loadingParams->lpParam = (LPVOID)param; - - // Reset the autosave time - app.SetAutosaveTimerTime(); - - C4JThread* thread = new C4JThread(loadingParams->func, loadingParams->lpParam, "RunNetworkGame"); - thread->Run(); -} - int CConsoleMinecraftApp::GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT) { return -1; @@ -131,3 +84,12 @@ int CConsoleMinecraftApp::LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType void CConsoleMinecraftApp::FreeLocalTMSFiles(eTMSFileType eType) { } + +std::wstring CConsoleMinecraftApp::UTF8ToWide(const char* utf8) +{ + int size = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, nullptr, 0); + std::wstring wstr(size, 0); + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, &wstr[0], size); + wstr.resize(size - 1); + return wstr; +} diff --git a/Minecraft.Client/Windows64/Windows64_App.h b/Minecraft.Client/Windows64/Windows64_App.h index 7e20138a..6302e7f2 100644 --- a/Minecraft.Client/Windows64/Windows64_App.h +++ b/Minecraft.Client/Windows64/Windows64_App.h @@ -3,6 +3,8 @@ class CConsoleMinecraftApp : public CMinecraftApp { public: + ImageFileBuffer m_ThumbnailBuffer; + CConsoleMinecraftApp(); virtual void SetRichPresenceContext(int iPad, int contextId); @@ -25,10 +27,10 @@ public: // BANNED LEVEL LIST virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {} - C4JStringTable *GetStringTable() { return NULL;} + C4JStringTable *GetStringTable() { return NULL;} - // original code - virtual void TemporaryCreateGameStart(); + // str1k3r - UTF8 to wchar + std::wstring UTF8ToWide(const char* utf8); }; extern CConsoleMinecraftApp app; diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 0aae8055..e952391b 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -37,6 +37,7 @@ #include "..\..\Minecraft.World\compression.h" #include "..\..\Minecraft.World\OldChunkStorage.h" +#include "Windows64_Minecraft.h" #include "Xbox/resource.h" HINSTANCE hMyInst; @@ -75,6 +76,7 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES]= //------------------------------------------------------------------------------------- BOOL g_bWidescreen = TRUE; +BOOL g_bResolutionSetByCMD = FALSE; int g_iScreenWidth = 1920; int g_iScreenHeight = 1080; @@ -312,8 +314,6 @@ ID3D11Texture2D* g_pDepthStencilBuffer = NULL; LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId, wmEvent; - PAINTSTRUCT ps; - HDC hdc; switch (message) { @@ -331,11 +331,35 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return DefWindowProc(hWnd, message, wParam, lParam); } break; - case WM_PAINT: - hdc = BeginPaint(hWnd, &ps); - // TODO: Add any drawing code here... - EndPaint(hWnd, &ps); - break; + case WM_ENTERSIZEMOVE: + SetTimer(hWnd, 1, USER_TIMER_MINIMUM, NULL); + break; + case WM_EXITSIZEMOVE: + KillTimer(hWnd, 1); + break; + case WM_ERASEBKGND: + return 1; + case WM_TIMER: + if (wParam == 1) + { + // Tick UI + ui.tick(); + ui.render(); + RenderManager.Present(); + ui.CheckMenuDisplayed(); + + // Tick Managers + app.UpdateTime(); + InputManager.Tick(); + StorageManager.Tick(); + RenderManager.Tick(); + + // Tick Music + Minecraft *pMinecraft=Minecraft::GetInstance(); + pMinecraft->soundEngine->tick(NULL, 0.0f); + pMinecraft->soundEngine->playMusicTick(); + } + break; case WM_DESTROY: PostQuitMessage(0); break; @@ -405,7 +429,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) return FALSE; } - ShowWindow(g_hWnd, nCmdShow); + ShowWindow(g_hWnd, (nCmdShow != SW_HIDE) ? SW_SHOWMAXIMIZED : nCmdShow); UpdateWindow(g_hWnd); return TRUE; @@ -466,17 +490,32 @@ HRESULT InitDevice() { HRESULT hr = S_OK; - RECT rc; - GetClientRect( g_hWnd, &rc ); - UINT width = rc.right - rc.left; - UINT height = rc.bottom - rc.top; -//app.DebugPrintf("width: %d, height: %d\n", width, height); - width = g_iScreenWidth; - height = g_iScreenHeight; -app.DebugPrintf("width: %d, height: %d\n", width, height); + //str1k3r - use screen size instead of window size & detect if its widescreen or not + if (!g_bResolutionSetByCMD) + { + HMONITOR hMonitor = MonitorFromWindow(g_hWnd, MONITOR_DEFAULTTONEAREST); + MONITORINFO monitorInfo = { sizeof(MONITORINFO) }; + if (GetMonitorInfo(hMonitor, &monitorInfo)) + { + g_iScreenWidth = monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left; + g_iScreenHeight = monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top; + } + else + { + g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN); + g_iScreenHeight = GetSystemMetrics(SM_CYSCREEN); + } + } + + g_bWidescreen = (g_iScreenHeight > 0 && ((double)g_iScreenWidth / g_iScreenHeight) >= 1.59) ? TRUE : FALSE; + + //str1k3r - stop hardcoding size and just use the screens actual size + UINT width = g_iScreenWidth; + UINT height = g_iScreenHeight; UINT createDeviceFlags = 0; #ifdef _DEBUG + app.DebugPrintf("Screen Width: %d, Screen Height: %d, Widescreen: %s\n", width, height, g_bWidescreen ? "TRUE" : "FALSE"); createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; #endif @@ -544,6 +583,7 @@ app.DebugPrintf("width: %d, height: %d\n", width, height); hr = g_pd3dDevice->CreateTexture2D(&descDepth, NULL, &g_pDepthStencilBuffer); D3D11_DEPTH_STENCIL_VIEW_DESC descDSView; + ZeroMemory(&descDSView, sizeof(descDSView)); descDSView.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; descDSView.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; descDSView.Texture2D.MipSlice = 0; @@ -611,23 +651,45 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, { if(lpCmdLine[0] == '1') { - g_iScreenWidth = 1280; - g_iScreenHeight = 720; + // 2160p + g_iScreenWidth = 3840; + g_iScreenHeight = 2160; + g_bResolutionSetByCMD = TRUE; } else if(lpCmdLine[0] == '2') { + // 1440p + g_iScreenWidth = 2560; + g_iScreenHeight = 1440; + g_bResolutionSetByCMD = TRUE; + } + else if (lpCmdLine[0] == '3') + { + // 1080p + g_iScreenWidth = 1920; + g_iScreenHeight = 1080; + g_bResolutionSetByCMD = TRUE; + } + else if(lpCmdLine[0] == '4') + { + // 720p + g_iScreenWidth = 1280; + g_iScreenHeight = 720; + g_bResolutionSetByCMD = TRUE; + } + else if(lpCmdLine[0] == '5') + { + // 480p g_iScreenWidth = 640; g_iScreenHeight = 480; + g_bResolutionSetByCMD = TRUE; } - else if(lpCmdLine[0] == '3') + else if(lpCmdLine[0] == '6') { - // Vita - g_iScreenWidth = 720; - g_iScreenHeight = 408; - - // Vita native - //g_iScreenWidth = 960; - //g_iScreenHeight = 544; + // Vita Native, 544p + g_iScreenWidth = 960; + g_iScreenHeight = 544; + g_bResolutionSetByCMD = TRUE; } } @@ -1159,10 +1221,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, // A memory leak was caused because the icon renderer kept creating new Vec3's because the pool wasn't reset Vec3::resetPool(); } + + //str1k3r - Safely exit the game + app.ExitGame(); - // Free resources, unregister custom classes, and exit. - // app.Uninit(); - g_pd3dDevice->Release(); + return (int)msg.wParam; } #ifdef MEMORY_TRACKING diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.h b/Minecraft.Client/Windows64/Windows64_Minecraft.h new file mode 100644 index 00000000..673d8261 --- /dev/null +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +extern BOOL g_bWidescreen; + +extern int g_iScreenWidth; +extern int g_iScreenHeight; + +extern BOOL g_bResolutionSetByCMD; + +extern ID3D11Device* g_pd3dDevice; + +void CleanupDevice(); \ No newline at end of file diff --git a/Minecraft.World/ConsoleSaveFileOriginal.cpp b/Minecraft.World/ConsoleSaveFileOriginal.cpp index d3e734e1..3560b260 100644 --- a/Minecraft.World/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/ConsoleSaveFileOriginal.cpp @@ -749,7 +749,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail ) PBYTE pbDataSaveImage=NULL; DWORD dwDataSizeSaveImage=0; -#if ( defined _XBOX || defined _DURANGO ) +#if ( defined _XBOX || defined _DURANGO || defined _WINDOWS64 ) app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); #elif ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ ) app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage); diff --git a/Minecraft.World/ConsoleSaveFileSplit.cpp b/Minecraft.World/ConsoleSaveFileSplit.cpp index 87983a02..ac2b2bf6 100644 --- a/Minecraft.World/ConsoleSaveFileSplit.cpp +++ b/Minecraft.World/ConsoleSaveFileSplit.cpp @@ -1412,7 +1412,7 @@ void ConsoleSaveFileSplit::Flush(bool autosave, bool updateThumbnail) PBYTE pbDataSaveImage=NULL; DWORD dwDataSizeSaveImage=0; -#if ( defined _XBOX || defined _DURANGO ) +#if ( defined _XBOX || defined _DURANGO || defined _WINDOWS64 ) app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); #elif ( defined __PS3__ || defined __ORBIS__ ) app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage); diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj index 7f8dab15..fa4b876e 100644 --- a/Minecraft.World/Minecraft.World.vcxproj +++ b/Minecraft.World/Minecraft.World.vcxproj @@ -818,6 +818,11 @@ true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -869,6 +874,13 @@ true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + + + @@ -1247,6 +1259,11 @@ true true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1270,6 +1287,11 @@ true true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1293,6 +1315,11 @@ true true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + + @@ -1316,6 +1343,11 @@ true true + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/" + + +