qloak/cafeberry
1
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

fix: miles not shutting down, copying extra stuff to output folder, typo, durango output paths & stray pixel on logos

Browse Source
This commit is contained in:
str1k3r
2026-08-29 13:04:39 -04:00
parent 81e4a789b6
commit 902a6ca641
15 changed files with 66 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
+5 -16
View File
@@ -24,7 +24,7 @@ foreach ($dir in $directories) {
}
$folderCopies = @(
@{ Source = "Common\Media"; Dest = "Common\Media" },
@{ Source = "Common\Media\Font"; Dest = "Common\Media\Font" },
@{ Source = "Common\res"; Dest = "Common\res" },
@{ Source = "DurangoMedia\Sound"; Dest = "Sound" },
@{ Source = "DurangoMedia\DLC"; Dest = "DLC" },
@@ -46,6 +46,7 @@ foreach ($copy in $folderCopies) {
}
$fileCopies = @(
@{ Source = "Common\Media\MediaDurango.arc"; Dest = "Common\Media\MediaDurango.arc" },
@{ Source = "Durango\DurangoExtras\xcompress.dll"; Dest = "xcompress.dll" },
@{ Source = "Durango\DLCXbox1.cmp"; Dest = "DLCXbox1.cmp" }
)
@@ -61,18 +62,7 @@ foreach ($copy in $fileCopies) {
}
$deleteDirs = @(
"Common\Media\Graphics",
"Common\Media\font\RU",
"Common\Media\Sound",
"Common\Media\de-DE",
"Common\Media\es-ES",
"Common\Media\fr-FR",
"Common\Media\it-IT",
"Common\Media\ja-JP",
"Common\Media\ko-KR",
"Common\Media\pt-BR",
"Common\Media\pt-PT",
"Common\Media\zh-CHT"
"Common\Media\font\RU"
)
foreach ($dir in $deleteDirs) {
@@ -83,15 +73,14 @@ foreach ($dir in $deleteDirs) {
}
$delDirs = @(
"Common\Media",
"Common\Media\font",
"Common\Media\font",
"Common\Media\font\*"
)
foreach ($dir in $delDirs) {
$path = Join-Path $OutDir $dir
if (Test-Path $path) {
Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
+5 -16
View File
@@ -23,7 +23,7 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "music"; Dest = "PS4_GAME\music" },
@{ Source = "Common\Media"; Dest = "PS4_GAME\Common\Media" },
@{ Source = "Common\Media\Font";Dest = "PS4_GAME\Common\Media\Font" },
@{ Source = "Common\res"; Dest = "PS4_GAME\Common\res" },
@{ Source = "OrbisMedia\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
@{ Source = "OrbisMedia\DLC"; Dest = "PS4_GAME\Orbis\DLC" },
@@ -50,6 +50,7 @@ foreach ($copy in $folderCopies) {
}
$fileCopies = @(
@{ Source = "Common\Media\MediaOrbis.arc"; Dest = "PS4_GAME\Common\Media\MediaOrbis.arc" },
@{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" },
@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }
)
@@ -75,18 +76,7 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PS4_GAME\Common\Media\Graphics",
"PS4_GAME\Common\Media\font\RU",
"PS4_GAME\Common\Media\Sound",
"PS4_GAME\Common\Media\de-DE",
"PS4_GAME\Common\Media\es-ES",
"PS4_GAME\Common\Media\fr-FR",
"PS4_GAME\Common\Media\it-IT",
"PS4_GAME\Common\Media\ja-JP",
"PS4_GAME\Common\Media\ko-KR",
"PS4_GAME\Common\Media\pt-BR",
"PS4_GAME\Common\Media\pt-PT",
"PS4_GAME\Common\Media\zh-CHT"
"PS4_GAME\Common\Media\font\RU"
)
foreach ($dir in $deleteDirs) {
@@ -97,15 +87,14 @@ foreach ($dir in $deleteDirs) {
}
$delDirs = @(
"PS4_GAME\Common\Media",
"PS4_GAME\Common\Media\font",
"PS4_GAME\Common\Media\font",
"PS4_GAME\Common\Media\font\*"
)
foreach ($dir in $delDirs) {
$path = Join-Path $OutDir $dir
if (Test-Path $path) {
Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File |
Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
+5 -16
View File
@@ -21,11 +21,11 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "music"; Dest = "PS3_GAME\USRDIR\music" },
@{ Source = "Common\Media"; Dest = "PS3_GAME\USRDIR\Common\Media" },
@{ Source = "Common\Media\Font";Dest = "PS3_GAME\USRDIR\Common\Media\Font" },
@{ Source = "Common\res"; Dest = "PS3_GAME\USRDIR\Common\res" },
@{ Source = "PS3Media\DLC"; Dest = "PS3_GAME\USRDIR\DLC" },
@{ Source = "PS3Media\Sound"; Dest = "PS3_GAME\USRDIR\PS3\Sound" },
#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
@{ 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" }
)
@@ -47,6 +47,7 @@ foreach ($copy in $folderCopies) {
$fileCopies = @(
@{ Source = "PS3\PS3ProductCodes.bin"; Dest = "PS3_GAME\USRDIR\PS3\PS3ProductCodes.bin" },
@{ Source = "Common\Media\MediaPS3.arc"; Dest = "PS3_GAME\USRDIR\Common\Media\MediaPS3.arc" },
@{ 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" },
@@ -84,18 +85,7 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PS3_GAME\USRDIR\Common\Media\Graphics",
"PS3_GAME\USRDIR\Common\Media\font\RU",
"PS3_GAME\USRDIR\Common\Media\Sound",
"PS3_GAME\USRDIR\Common\Media\de-DE",
"PS3_GAME\USRDIR\Common\Media\es-ES",
"PS3_GAME\USRDIR\Common\Media\fr-FR",
"PS3_GAME\USRDIR\Common\Media\it-IT",
"PS3_GAME\USRDIR\Common\Media\ja-JP",
"PS3_GAME\USRDIR\Common\Media\ko-KR",
"PS3_GAME\USRDIR\Common\Media\pt-BR",
"PS3_GAME\USRDIR\Common\Media\pt-PT",
"PS3_GAME\USRDIR\Common\Media\zh-CHT"
"PS3_GAME\USRDIR\Common\Media\font\RU"
)
foreach ($dir in $deleteDirs) {
@@ -106,7 +96,6 @@ foreach ($dir in $deleteDirs) {
}
$delDirs = @(
"PS3_GAME\USRDIR\Common\Media",
"PS3_GAME\USRDIR\Common\Media\font",
"PS3_GAME\USRDIR\Common\Media\font\*"
)
@@ -114,7 +103,7 @@ $delDirs = @(
foreach ($dir in $delDirs) {
$path = Join-Path $OutDir $dir
if (Test-Path $path) {
Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File |
Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
+6 -17
View File
@@ -9,8 +9,8 @@ $directories = @(
"PSVITA_GAME\music",
"PSVITA_GAME\PSVita",
"PSVITA_GAME\Common",
"PSVITA_GAME\Common\res",
"PSVITA_GAME\Common\Media",
"PSVITA_GAME\Common\res",
"PSVITA_GAME\PSVita\Sound",
"PSVITA_GAME\PSVita\Tutorial"
)
@@ -21,7 +21,7 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "music"; Dest = "PSVITA_GAME\music" },
@{ Source = "Common\Media"; Dest = "PSVITA_GAME\Common\Media" },
@{ Source = "Common\Media\Font"; Dest = "PSVITA_GAME\Common\Media\Font" },
@{ Source = "Common\res"; Dest = "PSVITA_GAME\Common\res" },
@{ Source = "PSVitaMedia\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
@{ Source = "PSVitaMedia\DLC"; Dest = "PSVITA_GAME\PSVita\DLC" },
@@ -46,6 +46,7 @@ foreach ($copy in $folderCopies) {
}
$fileCopies = @(
@{ Source = "Common\Media\MediaPSVita.arc"; Dest = "PSVITA_GAME\Common\Media\MediaPSVita.arc" },
@{ Source = "PSVita\PSVitaProductCodes.bin"; Dest = "PSVITA_GAME\PSVita\PSVitaProductCodes.bin" },
@{ Source = "PSVita\session_image.png"; Dest = "PSVITA_GAME\PSVita\session_image.png" }
)
@@ -72,18 +73,7 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PSVITA_GAME\Common\Media\Graphics",
"PSVITA_GAME\Common\Media\font\RU",
"PSVITA_GAME\Common\Media\Sound",
"PSVITA_GAME\Common\Media\de-DE",
"PSVITA_GAME\Common\Media\es-ES",
"PSVITA_GAME\Common\Media\fr-FR",
"PSVITA_GAME\Common\Media\it-IT",
"PSVITA_GAME\Common\Media\ja-JP",
"PSVITA_GAME\Common\Media\ko-KR",
"PSVITA_GAME\Common\Media\pt-BR",
"PSVITA_GAME\Common\Media\pt-PT",
"PSVITA_GAME\Common\Media\zh-CHT"
"PSVITA_GAME\Common\Media\font\RU"
)
foreach ($dir in $deleteDirs) {
@@ -94,15 +84,14 @@ foreach ($dir in $deleteDirs) {
}
$delDirs = @(
"PSVITA_GAME\Common\Media",
"PSVITA_GAME\Common\Media\font",
"PSVITA_GAME\Common\Media\font",
"PSVITA_GAME\Common\Media\font\*"
)
foreach ($dir in $delDirs) {
$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", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaOrbis.arc -File |
Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
+7 -19
View File
@@ -7,11 +7,10 @@ Write-Host "Windows64 Postbuild: script started. Output Directory: $OutDir, Proj
$directories = @(
"music",
"Windows64\GameHDD",
"Common\Media",
"Common\res",
"Windows64Media",
"redist64"
"Windows64\GameHDD",
"Windows64\redist64"
)
foreach ($dir in $directories) {
@@ -21,7 +20,7 @@ foreach ($dir in $directories) {
$folderCopies = @(
@{ Source = "music"; Dest = "music" },
@{ Source = "Common\res"; Dest = "Common\res" },
@{ Source = "Common\Media"; Dest = "Common\Media" },
@{ Source = "Common\Media\Font"; Dest = "Common\Media\Font" },
@{ Source = "Windows64Media\DLC"; Dest = "Windows64Media\DLC" },
@{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
#@{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
@@ -45,6 +44,7 @@ foreach ($copy in $folderCopies) {
$fileCopies = @(
@{ Source = Join-Path $ProjectDir "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" },
@{ Source = "Common\Media\MediaWindows64.arc"; Dest = "Common\Media\MediaWindows64.arc" },
@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" },
@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
)
@@ -60,18 +60,7 @@ foreach ($copy in $fileCopies) {
}
$deleteDirs = @(
"Common\Media\Graphics",
"Common\Media\font\RU", #str1k3r - russian font?
"Common\Media\Sound",
"Common\Media\de-DE",
"Common\Media\es-ES",
"Common\Media\fr-FR",
"Common\Media\it-IT",
"Common\Media\ja-JP",
"Common\Media\ko-KR",
"Common\Media\pt-BR",
"Common\Media\pt-PT",
"Common\Media\zh-CHT"
"Common\Media\font\RU" #str1k3r - russian font?
)
foreach ($dir in $deleteDirs) {
@@ -82,15 +71,14 @@ foreach ($dir in $deleteDirs) {
}
$delDirs = @(
"Common\Media",
"Common\Media\font",
"Common\Media\font",
"Common\Media\font\*"
)
foreach ($dir in $delDirs) {
$path = Join-Path $OutDir $dir
if (Test-Path $path) {
Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}