From 5ae3b2c11416eb897a08b0d9531843d0357332f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 1 Apr 2016 00:07:37 +0200
Subject: NOISSUE nuke builtin Minecraft versions

Use upstream Mojang versions.
---
 .../org/multimc/onesix/OneSixLauncher.java         | 49 +---------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

(limited to 'depends/launcher/org/multimc/onesix/OneSixLauncher.java')

diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
index 0d1e2174..179df0ee 100644
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -249,6 +249,8 @@ public class OneSixLauncher implements Launcher
 			mcparams.add(Integer.toString(winSize.height));
 		}
 
+		System.setProperty("minecraft.applet.TargetDirectory", cwd);
+
 		// Get the Minecraft Class.
 		Class<?> mc;
 		try
@@ -272,53 +274,6 @@ public class OneSixLauncher implements Launcher
 			e.printStackTrace(System.err);
 			return -1;
 		}
-		/*
-		final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png");
-		new Thread() {
-			public void run() {
-				ClassLoader cl = ClassLoader.getSystemClassLoader();
-				try
-				{
-					Class<?> Display;
-					Method isCreated;
-					Method setTitle;
-					Method setIcon;
-					Field fieldWindowCreated;
-					Boolean created = false;
-					Display = cl.loadClass("org.lwjgl.opengl.Display");
-					fieldWindowCreated = Display.getDeclaredField("window_created");
-					fieldWindowCreated.setAccessible( true );
-					setTitle = Display.getMethod("setTitle", String.class);
-					setIcon = Display.getMethod("setIcon", java.nio.ByteBuffer[].class);
-					created = (Boolean) fieldWindowCreated.get( null );
-					// set the window title? Maybe?
-					while(!created)
-					{
-						try
-						{
-							Thread.sleep(150);
-							created = (Boolean) fieldWindowCreated.get( null );
-						} catch (InterruptedException ignored) {}
-					}
-					// Give it a bit more time ;)
-					Thread.sleep(150);
-					// set the title
-					setTitle.invoke(null,windowTitle);
-					// only set icon when there's actually something to set...
-					if(icons.length > 0)
-					{
-						setIcon.invoke(null,(Object)icons);
-					}
-				}
-				catch (Exception e)
-				{
-					System.err.println("Couldn't set window icon or title.");
-					e.printStackTrace(System.err);
-				}
-			}
-		}
-		.start();
-		*/
 		// init params for the main method to chomp on.
 		String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
 		try
-- 
cgit v1.2.3