Merge branch 'master' of github.com:Parabot/Parabot

.gitignore

@@ -122,3 +122,4 @@ releases
 ._*
 
 Test.java
+*.DS_Store

pom.xml

@@ -96,6 +96,17 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

src/main/java/org/parabot/core/Configuration.java

@@ -26,4 +26,7 @@ public class Configuration {
     public static final String BUGSNAG_API = "d79752cf94dd4beb24c3d312a8609f53";
 
     public static final Version BOT_VERSION = ProjectProperties.getProjectVersion();
+
+    public static final String BOT_TITLE = "Parabot";
+    public static final String BOT_SLOGAN = "The best RuneScape private server bot";
 }

src/main/java/org/parabot/core/ui/BotUI.java

@@ -38,7 +38,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
 
         setTitle("Parabot");
         setResizable(false);
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         createMenu();
 
         setLayout(new BorderLayout());

src/main/java/org/parabot/core/ui/ReflectUI.java

@@ -1,198 +1,263 @@
 package org.parabot.core.ui;
 
-import java.awt.Dimension;
-import java.util.HashMap;
-
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
-
 import org.parabot.core.Context;
 import org.parabot.core.asm.ASMClassLoader;
 import org.parabot.core.classpath.ClassPath;
 import org.parabot.core.reflect.RefClass;
 import org.parabot.core.reflect.RefField;
 
+import javax.swing.*;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Enumeration;
+import java.util.HashMap;
+
 /**
- * 
  * A Reflection explorer
  *
  * @author Everel
- * 
  */
 public class ReflectUI extends JFrame {
-	private static final long serialVersionUID = 98565034137367257L;
+    private static final long serialVersionUID = 98565034137367257L;
-	private DefaultMutableTreeNode root;
+    private JTree tree;
-	private DefaultTreeModel model;
+    private DefaultMutableTreeNode root;
-	private JEditorPane basicInfoPane;
+    private DefaultTreeModel model;
-	private JEditorPane selectionInfoPane;
+    private JEditorPane basicInfoPane;
+    private JEditorPane selectionInfoPane;
 
-	private Object instance;
+    private Object instance;
 
-	private HashMap<DefaultMutableTreeNode, RefClass> classes;
+    private HashMap<DefaultMutableTreeNode, RefClass> classes;
-	private HashMap<DefaultMutableTreeNode, RefField> fields;
+    private HashMap<DefaultMutableTreeNode, RefField> fields;
 
-	public ReflectUI() {
+    public ReflectUI() {
-		this.root = new DefaultMutableTreeNode("Classes");
+        this.root = new DefaultMutableTreeNode("Classes");
-		this.model = new DefaultTreeModel(root);
+        this.model = new DefaultTreeModel(root);
-		this.basicInfoPane = new JEditorPane();
+        this.basicInfoPane = new JEditorPane();
-		this.selectionInfoPane = new JEditorPane();
+        this.selectionInfoPane = new JEditorPane();
-		this.classes = new HashMap<>();
+        this.classes = new HashMap<>();
-		this.fields = new HashMap<>();
+        this.fields = new HashMap<>();
-		this.instance = Context.getInstance().getClient();
+        this.instance = Context.getInstance().getClient();
 
-		fillModel();
+        fillModel();
 
-		setTitle("Reflection explorer");
+        setTitle("Reflection explorer");
-		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
-		JPanel content = new JPanel();
+        JPanel content = new JPanel();
-		content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS));
+        content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS));
 
-		JPanel exploreContent = new JPanel();
+        JPanel exploreContent = new JPanel();
-		exploreContent.setLayout(new BoxLayout(exploreContent, BoxLayout.X_AXIS));
+        exploreContent.setLayout(new BoxLayout(exploreContent, BoxLayout.X_AXIS));
 
-		JPanel infoContent = new JPanel();
+        JPanel infoContent = new JPanel();
-		infoContent.setLayout(new BoxLayout(infoContent, BoxLayout.Y_AXIS));
+        infoContent.setLayout(new BoxLayout(infoContent, BoxLayout.Y_AXIS));
 
-		JTree tree = new JTree();
+        JPanel searchContent = new JPanel();
-		tree.setRootVisible(true);
+        searchContent.setLayout(new BoxLayout(searchContent, BoxLayout.X_AXIS));
-		tree.setShowsRootHandles(true);
-		tree.setModel(model);
-		tree.addTreeSelectionListener(new TreeSelectionListener() {
 
-			@Override
+        final JTextField searchFunction = new JTextField(10);
-			public void valueChanged(TreeSelectionEvent event) {
+        searchFunction.setHorizontalAlignment(JTextField.CENTER);
-				TreePath path = event.getPath();
+        searchFunction.setSize(30, 30);
-				Object[] pathElements = path.getPath();
+        searchFunction.setColumns(1);
-				Object element = pathElements[pathElements.length-1];
+        searchFunction.setPreferredSize(new Dimension(30, 30));
-				if(pathElements.length == 2) {
-					// class
-					setClassInfo(classes.get(element));
-				}
-				if(pathElements.length == 3) {
-					// field
-					setFieldInfo(fields.get(element));
-				}
-			}
 
-		});
+        final JButton searchButton = new JButton("Search");
+        searchFunction.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                searchButton.getActionListeners()[0].actionPerformed(e);
+            }
+        });
 
