0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE implement direct java launch

Browse Source 
Just running the Java process and giving it params on the command line
This commit is contained in:
Petr Mrázek
2016-06-16 02:20:23 +02:00
parent 57c84ec2b1
commit 1f2bed2ef1
31 changed files with 990 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/logic/minecraft/MinecraftInstance.h
View File

@@ -1,5 +1,6 @@
#pragma once
#include "BaseInstance.h"
#include <java/JavaVersion.h>
#include "minecraft/Mod.h"
#include <QProcess>
@@ -7,6 +8,7 @@
class ModList;
class WorldList;
class LaunchStep;
class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
{
@@ -36,7 +38,7 @@ public:
return QList<Mod>();
}
/// get the launch script to be used with this
virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override;
virtual QString createLaunchScript(AuthSessionPtr session) = 0;
//FIXME: nuke?
@@ -60,8 +62,22 @@ public:
virtual QString getStatusbarDescription() override;
virtual QStringList getClassPath() const = 0;
virtual QStringList getNativeJars() const = 0;
virtual QString getMainClass() const = 0;
virtual QString getNativePath() const = 0;
virtual QStringList processMinecraftArgs(AuthSessionPtr account) const = 0;
virtual JavaVersion getJavaVersion() const;
protected:
QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
virtual QStringList validLaunchMethods() = 0;
virtual QString launchMethod();
virtual std::shared_ptr<LaunchStep> createMainLaunchStep(LaunchTask *parent, AuthSessionPtr session) = 0;
private:
QString prettifyTimeDuration(int64_t duration);
};