CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skin fix -> online fixes

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2022-12-23 09:35:29 +00:00
parent 94067f34cf
commit 884bd85495
8 changed files with 44 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/minecraft/MinecraftInstance.cpp
View File

@ -192,7 +192,7 @@ void MinecraftInstance::loadSpecificSettings()
m_settings->registerSetting("JoinServerOnLaunch", false);
m_settings->registerSetting("JoinServerOnLaunchAddress", "");
m_settings->registerSetting("LegacySkinFix", true);
m_settings->registerSetting("OnlineFixes", true);
qDebug() << "Instance-type specific settings were loaded!";
@ -440,7 +440,7 @@ QStringList MinecraftInstance::javaArguments()
args << "-Duser.language=en";
if (javaVersion.isModular() && traits().contains("legacySkins") && settings()->get("LegacySkinFix").toBool())
if (javaVersion.isModular() && traits().contains("legacyServices") && settings()->get("OnlineFixes").toBool())
// allow reflective access to java.net - required by the skin fix
args << "--add-opens"
<< "java.base/java.net=ALL-UNNAMED";
@ -665,8 +665,8 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
launchScript += "traits " + trait + "\n";
}
if (profile->getTraits().contains("legacySkins") && settings()->get("LegacySkinFix").toBool())
launchScript += "fixes legacySkinFix\n";
if (profile->getTraits().contains("legacyServices") && settings()->get("OnlineFixes").toBool())
launchScript += "onlineFixes true\n";
launchScript += "launcher " + getLauncher() + "\n";

8
launcher/ui/pages/instance/InstanceSettingsPage.cpp
View File

@ -276,8 +276,8 @@ void InstanceSettingsPage::applySettings()
m_settings->reset("JoinServerOnLaunchAddress");
}
bool legacySkinFix = ui->legacySkinFix->isChecked();
m_settings->set("LegacySkinFix", legacySkinFix);
bool onlineFixes = ui->onlineFixes->isChecked();
m_settings->set("OnlineFixes", onlineFixes);
// FIXME: This should probably be called by a signal instead
m_instance->updateRuntimeContext();
@ -377,8 +377,8 @@ void InstanceSettingsPage::loadSettings()
ui->serverJoinGroupBox->setChecked(m_settings->get("JoinServerOnLaunch").toBool());
ui->serverJoinAddress->setText(m_settings->get("JoinServerOnLaunchAddress").toString());
ui->legacySkinFix->setChecked(m_settings->get("LegacySkinFix").toBool());
ui->legacySkinFix->setVisible(m_instance->traits().contains("legacySkins"));
ui->onlineFixes->setChecked(m_settings->get("OnlineFixes").toBool());
ui->onlineFixes->setVisible(m_instance->traits().contains("legacyServices"));
}
void InstanceSettingsPage::on_javaDetectBtn_clicked()

6
launcher/ui/pages/instance/InstanceSettingsPage.ui
View File

@ -609,12 +609,12 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="legacySkinFix">
<widget class="QCheckBox" name="onlineFixes">
<property name="toolTip">
<string>Enables support for modern skins on old versions.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fixes usages of old online services which are no longer operating by emulating them or redirecting to their modern counterparts.&lt;/p&gt;&lt;p&gt;This currently only allows modern skins to be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Enable legacy skin fix</string>
<string>Enable online fixes</string>
</property>
</widget>
</item>