-
+
+
-
-
+
+
+To build this yourself, follow the instructions on the PolyMC website but clone this repo instead.
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index c4179b49..cb3f6c8c 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -881,6 +881,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
m_metacache->addBase("translations", QDir("translations").absolutePath());
m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
m_metacache->addBase("meta", QDir("meta").absolutePath());
+ m_metacache->addBase("injectors", QDir("injectors").absolutePath());
m_metacache->Load();
qDebug() << "<> Cache initialized.";
}
@@ -1223,7 +1224,8 @@ void Application::setIconTheme(const QString& name)
QIcon Application::getThemedIcon(const QString& name)
{
if(name == "logo") {
- return QIcon(":/org.polymc.PolyMC.svg");
+ // why is this hardcoded lol
+ return QIcon(":/org.fn2006.PollyMC.svg");
}
return QIcon::fromTheme(name);
}
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index e44b98eb..360209b5 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -206,11 +206,15 @@ set(MINECRAFT_SOURCES
minecraft/auth/flows/MSA.h
minecraft/auth/flows/Offline.cpp
minecraft/auth/flows/Offline.h
+ minecraft/auth/flows/Elyby.cpp
+ minecraft/auth/flows/Elyby.h
- minecraft/auth/steps/OfflineStep.cpp
- minecraft/auth/steps/OfflineStep.h
minecraft/auth/steps/EntitlementsStep.cpp
minecraft/auth/steps/EntitlementsStep.h
+ minecraft/auth/steps/ElybyProfileStep.cpp
+ minecraft/auth/steps/ElybyProfileStep.h
+ minecraft/auth/steps/ElybyStep.cpp
+ minecraft/auth/steps/ElybyStep.h
minecraft/auth/steps/GetSkinStep.cpp
minecraft/auth/steps/GetSkinStep.h
minecraft/auth/steps/LauncherLoginStep.cpp
@@ -223,6 +227,8 @@ set(MINECRAFT_SOURCES
minecraft/auth/steps/MinecraftProfileStepMojang.h
minecraft/auth/steps/MSAStep.cpp
minecraft/auth/steps/MSAStep.h
+ minecraft/auth/steps/OfflineStep.cpp
+ minecraft/auth/steps/OfflineStep.h
minecraft/auth/steps/XboxAuthorizationStep.cpp
minecraft/auth/steps/XboxAuthorizationStep.h
minecraft/auth/steps/XboxProfileStep.cpp
@@ -258,6 +264,8 @@ set(MINECRAFT_SOURCES
minecraft/launch/LauncherPartLaunch.h
minecraft/launch/MinecraftServerTarget.cpp
minecraft/launch/MinecraftServerTarget.h
+ minecraft/launch/InjectAuthlib.cpp
+ minecraft/launch/InjectAuthlib.h
minecraft/launch/PrintInstanceInfo.cpp
minecraft/launch/PrintInstanceInfo.h
minecraft/launch/ReconstructAssets.cpp
@@ -774,6 +782,8 @@ SET(LAUNCHER_SOURCES
ui/dialogs/CustomMessageBox.h
ui/dialogs/EditAccountDialog.cpp
ui/dialogs/EditAccountDialog.h
+ ui/dialogs/ElybyLoginDialog.cpp
+ ui/dialogs/ElybyLoginDialog.h
ui/dialogs/ExportInstanceDialog.cpp
ui/dialogs/ExportInstanceDialog.h
ui/dialogs/IconPickerDialog.cpp
@@ -924,6 +934,7 @@ qt_wrap_ui(LAUNCHER_UI
ui/dialogs/IconPickerDialog.ui
ui/dialogs/MSALoginDialog.ui
ui/dialogs/OfflineLoginDialog.ui
+ ui/dialogs/ElybyLoginDialog.ui
ui/dialogs/AboutDialog.ui
ui/dialogs/LoginDialog.ui
ui/dialogs/EditAccountDialog.ui
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 9478b1b8..ef1fbfef 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -356,6 +356,7 @@ QStringList MinecraftInstance::extraArguments()
if (!addn.isEmpty()) {
list.append(addn);
}
+
auto agents = m_components->getProfile()->getAgents();
for (auto agent : agents)
{
@@ -363,6 +364,13 @@ QStringList MinecraftInstance::extraArguments()
agent->library()->getApplicableFiles(currentSystem, jar, temp1, temp2, temp3, getLocalLibraryPath());
list.append("-javaagent:"+jar[0]+(agent->argument().isEmpty() ? "" : "="+agent->argument()));
}
+
+ // TODO: figure out how polymc's javaagent system works and use it instead of this hack
+ if (m_injector) {
+ list.append("-javaagent:"+m_injector->javaArg);
+ list.append("-Dauthlibinjector.noShowServerName");
+ }
+
return list;
}
@@ -978,7 +986,14 @@ shared_qobject_ptr