summaryrefslogtreecommitdiffstats
path: root/depends
diff options
context:
space:
mode:
Diffstat (limited to 'depends')
-rw-r--r--depends/launcher/CMakeLists.txt2
-rw-r--r--depends/launcher/net/minecraft/Launcher.java15
-rw-r--r--depends/launcher/org/multimc/LegacyFrame.java (renamed from depends/launcher/org/multimc/legacy/LegacyFrame.java)2
-rw-r--r--depends/launcher/org/multimc/legacy/LegacyLauncher.java5
-rw-r--r--depends/launcher/org/multimc/onesix/OneSixLauncher.java331
5 files changed, 253 insertions, 102 deletions
diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt
index ad06fa7b..42c77a89 100644
--- a/depends/launcher/CMakeLists.txt
+++ b/depends/launcher/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SRC
# The launcher has to be there for silly FML/Forge relauncher.
net/minecraft/Launcher.java
org/multimc/legacy/LegacyLauncher.java
- org/multimc/legacy/LegacyFrame.java
+ org/multimc/LegacyFrame.java
# onesix launcher
org/multimc/onesix/OneSixLauncher.java
diff --git a/depends/launcher/net/minecraft/Launcher.java b/depends/launcher/net/minecraft/Launcher.java
index c9b137e1..a53501ec 100644
--- a/depends/launcher/net/minecraft/Launcher.java
+++ b/depends/launcher/net/minecraft/Launcher.java
@@ -24,6 +24,7 @@ import java.awt.BorderLayout;
import java.awt.Graphics;
import java.applet.Applet;
import java.applet.AppletStub;
+import java.net.MalformedURLException;
public class Launcher extends Applet implements AppletStub
{
@@ -130,13 +131,23 @@ public class Launcher extends Applet implements AppletStub
@Override
public URL getCodeBase() {
- return wrappedApplet.getCodeBase();
+ try {
+ return new URL("http://www.minecraft.net/game/");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
public URL getDocumentBase()
{
- return documentBase;
+ try {
+ return new URL("http://www.minecraft.net/game/");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
diff --git a/depends/launcher/org/multimc/legacy/LegacyFrame.java b/depends/launcher/org/multimc/LegacyFrame.java
index c3c0cafc..a081f3ae 100644
--- a/depends/launcher/org/multimc/legacy/LegacyFrame.java
+++ b/depends/launcher/org/multimc/LegacyFrame.java
@@ -1,4 +1,4 @@
-package org.multimc.legacy;/*
+package org.multimc;/*
* Copyright 2012-2014 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/depends/launcher/org/multimc/legacy/LegacyLauncher.java b/depends/launcher/org/multimc/legacy/LegacyLauncher.java
index 1ca37c4a..347bb1a2 100644
--- a/depends/launcher/org/multimc/legacy/LegacyLauncher.java
+++ b/depends/launcher/org/multimc/legacy/LegacyLauncher.java
@@ -14,10 +14,7 @@ package org.multimc.legacy;/*
* limitations under the License.
*/
-import org.multimc.Launcher;
-import org.multimc.NotFoundException;
-import org.multimc.ParamBucket;
-import org.multimc.Utils;
+import org.multimc.*;
import java.applet.Applet;
import java.awt.*;
diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
index 28f8e6ee..b9eb4d66 100644
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -17,128 +17,185 @@ 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.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
public class OneSixLauncher implements Launcher
{
- @Override
- public int launch(ParamBucket params)
+ // parameters, separated from ParamBucket
+ private List<String> libraries;
+ private List<String> extlibs;
+ private List<String> mcparams;
+ private List<String> mods;
+ private List<String> traits;
+ private String appletClass;
+ private String mainClass;
+ private String natives;
+ 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
{
- // get and process the launch script params
- List<String> libraries;
- List<String> extlibs;
- List<String> mcparams;
- List<String> mods;
- String mainClass;
- String natives;
- final String windowTitle;
- String windowParams;
- try
- {
- libraries = params.all("cp");
- extlibs = params.all("ext");
- mcparams = params.all("param");
- mainClass = params.first("mainClass");
- mods = params.allSafe("mods", new ArrayList<String>());
- natives = params.first("natives");
+ libraries = params.all("cp");
+ extlibs = params.all("ext");
+ 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("mods", new ArrayList<String>());
+ traits = params.allSafe("traits", new ArrayList<String>());
+ natives = params.first("natives");
- windowTitle = params.first("windowTitle");
- // windowParams = params.first("windowParams");
- } catch (NotFoundException e)
+ 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"))
{
- System.err.println("Not enough arguments.");
- e.printStackTrace(System.err);
- return -1;
+ 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();
- List<String> allJars = new ArrayList<String>();
- allJars.addAll(mods);
- allJars.addAll(libraries);
+ Utils.log("Native path:");
+ Utils.log(" " + natives);
+ Utils.log();
- if(!Utils.addToClassPath(allJars))
+ Utils.log("Traits:");
+ Utils.log(" " + traits);
+ Utils.log();
+
+ Utils.log("Libraries:");
+ for (String s : libraries)
{
- System.err.println("Halting launch due to previous errors.");
- return -1;
+ Utils.log(" " + s);
}
+ Utils.log();
- // print the pretty things
+ if(mods.size() > 0)
{
- Utils.log("Main Class:");
- Utils.log(" " + mainClass);
- Utils.log();
-
- Utils.log("Native path:");
- Utils.log(" " + natives);
- Utils.log();
-
- Utils.log("Libraries:");
- for (String s : libraries)
+ Utils.log("Class Path Mods:");
+ for (String s : mods)
{
Utils.log(" " + s);
}
Utils.log();
+ }
+
+ Utils.log("Params:");
+ Utils.log(" " + mcparams.toString());
+ Utils.log();
+ }
+
+ int legacyLaunch()
+ {
+ // Get the Minecraft Class and set the base folder
+ Class<?> mc;
+ try
+ {
+ mc = cl.loadClass(mainClass);
- if(mods.size() > 0)
+ Field f = Utils.getMCPathField(mc);
+
+ if (f == null)
{
- Utils.log("Class Path Mods:");
- for (String s : mods)
- {
- Utils.log(" " + s);
- }
- Utils.log();
+ System.err.println("Could not find Minecraft path field.");
}
-
- Utils.log("Params:");
- Utils.log(" " + mcparams.toString());
- Utils.log();
+ 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;
}
- // set up the natives path(s).
- Utils.log("Preparing native libraries...");
- String property = System.getProperty("os.arch");
- boolean is_64 = property.equalsIgnoreCase("x86_64") || property.equalsIgnoreCase("amd64");
- for(String extlib: extlibs)
+ 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
{
- String cleanlib = extlib.replace("${arch}", is_64 ? "64" : "32");
- File cleanlibf = new File(cleanlib);
- Utils.log("Extracting " + cleanlibf.getName());
- Utils.unzip(cleanlibf, new File(natives));
- } catch (IOException e)
+ mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
+ } catch (Exception e1)
{
- System.err.println("Failed to extract native library:");
- e.printStackTrace(System.err);
+ Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
+ e1.printStackTrace(System.err);
return -1;
}
}
- Utils.log();
-
- System.setProperty("java.library.path", natives);
- Field fieldSysPath;
- try
+ return 0;
+ }
+
+ int launchWithMainClass()
+ {
+ // window size, title and state, onesix
+ if (maximize)
{
- fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible( true );
- fieldSysPath.set( null, null );
- } catch (Exception e)
+ // FIXME: there is no good way to maximize the minecraft window in onesix.
+ // the following often breaks linux screen setups
+ // mcparams.add("--fullscreen");
+ }
+ else
{
- System.err.println("Failed to set the native library path:");
- e.printStackTrace(System.err);
- return -1;
+ mcparams.add("--width");
+ mcparams.add(Integer.toString(winSize.width));
+ mcparams.add("--height");
+ mcparams.add(Integer.toString(winSize.height));
}
-
+
// Get the Minecraft Class.
- final ClassLoader cl = ClassLoader.getSystemClassLoader();
Class<?> mc;
try
{
@@ -161,9 +218,7 @@ public class OneSixLauncher implements Launcher
e.printStackTrace(System.err);
return -1;
}
-
- // FIXME: works only on linux, we need a better solution
-/*
+ /*
final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png");
new Thread() {
public void run() {
@@ -174,18 +229,21 @@ public class OneSixLauncher implements Launcher
Method isCreated;
Method setTitle;
Method setIcon;
-
+ Field fieldWindowCreated;
+ Boolean created = false;
Display = cl.loadClass("org.lwjgl.opengl.Display");
- isCreated = Display.getMethod("isCreated");
+ 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(!(Boolean) isCreated.invoke(null))
+ while(!created)
{
try
{
Thread.sleep(150);
+ created = (Boolean) fieldWindowCreated.get( null );
} catch (InterruptedException ignored) {}
}
// Give it a bit more time ;)
@@ -206,12 +264,13 @@ public class OneSixLauncher implements Launcher
}
}
.start();
-*/
- // start Minecraft
- String[] paramsArray = mcparams.toArray(new String[mcparams.size()]); // init params accordingly
+ */
+ // init params for the main method to chomp on.
+ String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
try
{
- meth.invoke(null, (Object) paramsArray); // static method doesn't have an instance
+ // static method doesn't have an instance
+ meth.invoke(null, (Object) paramsArray);
} catch (Exception e)
{
System.err.println("Failed to start Minecraft:");
@@ -220,4 +279,88 @@ public class OneSixLauncher implements Launcher
}
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;
+ }
+
+ // do some horrible black magic with the classpath
+ {
+ List<String> allJars = new ArrayList<String>();
+ allJars.addAll(mods);
+ allJars.addAll(libraries);
+
+ if(!Utils.addToClassPath(allJars))
+ {
+ 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...");
+ String property = System.getProperty("os.arch");
+ boolean is_64 = property.equalsIgnoreCase("x86_64") || property.equalsIgnoreCase("amd64");
+ for(String extlib: extlibs)
+ {
+ try
+ {
+ String cleanlib = extlib.replace("${arch}", is_64 ? "64" : "32");
+ File cleanlibf = new File(cleanlib);
+ Utils.log("Extracting " + cleanlibf.getName());
+ Utils.unzip(cleanlibf, new File(natives));
+ } 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", natives);
+ System.setProperty("org.lwjgl.librarypath", natives);
+ System.setProperty("net.java.games.input.librarypath", natives);
+ // 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);
+ 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();
+ }
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 12:54:09 +0000