Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-24 18:10:08 +01:00
Added the ability to configure the schematic and CraftScript directories.
Dieser Commit ist enthalten in:
Ursprung
cd298c3099
Commit
d1ff0250aa
@ -57,6 +57,8 @@ public abstract class LocalConfiguration {
|
||||
public int navigationWand = 345;
|
||||
public int navigationWandMaxDistance = 50;
|
||||
public int scriptTimeout = 3000;
|
||||
public String saveDir = "schematics";
|
||||
public String scriptsDir = "craftscripts";
|
||||
|
||||
/**
|
||||
* Loads the configuration.
|
||||
|
@ -343,6 +343,22 @@ public class WorldEdit {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a file relative to the defined working directory. If the specified
|
||||
* path is absolute, then the working directory is not used.
|
||||
*
|
||||
* @param path
|
||||
* @return
|
||||
*/
|
||||
public File getWorkingDirectoryFile(String path) {
|
||||
File f = new File(path);
|
||||
if (f.isAbsolute()) {
|
||||
return f;
|
||||
} else {
|
||||
return new File(config.getWorkingDirectory(), path);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Modulus, divisor-style.
|
||||
*
|
||||
@ -757,7 +773,7 @@ public class WorldEdit {
|
||||
*/
|
||||
public void runScript(LocalPlayer player, String filename, String[] args)
|
||||
throws WorldEditException {
|
||||
File dir = new File(config.getWorkingDirectory(), "craftscripts");
|
||||
File dir = getWorkingDirectoryFile(config.scriptsDir);
|
||||
File f = new File(dir, filename);
|
||||
|
||||
if (!filename.matches("^[A-Za-z0-9_\\- \\./\\\\'\\$@~!%\\^\\*\\(\\)\\[\\]\\+\\{\\},\\?]+\\.[A-Za-z0-9]+$")) {
|
||||
|
@ -66,6 +66,9 @@ public class BukkitConfiguration extends LocalConfiguration {
|
||||
navigationWandMaxDistance = config.getInt("navigation-wand.max-distance", navigationWandMaxDistance);
|
||||
|
||||
scriptTimeout = config.getInt("scripting.timeout", scriptTimeout);
|
||||
scriptsDir = config.getString("scripting.dir", scriptsDir);
|
||||
|
||||
saveDir = config.getString("saving.dir", saveDir);
|
||||
|
||||
disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
|
||||
|
||||
|
@ -181,8 +181,8 @@ public class ClipboardCommands {
|
||||
LocalConfiguration config = we.getConfiguration();
|
||||
|
||||
String filename = args.getString(0).replace("\0", "") + ".schematic";
|
||||
File dir = new File(config.getWorkingDirectory(), "schematics");
|
||||
File f = new File(new File(config.getWorkingDirectory(), "schematics"), filename);
|
||||
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
||||
File f = new File(dir, filename);
|
||||
|
||||
if (!filename.matches("^[A-Za-z0-9_\\- \\./\\\\'\\$@~!%\\^\\*\\(\\)\\[\\]\\+\\{\\},\\?]+$")) {
|
||||
player.printError("Valid characters: A-Z, a-z, 0-9, spaces, "
|
||||
@ -230,8 +230,8 @@ public class ClipboardCommands {
|
||||
return;
|
||||
}
|
||||
|
||||
File dir = new File(config.getWorkingDirectory(), "schematics");
|
||||
File f = new File(new File(config.getWorkingDirectory(), "schematics"), filename);
|
||||
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
||||
File f = new File(dir, filename);
|
||||
|
||||
if (!dir.exists()) {
|
||||
if (!dir.mkdir()) {
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren