implement qloak's kbm PR (#33)

kbm igReviewed-on: cafeberry/cafeberry#33

Co-authored-by: qloak <realminecart@gmail.com>

Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1

@@ -26,7 +26,7 @@ foreach ($dir in $directories) {
 $folderCopies = @(
     @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Common\res";      		 Dest = "Common\res" },
-	@{ Source = "DurangoMedia\Sound";    Dest = "Sound" },
+	@{ Source = "Durango\Sound";      	 Dest = "Sound" },
 	@{ Source = "DurangoMedia\DLC";      Dest = "DLC" },
 	@{ Source = "DurangoMedia\Tutorial"; Dest = "Tutorial" },
 	@{ Source = "music";      			 Dest = "music" },
@@ -40,8 +40,6 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-    } else {
-        Write-Host "Durango Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -56,9 +54,7 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	} else {
-        Write-Host "Durango Postbuild: File not found, skipping: $src"
-    }
+	}
 }
 
 $deleteDirs = @(

Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1

@@ -25,12 +25,12 @@ $folderCopies = @(
     @{ Source = "music";		    Dest = "PS4_GAME\music" },
     @{ 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 = "Orbis\Sound";     Dest = "PS4_GAME\Orbis\Sound" },
     @{ Source = "OrbisMedia\DLC";   Dest = "PS4_GAME\Orbis\DLC" },
     @{ 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 = Join-Path $PSScriptRoot "Contents\Orbis\sce_gls"; Dest = "PS4_GAME\sce_gls" },
+    @{ Source = "$env:SCE_ORBIS_SDK_DIR\target\sce_module"; Dest = "PS4_GAME\sce_module" },
+    @{ 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" }
 )
 
@@ -44,9 +44,7 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-	} else {
-        Write-Host "Orbis Postbuild: Folder not found, skipping: $src"
-    }
+	}
 }
 
 $fileCopies = @(
@@ -60,9 +58,7 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	} else {
-        Write-Host "Orbis Postbuild: File not found, skipping: $src"
-    }
+	}
 }
 
 $builtFile = Join-Path $OutDir "Minecraft.Client.elf"

Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1

@@ -24,24 +24,18 @@ $folderCopies = @(
     @{ 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 = "PS3\Sound";        Dest = "PS3_GAME\USRDIR\PS3\Sound" },
 	#@{ 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" }
 )
 
 foreach ($copy in $folderCopies) {
-    if ([System.IO.Path]::IsPathRooted($copy.Source)) {
-        $src = $copy.Source
-    } else {
-        $src = Join-Path $ProjectDir $copy.Source
-    }
+    $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
 
     if (Test-Path $src) {
 		xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-    } else {
-        Write-Host "PS3 Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -64,9 +58,7 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	} else {
-        Write-Host "PS3 Postbuild: File not found, skipping: $src"
-    }
+	}
 }
 
 if ($Configuration -match "ContentPackage") {

Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1

@@ -20,14 +20,14 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "music";		     Dest = "PSVITA_GAME\music" },
+    @{ Source = "music";		   Dest = "PSVITA_GAME\music" },
     @{ 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" },
-    @{ Source = "PSVita\Tutorial";   Dest = "PSVITA_GAME\PSVita\Tutorial" },
-	@{ Source = "$env:SCE_PSP2_SDK_DIR\target\sce_module";         Dest = "PSVITA_GAME\sce_module" },
-    @{ Source = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys"; Dest = "PSVITA_GAME\sce_sys" }
+    @{ Source = "Common\res";      Dest = "PSVITA_GAME\Common\res" },
+	@{ Source = "PSVita\Sound";    Dest = "PSVITA_GAME\PSVita\Sound" },
+	@{ 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 = Join-Path $PSScriptRoot "Contents\PSVita\sce_sys";    Dest = "PSVITA_GAME\sce_sys" }
 )
 
 foreach ($copy in $folderCopies) {
@@ -40,9 +40,7 @@ foreach ($copy in $folderCopies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-	} else {
-        Write-Host "PSVita Postbuild: Folder not found, skipping: $src"
-    }
+	}
 }
 
 $fileCopies = @(
@@ -57,9 +55,7 @@ foreach ($copy in $fileCopies) {
     if (Test-Path $src) {
         New-Item -ItemType Directory -Path (Split-Path $dst -Parent) -Force | Out-Null
         Copy-Item -Path $src -Destination $dst -Force
-	} else {
-        Write-Host "PSVita Postbuild: File not found, skipping: $src"
-    }
+	}
 }
 
 $builtFile = Join-Path $OutDir "Minecraft.Client.self"

Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1

@@ -19,34 +19,28 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
+    @{ Source = "Common\Media";    		Dest = "Common\Media" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
-    @{ 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
+	@{ Source = "Windows64\Sound"; 	Dest = "Windows64Media\Sound" },
+	#@{ Source = "PSVita\Tutorial"; 	 Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
 	@{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" }
 )
 
 foreach ($copy in $folderCopies) {
-    if ([System.IO.Path]::IsPathRooted($copy.Source)) {
-        $src = $copy.Source
-    } else {
-        $src = Join-Path $ProjectDir $copy.Source
-    }
+    $src = Join-Path $ProjectDir $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-    } else {
-        Write-Host "Windows64 Postbuild: Folder not found, skipping: $src"
     }
 }
 
 $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" }
+	@{ 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) {
@@ -55,7 +49,7 @@ foreach ($copy in $fileCopies) {
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
 	} else {
-        Write-Host "Windows64 Postbuild: File not found, skipping: $src"
+        Write-Host "Windows64 Postbuild: source not found, skipping: $src"
     }
 }
 

Minecraft.Client/Common/Buildsteps/Xbox-postbuild.ps1

@@ -24,8 +24,6 @@ foreach ($copy in $copies) {
 
     if (Test-Path $src) {
         xcopy /q /y /i /s /e /d "$src" "$dst" 2>$null
-    } else {
-        Write-Host "Xbox Postbuild: Folder not found, skipping: $src"
     }
 }
 
@@ -62,7 +60,5 @@ foreach ($copy in $fileCopies) {
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force
-	} else {
-        Write-Host "Xbox Postbuild: File not found, skipping: $src"
-    }
+	}
 }