-		JScrollPane scrollTreePane = new JScrollPane(tree);
+        searchButton.addActionListener(new ActionListener() {
-		scrollTreePane.setPreferredSize(new Dimension(400, 300));
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                RefField result = null;
+                String search = searchFunction.getText();
+                for (RefField f : fields.values()) {
+                    if (f != null && (f.asObject()) != null) {
+                        String value;
+                        if ((value = f.asObject().toString()).equalsIgnoreCase(search)) {
+                            result = f;
+                        } else if (value.toLowerCase().startsWith(search.toLowerCase())) {
+                            result = f;
+                        } else if (value.toLowerCase().endsWith(search.toLowerCase())) {
+                            result = f;
+                        }
+                    }
+                }
+                if (result != null) {
+                    setFieldInfo(result);
+                }
+            }
+        });
 
-		basicInfoPane.setContentType("text/html");
-		basicInfoPane.setEditable(false);
 
-		selectionInfoPane.setContentType("text/html");
+        final JButton adjustClasses = new JButton("Expand");
-		selectionInfoPane.setEditable(false);
+        adjustClasses.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Enumeration<?> topLevelNodes
+                        = ((TreeNode) tree.getModel().getRoot()).children();
+                while (topLevelNodes.hasMoreElements()) {
+                    DefaultMutableTreeNode node
+                            = (DefaultMutableTreeNode) topLevelNodes.nextElement();
+                    TreePath treePath = new TreePath(node.getPath());
+                    if (adjustClasses.getText().equalsIgnoreCase("expand")) {
+                        tree.expandPath(treePath);
+                    } else {
+                        tree.collapsePath(treePath);
+                    }
+                }
 
-		JScrollPane scrollBasicInfoPane = new JScrollPane(basicInfoPane);
+                adjustClasses.setText(adjustClasses.getText().equalsIgnoreCase("expand") ? "Collapse" : "Expand");
-		scrollBasicInfoPane.setPreferredSize(new Dimension(400, 90));
+            }
+        });
 
-		JScrollPane scrollSelectInfoPane = new JScrollPane(selectionInfoPane);
+        searchContent.add(adjustClasses);
-		scrollSelectInfoPane.setPreferredSize(new Dimension(400, 200));
+        searchContent.add(searchFunction);
+        searchContent.setMaximumSize(new Dimension(500, (int) searchContent.getPreferredSize().getHeight()));
+        searchContent.add(searchButton);
 
-		infoContent.add(scrollBasicInfoPane);
-		infoContent.add(Box.createRigidArea(new Dimension(0, 10)));
-		infoContent.add(scrollSelectInfoPane);
 
-		exploreContent.add(scrollTreePane);
+        tree = new JTree();
-		exploreContent.add(Box.createRigidArea(new Dimension(10, 0)));
+        tree.setRootVisible(true);
-		exploreContent.add(infoContent);
+        tree.setShowsRootHandles(true);
+        tree.setModel(model);
+        tree.addTreeSelectionListener(new TreeSelectionListener() {
 
-		content.add(exploreContent);
+            @Override
+            public void valueChanged(TreeSelectionEvent event) {
+                TreePath path = event.getPath();
+                Object[] pathElements = path.getPath();
+                Object element = pathElements[pathElements.length - 1];
+                if (pathElements.length == 2) {
+                    setClassInfo(classes.get(element));
+                } else if (pathElements.length == 3) {
+                    RefField field = fields.get(element);
+                    setFieldInfo(field);
+                    DefaultMutableTreeNode el = (DefaultMutableTreeNode) element;
+                    el.setUserObject("Field: " + field.getName() + " [type: " + field.getASMType() + "] [value: " + field.asObject() + "]");
+                }
+            }
 
-		JScrollPane contentPane = new JScrollPane(content);
+        });
-		Dimension prefSize = content.getPreferredSize();
-		contentPane.setPreferredSize(new Dimension(prefSize.width + contentPane.getVerticalScrollBar().getPreferredSize().width, prefSize.height + contentPane.getHorizontalScrollBar().getPreferredSize().height));
-		setContentPane(contentPane);
-		pack();
-		setLocationRelativeTo(null);
-		setVisible(true);
-	}
 
