Merge branch 'develop' into sparkle-disable

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

1 files changed, 5 insertions, 36 deletions

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 3bcd4df8..07ed04f9 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -61,7 +61,6 @@
 #include "launch/steps/QuitAfterGameStop.h"
 
 #include "minecraft/launch/LauncherPartLaunch.h"
-#include "minecraft/launch/DirectJavaLaunch.h"
 #include "minecraft/launch/ModMinecraftJar.h"
 #include "minecraft/launch/ClaimAccount.h"
 #include "minecraft/launch/ReconstructAssets.h"
@@ -167,10 +166,6 @@ void MinecraftInstance::loadSpecificSettings()
         m_settings->registerOverride(global_settings->getSetting("MaxMemAlloc"), memorySetting);
         m_settings->registerOverride(global_settings->getSetting("PermGen"), memorySetting);
 
-        // Minecraft launch method
-        auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
-        m_settings->registerOverride(global_settings->getSetting("MCLaunchMethod"), launchMethodOverride);
-
         // Native library workarounds
         auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
         m_settings->registerOverride(global_settings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
@@ -990,15 +985,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(makeShared<CheckJava>(pptr));
     }
 
-    // check launch method
-    QStringList validMethods = {"LauncherPart", "DirectJava"};
-    QString method = launchMethod();
-    if(!validMethods.contains(method))
-    {
-        process->appendStep(makeShared<TextPrint>(pptr, "Selected launch method \"" + method + "\" is not valid.\n", MessageLevel::Fatal));
-        return process;
-    }
-
     // create the .minecraft folder and server-resource-packs (workaround for Minecraft bug MCL-3732)
     {
         process->appendStep(makeShared<CreateGameFolders>(pptr));
@@ -1072,23 +1058,11 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
     {
         // actually launch the game
-        auto method = launchMethod();
-        if(method == "LauncherPart")
-        {
-            auto step = makeShared<LauncherPartLaunch>(pptr);
-            step->setWorkingDirectory(gameRoot());
-            step->setAuthSession(session);
-            step->setServerToJoin(serverToJoin);
-            process->appendStep(step);
-        }
-        else if (method == "DirectJava")
-        {
-            auto step = makeShared<DirectJavaLaunch>(pptr);
-            step->setWorkingDirectory(gameRoot());
-            step->setAuthSession(session);
-            step->setServerToJoin(serverToJoin);
-            process->appendStep(step);
-        }
+        auto step = makeShared<LauncherPartLaunch>(pptr);
+        step->setWorkingDirectory(gameRoot());
+        step->setAuthSession(session);
+        step->setServerToJoin(serverToJoin);
+        process->appendStep(step);
     }
 
     // run post-exit command if that's needed
@@ -1111,11 +1085,6 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
     return m_launchProcess;
 }
 
-QString MinecraftInstance::launchMethod()
-{
-    return settings()->get("MCLaunchMethod").toString();
-}
-
 JavaVersion MinecraftInstance::getJavaVersion()
 {
     return JavaVersion(settings()->get("JavaVersion").toString());