Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ git_commit_hash(${CMAKE_CURRENT_SOURCE_DIR} CLIENT_GIT_COMMIT_HASH)
configure_file(src/build_info.h.in ${CMAKE_CURRENT_BINARY_DIR}/build_info/build_info.h)

add_executable(mcpelauncher-client src/main.cpp src/main.h src/window_callbacks.cpp src/window_callbacks.h src/xbox_live_helper.cpp src/xbox_live_helper.h src/splitscreen_patch.cpp src/splitscreen_patch.h src/strafe_sprint_patch.cpp src/strafe_sprint_patch.h src/fake_swappygl.cpp src/fake_swappygl.h src/cll_upload_auth_step.cpp src/cll_upload_auth_step.h src/gl_core_patch.cpp src/gl_core_patch.h src/hbui_patch.cpp src/hbui_patch.h src/utf8_util.h src/shader_error_patch.cpp src/shader_error_patch.h src/jni/jni_descriptors.cpp src/jni/java_types.h src/jni/main_activity.cpp src/jni/main_activity.h src/jni/asset_manager.cpp src/jni/asset_manager.h src/jni/store.cpp src/jni/store.h src/jni/cert_manager.cpp src/jni/cert_manager.h src/jni/http_stub.cpp src/jni/http_stub.h src/jni/package_source.cpp src/jni/package_source.h src/jni/jni_support.h src/jni/jni_support.cpp src/jni/fmod.h src/jni/fmod.cpp src/fake_looper.cpp src/fake_looper.h src/fake_window.cpp src/fake_window.h src/fake_assetmanager.cpp src/fake_assetmanager.h src/fake_egl.cpp src/fake_egl.h src/fake_inputqueue.cpp src/fake_inputqueue.h src/symbols.cpp src/symbols.h src/text_input_handler.cpp src/text_input_handler.h src/jni/xbox_live.cpp src/jni/xbox_live.h src/core_patches.cpp src/core_patches.h src/thread_mover.cpp src/thread_mover.h src/jni/lib_http_client.cpp src/jni/lib_http_client.h src/jni/lib_http_client_websocket.cpp src/jni/lib_http_client_websocket.h src/jni/accounts.cpp src/jni/accounts.h src/jni/arrays.cpp src/jni/arrays.h src/jni/jbase64.cpp src/jni/jbase64.h src/jni/locale.cpp src/jni/locale.h src/jni/securerandom.cpp src/jni/securerandom.h src/jni/signature.cpp src/jni/signature.h src/jni/uuid.cpp src/jni/uuid.h src/jni/webview.cpp src/jni/webview.h src/util.cpp src/util.h src/xal_webview_factory.cpp src/xal_webview_factory.h src/xal_webview.h src/settings.cpp src/settings.h )
target_link_libraries(mcpelauncher-client logger properties-parser mcpelauncher-core gamewindow filepicker msa-daemon-client daemon-server-utils cll-telemetry argparser baron android-support-headers libc-shim ${CURL_LIBRARIES})
target_link_libraries(mcpelauncher-client logger properties-parser mcpelauncher-core gamewindow filepicker msa-daemon-client daemon-server-utils cll-telemetry argparser baron android-support-headers libc-shim mcpelauncher-apkinfo ${CURL_LIBRARIES})
target_include_directories(mcpelauncher-client PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/build_info/ ${CURL_INCLUDE_DIRS})

option(NO_OPENSSL "disable openssl code" OFF)
Expand Down
21 changes: 19 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include <daemon_utils/auto_shutdown_service.h>
#include "settings.h"
#include "imgui_ui.h"
#include <mcpelauncher/apkinfo.h>

struct RpcCallbackServer : daemon_utils::auto_shutdown_service {
RpcCallbackServer(const std::string& path, JniSupport& support) : daemon_utils::auto_shutdown_service(path, daemon_utils::shutdown_policy::never) {
Expand Down Expand Up @@ -201,6 +202,24 @@ int main(int argc, char* argv[]) {
#endif
Log::info("Launcher", "OS: %s", TARGET);
Log::info("Launcher", "Arch: %s", ARCH);

std::ifstream manifestFileStream(PathHelper::getGameDir() + "AndroidManifest.xml", std::ios::binary);
if(manifestFileStream.is_open()) {
std::stringstream manifest;
manifest << manifestFileStream.rdbuf();
auto smanifest = manifest.str();

axml::AXMLFile manifestFile (smanifest.data(), smanifest.size());
axml::AXMLParser manifestParser (manifestFile);
ApkInfo apkInfo = ApkInfo::fromXml(manifestParser);

Log::info("Launcher", "Minecraft Package: %s", apkInfo.package.c_str());
Log::info("Launcher", "Minecraft Version Code: %d", apkInfo.versionCode);

MinecraftVersion::init(apkInfo.package, apkInfo.versionCode);
}
Log::info("Launcher", "Game version: %s", MinecraftVersion::getString().c_str());

loadGameOptions();
#if defined(__i386__) || defined(__x86_64__)
{
Expand Down Expand Up @@ -485,8 +504,6 @@ Hardware : Qualcomm Technologies, Inc MSM8998
}
}

Log::info("Launcher", "Game version: %s", MinecraftVersion::getString().c_str());

Log::info("Launcher", "Applying patches");
if(v8Flags.get().size()) {
void (*V8SetFlagsFromString)(const char* str, int length);
Expand Down
Loading