From 55691fce4ede7a98f7fba6962509ddbdb9e614a9 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 31 Jan 2019 23:09:26 -0500 Subject: [PATCH] Expose the ModFile in the scan data, so languages can read it and make mod construction decisions. Signed-off-by: cpw --- build.gradle | 2 +- .../net/minecraftforge/fml/loading/moddiscovery/Scanner.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 302311096c..81eef5b703 100644 --- a/build.gradle +++ b/build.gradle @@ -272,7 +272,7 @@ project(':forge') { installer 'cpw.mods:modlauncher:0.9.+' installer 'net.minecraftforge:accesstransformers:0.14.+:shadowed' installer 'net.minecraftforge:eventbus:0.6.+:service' - installer 'net.minecraftforge:forgespi:0.5.+' + installer 'net.minecraftforge:forgespi:0.6.+' installer 'net.minecraftforge:coremods:0.2.+' installer 'com.electronwill.night-config:core:3.4.2' installer 'com.electronwill.night-config:toml:3.4.2' diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java index 7a9f4526c1..bbdf36bb2c 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java @@ -41,6 +41,7 @@ public class Scanner { public ModFileScanData scan() { ModFileScanData result = new ModFileScanData(); + result.addModFileInfo(fileToScan.getModFileInfo()); fileToScan.scanFile(p -> fileVisitor(p, result)); final IModLanguageProvider loader = fileToScan.getLoader(); LOGGER.debug(SCAN, "Scanning {} with language loader {}", fileToScan.getFilePath(), loader.name());