LiteLoader 1.6.4_02 - dev only - replace launcher jar with authlib, add better s…

…upport for yggdrasil token auth with login dialog box

LiteLoader 1.6.4_02 - dev only - replace launcher jar with authlib, add better s…
…upport for yggdrasil token auth with login dialog box
Mumfrey
1 parent 1ffb7333
Showing 15 changed files with 630 additions and 129 deletions
.classpath
ant/build_liteloader.xml
ant/ant-contrib.jar → ant/tasks/ant-contrib.jar
debug/com/mumfrey/liteloader/debug/AuthenticationRequest.java
debug/com/mumfrey/liteloader/debug/LoginManager.java
debug/com/mumfrey/liteloader/debug/LoginPanel.java
debug/com/mumfrey/liteloader/debug/Start.java
debug/minecraft.key
javadoc/guava-14.0.1-javadoc.jar
javadoc/jopt-simple-4.5-javadoc.jar
lib/authlib-1.3.jar
lib/jopt-simple-4.5.jar
lib/launcher.jar
lib/log4j-api-2.0-beta9.jar
lib/log4j-core-2.0-beta9.jar
@@ -7,15 +7,14 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/LiteLoader/javadoc/guava-14.0.1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/launchwrapper-1.8.jar"/>
-	<classpathentry kind="lib" path="lib/jopt-simple-4.5.jar"/>
-	<classpathentry kind="lib" path="lib/launcher.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-4.1.jar"/>
+	<classpathentry kind="lib" path="lib/authlib-1.3.jar" sourcepath="/AuthLib/java"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-api-2.0-beta9.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-core-2.0-beta9.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
 <?xml version="1.0" encoding="UTF-8" ?>
 <project name="liteloader" basedir="." default="rebuild">
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" />
 	<!-- Versions !!IMPORTANT -->
 	<property name="version" value="1.6.4" />
@@ -130,16 +130,20 @@
 	<target name="prepare" description="Prepare source for MCP" depends="preparemd5">
 		<echo level="info" message="Prepare sources for compile" />
+		<echo level="info" message="Contributing libs" />
 		<copy todir="${libs}" verbose="true" overwrite="true">
 			<fileset dir="${eclipse}/LiteLoader/lib">
-				<exclude name="**/launcher.jar" />
+				<exclude name="**/authlib*.jar" />
+				<exclude name="**/log4j*.jar" />
 			</fileset>
 		</copy>
+		<echo level="info" message="Contributing MC source" />
 		<copy todir="${src}" verbose="false" overwrite="true">
 			<fileset dir="${mc.src}" />
 		</copy>
+		<echo level="info" message="Contributing upstream projects" />
 		<foreach list="${upstream}" param="lib" target="contributesource" />
 		<antcall target="contributesource">
