Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-10-03 05:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finished tabs

Browse Source
This commit is contained in:
Lenni0451 2023-09-16 19:22:02 +02:00
parent ec028e8723
commit 345ecd8b78
No known key found for this signature in database
GPG Key ID: 5D59B86635AD3F2F
5 changed files with 136 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,9 @@ import java.util.List;
public class ViaProxyUI extends JFrame {
public static final int BORDER_PADDING = 10;
public static final int BODY_BLOCK_PADDING = 10;
private final JTabbedPane contentPane = new JTabbedPane();
private final List<AUITab> tabs = new ArrayList<>();

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

@ -28,6 +28,7 @@ import net.raphimc.viaproxy.saves.impl.accounts.MicrosoftAccount;
import net.raphimc.viaproxy.ui.AUITab;
import net.raphimc.viaproxy.ui.ViaProxyUI;
import net.raphimc.viaproxy.ui.popups.AddAccountPopup;
import net.raphimc.viaproxy.util.GBC;
import net.raphimc.viaproxy.util.TFunction;
import org.apache.http.impl.client.CloseableHttpClient;
@ -40,6 +41,9 @@ import java.awt.event.MouseEvent;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import static net.raphimc.viaproxy.ui.ViaProxyUI.BODY_BLOCK_PADDING;
import static net.raphimc.viaproxy.ui.ViaProxyUI.BORDER_PADDING;
public class AccountsTab extends AUITab {
private JList<Account> accountsList;
@ -55,40 +59,22 @@ public class AccountsTab extends AUITab {
@Override
protected void init(JPanel contentPane) {
{
JLabel infoLabel = new JLabel("To join online mode servers you have to add minecraft accounts for ViaProxy to use.");
infoLabel.setBounds(10, 10, 500, 20);
contentPane.add(infoLabel);
}
{
JLabel info2Label = new JLabel("You can select the account by right clicking it. By default the first one will be used.");
info2Label.setBounds(10, 30, 500, 20);
contentPane.add(info2Label);
}
{
JLabel infoLabel = new JLabel("<html>If you change your account frequently, you can install <a href=\"\">OpenAuthMod</a> on your</html>");
infoLabel.setBounds(10, 60, 500, 20);
contentPane.add(infoLabel);
JPanel body = new JPanel();
body.setLayout(new GridBagLayout());
JLabel infoLabel2 = new JLabel("client. This allows ViaProxy to use the account you are logged in with on the client.");
infoLabel2.setBounds(10, 80, 500, 20);
contentPane.add(infoLabel2);
JLabel clickRect = new JLabel();
clickRect.setBounds(305, 60, 90, 24);
clickRect.addMouseListener(new MouseAdapter() {
@Override
public void mouseReleased(MouseEvent e) {
frame.openURL("https://github.com/RaphiMC/OpenAuthMod/");
}
});
contentPane.add(clickRect);
{
JLabel infoLabel = new JLabel("""
<html>
<p>To join online mode servers you have to add minecraft accounts for ViaProxy to use.</p>
<p>You can select the account by right clicking it. By default the first one will be used.</p>
<br>
<p>If you change your account frequently, you can install OpenAuthMod on your client.</p>
<p>This allows ViaProxy to use the account you are logged in with on the client.</p>
</html>""");
GBC.create(body).grid(0, 0).weightx(1).insets(BORDER_PADDING, BORDER_PADDING, 0, BORDER_PADDING).fill(GridBagConstraints.HORIZONTAL).add(infoLabel);
}
{
JScrollPane scrollPane = new JScrollPane();
scrollPane.setBounds(10, 105, 465, 110);
contentPane.add(scrollPane);
DefaultListModel<Account> model = new DefaultListModel<>();
this.accountsList = new JList<>(model);
this.accountsList.addMouseListener(new MouseAdapter() {
@ -130,7 +116,6 @@ public class AccountsTab extends AUITab {
}
});
scrollPane.setViewportView(this.accountsList);
JPopupMenu contextMenu = new JPopupMenu();
{
JMenuItem selectItem = new JMenuItem("Select account");
@ -175,53 +160,59 @@ public class AccountsTab extends AUITab {
contextMenu.add(moveDown);
}
this.accountsList.setComponentPopupMenu(contextMenu);
}
final JPanel addButtons = new JPanel();
addButtons.setBorder(BorderFactory.createTitledBorder("Add Account"));
addButtons.setBounds(10, 220, 465, 50);
addButtons.setLayout(null);
contentPane.add(addButtons);
{
JButton addOfflineAccountButton = new JButton("Offline Account");
addOfflineAccountButton.setBounds(10, 20, 145, 20);
addOfflineAccountButton.addActionListener(event -> {
String username = JOptionPane.showInputDialog(this.frame, "Enter your offline mode Username:", "Add Offline Account", JOptionPane.PLAIN_MESSAGE);
if (username != null && !username.trim().isEmpty()) {
Account account = ViaProxy.saveManager.accountsSave.addAccount(username);
ViaProxy.saveManager.save();
this.addAccount(account);
}
});
addButtons.add(addOfflineAccountButton);
GBC.create(body).grid(0, 1).weight(1, 1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, BORDER_PADDING).fill(GridBagConstraints.BOTH).add(scrollPane);
}
{
this.addMicrosoftAccountButton = new JButton("Microsoft Account");
this.addMicrosoftAccountButton.setBounds(160, 20, 145, 20);
this.addMicrosoftAccountButton.addActionListener(event -> {
this.addMicrosoftAccountButton.setEnabled(false);
this.handleLogin(msaDeviceCodeConsumer -> {
try (final CloseableHttpClient httpClient = MicrosoftConstants.createHttpClient()) {
return new MicrosoftAccount(MinecraftAuth.JAVA_DEVICE_CODE_LOGIN.getFromInput(httpClient, new StepMsaDeviceCode.MsaDeviceCodeCallback(msaDeviceCodeConsumer)));
final JPanel addButtons = new JPanel();
addButtons.setLayout(new GridLayout(1, 3, BORDER_PADDING, 0));
contentPane.add(addButtons);
{
JButton addOfflineAccountButton = new JButton("Offline Account");
addOfflineAccountButton.addActionListener(event -> {
String username = JOptionPane.showInputDialog(this.frame, "Enter your offline mode Username:", "Add Offline Account", JOptionPane.PLAIN_MESSAGE);
if (username != null && !username.trim().isEmpty()) {
Account account = ViaProxy.saveManager.accountsSave.addAccount(username);
ViaProxy.saveManager.save();
this.addAccount(account);
}
});
});
addButtons.add(this.addMicrosoftAccountButton);
}
{
this.addBedrockAccountButton = new JButton("Bedrock Account");
this.addBedrockAccountButton.setBounds(310, 20, 145, 20);
this.addBedrockAccountButton.addActionListener(event -> {
this.addBedrockAccountButton.setEnabled(false);
this.handleLogin(msaDeviceCodeConsumer -> {
try (final CloseableHttpClient httpClient = MicrosoftConstants.createHttpClient()) {
return new BedrockAccount(MinecraftAuth.BEDROCK_DEVICE_CODE_LOGIN.getFromInput(httpClient, new StepMsaDeviceCode.MsaDeviceCodeCallback(msaDeviceCodeConsumer)));
}
addButtons.add(addOfflineAccountButton);
}
{
this.addMicrosoftAccountButton = new JButton("Microsoft Account");
this.addMicrosoftAccountButton.addActionListener(event -> {
this.addMicrosoftAccountButton.setEnabled(false);
this.handleLogin(msaDeviceCodeConsumer -> {
try (final CloseableHttpClient httpClient = MicrosoftConstants.createHttpClient()) {
return new MicrosoftAccount(MinecraftAuth.JAVA_DEVICE_CODE_LOGIN.getFromInput(httpClient, new StepMsaDeviceCode.MsaDeviceCodeCallback(msaDeviceCodeConsumer)));
}
});
});
});
addButtons.add(this.addBedrockAccountButton);
addButtons.add(this.addMicrosoftAccountButton);
}
{
this.addBedrockAccountButton = new JButton("Bedrock Account");
this.addBedrockAccountButton.addActionListener(event -> {
this.addBedrockAccountButton.setEnabled(false);
this.handleLogin(msaDeviceCodeConsumer -> {
try (final CloseableHttpClient httpClient = MicrosoftConstants.createHttpClient()) {
return new BedrockAccount(MinecraftAuth.BEDROCK_DEVICE_CODE_LOGIN.getFromInput(httpClient, new StepMsaDeviceCode.MsaDeviceCodeCallback(msaDeviceCodeConsumer)));
}
});
});
addButtons.add(this.addBedrockAccountButton);
}
JPanel border = new JPanel();
border.setLayout(new GridBagLayout());
border.setBorder(BorderFactory.createTitledBorder("Add Account"));
GBC.create(border).grid(0, 0).weightx(1).insets(2, 4, 4, 4).fill(GridBagConstraints.HORIZONTAL).add(addButtons);
GBC.create(body).grid(0, 2).weightx(1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, BORDER_PADDING, BORDER_PADDING).fill(GridBagConstraints.HORIZONTAL).add(border);
}
contentPane.setLayout(new BorderLayout());
contentPane.add(body, BorderLayout.CENTER);
}
@Override

91
src/main/java/net/raphimc/viaproxy/ui/impl/AdvancedTab.java
View File

@ -24,9 +24,11 @@ import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.saves.impl.UISave;
import net.raphimc.viaproxy.ui.AUITab;
import net.raphimc.viaproxy.ui.ViaProxyUI;
import net.raphimc.viaproxy.util.GBC;
import net.raphimc.viaproxy.util.logging.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.appender.RollingRandomAccessFileAppender;
import org.jdesktop.swingx.VerticalLayout;
import javax.swing.*;
import java.awt.*;
@ -34,6 +36,9 @@ import java.awt.datatransfer.StringSelection;
import java.io.File;
import java.io.FileNotFoundException;
import static net.raphimc.viaproxy.ui.ViaProxyUI.BODY_BLOCK_PADDING;
import static net.raphimc.viaproxy.ui.ViaProxyUI.BORDER_PADDING;
public class AdvancedTab extends AUITab {
JSpinner bindPort;
@ -51,72 +56,93 @@ public class AdvancedTab extends AUITab {
@Override
protected void init(JPanel contentPane) {
JPanel top = new JPanel();
top.setLayout(new VerticalLayout());
JPanel bottom = new JPanel();
bottom.setLayout(new VerticalLayout());
this.addBody(top);
this.addFooter(bottom);
contentPane.setLayout(new BorderLayout());
contentPane.add(top, BorderLayout.NORTH);
contentPane.add(bottom, BorderLayout.SOUTH);
}
private void addBody(final Container parent) {
JPanel body = new JPanel();
body.setLayout(new GridBagLayout());
int gridy = 0;
{
String toolTipText = "The port the proxy should bind to.";
JLabel bindPortLabel = new JLabel("Bind Port:");
bindPortLabel.setBounds(10, 10, 100, 20);
bindPortLabel.setToolTipText(toolTipText);
contentPane.add(bindPortLabel);
GBC.create(body).grid(0, gridy++).insets(BORDER_PADDING, BORDER_PADDING, 0, 0).anchor(GridBagConstraints.NORTHWEST).add(bindPortLabel);
this.bindPort = new JSpinner(new SpinnerNumberModel(25568, 1, 65535, 1));
this.bindPort.setBounds(10, 30, 465, 22);
this.bindPort.setToolTipText(toolTipText);
ViaProxy.saveManager.uiSave.loadSpinner("bind_port", this.bindPort);
contentPane.add(this.bindPort);
GBC.create(body).grid(0, gridy++).weightx(1).insets(0, BORDER_PADDING, 0, BORDER_PADDING).fill(GridBagConstraints.HORIZONTAL).add(this.bindPort);
}
{
String toolTipText = "URL of a SOCKS(4/5)/HTTP(S) proxy which will be used for TCP connections.\n" +
"Supported formats:\n" +
"- type://address:port\n" +
"- type://username:password@address:port";
String toolTipText = """
URL of a SOCKS(4/5)/HTTP(S) proxy which will be used for TCP connections.
Supported formats:
- type://address:port
- type://username:password@address:port""";
JLabel proxyLabel = new JLabel("Proxy URL:");
proxyLabel.setBounds(10, 60, 100, 20);
proxyLabel.setToolTipText(toolTipText);
contentPane.add(proxyLabel);
GBC.create(body).grid(0, gridy++).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, 0).anchor(GridBagConstraints.NORTHWEST).add(proxyLabel);
this.proxy = new JTextField();
this.proxy.setBounds(10, 80, 465, 22);
this.proxy.setToolTipText(toolTipText);
ViaProxy.saveManager.uiSave.loadTextField("proxy", this.proxy);
contentPane.add(this.proxy);
GBC.create(body).grid(0, gridy++).insets(0, BORDER_PADDING, 0, BORDER_PADDING).fill(GridBagConstraints.HORIZONTAL).add(this.proxy);
}
{
this.proxyOnlineMode = new JCheckBox("Proxy Online Mode");
this.proxyOnlineMode.setBounds(10, 110, 465, 20);
this.proxyOnlineMode.setToolTipText("Enabling Proxy Online Mode requires your client to have a valid account.\n" +
"Proxy Online Mode allows your client to see skins on online mode servers and use the signed chat features.");
this.proxyOnlineMode.setToolTipText("""
Enabling Proxy Online Mode requires your client to have a valid account.
Proxy Online Mode allows your client to see skins on online mode servers and use the signed chat features.""");
ViaProxy.saveManager.uiSave.loadCheckBox("proxy_online_mode", this.proxyOnlineMode);
contentPane.add(this.proxyOnlineMode);
GBC.create(body).grid(0, gridy++).weightx(1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, 0).anchor(GridBagConstraints.NORTHWEST).add(this.proxyOnlineMode);
}
{
this.legacySkinLoading = new JCheckBox("Legacy Skin Loading");
this.legacySkinLoading.setBounds(10, 140, 465, 20);
this.legacySkinLoading.setToolTipText("Enabling Legacy Skin Loading allows you to see skins on <= 1.6.4 servers");
this.legacySkinLoading.setToolTipText("Enabling Legacy Skin Loading allows you to see skins on <= 1.6.4 servers.");
ViaProxy.saveManager.uiSave.loadCheckBox("legacy_skin_loading", this.legacySkinLoading);
contentPane.add(this.legacySkinLoading);
GBC.create(body).grid(0, gridy++).weightx(1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, 0).fill(GridBagConstraints.HORIZONTAL).add(this.legacySkinLoading);
}
{
this.chatSigning = new JCheckBox("Chat signing");
this.chatSigning.setBounds(10, 170, 465, 20);
this.chatSigning.setToolTipText("Enables sending signed chat messages on >= 1.19 servers");
this.chatSigning.setToolTipText("Enables sending signed chat messages on >= 1.19 servers.");
this.chatSigning.setSelected(true);
ViaProxy.saveManager.uiSave.loadCheckBox("chat_signing", this.chatSigning);
contentPane.add(this.chatSigning);
GBC.create(body).grid(0, gridy++).weightx(1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, 0).anchor(GridBagConstraints.NORTHWEST).add(this.chatSigning);
}
{
this.ignorePacketTranslationErrors = new JCheckBox("Ignore packet translation errors");
this.ignorePacketTranslationErrors.setBounds(10, 200, 465, 20);
this.ignorePacketTranslationErrors.setToolTipText("Enabling this will prevent getting disconnected from the server when a packet translation error occurs and instead only print the error in the console.\n" +
"This may cause issues depending on the type of packet which failed to translate.");
this.ignorePacketTranslationErrors.setToolTipText("""
Enabling this will prevent getting disconnected from the server when a packet translation error occurs and instead only print the error in the console.
This may cause issues depending on the type of packet which failed to translate.""");
this.ignorePacketTranslationErrors.setSelected(false);
ViaProxy.saveManager.uiSave.loadCheckBox("ignore_packet_translation_errors", this.ignorePacketTranslationErrors);
contentPane.add(this.ignorePacketTranslationErrors);
GBC.create(body).grid(0, gridy++).weightx(1).insets(BODY_BLOCK_PADDING, BORDER_PADDING, 0, 0).fill(GridBagConstraints.HORIZONTAL).add(this.ignorePacketTranslationErrors);
}
parent.add(body, BorderLayout.CENTER);
}
private void addFooter(final Container container) {
JPanel footer = new JPanel();
footer.setLayout(new GridLayout(1, 2, BORDER_PADDING, 0));
{
this.viaVersionDumpButton = new JButton("Create ViaVersion dump");
this.viaVersionDumpButton.setBounds(10, 250, 225, 20);
this.viaVersionDumpButton.addActionListener(event -> {
this.viaVersionDumpButton.setEnabled(false);
DumpUtil.postDump(null).whenComplete((url, e) -> {
@ -133,11 +159,10 @@ public class AdvancedTab extends AUITab {
});
});
this.viaVersionDumpButton.setEnabled(false);
contentPane.add(this.viaVersionDumpButton);
footer.add(this.viaVersionDumpButton);
}
{
this.uploadLogsButton = new JButton("Upload latest.log");
this.uploadLogsButton.setBounds(249, 250, 225, 20);
this.uploadLogsButton.addActionListener(event -> {
final org.apache.logging.log4j.core.Logger logger = (org.apache.logging.log4j.core.Logger) LogManager.getRootLogger();
final RollingRandomAccessFileAppender fileAppender = (RollingRandomAccessFileAppender) logger.getAppenders().get("LatestFile");
@ -165,8 +190,14 @@ public class AdvancedTab extends AUITab {
this.uploadLogsButton.setEnabled(true);
}
});
contentPane.add(this.uploadLogsButton);
footer.add(this.uploadLogsButton);
}
JPanel padding = new JPanel();
padding.setLayout(new GridBagLayout());
GBC.create(padding).grid(0, 0).weightx(1).insets(0, BORDER_PADDING, BORDER_PADDING, BORDER_PADDING).fill(GridBagConstraints.HORIZONTAL).add(footer);
container.add(padding, BorderLayout.CENTER);
}
@Override

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

@ -40,10 +40,10 @@ import java.awt.event.MouseEvent;
import java.net.URI;
import java.net.URISyntaxException;
public class GeneralTab extends AUITab {
import static net.raphimc.viaproxy.ui.ViaProxyUI.BODY_BLOCK_PADDING;
import static net.raphimc.viaproxy.ui.ViaProxyUI.BORDER_PADDING;
private static final int BORDER_PADDING = 10;
private static final int BODY_BLOCK_PADDING = 10;
public class GeneralTab extends AUITab {
private JTextField serverAddress;
private JComboBox<VersionEnum> serverVersion;

6
src/main/java/net/raphimc/viaproxy/util/GBC.java
View File

@ -74,6 +74,12 @@ public class GBC {
return this;
}
public GBC weight(final double weightx, final double weighty) {
this.gbc.weightx = weightx;
this.gbc.weighty = weighty;
return this;
}
public GBC anchor(final int anchor) {
this.gbc.anchor = anchor;
return this;