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

Fix handing the "minecraft" dependency properly by adding it to the list

Browse source 
of mods.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2019-01-26 11:23:51 -05:00
parent 13f9418201
commit 0bdafb976e
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/fmllauncher/java/net/minecraftforge/fml/loading/ModSorter.java
View file

@ -19,6 +19,7 @@
package net.minecraftforge.fml.loading; package net.minecraftforge.fml.loading;
import com.google.common.collect.Streams;
import com.google.common.graph.GraphBuilder; import com.google.common.graph.GraphBuilder;
import com.google.common.graph.MutableGraph; import com.google.common.graph.MutableGraph;
import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModFileInfo;
@ -77,9 +78,10 @@ public class ModSorter
} }
private void findLanguages() { private void findLanguages() {
modFiles.stream().forEach(mf->mf.identifyLanguage()); modFiles.forEach(ModFile::identifyLanguage);
} }
@SuppressWarnings("UnstableApiUsage")
private void sort() private void sort()
{ {
// lambdas are identity based, so sorting them is impossible unless you hold reference to them // lambdas are identity based, so sorting them is impossible unless you hold reference to them
@ -118,6 +120,7 @@ public class ModSorter
this.modFiles = sorted.stream().map(ModFileInfo::getFile).collect(Collectors.toList()); this.modFiles = sorted.stream().map(ModFileInfo::getFile).collect(Collectors.toList());
} }
@SuppressWarnings("UnstableApiUsage")
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep) private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
{ {
ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile(); ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
@ -138,7 +141,7 @@ public class ModSorter
private void buildUniqueList() private void buildUniqueList()
{ {
final Stream<ModInfo> modInfos = modFiles.stream().map(ModFile::getModInfos).flatMap(Collection::stream).map(ModInfo.class::cast); final Stream<ModInfo> modInfos = Stream.concat(DefaultModInfos.getModInfos().stream(), modFiles.stream().map(ModFile::getModInfos).flatMap(Collection::stream)).map(ModInfo.class::cast);
final Map<String, List<ModInfo>> modIds = modInfos.collect(Collectors.groupingBy(IModInfo::getModId)); final Map<String, List<ModInfo>> modIds = modInfos.collect(Collectors.groupingBy(IModInfo::getModId));
// TODO: make this figure out dupe handling better // TODO: make this figure out dupe handling better