Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'Prototik-blueprints-downloads' into 6.0.x

Browse source
This commit is contained in:
SpaceToad 2014-05-07 11:49:36 +02:00
commit adb369c9c0
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common/buildcraft/BuildCraftBuilders.java
View file

@ -8,7 +8,9 @@
*/
package buildcraft;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.item.EntityMinecartChest;
@ -166,8 +168,8 @@ public class BuildCraftBuilders extends BuildCraftMod {
// legacy beta BuildCraft
"\"$MINECRAFT" + File.separator + "config" + File.separator + "buildcraft" + File.separator
+ "blueprints" + File.separator + "client\"",
// default Windows download location
"\"$HOME" + File.separator + "Downloads\""
// infered used download location
"\"" + getDownloadsDir() + "\""
}
).getStringList().clone();
@ -192,14 +194,40 @@ public class BuildCraftBuilders extends BuildCraftMod {
clientDB.init(blueprintLibraryInput, blueprintLibraryOutput);
}
private static String getDownloadsDir() {
final String os = System.getProperty("os.name").toLowerCase();
if (os.contains("nix") || os.contains("lin") || os.contains("mac")) {
// Linux, Mac or other UNIX
// According XDG specification every user-specified folder can be localized
// or even moved to any destination, so we obtain real path with xdg-user-dir
try {
Process process = Runtime.getRuntime().exec(new String[] {"xdg-user-dir", "DOWNLOAD"});
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), "utf-8"));
process.waitFor();
String line = reader.readLine().trim();
reader.close();
if (line.length() > 0) {
return line;
}
} catch (Exception ignored) {
// Very bad, we have a error while obtaining xdg dir :(
// Just ignore, uses default dir
}
}
// Windows or unknown system
return "$HOME" + File.separator + "Downloads";
}
private String replacePathVariables(String path) {
String result = path.replaceAll("\\$HOME", System.getProperty("user.home").replaceAll("\\\\", "\\\\\\\\"));
String result = path.replace("$DOWNLOADS", getDownloadsDir());
result = result.replace("$HOME", System.getProperty("user.home"));
if (Launch.minecraftHome == null) {
result = result.replaceAll("\\$MINECRAFT", new File(".").getAbsolutePath().replaceAll("\\\\", "\\\\\\\\"));
result = result.replace("$MINECRAFT", new File(".").getAbsolutePath());
} else {
result = result.replaceAll("\\$MINECRAFT",
Launch.minecraftHome.getAbsolutePath().replaceAll("\\\\", "\\\\\\\\"));
result = result.replace("$MINECRAFT", Launch.minecraftHome.getAbsolutePath());
}
return result;