backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-30 23:52:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch back to MediaWindows64 for media assets

Browse source
This commit is contained in:
Tropical 2026-04-09 22:47:00 -05:00
parent 5d28fc9fd5
commit 9e74005af7
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
targets/app/common/ArchiveManager.cpp
View file

@ -3,8 +3,8 @@
#include <mutex>
#include <string>
#include "app/common/UI/All Platforms/ArchiveFile.h"
#include "app/common/Game.h"
#include "app/common/UI/All Platforms/ArchiveFile.h"
#include "java/File.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
@ -18,14 +18,9 @@ ArchiveManager::ArchiveManager()
void ArchiveManager::loadMediaArchive() {
std::string mediapath = "";
#if _WINDOWS64
mediapath = "Common\\Media\\MediaWindows64.arc";
#elif __linux__
mediapath = "app/common/Media/MediaLinux.arc";
#endif
if (!mediapath.empty()) {
#if defined(__linux__)
std::string exeDirW = PlatformFilesystem.getBasePath().string();
std::string candidate = exeDirW + File::pathSeparator + mediapath;
if (File(candidate).exists()) {
@ -33,9 +28,6 @@ void ArchiveManager::loadMediaArchive() {
} else {
m_mediaArchive = new ArchiveFile(File(mediapath));
}
#else
m_mediaArchive = new ArchiveFile(File(mediapath));
#endif
}
}

2
targets/resources/meson.build
View file

@ -478,7 +478,7 @@ archive_sources_psvita = [
]
media_archive = custom_target('Minecraft.Media_Archive',
output : 'MediaLinux.arc',
output : 'MediaWindows64.arc',
input : archive_sources + archive_sources_movies1080 + archive_sources_movies720 + archive_sources_linux,
command : [
python, meson.project_source_root() / 'scripts/pack_arc.py',