mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 08:17:35 +00:00
Refactor Userdev and Forgedev launching.
Locating mods on the classpath in dev should solve linked MC sources when debugging. As well as loading deobfed mods. Rewrote how arguments are handled in dev, so users can overwrite any defaults we provide. Added basic Yggdrasil auth support. Passing in --username and --password arguments. ONLY USE IF NECESSARY. Forge is NOT responsible for your login information.
This commit is contained in:
LexManos committed
1 parent
7bd7b059c4
commit
3003e33074
17 files changed
+440
-335
No files matched your search
@@ -1,99 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2019.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.fml;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.collect.ObjectArrays;
|
||||
import cpw.mods.modlauncher.Launcher;
|
||||
import net.minecraftforge.fml.loading.StringUtils;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.core.Filter;
|
||||
import org.apache.logging.log4j.core.LoggerContext;
|
||||
import org.apache.logging.log4j.core.config.Configurator;
|
||||
import org.apache.logging.log4j.core.filter.MarkerFilter;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
|
||||
public class LaunchTesting
|
||||
{
|
||||
public static void main(String... args) throws InterruptedException
|
||||
{
|
||||
final String markerselection = System.getProperty("forge.logging.markers", "");
|
||||
Arrays.stream(markerselection.split(",")).forEach(marker-> System.setProperty("forge.logging.marker."+ marker.toLowerCase(Locale.ROOT), "ACCEPT"));
|
||||
|
||||
String assets = System.getenv().getOrDefault("assetDirectory", "assets");
|
||||
String target = System.getenv().get("target");
|
||||
String[] launchArgs = new String[]{
|
||||
"--gameDir", ".",
|
||||
"--launchTarget", target,
|
||||
"--fml.forgeVersion", System.getProperty("forge.version"),
|
||||
"--fml.mcpVersion", System.getProperty("mcp.version"),
|
||||
"--fml.mcVersion", System.getProperty("mc.version"),
|
||||
"--fml.forgeGroup", System.getProperty("forge.group")
|
||||
};
|
||||
|
||||
|
||||
if (target == null) {
|
||||
throw new IllegalArgumentException("Environment variable target must be set.");
|
||||
}
|
||||
|
||||
if (Objects.equals(target,"fmldevclient")) {
|
||||
hackNatives();
|
||||
launchArgs = ObjectArrays.concat(launchArgs, new String[] {
|
||||
"--accessToken", "blah",
|
||||
"--version", "FMLDev",
|
||||
"--assetIndex", System.getenv("assetIndex"),
|
||||
"--assetsDir", assets,
|
||||
"--userProperties", "{}"
|
||||
}, String.class);
|
||||
} else {
|
||||
launchArgs = ObjectArrays.concat(launchArgs, args, String.class);
|
||||
}
|
||||
Launcher.main(launchArgs);
|
||||
Thread.sleep(10000);
|
||||
}
|
||||
|
||||
private static void hackNatives()
|
||||
{
|
||||
String paths = System.getProperty("java.library.path");
|
||||
String nativesDir = System.getenv().get("nativesDirectory");
|
||||
|
||||
if (Strings.isNullOrEmpty(paths))
|
||||
paths = nativesDir;
|
||||
else
|
||||
paths += File.pathSeparator + nativesDir;
|
||||
|
||||
System.setProperty("java.library.path", paths);
|
||||
|
||||
// hack the classloader now.
|
||||
try
|
||||
{
|
||||
final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");
|
||||
sysPathsField.setAccessible(true);
|
||||
sysPathsField.set(null, null);
|
||||
}
|
||||
catch(Throwable t) {}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2019.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.fml.common.launcher;
|
||||
|
||||
import java.net.Proxy;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
||||
import com.mojang.authlib.Agent;
|
||||
import com.mojang.authlib.exceptions.AuthenticationException;
|
||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
||||
import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
|
||||
|
||||
/**
|
||||
* Basic implementation of Mojang's 'Yggdrasil' login system, purely intended as a dev time bare bones login.
|
||||
* Login errors are not handled.
|
||||
*/
|
||||
public class Yggdrasil
|
||||
{
|
||||
public static void login(Map<String, String> args)
|
||||
{
|
||||
if (!args.containsKey("--username") || !args.containsKey("--password")) return;
|
||||
YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication) new YggdrasilAuthenticationService(Proxy.NO_PROXY, "1").createUserAuthentication(Agent.MINECRAFT);
|
||||
auth.setUsername(args.get("--username"));
|
||||
auth.setPassword(args.remove("--password"));
|
||||
|
||||
try
|
||||
{
|
||||
auth.logIn();
|
||||
}
|
||||
catch (AuthenticationException e)
|
||||
{
|
||||
LogManager.getLogger("FML.TWEAK").error("-- Login failed!", e);
|
||||
throw new RuntimeException(e); // don't set other variables
|
||||
}
|
||||
|
||||
args.put("--username", auth.getSelectedProfile().getName());
|
||||
args.put("--uuid", auth.getSelectedProfile().getId().toString().replace("-", ""));
|
||||
args.put("--accessToken", auth.getAuthenticatedToken());
|
||||
args.put("--userProperties", auth.getUserProperties().toString());
|
||||
}
|
||||
}
|
||||
@@ -24,8 +24,6 @@ import net.minecraftforge.fml.VersionChecker;
|
||||
import net.minecraftforge.fml.loading.JarVersionLookupHandler;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@@ -43,11 +41,11 @@ public class ForgeVersion
|
||||
|
||||
static {
|
||||
LOGGER.debug(CORE, "Forge Version package {} from {}", ForgeVersion.class.getPackage(), ForgeVersion.class.getClassLoader());
|
||||
String vers = JarVersionLookupHandler.getImplementationVersion(ForgeVersion.class).orElse(System.getProperty("forge.version"));
|
||||
String vers = JarVersionLookupHandler.getImplementationVersion(ForgeVersion.class).orElse(System.getenv("FORGE_VERSION"));
|
||||
if (vers == null) throw new RuntimeException("Missing forge version, cannot continue");
|
||||
String spec = JarVersionLookupHandler.getSpecificationVersion(ForgeVersion.class).orElse(System.getProperty("forge.spec"));
|
||||
String spec = JarVersionLookupHandler.getSpecificationVersion(ForgeVersion.class).orElse(System.getenv("FORGE_SPEC"));
|
||||
if (spec == null) throw new RuntimeException("Missing forge spec, cannot continue");
|
||||
String group = JarVersionLookupHandler.getImplementationTitle(ForgeVersion.class).orElse(System.getProperty("forge.group"));
|
||||
String group = JarVersionLookupHandler.getImplementationTitle(ForgeVersion.class).orElse(System.getenv("FORGE_GROUP"));
|
||||
if (group == null) {
|
||||
group = "net.minecraftforge"; // If all else fails, Our normal group
|
||||
}
|
||||
|
||||
@@ -31,14 +31,14 @@ public class MCPVersion {
|
||||
static {
|
||||
String vers = MCPVersion.class.getPackage().getSpecificationVersion();
|
||||
if (vers == null) {
|
||||
vers = System.getProperty("mc.version");
|
||||
vers = System.getenv("MC_VERSION");
|
||||
}
|
||||
if (vers == null) throw new RuntimeException("Missing MC version, cannot continue");
|
||||
mcVersion = vers;
|
||||
|
||||
vers = MCPVersion.class.getPackage().getImplementationVersion();
|
||||
if (vers == null) {
|
||||
vers = System.getProperty("mcp.version");
|
||||
vers = System.getenv("MCP_VERSION");
|
||||
}
|
||||
if (vers == null) throw new RuntimeException("Missing MCP version, cannot continue");
|
||||
mcpVersion = vers;
|
||||
|
||||
Reference in new issue
Block a user