chore: Bump 4JLibs

fix: 4JLibs building, windows64 files not copying & add buildsteps to solution filter
feat: update submodule, more proper 4JLibs checks
2026-08-08 21:08:50 -04:00 · 2026-08-08 20:56:23 -04:00 · 2026-08-08 19:58:37 -04:00 · 2026-08-08 15:09:57 -04:00 · 2026-08-08 15:00:18 -04:00 · 2026-08-08 14:19:49 -04:00
198 changed files with 1192 additions and 1293 deletions
@@ -16,7 +16,7 @@ on:

 jobs:
  build:
-    runs-on: windows-2022
+    runs-on: sdk-orbis

    strategy:
      matrix:
@@ -27,6 +27,7 @@ jobs:
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
+          clean: false
          lfs: false

      - name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
          Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0
@@ -16,7 +16,7 @@ on:

 jobs:
  build:
-    runs-on: windows-2022
+    runs-on: sdk-ps3

    strategy:
      matrix:
@@ -27,6 +27,7 @@ jobs:
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
+          clean: false
          lfs: false

      - name: Build Cafeberry
@@ -37,7 +38,7 @@ jobs:
            /m

      - name: Zip Build
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
+        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"

      - name: Stage artifacts
        run: |
@@ -45,7 +46,8 @@ jobs:
          Copy-Item LCE${{ matrix.platform }}.zip staging/ 

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0
@@ -16,7 +16,7 @@ on:

 jobs:
  build:
-    runs-on: windows-2022
+    runs-on: sdk-psvita

    strategy:
      matrix:
@@ -27,6 +27,7 @@ jobs:
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
+          clean: false
          lfs: false

      - name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
          Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0
@@ -25,19 +25,31 @@ jobs:

  build:
    needs: validate
-    runs-on: windows-2022
-
    strategy:
      matrix:
        configuration: [Release]
-        platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
+        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 }}"]

    steps:
      - name: Checkout Repository
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
-          lfs: false 
+          clean: false
+          lfs: false

      - name: Build Cafeberry
        run: |
