2011-04-16 13:36:09 +00:00
|
|
|
package com.earth2me.essentials;
|
|
|
|
|
2011-12-06 12:41:29 +00:00
|
|
|
import com.earth2me.essentials.settings.Spawns;
|
|
|
|
import com.earth2me.essentials.storage.YamlStorageWriter;
|
2011-11-21 01:55:26 +00:00
|
|
|
import static com.earth2me.essentials.I18n._;
|
2011-11-18 17:42:26 +00:00
|
|
|
import java.io.*;
|
2011-09-17 22:49:34 +00:00
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.security.DigestInputStream;
|
|
|
|
import java.security.MessageDigest;
|
2011-11-18 17:42:26 +00:00
|
|
|
import java.util.*;
|
2011-04-16 13:36:09 +00:00
|
|
|
import java.util.logging.Level;
|
|
|
|
import java.util.logging.Logger;
|
2011-09-17 22:49:34 +00:00
|
|
|
import org.bukkit.Bukkit;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
import org.bukkit.Location;
|
2011-04-16 13:36:09 +00:00
|
|
|
import org.bukkit.Material;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
import org.bukkit.World;
|
2011-04-16 13:36:09 +00:00
|
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
|
|
|
public class EssentialsUpgrade
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
private final static Logger LOGGER = Logger.getLogger("Minecraft");
|
|
|
|
private final transient IEssentials ess;
|
|
|
|
private final transient EssentialsConf doneFile;
|
2011-04-16 13:36:09 +00:00
|
|
|
|
2011-08-08 12:40:30 +00:00
|
|
|
EssentialsUpgrade(final IEssentials essentials)
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-06-01 10:40:12 +00:00
|
|
|
ess = essentials;
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!ess.getDataFolder().exists())
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
ess.getDataFolder().mkdirs();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
doneFile = new EssentialsConf(new File(ess.getDataFolder(), "upgrades-done.yml"));
|
|
|
|
doneFile.load();
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
|
|
|
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
private void moveWorthValuesToWorthYml()
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
if (doneFile.getBoolean("moveWorthValuesToWorthYml", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
try
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final File configFile = new File(ess.getDataFolder(), "config.yml");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!configFile.exists())
|
|
|
|
{
|
2011-04-16 23:41:11 +00:00
|
|
|
return;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final EssentialsConf conf = new EssentialsConf(configFile);
|
2011-04-16 13:36:09 +00:00
|
|
|
conf.load();
|
2011-08-08 12:40:30 +00:00
|
|
|
final Worth worth = new Worth(ess.getDataFolder());
|
2011-05-16 21:43:43 +00:00
|
|
|
boolean found = false;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
for (Material mat : Material.values())
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final int id = mat.getId();
|
|
|
|
final double value = conf.getDouble("worth-" + id, Double.NaN);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!Double.isNaN(value))
|
|
|
|
{
|
2011-05-16 21:43:43 +00:00
|
|
|
found = true;
|
2011-08-08 12:40:30 +00:00
|
|
|
worth.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
|
|
|
}
|
2011-05-16 21:43:43 +00:00
|
|
|
if (found)
|
|
|
|
{
|
|
|
|
removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
doneFile.setProperty("moveWorthValuesToWorthYml", true);
|
|
|
|
doneFile.save();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
catch (Throwable e)
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-18 03:18:03 +00:00
|
|
|
private void moveMotdRulesToFile(String name)
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
if (doneFile.getBoolean("move" + name + "ToFile", false))
|
2011-11-18 03:18:03 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
try
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
final File file = new File(ess.getDataFolder(), name + ".txt");
|
2011-11-18 03:18:03 +00:00
|
|
|
if (file.exists())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File configFile = new File(ess.getDataFolder(), "config.yml");
|
|
|
|
if (!configFile.exists())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final EssentialsConf conf = new EssentialsConf(configFile);
|
|
|
|
conf.load();
|
|
|
|
List<String> lines = conf.getStringList(name, null);
|
|
|
|
if (lines != null && !lines.isEmpty())
|
|
|
|
{
|
|
|
|
if (!file.createNewFile())
|
|
|
|
{
|
|
|
|
throw new IOException("Failed to create file " + file);
|
|
|
|
}
|
|
|
|
PrintWriter writer = new PrintWriter(file);
|
|
|
|
|
|
|
|
for (String line : lines)
|
|
|
|
{
|
|
|
|
writer.println(line);
|
|
|
|
}
|
|
|
|
writer.close();
|
|
|
|
}
|
2011-11-21 01:55:26 +00:00
|
|
|
doneFile.setProperty("move" + name + "ToFile", true);
|
2011-11-18 03:18:03 +00:00
|
|
|
doneFile.save();
|
|
|
|
}
|
|
|
|
catch (Throwable e)
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
|
2011-11-18 03:18:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
private void removeLinesFromConfig(File file, String regex, String info) throws Exception
|
|
|
|
{
|
2011-04-16 13:36:09 +00:00
|
|
|
boolean needUpdate = false;
|
2011-08-08 12:40:30 +00:00
|
|
|
final BufferedReader bReader = new BufferedReader(new FileReader(file));
|
|
|
|
final File tempFile = File.createTempFile("essentialsupgrade", ".tmp.yml", ess.getDataFolder());
|
|
|
|
final BufferedWriter bWriter = new BufferedWriter(new FileWriter(tempFile));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
do
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final String line = bReader.readLine();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (line == null)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (line.matches(regex))
|
|
|
|
{
|
2011-06-01 10:40:12 +00:00
|
|
|
if (!needUpdate && info != null)
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
bWriter.write(info, 0, info.length());
|
|
|
|
bWriter.newLine();
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
|
|
|
needUpdate = true;
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (line.endsWith("\r\n"))
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
bWriter.write(line, 0, line.length() - 2);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
else if (line.endsWith("\r") || line.endsWith("\n"))
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
bWriter.write(line, 0, line.length() - 1);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
bWriter.write(line, 0, line.length());
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
bWriter.newLine();
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
while (true);
|
2011-08-08 12:40:30 +00:00
|
|
|
bReader.close();
|
|
|
|
bWriter.close();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (needUpdate)
|
|
|
|
{
|
|
|
|
if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
throw new Exception(_("configFileMoveError"));
|
2011-04-17 00:08:09 +00:00
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!tempFile.renameTo(file))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
throw new Exception(_("configFileRenameError"));
|
2011-04-17 00:08:09 +00:00
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-05-02 16:59:25 +00:00
|
|
|
tempFile.delete();
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
|
|
|
private void updateUsersToNewDefaultHome()
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
if (doneFile.getBoolean("updateUsersToNewDefaultHome", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File userdataFolder = new File(ess.getDataFolder(), "userdata");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!userdataFolder.exists() || !userdataFolder.isDirectory())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final File[] userFiles = userdataFolder.listFiles();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
|
|
|
for (File file : userFiles)
|
|
|
|
{
|
|
|
|
if (!file.isFile() || !file.getName().endsWith(".yml"))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final EssentialsConf config = new EssentialsConf(file);
|
2011-05-23 10:59:26 +00:00
|
|
|
try
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-05-23 10:59:26 +00:00
|
|
|
config.load();
|
|
|
|
if (config.hasProperty("home") && !config.hasProperty("home.default"))
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-05-23 10:59:26 +00:00
|
|
|
@SuppressWarnings("unchecked")
|
2011-08-08 12:40:30 +00:00
|
|
|
final List<Object> vals = (List<Object>)config.getProperty("home");
|
|
|
|
if (vals == null)
|
|
|
|
{
|
2011-05-23 10:59:26 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
World world = ess.getServer().getWorlds().get(0);
|
|
|
|
if (vals.size() > 5)
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-05-23 10:59:26 +00:00
|
|
|
world = ess.getServer().getWorld((String)vals.get(5));
|
|
|
|
}
|
|
|
|
if (world != null)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final Location loc = new Location(
|
2011-05-23 10:59:26 +00:00
|
|
|
world,
|
|
|
|
((Number)vals.get(0)).doubleValue(),
|
|
|
|
((Number)vals.get(1)).doubleValue(),
|
|
|
|
((Number)vals.get(2)).doubleValue(),
|
|
|
|
((Number)vals.get(3)).floatValue(),
|
|
|
|
((Number)vals.get(4)).floatValue());
|
|
|
|
|
2011-11-21 01:55:26 +00:00
|
|
|
final String worldName = world.getName().toLowerCase(Locale.ENGLISH);
|
2011-05-23 10:59:26 +00:00
|
|
|
if (worldName != null && !worldName.isEmpty())
|
|
|
|
{
|
|
|
|
config.removeProperty("home");
|
|
|
|
config.setProperty("home.default", worldName);
|
|
|
|
config.setProperty("home.worlds." + worldName, loc);
|
|
|
|
config.save();
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-05-23 10:59:26 +00:00
|
|
|
catch (RuntimeException ex)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
LOGGER.log(Level.INFO, "File: " + file.toString());
|
2011-05-23 10:59:26 +00:00
|
|
|
throw ex;
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
doneFile.setProperty("updateUsersToNewDefaultHome", true);
|
|
|
|
doneFile.save();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
|
2011-08-21 18:02:01 +00:00
|
|
|
private void updateUsersPowerToolsFormat()
|
|
|
|
{
|
|
|
|
if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File userdataFolder = new File(ess.getDataFolder(), "userdata");
|
|
|
|
if (!userdataFolder.exists() || !userdataFolder.isDirectory())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File[] userFiles = userdataFolder.listFiles();
|
|
|
|
|
|
|
|
for (File file : userFiles)
|
|
|
|
{
|
|
|
|
if (!file.isFile() || !file.getName().endsWith(".yml"))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
final EssentialsConf config = new EssentialsConf(file);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
config.load();
|
|
|
|
if (config.hasProperty("powertools"))
|
|
|
|
{
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
|
final Map<Integer, Object> powertools = (Map<Integer, Object>)config.getProperty("powertools");
|
|
|
|
if (powertools == null)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (Map.Entry<Integer, Object> entry : powertools.entrySet())
|
|
|
|
{
|
|
|
|
if (entry.getValue() instanceof String)
|
|
|
|
{
|
|
|
|
List<String> temp = new ArrayList<String>();
|
|
|
|
temp.add((String)entry.getValue());
|
|
|
|
((Map<Integer, Object>)powertools).put(entry.getKey(), temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
config.save();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (RuntimeException ex)
|
|
|
|
{
|
|
|
|
LOGGER.log(Level.INFO, "File: " + file.toString());
|
|
|
|
throw ex;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
doneFile.setProperty("updateUsersPowerToolsFormat", true);
|
|
|
|
doneFile.save();
|
|
|
|
}
|
|
|
|
|
2011-08-23 05:09:34 +00:00
|
|
|
private void updateUsersHomesFormat()
|
|
|
|
{
|
|
|
|
if (doneFile.getBoolean("updateUsersHomesFormat", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File userdataFolder = new File(ess.getDataFolder(), "userdata");
|
|
|
|
if (!userdataFolder.exists() || !userdataFolder.isDirectory())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File[] userFiles = userdataFolder.listFiles();
|
|
|
|
|
|
|
|
for (File file : userFiles)
|
|
|
|
{
|
|
|
|
if (!file.isFile() || !file.getName().endsWith(".yml"))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
final EssentialsConf config = new EssentialsConf(file);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
|
|
|
|
config.load();
|
|
|
|
if (config.hasProperty("home") && config.hasProperty("home.default"))
|
|
|
|
{
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
|
final String defworld = (String)config.getProperty("home.default");
|
2011-09-17 22:49:34 +00:00
|
|
|
final Location defloc = getFakeLocation(config, "home.worlds." + defworld);
|
2011-08-24 02:49:35 +00:00
|
|
|
if (defloc != null)
|
|
|
|
{
|
|
|
|
config.setProperty("homes.home", defloc);
|
2011-09-17 22:49:34 +00:00
|
|
|
}
|
2011-08-23 05:09:34 +00:00
|
|
|
|
|
|
|
List<String> worlds = config.getKeys("home.worlds");
|
|
|
|
Location loc;
|
2011-08-23 14:37:09 +00:00
|
|
|
String worldName;
|
2011-08-23 05:09:34 +00:00
|
|
|
|
|
|
|
if (worlds == null)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (String world : worlds)
|
|
|
|
{
|
|
|
|
if (defworld.equalsIgnoreCase(world))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-08-24 04:18:35 +00:00
|
|
|
loc = getFakeLocation(config, "home.worlds." + world);
|
2011-08-23 05:09:34 +00:00
|
|
|
if (loc == null)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-11-21 01:55:26 +00:00
|
|
|
worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
|
2011-08-23 05:09:34 +00:00
|
|
|
if (worldName != null && !worldName.isEmpty())
|
|
|
|
{
|
|
|
|
config.setProperty("homes." + worldName, loc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
config.removeProperty("home");
|
|
|
|
config.save();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
catch (RuntimeException ex)
|
|
|
|
{
|
|
|
|
LOGGER.log(Level.INFO, "File: " + file.toString());
|
|
|
|
throw ex;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
doneFile.setProperty("updateUsersHomesFormat", true);
|
|
|
|
doneFile.save();
|
|
|
|
}
|
|
|
|
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
private void moveUsersDataToUserdataFolder()
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final File usersFile = new File(ess.getDataFolder(), "users.yml");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!usersFile.exists())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final EssentialsConf usersConfig = new EssentialsConf(usersFile);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
usersConfig.load();
|
|
|
|
for (String username : usersConfig.getKeys(null))
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final User user = new User(new OfflinePlayer(username, ess), ess);
|
|
|
|
final String nickname = usersConfig.getString(username + ".nickname");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
|
|
|
|
{
|
|
|
|
user.setNickname(nickname);
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final List<String> mails = usersConfig.getStringList(username + ".mail", null);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (mails != null && !mails.isEmpty())
|
|
|
|
{
|
|
|
|
user.setMails(mails);
|
|
|
|
}
|
2011-05-01 21:58:38 +00:00
|
|
|
if (!user.hasHome())
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
|
|
|
@SuppressWarnings("unchecked")
|
2011-08-08 12:40:30 +00:00
|
|
|
final List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
|
|
|
|
if (vals != null)
|
|
|
|
{
|
2011-05-01 22:35:26 +00:00
|
|
|
World world = ess.getServer().getWorlds().get(0);
|
|
|
|
if (vals.size() > 5)
|
|
|
|
{
|
2011-05-14 02:02:15 +00:00
|
|
|
world = getFakeWorld((String)vals.get(5));
|
2011-05-01 22:35:26 +00:00
|
|
|
}
|
|
|
|
if (world != null)
|
|
|
|
{
|
2011-08-23 02:42:32 +00:00
|
|
|
user.setHome("home", new Location(world,
|
2011-08-23 05:09:34 +00:00
|
|
|
((Number)vals.get(0)).doubleValue(),
|
|
|
|
((Number)vals.get(1)).doubleValue(),
|
|
|
|
((Number)vals.get(2)).doubleValue(),
|
|
|
|
((Number)vals.get(3)).floatValue(),
|
|
|
|
((Number)vals.get(4)).floatValue()));
|
2011-05-01 22:35:26 +00:00
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-05-01 22:58:54 +00:00
|
|
|
usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private void convertWarps()
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final File warpsFolder = new File(ess.getDataFolder(), "warps");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!warpsFolder.exists())
|
|
|
|
{
|
|
|
|
warpsFolder.mkdirs();
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final File[] listOfFiles = warpsFolder.listFiles();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (listOfFiles.length >= 1)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < listOfFiles.length; i++)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final String filename = listOfFiles[i].getName();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (listOfFiles[i].isFile() && filename.endsWith(".dat"))
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final BufferedReader rx = new BufferedReader(new FileReader(listOfFiles[i]));
|
2011-06-01 10:40:12 +00:00
|
|
|
double x, y, z;
|
|
|
|
float yaw, pitch;
|
|
|
|
String worldName;
|
|
|
|
try
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!rx.ready())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
x = Double.parseDouble(rx.readLine().trim());
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!rx.ready())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
y = Double.parseDouble(rx.readLine().trim());
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!rx.ready())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
z = Double.parseDouble(rx.readLine().trim());
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!rx.ready())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
yaw = Float.parseFloat(rx.readLine().trim());
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!rx.ready())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
pitch = Float.parseFloat(rx.readLine().trim());
|
|
|
|
worldName = rx.readLine();
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
finally
|
|
|
|
{
|
2011-06-01 10:40:12 +00:00
|
|
|
rx.close();
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
World w = null;
|
|
|
|
for (World world : ess.getServer().getWorlds())
|
|
|
|
{
|
|
|
|
if (world.getEnvironment() != World.Environment.NETHER)
|
|
|
|
{
|
|
|
|
w = world;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (worldName != null)
|
|
|
|
{
|
2011-06-01 10:40:12 +00:00
|
|
|
worldName = worldName.trim();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
World w1 = null;
|
2011-05-14 02:02:15 +00:00
|
|
|
w1 = getFakeWorld(worldName);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (w1 != null)
|
|
|
|
{
|
|
|
|
w = w1;
|
|
|
|
}
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final Location loc = new Location(w, x, y, z, yaw, pitch);
|
2011-06-01 10:40:12 +00:00
|
|
|
ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
throw new Exception(_("fileRenameError", filename));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
LOGGER.log(Level.SEVERE, null, ex);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final File warpFile = new File(ess.getDataFolder(), "warps.txt");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (warpFile.exists())
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final BufferedReader rx = new BufferedReader(new FileReader(warpFile));
|
|
|
|
try
|
2011-06-01 10:40:12 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
for (String[] parts = new String[0]; rx.ready(); parts = rx.readLine().split(":"))
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
if (parts.length < 6)
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
final String name = parts[0];
|
|
|
|
final double x = Double.parseDouble(parts[1].trim());
|
|
|
|
final double y = Double.parseDouble(parts[2].trim());
|
|
|
|
final double z = Double.parseDouble(parts[3].trim());
|
|
|
|
final float yaw = Float.parseFloat(parts[4].trim());
|
|
|
|
final float pitch = Float.parseFloat(parts[5].trim());
|
|
|
|
if (name.isEmpty())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
World w = null;
|
|
|
|
for (World world : ess.getServer().getWorlds())
|
|
|
|
{
|
|
|
|
if (world.getEnvironment() != World.Environment.NETHER)
|
|
|
|
{
|
|
|
|
w = world;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
final Location loc = new Location(w, x, y, z, yaw, pitch);
|
|
|
|
ess.getWarps().setWarp(name, loc);
|
|
|
|
if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
throw new Exception(_("fileRenameError", "warps.txt"));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
2011-06-01 10:40:12 +00:00
|
|
|
}
|
|
|
|
finally
|
|
|
|
{
|
|
|
|
rx.close();
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
LOGGER.log(Level.SEVERE, null, ex);
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void sanitizeAllUserFilenames()
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
if (doneFile.getBoolean("sanitizeAllUserFilenames", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File usersFolder = new File(ess.getDataFolder(), "userdata");
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!usersFolder.exists())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final File[] listOfFiles = usersFolder.listFiles();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
for (int i = 0; i < listOfFiles.length; i++)
|
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final String filename = listOfFiles[i].getName();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (sanitizedFilename.equals(filename))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
final File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
|
|
|
|
final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
|
|
|
|
if (!listOfFiles[i].renameTo(tmpFile))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
LOGGER.log(Level.WARNING, _("userdataMoveError", filename, sanitizedFilename));
|
2011-05-01 22:58:54 +00:00
|
|
|
continue;
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
if (newFile.exists())
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
LOGGER.log(Level.WARNING, _("duplicatedUserdata", filename, sanitizedFilename));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
continue;
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
if (!tmpFile.renameTo(newFile))
|
|
|
|
{
|
2011-11-21 01:55:26 +00:00
|
|
|
LOGGER.log(Level.WARNING, _("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
doneFile.setProperty("sanitizeAllUserFilenames", true);
|
|
|
|
doneFile.save();
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
}
|
2011-08-08 12:40:30 +00:00
|
|
|
|
|
|
|
private World getFakeWorld(final String name)
|
2011-05-14 02:02:15 +00:00
|
|
|
{
|
2011-08-08 12:40:30 +00:00
|
|
|
final File bukkitDirectory = ess.getDataFolder().getParentFile().getParentFile();
|
|
|
|
final File worldDirectory = new File(bukkitDirectory, name);
|
2011-05-14 02:02:15 +00:00
|
|
|
if (worldDirectory.exists() && worldDirectory.isDirectory())
|
|
|
|
{
|
|
|
|
return new FakeWorld(worldDirectory.getName(), World.Environment.NORMAL);
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}
|
2011-09-17 22:49:34 +00:00
|
|
|
|
2011-08-24 04:18:35 +00:00
|
|
|
public Location getFakeLocation(EssentialsConf config, String path)
|
|
|
|
{
|
|
|
|
String worldName = config.getString((path != null ? path + "." : "") + "world");
|
|
|
|
if (worldName == null || worldName.isEmpty())
|
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
World world = getFakeWorld(worldName);
|
|
|
|
if (world == null)
|
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
return new Location(world,
|
|
|
|
config.getDouble((path != null ? path + "." : "") + "x", 0),
|
|
|
|
config.getDouble((path != null ? path + "." : "") + "y", 0),
|
|
|
|
config.getDouble((path != null ? path + "." : "") + "z", 0),
|
|
|
|
(float)config.getDouble((path != null ? path + "." : "") + "yaw", 0),
|
|
|
|
(float)config.getDouble((path != null ? path + "." : "") + "pitch", 0));
|
|
|
|
}
|
2011-05-16 08:55:20 +00:00
|
|
|
|
2011-09-17 22:49:34 +00:00
|
|
|
private void deleteOldItemsCsv()
|
|
|
|
{
|
|
|
|
if (doneFile.getBoolean("deleteOldItemsCsv", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File file = new File(ess.getDataFolder(), "items.csv");
|
|
|
|
if (file.exists())
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
final Set<BigInteger> oldconfigs = new HashSet<BigInteger>();
|
|
|
|
oldconfigs.add(new BigInteger("66ec40b09ac167079f558d1099e39f10", 16)); // sep 1
|
|
|
|
oldconfigs.add(new BigInteger("34284de1ead43b0bee2aae85e75c041d", 16)); // crlf
|
|
|
|
oldconfigs.add(new BigInteger("c33bc9b8ee003861611bbc2f48eb6f4f", 16)); // jul 24
|
|
|
|
oldconfigs.add(new BigInteger("6ff17925430735129fc2a02f830c1daa", 16)); // crlf
|
|
|
|
|
|
|
|
MessageDigest digest = ManagedFile.getDigest();
|
|
|
|
final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
|
|
|
|
final DigestInputStream dis = new DigestInputStream(bis, digest);
|
|
|
|
final byte[] buffer = new byte[1024];
|
|
|
|
try
|
|
|
|
{
|
|
|
|
while (dis.read(buffer) != -1)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
finally
|
|
|
|
{
|
|
|
|
dis.close();
|
|
|
|
}
|
|
|
|
|
|
|
|
BigInteger hash = new BigInteger(1, digest.digest());
|
|
|
|
if (oldconfigs.contains(hash) && !file.delete())
|
|
|
|
{
|
|
|
|
throw new IOException("Could not delete file " + file.toString());
|
|
|
|
}
|
|
|
|
doneFile.setProperty("deleteOldItemsCsv", true);
|
|
|
|
doneFile.save();
|
|
|
|
}
|
|
|
|
catch (IOException ex)
|
|
|
|
{
|
|
|
|
Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-06 12:41:29 +00:00
|
|
|
private void updateSpawnsToNewSpawnsConfig()
|
|
|
|
{
|
|
|
|
if (doneFile.getBoolean("updateSpawnsToNewSpawnsConfig", false))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
final File configFile = new File(ess.getDataFolder(), "spawn.yml");
|
|
|
|
if (configFile.exists())
|
|
|
|
{
|
|
|
|
|
|
|
|
final EssentialsConf config = new EssentialsConf(configFile);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
config.load();
|
|
|
|
if (!config.hasProperty("spawns"))
|
|
|
|
{
|
|
|
|
final Spawns spawns = new Spawns();
|
|
|
|
List<String> keys = config.getKeys();
|
|
|
|
for (String group : keys)
|
|
|
|
{
|
|
|
|
Location loc = getFakeLocation(config, group);
|
|
|
|
spawns.getSpawns().put(group.toLowerCase(Locale.ENGLISH), loc);
|
|
|
|
}
|
|
|
|
if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
|
|
|
|
{
|
|
|
|
throw new Exception(_("fileRenameError", "spawn.yml"));
|
|
|
|
}
|
|
|
|
PrintWriter writer = new PrintWriter(configFile);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
new YamlStorageWriter(writer).save(spawns);
|
|
|
|
}
|
|
|
|
finally
|
|
|
|
{
|
|
|
|
writer.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception ex)
|
|
|
|
{
|
|
|
|
Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
|
|
|
|
doneFile.save();
|
|
|
|
}
|
|
|
|
|
2011-06-01 10:40:12 +00:00
|
|
|
public void beforeSettings()
|
2011-05-16 08:55:20 +00:00
|
|
|
{
|
|
|
|
if (!ess.getDataFolder().exists())
|
|
|
|
{
|
|
|
|
ess.getDataFolder().mkdirs();
|
|
|
|
}
|
|
|
|
moveWorthValuesToWorthYml();
|
2011-11-18 03:18:03 +00:00
|
|
|
moveMotdRulesToFile("motd");
|
|
|
|
moveMotdRulesToFile("rules");
|
2011-05-16 08:55:20 +00:00
|
|
|
}
|
|
|
|
|
2011-06-01 10:40:12 +00:00
|
|
|
public void afterSettings()
|
2011-05-16 08:55:20 +00:00
|
|
|
{
|
|
|
|
sanitizeAllUserFilenames();
|
|
|
|
updateUsersToNewDefaultHome();
|
|
|
|
moveUsersDataToUserdataFolder();
|
|
|
|
convertWarps();
|
2011-08-21 18:02:01 +00:00
|
|
|
updateUsersPowerToolsFormat();
|
2011-08-23 05:09:34 +00:00
|
|
|
updateUsersHomesFormat();
|
2011-09-17 22:49:34 +00:00
|
|
|
deleteOldItemsCsv();
|
2011-12-06 12:41:29 +00:00
|
|
|
updateSpawnsToNewSpawnsConfig();
|
2011-05-16 08:55:20 +00:00
|
|
|
}
|
2011-04-16 13:36:09 +00:00
|
|
|
}
|