diff --git a/src/main/java/com/griefcraft/io/BackupManager.java b/src/main/java/com/griefcraft/io/BackupManager.java index 587ac03a2..ca8e933f7 100644 --- a/src/main/java/com/griefcraft/io/BackupManager.java +++ b/src/main/java/com/griefcraft/io/BackupManager.java @@ -87,7 +87,10 @@ public enum Result { /** * The folder backups are stored in */ - private final File backupFolder = new File(BACKUP_FOLDER); + private File backupFolder; + + private final LWC lwc = LWC.getInstance(); + private final Plugin plugin = lwc.getPlugin(); /** * Backup creation flags @@ -112,6 +115,8 @@ public enum Flag { } public BackupManager() { + BACKUP_FOLDER = plugin.getDataFolder().getAbsolutePath() + "backups/"; + backupFolder = new File(BACKUP_FOLDER); if (!backupFolder.exists()) { backupFolder.mkdir(); } @@ -217,7 +222,6 @@ public Backup loadBackup(String name) throws IOException { * @return */ public Backup createBackup(String name, final EnumSet flags) { - final LWC lwc = LWC.getInstance(); final Plugin plugin = lwc.getPlugin(); Server server = Bukkit.getServer(); final BukkitScheduler scheduler = server.getScheduler(); diff --git a/src/main/java/com/griefcraft/migration/ConfigPost300.java b/src/main/java/com/griefcraft/migration/ConfigPost300.java index f489de9e2..dcb3eaa1f 100644 --- a/src/main/java/com/griefcraft/migration/ConfigPost300.java +++ b/src/main/java/com/griefcraft/migration/ConfigPost300.java @@ -51,14 +51,15 @@ public class ConfigPost300 implements MigrationUtility { public void run() { LWC lwc = LWC.getInstance(); - File configFile = new File("plugins/LWC/lwc.properties"); + File coreDir = LWC.getInstance().getPlugin().getDataFolder(); + File configFile = new File(coreDir, "lwc.properties"); if (!configFile.exists()) { return; } // delete internal.ini - new File("plugins/LWC/internal.ini").delete(); + new File(coreDir, "internal.ini").delete(); logger.info("Converting lwc.properties to new variants"); // we need to convert.. diff --git a/src/main/java/com/griefcraft/migration/MySQLPost200.java b/src/main/java/com/griefcraft/migration/MySQLPost200.java index bf8e4d4c4..9504030f5 100644 --- a/src/main/java/com/griefcraft/migration/MySQLPost200.java +++ b/src/main/java/com/griefcraft/migration/MySQLPost200.java @@ -58,7 +58,7 @@ public void run() { String database = lwc.getConfiguration().getString("database.path"); if (database == null || database.trim().equals("")) { - database = "plugins/LWC/lwc.db"; + database = lwc.getPlugin().getDataFolder().getAbsolutePath() + "lwc.db"; } File file = new File(database); diff --git a/src/main/java/com/griefcraft/scripting/ModuleLoader.java b/src/main/java/com/griefcraft/scripting/ModuleLoader.java index 7bfb4a503..ddfd6d85d 100644 --- a/src/main/java/com/griefcraft/scripting/ModuleLoader.java +++ b/src/main/java/com/griefcraft/scripting/ModuleLoader.java @@ -163,7 +163,7 @@ public int getExpectedArguments() { /** * Path to the root of scripts */ - public final static String ROOT_PATH = "plugins/LWC/"; + public static String ROOT_PATH = "plugins/LWC/"; /** * Map of loaded modules @@ -184,6 +184,7 @@ public int getExpectedArguments() { public ModuleLoader(LWC lwc) { this.lwc = lwc; + ROOT_PATH = lwc.getPlugin().getDataFolder().getAbsolutePath(); populateFastModuleCache(); } diff --git a/src/main/java/com/griefcraft/util/Updater.java b/src/main/java/com/griefcraft/util/Updater.java index c0f647062..c9c678c6f 100644 --- a/src/main/java/com/griefcraft/util/Updater.java +++ b/src/main/java/com/griefcraft/util/Updater.java @@ -60,7 +60,7 @@ public class Updater { /** * The folder where libraries are stored */ - public final static String DEST_LIBRARY_FOLDER = "plugins/LWC/lib/"; + public static String DEST_LIBRARY_FOLDER = ""; /** * The queue of files that need to be downloaded @@ -73,6 +73,9 @@ public void init() { downloadFiles(); final LWC lwc = LWC.getInstance(); + + DEST_LIBRARY_FOLDER = lwc.getPlugin().getDataFolder().getAbsolutePath() + "lib/"; + if (lwc.getConfiguration().getBoolean("core.updateNotifier", true)) { lwc.getPlugin().getServer().getScheduler().scheduleAsyncDelayedTask(lwc.getPlugin(), new Runnable() { public void run() { @@ -203,7 +206,7 @@ public void downloadFiles() { lwc.log("Downloading file " + local.getName()); // check for LWC folder - File folder = new File("plugins/LWC/"); + File folder = new File(DEST_LIBRARY_FOLDER); if (!folder.exists()) { folder.mkdir(); }