-	private void fillModel() {
+        JScrollPane scrollTreePane = new JScrollPane(tree);
-		Context context = Context.getInstance();
+        scrollTreePane.setPreferredSize(new Dimension(400, 300));
-		ClassPath classPath = context.getClassPath();
-		ASMClassLoader classLoader = context.getASMClassLoader();
-		for (String className : classPath.classNames) {
-			try {
-				DefaultMutableTreeNode classNode = new DefaultMutableTreeNode(
-						"Class: " + className);
-				DefaultMutableTreeNode fieldNode;
 
-				Class<?> clazz = classLoader.loadClass(className);
+        basicInfoPane.setContentType("text/html");
+        basicInfoPane.setEditable(false);
 
-				RefClass refClass = new RefClass(clazz);
+        selectionInfoPane.setContentType("text/html");
-				if(refClass.instanceOf(this.instance)) {
+        selectionInfoPane.setEditable(false);
-					refClass.setInstance(this.instance);
-				}
 
-				for (RefField field : refClass.getFields()) {
+        JScrollPane scrollBasicInfoPane = new JScrollPane(basicInfoPane);
-					fieldNode = new DefaultMutableTreeNode("Field: " + field.getName() + " [type: " + field.getASMType()  + "] [value: " + field.asObject() + "]");
+        scrollBasicInfoPane.setPreferredSize(new Dimension(400, 90));
-					classNode.add(fieldNode);
-					fields.put(fieldNode, field);
-				}
-				classes.put(classNode, refClass);
 
-				root.add(classNode);
+        JScrollPane scrollSelectInfoPane = new JScrollPane(selectionInfoPane);
-			} catch (Throwable t) {
+        scrollSelectInfoPane.setPreferredSize(new Dimension(400, 200));
-				t.printStackTrace();
-			}
-		}
-	}
 
-	private void fillBasicInfoPane() {
+        infoContent.add(scrollBasicInfoPane);
-		Context context = Context.getInstance();
+        infoContent.add(Box.createRigidArea(new Dimension(0, 10)));
-		ClassPath classPath = context.getClassPath();
+        infoContent.add(scrollSelectInfoPane);
 
-		StringBuilder builder = new StringBuilder();
+        exploreContent.add(scrollTreePane);
+        exploreContent.add(Box.createRigidArea(new Dimension(10, 0)));
+        exploreContent.add(infoContent);
 
-		builder.append("<b>Classes: </b>").append(classPath.classNames.size()).append("<br/>");
+        content.add(exploreContent);
-		builder.append("<b>Using instance: </b>").append(instance.toString()).append("<br/>");
+        content.add(searchContent);
 
-		basicInfoPane.setText(builder.toString());
+        JScrollPane contentPane = new JScrollPane(content);
-	}
+        Dimension prefSize = content.getPreferredSize();
+        contentPane.setPreferredSize(new Dimension(prefSize.width + contentPane.getVerticalScrollBar().getPreferredSize().width, prefSize.height + contentPane.getHorizontalScrollBar().getPreferredSize().height));
+        setContentPane(contentPane);
+        pack();
+        setLocationRelativeTo(null);
+        setVisible(true);
+    }
 
