56 Commits
Author SHA1 Message Date
str1k3r 8abedd5d3e fix: windows64 copy paths 2026-08-02 07:17:38 -04:00
str1k3r 68dcc22b80 chore: update sounds 2026-08-02 06:59:27 -04:00
str1k3r 74af9a9bfa chore: add keystone 2026-08-02 06:13:09 -04:00
str1k3r b5ad26ddba feat(Orbis): make fpkgs not real pkgs
https://github.com/CyB1K/PS4-Fake-PKG-Tools-3.87
2026-08-02 06:01:53 -04:00
str1k3r e053df94bd chore: delete old orbis GP4 2026-08-01 23:13:02 -04:00
str1k3r d13b84cada feat(Orbis): PKG Generation 2026-08-01 23:12:05 -04:00
str1k3r 04b2a090d0 chore: finish orbis dlcs & cleanup postbuilds 2026-08-01 21:33:01 -04:00
str1k3r 366f17669e feat(PSVita): fully working builds (#19)
Reviewed-on: pieeebot/cafeberry#19
2026-08-01 22:10:47 +00:00
str1k3r 8886bf3e29 chore: update .gitignore 2026-08-01 22:10:16 +00:00
552eden fe05ee3faf undo debug menu for release 2026-08-02 01:07:16 +03:00
552eden edf9a4f22b fix debug settings and re added ps3 leaderboard fix 2026-08-02 00:59:44 +03:00
552eden 5e21a0ab23 cleanup 2026-08-02 00:43:48 +03:00
552eden eb631f480c add vpk creation 2026-08-02 00:42:41 +03:00
552eden 49b89075a8 (vita) fix build script and update SCE_SYS 2026-08-02 00:24:57 +03:00
552eden a0643abf49 added correct param.sfo 2026-08-02 00:13:25 +03:00
552eden aafbd31b61 added DLC and temp vita build script 2026-08-02 00:13:24 +03:00
ubergamer-pie 3dc92504c4 merge upstream 2026-08-01 21:08:03 +00:00
str1k3r e04c06a523 delete old orbis sce_module 2026-08-01 11:50:15 -04:00
str1k3r 8b8ca695e0 use orbis sdk sce_module 2026-08-01 11:47:38 -04:00
str1k3r 07d9827865 feat(PSVita): Release builds 2026-08-01 09:48:03 -04:00
str1k3r 79fe155b8f Merge branch 'main' into ps4 2026-08-01 07:10:29 +00:00
str1k3r dbf80d9dd7 fix: sln & m_instance 2026-08-01 03:06:52 -04:00
str1k3r 702f2f8bbe Merge branch 'main' of https://gitea.str1k3r.xyz/pieeebot/cafeberry into ps4 2026-08-01 02:21:20 -04:00
ubergamer-pie 930e39b6d2 merge upstream 2026-07-28 19:07:32 +00:00
str1k3r fae9ab3ba4 revert vcxproj being pushed 2026-07-28 12:28:19 -04:00
str1k3r be434c42d3 fix(Orbis): crash and no sound 2026-07-28 12:25:49 -04:00
str1k3r 415bd9a1a0 fix(Orbis): sound 2026-07-28 10:59:47 -04:00
353eeea217 fix(PS5): PS5 crashing on startup (#17)
Fixed PS5 crashing on startup by migrating to JP sce_sys with english assets. since its the only working nptitle.dat i could find.
Trophies are working as well

---------

Co-authored-by: 552eden <552eden@gmail.com>
Reviewed-on: pieeebot/cafeberry#17
Co-authored-by: ubergamer-pie <16+ubergamer-pie@noreply.localhost>
2026-07-26 23:46:04 +00:00
552eden 4cf5972ebb Fixed crashing on PS5 by migrating to JP CUSA 2026-07-25 23:34:51 +03:00
552eden 9a4ab9cc9d fix double declartion on Orbis 2026-07-25 23:03:52 +03:00
str1k3r 4099ed477d fix(Orbis): stop asserting when voicechat fails 2026-07-22 17:36:58 -04:00
str1k3r f992d40795 Merge branch 'main' into ps4 2026-07-21 21:07:42 +00:00
str1k3r 454fefaf20 Merge branch 'main' into ps4 2026-07-19 16:34:48 +01:00
str1k3r db803a04b5 feat(ps3): use new sonyleaderboardmanager
This also removes SPU objfiles
2026-07-19 10:59:57 -04:00
str1k3r a113e32cb0 feat: move windows64 to its own sentient folder & remove gamehdd saves 2026-07-19 08:03:30 -04:00
str1k3r f19c1b2a30 chore: remove ContentPackage_Vita
This also cleans up the vcxproj so x360 stuff isnt duplicated across platforms
2026-07-19 07:06:14 -04:00
str1k3r 1d9df53595 feat(durango): postbuild estimation 2026-07-19 06:09:34 -04:00
str1k3r 82ce6313c1 feat: ReleaseForArt almost building 2026-07-19 03:23:00 -04:00
str1k3r bb714b3706 feat: build actual final builds & contentpackage almost building
Previously Windows64 Release was just building debug with somethings disabled this builds 1:1 what 4J would of built for consoles using release

This also gets ContentPackage closer to building for Windows64
2026-07-19 00:42:36 -04:00
str1k3r 80f0e4845a fix(PSVita): postbuild copying sounds into wrong spot 2026-07-18 10:39:16 -04:00
str1k3r 5c9171ca3c chore: link postbuilds to all configurations
This also fully removes the Win32 build option
2026-07-18 09:02:39 -04:00
pieeebot 31214d179a chore: remove unnecessary note for PS Vita in README. 2026-07-18 13:29:05 +01:00
str1k3r 9a0c759b65 chore: add ReleaseForArt to .gitignore 2026-07-18 04:59:05 -04:00
str1k3r 8fd70b0fca chore: improve .gitignore 2026-07-18 04:50:21 -04:00
str1k3r 0d66c59e10 Fix(Orbis): build and update readme info for vita
Reviewed-on: https://git.neolegacy.dev/pieeebot/cafeberry/pulls/14
2026-07-18 09:33:17 +01:00
552eden 3092e99d0e fixed ps4 compile issue and updated readme 2026-07-18 11:27:23 +03:00
str1k3r 4c082384c4 refactor: cleaup 2026-07-18 03:27:30 -04:00
str1k3r a8069727c3 feat(psvita): psvita builds
Reviewed-on: https://git.neolegacy.dev/pieeebot/cafeberry/pulls/13
2026-07-18 08:23:10 +01:00
552eden 13b827d21f Merge branch 'ps4' of https://git.neolegacy.dev/pieeebot/cafeberry into ps4
# Conflicts:
#	Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
#	Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
#	Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
#	Minecraft.Client/OrbisMedia/strings.h
#	MinecraftConsoles.sln
2026-07-18 10:01:09 +03:00
552eden 9f181ba8c1 make vita content package target build 2026-07-18 09:45:14 +03:00
str1k3r 6ee614dfda fix(orbis): better fix for orbis voicechat crash
This most likely can be fixed a more proper way but this is what works and is better then the previous method
2026-07-18 01:19:10 -04:00
str1k3r 388626dbba fix(orbis): strings
Both IDS_CORRUPT_OPTIONS_DELETE & IDS_CORRUPT_OPTIONS_RETRY are placeholders as of now
2026-07-18 00:36:37 -04:00
str1k3r 0a38bb51bc fix(orbis): voicechat crash 2026-07-17 13:45:53 -04:00
str1k3r 9171922767 refactor: cleanup 2026-07-17 13:45:22 -04:00
e70ef09900 first buildable orbis version. a bit ugly. (#9)
this is the first buildable ps4 orbis version

---------

Co-authored-by: 552eden <552eden@gmail.com>
Reviewed-on: https://git.neolegacy.dev/pieeebot/cafeberry/pulls/9
Co-authored-by: ubergamer-pie <81+ubergamer-pie@noreply.neolegacy.dev>
Co-committed-by: ubergamer-pie <81+ubergamer-pie@noreply.neolegacy.dev>
2026-07-17 17:55:42 +01:00
552eden 1bd4a3455c first buildable orbis version. a bit ugly. 2026-07-17 19:24:48 +03:00
206 changed files with 1480 additions and 1594 deletions
+9 -22
View File
@@ -7,50 +7,37 @@ on:
description: 'Configuration for the build (e.g. Debug, Release).'
required: true
default: 'Release'
type: choice
options:
- Debug
- Release
- ContentPackage
- ReleaseForArt
jobs:
build:
runs-on: sdk-orbis
runs-on: windows-2022
strategy:
matrix:
platform: [Orbis]
platform: [ORBIS]
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
$platform = if ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" }
& "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
/p:Configuration=${{ inputs.configuration }} `
"/p:Platform=$platform" `
/p:Platform=${{ matrix.platform }} `
/m
- name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/PS4_GAME/* "-x!*.ipdb" "-x!*.iobj"
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
New-Item -ItemType Directory -Force -Path staging
Copy-Item LCE${{ matrix.platform }}.zip staging/
Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
path: staging/*
+6 -16
View File
@@ -7,16 +7,10 @@ on:
description: 'Configuration for the build (e.g. Debug, Release).'
required: true
default: 'Release'
type: choice
options:
- Debug
- Release
- ContentPackage
- ReleaseForArt
jobs:
build:
runs-on: sdk-ps3
runs-on: windows-2022
strategy:
matrix:
@@ -25,10 +19,6 @@ jobs:
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
@@ -37,8 +27,9 @@ jobs:
/p:Platform=${{ matrix.platform }} `
/m
- name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
@@ -46,8 +37,7 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
path: staging/*
+7 -18
View File
@@ -7,16 +7,10 @@ on:
description: 'Configuration for the build (e.g. Debug, Release).'
required: true
default: 'Release'
type: choice
options:
- Debug
- Release
- ContentPackage
- ReleaseForArt
jobs:
build:
runs-on: sdk-psvita
runs-on: windows-2022
strategy:
matrix:
@@ -25,10 +19,6 @@ jobs:
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
@@ -37,18 +27,17 @@ jobs:
/p:Platform=${{ matrix.platform }} `
/m
- name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/PSVITA_GAME/*
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
New-Item -ItemType Directory -Force -Path staging
Copy-Item LCE${{ matrix.platform }}.zip staging/
Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
path: staging/*
+19 -55
View File
@@ -24,84 +24,54 @@ jobs:
}
build:
needs: validate
runs-on: windows-2022
strategy:
matrix:
configuration: [Release]
platform: [Windows64, Xbox360, Orbis, PSVita, PS3]
include:
- platform: Windows64
sdk_label: windows-2022 # str1k3r - can run on any runner
- platform: Xbox360
sdk_label: sdk-xbox360
- platform: Orbis
sdk_label: sdk-orbis
- platform: PSVita
sdk_label: sdk-psvita
- platform: PS3
sdk_label: sdk-ps3
runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
$platform = if ("${{ matrix.platform }}" -eq "Xbox360") { "Xbox 360" } elseif ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" } else { "${{ matrix.platform }}" }
& "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
/p:Configuration=${{ matrix.configuration }} `
"/p:Platform=$platform" `
/p:Platform=${{ matrix.platform }} `
/m
- name: Zip Build
run: |
if ("${{ matrix.platform }}" -eq "Windows64") {
7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
} elseif ("${{ matrix.platform }}" -eq "Orbis") {
7z a -r "LCEOrbis.zip" "./ORBIS_${{ matrix.configuration }}/PS4_GAME/*"
} elseif ("${{ matrix.platform }}" -eq "PSVita") {
7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
} elseif ("${{ matrix.platform }}" -eq "PS3") {
7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
} elseif ("${{ matrix.platform }}" -eq "Xbox360") {
7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
} else {
7z a -r "LCE${{ matrix.platform }}.zip" "./${{ matrix.platform }}/${{ matrix.configuration }}/*" "-x!*.ipdb" "-x!*.iobj" "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
}
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Zip Build (Windows64)
if: matrix.platform == 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
New-Item -ItemType Directory -Force -Path staging
Copy-Item "LCE${{ matrix.platform }}.zip" staging/
Copy-Item LCE${{ matrix.platform }}.zip staging/
if ("${{ matrix.platform }}" -eq "Windows64") {
Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/
} elseif ("${{ matrix.platform }}" -eq "PSVita") {
Copy-Item "./PSVita_${{ matrix.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
} elseif ("${{ matrix.platform }}" -eq "Orbis") {
Copy-Item "./ORBIS_${{ matrix.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
}
- name: Stage exe
if: matrix.platform == 'Windows64'
run: |
Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
release:
needs: build
runs-on: windows-2022
steps:
- name: Download all build artifacts
uses: https://github.com/christopherHX/gitea-download-artifact@v4
uses: https://github.com/actions/download-artifact@v3
with:
path: downloaded
@@ -118,15 +88,9 @@ jobs:
} catch {
$body = $fallback
}
} else {
$body = $fallback
}
$delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
$content = "description<<$delimiter`n$body`n$delimiter`n"
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
[System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)
"description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
- name: Publish Release
uses: akkuman/gitea-release-action@v1
+3 -14
View File
@@ -7,12 +7,6 @@ on:
description: 'Configuration for the build (e.g. Debug, Release).'
required: true
default: 'Release'
type: choice
options:
- Debug
- Release
- ContentPackage
- ReleaseForArt
jobs:
build:
@@ -25,10 +19,6 @@ jobs:
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
@@ -39,7 +29,7 @@ jobs:
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.pdb" "-x!*.pch" "-x!*.ilk"
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
@@ -47,8 +37,7 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
path: staging/*
+8 -21
View File
@@ -7,41 +7,29 @@ on:
description: 'Configuration for the build (e.g. Debug, Release).'
required: true
default: 'Release'
type: choice
options:
- Debug
- Release
- ContentPackage
- ReleaseForArt
jobs:
build:
runs-on: sdk-xbox360
runs-on: windows-2022
strategy:
matrix:
platform: [Xbox360]
platform: [Xbox 360]
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
run: |
$platform = if ("${{ matrix.platform }}" -eq "Xbox360") { "Xbox 360" }
& "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
/p:Configuration=${{ inputs.configuration }} `
"/p:Platform=$platform" `
/p:Platform=${{ matrix.platform }} `
/m
- name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./X360_${{ inputs.configuration }}/* "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
- name: Zip Build (Consoles)
if: matrix.platform != 'Windows64'
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts
run: |
@@ -49,8 +37,7 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
uses: https://github.com/actions/upload-artifact@v3
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
path: staging/*
+28 -21
View File
@@ -1,35 +1,44 @@
.vs
/*Debug
/*Release
/*ContentPackage
/*ContentPackage_NO_TU
/*ContentPackage_SYMBOLS
/*ReleaseForArt
/x64
/ipch
.vscode
/*Debug
/*Release*
/*ContentPackage*
.vs/
# Minecraft.Client
/Minecraft.Client/x64
/Minecraft.Client/x64/
/Minecraft.Client/x64_*
/Minecraft.Client/*Debug
/Minecraft.Client/*Release*
/Minecraft.Client/*ContentPackage*
/Minecraft.Client/*Release
/Minecraft.Client/*ContentPackage
/Minecraft.Client/*ContentPackage_NO_TU
/Minecraft.Client/*ContentPackage_SYMBOLS
/Minecraft.Client/*ReleaseForArt
/Minecraft.Client/Windows64/GameHDD
# Minecraft.world
/Minecraft.World/x64
/Minecraft.World/x64/
/Minecraft.World/x64_*
/Minecraft.World/*Debug
/Minecraft.World/*Release*
/Minecraft.World/*ContentPackage*
/Minecraft.World/*Release
/Minecraft.World/*ContentPackage
/Minecraft.World/*ContentPackage_NO_TU
/Minecraft.World/*ContentPackage_SYMBOLS
/Minecraft.World/*ReleaseForArt
# PS3 SPU Tasks
/Minecraft.Client/PS3/SPU_Tasks/objFiles
/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
/Minecraft.Client/PS3/SPU_Tasks/*/Debug
/Minecraft.Client/PS3/SPU_Tasks/*/Release
/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
# PS3 SPU
/Minecraft.Client/PS3/SPU_Tasks/objFiles/
/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3*
/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3*
/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3*
/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3*
/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3*
/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3*
# Misc
*.ppu.o
*.pkg
/*.gp4p
/*.vpk
@@ -37,6 +46,4 @@
*-app
*.sdf
*.opensdf
*.v11.suo
*.vcxproj.user
*.aps
*.v11.suo
-5
View File
@@ -1,5 +0,0 @@
[submodule "Minecraft.Client/Windows64/4JLibs"]
path = Minecraft.Client/Windows64/4JLibs
url = https://gitea.str1k3r.xyz/pieeebot/Cafeberry-4JLibs
ignore = untracked
branch = main
@@ -1,80 +0,0 @@
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."
}
+8
View File
@@ -4,6 +4,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}"
EndProject
Global
GlobalSection(TeamFoundationVersionControl) = preSolution
SccNumberOfProjects = 2
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
SccProjectUniqueName0 = CommonMedia.vcxproj
SccLocalPath0 = .
SccLocalPath1 = .
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
+3 -3
View File
@@ -10034,11 +10034,11 @@ enum ETitleUpdateTexturePacks
#ifdef _WINDOWS64
wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\";
#elif defined(__ORBIS__)
wstring titleUpdateTexturePackRoot = L"app0/Orbis/DLC/";
wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/";
#elif defined(__PSVITA__)
wstring titleUpdateTexturePackRoot = L"PSVita/DLC/";
wstring titleUpdateTexturePackRoot = L"PSVita/CU/DLC/";
#elif defined(__PS3__)
wstring titleUpdateTexturePackRoot = L"PS3/DLC/";
wstring titleUpdateTexturePackRoot = L"PS3/CU/DLC/";
#else
wstring titleUpdateTexturePackRoot = L"CU\\DLC\\";
#endif
@@ -9,7 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
L"Friends", L"MyScore", L"TopRank"
};
#if defined(__PS3__) && !defined(_CONTENT_PACKAGE) // str1k3r - only PS3 needs this, also this wasnt in the leak?
#ifdef __PS3__ // str1k3r - only PS3 needs this, also this wasnt in the leak?
LeaderboardManager *LeaderboardManager::m_instance = NULL;
#endif

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 196 KiB

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 308 KiB

Before

Width:  |  Height:  |  Size: 252 KiB

After

Width:  |  Height:  |  Size: 252 KiB

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 91 KiB

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 123 KiB

Some files were not shown because too many files have changed in this diff Show More