backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-23 14:33:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #209 from Acemany/fix-file-delimeter

Browse source 
fix File class' delimeter and homepath detection
This commit is contained in:
Tropical 2026-03-13 13:36:17 -05:00 committed by GitHub
parent 5e5ca12129 40a783207c
commit f4d8815285
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Minecraft.Client/Minecraft.cpp
View file

@ -485,49 +485,41 @@ void Minecraft::blit(int x, int y, int sx, int sy, int w, int h)
File Minecraft::getWorkingDirectory()
{
if (workDir.getPath().empty()) workDir = getWorkingDirectory(L"minecraft");
if (workDir.getPath().empty()) workDir = getWorkingDirectory(L"4jcraft");
return workDir;
}
File Minecraft::getWorkingDirectory(const std::wstring& applicationName)
{
#if 0
// 4J - original version
final String userHome = System.getProperty("user.home", ".");
final File workingDirectory;
switch (getPlatform()) {
case linux:
case solaris:
workingDirectory = new File(userHome, '.' + applicationName + '/');
break;
case windows:
final String applicationData = System.getenv("APPDATA");
if (applicationData != null) workingDirectory = new File(applicationData, "." + applicationName + '/');
else workingDirectory = new File(userHome, '.' + applicationName + '/');
break;
case macos:
workingDirectory = new File(userHome, "Library/Application Support/" + applicationName);
break;
default:
workingDirectory = new File(userHome, applicationName + '/');
// 4jcraft: ported to C++
std::wstring userHome = convStringToWstring(getenv("HOME"));
File *workingDirectory;
#if defined(__linux__)
workingDirectory = new File(userHome, L'.' + applicationName + L'/');
#elif defined(_WINDOWS64)
std::string applicationData = getenv("APPDATA");
if (!applicationData.empty())
{
workingDirectory = new File(convStringToWstring(applicationData), L'.' + applicationName + L'/');
}
if (!workingDirectory.exists()) if (!workingDirectory.mkdirs()) throw new RuntimeException("The working directory could not be created: " + workingDirectory);
return workingDirectory;
else
{
workingDirectory = new File(userHome, L'.' + applicationName + L'/');
}
//#elif defined(_MACOS)
// workingDirectory = new File(userHome, "Library/Application Support/" + applicationName);
#else
std::wstring userHome = L"home"; // 4J - TODO
File workingDirectory(userHome, applicationName);
// 4J Removed
//if (!workingDirectory.exists())
//{
// workingDirectory.mkdirs();
//}
return workingDirectory;
workingDirectory = new File(userHome, applicationName + L'/');
#endif
}
Minecraft::OS Minecraft::getPlatform()
{
return xbox;
if (!workingDirectory->exists()){
if (!workingDirectory->mkdirs()) {
app.DebugPrintf("The working directory could not be created");
assert(0);
//throw new RuntimeException(L"The working directory could not be created: " + workingDirectory);
}
}
return *workingDirectory;
}
LevelStorageSource *Minecraft::getLevelSource()

7
Minecraft.Client/Minecraft.h
View file

@ -50,11 +50,6 @@ class PsPlusUpsellWrapper;
class Minecraft
{
private:
enum OS{
linux, solaris, windows, macos, unknown, xbox
};
public:
static const std::wstring VERSION_STRING;
Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet *minecraftApplet, int width, int height, bool fullscreen);
@ -200,8 +195,6 @@ private:
public:
static File getWorkingDirectory();
static File getWorkingDirectory(const std::wstring& applicationName);
private:
static OS getPlatform();
public:
LevelStorageSource *getLevelSource();
void setScreen(Screen *screen);

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

@ -15,7 +15,8 @@
#include <fios2.h>
#endif
const wchar_t File::pathSeparator = L'\\';
const wchar_t File::pathSeparator = L'/';
#ifdef _XBOX
const std::wstring File::pathRoot = L"GAME:"; // Path root after pathSeparator has been removed
#else