summaryrefslogtreecommitdiffstats
path: root/libraries/launcher
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/launcher')
-rw-r--r--libraries/launcher/org/multimc/Utils.java71
-rw-r--r--libraries/launcher/org/multimc/onesix/OneSixLauncher.java26
2 files changed, 0 insertions, 97 deletions
diff --git a/libraries/launcher/org/multimc/Utils.java b/libraries/launcher/org/multimc/Utils.java
index 860c0864..94b2eaa9 100644
--- a/libraries/launcher/org/multimc/Utils.java
+++ b/libraries/launcher/org/multimc/Utils.java
@@ -68,77 +68,6 @@ public class Utils
}
/**
- * 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
diff --git a/libraries/launcher/org/multimc/onesix/OneSixLauncher.java b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
index f057e55a..8f0a498f 100644
--- a/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -214,32 +214,6 @@ public class OneSixLauncher implements Launcher
return -1;
}
- // add libraries to classpath
- if(!Utils.addToClassPath(libraries))
- {
- System.err.println("Halting launch due to previous errors.");
- return -1;
- }
-
- // 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();