summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-07-14 13:00:03 +0100
committerKHobbits <rob@khobbits.co.uk>2013-07-14 13:00:03 +0100
commit00463a7899f36b035a8ae735d46b552f87c818a8 (patch)
treed6dfc916784a09410f8800db9248e63b4bd98c4e
parent11f87eccb000b618a320ac5bad5f5f88852f1246 (diff)
downloadEssentials-00463a7899f36b035a8ae735d46b552f87c818a8.tar
Essentials-00463a7899f36b035a8ae735d46b552f87c818a8.tar.gz
Essentials-00463a7899f36b035a8ae735d46b552f87c818a8.tar.lz
Essentials-00463a7899f36b035a8ae735d46b552f87c818a8.tar.xz
Essentials-00463a7899f36b035a8ae735d46b552f87c818a8.zip
Try to restore basic api functionality
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/IEssentials.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/UserData.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandwarp.java2
5 files changed, 6 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 90d9ce4ed..2e2b8eb7d 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -19,7 +19,6 @@ package com.earth2me.essentials;
import net.ess3.api.ISettings;
import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
import static com.earth2me.essentials.I18n._;
import net.ess3.api.Economy;
import net.ess3.api.IJails;
diff --git a/Essentials/src/com/earth2me/essentials/IEssentials.java b/Essentials/src/com/earth2me/essentials/IEssentials.java
index 7e2ad65a4..6c1ba3715 100644
--- a/Essentials/src/com/earth2me/essentials/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/IEssentials.java
@@ -1,12 +1,12 @@
package com.earth2me.essentials;
+import com.earth2me.essentials.api.IItemDb;
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.metrics.Metrics;
import com.earth2me.essentials.perm.PermissionsHandler;
import com.earth2me.essentials.register.payment.Methods;
import java.util.List;
-import net.ess3.api.IItemDb;
-import net.ess3.api.IJails;
-import net.ess3.api.IWarps;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -33,7 +33,7 @@ public interface IEssentials extends Plugin
int broadcastMessage(String message);
- int broadcastMessage(net.ess3.api.IUser sender, String message);
+ int broadcastMessage(IUser sender, String message);
int broadcastMessage(String permission, String message);
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index 090f40ef7..9948a663e 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -1,7 +1,6 @@
package com.earth2me.essentials;
import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
import com.earth2me.essentials.utils.StringUtil;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.NumberUtil;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
index 9e14fa7de..6144c1352 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
@@ -2,8 +2,8 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.utils.StringUtil;
-import net.ess3.api.IWarps;
import com.earth2me.essentials.utils.NumberUtil;
import org.bukkit.Location;
import org.bukkit.Server;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
index 5b88fdb54..94e63b7e7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
@@ -4,8 +4,8 @@ import static com.earth2me.essentials.I18n._;
import net.ess3.api.IUser;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IWarps;
import com.earth2me.essentials.utils.StringUtil;
-import net.ess3.api.IWarps;
import com.earth2me.essentials.utils.NumberUtil;
import java.math.BigDecimal;
import java.util.ArrayList;