backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-07 12:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat/bttr-cwd

Browse source
This commit is contained in:
JuiceyDev 2026-03-27 11:52:05 +01:00
parent c18e86944f
commit 256a809750
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -52,6 +52,10 @@
#include "../Minecraft.Client/Utils/ArchiveFile.h"
#endif
#include "../Minecraft.Client/Minecraft.h"
#if defined(__linux__)
#include <unistd.h>
#include <limits.h>
#endif
#ifdef _XBOX
#include "../Minecraft.Client/Platform/Xbox/GameConfig/Minecraft.spa.h"
#include "../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h"
@ -4600,7 +4604,33 @@ void CMinecraftApp::loadMediaArchive() {
#endif
if (!mediapath.empty()) {
// (check file.cpp)
// try to load the archive relative to the executable
// directory first.
// If that fails, fall back to the current working
// directory (original behavior)
// if everything fails, may god help you
#if defined(__linux__)
char exePathBuf[PATH_MAX];
ssize_t exeLen = readlink("/proc/self/exe", exePathBuf, sizeof(exePathBuf) - 1);
if (exeLen != -1) {
exePathBuf[exeLen] = '\0';
std::string exePathStr(exePathBuf);
size_t pos = exePathStr.find_last_of('/');
std::string exeDir = (pos == std::string::npos) ? std::string(".") : exePathStr.substr(0, pos);
std::wstring exeDirW = convStringToWstring(exeDir.c_str());
std::wstring candidate = exeDirW + File::pathSeparator + mediapath;
if (File(candidate).exists()) {
m_mediaArchive = new ArchiveFile(File(candidate));
} else {
m_mediaArchive = new ArchiveFile(File(mediapath));
}
} else {
m_mediaArchive = new ArchiveFile(File(mediapath));
}
#else
m_mediaArchive = new ArchiveFile(File(mediapath));
#endif
}
#if 0
std::string path = "Common\\media.arc";

23
Minecraft.World/IO/Files/File.cpp
View file

@ -69,6 +69,29 @@ File::File(const std::wstring& pathname) //: parent( NULL )
else
m_abstractPathName = pathname;
#if defined(__linux__)
// If this is a relative path and it doesn't exist in the CWD, try to
// resolve it relative to the executable directory
if (!m_abstractPathName.empty() && m_abstractPathName[0] != L'/') {
const char* native = wstringtofilename(m_abstractPathName);
if (access(native, F_OK) == -1) {
char exePathBuf[PATH_MAX];
ssize_t exeLen = readlink("/proc/self/exe", exePathBuf, sizeof(exePathBuf) - 1);
if (exeLen != -1) {
exePathBuf[exeLen] = '\0';
std::string exePathStr(exePathBuf);
size_t pos = exePathStr.find_last_of('/');
std::string exeDir = (pos == std::string::npos) ? std::string(".") : exePathStr.substr(0, pos);
std::wstring exeDirW = convStringToWstring(exeDir);
std::wstring candidate = exeDirW + pathSeparator + m_abstractPathName;
const char* candNative = wstringtofilename(candidate);
if (access(candNative, F_OK) != -1) {
m_abstractPathName = candidate;
}
}
}
}
#endif
#ifdef _WINDOWS64
std::string path = wstringtofilename(m_abstractPathName);
std::string finalPath = StorageManager.GetMountedPath(path.c_str());