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

Changed RelauchLibraryManager so that files with different paths on the

Browse source 
same baseURL can be implemented in one ILibrarySet.
This commit is contained in:
keepcalm 2012-10-13 19:12:06 +11:00 committed by Christian
parent c0795e9bee
commit 924425074f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
View file

@ -85,13 +85,15 @@ public class RelaunchLibraryManager
{ {
boolean download = false; boolean download = false;
String libName = lib.getLibraries()[i]; String libName = lib.getLibraries()[i];
File tmp = new File(libName);
String targFileName = tmp.getName();
String checksum = lib.getHashes()[i]; String checksum = lib.getHashes()[i];
File libFile = new File(libDir, libName); File libFile = new File(libDir, targFileName);
if (!libFile.exists()) if (!libFile.exists())
{ {
try try
{ {
downloadFile(libFile, lib.getRootURL(), checksum); downloadFile(libFile, lib.getRootURL(), libName, checksum);
download = true; download = true;
} }
catch (Throwable e) catch (Throwable e)
@ -414,11 +416,14 @@ public class RelaunchLibraryManager
return coreModDir; return coreModDir;
} }
private static void downloadFile(File libFile, String rootUrl, String hash) private static void downloadFile(File libFile, String rootUrl,String realFilePath, String hash)
{ {
try try
{ {
URL libDownload = new URL(String.format(rootUrl,libFile.getName())); //rootUrl.replace("%s", libFile.getPath())
URL libDownload = new URL(String.format(rootUrl,realFilePath));
System.out.println("Downloading file: " + libDownload.getHost() + libDownload.getPath());
System.out.println("The libFile's path is " + libFile.getAbsolutePath());
String infoString = String.format("Downloading file %s", libDownload.toString()); String infoString = String.format("Downloading file %s", libDownload.toString());
downloadMonitor.updateProgressString(infoString); downloadMonitor.updateProgressString(infoString);
FMLRelaunchLog.info(infoString); FMLRelaunchLog.info(infoString);