10 files changed, 0 insertions, 1395 deletions

diff --git a/depends/launcher/org/multimc/EntryPoint.java b/depends/launcher/org/multimc/EntryPoint.java
deleted file mode 100644
index d1fc54a8..00000000
--- a/depends/launcher/org/multimc/EntryPoint.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.multimc;/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.multimc.legacy.LegacyLauncher;
-import org.multimc.onesix.OneSixLauncher;
-import org.simplericity.macify.eawt.Application;
-import org.simplericity.macify.eawt.DefaultApplication;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.nio.charset.Charset;
-
-public class EntryPoint
-{
-	private enum Action
-	{
-		Proceed,
-		Launch,
-		Abort
-	}
-
-	public static void main(String[] args)
-	{
-		// Set the OSX application icon first, if we are on OSX.
-		Application application = new DefaultApplication();
-		if(application.isMac())
-		{
-			try
-			{
-				BufferedImage image = ImageIO.read(new File("icon.png"));
-				application.setApplicationIconImage(image);
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-			}
-		}
-
-		EntryPoint listener = new EntryPoint();
-		int retCode = listener.listen();
-		if (retCode != 0)
-		{
-			System.out.println("Exiting with " + retCode);
-			System.exit(retCode);
-		}
-	}
-
-	private Action parseLine(String inData) throws ParseException
-	{
-		String[] pair = inData.split(" ", 2);
-
-		if(pair.length == 1)
-		{
-			String command = pair[0];
-			if (pair[0].equals("launch"))
-				return Action.Launch;
-
-			else if (pair[0].equals("abort"))
-				return Action.Abort;
-
-			else throw new ParseException();
-		}
-
-		if(pair.length != 2)
-			throw new ParseException();
-
-		String command = pair[0];
-		String param = pair[1];
-
-		if(command.equals("launcher"))
-		{
-			if(param.equals("legacy"))
-			{
-				m_launcher = new LegacyLauncher();
-				Utils.log("Using legacy launcher.");
-				Utils.log();
-				return Action.Proceed;
-			}
-			if(param.equals("onesix"))
-			{
-				m_launcher = new OneSixLauncher();
-				Utils.log("Using onesix launcher.");
-				Utils.log();
-				return Action.Proceed;
-			}
-			else
-				throw new ParseException();
-		}
-
-		m_params.add(command, param);
-		//System.out.println(command + " : " + param);
-		return Action.Proceed;
-	}
-
-	public int listen()
-	{
-		BufferedReader buffer;
-		try
-		{
-			buffer = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
-		} catch (UnsupportedEncodingException e)
-		{
-			System.err.println("For some reason, your java does not support UTF-8. Consider living in the current century.");
-			e.printStackTrace();
-			return 1;
-		}
-		boolean isListening = true;
-		boolean isAborted = false;
-		// Main loop
-		while (isListening)
-		{
-			String inData;
-			try
-			{
-				// Read from the pipe one line at a time
-				inData = buffer.readLine();
-				if (inData != null)
-				{
-					Action a = parseLine(inData);
-					if(a == Action.Abort)
-					{
-						isListening = false;
-						isAborted = true;
-					}
-					if(a == Action.Launch)
-					{
-						isListening = false;
-					}
-				}
-				else
-				{
-					isListening = false;
-					isAborted = true;
-				}
-			}
-			catch (IOException e)
-			{
-				System.err.println("Launcher ABORT due to IO exception:");
-				e.printStackTrace();
-				return 1;
-			}
-			catch (ParseException e)
-			{
-				System.err.println("Launcher ABORT due to PARSE exception:");
-				e.printStackTrace();
-				return 1;
-			}
-		}
-		if(isAborted)
-		{
-			System.err.println("Launch aborted by MultiMC.");
-			return 1;
-		}
-		if(m_launcher != null)
-		{
-			return m_launcher.launch(m_params);
-		}
-		System.err.println("No valid launcher implementation specified.");
-		return 1;
-	}
-
-	private ParamBucket m_params = new ParamBucket();
-	private org.multimc.Launcher m_launcher;
-}
diff --git a/depends/launcher/org/multimc/IconLoader.java b/depends/launcher/org/multimc/IconLoader.java
deleted file mode 100644
index f1638f3a..00000000
--- a/depends/launcher/org/multimc/IconLoader.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.multimc;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/*****************************************************************************
- * A convenience class for loading icons from images.
- *
- * Icons loaded from this class are formatted to fit within the required
- * dimension (16x16, 32x32, or 128x128). If the source image is larger than the
- * target dimension, it is shrunk down to the minimum size that will fit. If it
- * is smaller, then it is only scaled up if the new scale can be a per-pixel
- * linear scale (i.e., x2, x3, x4, etc). In both cases, the image's width/height
- * ratio is kept the same as the source image.
- *
- * @author Chris Molini
- *****************************************************************************/
-public class IconLoader
-{
-	/*************************************************************************
-	 * Loads an icon in ByteBuffer form.
-	 *
-	 * @param filepath
-	 *            The location of the Image to use as an icon.
-	 *
-	 * @return An array of ByteBuffers containing the pixel data for the icon in
-	 *         various sizes (as recommended by the OS).
-	 *************************************************************************/
-	public static ByteBuffer[] load(String filepath)
-	{
-		BufferedImage image;
-		try {
-			image = ImageIO.read ( new File( filepath ) );
-		} catch ( IOException e ) {
-			e.printStackTrace();
-			return new ByteBuffer[0];
-		}
-		ByteBuffer[] buffers;
-		buffers = new ByteBuffer[1];
-		buffers[0] = loadInstance(image, 128);
-		return buffers;
-	}
-
-	/*************************************************************************
-	 * Copies the supplied image into a square icon at the indicated size.
-	 *
-	 * @param image
-	 *            The image to place onto the icon.
-	 * @param dimension
-	 *            The desired size of the icon.
-	 *
-	 * @return A ByteBuffer of pixel data at the indicated size.
-	 *************************************************************************/
-	private static ByteBuffer loadInstance(BufferedImage image, int dimension)
-	{
-		BufferedImage scaledIcon = new BufferedImage(dimension, dimension,
-				BufferedImage.TYPE_INT_ARGB_PRE);
-		Graphics2D g = scaledIcon.createGraphics();
-		double ratio = getIconRatio(image, scaledIcon);
-		double width = image.getWidth() * ratio;
-		double height = image.getHeight() * ratio;
-		g.drawImage(image, (int) ((scaledIcon.getWidth() - width) / 2),
-				(int) ((scaledIcon.getHeight() - height) / 2), (int) (width),
-				(int) (height), null);
-		g.dispose();
-
-		return convertToByteBuffer(scaledIcon);
-	}
-
-	/*************************************************************************
-	 * Gets the width/height ratio of the icon. This is meant to simplify
-	 * scaling the icon to a new dimension.
-	 *
-	 * @param src
-	 *            The base image that will be placed onto the icon.
-	 * @param icon
-	 *            The icon that will have the image placed on it.
-	 *
-	 * @return The amount to scale the source image to fit it onto the icon
-	 *         appropriately.
-	 *************************************************************************/
-	private static double getIconRatio(BufferedImage src, BufferedImage icon)
-	{
-		double ratio = 1;
-		if (src.getWidth() > icon.getWidth())
-			ratio = (double) (icon.getWidth()) / src.getWidth();
-		else
-			ratio = (int) (icon.getWidth() / src.getWidth());
-		if (src.getHeight() > icon.getHeight())
-		{
-			double r2 = (double) (icon.getHeight()) / src.getHeight();
-			if (r2 < ratio)
-				ratio = r2;
-		}
-		else
-		{
-			double r2 = (int) (icon.getHeight() / src.getHeight());
-			if (r2 < ratio)
-				ratio = r2;
-		}
-		return ratio;
-	}
-
-	/*************************************************************************
-	 * Converts a BufferedImage into a ByteBuffer of pixel data.
-	 *
-	 * @param image
-	 *            The image to convert.
-	 *
-	 * @return A ByteBuffer that contains the pixel data of the supplied image.
-	 *************************************************************************/
-	public static ByteBuffer convertToByteBuffer(BufferedImage image)
-	{
-		byte[] buffer = new byte[image.getWidth() * image.getHeight() * 4];
-		int counter = 0;
-		for (int i = 0; i < image.getHeight(); i++)
-			for (int j = 0; j < image.getWidth(); j++)
-			{
-				int colorSpace = image.getRGB(j, i);
-				buffer[counter + 0] = (byte) ((colorSpace << 8) >> 24);
-				buffer[counter + 1] = (byte) ((colorSpace << 16) >> 24);
-				buffer[counter + 2] = (byte) ((colorSpace << 24) >> 24);
-				buffer[counter + 3] = (byte) (colorSpace >> 24);
-				counter += 4;
-			}
-		return ByteBuffer.wrap(buffer);
-	}
-}
\ No newline at end of file
diff --git a/depends/launcher/org/multimc/Launcher.java b/depends/launcher/org/multimc/Launcher.java
deleted file mode 100644
index 1aa2b21f..00000000
--- a/depends/launcher/org/multimc/Launcher.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc;
-
-public interface Launcher
-{
-	abstract int launch(ParamBucket params);
-}
diff --git a/depends/launcher/org/multimc/LegacyFrame.java b/depends/launcher/org/multimc/LegacyFrame.java
deleted file mode 100644
index a081f3ae..00000000
--- a/depends/launcher/org/multimc/LegacyFrame.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.multimc;/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import net.minecraft.Launcher;
-
-import javax.imageio.ImageIO;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class LegacyFrame extends Frame implements WindowListener
-{
-    private Launcher appletWrap = null;
-    public LegacyFrame(String title)
-    {
-        super ( title );
-        BufferedImage image;
-        try {
-            image = ImageIO.read ( new File ( "icon.png" ) );
-            setIconImage ( image );
-        } catch ( IOException e ) {
-            e.printStackTrace();
-        }
-        this.addWindowListener ( this );
-    }
-
-    public void start ( Applet mcApplet, String user, String session, Dimension winSize, boolean maximize )
-    {
-        try {
-            appletWrap = new Launcher( mcApplet, new URL ( "http://www.minecraft.net/game" ) );
-        } catch ( MalformedURLException ignored ) {}
-        appletWrap.setParameter ( "username", user );
-        appletWrap.setParameter ( "sessionid", session );
-        appletWrap.setParameter ( "stand-alone", "true" ); // Show the quit button.
-		appletWrap.setParameter ( "demo", "false" );
-		appletWrap.setParameter("fullscreen", "false");
-        mcApplet.setStub(appletWrap);
-        this.add ( appletWrap );
-        appletWrap.setPreferredSize ( winSize );
-        this.pack();
-        this.setLocationRelativeTo ( null );
-        this.setResizable ( true );
-        if ( maximize ) {
-            this.setExtendedState ( MAXIMIZED_BOTH );
-        }
-        validate();
-        appletWrap.init();
-        appletWrap.start();
-        setVisible ( true );
-    }
-
-    @Override
-    public void windowActivated ( WindowEvent e ) {}
-
-    @Override
-    public void windowClosed ( WindowEvent e ) {}
-
-    @Override
-    public void windowClosing ( WindowEvent e )
-    {
-        new Thread() {
-            public void run() {
-                try {
-                    Thread.sleep ( 30000L );
-                } catch ( InterruptedException localInterruptedException ) {
-                    localInterruptedException.printStackTrace();
-                }
-                System.out.println ( "FORCING EXIT!" );
-                System.exit ( 0 );
-            }
-        }
-        .start();
-
-        if ( appletWrap != null ) {
-            appletWrap.stop();
-            appletWrap.destroy();
-        }
-        // old minecraft versions can hang without this >_<
-        System.exit ( 0 );
-    }
-
-    @Override
-    public void windowDeactivated ( WindowEvent e ) {}
-
-    @Override
-    public void windowDeiconified ( WindowEvent e ) {}
-
-    @Override
-    public void windowIconified ( WindowEvent e ) {}
-
-    @Override
-    public void windowOpened ( WindowEvent e ) {}
-}
diff --git a/depends/launcher/org/multimc/NotFoundException.java b/depends/launcher/org/multimc/NotFoundException.java
deleted file mode 100644
index fe154a2f..00000000
--- a/depends/launcher/org/multimc/NotFoundException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc;
-
-public class NotFoundException extends Exception
-{
-}
diff --git a/depends/launcher/org/multimc/ParamBucket.java b/depends/launcher/org/multimc/ParamBucket.java
deleted file mode 100644
index 2e197d9f..00000000
--- a/depends/launcher/org/multimc/ParamBucket.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ParamBucket
-{
-	public void add(String key, String value)
-	{
-		List<String> coll = null;
-		if(!m_params.containsKey(key))
-		{
-			coll = new ArrayList<String>();
-			m_params.put(key, coll);
-		}
-		else
-		{
-			coll = m_params.get(key);
-		}
-		coll.add(value);
-	}
-
-	public List<String> all(String key) throws NotFoundException
-	{
-		if(!m_params.containsKey(key))
-			throw new NotFoundException();
-		return m_params.get(key);
-	}
-
-	public List<String> allSafe(String key, List<String> def)
-	{
-		if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
-		{
-			return def;
-		}
-		return m_params.get(key);
-	}
-
-	public List<String> allSafe(String key)
-	{
-		return allSafe(key, new ArrayList<String>());
-	}
-
-	public String first(String key) throws NotFoundException
-	{
-		List<String> list = all(key);
-		if(list.size() < 1)
-		{
-			throw new NotFoundException();
-		}
-		return list.get(0);
-	}
-
-	public String firstSafe(String key, String def)
-	{
-		if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
-		{
-			return def;
-		}
-		return m_params.get(key).get(0);
-	}
-
-	public String firstSafe(String key)
-	{
-		return firstSafe(key, "");
-	}
-
-	private HashMap<String, List<String>> m_params = new HashMap<String, List<String>>();
-}
diff --git a/depends/launcher/org/multimc/ParseException.java b/depends/launcher/org/multimc/ParseException.java
deleted file mode 100644
index d9e8e53e..00000000
--- a/depends/launcher/org/multimc/ParseException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc;
-
-public class ParseException extends java.lang.Exception
-{
-
-}
diff --git a/depends/launcher/org/multimc/Utils.java b/depends/launcher/org/multimc/Utils.java
deleted file mode 100644
index 32cf7919..00000000
--- a/depends/launcher/org/multimc/Utils.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc;
-
-import java.io.*;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class Utils
-{
-	/**
-	 * Combine two parts of a path.
-	 *
-	 * @param path1
-	 * @param path2
-	 * @return the paths, combined
-	 */
-	public static String combine(String path1, String path2)
-	{
-		File file1 = new File(path1);
-		File file2 = new File(file1, path2);
-		return file2.getPath();
-	}
-
-	/**
-	 * Join a list of strings into a string using a separator!
-	 *
-	 * @param strings   the string list to join
-	 * @param separator the glue
-	 * @return the result.
-	 */
-	public static String join(List<String> strings, String separator)
-	{
-		StringBuilder sb = new StringBuilder();
-		String sep = "";
-		for (String s : strings)
-		{
-			sb.append(sep).append(s);
-			sep = separator;
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Adds the specified library to the classpath
-	 *
-	 * @param s the path to add
-	 * @throws Exception
-	 */
-	public static void addToClassPath(String s) throws Exception
-	{
-		File f = new File(s);
-		URL u = f.toURI().toURL();
-		URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
-		Class urlClass = URLClassLoader.class;
-		Method method = urlClass.getDeclaredMethod("addURL", new Class[]{URL.class});
-		method.setAccessible(true);
-		method.invoke(urlClassLoader, new Object[]{u});
-	}
-
-	/**
-	 * Adds many libraries to the classpath
-	 *
-	 * @param jars the paths to add
-	 */
-	public static boolean addToClassPath(List<String> jars)
-	{
-		boolean pure = true;
-		// initialize the class path
-		for (String jar : jars)
-		{
-			try
-			{
-				Utils.addToClassPath(jar);
-			} catch (Exception e)
-			{
-				System.err.println("Unable to load: " + jar);
-				e.printStackTrace(System.err);
-				pure = false;
-			}
-		}
-		return pure;
-	}
-
-	/**
-	 * Adds the specified path to the java library path
-	 *
-	 * @param pathToAdd the path to add
-	 * @throws Exception
-	 */
-	@Deprecated
-	public static void addLibraryPath(String pathToAdd) throws Exception
-	{
-		final Field usrPathsField = ClassLoader.class.getDeclaredField("usr_paths");
-		usrPathsField.setAccessible(true);
-
-		//get array of paths
-		final String[] paths = (String[]) usrPathsField.get(null);
-
-		//check if the path to add is already present
-		for (String path : paths)
-		{
-			if (path.equals(pathToAdd))
-			{
-				return;
-			}
-		}
-
-		//add the new path
-		final String[] newPaths = Arrays.copyOf(paths, paths.length + 1);
-		newPaths[newPaths.length - 1] = pathToAdd;
-		usrPathsField.set(null, newPaths);
-	}
-
-	/**
-	 * Finds a field that looks like a Minecraft base folder in a supplied class
-	 *
-	 * @param mc the class to scan
-	 */
-	public static Field getMCPathField(Class<?> mc)
-	{
-		Field[] fields = mc.getDeclaredFields();
-
-		for (Field f : fields)
-		{
-			if (f.getType() != File.class)
-			{
-				// Has to be File
-				continue;
-			}
-			if (f.getModifiers() != (Modifier.PRIVATE + Modifier.STATIC))
-			{
-				// And Private Static.
-				continue;
-			}
-			return f;
-		}
-		return null;
-	}
-
-	/**
-	 * Log to the MultiMC console
-	 *
-	 * @param message A String containing the message
-	 * @param level   A String containing the level name. See MinecraftLauncher::getLevel()
-	 */
-	public static void log(String message, String level)
-	{
-		// Kinda dirty
-		String tag = "!![" + level + "]!";
-		System.out.println(tag + message.replace("\n", "\n" + tag));
-	}
-
-	public static void log(String message)
-	{
-		log(message, "MultiMC");
-	}
-
-	public static void log()
-	{
-		System.out.println();
-	}
-
-	/**
-	 * Pushes bytes from in to out. Closes both streams no matter what.
-	 * @param in the input stream
-	 * @param out the output stream
-	 * @throws IOException
-	 */
-	private static void copyStream(InputStream in, OutputStream out) throws IOException
-	{
-		try
-		{
-		byte[] buffer = new byte[4096];
-		int len;
-
-		while((len = in.read(buffer)) >= 0)
-			out.write(buffer, 0, len);
-		} finally
-		{
-			in.close();
-			out.close();
-		}
-	}
-
-	/**
-	 * Replace a 'target' string 'suffix' with 'replacement'
-	 */
-	public static String replaceSuffix (String target, String suffix, String replacement)
-	{
-		if (!target.endsWith(suffix))
-		{
-			return target;
-		}
-		String prefix = target.substring(0, target.length() - suffix.length());
-		return prefix + replacement;
-	}
-
-	/**
-	 * Unzip zip file with natives 'source' into the folder 'targetFolder'
-	 *
-	 * Contains a hack for OSX. Yay.
-	 * @param source
-	 * @param targetFolder
-	 * @throws IOException
-	 */
-	public static void unzipNatives(File source, File targetFolder) throws IOException
-	{
-		ZipFile zip = new ZipFile(source);
-
-		boolean applyHacks = false;
-		String[] javaVersionElements = System.getProperty("java.version").split("[.\\-+]");
-		int major = Integer.parseInt(javaVersionElements[0]);
-		if(major == 1)
-		{
-			major = Integer.parseInt(javaVersionElements[1]);
-		}
-		if (major >= 8)
-		{
-			applyHacks = true;
-		}
-
-		try
-		{
-			Enumeration entries = zip.entries();
-
-			while (entries.hasMoreElements())
-			{
-				ZipEntry entry = (ZipEntry) entries.nextElement();
-
-				String entryName = entry.getName();
-				String fileName = entryName;
-				if(applyHacks)
-				{
-					fileName = replaceSuffix(entryName, ".jnilib", ".dylib");
-				}
-				File targetFile = new File(targetFolder, fileName);
-				if (targetFile.getParentFile() != null)
-				{
-					targetFile.getParentFile().mkdirs();
-				}
-
-				if (entry.isDirectory())
-					continue;
-
-				copyStream(zip.getInputStream(entry), new BufferedOutputStream(new FileOutputStream(targetFile)));
-			}
-		} finally
-		{
-			zip.close();
-		}
-	}
-}
-
diff --git a/depends/launcher/org/multimc/legacy/LegacyLauncher.java b/depends/launcher/org/multimc/legacy/LegacyLauncher.java
deleted file mode 100644
index 347bb1a2..00000000
--- a/depends/launcher/org/multimc/legacy/LegacyLauncher.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.multimc.legacy;/*
- * Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.multimc.*;
-
-import java.applet.Applet;
-import java.awt.*;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public class LegacyLauncher implements Launcher
-{
-	@Override
-	public int launch(ParamBucket params)
-	{
-		String userName, sessionId, windowTitle, windowParams, lwjgl;
-		String mainClass = "net.minecraft.client.Minecraft";
-		try
-		{
-			userName = params.first("userName");
-			sessionId = params.first("sessionId");
-			windowTitle = params.first("windowTitle");
-			windowParams = params.first("windowParams");
-			lwjgl = params.first("lwjgl");
-		} catch (NotFoundException e)
-		{
-			System.err.println("Not enough arguments.");
-			return -1;
-		}
-
-		String cwd = System.getProperty("user.dir");
-		Dimension winSize = new Dimension(854, 480);
-		boolean maximize = false;
-
-		String[] dimStrings = windowParams.split("x");
-
-		if (windowParams.equalsIgnoreCase("max"))
-		{
-			maximize = true;
-		}
-		else if (dimStrings.length == 2)
-		{
-			try
-			{
-				winSize = new Dimension(Integer.parseInt(dimStrings[0]), Integer.parseInt(dimStrings[1]));
-			} catch (NumberFormatException ignored) {}
-		}
-
-		File binDir = new File(cwd, "bin");
-		File lwjglDir;
-		if (lwjgl.equalsIgnoreCase("Mojang"))
-		{
-			lwjglDir = binDir;
-		}
-		else
-		{
-			lwjglDir = new File(lwjgl);
-		}
-
-		URL[] classpath;
-		{
-			try
-			{
-				classpath = new URL[]
-				{
-					new File(binDir, "minecraft.jar").toURI().toURL(),
-					new File(lwjglDir, "lwjgl.jar").toURI().toURL(),
-					new File(lwjglDir, "lwjgl_util.jar").toURI().toURL(),
-					new File(lwjglDir, "jinput.jar").toURI().toURL(),
-				};
-			} catch (MalformedURLException e)
-			{
-				System.err.println("Class path entry is badly formed:");
-				e.printStackTrace(System.err);
-				return -1;
-			}
-		}
-
-		String nativesDir = new File(lwjglDir, "natives").toString();
-
-		System.setProperty("org.lwjgl.librarypath", nativesDir);
-		System.setProperty("net.java.games.input.librarypath", nativesDir);
-
-		// print the pretty things
-		{
-			Utils.log("Main Class:");
-			Utils.log("  " + mainClass);
-			Utils.log();
-
-			Utils.log("Class Path:");
-			for (URL s : classpath)
-			{
-				Utils.log("  " + s);
-			}
-			Utils.log();
-
-			Utils.log("Native Path:");
-			Utils.log("  " + nativesDir);
-			Utils.log();
-		}
-
-		URLClassLoader cl = new URLClassLoader(classpath, LegacyLauncher.class.getClassLoader());
-
-		// Get the Minecraft Class and set the base folder
-		Class<?> mc;
-		try
-		{
-			mc = cl.loadClass(mainClass);
-
-			Field f = Utils.getMCPathField(mc);
-
-			if (f == null)
-			{
-				System.err.println("Could not find Minecraft path field. Launch failed.");
-				return -1;
-			}
-
-			f.setAccessible(true);
-			f.set(null, new File(cwd));
-		} catch (Exception e)
-		{
-			System.err.println("Could not set base folder. Failed to find/access Minecraft main class:");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-
-		System.setProperty("minecraft.applet.TargetDirectory", cwd);
-
-		String[] mcArgs = new String[2];
-		mcArgs[0] = userName;
-		mcArgs[1] = sessionId;
-
-		Utils.log("Launching with applet wrapper...");
-		try
-		{
-			Class<?> MCAppletClass = cl.loadClass("net.minecraft.client.MinecraftApplet");
-			Applet mcappl = (Applet) MCAppletClass.newInstance();
-			LegacyFrame mcWindow = new LegacyFrame(windowTitle);
-			mcWindow.start(mcappl, userName, sessionId, winSize, maximize);
-		} catch (Exception e)
-		{
-			Utils.log("Applet wrapper failed:", "Error");
-			e.printStackTrace(System.err);
-			Utils.log();
-			Utils.log("Falling back to compatibility mode.");
-			try
-			{
-				mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
-			} catch (Exception e1)
-			{
-				Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
-				e1.printStackTrace(System.err);
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-}
diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
deleted file mode 100644
index 179df0ee..00000000
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/* Copyright 2012-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.multimc.onesix;
-
-import org.multimc.*;
-
-import java.applet.Applet;
-import java.io.File;
-import java.awt.*;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-public class OneSixLauncher implements Launcher
-{
-	// parameters, separated from ParamBucket
-	private List<String> libraries;
-	private List<String> extlibs;
-	private List<String> extlibs32;
-	private List<String> extlibs64;
-	private List<String> mcparams;
-	private List<String> mods;
-	private List<String> jarmods;
-	private List<String> coremods;
-	private List<String> traits;
-	private String appletClass;
-	private String mainClass;
-	private String nativePath;
-	private String userName, sessionId;
-	private String windowTitle;
-	private String windowParams;
-
-	// secondary parameters
-	private Dimension winSize;
-	private boolean maximize;
-	private String cwd;
-
-	// the much abused system classloader, for convenience (for further abuse)
-	private ClassLoader cl;
-
-	private void processParams(ParamBucket params) throws NotFoundException
-	{
-		libraries = params.all("cp");
-		extlibs = params.allSafe("ext", new ArrayList<String>());
-		extlibs32 = params.allSafe("ext32", new ArrayList<String>());
-		extlibs64 = params.allSafe("ext64", new ArrayList<String>());
-
-		// Unify the extracted native libs according to actual system architecture
-		String property = System.getProperty("os.arch");
-		boolean is_64 = property.equalsIgnoreCase("x86_64") || property.equalsIgnoreCase("amd64");
-		if(is_64)
-		{
-			extlibs.addAll(extlibs64);
-		}
-		else
-		{
-			extlibs.addAll(extlibs32);
-		}
-
-		mcparams = params.allSafe("param", new ArrayList<String>() );
-		mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
-		appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
-		mods = params.allSafe("mod", new ArrayList<String>());
-		jarmods = params.allSafe("jarmod", new ArrayList<String>());
-		coremods = params.allSafe("coremod", new ArrayList<String>());
-		traits = params.allSafe("traits", new ArrayList<String>());
-		nativePath = params.first("natives");
-
-		userName = params.first("userName");
-		sessionId = params.first("sessionId");
-		windowTitle = params.firstSafe("windowTitle", "Minecraft");
-		windowParams = params.firstSafe("windowParams", "854x480");
-
-		cwd = System.getProperty("user.dir");
-		winSize = new Dimension(854, 480);
-		maximize = false;
-
-		String[] dimStrings = windowParams.split("x");
-
-		if (windowParams.equalsIgnoreCase("max"))
-		{
-			maximize = true;
-		}
-		else if (dimStrings.length == 2)
-		{
-			try
-			{
-				winSize = new Dimension(Integer.parseInt(dimStrings[0]), Integer.parseInt(dimStrings[1]));
-			} catch (NumberFormatException ignored) {}
-		}
-	}
-
-	private void printStats()
-	{
-		Utils.log("Main Class:");
-		Utils.log("  " + mainClass);
-		Utils.log();
-
-		Utils.log("Native path:");
-		Utils.log("  " + nativePath);
-		Utils.log();
-
-		Utils.log("Traits:");
-		Utils.log("  " + traits);
-		Utils.log();
-
-		Utils.log("Libraries:");
-		for (String s : libraries)
-		{
-			File f = new File(s);
-			if (f.exists())
-			{
-				Utils.log("  " + s);
-			}
-			else
-			{
-				Utils.log("  " + s + " (missing)", "Warning");
-			}
-		}
-		Utils.log();
-
-		if(mods.size() > 0)
-		{
-			Utils.log("Mods:");
-			for (String s : mods)
-			{
-				Utils.log("  " + s);
-			}
-			Utils.log();
-		}
-
-		if(coremods.size() > 0)
-		{
-			Utils.log("Core Mods:");
-			for (String s : coremods)
-			{
-				Utils.log("  " + s);
-			}
-			Utils.log();
-		}
-
-		if(jarmods.size() > 0)
-		{
-			Utils.log("Jar Mods:");
-			for (String s : jarmods)
-			{
-				Utils.log("  " + s);
-			}
-			Utils.log();
-		}
-
-		Utils.log("Params:");
-		Utils.log("  " + mcparams.toString());
-		Utils.log();
-		if(maximize)
-			Utils.log("Window size: max (if available)");
-		else
-			Utils.log("Window size: " + Integer.toString(winSize.width) + " x " + Integer.toString(winSize.height));
-		Utils.log();
-	}
-
-	int legacyLaunch()
-	{
-		// Get the Minecraft Class and set the base folder
-		Class<?> mc;
-		try
-		{
-			mc = cl.loadClass(mainClass);
-
-			Field f = Utils.getMCPathField(mc);
-
-			if (f == null)
-			{
-				System.err.println("Could not find Minecraft path field.");
-			}
-			else
-			{
-				f.setAccessible(true);
-				f.set(null, new File(cwd));
-			}
-		} catch (Exception e)
-		{
-			System.err.println("Could not set base folder. Failed to find/access Minecraft main class:");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-
-		System.setProperty("minecraft.applet.TargetDirectory", cwd);
-
-		String[] mcArgs = new String[2];
-		mcArgs[0] = userName;
-		mcArgs[1] = sessionId;
-
-		Utils.log("Launching with applet wrapper...");
-		try
-		{
-			Class<?> MCAppletClass = cl.loadClass(appletClass);
-			Applet mcappl = (Applet) MCAppletClass.newInstance();
-			LegacyFrame mcWindow = new LegacyFrame(windowTitle);
-			mcWindow.start(mcappl, userName, sessionId, winSize, maximize);
-		} catch (Exception e)
-		{
-			Utils.log("Applet wrapper failed:", "Error");
-			e.printStackTrace(System.err);
-			Utils.log();
-			Utils.log("Falling back to compatibility mode.");
-			try
-			{
-				mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
-			} catch (Exception e1)
-			{
-				Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
-				e1.printStackTrace(System.err);
-				return -1;
-			}
-		}
-		return 0;
-	}
-
-	int launchWithMainClass()
-	{
-		// window size, title and state, onesix
-		if (maximize)
-		{
-			// FIXME: there is no good way to maximize the minecraft window in onesix.
-			// the following often breaks linux screen setups
-			// mcparams.add("--fullscreen");
-		}
-		else
-		{
-			mcparams.add("--width");
-			mcparams.add(Integer.toString(winSize.width));
-			mcparams.add("--height");
-			mcparams.add(Integer.toString(winSize.height));
-		}
-
-		System.setProperty("minecraft.applet.TargetDirectory", cwd);
-
-		// Get the Minecraft Class.
-		Class<?> mc;
-		try
-		{
-			mc = cl.loadClass(mainClass);
-		} catch (ClassNotFoundException e)
-		{
-			System.err.println("Failed to find Minecraft main class:");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-
-		// get the main method.
-		Method meth;
-		try
-		{
-			meth = mc.getMethod("main", String[].class);
-		} catch (NoSuchMethodException e)
-		{
-			System.err.println("Failed to acquire the main method:");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-		// init params for the main method to chomp on.
-		String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
-		try
-		{
-			// static method doesn't have an instance
-			meth.invoke(null, (Object) paramsArray);
-		} catch (Exception e)
-		{
-			System.err.println("Failed to start Minecraft:");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-		return 0;
-	}
-
-	@Override
-	public int launch(ParamBucket params)
-	{
-		// get and process the launch script params
-		try
-		{
-			processParams(params);
-		} catch (NotFoundException e)
-		{
-			System.err.println("Not enough arguments.");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-
-		// add libraries to classpath
-		if(!Utils.addToClassPath(libraries))
-		{
-			System.err.println("Halting launch due to previous errors.");
-			return -1;
-		}
-
-		// print the pretty things
-		printStats();
-
-		// extract native libs (depending on platform here... java!)
-		Utils.log("Preparing native libraries...");
-		for(String extlib: extlibs)
-		{
-			try
-			{
-				File extlibf = new File(extlib);
-				Utils.log("Extracting " + extlibf.getName());
-				Utils.unzipNatives(extlibf, new File(nativePath));
-			} catch (IOException e)
-			{
-				System.err.println("Failed to extract native library:");
-				e.printStackTrace(System.err);
-				return -1;
-			}
-		}
-		Utils.log();
-
-		// set the native libs path... the brute force way
-		try
-		{
-			System.setProperty("java.library.path", nativePath);
-			System.setProperty("org.lwjgl.librarypath", nativePath);
-			System.setProperty("net.java.games.input.librarypath", nativePath);
-			// by the power of reflection, initialize native libs again. DIRTY!
-			// this is SO BAD. imagine doing that to ld
-			Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
-			fieldSysPath.setAccessible( true );
-			fieldSysPath.set( null, null );
-		}
-		catch (Exception e)
-		{
-			System.err.println("Failed to set the native library path:");
-			e.printStackTrace(System.err);
-			System.err.println("Minecraft might fail to launch...");
-		}
-
-		// grab the system classloader and ...
-		cl = ClassLoader.getSystemClassLoader();
-
-		if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch") )
-		{
-			// legacy launch uses the applet wrapper
-			return legacyLaunch();
-		}
-		else
-		{
-			// normal launch just calls main()
-			return launchWithMainClass();
-		}
-	}
-}