upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libraries not being added to the modlist when using external metadata. Closes #4879

Browse Source
This commit is contained in:
LexManos committed 2018-04-15 17:44:01 -07:00
1 parent d9dbec0546
commit 68ce80dad4
2 files changed
+17 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fml/relauncher/libraries/Artifact.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class Artifact implements Comparable<Artifact>
if (folder == null)
{
StringBuilder sb = new StringBuilder();
for (String part : group.split("."))
for (String part : group.split("\\."))
sb.append(part).append(File.separatorChar);
sb.append(artifact).append(File.separatorChar);
sb.append(version);
src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java
+16 -8
View File
@@ -317,14 +317,18 @@ public class LibraryManager
{
try
{
Artifact artifact = readArtifact(modlist.getRepository(), meta);
Artifact artifact = readArtifact(modlist.getRepository(), meta);
File target = artifact.getFile();
if (target.exists())
{
FMLLog.log.debug("Found existing ContainedDep {}({}) from {} extracted to {}, skipping extraction", dep, artifact.toString(), target.getCanonicalPath(), jar.getName());
if (!ENABLE_AUTO_MOD_MOVEMENT)
{
extractPacked(target, modlist, modDirs); //If we're not building a real list we have to re-build the dep list every run. So search down.
Pair<?, ?> child = extractPacked(target, modlist, modDirs); //If we're not building a real list we have to re-build the dep list every run. So search down.
if (child == null && metaEntry != null) //External meta with no internal name... If there is a internal name, we trust that that name is the correct one.
{
modlist.add(artifact);
}
}
}
else
@@ -353,7 +357,11 @@ public class LibraryManager
File meta_target = new File(target.getAbsolutePath() + ".meta");
Files.write(manifest_data, meta_target);
}
extractPacked(target, modlist, modDirs);
Pair<?, ?> child = extractPacked(target, modlist, modDirs);
if (child == null && metaEntry != null) //External meta with no internal name... If there is a internal name, we trust that that name is the correct one.
{
modlist.add(artifact);
}
}
}
catch (NumberFormatException nfe)
@@ -368,15 +376,15 @@ public class LibraryManager
}
}
if (attrs.containsKey(MAVEN_ARTIFACT))
if (attrs.containsKey(MAVEN_ARTIFACT))
{
Artifact artifact = readArtifact(modlist.getRepository(), attrs);
modlist.add(artifact);
return Pair.of(artifact, readAll(jar.getInputStream(manifest_entry)));
Artifact artifact = readArtifact(modlist.getRepository(), attrs);
modlist.add(artifact);
return Pair.of(artifact, readAll(jar.getInputStream(manifest_entry)));
}
return null;
}
private static Artifact readArtifact(Repository repo, Attributes meta)
{
String timestamp = meta.getValue(TIMESTAMP);