keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Rework server launching at runtime to include needed default arguments and validate libraries exist. 

Move Forge config loading to manual while config system is in development.
This commit is contained in:
LexManos 2019-02-04 18:23:58 -08:00
parent 9119e395d4
commit aa91af865d
10 changed files with 127 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build.gradle
View File

@ -1,6 +1,6 @@
buildscript {
repositories {
mavenLocal()
//mavenLocal()
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter()
mavenCentral()
@ -241,12 +241,12 @@ project(':forge') {
'Implementation-Vendor': 'Forge'
] as LinkedHashMap,
'net/minecraftforge/fml/loading/': [
'Specification-Title': 'Launcher',
'Specification-Vendor': 'Forge Development LLC',
'Specification-Version': '1',
'Implementation-Title': 'FML Launcher',
'Implementation-Version': SPEC_VERSION,
'Implementation-Vendor': 'Forge'
'Specification-Title': 'Launcher',
'Specification-Vendor': 'Forge Development LLC',
'Specification-Version': '1',
'Implementation-Title': 'FML Launcher',
'Implementation-Version': SPEC_VERSION,
'Implementation-Vendor': 'Forge'
] as LinkedHashMap
]
}
@ -695,10 +695,34 @@ project(':forge') {
}
}
}
task fmllauncherConfig(type: WriteProperties) {
outputFile file('build/server_launcher.properties')
encoding 'UTF8'
doFirst {
def artifacts = getArtifacts(project, project.configurations.installer, false).values().stream().map{a -> a.downloads.artifact.path}.sorted().collect() + [
"net/minecraft/server/${MC_VERSION}/server-${MC_VERSION}-data.jar",
"net/minecraft/server/${MC_VERSION}/server-${MC_VERSION}-extra.jar"
]
for (int x = 0; x < artifacts.size(); x++) {
property 'library.' + x.toString().padLeft(3, '0'), "libraries/${artifacts.get(x)}"
}
property 'library.count', artifacts.size()
property 'args', [
'--gameDir', '.',
'--launchTarget', 'fmlserver',
'--fml.forgeVersion', "${project.version.substring(MC_VERSION.length() + 1)}".toString(),
'--fml.mcpVersion', MCP_VERSION,
'--fml.mcVersion', MC_VERSION,
'--fml.forgeGroup', project.group
].join(' ')
}
}
task launcherJar(type: Jar) {
task launcherJar(type: Jar, dependsOn: [fmllauncherConfig]) {
classifier 'launcher'
from sourceSets.fmllauncher.output
from fmllauncherConfig.outputFile
doFirst {
def classpath = new StringBuilder()
def artifacts = getArtifacts(project, project.configurations.installer, false)
@ -865,7 +889,7 @@ project(':forge') {
task userdevExtrasReobf(type:TaskReobfuscateJar) {
dependsOn userdevExtras, createMcp2Srg
input = tasks.userdevExtras.archivePath
classpath = project.configurations.getByName("compile")
classpath = project.configurations.compile
srg = tasks.createMcp2Srg.output
}

1
mdk/gradle.properties
View File

@ -1,3 +1,4 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

12
src/fmllauncher/java/net/minecraftforge/fml/loading/FMLClientLaunchProvider.java
View File

@ -19,7 +19,6 @@
package net.minecraftforge.fml.loading;
import com.google.common.collect.ObjectArrays;
import cpw.mods.modlauncher.api.IEnvironment;
import cpw.mods.modlauncher.api.ILaunchHandlerService;
import cpw.mods.modlauncher.api.ITransformingClassLoader;
@ -28,14 +27,10 @@ import net.minecraftforge.api.distmarker.Dist;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.stream.Stream;
public class FMLClientLaunchProvider extends FMLCommonLaunchHandler implements ILaunchHandlerService
{
@ -58,6 +53,13 @@ public class FMLClientLaunchProvider extends FMLCommonLaunchHandler implements I
};
}
@Override
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
{
super.configureTransformationClassLoader(builder);
builder.addTransformationPath(LibraryFinder.findJarPathFor("com/mojang/realmsclient/RealmsVersion.class", "realms"));
}
@SuppressWarnings("unchecked")
@Override
public void setup(final IEnvironment environment, final Map<String, ?> arguments) {

6
src/fmllauncher/java/net/minecraftforge/fml/loading/FMLCommonLaunchHandler.java
View File

@ -19,7 +19,6 @@
package net.minecraftforge.fml.loading;
import com.google.common.collect.ObjectArrays;
import cpw.mods.modlauncher.api.IEnvironment;
import cpw.mods.modlauncher.api.ITransformingClassLoader;
import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
@ -68,8 +67,9 @@ public abstract class FMLCommonLaunchHandler
}
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) {
Stream.of(LibraryFinder.commonLibPaths(ObjectArrays.concat(FMLLoader.getForgePath(), FMLLoader.getMCPaths()))).
forEach(builder::addTransformationPath);
builder.addTransformationPath(FMLLoader.getForgePath());
for (Path path : FMLLoader.getMCPaths())
builder.addTransformationPath(path);
builder.setClassBytesLocator(getClassLoaderLocatorFunction());
builder.setManifestLocator(getClassLoaderManifestLocatorFunction());
}

9
src/fmllauncher/java/net/minecraftforge/fml/loading/FMLDevClientLaunchProvider.java
View File

@ -19,10 +19,10 @@
package net.minecraftforge.fml.loading;
import com.google.common.collect.ObjectArrays;
import cpw.mods.modlauncher.api.IEnvironment;
import cpw.mods.modlauncher.api.ILaunchHandlerService;
import cpw.mods.modlauncher.api.ITransformingClassLoader;
import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
import net.minecraftforge.api.distmarker.Dist;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
@ -64,6 +64,13 @@ public class FMLDevClientLaunchProvider extends FMLCommonLaunchHandler implement
return new Path[] { compiledClasses, resources };
}
@Override
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
{
super.configureTransformationClassLoader(builder);
builder.addTransformationPath(LibraryFinder.findJarPathFor("com/mojang/realmsclient/RealmsVersion.class", "realms"));
}
@Override
public Callable<Void> launchService(String[] arguments, ITransformingClassLoader launchClassLoader)
{

7
src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java
View File

@ -47,7 +47,7 @@ public class LibraryFinder {
return libsPath;
}
static Path findJarPathFor(final String className, final String jarName) {
public static Path findJarPathFor(final String className, final String jarName) {
final URL resource = LibraryFinder.class.getClassLoader().getResource(className);
return findJarPathFor(className, jarName, resource);
}
@ -69,11 +69,6 @@ public class LibraryFinder {
}
}
public static Path[] commonLibPaths(Path[] extras) {
final Path realms = findJarPathFor("com/mojang/realmsclient/RealmsVersion.class", "realms");
return ObjectArrays.concat(extras, realms);
}
static Path getForgeLibraryPath(final String mcVersion, final String forgeVersion, final String forgeGroup) {
Path forgePath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", "universal", mcVersion+"-"+forgeVersion));
LOGGER.debug(CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath));

41
src/fmllauncher/java/net/minecraftforge/server/ServerMain.java
View File

@ -19,12 +19,49 @@
package net.minecraftforge.server;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import com.google.common.collect.ObjectArrays;
import cpw.mods.modlauncher.Launcher;
public class ServerMain {
public static void main(String[] args) {
final String[] argArray = ObjectArrays.concat(new String[]{"--launchTarget", "fmlserver","--gameDir", "."}, args, String.class);
public static void main(String[] args) throws IOException {
final Properties props = new Properties();
try(InputStream stream = ServerMain.class.getClassLoader().getResourceAsStream("server_launcher.properties")) {
if (stream == null) {
System.out.println("ERROR: could not load server_launcher.properties, invalid launcher jar, you must specify all arguments");
return;
}
props.load(stream);
}
boolean exit = false;
int lib_count = Integer.parseInt(props.getProperty("library.count"));
for (int x = 0; x < lib_count; x++) {
String lib = props.getProperty(String.format("library.%03d", x));
if (lib == null) {
System.out.println("Invalid server launcher properties, missing library: " + x);
exit = true;
} else if (!new File(lib).exists()) {
System.out.println("Missing library: " + lib);
exit = true;
}
}
if (exit)
return;
String defaults = props.getProperty("args");
if (defaults == null) {
System.out.println("Null default argumetns found, you must specify all arguments.");
return;
}
System.out.println("Appending default arguments: " + defaults);
final String[] argArray = ObjectArrays.concat(defaults.split(" "), args, String.class);
Launcher.main(argArray);
}
}

26
src/main/java/net/minecraftforge/common/ForgeMod.java
View File

@ -22,7 +22,6 @@ package net.minecraftforge.common;
import net.minecraftforge.fml.FMLWorldPersistenceHook;
import net.minecraftforge.fml.VersionChecker;
import net.minecraftforge.fml.WorldPersistenceHooks;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent;
@ -30,9 +29,13 @@ import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.server.command.ForgeCommand;
import net.minecraftforge.versions.forge.ForgeVersion;
import net.minecraftforge.versions.mcp.MCPVersion;
import java.nio.file.Path;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -49,6 +52,9 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.io.WritingMode;
@Mod("forge")
public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
{
@ -85,9 +91,27 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
MinecraftForge.EVENT_BUS.addListener(this::playerLogin);
MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
/*
FMLModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ForgeConfig.spec);
FMLModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ForgeConfig.chunk_spec);
FMLModLoadingContext.get().getModEventBus().register(ForgeConfig.class);
*/
//Temporary, until I can talk to CPW about how certian types of config setups
loadConfig(ForgeConfig.spec, FMLPaths.CONFIGDIR.get().resolve("forge.toml"));
loadConfig(ForgeConfig.chunk_spec, FMLPaths.CONFIGDIR.get().resolve("forge_chunk.toml"));
}
private void loadConfig(ForgeConfigSpec spec, Path path) {
LOGGER.debug(FORGEMOD, "Loading config file {}", path);
final CommentedFileConfig configData = CommentedFileConfig.builder(path)
.sync()
.autosave()
.writingMode(WritingMode.REPLACE)
.build();
LOGGER.debug(FORGEMOD, "Built TOML config for {}", path.toString());
configData.load();
LOGGER.debug(FORGEMOD, "Loaded TOML config file {}", path.toString());
spec.setConfig(configData);
}
/*

1
src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java
View File

@ -3,7 +3,6 @@ package net.minecraftforge.fml.config;
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.file.FileWatcher;
import com.electronwill.nightconfig.core.io.WritingMode;
import net.minecraftforge.fml.loading.FMLPaths;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

10
src/userdev/java/net/minecraftforge/userdev/FMLUserdevClientLaunchProvider.java
View File

@ -21,7 +21,10 @@ package net.minecraftforge.userdev;
import cpw.mods.modlauncher.api.ILaunchHandlerService;
import cpw.mods.modlauncher.api.ITransformingClassLoader;
import cpw.mods.modlauncher.api.ITransformingClassLoaderBuilder;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.loading.LibraryFinder;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -53,4 +56,11 @@ public class FMLUserdevClientLaunchProvider extends FMLUserdevLaunchProvider imp
return null;
};
}
@Override
public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
{
super.configureTransformationClassLoader(builder);
builder.addTransformationPath(LibraryFinder.findJarPathFor("com/mojang/realmsclient/RealmsVersion.class", "realms"));
}
}