1.13.0.15 support

ChristopherHX · Oct 30, 2019 · a9ca551 · a9ca551
1 parent 6e38c60
commit a9ca551
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/http_request_stub.cpp b/src/http_request_stub.cpp
@@ -3,8 +3,12 @@
 #include <mcpelauncher/patch_utils.h>
 #include <hybris/dlfcn.h>
 #include <log.h>
+#include <mcpelauncher/minecraft_version.h>
 
 void LinuxHttpRequestHelper::install(void* handle) {
+    if (MinecraftVersion::isAtLeast(1, 13, 0, 9))
+        return;
+
     void* ptr = hybris_dlsym(handle, "_ZN26HTTPRequestInternalAndroidC2ER11HTTPRequest");
     PatchUtils::patchCallInstruction(ptr, (void *) (void (*)(LinuxHttpRequestInternal*, HTTPRequest*)) [](
             LinuxHttpRequestInternal* th, HTTPRequest* request) {

diff --git a/src/main.cpp b/src/main.cpp
@@ -142,8 +142,9 @@ int main(int argc, char *argv[]) {
     if (MinecraftVersion::isAtLeast(0, 16))
         mce::Platform::OGL::InitBindings();
 
-    Log::info("Launcher", "OpenGL: version: %s, renderer: %s, vendor: %s",
-              gl::getOpenGLVersion().c_str(), gl::getOpenGLRenderer().c_str(), gl::getOpenGLVendor().c_str());
+    if (!MinecraftVersion::isAtLeast(1, 13, 0, 9))
+        Log::info("Launcher", "OpenGL: version: %s, renderer: %s, vendor: %s",
+                  gl::getOpenGLVersion().c_str(), gl::getOpenGLRenderer().c_str(), gl::getOpenGLVendor().c_str());
 
     Log::trace("Launcher", "Initializing MinecraftGame (create instance)");
     std::unique_ptr<MinecraftGameWrapper> game (MinecraftGameWrapper::create(argc, argv));

diff --git a/src/store.cpp b/src/store.cpp
@@ -17,6 +17,7 @@ void LauncherStore::initVtable(void *lib) {
     Log::trace("Store", "Vtable size = %u", myVtableSize);
 
     myVtable = (void**) ::operator new((myVtableSize + 1) * sizeof(void*));
+    memcpy(myVtable, vta, myVtableSize * sizeof(void*));
     myVtable[myVtableSize] = nullptr;
     myVtable[0] = (void*) (void (*) (LauncherStore* p)) [](LauncherStore* p) { p->~LauncherStore(); };
     myVtable[1] = (void*) (void (*) (LauncherStore* p)) [](LauncherStore* p) { delete p; };

diff --git a/src/tts_patch.cpp b/src/tts_patch.cpp
@@ -1,13 +1,12 @@
 #include "tts_patch.h"
 
 #include <mcpelauncher/patch_utils.h>
-#include <hybris/dlfcn.h>
 #include <mcpelauncher/minecraft_version.h>
 
 void TTSPatch::install(void* handle) {
     if (!MinecraftVersion::isAtLeast(1, 8))
         return;
-    void* sym = hybris_dlsym(handle, "_ZN18TextToSpeechSystem15createTTSClientEb");
+    void* sym = minecraft_dlsym(handle, "_ZN18TextToSpeechSystem15createTTSClientEb");
     PatchUtils::patchCallInstruction(sym, (void*) &TTSPatch::createTTSClient, true);
 }