From b7f6fbcfcbf1048854204f1097f9bb78a1799cc6 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 21 Feb 2019 04:24:39 -0800 Subject: [PATCH] Merge extra and data jars. As Log4j has issues with it's config being in a different jar then the custom logger. --- build.gradle | 16 ++++------------ .../fml/loading/LibraryFinder.java | 4 +--- .../minecraftforge/fml/config/ConfigTracker.java | 9 ++++++++- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index aebaf288f..324b38a80 100644 --- a/build.gradle +++ b/build.gradle @@ -493,7 +493,7 @@ project(':forge') { ext { output = file('build/install_profile.json') INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.0.3' - JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.0.4' + JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.0' } doFirst { ext.BIN_PATCHER = 'net.minecraftforge:binarypatcher:' + genClientBinPatches.resolvedVersion @@ -544,14 +544,6 @@ project(':forge') { client: "'${sha1(tasks.getByName('downloadClientSlim').output)}'", server: "'${sha1(tasks.getByName('downloadServerSlim').output)}'" ], - MC_DATA: [ - client: "[net.minecraft:client:${MC_VERSION}:data]", - server: "[net.minecraft:server:${MC_VERSION}:data]" - ], - MC_DATA_SHA: [ - client: "'${sha1(tasks.getByName('downloadClientData').output)}'", - server: "'${sha1(tasks.getByName('downloadServerData').output)}'" - ], MC_EXTRA: [ client: "[net.minecraft:client:${MC_VERSION}:extra]", server: "[net.minecraft:server:${MC_VERSION}:extra]" @@ -589,13 +581,11 @@ project(':forge') { args: [ '--input', '{MINECRAFT_JAR}', '--slim', '{MC_SLIM}', - '--data', '{MC_DATA}', '--extra', '{MC_EXTRA}', '--srg', '{MAPPINGS}' ], outputs: [ '{MC_SLIM}': '{MC_SLIM_SHA}', - '{MC_DATA}': '{MC_DATA_SHA}', '{MC_EXTRA}': '{MC_EXTRA_SHA}' ] ], [ // SpecialSource has a bug where it won't create the nessasary directories, remove when they fix that. @@ -635,7 +625,7 @@ project(':forge') { } ['client', 'server'].each { side -> - ['slim', 'extra', 'data'].each { type -> + ['slim', 'extra'].each { type -> def name = "download${side.capitalize()}${type.capitalize()}" task "${name}"(type: DownloadMavenArtifact) { artifact = "net.minecraft:${side}:${MC_VERSION}:${type}" @@ -897,6 +887,8 @@ project(':forge') { setSources sourceSets.userdev.java.srcDirs.findAll({f -> (f != patcher.patchedSrc) }) } + tasks.eclipse.dependsOn('genEclipseRuns') + publishing { publications { mavenJava(MavenPublication) { diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java index 2260a9566..11ea803ed 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/LibraryFinder.java @@ -81,13 +81,11 @@ public class LibraryFinder { static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) { Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion)); - Path mcDataPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "data", mcVersion)); Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion)); Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion)); LOGGER.debug(CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath)); - LOGGER.debug(CORE,"MC Data at {} is {}", mcDataPath.toString(), pathStatus(mcDataPath)); LOGGER.debug(CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath)); LOGGER.debug(CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath)); - return new Path[] { patchedBinariesPath, mcDataPath, mcExtrasPath, srgMcPath }; + return new Path[] { patchedBinariesPath, mcExtrasPath, srgMcPath }; } } diff --git a/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java b/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java index 4cdc9e4c6..ed0dec64f 100644 --- a/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java +++ b/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java @@ -32,6 +32,7 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; @@ -79,7 +80,13 @@ public class ConfigTracker { } public List> syncConfigs() { - final Map configData = configSets.get(ModConfig.Type.SERVER).stream().collect(Collectors.toMap(ModConfig::getFileName, rethrowFunction(mc -> Files.readAllBytes(mc.getFullPath())))); + final Map configData = configSets.get(ModConfig.Type.SERVER).stream().collect(Collectors.toMap(ModConfig::getFileName, mc -> { //TODO: Test cpw's LambdaExceptionUtils on Oracle javac. + try { + return Files.readAllBytes(mc.getFullPath()); + } catch (IOException e) { + throw new RuntimeException(e); + } + })); return configData.entrySet().stream().map(e->Pair.of("Config "+e.getKey(), new FMLHandshakeMessages.S2CConfigData(e.getKey(), e.getValue()))).collect(Collectors.toList()); }