From 3bad03f5856172284f33c22f3af9d9e4d9dfee40 Mon Sep 17 00:00:00 2001
From: NOTPIES <NOTPIES@users.noreply.github.com>
Date: Tue, 21 Apr 2026 01:27:06 -0400
Subject: [PATCH] fix

---
 .github/workflows/build-channel.yml           | 33 +++++++++++++++++--
 Minecraft.Client/Extrax64Stubs.cpp            |  4 ++-
 .../Platform_Libs/Dev/Input/4J_Input.cpp      |  2 ++
 .../Dev/Input/INP_ForceFeedback.cpp           |  2 ++
 .../Platform_Libs/Dev/Input/INP_Keyboard.cpp  |  2 ++
 .../Platform_Libs/Dev/Input/INP_Main.cpp      |  2 ++
 .../Dev/Input/INP_StringCheck.cpp             |  2 ++
 .../Platform_Libs/Dev/Input/LinkedList.cpp    |  2 ++
 .../Platform_Libs/Dev/Profile/4J_Profile.cpp  |  2 ++
 .../Platform_Libs/Dev/Storage/4J_Storage.cpp  |  2 ++
 .../Platform_Libs/Dev/Storage/STO_DLC.cpp     |  2 ++
 .../Platform_Libs/Dev/Storage/STO_Main.cpp    |  2 ++
 .../Dev/Storage/STO_SaveGame.cpp              |  2 ++
 13 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-channel.yml b/.github/workflows/build-channel.yml
index e8171d0..65602b3 100644
--- a/.github/workflows/build-channel.yml
+++ b/.github/workflows/build-channel.yml
@@ -123,11 +123,25 @@ jobs:
         shell: pwsh
         run: |
           $outRoots = @(
+            ".\\Minecraft.Client\\x64\\Release",
+            ".\\Minecraft.Client\\x64_Release",
             ".\\x64\\Release",
             ".\\x64_Release"
           )
 
-          $root = $outRoots | Where-Object { Test-Path $_ } | Select-Object -First 1
+          $root = $outRoots | Where-Object {
+            Test-Path (Join-Path $_ "Minecraft.Client.exe")
+          } | Select-Object -First 1
+
+          if (-not $root) {
+            $fallback = Get-ChildItem -Path . -Filter "Minecraft.Client.exe" -Recurse -File -ErrorAction SilentlyContinue |
+              Select-Object -First 1
+
+            if ($fallback) {
+              $root = $fallback.DirectoryName
+            }
+          }
+
           if (-not $root) {
             throw "Could not locate Windows client output directory."
           }
@@ -379,11 +393,26 @@ jobs:
         shell: pwsh
         run: |
           $outRoots = @(
+            ".\\Minecraft.Server\\x64_Server_Release",
+            ".\\Minecraft.Server\\x64\\Release",
+            ".\\Minecraft.Server\\x64_Release",
             ".\\x64_Server_Release",
             ".\\x64_Release"
           )
 
-          $root = $outRoots | Where-Object { Test-Path $_ } | Select-Object -First 1
+          $root = $outRoots | Where-Object {
+            Test-Path (Join-Path $_ "Minecraft.Server.exe")
+          } | Select-Object -First 1
+
+          if (-not $root) {
+            $fallback = Get-ChildItem -Path . -Filter "Minecraft.Server.exe" -Recurse -File -ErrorAction SilentlyContinue |
+              Select-Object -First 1
+
+            if ($fallback) {
+              $root = $fallback.DirectoryName
+            }
+          }
+
           if (-not $root) {
             throw "Could not locate Windows dedicated server output directory."
           }
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index c41739d..e7831b7 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -46,7 +46,9 @@
 #if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__)
 #ifdef _WINDOWS64
 //C4JStorage StorageManager;
-//C_4JProfile ProfileManager;
+#if defined(__linux__)
+C_4JProfile ProfileManager;
+#endif
 #endif
 #endif // __PS3__
 CSentientManager SentientManager;
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/4J_Input.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/4J_Input.cpp
index a8d480f..be0f9ef 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/4J_Input.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/4J_Input.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "4J_Input.h"
 #include "INP_Keyboard.h"
 #include "INP_Main.h"
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/INP_ForceFeedback.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/INP_ForceFeedback.cpp
index 3341a30..75aa437 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/INP_ForceFeedback.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/INP_ForceFeedback.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "INP_ForceFeedback.h"
 
 void CForceFeedback::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC)
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/INP_Keyboard.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/INP_Keyboard.cpp
index a15f13f..c6d1e6d 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/INP_Keyboard.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/INP_Keyboard.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "INP_Keyboard.h"
 
 void CKeyboard::Tick(void) {}
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/INP_Main.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/INP_Main.cpp
index a10a6f7..af0a56b 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/INP_Main.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/INP_Main.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "INP_Main.h"
 
 CInput InternalInputManager;
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/INP_StringCheck.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/INP_StringCheck.cpp
index 541aeb2..fa3d775 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/INP_StringCheck.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/INP_StringCheck.cpp
@@ -22,5 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "INP_StringCheck.h"
\ No newline at end of file
diff --git a/Minecraft.Client/Platform_Libs/Dev/Input/LinkedList.cpp b/Minecraft.Client/Platform_Libs/Dev/Input/LinkedList.cpp
index f9f71b4..9a7363d 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Input/LinkedList.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Input/LinkedList.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "LinkedList.h"
 
 LinkedList::LinkedList()
diff --git a/Minecraft.Client/Platform_Libs/Dev/Profile/4J_Profile.cpp b/Minecraft.Client/Platform_Libs/Dev/Profile/4J_Profile.cpp
index a1d60e6..b5c28f9 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Profile/4J_Profile.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Profile/4J_Profile.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "4J_Profile.h"
 
 C_4JProfile ProfileManager;
diff --git a/Minecraft.Client/Platform_Libs/Dev/Storage/4J_Storage.cpp b/Minecraft.Client/Platform_Libs/Dev/Storage/4J_Storage.cpp
index aca15cb..991aca5 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Storage/4J_Storage.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Storage/4J_Storage.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "4J_Storage.h"
 #include "STO_Main.h"
 
diff --git a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_DLC.cpp b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_DLC.cpp
index bc4e8d2..ab8982a 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_DLC.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_DLC.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "STO_DLC.h"
 #include "STO_Main.h"
 
diff --git a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_Main.cpp b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_Main.cpp
index f461618..2c4668a 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_Main.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_Main.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "STO_Main.h"
 #include "4J_Storage.h"
 
diff --git a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_SaveGame.cpp b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_SaveGame.cpp
index a9fe931..e661260 100644
--- a/Minecraft.Client/Platform_Libs/Dev/Storage/STO_SaveGame.cpp
+++ b/Minecraft.Client/Platform_Libs/Dev/Storage/STO_SaveGame.cpp
@@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#if !defined(__linux__)
 #include "stdafx.h"
+#endif
 #include "STO_SaveGame.h"
 #include <stdio.h>