Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

This commit is contained in:
nossr50
2020-07-26 05:08:49 -07:00
259 changed files with 2025 additions and 2270 deletions

View File

@ -16,15 +16,15 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class ZipLibrary {
private static String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "backup" + File.separator;
private static File BACKUP_DIR = new File(BACKUP_DIRECTORY);
private static File FLAT_FILE_DIRECTORY = new File(mcMMO.getFlatFileDirectory());
private static File MOD_FILE_DIRECTORY = new File(mcMMO.getModDirectory());
private static File CONFIG_FILE = new File(mcMMO.getMainDirectory() + "config.yml");
private static File EXPERIENCE_FILE = new File(mcMMO.getMainDirectory() + "experience.yml");
private static File TREASURE_FILE = new File(mcMMO.getMainDirectory() + "treasures.yml");
private static File ADVANCED_FILE = new File(mcMMO.getMainDirectory() + "advanced.yml");
private static File REPAIR_FILE = new File(mcMMO.getMainDirectory() + "repair.vanilla.yml");
private static final String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "backup" + File.separator;
private static final File BACKUP_DIR = new File(BACKUP_DIRECTORY);
private static final File FLAT_FILE_DIRECTORY = new File(mcMMO.getFlatFileDirectory());
private static final File MOD_FILE_DIRECTORY = new File(mcMMO.getModDirectory());
private static final File CONFIG_FILE = new File(mcMMO.getMainDirectory() + "config.yml");
private static final File EXPERIENCE_FILE = new File(mcMMO.getMainDirectory() + "experience.yml");
private static final File TREASURE_FILE = new File(mcMMO.getMainDirectory() + "treasures.yml");
private static final File ADVANCED_FILE = new File(mcMMO.getMainDirectory() + "advanced.yml");
private static final File REPAIR_FILE = new File(mcMMO.getMainDirectory() + "repair.vanilla.yml");
public static void mcMMOBackup() throws IOException {
if (Config.getInstance().getUseMySQL()) {
@ -47,7 +47,7 @@ public class ZipLibrary {
File fileZip = new File(BACKUP_DIRECTORY + File.separator + dateFormat.format(date) + ".zip");
// Create the Source List, and add directories/etc to the file.
List<File> sources = new ArrayList<File>();
List<File> sources = new ArrayList<>();
sources.add(FLAT_FILE_DIRECTORY);
sources.add(CONFIG_FILE);