Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-27 12:46:22 +01:00
Code Issues Projects Releases Wiki Activity

Re-add offline session button & alter play button

Browse Source
This commit is contained in:
Henry Le Grys 2021-02-09 01:36:04 +00:00
parent d2127e9b13
commit 3effa7d674
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
launcher/src/main/java/com/skcraft/launcher/dialog/AccountSelectDialog.java
View File

@ -8,6 +8,7 @@ import com.skcraft.concurrency.ObservableFuture;
import com.skcraft.concurrency.ProgressObservable; import com.skcraft.concurrency.ProgressObservable;
import com.skcraft.launcher.Launcher; import com.skcraft.launcher.Launcher;
import com.skcraft.launcher.auth.LoginService; import com.skcraft.launcher.auth.LoginService;
import com.skcraft.launcher.auth.OfflineSession;
import com.skcraft.launcher.auth.SavedSession; import com.skcraft.launcher.auth.SavedSession;
import com.skcraft.launcher.auth.Session; import com.skcraft.launcher.auth.Session;
import com.skcraft.launcher.persistence.Persistence; import com.skcraft.launcher.persistence.Persistence;
@ -23,11 +24,12 @@ import java.util.concurrent.Callable;
public class AccountSelectDialog extends JDialog { public class AccountSelectDialog extends JDialog {
private final JList<SavedSession> accountList; private final JList<SavedSession> accountList;
private final JButton loginButton = new JButton(SharedLocale.tr("login.login")); private final JButton loginButton = new JButton(SharedLocale.tr("accounts.play"));
private final JButton cancelButton = new JButton(SharedLocale.tr("button.cancel")); private final JButton cancelButton = new JButton(SharedLocale.tr("button.cancel"));
private final JButton addMojangButton = new JButton(SharedLocale.tr("accounts.addMojang")); private final JButton addMojangButton = new JButton(SharedLocale.tr("accounts.addMojang"));
private final JButton addMicrosoftButton = new JButton(SharedLocale.tr("accounts.addMicrosoft")); private final JButton addMicrosoftButton = new JButton(SharedLocale.tr("accounts.addMicrosoft"));
private final JButton removeSelected = new JButton(SharedLocale.tr("accounts.removeSelected")); private final JButton removeSelected = new JButton(SharedLocale.tr("accounts.removeSelected"));
private final JButton offlineButton = new JButton(SharedLocale.tr("login.playOffline"));
private final LinedBoxPanel buttonsPanel = new LinedBoxPanel(true); private final LinedBoxPanel buttonsPanel = new LinedBoxPanel(true);
private final Launcher launcher; private final Launcher launcher;
@ -42,7 +44,7 @@ public class AccountSelectDialog extends JDialog {
setTitle(SharedLocale.tr("accounts.title")); setTitle(SharedLocale.tr("accounts.title"));
initComponents(); initComponents();
setDefaultCloseOperation(DISPOSE_ON_CLOSE); setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setMinimumSize(new Dimension(450, 70)); setMinimumSize(new Dimension(350, 170));
setResizable(false); setResizable(false);
pack(); pack();
setLocationRelativeTo(owner); setLocationRelativeTo(owner);
@ -52,7 +54,7 @@ public class AccountSelectDialog extends JDialog {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
accountList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); accountList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
accountList.setLayoutOrientation(JList.HORIZONTAL_WRAP); accountList.setLayoutOrientation(JList.VERTICAL);
accountList.setVisibleRowCount(0); accountList.setVisibleRowCount(0);
accountList.setCellRenderer(new AccountRenderer()); accountList.setCellRenderer(new AccountRenderer());
@ -61,8 +63,12 @@ public class AccountSelectDialog extends JDialog {
accountPane.setAlignmentX(CENTER_ALIGNMENT); accountPane.setAlignmentX(CENTER_ALIGNMENT);
loginButton.setFont(loginButton.getFont().deriveFont(Font.BOLD)); loginButton.setFont(loginButton.getFont().deriveFont(Font.BOLD));
loginButton.setMargin(new Insets(0, 10, 0, 10));
buttonsPanel.setBorder(BorderFactory.createEmptyBorder(26, 13, 13, 13)); buttonsPanel.setBorder(BorderFactory.createEmptyBorder(26, 13, 13, 13));
if (launcher.getConfig().isOfflineEnabled()) {
buttonsPanel.addElement(offlineButton);
}
buttonsPanel.addGlue(); buttonsPanel.addGlue();
buttonsPanel.addElement(loginButton); buttonsPanel.addElement(loginButton);
buttonsPanel.addElement(cancelButton); buttonsPanel.addElement(cancelButton);
@ -100,6 +106,9 @@ public class AccountSelectDialog extends JDialog {
addMicrosoftButton.addActionListener(ev -> attemptMicrosoftLogin()); addMicrosoftButton.addActionListener(ev -> attemptMicrosoftLogin());
offlineButton.addActionListener(ev ->
setResult(new OfflineSession(launcher.getProperties().getProperty("offlinePlayerName"))));
removeSelected.addActionListener(ev -> { removeSelected.addActionListener(ev -> {
if (accountList.getSelectedValue() != null) { if (accountList.getSelectedValue() != null) {
launcher.getAccounts().remove(accountList.getSelectedValue()); launcher.getAccounts().remove(accountList.getSelectedValue());
@ -119,7 +128,7 @@ public class AccountSelectDialog extends JDialog {
AccountSelectDialog dialog = new AccountSelectDialog(owner, launcher); AccountSelectDialog dialog = new AccountSelectDialog(owner, launcher);
dialog.setVisible(true); dialog.setVisible(true);
if (dialog.selected != null) { if (dialog.selected != null && dialog.selected.isOnline()) {
launcher.getAccounts().update(dialog.selected.toSavedSession()); launcher.getAccounts().update(dialog.selected.toSavedSession());
} }

1
launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties
View File

@ -88,6 +88,7 @@ launcher.requiresUpdateHint=(requires update)
launcher.updatePendingHint=(pending update) launcher.updatePendingHint=(pending update)
accounts.title=Select the account to play with accounts.title=Select the account to play with
accounts.play=Play!
accounts.refreshingStatus=Refreshing login session... accounts.refreshingStatus=Refreshing login session...
accounts.addMojang=Add Mojang account accounts.addMojang=Add Mojang account
accounts.addMicrosoft=Add Microsoft account accounts.addMicrosoft=Add Microsoft account