-	private void setFieldInfo(RefField refField) {
+    private void fillModel() {
-		StringBuilder builder = new StringBuilder();
+        Context context = Context.getInstance();
-		RefClass refClass = refField.getOwner();
+        ClassPath classPath = context.getClassPath();
-		builder.append("<h1>").append(refClass.getClassName()).append(".").append(refField.getName()).append("</h1><br/>");
+        ASMClassLoader classLoader = context.getASMClassLoader();
-		builder.append("<b>Class: </b>").append(refClass.getClassName()).append("<br/>");
+        for (String className : classPath.classNames) {
-		builder.append("<b>Value: </b>").append(refField.asObject()).append("<br/>");
+            try {
-		builder.append("<b>Type: </b>").append(refField.getASMType().getClassName()).append("<br/>");
+                DefaultMutableTreeNode classNode = new DefaultMutableTreeNode(
-		builder.append("<b>Static: </b>").append(refField.isStatic() ? "yes" : "no").append("<br/>");
+                        "Class: " + className);
-		builder.append("<b>Array: </b>").append(refField.isArray() ? refField.getArrayDimensions() + " dimension(s)" : "no").append("<br/>");
+                DefaultMutableTreeNode fieldNode;
-		selectionInfoPane.setText(builder.toString());
 
-		fillBasicInfoPane();
+                Class<?> clazz = classLoader.loadClass(className);
-	}
 
-	private void setClassInfo(RefClass refClass) {
+                RefClass refClass = new RefClass(clazz);
-		StringBuilder builder = new StringBuilder();
+                if (refClass.instanceOf(this.instance)) {
-		builder.append("<h1>").append(refClass.getClassName()).append("</h1><br/>");
+                    refClass.setInstance(this.instance);
-		if(refClass.getClassName().contains(".")) {
+                }
-			builder.append("<b>Package: </b>").append(refClass.getClassName().substring(0, refClass.getClassName().lastIndexOf("."))).append("<br/>");
-		}
-		builder.append("<b>Abstract: </b>").append(refClass.isAbstract() ? "yes" : "no").append("<br/>");
-		builder.append("<b>Interface: </b>").append(refClass.isInterface() ? "yes" : "no").append("<br/>");
-		builder.append("<b>Superclass: </b>").append(refClass.hasSuperclass() ? refClass.getSuperclass().getClassName() : "no").append("<br/>");
-		builder.append("<b>Fields: </b>").append(refClass.getFields().length).append("<br/>");
-		builder.append("<b>Methods: </b>").append(refClass.getMethods().length).append("<br/>");
-		builder.append("<b>Constructors: </b>").append(refClass.getConstructors().length).append("<br/>");
-		selectionInfoPane.setText(builder.toString());
 
-		fillBasicInfoPane();
+                for (RefField field : refClass.getFields()) {
-	}
+                    fieldNode = new DefaultMutableTreeNode("Field: " + field.getName() + " [type: " + field.getASMType() + "] [value: " + field.asObject() + "]");
+                    classNode.add(fieldNode);
+                    fields.put(fieldNode, field);
+                }
+                classes.put(classNode, refClass);
+
+                root.add(classNode);
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+        }
+    }
+
+    private void fillBasicInfoPane() {
+        Context context = Context.getInstance();
+        ClassPath classPath = context.getClassPath();
+
+        StringBuilder builder = new StringBuilder();
+
+        builder.append("<b>Classes: </b>").append(classPath.classNames.size()).append("<br/>");
+        builder.append("<b>Using instance: </b>").append(instance.toString()).append("<br/>");
+
+        basicInfoPane.setText(builder.toString());
+    }
+
+    private void setFieldInfo(RefField refField) {
+        StringBuilder builder = new StringBuilder();
+        RefClass refClass = refField.getOwner();
+        builder.append("<h1>").append(refClass.getClassName()).append(".").append(refField.getName()).append("</h1><br/>");
+        builder.append("<b>Class: </b>").append(refClass.getClassName()).append("<br/>");
+        builder.append("<b>Value: </b>").append(refField.asObject()).append("<br/>");
+        builder.append("<b>Type: </b>").append(refField.getASMType().getClassName()).append("<br/>");
+        builder.append("<b>Static: </b>").append(refField.isStatic() ? "yes" : "no").append("<br/>");
+        builder.append("<b>Array: </b>").append(refField.isArray() ? refField.getArrayDimensions() + " dimension(s)" : "no").append("<br/>");
+        selectionInfoPane.setText(builder.toString());
+
+        fillBasicInfoPane();
+    }
+
+    private void setClassInfo(RefClass refClass) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("<h1>").append(refClass.getClassName()).append("</h1><br/>");
+        if (refClass.getClassName().contains(".")) {
+            builder.append("<b>Package: </b>").append(refClass.getClassName().substring(0, refClass.getClassName().lastIndexOf("."))).append("<br/>");
+        }
+        builder.append("<b>Abstract: </b>").append(refClass.isAbstract() ? "yes" : "no").append("<br/>");
+        builder.append("<b>Interface: </b>").append(refClass.isInterface() ? "yes" : "no").append("<br/>");
+        builder.append("<b>Superclass: </b>").append(refClass.hasSuperclass() ? refClass.getSuperclass().getClassName() : "no").append("<br/>");
+        builder.append("<b>Fields: </b>").append(refClass.getFields().length).append("<br/>");
+        builder.append("<b>Methods: </b>").append(refClass.getMethods().length).append("<br/>");
+        builder.append("<b>Constructors: </b>").append(refClass.getConstructors().length).append("<br/>");
+        selectionInfoPane.setText(builder.toString());
+
+        fillBasicInfoPane();
+    }
 
 }

src/main/java/org/parabot/core/ui/ServerSelector.java

