NOISSUE tabs -> spaces

1 files changed, 204 insertions, 204 deletions

diff --git a/libraries/launcher/org/multimc/onesix/OneSixLauncher.java b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
index 9667297d..48baba2e 100644
--- a/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -27,208 +27,208 @@ import java.util.List;
 
 public class OneSixLauncher implements Launcher
 {
-	// parameters, separated from ParamBucket
-	private List<String> libraries;
-	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 int winSizeW;
-	private int winSizeH;
-	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");
-		mcparams = params.allSafe("param", new ArrayList<String>() );
-		mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
-		appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
-		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");
-
-		winSizeW = 854;
-		winSizeH = 480;
-		maximize = false;
-
-		String[] dimStrings = windowParams.split("x");
-
-		if (windowParams.equalsIgnoreCase("max"))
-		{
-			maximize = true;
-		}
-		else if (dimStrings.length == 2)
-		{
-			try
-			{
-				winSizeW = Integer.parseInt(dimStrings[0]);
-				winSizeH = Integer.parseInt(dimStrings[1]);
-			} catch (NumberFormatException ignored) {}
-		}
-	}
-
-	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);
-
-		if(!traits.contains("noapplet"))
-		{
-			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, winSizeW, winSizeH, maximize);
-				return 0;
-			} catch (Exception e)
-			{
-				Utils.log("Applet wrapper failed:", "Error");
-				e.printStackTrace(System.err);
-				Utils.log();
-				Utils.log("Falling back to using main class.");
-			}
-		}
-
-		// init params for the main method to chomp on.
-		String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
-		try
-		{
-			mc.getMethod("main", String[].class).invoke(null, (Object) paramsArray);
-			return 0;
-		} catch (Exception e)
-		{
-			Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
-			e.printStackTrace(System.err);
-			return -1;
-		}
-	}
-
-	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(winSizeW));
-			mcparams.add("--height");
-			mcparams.add(Integer.toString(winSizeH));
-		}
-
-		// 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;
-		}
-
-		// 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();
-		}
-	}
+    // parameters, separated from ParamBucket
+    private List<String> libraries;
+    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 int winSizeW;
+    private int winSizeH;
+    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");
+        mcparams = params.allSafe("param", new ArrayList<String>() );
+        mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
+        appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
+        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");
+
+        winSizeW = 854;
+        winSizeH = 480;
+        maximize = false;
+
+        String[] dimStrings = windowParams.split("x");
+
+        if (windowParams.equalsIgnoreCase("max"))
+        {
+            maximize = true;
+        }
+        else if (dimStrings.length == 2)
+        {
+            try
+            {
+                winSizeW = Integer.parseInt(dimStrings[0]);
+                winSizeH = Integer.parseInt(dimStrings[1]);
+            } catch (NumberFormatException ignored) {}
+        }
+    }
+
+    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);
+
+        if(!traits.contains("noapplet"))
+        {
+            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, winSizeW, winSizeH, maximize);
+                return 0;
+            } catch (Exception e)
+            {
+                Utils.log("Applet wrapper failed:", "Error");
+                e.printStackTrace(System.err);
+                Utils.log();
+                Utils.log("Falling back to using main class.");
+            }
+        }
+
+        // init params for the main method to chomp on.
+        String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
+        try
+        {
+            mc.getMethod("main", String[].class).invoke(null, (Object) paramsArray);
+            return 0;
+        } catch (Exception e)
+        {
+            Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
+            e.printStackTrace(System.err);
+            return -1;
+        }
+    }
+
+    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(winSizeW));
+            mcparams.add("--height");
+            mcparams.add(Integer.toString(winSizeH));
+        }
+
+        // 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;
+        }
+
+        // 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();
+        }
+    }
 }