summaryrefslogtreecommitdiffstats
path: root/Essentials2Compat/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials2Compat/src/com')
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/Essentials.java1
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/ISettings.java3
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/Settings.java2
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java2
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/UserData.java4
5 files changed, 5 insertions, 7 deletions
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
index 4d61e6b3d..c22730f3d 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
@@ -18,6 +18,7 @@ public class Essentials extends JavaPlugin
Bukkit.getLogger().info("You can remove this compatibility plugin, when all plugins are updated to Essentials-3");
//TODO: Update files to new 3.0 format
//TODO: Move Eco Api here
+ //TODO: write update methods for itemmeta
IPlugin plugin = (IPlugin)getServer().getPluginManager().getPlugin("Essentials-3");
ess = plugin.getEssentials();
updateSettings();
diff --git a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
index db4af46fa..93fbd20b3 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/ISettings.java
@@ -27,7 +27,6 @@ public interface ISettings
int getChatRadius();
-
double getCommandCost(String label);
String getCurrencySymbol();
@@ -68,7 +67,6 @@ public interface ISettings
int getHomeLimit(String set);
-
boolean getSortListByGroups();
int getSpawnMobLimit();
@@ -81,7 +79,6 @@ public interface ISettings
boolean hidePermissionlessHelp();
-
boolean isCommandDisabled(String label);
boolean isCommandOverridden(String name);
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
index 221d94414..a5f454916 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
@@ -321,7 +321,7 @@ public final class Settings implements ISettings
private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
- /*@Override
+ /*@Override //TODO: implement this
public MessageFormat getChatFormat(String group)
{
MessageFormat mFormat = chatFormats.get(group);
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
index c53400efd..040fdd875 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
@@ -29,7 +29,7 @@ class UpdateUserFiles
name = getRealName(name);
if (name.equals(BROKENNAME))
{
- ess.getLogger().warning("Could not convert player " + origName);
+ ess.getLogger().log(Level.WARNING, "Could not convert player {0}", origName);
continue;
}
}
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
index 7052ffbca..fdd16c495 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
@@ -619,7 +619,7 @@ public class UserData
return lastLoginAddress;
}
- private void _setLastLoginAddress(String address) //unused method
+ private void _setLastLoginAddress(String address) //TODO: unused method?
{
lastLoginAddress = address;
config.setProperty("ipAddress", address);
@@ -651,7 +651,7 @@ public class UserData
return ret;
}
- private boolean newplayer; //unused variable
+ private boolean newplayer; //TODO: unused variable?
private String geolocation;
private String _getGeoLocation()