@@ -57,7 +69,7 @@ jobs:
          } elseif ("${{ matrix.platform }}" -eq "PSVita") {
            7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
          } elseif ("${{ matrix.platform }}" -eq "PS3") {
-            7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*"
+            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 {
@@ -78,17 +90,18 @@ jobs:
          }

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
          path: staging/*
+          compression-level: 0

  release:
    needs: build
    runs-on: windows-2022
    steps:
      - name: Download all build artifacts
-        uses: https://github.com/actions/download-artifact@v3
+        uses: https://github.com/christopherHX/gitea-download-artifact@v4
        with:
          path: downloaded

@@ -110,9 +123,10 @@ jobs:
          }

          $delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
-          "description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
-          $body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
-          "$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
+          $content = "description<<$delimiter`n$body`n$delimiter`n"
+
+          $utf8NoBom = New-Object System.Text.UTF8Encoding($false)
+          [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)

      - name: Publish Release
        uses: akkuman/gitea-release-action@v1
@@ -27,6 +27,7 @@ jobs:
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
+          clean: false
          lfs: false

      - name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
          Copy-Item LCE${{ matrix.platform }}.zip staging/ 

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0
@@ -16,7 +16,7 @@ on:

 jobs:
  build:
-    runs-on: windows-2022
+    runs-on: sdk-xbox360

    strategy:
      matrix:
@@ -27,6 +27,7 @@ jobs:
        uses: https://github.com/actions/checkout@v4
        with:
          fetch-depth: 1
+          clean: false
          lfs: false

      - name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
          Copy-Item LCE${{ matrix.platform }}.zip staging/ 

      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
        with:
          name: build-${{ matrix.platform }}
-          path: staging/*
+          path: staging/*
+          compression-level: 0
@@ -1,44 +1,35 @@
-/*Debug
-/*Release
-/*ContentPackage
-/*ContentPackage_NO_TU
-/*ContentPackage_SYMBOLS
-/*ReleaseForArt
+.vs
 /x64
 /ipch
-.vs/
+.vscode
+/*Debug
+/*Release*
+/*ContentPackage*

 # Minecraft.Client
-/Minecraft.Client/x64/
+/Minecraft.Client/x64
 /Minecraft.Client/x64_*
 /Minecraft.Client/*Debug
-/Minecraft.Client/*Release
-/Minecraft.Client/*ContentPackage
-/Minecraft.Client/*ContentPackage_NO_TU
-/Minecraft.Client/*ContentPackage_SYMBOLS
-/Minecraft.Client/*ReleaseForArt
+/Minecraft.Client/*Release*
+/Minecraft.Client/*ContentPackage*
 /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/*ContentPackage_NO_TU
-/Minecraft.World/*ContentPackage_SYMBOLS
-/Minecraft.World/*ReleaseForArt
+/Minecraft.World/*Release*
+/Minecraft.World/*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*
+# 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

 # Misc
+*.ppu.o
 *.pkg
 /*.gp4p
 /*.vpk
@@ -46,4 +37,5 @@
 *-app
 *.sdf
 *.opensdf
-*.v11.suo
+*.v11.suo
+*.vcxproj.user
@@ -0,0 +1,5 @@
+[submodule "Minecraft.Client/Windows64/4JLibs"]
+	path = Minecraft.Client/Windows64/4JLibs
+	url = https://gitea.str1k3r.xyz/str1k3r/4JLibs-VS2012
+	ignore = untracked
+	branch = main
@@ -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."
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
str1k3r	eb317d8fbd	chore: Bump 4JLibs	2026-08-08 21:08:50 -04:00
str1k3r	af2040a849	fix: 4JLibs building, windows64 files not copying & add buildsteps to solution filter	2026-08-08 20:56:23 -04:00
str1k3r	9cba342973	feat: update submodule, more proper 4JLibs checks	2026-08-08 19:58:37 -04:00
str1k3r	8055f4dfc7	fix: world thumbnails	2026-08-08 15:09:57 -04:00
str1k3r	3ea3c08372	update submodule SDL was being a bitch	2026-08-08 15:00:18 -04:00
str1k3r	9a729de7c3	fix: submodule tracking unneeded files	2026-08-08 14:19:49 -04:00
str1k3r	274f2ddc61	fix: submodule	2026-08-08 14:11:30 -04:00
str1k3r	831ec7292d	fix: save space indicator Credits to smartcmd for the base of this	2026-08-08 14:08:00 -04:00
str1k3r	13285fbffa	feat: 4JLibs submodule	2026-08-08 14:06:08 -04:00
str1k3r	3866e525f1	fix(Windows64): 720p crash, Update README & .gitignore	2026-08-03 21:55:05 -04:00
str1k3r	9254fbcdb3	fix: ps3 zip not ignoring .self, stop tracking .vcxproj.user	2026-08-03 18:28:00 -04:00
str1k3r	e8d19516e6	fix: windows64 release build Release is actually a "Debug without extra shit" so we dont use _FINAL_BUILD	2026-08-03 16:32:30 -04:00
str1k3r	8bae3cfbc1	fix: ps3 zip	2026-08-03 15:27:43 -04:00
str1k3r	7f4227d902	fix: my mistake on workflow	2026-08-03 15:14:31 -04:00
str1k3r	d9327ff1f5	fix: dangling build on workflow	2026-08-03 15:11:57 -04:00
str1k3r	d770e58992	fix: workflows throwing GHES error	2026-08-03 15:03:16 -04:00
str1k3r	0889edf3bd	chore: make the SPU Tasks SLN use $(Configuration) & $(Platform)	2026-08-03 14:40:28 -04:00
str1k3r	6e13d5d4c0	fix: PS3 & Windows64 ContentPackage, Exclude PSVita libs & OldSDK from other plats	2026-08-03 14:27:03 -04:00
str1k3r	cffdcb1971	fix: release workflow notes	2026-08-03 10:31:04 +00:00
str1k3r	eb80f3e52b	fix(PS3): SPU Tasks not being built	2026-08-02 20:47:50 -04:00