-package com.mumfrey.liteloader.debug;
-
-import java.util.UUID;
-
-import net.minecraft.launcher.authentication.yggdrasil.Agent;
-
-@SuppressWarnings("unused")
-public class AuthenticationRequest
-{
-	private Agent agent;
-	private String username;
-	private String password;
-	private String clientToken;
-	
-	public AuthenticationRequest(String username, String password)
-	{
-		this.agent = Agent.MINECRAFT;
-		this.username = username;
-		this.password = password;
-		this.clientToken = UUID.randomUUID().toString();
-	}
-}
-
+package com.mumfrey.liteloader.debug;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.Proxy;
+import java.util.Map;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+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.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.exceptions.InvalidCredentialsException;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+/**
+ * Manages login requests against Yggdrasil for use in MCP
+ *
+ * @author Adam Mummery-Smith
+ */
+public class LoginManager
+{
+	private static Logger logger = Logger.getLogger("liteloader");
+	
+	private static Gson gson = new GsonBuilder().setPrettyPrinting().create();
+	
+	private YggdrasilAuthenticationService authService;
+	
+	private YggdrasilUserAuthentication authentication;
+
+	private File jsonFile;
+	
+	private String defaultUsername;
+	
+	private String defaultDisplayName = System.getProperty("user.name");
+	
+	private boolean offline = false;
+	
+	private boolean showDialog = false;
+	
+	public LoginManager(File jsonFile)
+	{
+		this.jsonFile = jsonFile;
+
+		this.resetAuth();
+		this.load();
+	}
+
+	/**
+	 * 
+	 */
+	public void resetAuth()
+	{
+		this.authService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
+		this.authentication = new YggdrasilUserAuthentication(this.authService, Agent.MINECRAFT);
+	}
+
+	/**
+	 * @throws JsonIOException
+	 * @throws JsonSyntaxException
+	 */
+	private void load()
+	{
+		if (this.jsonFile.exists())
+		{
+			FileReader fileReader = null;
+			
+			try
+			{
+				fileReader = new FileReader(this.jsonFile);
+				AuthData authData = LoginManager.gson.fromJson(fileReader, AuthData.class);
+				
+				if (authData != null)
+				{
+					this.logInfo("Initialising Yggdrasil authentication service with client token: %s", authData.getClientToken());
+					this.authService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, authData.getClientToken());
+					this.authentication = new YggdrasilUserAuthentication(this.authService, Agent.MINECRAFT);
+					authData.loadFromStorage(this.authentication);
+					this.offline = authData.workOffline();
+					this.defaultUsername = authData.getUsername();
+					this.defaultDisplayName = authData.getDisplayName();
+				}
+			}
+			catch (IOException ex) {}
+			finally
+			{
+				try
+				{
+					if (fileReader != null) fileReader.close();
+				}
+				catch (IOException ex) {}
+			}
+		}
+	}
+	
+	private void save()
+	{
+		FileWriter fileWriter = null;
+		
+		try
+		{
+			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(); }
+		}
+		
+	}
+
+	public boolean login(String username, String password, int remainingTries)
+	{
+		if (this.offline || remainingTries < 1)
+		{
+			this.logInfo("LoginManager is set to work offline, skipping login");
+			return false;
+		}
+		
+		this.logInfo("Remaining login tries: %d", remainingTries);
+		
+		try
+		{
+			this.logInfo("Attempting login, contacting Mojang auth servers...");
+			
+			this.authentication.logIn();
+			
+			if (this.authentication.isLoggedIn())
+			{
+				this.logInfo("LoginManager logged in successfully. Can play online = %s", this.authentication.canPlayOnline());
+				this.save();
+				return true;
+			}
+			
+			this.logInfo("LoginManager failed to log in, unspecified status.");
+		}
+		catch (InvalidCredentialsException ex)
+		{
+			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)
+			{
+				LoginPanel loginPanel = LoginPanel.getLoginPanel(username, password, this.showDialog ? ex.getMessage() : null);
+				if (!loginPanel.showModalDialog())
+				{
+					this.logInfo("User cancelled login dialog");
+					this.offline = loginPanel.workOffline();
+					if (this.offline) this.save();
+					return false;
+				}
+
+				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);
+			}
+
+			this.showDialog = true;
+			this.login(username, password, --remainingTries);
+		}
+		catch (AuthenticationException ex)
+		{
+			ex.printStackTrace();
+		}
+		
+		this.save();
+		return false;
+	}
+	
+	public String getProfileName()
+	{
+		GameProfile selectedProfile = this.authentication.getSelectedProfile();
+		return selectedProfile != null ? selectedProfile.getName() : this.defaultDisplayName;
+	}
+	
+	public String getAuthenticatedToken()
+	{
+		String accessToken = this.authentication.getAuthenticatedToken();
+		return accessToken != null ? accessToken : "-";
+	}
+	
+	private void logInfo(String message, Object... params)
+	{
+		LoginManager.logger.info(String.format(message, params));
+	}
+
+	class AuthData
+	{
+		private String clientToken;
+		
+		private boolean workOffline;
+		
+		private Map<String, String> credentials;
+		
+		public AuthData()
+		{
+		}
+
+		public AuthData(YggdrasilAuthenticationService authService, YggdrasilUserAuthentication authentication, boolean workOffline, String defaultUserName, String defaultDisplayName)
+		{
+			this.clientToken = authService.getClientToken();
+			this.credentials = authentication.saveForStorage();
+			this.workOffline = workOffline;
+			
+			if (defaultUserName != null && !this.credentials.containsKey("username"))
+				this.credentials.put("username", defaultUserName);
+			
+			if (defaultDisplayName != null && !this.credentials.containsKey("displayName"))
+				this.credentials.put("displayName", defaultDisplayName);
+		}
+
+		public String getClientToken()
+		{
+			return this.clientToken;
+		}
+
+		public void setClientToken(String clientToken)
+		{
+			this.clientToken = clientToken;
+		}
+
+		public void loadFromStorage(YggdrasilUserAuthentication authentication)
+		{
+			authentication.loadFromStorage(this.credentials);
+		}
+		
+		public boolean workOffline()
+		{
+			return this.workOffline;
+		}
+
+		public String getUsername()
+		{
+			return this.credentials != null ? this.credentials.get("username") : null;
+		}
+		
+		public String getDisplayName()
+		{
+			return this.credentials != null && this.credentials.containsKey("displayName") ? this.credentials.get("displayName") : System.getProperty("user.name");
+		}
+	}
+}
+package com.mumfrey.liteloader.debug;
+
+import javax.swing.JPanel;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.BorderLayout;
+
+import javax.swing.JLabel;
+
+import java.awt.Font;
+
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.JDialog;
+import javax.swing.UIManager;
+import javax.swing.JCheckBox;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.FocusTraversalPolicy;
+import java.awt.TextField;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+
+import javax.swing.JButton;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
+
+/**
+ * JPanel displayed in a JDialog to prompt the user for login credentials for minecraft
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class LoginPanel extends JPanel
+{
+	private static final long serialVersionUID = 1L;
+	private TextField txtUsername;
+	private TextField txtPassword;
+	private JButton btnLogin;
+	private JButton btnCancel;
+	
+	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;
+	
+	public LoginPanel(String username, String password, String error)
+	{
+		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.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.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.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.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);
+		
+		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);
+		
+		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);
+		
+		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);
+		
+		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);
+		
+		this.tabOrder.add(this.txtUsername);
+		this.tabOrder.add(this.txtPassword);
+		this.tabOrder.add(this.btnLogin);
+		this.tabOrder.add(this.btnCancel);
+		this.tabOrder.add(this.chkOffline);
+		
+		if (error != null)
+		{
+			this.lblMessage.setText(error);
+			this.lblMessage.setForeground(new Color(255, 180, 180));
+		}
+	}
+	
+	protected void onShowDialog()
+	{
+		if (this.txtUsername.getText().length() > 0)
+		{
+			if (this.txtPassword.getText().length() > 0)
+				this.txtUsername.select(0, this.txtUsername.getText().length());
+			else
+				this.txtPassword.requestFocusInWindow();
+		}
+	}
+	
+	protected void onLoginClick()
+	{
+		this.loginClicked = true;
+		this.dialog.setVisible(false);
+	}
+
+	protected void onCancelClick()
+	{
+		this.dialog.setVisible(false);
+	}
+	
+	/**
+	 * @param dialog
+	 * @param panel
+	 */
+	public void setDialog(JDialog dialog)
+	{
+		this.dialog = dialog;
+
+		this.dialog.addWindowListener(new WindowAdapter()
+		{
+			@Override
+			public void windowOpened(WindowEvent e)
+			{
+				LoginPanel.this.onShowDialog();
+			}
+		});
+		
+		this.dialog.getRootPane().setDefaultButton(this.btnLogin);
+		this.dialog.setFocusTraversalPolicy(this.tabOrder);
+	}
+	
+	public boolean showModalDialog()
+	{
+		this.dialog.setVisible(true);
+		this.dialog.dispose();
+		return this.loginClicked;
+	}
+	
+	public String getUsername()
+	{
+		return this.txtUsername.getText();
+	}
+	
+	public String getPassword()
+	{
+		return this.txtPassword.getText();
+	}
+	
+	public boolean workOffline()
+	{
+		return this.chkOffline.isSelected();
+	}
+	
+	public static LoginPanel getLoginPanel(String username, String password, String error)
+	{
+		if (username == null) username = "";
+		if (password == null) password = "";
+		
+		final JDialog dialog = new JDialog();
+		final LoginPanel panel = new LoginPanel(username, password, error);
+		panel.setDialog(dialog);
+		
+		dialog.setContentPane(panel);
+		dialog.setTitle("Yggdrasil Login");
+		dialog.setResizable(false);
+		dialog.pack();
+		dialog.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+		dialog.setLocationRelativeTo(null);
+		dialog.setModal(true);
+		
+		return panel;
+	}
+	
+	class CustomFocusTraversal extends FocusTraversalPolicy
+	{
+		private final List<Component> components = new ArrayList<Component>();
+		
+		void add(Component component)
+		{
+			this.components.add(component);
+		}
+		
+		@Override
+		public Component getComponentAfter(Container container, Component component)
+		{
+			int index = this.components.indexOf(component) + 1;
+			if (index >= this.components.size()) return this.components.get(0);
+			return this.components.get(index);
+		}
+		
+		@Override
+		public Component getComponentBefore(Container container, Component component)
+		{
+			int index = this.components.indexOf(component) - 1;
+			if (index < 0) return this.getLastComponent(container);
+			return this.components.get(index);
+		}
+		
+		@Override
+		public Component getFirstComponent(Container container)
+		{
+			return this.components.get(0);
+		}
+		
+		@Override
+		public Component getLastComponent(Container container)
+		{
+			return this.components.get(this.components.size() - 1);
+		}
+		
+		@Override
+		public Component getDefaultComponent(Container container)
+		{
+			return this.getFirstComponent(container);
+		}
+	}
+}
 package com.mumfrey.liteloader.debug;
 import java.io.File;
