Merge pull request #3 from Drayshak/develop
Fix window size setting for 1.6+, improve Windows Java detection
This commit is contained in:
commit
0bf8d9df5c
15
MultiMC.cpp
15
MultiMC.cpp
@ -16,6 +16,8 @@
|
|||||||
#include "logic/InstanceLauncher.h"
|
#include "logic/InstanceLauncher.h"
|
||||||
#include "logic/net/HttpMetaCache.h"
|
#include "logic/net/HttpMetaCache.h"
|
||||||
|
|
||||||
|
#include "logic/JavaUtils.h"
|
||||||
|
|
||||||
#include "pathutils.h"
|
#include "pathutils.h"
|
||||||
#include "cmdutils.h"
|
#include "cmdutils.h"
|
||||||
#include <inisettingsobject.h>
|
#include <inisettingsobject.h>
|
||||||
@ -260,7 +262,18 @@ void MultiMC::initGlobalSettings()
|
|||||||
m_settings->registerSetting(new Setting("PermGen", 64));
|
m_settings->registerSetting(new Setting("PermGen", 64));
|
||||||
|
|
||||||
// Java Settings
|
// Java Settings
|
||||||
m_settings->registerSetting(new Setting("JavaPath", "java"));
|
m_settings->registerSetting(new Setting("JavaPath", ""));
|
||||||
|
QString currentJavaPath = m_settings->get("JavaPath").toString();
|
||||||
|
if(currentJavaPath.isEmpty())
|
||||||
|
{
|
||||||
|
QLOG_INFO() << "Java path not set, attempting to set it automatically...";
|
||||||
|
|
||||||
|
JavaUtils jut;
|
||||||
|
auto javas = jut.FindJavaPaths();
|
||||||
|
|
||||||
|
m_settings->set("JavaPath", std::get<JI_PATH>(javas.at(0)));
|
||||||
|
}
|
||||||
|
|
||||||
m_settings->registerSetting(new Setting("JvmArgs", ""));
|
m_settings->registerSetting(new Setting("JvmArgs", ""));
|
||||||
|
|
||||||
// Custom Commands
|
// Custom Commands
|
||||||
|
@ -185,9 +185,9 @@ void SettingsDialog::loadSettings(SettingsObject *s)
|
|||||||
void SettingsDialog::on_pushButton_clicked()
|
void SettingsDialog::on_pushButton_clicked()
|
||||||
{
|
{
|
||||||
JavaUtils jut;
|
JavaUtils jut;
|
||||||
QStringList paths = jut.FindJavaPath();
|
auto javas = jut.FindJavaPaths();
|
||||||
|
|
||||||
ui->javaPathTextBox->setText(paths.at(0));
|
ui->javaPathTextBox->setText(std::get<JI_PATH>(javas.at(0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsDialog::on_btnBrowse_clicked()
|
void SettingsDialog::on_btnBrowse_clicked()
|
||||||
|
@ -374,6 +374,12 @@
|
|||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="labelJavaPath">
|
<widget class="QLabel" name="labelJavaPath">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Java path:</string>
|
<string>Java path:</string>
|
||||||
</property>
|
</property>
|
||||||
@ -381,6 +387,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="labelJVMArgs">
|
<widget class="QLabel" name="labelJVMArgs">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>JVM arguments:</string>
|
<string>JVM arguments:</string>
|
||||||
</property>
|
</property>
|
||||||
@ -402,9 +414,6 @@
|
|||||||
<item row="0" column="1" colspan="3">
|
<item row="0" column="1" colspan="3">
|
||||||
<widget class="QLineEdit" name="javaPathTextBox"/>
|
<widget class="QLineEdit" name="javaPathTextBox"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1" colspan="3">
|
|
||||||
<widget class="QLineEdit" name="jvmArgsTextBox"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
<item row="1" column="2">
|
||||||
<widget class="QPushButton" name="pushButton">
|
<widget class="QPushButton" name="pushButton">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -418,6 +427,9 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="1" colspan="3">
|
||||||
|
<widget class="QLineEdit" name="jvmArgsTextBox"/>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "JavaUtils.h"
|
#include "JavaUtils.h"
|
||||||
#include "osutils.h"
|
|
||||||
#include "pathutils.h"
|
#include "pathutils.h"
|
||||||
|
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
@ -22,27 +21,33 @@
|
|||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <logger/QsLog.h>
|
#include <logger/QsLog.h>
|
||||||
|
|
||||||
#if WINDOWS
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
JavaUtils::JavaUtils()
|
JavaUtils::JavaUtils()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WINDOWS
|
std::vector<java_install> JavaUtils::GetDefaultJava()
|
||||||
QStringList JavaUtils::FindJavaPath()
|
|
||||||
{
|
{
|
||||||
QStringList paths;
|
std::vector<java_install> javas;
|
||||||
|
javas.push_back(std::make_tuple("java", "unknown", "java", false));
|
||||||
|
|
||||||
|
return javas;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if WINDOWS
|
||||||
|
std::vector<java_install> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName)
|
||||||
|
{
|
||||||
|
std::vector<java_install> javas;
|
||||||
|
|
||||||
|
QString archType = "unknown";
|
||||||
|
if(keyType == KEY_WOW64_64KEY) archType = "64";
|
||||||
|
else if(keyType == KEY_WOW64_32KEY) archType = "32";
|
||||||
|
|
||||||
HKEY jreKey;
|
HKEY jreKey;
|
||||||
QString jreKeyName = "SOFTWARE\\JavaSoft\\Java Runtime Environment";
|
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName.toStdString().c_str(), 0, KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) == ERROR_SUCCESS)
|
||||||
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, jreKeyName.toStdString().c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &jreKey) == ERROR_SUCCESS)
|
|
||||||
{
|
{
|
||||||
// Read the current JRE version from the registry.
|
// Read the current type version from the registry.
|
||||||
// This will be used to find the key that contains the JavaHome value.
|
// This will be used to find any key that contains the JavaHome value.
|
||||||
char *value = new char[0];
|
char *value = new char[0];
|
||||||
DWORD valueSz = 0;
|
DWORD valueSz = 0;
|
||||||
if (RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE*)value, &valueSz) == ERROR_MORE_DATA)
|
if (RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE*)value, &valueSz) == ERROR_MORE_DATA)
|
||||||
@ -51,64 +56,102 @@ QStringList JavaUtils::FindJavaPath()
|
|||||||
RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE*)value, &valueSz);
|
RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE*)value, &valueSz);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(jreKey);
|
QString recommended = value;
|
||||||
|
|
||||||
// Now open the registry key for the JRE version that we just got.
|
TCHAR subKeyName[255];
|
||||||
jreKeyName.append("\\").append(value);
|
DWORD subKeyNameSize, numSubKeys, retCode;
|
||||||
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, jreKeyName.toStdString().c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &jreKey) == ERROR_SUCCESS)
|
|
||||||
|
// Get the number of subkeys
|
||||||
|
RegQueryInfoKey(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||||
|
|
||||||
|
// Iterate until RegEnumKeyEx fails
|
||||||
|
if(numSubKeys > 0)
|
||||||
|
{
|
||||||
|
for(int i = 0; i < numSubKeys; i++)
|
||||||
|
{
|
||||||
|
subKeyNameSize = 255;
|
||||||
|
retCode = RegEnumKeyEx(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL, NULL);
|
||||||
|
if(retCode == ERROR_SUCCESS)
|
||||||
|
{
|
||||||
|
// Now open the registry key for the version that we just got.
|
||||||
|
QString newKeyName = keyName + "\\" + subKeyName;
|
||||||
|
|
||||||
|
HKEY newKey;
|
||||||
|
if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, newKeyName.toStdString().c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
// Read the JavaHome value to find where Java is installed.
|
// Read the JavaHome value to find where Java is installed.
|
||||||
value = new char[0];
|
value = new char[0];
|
||||||
valueSz = 0;
|
valueSz = 0;
|
||||||
if (RegQueryValueExA(jreKey, "JavaHome", NULL, NULL, (BYTE*)value, &valueSz) == ERROR_MORE_DATA)
|
if (RegQueryValueEx(newKey, "JavaHome", NULL, NULL, (BYTE*)value, &valueSz) == ERROR_MORE_DATA)
|
||||||
{
|
{
|
||||||
value = new char[valueSz];
|
value = new char[valueSz];
|
||||||
RegQueryValueExA(jreKey, "JavaHome", NULL, NULL, (BYTE*)value, &valueSz);
|
RegQueryValueEx(newKey, "JavaHome", NULL, NULL, (BYTE*)value, &valueSz);
|
||||||
|
|
||||||
paths << QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe");
|
javas.push_back(std::make_tuple(subKeyName, archType, QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe"), (recommended == subKeyName)));
|
||||||
|
}
|
||||||
|
|
||||||
|
RegCloseKey(newKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(jreKey);
|
RegCloseKey(jreKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return javas;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(paths.length() <= 0)
|
std::vector<java_install> JavaUtils::FindJavaPaths()
|
||||||
|
{
|
||||||
|
std::vector<java_install> JRE64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
|
||||||
|
std::vector<java_install> JDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
|
||||||
|
std::vector<java_install> JRE32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
|
||||||
|
std::vector<java_install> JDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
|
||||||
|
|
||||||
|
std::vector<java_install> javas;
|
||||||
|
javas.insert(javas.end(), JRE64s.begin(), JRE64s.end());
|
||||||
|
javas.insert(javas.end(), JDK64s.begin(), JDK64s.end());
|
||||||
|
javas.insert(javas.end(), JRE32s.begin(), JRE32s.end());
|
||||||
|
javas.insert(javas.end(), JDK32s.begin(), JDK32s.end());
|
||||||
|
|
||||||
|
if(javas.size() <= 0)
|
||||||
{
|
{
|
||||||
QLOG_WARN() << "Failed to find Java in the Windows registry - defaulting to \"java\"";
|
QLOG_WARN() << "Failed to find Java in the Windows registry - defaulting to \"java\"";
|
||||||
paths << "java";
|
return this->GetDefaultJava();
|
||||||
}
|
}
|
||||||
|
|
||||||
return paths;
|
QLOG_INFO() << "Found the following Java installations (64 -> 32, JRE -> JDK): ";
|
||||||
|
|
||||||
|
for(auto &java : javas)
|
||||||
|
{
|
||||||
|
QString sRec;
|
||||||
|
if(std::get<JI_REC>(java)) sRec = "(Recommended)";
|
||||||
|
QLOG_INFO() << std::get<JI_ID>(java) << std::get<JI_ARCH>(java) << " at " << std::get<JI_PATH>(java) << sRec;
|
||||||
|
}
|
||||||
|
|
||||||
|
return javas;
|
||||||
}
|
}
|
||||||
#elif OSX
|
#elif OSX
|
||||||
QStringList JavaUtils::FindJavaPath()
|
std::vector<java_install> JavaUtils::FindJavaPaths()
|
||||||
{
|
{
|
||||||
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
|
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
|
||||||
|
|
||||||
QStringList paths;
|
return this->GetDefaultJava();
|
||||||
paths << "java";
|
|
||||||
|
|
||||||
return paths;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif LINUX
|
#elif LINUX
|
||||||
QStringList JavaUtils::FindJavaPath()
|
std::vector<java_install> JavaUtils::FindJavaPaths()
|
||||||
{
|
{
|
||||||
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
|
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
|
||||||
|
|
||||||
QStringList paths;
|
return this->GetDefaultJava();
|
||||||
paths << "java";
|
|
||||||
|
|
||||||
return paths;
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
QStringList JavaUtils::FindJavaPath()
|
std::vector<java_install> JavaUtils::FindJavaPaths()
|
||||||
{
|
{
|
||||||
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
|
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
|
||||||
|
|
||||||
QStringList paths;
|
return this->GetDefaultJava();
|
||||||
paths << "java";
|
|
||||||
|
|
||||||
return paths;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -17,10 +17,28 @@
|
|||||||
|
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
|
#include "osutils.h"
|
||||||
|
|
||||||
|
#if WINDOWS
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define JI_ID 0
|
||||||
|
#define JI_ARCH 1
|
||||||
|
#define JI_PATH 2
|
||||||
|
#define JI_REC 3
|
||||||
|
typedef std::tuple<QString, QString, QString, bool> java_install;
|
||||||
|
|
||||||
class JavaUtils
|
class JavaUtils
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
JavaUtils();
|
JavaUtils();
|
||||||
|
|
||||||
QStringList FindJavaPath();
|
std::vector<java_install> FindJavaPaths();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<java_install> GetDefaultJava();
|
||||||
|
#if WINDOWS
|
||||||
|
std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
@ -143,6 +143,10 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response)
|
|||||||
args << version->mainClass;
|
args << version->mainClass;
|
||||||
args.append(processMinecraftArgs(response));
|
args.append(processMinecraftArgs(response));
|
||||||
|
|
||||||
|
// Set the width and height for 1.6 instances
|
||||||
|
args << QString("--width") << settings().get("MinecraftWinWidth").toString();
|
||||||
|
args << QString("--height") << settings().get("MinecraftWinHeight").toString();
|
||||||
|
|
||||||
// create the process and set its parameters
|
// create the process and set its parameters
|
||||||
MinecraftProcess *proc = new MinecraftProcess(this);
|
MinecraftProcess *proc = new MinecraftProcess(this);
|
||||||
proc->setMinecraftArguments(args);
|
proc->setMinecraftArguments(args);
|
||||||
|
Loading…
Reference in New Issue
Block a user