-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
252 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| package com.dre.brewery.filedata; | ||
|
|
||
|
|
||
| import java.io.File; | ||
|
|
||
| import org.bukkit.World; | ||
| import org.bukkit.configuration.ConfigurationSection; | ||
| import org.bukkit.configuration.file.FileConfiguration; | ||
| import org.bukkit.configuration.file.YamlConfiguration; | ||
| import org.bukkit.scheduler.BukkitRunnable; | ||
|
|
||
| import com.dre.brewery.BCauldron; | ||
| import com.dre.brewery.BPlayer; | ||
| import com.dre.brewery.Barrel; | ||
| import com.dre.brewery.Brew; | ||
| import com.dre.brewery.P; | ||
| import com.dre.brewery.Wakeup; | ||
|
|
||
| public class DataSave extends BukkitRunnable { | ||
|
|
||
| public static int lastBackup = 0; | ||
| public static int lastSave = 1; | ||
| public static int autosave = 3; | ||
| final public static String dataVersion = "1.1"; | ||
| public static DataSave running; | ||
|
|
||
| public ReadOldData read; | ||
| private long time; | ||
| public boolean collected = false; | ||
|
|
||
| // Not Thread-Safe! Needs to be run in main thread but uses async Read/Write | ||
| public DataSave(ReadOldData read) { | ||
| this.read = read; | ||
| time = System.currentTimeMillis(); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public void run() { | ||
| FileConfiguration oldData; | ||
| if (read != null) { | ||
| if (!read.done) { | ||
| // Wait for async thread to load old data | ||
| if (System.currentTimeMillis() - time > 30000) { | ||
| P.p.errorLog("Old Data took too long to load!"); | ||
| cancel(); | ||
| return; | ||
| } | ||
| return; | ||
| } | ||
| oldData = read.getData(); | ||
| } else { | ||
| oldData = new YamlConfiguration(); | ||
| } | ||
| try { | ||
| cancel(); | ||
| } catch (IllegalStateException e) { | ||
| } | ||
|
|
||
| FileConfiguration configFile = new YamlConfiguration(); | ||
|
|
||
| if (!Brew.potions.isEmpty()) { | ||
| Brew.save(configFile.createSection("Brew")); | ||
| } | ||
|
|
||
| if (!BCauldron.bcauldrons.isEmpty() || oldData.contains("BCauldron")) { | ||
| BCauldron.save(configFile.createSection("BCauldron"), oldData.getConfigurationSection("BCauldron")); | ||
| } | ||
|
|
||
| if (!Barrel.barrels.isEmpty() || oldData.contains("Barrel")) { | ||
| Barrel.save(configFile.createSection("Barrel"), oldData.getConfigurationSection("Barrel")); | ||
| } | ||
|
|
||
| if (!BPlayer.isEmpty()) { | ||
| BPlayer.save(configFile.createSection("Player")); | ||
| } | ||
|
|
||
| if (!Wakeup.wakeups.isEmpty() || oldData.contains("Wakeup")) { | ||
| Wakeup.save(configFile.createSection("Wakeup"), oldData.getConfigurationSection("Wakeup")); | ||
| } | ||
|
|
||
| saveWorldNames(configFile, oldData.getConfigurationSection("Worlds")); | ||
| configFile.set("Version", dataVersion); | ||
|
|
||
| collected = true; | ||
| if (P.p.isEnabled()) { | ||
| P.p.getServer().getScheduler().runTaskAsynchronously(P.p, new WriteData(configFile)); | ||
| } else { | ||
| new WriteData(configFile).run(); | ||
| } | ||
| } | ||
|
|
||
| // Finish the collection of data immediately | ||
| public void now() { | ||
| if (!read.done) { | ||
| read.cancel(); | ||
| read.run(); | ||
| } | ||
| if (!collected) { | ||
| cancel(); | ||
| run(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
| // Save all data. Takes a boolean whether all data should be collected in instantly | ||
| public static void save(boolean collectInstant) { | ||
| long time = System.nanoTime(); | ||
| if (running != null) { | ||
| P.p.log("Another Save was started while a Save was in Progress"); | ||
| if (collectInstant) { | ||
| running.now(); | ||
| } | ||
| return; | ||
| } | ||
| File datafile = new File(P.p.getDataFolder(), "data.yml"); | ||
|
|
||
| if (datafile.exists()) { | ||
| ReadOldData read = new ReadOldData(); | ||
| if (collectInstant) { | ||
| read.run(); | ||
| running = new DataSave(read); | ||
| running.run(); | ||
| } else { | ||
| read.runTaskAsynchronously(P.p); | ||
| running = new DataSave(read); | ||
| running.runTaskTimer(P.p, 1, 2); | ||
| } | ||
| } else { | ||
| running = new DataSave(null); | ||
| running.runTask(P.p); | ||
| } | ||
| P.p.debugLog("saving: " + ((System.nanoTime() - time) / 1000000.0) + "ms"); | ||
| } | ||
|
|
||
| public static void autoSave() { | ||
| if (lastSave >= autosave) { | ||
| save(false);// save all data | ||
| } else { | ||
| lastSave++; | ||
| } | ||
| } | ||
|
|
||
| public static void saveWorldNames(FileConfiguration root, ConfigurationSection old) { | ||
| if (old != null) { | ||
| root.set("Worlds", old); | ||
| } | ||
| for (World world : P.p.getServer().getWorlds()) { | ||
| String worldName = world.getName(); | ||
| if (worldName.startsWith("DXL_")) { | ||
| worldName = P.p.getDxlName(worldName); | ||
| root.set("Worlds." + worldName, 0); | ||
| } else { | ||
| worldName = world.getUID().toString(); | ||
| root.set("Worlds." + worldName, world.getName()); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/com/dre/brewery/LanguageReader.java → .../dre/brewery/filedata/LanguageReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package com.dre.brewery; | ||
| package com.dre.brewery.filedata; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
|
|
||
Oops, something went wrong.