-import java.io.IOException;
-import java.net.Proxy;
-import java.net.URL;
+import java.util.logging.Logger;
-import net.minecraft.hopper.Util;
-import net.minecraft.launcher.authentication.yggdrasil.AuthenticationResponse;
 import net.minecraft.launchwrapper.Launch;
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.gson.Gson;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
 /**
  * Wrapper class for LaunchWrapper Main class, which logs into minecraft.net first so that online shizzle can be tested
  * 
  * @author Adam Mummery-Smith
- * @version 0.5
+ * @version 0.6
  */
 public abstract class Start
 {
-	/**
-	 * Username specified on the command line
-	 */
-	private static String userName = "";
+	private static Logger logger = Logger.getLogger("liteloader");
 	/**
-	 * Session ID retrieved during login ("-" means no session, eg. offline)
-	 */
-	private static String sessionId = "-";
-	
-	/**
-	 * Entry point. Validates the parameters and performs the login
+	 * Entry point.
 	 * 
 	 * @param args
 	 */
 	public static void main(String[] args)
 	{
-		// Check we have enough arguments
-		if (args.length < 2)
-		{
-			Start.showError("Invalid parameters specified for start, use: <username> <password> to log in to minecraft.net");
-			userName = args.length < 1 ? System.getProperty("user.name") : args[0];
-		}
-		else
-		{
-			// Assign username as the first argument
-			userName = args[0];			
-			
-			// Perform the login if the second parameter is not "-" (indicating offline)
-			if (!args[1].equals("-") && Start.login(args[0], args[1], 13, true))
-			{
-				Start.showMessage(String.format("Successfully logged in as %s with session ID %s", userName, sessionId));
-				args[0] = userName;
-				args[1] = sessionId;
-			}
-		}
+		String usernameFromCmdLine = (args.length > 0) ? args[0] : null;
+		String passwordFromCmdLine = (args.length > 1) ? args[1] : null;
+		
+		File loginJson = new File(new File(System.getProperty("user.dir")), ".auth.json");
+		LoginManager loginManager = new LoginManager(loginJson);
+		loginManager.login(usernameFromCmdLine, passwordFromCmdLine, 5);
-		Start.showMessage(String.format("Launching game as %s", userName));
+		Start.logger.info(String.format("Launching game as %s", loginManager.getProfileName()));
 		File gameDir = new File(System.getProperty("user.dir"));
 		File assetsDir = new File(gameDir, "assets");
 		args = new String[] {
 			"--tweakClass", LiteLoaderTweaker.class.getName(),
-			"--username",   userName,
-			"--session",    sessionId,
+			"--username",   loginManager.getProfileName(),
+			"--session",    loginManager.getAuthenticatedToken(),
 			"--version",    "mcp",
 			"--gameDir",    gameDir.getAbsolutePath(),
 			"--assetsDir",  assetsDir.getAbsolutePath()
@@ -74,60 +46,4 @@ public abstract class Start
 		Launch.main(args);
 	}
-	
-	private static boolean login(String user, String password, int masqueradeLauncherVersion, boolean validateCertificate)
-	{
-		try
-		{
-			AuthenticationResponse response = Start.authRequest(user, password);
-			
-			if (response != null)
-			{
-				userName = response.getSelectedProfile().getName();
-				sessionId = String.format("token:%s:%s", response.getAccessToken(), response.getSelectedProfile().getId());
-				return true;
-			}
-		}
-		catch (Exception ex) {}
-
-		return false;
-	}
-
-	protected static AuthenticationResponse authRequest(String user, String password) throws IOException
-	{
-		Gson gson = new Gson();
-		AuthenticationRequest request = new AuthenticationRequest(user, password);
-		URL authUrl = new URL("https://authserver.mojang.com/authenticate");
-		String json = Util.performPost(authUrl, gson.toJson(request), Proxy.NO_PROXY, "application/json", true);
-		AuthenticationResponse result = gson.fromJson(json, AuthenticationResponse.class);
-		if (result != null)
-		{
-			if (StringUtils.isBlank(result.getError()))
-				return result;
-			
-			Start.showError(result.getErrorMessage());
-		}
-
-		return null;
-	}
-
-	/**
-	 * Show a message on stdout
-	 * 
-	 * @param message
-	 */
-	private static void showMessage(String message)
-	{
-		System.out.println("[START] [INFO] " + message);
-	}
-
-	/**
-	 * Show a message on stderr
-	 * 
-	 * @param message
-	 */
-	private static void showError(String message)
-	{
-		System.err.println("[START] [ERROR] " + message);
-	}
 }