backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Windows archive file discovery

Browse source
This commit is contained in:
Tropical 2026-04-10 20:37:08 -07:00
parent 93215033e4
commit b7ad828882
9 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -10,8 +10,9 @@ project(
'warning_level=0', 'warning_level=0',
'unity=on', # merge source files per target 'unity=on', # merge source files per target
'unity_size=8', # TODO: mess around with this 'unity_size=8', # TODO: mess around with this
'buildtype=debugoptimized', # needed for _FORTIFY_SOURCE 'buildtype=debug',
'b_pch=true', # precompiled headers 'b_pch=true', # precompiled headers
'default_library=static', # static linkage to subprojects
# 'b_lto=true', # link-time optimisation (ThinLTO under clang+lld) # 'b_lto=true', # link-time optimisation (ThinLTO under clang+lld)
# 'b_ndebug=if-release', # drop assert() in --buildtype=release # 'b_ndebug=if-release', # drop assert() in --buildtype=release
], ],

4
targets/app/common/Game.cpp
View file

@ -259,11 +259,7 @@ int Game::GetLocalPlayerCount(void) {
// Installed DLC callback // Installed DLC callback
// 4J-JEV: For the sake of clarity in DLCMountedCallback. // 4J-JEV: For the sake of clarity in DLCMountedCallback.
#if defined(_WINDOWS64)
#define CONTENT_DATA_DISPLAY_NAME(a) (a.szDisplayName) #define CONTENT_DATA_DISPLAY_NAME(a) (a.szDisplayName)
#else
#define CONTENT_DATA_DISPLAY_NAME(a) (a.wszDisplayName)
#endif
#undef CONTENT_DATA_DISPLAY_NAME #undef CONTENT_DATA_DISPLAY_NAME

6
targets/app/common/Game.h
View file

@ -1202,12 +1202,6 @@ private:
std::string getRootPath(std::uint32_t packId, bool allowOverride, std::string getRootPath(std::uint32_t packId, bool allowOverride,
bool bAddDataFolder, std::string mountPoint); bool bAddDataFolder, std::string mountPoint);
public:
#if defined(_WINDOWS64)
// CMinecraftAudio audio;
#else
#endif
}; };
extern Game app; extern Game app;

7
targets/app/common/GameSettingsManager.cpp
View file

@ -41,17 +41,10 @@ void GameSettingsManager::initGameSettings() {
// clear the flag to say the settings have changed // clear the flag to say the settings have changed
GameSettingsA[i]->bSettingsChanged = false; GameSettingsA[i]->bSettingsChanged = false;
#if defined(_WINDOWS64)
IPlatformProfile::PROFILESETTINGS* pProfileSettings = IPlatformProfile::PROFILESETTINGS* pProfileSettings =
PlatformProfile.GetDashboardProfileSettings(i); PlatformProfile.GetDashboardProfileSettings(i);
memset(pProfileSettings, 0, sizeof(IPlatformProfile::PROFILESETTINGS)); memset(pProfileSettings, 0, sizeof(IPlatformProfile::PROFILESETTINGS));
setDefaultOptions(pProfileSettings, i); setDefaultOptions(pProfileSettings, i);
#else
IPlatformProfile::PROFILESETTINGS* pProfileSettings =
PlatformProfile.GetDashboardProfileSettings(i);
memset(pProfileSettings, 0, sizeof(IPlatformProfile::PROFILESETTINGS));
setDefaultOptions(pProfileSettings, i);
#endif
} }
} }

2
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
View file

@ -1119,7 +1119,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() {
delete m_currentSessions; delete m_currentSessions;
m_currentSessions = m_currentSessions =
g_NetworkManager.GetSessionList(m_iPad, 1, m_bShowingPartyGamesOnly); PlatformNetwork.GetSessionList(m_iPad, 1, m_bShowingPartyGamesOnly);
// Update the xui list displayed // Update the xui list displayed
unsigned int xuiListSize = m_buttonListGames.getItemCount(); unsigned int xuiListSize = m_buttonListGames.getItemCount();

2
targets/java/include/java/Class.h
View file

@ -350,7 +350,7 @@ inline bool eTYPE_FLAGSET(eINSTANCEOF flag, eINSTANCEOF claz) {
/// FOR CHECKING /// /// FOR CHECKING ///
#if !(defined _WINDOWS64) #if 1
class SubClass { class SubClass {
static void checkDerivations() {} static void checkDerivations() {}

5
targets/java/src/File.cpp
View file

@ -122,9 +122,8 @@ File::File(const std::string& pathname) {
File::File(const std::string& parent, File::File(const std::string& parent,
const std::string& child) //: m_abstractPathName( child ) const std::string& child) //: m_abstractPathName( child )
{ {
m_abstractPathName = // Using std::filesystem::path to join paths properly
pathRoot + pathSeparator + parent + pathSeparator + child; m_abstractPathName = (std::filesystem::path(parent) / child).string();
// this->parent = new File( parent );
} }
// Creates a new File instance by converting the given path vector into an // Creates a new File instance by converting the given path vector into an

5
targets/minecraft/client/renderer/LevelRenderer.h
View file

@ -68,13 +68,8 @@ public:
static const int CHUNK_SIZE = 16; static const int CHUNK_SIZE = 16;
#endif #endif
static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE; static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE;
#if defined(_WINDOWS64)
static const int MAX_COMMANDBUFFER_ALLOCATIONS = static const int MAX_COMMANDBUFFER_ALLOCATIONS =
512 * 1024 * 1024; // 4J - added 512 * 1024 * 1024; // 4J - added
#else
static const int MAX_COMMANDBUFFER_ALLOCATIONS =
55 * 1024 * 1024; // 4J - added
#endif
public: public:
LevelRenderer(Minecraft* mc, Textures* textures); LevelRenderer(Minecraft* mc, Textures* textures);

3
targets/minecraft/client/skins/DLCTexturePack.cpp
View file

@ -33,9 +33,6 @@
#include "platform/storage/storage.h" #include "platform/storage/storage.h"
#include "util/StringHelpers.h" #include "util/StringHelpers.h"
#if defined(_WINDOWS64)
#endif
namespace { namespace {
bool ReadPortableBinaryFile(File& file, std::uint8_t*& data, bool ReadPortableBinaryFile(File& file, std::uint8_t*& data,
unsigned int& size) { unsigned int& size) {