@@ -31,7 +31,6 @@ public class ServerSelector extends JPanel {
 	}
 
 	public ServerSelector() {
-
 		Queue<ServerComponent> widgets = getServers();
 		if (initServer != null) {
 			if (runServer(widgets)) {
@@ -42,7 +41,7 @@ public class ServerSelector extends JPanel {
 
 
 		setLayout(new BorderLayout());
-		setPreferredSize(new Dimension(600, 400));
+		setPreferredSize(new Dimension(600, 350));
 
 		JPanel interior = new JPanel(null);
 
@@ -66,8 +65,7 @@ public class ServerSelector extends JPanel {
 				.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		scrlInterior
 				.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-
+		add(scrlInterior);
-		add(scrlInterior, BorderLayout.CENTER);
 
 	}
 

src/main/java/org/parabot/core/ui/components/ServerComponent.java

@@ -13,6 +13,7 @@ import java.awt.event.MouseMotionListener;
 import javax.swing.JPanel;
 
 import org.parabot.core.desc.ServerDescription;
+import org.parabot.core.ui.fonts.Fonts;
 import org.parabot.environment.Environment;
 
 /**
@@ -61,13 +62,13 @@ public class ServerComponent extends JPanel implements MouseListener,
 		g2d.setColor(bgColor);
 		g2d.fillRect(0, 0, w, h);
 		g.setColor(Color.black);
-		Font title = new Font("Arial", Font.BOLD, 16);
+		Font title = Fonts.getResource("leelawadee.ttf", 16);
 		g.setFont(title);
 		String serverName = desc.getServerName();
 		int sw = g.getFontMetrics().stringWidth(serverName);
 		g.drawString(serverName, (w / 2) - (sw / 2), 30);
 
-		Font normal = new Font("Arial", Font.PLAIN, 12);
+		Font normal = Fonts.getResource("leelawadee.ttf");
 		g.setFont(normal);
 		FontMetrics fm = g.getFontMetrics();
 		String author = "Author: " + desc.getAuthor();

src/main/java/org/parabot/core/ui/components/VerboseLoader.java

@@ -1,250 +1,287 @@
 package org.parabot.core.ui.components;
 
+import org.parabot.core.Configuration;
 import org.parabot.core.Core;
 import org.parabot.core.forum.AccountManager;
 import org.parabot.core.forum.AccountManagerAccess;
 import org.parabot.core.io.ProgressListener;
 import org.parabot.core.ui.ServerSelector;
 import org.parabot.core.ui.images.Images;
+import org.parabot.core.ui.fonts.Fonts;
 import org.parabot.core.ui.utils.UILog;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.RescaleOp;
 
 /**
  * An informative JPanel which tells the user what bot is doing
  *
  * @author Everel
- *
  */
 public class VerboseLoader extends JPanel implements ProgressListener {
-	private static final long serialVersionUID = 7412412644921803896L;
+    private static final long serialVersionUID = 7412412644921803896L;
-	private static VerboseLoader current;
+    private static VerboseLoader current;
-	private static String state = "Initializing loader...";
+    private static String state = "Initializing loader...";
 
-	public static final int STATE_AUTHENTICATION = 0;
+    private static final int STATE_AUTHENTICATION = 0;
-	public static final int STATE_LOADING = 1;
+    public static final int STATE_LOADING = 1;
-	public static final int STATE_SERVER_SELECT = 2;
+    private static final int STATE_SERVER_SELECT = 2;
-	private int currentState;
+    private int currentState;
 
-	private static AccountManager manager;
+    private static AccountManager manager;
 
-	private FontMetrics fontMetrics;
+    private FontMetrics fontMetrics;
-	private BufferedImage background;
+    private BufferedImage background, banner, loginBox;
-	private ProgressBar progressBar;
+    private ProgressBar progressBar;
-	private JPanel loginPanel;
+    private JPanel loginPanel;
 
-	public static final AccountManagerAccess MANAGER_FETCHER = new AccountManagerAccess() {
+    public static final AccountManagerAccess MANAGER_FETCHER = new AccountManagerAccess() {
 
-		@Override
+        @Override
-		public final void setManager(AccountManager manager) {
+        public final void setManager(AccountManager manager) {
-			VerboseLoader.manager = manager;
+            VerboseLoader.manager = manager;
-		}
+        }
 
-	};
+    };
 
-	private VerboseLoader(String username, String password) {
+    private VerboseLoader(String username, String password) {
-		if(current != null) {
+        if (current != null) {
-			throw new IllegalStateException("MainScreenComponent already made.");
+            throw new IllegalStateException("MainScreenComponent already made.");
-		}
+        }
-		current = this;
+        current = this;
-		this.background = Images.getResource("/storage/images/background.png");
+        this.background = Images.getResource("/storage/images/background.png");
-		this.progressBar = new ProgressBar(400, 20);
+        this.banner = Images.getResource("/storage/images/logo.png");
-		setLayout(new GridBagLayout());
+        this.loginBox = Images.getResource("/storage/images/login.png");
-		setSize(775, 510);
+        this.progressBar = new ProgressBar(400, 20);
-		setPreferredSize(new Dimension(775, 510));
+        setLayout(new GridBagLayout());
-		setDoubleBuffered(true);
+        setSize(775, 510);
-		setOpaque(false);
+        setPreferredSize(new Dimension(775, 510));
+        setDoubleBuffered(true);
+        setOpaque(false);
 
-		if(username != null && password != null) {
+        if (username != null && password != null) {
-			if(Core.inDebugMode() || manager.login(username, password, false)) {
+            if (Core.inDebugMode() || manager.login(username, password, false)) {
-				currentState = STATE_SERVER_SELECT;
+                currentState = STATE_SERVER_SELECT;
-			}
+            }
-		}
+        }
 
-		if(currentState == STATE_AUTHENTICATION) {
+        if (currentState == STATE_AUTHENTICATION) {
-			addLoginPanel();
+            addLoginPanel();
-		} else if(currentState == STATE_SERVER_SELECT) {
+        } else if (currentState == STATE_SERVER_SELECT) {
-			addServerPanel();
+            addServerPanel();
-		}
+        }
-	}
+    }
 
-	public void addServerPanel() {
+    public void addServerPanel() {
-		JPanel servers = ServerSelector.getInstance();
+        JPanel servers = ServerSelector.getInstance();
-		add(servers, new GridBagConstraints());
+        GridBagLayout bagLayout = (GridBagLayout) getLayout();
-	}
+        GridBagConstraints c = new GridBagConstraints();
 
-	public void addLoginPanel() {
+        c.weightx = 1;
-		loginPanel = new JPanel();
+        c.weighty = 1;
-		loginPanel.setOpaque(false);
+        c.gridx = 0;
+        c.gridy = 0;
+        c.anchor = GridBagConstraints.SOUTH;
+        c.insets = new Insets(0, 0, 25, 0);
 
-		loginPanel.setLayout(new BoxLayout(loginPanel, BoxLayout.Y_AXIS));
+        bagLayout.setConstraints(servers, c);
+        add(servers);
+    }
 
-		Font labelFont = new Font("Times New Roman", Font.PLAIN, 11);
+    public void addLoginPanel() {
+        loginPanel = new JPanel();
+        loginPanel.setOpaque(false);
 
-		JLabel usernameLabel = new JLabel("Username");
+        loginPanel.setLayout(new BoxLayout(loginPanel, BoxLayout.Y_AXIS));
-		usernameLabel.setFont(labelFont);
-		usernameLabel.setAlignmentX(Box.CENTER_ALIGNMENT);
-		usernameLabel.setForeground(Color.white);
 
-		final JTextField userInput = new JTextField(25);
+        Font labelFont = Fonts.getResource("leelawadee.ttf");
-		final JTextField passInput = new JPasswordField(25);
-		userInput.addActionListener(new ActionListener() {
 
-			@Override
+        JLabel usernameLabel = new JLabel("Username");
-			public void actionPerformed(ActionEvent e) {
+        usernameLabel.setFont(labelFont);
-				passInput.requestFocus();
+        usernameLabel.setAlignmentX(Box.CENTER_ALIGNMENT);
-			}
+        usernameLabel.setForeground(Color.white);
 
-		});
+        final JTextField userInput = new JTextField(20);
-		userInput.setFont(labelFont);
+        final JTextField passInput = new JPasswordField(20);
-		userInput.setAlignmentX(Box.CENTER_ALIGNMENT);
+        userInput.addActionListener(new ActionListener() {
-		userInput.setMaximumSize(userInput.getPreferredSize());
 
-		final JButton login = new JButton("Login");
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                passInput.requestFocus();
+            }
 
-		passInput.setAlignmentX(Box.CENTER_ALIGNMENT);
+        });
-		passInput.setMaximumSize(userInput.getPreferredSize());
+        userInput.setFont(labelFont);
+        userInput.setAlignmentX(Box.CENTER_ALIGNMENT);
+        userInput.setMaximumSize(userInput.getPreferredSize());
+
+        final JButton login = new JButton("Login");
+
+        passInput.setAlignmentX(Box.CENTER_ALIGNMENT);
+        passInput.setMaximumSize(userInput.getPreferredSize());
         passInput.setPreferredSize(new Dimension(userInput.getWidth(), 20));
         passInput.addActionListener(new ActionListener() {
 
-			@Override
+            @Override
-			public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-				login.doClick();
+                login.doClick();
-			}
+            }
 
         });
 
-		JLabel passwordLabel = new JLabel("Password");
+        JLabel passwordLabel = new JLabel("Password");
-		passwordLabel.setFont(labelFont);
+        passwordLabel.setFont(labelFont);
-		passwordLabel.setAlignmentX(Box.CENTER_ALIGNMENT);
+        passwordLabel.setAlignmentX(Box.CENTER_ALIGNMENT);
-		passwordLabel.setForeground(Color.white);
+        passwordLabel.setForeground(Color.white);
 
 
-		login.setAlignmentX(Box.CENTER_ALIGNMENT);
+        login.setAlignmentX(Box.CENTER_ALIGNMENT);
-		login.setOpaque(false);
+        login.setOpaque(false);
 
-		login.addActionListener(new ActionListener() {
+        login.addActionListener(new ActionListener() {
 
-			@Override
+            @Override
-			public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-				if(manager.login(userInput.getText(), passInput.getText(), false)) {
+                if (manager.login(userInput.getText(), passInput.getText(), false)) {
-					switchState(STATE_SERVER_SELECT);
+                    switchState(STATE_SERVER_SELECT);
-				} else {
+                } else {
-					Core.verbose("Failed to log in.");
+                    Core.verbose("Failed to log in.");
-					UILog.log("Error", "Incorrect username or password. Have you tried logging into http://bdn.parabot.org/account/", JOptionPane.ERROR_MESSAGE);
+                    UILog.log("Error", "Incorrect username or password. Have you tried logging into http://bdn.parabot.org/account/", JOptionPane.ERROR_MESSAGE);
-				}
+                }
-			}
+            }
 
-		});
+        });
 
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-		loginPanel.add(usernameLabel);
+        loginPanel.add(usernameLabel);
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-		loginPanel.add(userInput);
+        loginPanel.add(userInput);
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-		loginPanel.add(passwordLabel);
+        loginPanel.add(passwordLabel);
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-		loginPanel.add(passInput);
+        loginPanel.add(passInput);
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-		loginPanel.add(login);
+        loginPanel.add(login);
-		loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+        loginPanel.add(Box.createRigidArea(new Dimension(0, 5)));
 
-		add(loginPanel, new GridBagConstraints());
+        add(loginPanel, new GridBagConstraints());
-	}
+    }
 
