diff --git a/src/main/java/net/raphimc/viaproxy/ui/ViaProxyUI.java b/src/main/java/net/raphimc/viaproxy/ui/ViaProxyUI.java
index 7b9e9f5..660cc66 100644
--- a/src/main/java/net/raphimc/viaproxy/ui/ViaProxyUI.java
+++ b/src/main/java/net/raphimc/viaproxy/ui/ViaProxyUI.java
@@ -61,6 +61,10 @@ public class ViaProxyUI extends JFrame {
private void setLookAndFeel() {
try {
UIManager.setLookAndFeel(new FlatDarkLaf());
+
+ final Font font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getClassLoader().getResourceAsStream("assets/fonts/OpenSans-Regular.ttf")).deriveFont(Font.PLAIN, 12F);
+ GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(font);
+ UIManager.getLookAndFeelDefaults().put("defaultFont", font);
} catch (Throwable t) {
t.printStackTrace();
}
diff --git a/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java b/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
index 9e5b1c7..b08322e 100644
--- a/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
+++ b/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
@@ -57,12 +57,12 @@ public class AccountsTab extends AUITab {
contentPane.add(infoLabel);
}
{
- JLabel info2Label = new JLabel("You can select the account to use by right clicking it. By default the first one will be used.");
+ 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 might want to install <a href=\"\">OpenAuthMod</a> on your</html>");
+ 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);
@@ -71,7 +71,7 @@ public class AccountsTab extends AUITab {
contentPane.add(infoLabel2);
JLabel clickRect = new JLabel();
- clickRect.setBounds(353, 60, 80, 20);
+ clickRect.setBounds(305, 60, 90, 24);
clickRect.addMouseListener(new MouseAdapter() {
@Override
public void mouseReleased(MouseEvent e) {
@@ -82,7 +82,7 @@ public class AccountsTab extends AUITab {
}
{
JScrollPane scrollPane = new JScrollPane();
- scrollPane.setBounds(10, 105, 465, 135);
+ scrollPane.setBounds(10, 105, 465, 110);
contentPane.add(scrollPane);
DefaultListModel<String> model = new DefaultListModel<>();
@@ -165,9 +165,16 @@ public class AccountsTab extends AUITab {
}
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("Add Offline Account");
- addOfflineAccountButton.setBounds(10, 250, 153, 20);
+ 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()) {
@@ -176,25 +183,25 @@ public class AccountsTab extends AUITab {
this.addAccount(account);
}
});
- contentPane.add(addOfflineAccountButton);
+ addButtons.add(addOfflineAccountButton);
}
{
- this.addMicrosoftAccountButton = new JButton("Add Microsoft Account");
- this.addMicrosoftAccountButton.setBounds(168, 250, 153, 20);
+ this.addMicrosoftAccountButton = new JButton("Microsoft Account");
+ this.addMicrosoftAccountButton.setBounds(160, 20, 145, 20);
this.addMicrosoftAccountButton.addActionListener(event -> {
this.addMicrosoftAccountButton.setEnabled(false);
this.handleLogin(MinecraftAuth::requestJavaLogin, profile -> ViaProxy.saveManager.accountsSave.addAccount(profile));
});
- contentPane.add(this.addMicrosoftAccountButton);
+ addButtons.add(this.addMicrosoftAccountButton);
}
{
- this.addBedrockAccountButton = new JButton("Add Bedrock Account");
- this.addBedrockAccountButton.setBounds(326, 250, 149, 20);
+ this.addBedrockAccountButton = new JButton("Bedrock Account");
+ this.addBedrockAccountButton.setBounds(310, 20, 145, 20);
this.addBedrockAccountButton.addActionListener(event -> {
this.addBedrockAccountButton.setEnabled(false);
this.handleLogin(MinecraftAuth::requestBedrockLogin, chain -> ViaProxy.saveManager.accountsSave.addAccount(chain));
});
- contentPane.add(this.addBedrockAccountButton);
+ addButtons.add(this.addBedrockAccountButton);
}
}
diff --git a/src/main/java/net/raphimc/viaproxy/ui/impl/AdvancedTab.java b/src/main/java/net/raphimc/viaproxy/ui/impl/AdvancedTab.java
index e53bed7..9a23f3c 100644
--- a/src/main/java/net/raphimc/viaproxy/ui/impl/AdvancedTab.java
+++ b/src/main/java/net/raphimc/viaproxy/ui/impl/AdvancedTab.java
@@ -46,7 +46,7 @@ public class AdvancedTab extends AUITab {
contentPane.add(bindPortLabel);
this.bindPort = new JSpinner(new SpinnerNumberModel(25568, 1, 65535, 1));
- this.bindPort.setBounds(10, 30, 465, 20);
+ this.bindPort.setBounds(10, 30, 465, 22);
this.bindPort.setToolTipText(toolTipText);
ViaProxy.saveManager.uiSave.loadSpinner("bind_port", this.bindPort);
contentPane.add(this.bindPort);
@@ -63,7 +63,7 @@ public class AdvancedTab extends AUITab {
contentPane.add(proxyLabel);
this.proxy = new JTextField();
- this.proxy.setBounds(10, 80, 465, 20);
+ this.proxy.setBounds(10, 80, 465, 22);
this.proxy.setToolTipText(toolTipText);
ViaProxy.saveManager.uiSave.loadTextField("proxy", this.proxy);
contentPane.add(this.proxy);
diff --git a/src/main/java/net/raphimc/viaproxy/ui/impl/GeneralTab.java b/src/main/java/net/raphimc/viaproxy/ui/impl/GeneralTab.java
index 513f3a0..18b30b8 100644
--- a/src/main/java/net/raphimc/viaproxy/ui/impl/GeneralTab.java
+++ b/src/main/java/net/raphimc/viaproxy/ui/impl/GeneralTab.java
@@ -86,7 +86,7 @@ public class GeneralTab extends AUITab {
contentPane.add(addressLabel);
this.serverAddress = new JTextField();
- this.serverAddress.setBounds(10, 70, 465, 20);
+ this.serverAddress.setBounds(10, 70, 465, 22);
this.serverAddress.setToolTipText(toolTipText);
ViaProxy.saveManager.uiSave.loadTextField("server_address", this.serverAddress);
contentPane.add(this.serverAddress);
@@ -97,7 +97,7 @@ public class GeneralTab extends AUITab {
contentPane.add(serverVersionLabel);
this.serverVersion = new JComboBox<>(VersionEnum.SORTED_VERSIONS.toArray(new VersionEnum[0]));
- this.serverVersion.setBounds(10, 120, 465, 20);
+ this.serverVersion.setBounds(10, 120, 465, 22);
this.serverVersion.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -126,7 +126,7 @@ public class GeneralTab extends AUITab {
contentPane.add(authMethodLabel);
this.authMethod = new JComboBox<>(new String[]{"Use no account", "Use selected account", "Use OpenAuthMod"});
- this.authMethod.setBounds(10, 170, 465, 20);
+ this.authMethod.setBounds(10, 170, 465, 22);
ViaProxy.saveManager.uiSave.loadComboBox("auth_method", this.authMethod);
contentPane.add(this.authMethod);
}
diff --git a/src/main/resources/assets/fonts/OFL.txt b/src/main/resources/assets/fonts/OFL.txt
new file mode 100644
index 0000000..57eeaca
--- /dev/null
+++ b/src/main/resources/assets/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/main/resources/assets/fonts/OpenSans-Regular.ttf b/src/main/resources/assets/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..1dc226d
Binary files /dev/null and b/src/main/resources/assets/fonts/OpenSans-Regular.ttf differ