LiteLoader 1.6.4_02 - dev only - added comments to LoginManager, some minor tweaks

Mumfrey
1 parent fca9591f
Showing 3 changed files with 322 additions and 157 deletions
debug/com/mumfrey/liteloader/debug/LoginManager.java
debug/com/mumfrey/liteloader/debug/LoginPanel.java
debug/com/mumfrey/liteloader/debug/Start.java
@@ -5,15 +5,17 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.net.Proxy;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
+import javax.swing.JOptionPane;
+
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
+import com.google.gson.annotations.SerializedName;
 import com.mojang.authlib.Agent;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.exceptions.AuthenticationException;
@@ -28,24 +30,62 @@ import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
  */
 public class LoginManager
 {
+	/**
+	 * Logger instance
+	 */
 	private static Logger logger = Logger.getLogger("liteloader");
+	/**
+	 * Gson instance for serialising and deserialising the authentication data
+	 */
 	private static Gson gson = new GsonBuilder().setPrettyPrinting().create();
+	/**
+	 * Authentication service
+	 */
 	private YggdrasilAuthenticationService authService;
+	/**
+	 * Authentication agent
+	 */
 	private YggdrasilUserAuthentication authentication;
+	/**
+	 * JSON file to load/save auth data from
+	 */
 	private File jsonFile;
+	/**
+	 * Username read from the auth JSON file, we use this as the default in the login dialog in
+	 * case login fails. This is stored in the JSON even if authentication is not successful so that
+	 * we can display the same username next time
+	 */
 	private String defaultUsername;
+	/**
+	 * Minecraft screen name read from the auth JSON file. Use this as default in case the login fails
+	 * or is skipped (when offline) so that at least the Minecraft client has a sensible display name.
+	 * Defaults to user.name when not specified
+	 */
 	private String defaultDisplayName = System.getProperty("user.name");
+	/**
+	 * True if login should not be attempted, skips the authentication attempt and the login dialog
+	 */
 	private boolean offline = false;
-	private boolean showDialog = false;
+	/**
+	 * If authentication fails with token then the first attempt will be to use the user/pass specified
+	 * on the command line (if any). This flag is set AFTER that first attempt so that we know to display
+	 * the login dialog anyway (eg. the login on the command line was bad)
+	 */
+	private boolean forceShowLoginDialog = false;
+	/**
+	 * ctor
+	 * 
+	 * @param jsonFile
+	 */
 	public LoginManager(File jsonFile)
 	{
 		this.jsonFile = jsonFile;
@@ -55,7 +95,8 @@ public class LoginManager
 	}
 	/**
-	 * 
+	 * When authenticaion fails, we regenerate the auth service and agent because trying again with the same
+	 * client data will fail.
 	 */
 	public void resetAuth()
 	{
@@ -64,12 +105,11 @@ public class LoginManager
 	}
 	/**
-	 * @throws JsonIOException
-	 * @throws JsonSyntaxException
+	 * Load auth data from the json file 
 	 */
 	private void load()
 	{
-		if (this.jsonFile.exists())
+		if (this.jsonFile != null && this.jsonFile.exists())
 		{
 			FileReader fileReader = null;
@@ -78,7 +118,7 @@ public class LoginManager
 				fileReader = new FileReader(this.jsonFile);
 				AuthData authData = LoginManager.gson.fromJson(fileReader, AuthData.class);
-				if (authData != null)
+				if (authData != null && authData.validate())
 				{
 					this.logInfo("Initialising Yggdrasil authentication service with client token: %s", authData.getClientToken());
 					this.authService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, authData.getClientToken());
@@ -101,38 +141,57 @@ public class LoginManager
 		}
 	}
+	/**
+	 * Save auth data to the JSON file
+	 */
 	private void save()
 	{
-		FileWriter fileWriter = null;
-		
-		try
+		if (this.jsonFile != null)
 		{
-			fileWriter = new FileWriter(this.jsonFile);
+			FileWriter fileWriter = null;
-			AuthData authData = new AuthData(this.authService, this.authentication, this.offline, this.defaultUsername, this.defaultDisplayName);
-			LoginManager.gson.toJson(authData, fileWriter);
-		}
-		catch (IOException ex) { ex.printStackTrace(); }
-		finally
-		{
 			try
 			{
-				if (fileWriter != null) fileWriter.close();
+				fileWriter = new FileWriter(this.jsonFile);
+				
+				AuthData authData = new AuthData(this.authService, this.authentication, this.offline, this.defaultUsername, this.defaultDisplayName);
+				LoginManager.gson.toJson(authData, fileWriter);
 			}
 			catch (IOException ex) { ex.printStackTrace(); }
+			finally
+			{
+				try
+				{
+					if (fileWriter != null) fileWriter.close();
+				}
+				catch (IOException ex) { ex.printStackTrace(); }
+			}
 		}
-		
 	}
+	/**
+	 * Attempt to login. If authentication data are found on disk then tries first to log in with
+	 * the stored token. If the token login fails then attempts to log in with the username and password
+	 * specified. If no user or pass are specified or if they fail then displays a login dialog to
+	 * allow the user to login. If login succeeds then the token is stored on disk and the method
+	 * returns.
+	 * 
+	 * If the user presses cancel in the login dialog then the method returns false.
+	 * 
+	 * @param username User name to log in with if token login fails, if null displays the login dialog immediately
+	 * @param password Password to log in with if token login fails, if null displays the login dialog immediately
+	 * @param remainingTries Number of loops to go through before giving up, decremented for each try, specify -1 for unlimited
+	 * @return false if the user presses cancel in the login dialog, otherwise returns true
+	 */
 	public boolean login(String username, String password, int remainingTries)
 	{
-		if (this.offline || remainingTries < 1)
+		if (this.offline || remainingTries == 0)
 		{
 			this.logInfo("LoginManager is set to work offline, skipping login");
 			return false;
 		}
-		this.logInfo("Remaining login tries: %d", remainingTries);
+		this.logInfo("Remaining login tries: %s", remainingTries > 0 ? remainingTries : "unlimited");
 		try
 		{
@@ -153,37 +212,50 @@ public class LoginManager
 		{
 			this.logInfo("Authentication agent reported invalid credentials: %s", ex.getMessage());
 			this.resetAuth();
-			
-			if (username == null)
-			{
-				username = this.defaultUsername;
-			}
-			if (this.showDialog || username == null || password == null)
+			if (remainingTries > 1)
 			{
-				LoginPanel loginPanel = LoginPanel.getLoginPanel(username, password, this.showDialog ? ex.getMessage() : null);
-				if (!loginPanel.showModalDialog())
+				if (username == null)
 				{
-					this.logInfo("User cancelled login dialog");
+					username = this.defaultUsername;
+				}
+	
+				if (this.forceShowLoginDialog || username == null || password == null)
+				{
+					LoginPanel loginPanel = LoginPanel.getLoginPanel(username, password, this.forceShowLoginDialog ? ex.getMessage() : null);
+					boolean dialogResult = loginPanel.showModalDialog();
 					this.offline = loginPanel.workOffline();
-					if (this.offline) this.save();
-					return false;
+					this.defaultUsername = loginPanel.getUsername();
+					
+					if (!dialogResult)
+					{
+						this.logInfo("User cancelled login dialog");
+						return false;
+					}
+					
+					if (this.offline)
+					{
+						if (JOptionPane.showConfirmDialog(null, "<html>You have chosen to work offline. You will never be prompted to log in again.<br /><br />If you would like to re-enable login please delete the file <span style=\"color: #0000FF\">.auth.json</span> from the working dir<br />or press Cancel to return to the login dialog.</html>", "Confirm work offline", JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.CANCEL_OPTION)
+						{
+							this.offline = false;
+							remainingTries = Math.max(remainingTries, 3);
+						}
+					}
+	
+					username = loginPanel.getUsername();
+					password = loginPanel.getPassword();
+					this.save();
 				}
-
-				username = loginPanel.getUsername();
-				password = loginPanel.getPassword();
-				this.offline = loginPanel.workOffline();
-				this.save();
-			}
-			
-			if (!Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password))
-			{
-				this.authentication.setUsername(username);
-				this.authentication.setPassword(password);
+				
+				if (!Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password))
+				{
+					this.authentication.setUsername(username);
+					this.authentication.setPassword(password);
+				}
+	
+				this.forceShowLoginDialog = true;
+				this.login(username, password, --remainingTries);
 			}
-
-			this.showDialog = true;
-			this.login(username, password, --remainingTries);
 		}
 		catch (AuthenticationException ex)
 		{
@@ -194,12 +266,34 @@ public class LoginManager
 		return false;
 	}
+	/**
+	 * Get whether user logged in
+	 */
+	public boolean isLoggedIn()
+	{
+		return this.authentication.isLoggedIn();
+	}
+	
+	/**
+	 * Get whether we are able to play online or not
+	 */
+	public boolean canPlayOnline()
+	{
+		return this.authentication.canPlayOnline();
+	}
+	
+	/**
+	 * Get the profile name (minecraft player name) from login
+	 */
 	public String getProfileName()
 	{
 		GameProfile selectedProfile = this.authentication.getSelectedProfile();
 		return selectedProfile != null ? selectedProfile.getName() : this.defaultDisplayName;
 	}
+	/**
+	 * Get the session token
+	 */
 	public String getAuthenticatedToken()
 	{
 		String accessToken = this.authentication.getAuthenticatedToken();
@@ -211,16 +305,25 @@ public class LoginManager
 		LoginManager.logger.info(String.format(message, params));
 	}
+	/**
+	 * Struct for Gson serialisation of authenticaion settings
+	 * 
+	 * @author Adam Mummery-Smith
+	 */
 	class AuthData
 	{
+		@SerializedName("clientToken")
 		private String clientToken;
+		@SerializedName("workOffline")
 		private boolean workOffline;
+		@SerializedName("authData")
 		private Map<String, String> credentials;
 		public AuthData()
 		{
+			// default ctor for Gson
 		}
 		public AuthData(YggdrasilAuthenticationService authService, YggdrasilUserAuthentication authentication, boolean workOffline, String defaultUserName, String defaultDisplayName)
@@ -236,6 +339,16 @@ public class LoginManager
 				this.credentials.put("displayName", defaultDisplayName);
 		}
+		/**
+		 * Called after Gson deserialisation to check that deserialisation was successful
+		 */
+		public boolean validate()
+		{
+			if (this.clientToken == null) this.clientToken = UUID.randomUUID().toString();
+			if (this.credentials == null) this.credentials = new HashMap<String, String>();
+			return true;
+		}
+
 		public String getClientToken()
 		{
 			return this.clientToken;
@@ -44,154 +44,184 @@ import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
 public class LoginPanel extends JPanel
 {
 	private static final long serialVersionUID = 1L;
+	
+	private GridBagLayout panelLoginLayout;
+	
+	private JPanel panelTitle;
+	private JPanel panelCentre;
+	private JPanel panelPadding;
+	private JPanel panelBottom;
+	private JLabel lblTitle;
+	private JLabel lblSubTitle;
+	private JLabel lblMessage;
+	private JLabel lblUserName;
+	private JLabel lblPassword;
 	private TextField txtUsername;
 	private TextField txtPassword;
 	private JButton btnLogin;
 	private JButton btnCancel;
+	private JCheckBox chkOffline;
-	private boolean loginClicked = false;
-
 	private JDialog dialog;
-	private JCheckBox chkOffline;
-	private JLabel lblLogIn;
-	private JPanel panelLogin;
-	private JPanel panelButtons;
-	private JPanel panelPadding;
-	private JLabel lblNewLabel;
-	private JLabel lblPassword;
-	private CustomFocusTraversal tabOrder = new CustomFocusTraversal();
-	private JLabel lblMessage;
+	private ListFocusTraversal tabOrder = new ListFocusTraversal();
+	
+	private boolean dialogResult = false;
 	public LoginPanel(String username, String password, String error)
 	{
+		Color backColour = new Color(102, 118, 144);
+		
 		this.setFocusable(false);
 		this.setPreferredSize(new Dimension(400, 260));
 		this.setBackground(new Color(105, 105, 105));
 		this.setLayout(new BorderLayout(0, 0));
-		this.lblLogIn = new JLabel("Log In");
-		this.lblLogIn.setFocusable(false);
-		this.lblLogIn.setBorder(new EmptyBorder(10, 16, 10, 16));
-		this.lblLogIn.setOpaque(true);
-		this.lblLogIn.setBackground(new Color(119, 136, 153));
-		this.lblLogIn.setFont(new Font("Tahoma", Font.BOLD, 18));
-		this.lblLogIn.setForeground(new Color(255, 255, 255));
-		this.lblLogIn.setPreferredSize(new Dimension(400, 64));
-		this.add(this.lblLogIn, BorderLayout.NORTH);
-		
-		this.panelButtons = new JPanel();
-		this.panelButtons.setFocusable(false);
-		this.panelButtons.setBackground(new Color(112, 128, 144));
-		this.panelButtons.setPreferredSize(new Dimension(400, 32));
-		this.add(this.panelButtons, BorderLayout.SOUTH);
-		this.panelButtons.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
+		this.panelTitle = new JPanel();
+		this.panelTitle.setBackground(backColour);
+		this.panelTitle.setPreferredSize(new Dimension(400, 64));
+		this.panelTitle.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
-		this.chkOffline = new JCheckBox("Never ask me to log in (always run offline)");
-		this.chkOffline.setPreferredSize(new Dimension(386, 23));
-		this.chkOffline.setForeground(new Color(255, 255, 255));
-		this.chkOffline.setOpaque(false);
-		this.panelButtons.add(this.chkOffline);
+		this.panelBottom = new JPanel();
+		this.panelBottom.setBackground(backColour);
+		this.panelBottom.setPreferredSize(new Dimension(400, 32));
+		this.panelBottom.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
 		this.panelPadding = new JPanel();
-		this.panelPadding.setFocusable(false);
 		this.panelPadding.setBorder(new EmptyBorder(4, 8, 8, 8));
 		this.panelPadding.setOpaque(false);
-		this.add(this.panelPadding, BorderLayout.CENTER);
 		this.panelPadding.setLayout(new BorderLayout(0, 0));
-		this.panelLogin = new JPanel();
-		this.panelLogin.setFocusable(false);
-		this.panelPadding.add(this.panelLogin);
-		this.panelLogin.setOpaque(false);
-		this.panelLogin.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Yggdrasil Login", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(255, 255, 255)));
-		GridBagLayout gbl_panelLogin = new GridBagLayout();
-		gbl_panelLogin.columnWidths = new int[] {30, 80, 120, 120, 30};
-		gbl_panelLogin.rowHeights = new int[] {24, 32, 32, 32};
-		gbl_panelLogin.columnWeights = new double[]{0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE};
-		gbl_panelLogin.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0};
-		this.panelLogin.setLayout(gbl_panelLogin);
+		this.panelCentre = new JPanel();
+		this.panelCentre.setOpaque(false);
+		this.panelCentre.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Yggdrasil Login", TitledBorder.LEADING, TitledBorder.TOP, null, Color.WHITE));
+		this.panelLoginLayout = new GridBagLayout();
+		this.panelLoginLayout.columnWidths = new int[] {30, 80, 120, 120, 30};
+		this.panelLoginLayout.rowHeights = new int[] {24, 32, 32, 32};
+		this.panelLoginLayout.columnWeights = new double[]{0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE};
+		this.panelLoginLayout.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0};
+		this.panelCentre.setLayout(this.panelLoginLayout);
+		
+		this.lblTitle = new JLabel("Log in to minecraft.net");
+		this.lblTitle.setBorder(new EmptyBorder(4, 16, 0, 16));
+		this.lblTitle.setFont(new Font("Tahoma", Font.BOLD, 18));
+		this.lblTitle.setForeground(Color.WHITE);
+		this.lblTitle.setPreferredSize(new Dimension(400, 26));
+
+		this.lblSubTitle = new JLabel("Your password will not be stored, logging in with Yggdrasil");
+		this.lblSubTitle.setBorder(new EmptyBorder(0, 16, 0, 16));
+		this.lblSubTitle.setForeground(Color.WHITE);
+		this.lblSubTitle.setPreferredSize(new Dimension(400, 16));
+		
+		this.lblMessage = new JLabel("Enter your login details for minecraft.net");
+		this.lblMessage.setForeground(Color.WHITE);
+		
+		this.lblUserName = new JLabel("User name");
+		this.lblUserName.setForeground(Color.WHITE);
+		
+		this.lblPassword = new JLabel("Password");
+		this.lblPassword.setForeground(Color.WHITE);
+		this.txtUsername = new TextField();
+		this.txtUsername.setPreferredSize(new Dimension(200, 22));
+		this.txtUsername.setText(username);
+
+		this.txtPassword = new TextField();
+		this.txtPassword.setEchoChar('*');
+		this.txtPassword.setPreferredSize(new Dimension(200, 22));
+		this.txtPassword.setText(password);
+
 		this.btnLogin = new JButton("Log in");
 		this.btnLogin.addActionListener(new ActionListener() {
 			@Override public void actionPerformed(ActionEvent e) {
 				LoginPanel.this.onLoginClick();
 			}
 		});
-		
+
 		this.btnCancel = new JButton("Cancel");
 		this.btnCancel.addActionListener(new ActionListener() {
 			@Override public void actionPerformed(ActionEvent e) {
 				LoginPanel.this.onCancelClick();
 			}
 		});
+
+		this.chkOffline = new JCheckBox("Never ask me to log in (always run offline)");
+		this.chkOffline.setPreferredSize(new Dimension(380, 23));
+		this.chkOffline.setForeground(Color.WHITE);
+		this.chkOffline.setOpaque(false);
+		this.chkOffline.addActionListener(new ActionListener()
+		{
+			@Override public void actionPerformed(ActionEvent e)
+			{
+				LoginPanel.this.onOfflineCheckedChanged();
+			}
+		});
+
+		GridBagConstraints lblMessageConstraints = new GridBagConstraints();
+		lblMessageConstraints.anchor = GridBagConstraints.WEST;
+		lblMessageConstraints.gridwidth = 2;
+		lblMessageConstraints.insets = new Insets(0, 0, 5, 5);
+		lblMessageConstraints.gridx = 2;
+		lblMessageConstraints.gridy = 0;
-		this.lblMessage = new JLabel("Enter your login details for minecraft.net");
-		this.lblMessage.setForeground(new Color(255, 255, 255));
-		GridBagConstraints gbc_lblNewLabel_1 = new GridBagConstraints();
-		gbc_lblNewLabel_1.anchor = GridBagConstraints.WEST;
-		gbc_lblNewLabel_1.gridwidth = 2;
-		gbc_lblNewLabel_1.insets = new Insets(0, 0, 5, 5);
-		gbc_lblNewLabel_1.gridx = 2;
-		gbc_lblNewLabel_1.gridy = 0;
-		this.panelLogin.add(this.lblMessage, gbc_lblNewLabel_1);
+		GridBagConstraints lblUserNameConstraints = new GridBagConstraints();
+		lblUserNameConstraints.anchor = GridBagConstraints.WEST;
+		lblUserNameConstraints.fill = GridBagConstraints.VERTICAL;
+		lblUserNameConstraints.insets = new Insets(0, 0, 5, 5);
+		lblUserNameConstraints.gridx = 1;
+		lblUserNameConstraints.gridy = 1;
-		this.lblNewLabel = new JLabel("User name");
-		this.lblNewLabel.setFocusable(false);
-		this.lblNewLabel.setForeground(new Color(255, 255, 255));
-		GridBagConstraints gbc_lblNewLabel = new GridBagConstraints();
-		gbc_lblNewLabel.anchor = GridBagConstraints.WEST;
-		gbc_lblNewLabel.fill = GridBagConstraints.VERTICAL;
-		gbc_lblNewLabel.insets = new Insets(0, 0, 5, 5);
-		gbc_lblNewLabel.gridx = 1;
-		gbc_lblNewLabel.gridy = 1;
-		this.panelLogin.add(this.lblNewLabel, gbc_lblNewLabel);
+		GridBagConstraints lblPasswordConstraints = new GridBagConstraints();
+		lblPasswordConstraints.anchor = GridBagConstraints.WEST;
+		lblPasswordConstraints.fill = GridBagConstraints.VERTICAL;
+		lblPasswordConstraints.insets = new Insets(0, 0, 5, 5);
+		lblPasswordConstraints.gridx = 1;
+		lblPasswordConstraints.gridy = 2;
-		this.txtUsername = new TextField();
-		this.txtUsername.setPreferredSize(new Dimension(200, 22));
-		this.txtUsername.setText(username);
-		GridBagConstraints gbc_txtUsername = new GridBagConstraints();
-		gbc_txtUsername.gridwidth = 2;
-		gbc_txtUsername.fill = GridBagConstraints.HORIZONTAL;
-		gbc_txtUsername.insets = new Insets(0, 0, 5, 0);
-		gbc_txtUsername.gridx = 2;
-		gbc_txtUsername.gridy = 1;
-		this.panelLogin.add(this.txtUsername, gbc_txtUsername);
+		GridBagConstraints txtUsernameConstraints = new GridBagConstraints();
+		txtUsernameConstraints.gridwidth = 2;
+		txtUsernameConstraints.fill = GridBagConstraints.HORIZONTAL;
+		txtUsernameConstraints.insets = new Insets(0, 0, 5, 0);
+		txtUsernameConstraints.gridx = 2;
+		txtUsernameConstraints.gridy = 1;
-		this.lblPassword = new JLabel("Password");
-		this.lblPassword.setFocusable(false);
-		this.lblPassword.setForeground(Color.WHITE);
-		GridBagConstraints gbc_lblPassword = new GridBagConstraints();
-		gbc_lblPassword.anchor = GridBagConstraints.WEST;
-		gbc_lblPassword.fill = GridBagConstraints.VERTICAL;
-		gbc_lblPassword.insets = new Insets(0, 0, 5, 5);
-		gbc_lblPassword.gridx = 1;
-		gbc_lblPassword.gridy = 2;
-		this.panelLogin.add(this.lblPassword, gbc_lblPassword);
+		GridBagConstraints txtPasswordConstraints = new GridBagConstraints();
+		txtPasswordConstraints.gridwidth = 2;
+		txtPasswordConstraints.insets = new Insets(0, 0, 5, 0);
+		txtPasswordConstraints.fill = GridBagConstraints.HORIZONTAL;
+		txtPasswordConstraints.gridx = 2;
+		txtPasswordConstraints.gridy = 2;
-		this.txtPassword = new TextField();
-		this.txtPassword.setEchoChar('*');
-		this.txtPassword.setPreferredSize(new Dimension(200, 22));
-		this.txtPassword.setText(password);
-		GridBagConstraints gbc_txtPassword = new GridBagConstraints();
-		gbc_txtPassword.gridwidth = 2;
-		gbc_txtPassword.insets = new Insets(0, 0, 5, 0);
-		gbc_txtPassword.fill = GridBagConstraints.HORIZONTAL;
-		gbc_txtPassword.gridx = 2;
-		gbc_txtPassword.gridy = 2;
-		this.panelLogin.add(this.txtPassword, gbc_txtPassword);
-		GridBagConstraints gbc_btnCancel = new GridBagConstraints();
-		gbc_btnCancel.anchor = GridBagConstraints.EAST;
-		gbc_btnCancel.insets = new Insets(0, 0, 0, 5);
-		gbc_btnCancel.gridx = 2;
-		gbc_btnCancel.gridy = 3;
-		this.panelLogin.add(this.btnCancel, gbc_btnCancel);
-		GridBagConstraints gbc_btnLogin = new GridBagConstraints();
-		gbc_btnLogin.fill = GridBagConstraints.HORIZONTAL;
-		gbc_btnLogin.gridx = 3;
-		gbc_btnLogin.gridy = 3;
-		this.panelLogin.add(this.btnLogin, gbc_btnLogin);
+		GridBagConstraints btnLoginConstraints = new GridBagConstraints();
+		btnLoginConstraints.fill = GridBagConstraints.HORIZONTAL;
+		btnLoginConstraints.gridx = 3;
+		btnLoginConstraints.gridy = 3;
+		
+		GridBagConstraints btnCancelConstraints = new GridBagConstraints();
+		btnCancelConstraints.anchor = GridBagConstraints.EAST;
+		btnCancelConstraints.insets = new Insets(0, 0, 0, 5);
+		btnCancelConstraints.gridx = 2;
+		btnCancelConstraints.gridy = 3;
+		
+		this.add(this.panelTitle, BorderLayout.NORTH);
+		this.add(this.panelPadding, BorderLayout.CENTER);
+		this.add(this.panelBottom, BorderLayout.SOUTH);
+		
+		this.panelPadding.add(this.panelCentre);
+		this.panelTitle.add(this.lblTitle);
+		this.panelTitle.add(this.lblSubTitle);
+
+		this.panelCentre.add(this.lblMessage, lblMessageConstraints);
+		this.panelCentre.add(this.lblUserName, lblUserNameConstraints);
+		this.panelCentre.add(this.lblPassword, lblPasswordConstraints);
+		this.panelCentre.add(this.txtUsername, txtUsernameConstraints);
+		this.panelCentre.add(this.txtPassword, txtPasswordConstraints);
+		this.panelCentre.add(this.btnLogin, btnLoginConstraints);
+		this.panelCentre.add(this.btnCancel, btnCancelConstraints);
+
+		this.panelBottom.add(this.chkOffline);
+
 		this.tabOrder.add(this.txtUsername);
 		this.tabOrder.add(this.txtPassword);
 		this.tabOrder.add(this.btnLogin);
@@ -218,7 +248,7 @@ public class LoginPanel extends JPanel
 	protected void onLoginClick()
 	{
-		this.loginClicked = true;
+		this.dialogResult = true;
 		this.dialog.setVisible(false);
 	}
@@ -227,6 +257,14 @@ public class LoginPanel extends JPanel
 		this.dialog.setVisible(false);
 	}
+	protected void onOfflineCheckedChanged()
+	{
+		boolean selected = this.chkOffline.isSelected();
+		this.btnLogin.setText(selected ? "Work Offline" : "Log In");
+		this.txtUsername.setEnabled(!selected);
+		this.txtPassword.setEnabled(!selected);
+	}
+	
 	/**
 	 * @param dialog
 	 * @param panel
@@ -252,7 +290,7 @@ public class LoginPanel extends JPanel
 	{
 		this.dialog.setVisible(true);
 		this.dialog.dispose();
-		return this.loginClicked;
+		return this.dialogResult;
 	}
 	public String getUsername()
@@ -290,7 +328,7 @@ public class LoginPanel extends JPanel
 		return panel;
 	}
-	class CustomFocusTraversal extends FocusTraversalPolicy
+	class ListFocusTraversal extends FocusTraversalPolicy
 	{
 		private final List<Component> components = new ArrayList<Component>();
 package com.mumfrey.liteloader.debug;
 import java.io.File;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
 import java.util.logging.Logger;
 import net.minecraft.launchwrapper.Launch;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogFormatter;
 /**
  * Wrapper class for LaunchWrapper Main class, which logs into minecraft.net first so that online shizzle can be tested
@@ -23,6 +26,8 @@ public abstract class Start
 	 */
 	public static void main(String[] args)
 	{
+		Start.prepareLogger();
+		
 		String usernameFromCmdLine = (args.length > 0) ? args[0] : null;
 		String passwordFromCmdLine = (args.length > 1) ? args[1] : null;
@@ -46,4 +51,13 @@ public abstract class Start
 		Launch.main(args);
 	}
+	
+	private static void prepareLogger()
+	{
+		for (Handler handler : Start.logger.getParent().getHandlers())
+		{
+			if (handler instanceof ConsoleHandler)
+				handler.setFormatter(new LiteLoaderLogFormatter());
+		}
+	}
 }