Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2025-02-26 03:21:51 +01:00
Code Issues Projects Releases Wiki Activity

Add account selector to creator tools

Browse Source
This commit is contained in:
Henry Le Grys 2021-02-10 01:46:46 +00:00
parent 6b442c771e
commit b18c29a5ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
View File

@ -21,18 +21,18 @@ import com.skcraft.launcher.auth.Session;
import com.skcraft.launcher.builder.BuilderConfig; import com.skcraft.launcher.builder.BuilderConfig;
import com.skcraft.launcher.builder.FnPatternList; import com.skcraft.launcher.builder.FnPatternList;
import com.skcraft.launcher.creator.Creator; import com.skcraft.launcher.creator.Creator;
import com.skcraft.launcher.creator.model.creator.*;
import com.skcraft.launcher.creator.controller.task.*; import com.skcraft.launcher.creator.controller.task.*;
import com.skcraft.launcher.creator.dialog.*; import com.skcraft.launcher.creator.dialog.*;
import com.skcraft.launcher.creator.dialog.BuildDialog.BuildOptions; import com.skcraft.launcher.creator.dialog.BuildDialog.BuildOptions;
import com.skcraft.launcher.creator.dialog.DeployServerDialog.DeployOptions; import com.skcraft.launcher.creator.dialog.DeployServerDialog.DeployOptions;
import com.skcraft.launcher.creator.model.creator.*;
import com.skcraft.launcher.creator.model.swing.PackTableModel; import com.skcraft.launcher.creator.model.swing.PackTableModel;
import com.skcraft.launcher.creator.server.TestServer; import com.skcraft.launcher.creator.server.TestServer;
import com.skcraft.launcher.creator.server.TestServerBuilder; import com.skcraft.launcher.creator.server.TestServerBuilder;
import com.skcraft.launcher.creator.swing.PackDirectoryFilter; import com.skcraft.launcher.creator.swing.PackDirectoryFilter;
import com.skcraft.launcher.dialog.AccountSelectDialog;
import com.skcraft.launcher.dialog.ConfigurationDialog; import com.skcraft.launcher.dialog.ConfigurationDialog;
import com.skcraft.launcher.dialog.ConsoleFrame; import com.skcraft.launcher.dialog.ConsoleFrame;
import com.skcraft.launcher.dialog.LoginDialog;
import com.skcraft.launcher.dialog.ProgressDialog; import com.skcraft.launcher.dialog.ProgressDialog;
import com.skcraft.launcher.model.modpack.LaunchModifier; import com.skcraft.launcher.model.modpack.LaunchModifier;
import com.skcraft.launcher.persistence.Persistence; import com.skcraft.launcher.persistence.Persistence;
@ -225,7 +225,7 @@ public class PackManagerController {
if (config.isOfflineEnabled()) { if (config.isOfflineEnabled()) {
return true; return true;
} else { } else {
Session session = LoginDialog.showLoginRequest(frame, launcher); Session session = AccountSelectDialog.showAccountRequest(frame, launcher);
if (session != null) { if (session != null) {
config.setOfflineEnabled(true); config.setOfflineEnabled(true);
Persistence.commitAndForget(config); Persistence.commitAndForget(config);
@ -734,7 +734,7 @@ public class PackManagerController {
Session session; Session session;
if (online) { if (online) {
session = LoginDialog.showLoginRequest(frame, launcher); session = AccountSelectDialog.showAccountRequest(frame, launcher);
if (session == null) { if (session == null) {
return; return;
} }