Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-28 12:55:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed account selection being reset (or not reset) sometimes

Browse Source
This commit is contained in:
RaphiMC 2023-01-10 22:39:48 +01:00
parent 4a78b4becb
commit 8d10f9956d
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/raphimc/viaproxy/ui/ViaProxyUI.java
View File

@ -17,8 +17,8 @@ public class ViaProxyUI extends JFrame {
private final JTabbedPane contentPane = new JTabbedPane(); private final JTabbedPane contentPane = new JTabbedPane();
private final List<AUITab> tabs = new ArrayList<>(); private final List<AUITab> tabs = new ArrayList<>();
private final GeneralTab generalTab = new GeneralTab(this); public final GeneralTab generalTab = new GeneralTab(this);
private final AccountsTab accountsTab = new AccountsTab(this); public final AccountsTab accountsTab = new AccountsTab(this);
private ImageIcon icon; private ImageIcon icon;

9
src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
View File

@ -9,7 +9,10 @@ import net.raphimc.viaproxy.ui.ViaProxyUI;
import net.raphimc.viaproxy.ui.popups.AddAccountPopup; import net.raphimc.viaproxy.ui.popups.AddAccountPopup;
import javax.swing.*; import javax.swing.*;
import java.awt.event.*; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
public class AccountsTab extends AUITab { public class AccountsTab extends AUITab {
@ -213,8 +216,8 @@ public class AccountsTab extends AUITab {
else model.addElement(account.name() + " (Microsoft)"); else model.addElement(account.name() + " (Microsoft)");
} }
private void markSelected(final int index) { public void markSelected(final int index) {
if (index == -1) { if (index < 0 || index >= this.accountsList.getModel().getSize()) {
Options.MC_ACCOUNT = null; Options.MC_ACCOUNT = null;
return; return;
} }

10
src/main/java/net/raphimc/viaproxy/ui/impl/GeneralTab.java
View File

@ -166,7 +166,15 @@ public class GeneralTab extends AUITab {
Options.PROTOCOL_VERSION = serverVersion; Options.PROTOCOL_VERSION = serverVersion;
Options.BETACRAFT_AUTH = betaCraftAuth; Options.BETACRAFT_AUTH = betaCraftAuth;
if (authMethod == 2) Options.OPENAUTHMOD_AUTH = true; if (authMethod != 1) {
Options.MC_ACCOUNT = null;
} else if (Options.MC_ACCOUNT == null) {
this.frame.accountsTab.markSelected(0);
}
if (authMethod == 2) {
Options.OPENAUTHMOD_AUTH = true;
}
} catch (Throwable e) { } catch (Throwable e) {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
this.frame.showError("Invalid server address!"); this.frame.showError("Invalid server address!");