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

Use cell renderer instead of raw strings

Browse Source
This commit is contained in:
Lenni0451 2023-06-19 18:28:57 +02:00
parent 68d4a4b72d
commit 370222b2a9
No known key found for this signature in database
GPG Key ID: 5D59B86635AD3F2F
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import net.raphimc.viaproxy.util.TFunction;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
@ -41,7 +42,7 @@ import java.util.function.Consumer;
public class AccountsTab extends AUITab { public class AccountsTab extends AUITab {
private JList<String> accountsList; private JList<Account> accountsList;
private JButton addMicrosoftAccountButton; private JButton addMicrosoftAccountButton;
private JButton addBedrockAccountButton; private JButton addBedrockAccountButton;
@ -88,7 +89,7 @@ public class AccountsTab extends AUITab {
scrollPane.setBounds(10, 105, 465, 110); scrollPane.setBounds(10, 105, 465, 110);
contentPane.add(scrollPane); contentPane.add(scrollPane);
DefaultListModel<String> model = new DefaultListModel<>(); DefaultListModel<Account> model = new DefaultListModel<>();
this.accountsList = new JList<>(model); this.accountsList = new JList<>(model);
this.accountsList.addMouseListener(new MouseAdapter() { this.accountsList.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
@ -115,6 +116,19 @@ public class AccountsTab extends AUITab {
} }
} }
}); });
this.accountsList.setCellRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
DefaultListCellRenderer component = (DefaultListCellRenderer) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
Account account = (Account) value;
if (Options.MC_ACCOUNT == account) {
component.setText("<html><span style=\"color:rgb(0, 180, 0)\"><b>" + account.getDisplayString() + "</b></span></html>");
} else {
component.setText(account.getDisplayString());
}
return component;
}
});
scrollPane.setViewportView(this.accountsList); scrollPane.setViewportView(this.accountsList);
JPopupMenu contextMenu = new JPopupMenu(); JPopupMenu contextMenu = new JPopupMenu();
@ -131,19 +145,13 @@ public class AccountsTab extends AUITab {
removeItem.addActionListener(event -> { removeItem.addActionListener(event -> {
int index = this.accountsList.getSelectedIndex(); int index = this.accountsList.getSelectedIndex();
if (index != -1) { if (index != -1) {
String removedName = model.remove(index); Account removed = model.remove(index);
if (removedName.contains("<")) { ViaProxy.saveManager.accountsSave.removeAccount(removed);
ViaProxy.saveManager.save();
if (Options.MC_ACCOUNT == removed) {
if (model.isEmpty()) this.markSelected(-1); if (model.isEmpty()) this.markSelected(-1);
else this.markSelected(0); else this.markSelected(0);
} }
final Account account = ViaProxy.saveManager.accountsSave.getAccounts().get(index);
if (account != null) {
ViaProxy.saveManager.accountsSave.removeAccount(account);
ViaProxy.saveManager.save();
} else {
throw new IllegalStateException("Account is null");
}
} }
if (index < model.getSize()) this.accountsList.setSelectedIndex(index); if (index < model.getSize()) this.accountsList.setSelectedIndex(index);
else if (index > 0) this.accountsList.setSelectedIndex(index - 1); else if (index > 0) this.accountsList.setSelectedIndex(index - 1);
@ -219,7 +227,7 @@ public class AccountsTab extends AUITab {
@Override @Override
public void setReady() { public void setReady() {
ViaProxy.saveManager.accountsSave.getAccounts().forEach(this::addAccount); ViaProxy.saveManager.accountsSave.getAccounts().forEach(this::addAccount);
DefaultListModel<String> model = (DefaultListModel<String>) this.accountsList.getModel(); DefaultListModel<Account> model = (DefaultListModel<Account>) this.accountsList.getModel();
if (!model.isEmpty()) this.markSelected(0); if (!model.isEmpty()) this.markSelected(0);
} }
@ -233,8 +241,8 @@ public class AccountsTab extends AUITab {
} }
private void addAccount(final Account account) { private void addAccount(final Account account) {
DefaultListModel<String> model = (DefaultListModel<String>) this.accountsList.getModel(); DefaultListModel<Account> model = (DefaultListModel<Account>) this.accountsList.getModel();
model.addElement(account.getDisplayString()); model.addElement(account);
} }
public void markSelected(final int index) { public void markSelected(final int index) {
@ -243,47 +251,36 @@ public class AccountsTab extends AUITab {
return; return;
} }
DefaultListModel<String> model = (DefaultListModel<String>) this.accountsList.getModel(); Options.MC_ACCOUNT = ViaProxy.saveManager.accountsSave.getAccounts().get(index);
for (int i = 0; i < model.getSize(); i++) model.setElementAt(model.getElementAt(i).replaceAll("<[^>]+>", ""), i); accountsList.repaint();
model.setElementAt("<html><span style=\"color:rgb(0, 180, 0)\"><b>" + model.getElementAt(index) + "</b></span></html>", index);
Account account = ViaProxy.saveManager.accountsSave.getAccounts().get(index);
if (account != null) Options.MC_ACCOUNT = account;
else throw new IllegalStateException("Account is null"); //Lists desynced
} }
private void moveUp(final int index) { private void moveUp(final int index) {
DefaultListModel<String> model = (DefaultListModel<String>) this.accountsList.getModel(); DefaultListModel<Account> model = (DefaultListModel<Account>) this.accountsList.getModel();
if (model.getSize() == 0) return;
if (index == 0) return; if (index == 0) return;
String name = model.remove(index);
model.add(index - 1, name); Account account = model.remove(index);
model.add(index - 1, account);
this.accountsList.setSelectedIndex(index - 1); this.accountsList.setSelectedIndex(index - 1);
Account account = ViaProxy.saveManager.accountsSave.getAccounts().get(index); ViaProxy.saveManager.accountsSave.removeAccount(account);
if (account != null) { ViaProxy.saveManager.accountsSave.addAccount(index - 1, account);
ViaProxy.saveManager.accountsSave.removeAccount(account); ViaProxy.saveManager.save();
ViaProxy.saveManager.accountsSave.addAccount(index - 1, account);
ViaProxy.saveManager.save();
} else {
throw new IllegalStateException("Account is null");
}
} }
private void moveDown(final int index) { private void moveDown(final int index) {
DefaultListModel<String> model = (DefaultListModel<String>) this.accountsList.getModel(); DefaultListModel<Account> model = (DefaultListModel<Account>) this.accountsList.getModel();
if (model.getSize() == 0) return;
if (index == model.getSize() - 1) return; if (index == model.getSize() - 1) return;
String name = model.remove(index);
model.add(index + 1, name); Account account = model.remove(index);
model.add(index + 1, account);
this.accountsList.setSelectedIndex(index + 1); this.accountsList.setSelectedIndex(index + 1);
Account account = ViaProxy.saveManager.accountsSave.getAccounts().get(index); ViaProxy.saveManager.accountsSave.removeAccount(account);
if (account != null) { ViaProxy.saveManager.accountsSave.addAccount(index + 1, account);
ViaProxy.saveManager.accountsSave.removeAccount(account); ViaProxy.saveManager.save();
ViaProxy.saveManager.accountsSave.addAccount(index + 1, account);
ViaProxy.saveManager.save();
} else {
throw new IllegalStateException("Account is null");
}
} }
private void handleLogin(final TFunction<Consumer<StepMsaDeviceCode.MsaDeviceCode>, Account> requestHandler) { private void handleLogin(final TFunction<Consumer<StepMsaDeviceCode.MsaDeviceCode>, Account> requestHandler) {