-	public void switchState(int state) {
+    public void switchState(int state) {
-		removeAll();
+        removeAll();
-		if(state == STATE_AUTHENTICATION) {
+        if (state == STATE_AUTHENTICATION) {
-			addLoginPanel();
+            addLoginPanel();
-		} else if(state == STATE_SERVER_SELECT) {
+        } else if (state == STATE_SERVER_SELECT) {
-			addServerPanel();
+            addServerPanel();
-		}
+        }
-		this.currentState = state;
+        this.currentState = state;
-		revalidate();
+        revalidate();
-	}
+    }
 
-	/**
+    /**
-	 * Paints on this panel
+     * Paints on this panel
-	 */
+     */
-	@Override
+    @Override
-	public void paintComponent(Graphics graphics) {
+    public void paintComponent(Graphics graphics) {
-		super.paintComponent(graphics);
+        super.paintComponent(graphics);
 
 
-		Graphics2D g = (Graphics2D) graphics;
+        Graphics2D g = (Graphics2D) graphics;
-		g.setRenderingHint(
+        g.setRenderingHint(
-		        RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.KEY_TEXT_ANTIALIASING,
-		        RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+                RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
-		g.drawImage(background, 0, 0, null);
+        g.drawImage(background, 0, 0, null);
+        float[] scales = {1f, 1f, 1f, 0.9f};
+        float[] offsets = new float[4];
+        RescaleOp rop = new RescaleOp(scales, offsets, null);
+        g.drawImage(banner, rop, 0, 0);
 
-		if (fontMetrics == null) {
+        g.setStroke(new BasicStroke(5));
-			fontMetrics = g.getFontMetrics();
+        g.setPaint(Color.WHITE);
-		}
 
-		if(currentState == STATE_AUTHENTICATION) {
+        g.draw(new Line2D.Float(0, 0, this.getWidth(), 0));
-			g.setColor(new Color(74, 74, 72, 100));
+        g.draw(new Line2D.Float(0, 0, 0, 120));
-			g.fillRect(loginPanel.getX() - 10, loginPanel.getY(), loginPanel.getWidth() + 20, loginPanel.getHeight());
+        g.draw(new Line2D.Float(0, 120, this.getWidth(), 120));
-			g.setColor(Color.black);
+        g.draw(new Line2D.Float(this.getWidth() - 6, 0, this.getWidth() - 6, 120));
-			g.drawRect(loginPanel.getX() - 10, loginPanel.getY(), loginPanel.getWidth() + 20, loginPanel.getHeight());
-		}
 
-		g.setColor(Color.white);
+        g.setColor(Color.white);
 
-		if(currentState == STATE_LOADING) {
+        g.setFont(Fonts.getResource("leelawadee.ttf", 30));
-			progressBar.draw(g, (getWidth() / 2) - 200, 220);
+        g.getFont().deriveFont(Font.BOLD);
-			g.setFont(new Font("Times New Roman", Font.PLAIN, 14));
+        g.drawString(Configuration.BOT_TITLE, 20, 50);
-			int x = (getWidth() / 2) - (fontMetrics.stringWidth(state) / 2);
+
-			g.drawString(state, x, 200);
+        g.setFont(Fonts.getResource("leelawadee.ttf", 15));
-		}
+        g.getFont().deriveFont(Font.ITALIC);
+        g.drawString(Configuration.BOT_SLOGAN, 20, 85);
+
+        if (fontMetrics == null) {
+            fontMetrics = g.getFontMetrics();
+        }
+
+        if (currentState == STATE_AUTHENTICATION) {
+            g.drawImage(loginBox, loginPanel.getX() - 30, loginPanel.getY() - 22, null);
+        }
+
+        g.setColor(Color.white);
+
+        if (currentState == STATE_LOADING) {
+            progressBar.draw(g, (getWidth() / 2) - 200, 220);
+            g.setFont(Fonts.getResource("leelawadee.ttf"));
+            int x = (getWidth() / 2) - (fontMetrics.stringWidth(state) / 2);
+            g.drawString(state, x, 200);
+        }
 
 
-		g.setFont(new Font("Times New Roman", Font.PLAIN, 12));
+        g.setFont(Fonts.getResource("leelawadee.ttf"));
-		final String version = "v2.1";
+        final String version = Configuration.BOT_VERSION.get();
-		g.drawString(version,
+        g.drawString(version,
-				getWidth() - g.getFontMetrics().stringWidth(version) - 10,
+                getWidth() - g.getFontMetrics().stringWidth(version) - 10,
-				getHeight() - 12);
+                getHeight() - 12);
-	}
+    }
 
-	/**
+    /**
-	 * Gets instance of this panel
+     * Gets instance of this panel
-	 * @return instance of this panel
+     *
-	 */
+     * @return instance of this panel
-	public static VerboseLoader get(String username, String password) {
+     */
-		return current == null ? new VerboseLoader(username, password) : current;
+    public static VerboseLoader get(String username, String password) {
-	}
+        return current == null ? new VerboseLoader(username, password) : current;
+    }
 
-	/**
+    /**
-	 * Gets instance of this panel
+     * Gets instance of this panel
-	 * @return instance of this panel
+     *
-	 */
+     * @return instance of this panel
-	public static VerboseLoader get() {
+     */
-		return current == null ? new VerboseLoader(null, null) : current;
+    public static VerboseLoader get() {
-	}
+        return current == null ? new VerboseLoader(null, null) : current;
+    }
 
 
-	/**
+    /**
-	 * Updates the status message and repaints the panel
+     * Updates the status message and repaints the panel
-	 * @param message
+     *
-	 */
+     * @param message
-	public static void setState(final String message) {
+     */
-		state = message;
+    public static void setState(final String message) {
-		current.repaint();
+        state = message;
-	}
+        current.repaint();
+    }
 
-	@Override
+    @Override
-	public void onProgressUpdate(double value) {
+    public void onProgressUpdate(double value) {
-		progressBar.setValue(value);
+        progressBar.setValue(value);
-		this.repaint();
+        this.repaint();
-	}
+    }
-
-	@Override
-	public void updateDownloadSpeed(double mbPerSecond) {
-		progressBar.setText(String.format("(%.2fMB/s)", mbPerSecond));
-	}
 
+    @Override
+    public void updateDownloadSpeed(double mbPerSecond) {
+        progressBar.setText(String.format("(%.2fMB/s)", mbPerSecond));
+    }
 }

src/main/java/org/parabot/core/ui/fonts/Fonts.java

@@ -0,0 +1,38 @@
+package org.parabot.core.ui.fonts;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+/**
+ * @author Capslock
+ */
+public class Fonts {
+    private static final java.util.List<ParabotFont> FONT_CACHE = new ArrayList<>();
+
+    /**
+     * Calls the getResource with the default size of 12
+     *
+     * @param resource
+     * @return
+     */
+    public static Font getResource(final String resource) {
+        return getResource(resource, 12f);
+    }
+
+    public static Font getResource(final String fileName, float size) {
+        ParabotFont parabotFont = null;
+
+        for (ParabotFont font : FONT_CACHE) {
+            if (font.getLocation().equalsIgnoreCase(fileName) && font.getSize() == size) {
+                parabotFont = font;
+            }
+        }
+
+        if (parabotFont == null) {
+            parabotFont = new ParabotFont(fileName, size);
+            FONT_CACHE.add(parabotFont);
+        }
+
+        return parabotFont.getFont();
+    }
+}

src/main/java/org/parabot/core/ui/fonts/ParabotFont.java

@@ -0,0 +1,55 @@
+package org.parabot.core.ui.fonts;
+
+import java.awt.*;
+import java.io.IOException;
+
+/**
+ * @author Capslock
+ */
+public class ParabotFont {
+
+    private String location;
+    private Font font;
+
+    public ParabotFont(String location, float size) {
+        if (!location.toLowerCase().startsWith("/storage/fonts/")) {
+            location = "/storage/fonts/" + location;
+        }
+        this.location = location;
+
+        try {
+            this.font = createFont(size);
+        } catch (FontFormatException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Font createFont(float size) throws IOException, FontFormatException {
+        return Font.createFont(Font.TRUETYPE_FONT, Fonts.class.getResourceAsStream(this.location)).deriveFont(size);
+    }
+
+    public float getSize() {
+        return font.getSize();
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public Font getFont() {
+        return font;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj != null) {
+            if (obj instanceof ParabotFont) {
+                ParabotFont otherFont = (ParabotFont) obj;
+                if (otherFont.getSize() == this.getSize()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}