change static interface...

Signed-off-by: 502647092 <jtb1@163.com>

src/main/java/com/bekvon/bukkit/residence/Residence.java

@@ -1,147 +0,0 @@
-/*
- * To change this template, choose Tools | Templates and open the template in
- * the editor.
- */
-package com.bekvon.bukkit.residence;
-
-import java.io.File;
-import java.util.Map;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.bekvon.bukkit.residence.chat.ChatManager;
-import com.bekvon.bukkit.residence.economy.EconomyInterface;
-import com.bekvon.bukkit.residence.economy.TransactionManager;
-import com.bekvon.bukkit.residence.economy.rent.RentManager;
-import com.bekvon.bukkit.residence.itemlist.WorldItemManager;
-import com.bekvon.bukkit.residence.manager.ConfigManager;
-import com.bekvon.bukkit.residence.manager.EntityManager;
-import com.bekvon.bukkit.residence.permissions.PermissionManager;
-import com.bekvon.bukkit.residence.protection.ClaimedResidence;
-import com.bekvon.bukkit.residence.protection.FlagPermissions;
-import com.bekvon.bukkit.residence.protection.LeaseManager;
-import com.bekvon.bukkit.residence.protection.PermissionListManager;
-import com.bekvon.bukkit.residence.protection.ResidenceManager;
-import com.bekvon.bukkit.residence.protection.WorldFlagManager;
-import com.bekvon.bukkit.residence.selection.SelectionManager;
-import com.bekvon.bukkit.residence.text.Language;
-import com.bekvon.bukkit.residence.text.help.HelpEntry;
-
-public class Residence extends JavaPlugin {
-	static ResidenceMain plugin;
-
-	public static ChatManager getChatManager() {
-		return plugin.chatmanager;
-	}
-
-	public static ConfigManager getConfigManager() {
-		return plugin.cmanager;
-	}
-
-	public static File getDataLocation() {
-		return plugin.dataFolder;
-	}
-
-	public static Map<String, String> getDeleteConfirm() {
-		return plugin.deleteConfirm;
-	}
-
-	public static EconomyInterface getEconomyManager() {
-		return plugin.economy;
-	}
-
-	public static EntityManager getEntityManager() {
-		return plugin.entitymanager;
-	}
-
-	public static HelpEntry getHelppages() {
-		return plugin.helppages;
-	}
-
-	public static WorldItemManager getItemManager() {
-		return plugin.imanager;
-	}
-
-	public static Language getLanguage() {
-		if (plugin.language == null) {
-			plugin.language = new Language();
-		}
-		return plugin.language;
-	}
-
-	public static LeaseManager getLeaseManager() {
-		return plugin.leasemanager;
-	}
-
-	public static PermissionListManager getPermissionListManager() {
-		return plugin.pmanager;
-	}
-
-	public static PermissionManager getPermissionManager() {
-		return plugin.gmanager;
-	}
-
-	public static FlagPermissions getPermsByLoc(final Location loc) {
-		final ClaimedResidence res = plugin.rmanager.getByLoc(loc);
-		if (res != null) {
-			return res.getPermissions();
-		} else {
-			return plugin.wmanager.getPerms(loc.getWorld().getName());
-		}
-	}
-
-	public static FlagPermissions getPermsByLocForPlayer(final Location loc, final Player player) {
-		final ClaimedResidence res = plugin.rmanager.getByLoc(loc);
-		if (res != null) {
-			return res.getPermissions();
-		} else if (player != null) {
-			return plugin.wmanager.getPerms(player);
-		} else {
-			return plugin.wmanager.getPerms(loc.getWorld().getName());
-		}
-	}
-
-	public static RentManager getRentManager() {
-		return plugin.rentmanager;
-	}
-
-	public static ResidenceManager getResidenceManager() {
-		return plugin.rmanager;
-	}
-
-	public static SelectionManager getSelectionManager() {
-		return plugin.smanager;
-	}
-
-	public static TransactionManager getTransactionManager() {
-		return plugin.tmanager;
-	}
-
-	public static WorldFlagManager getWorldFlags() {
-		return plugin.wmanager;
-	}
-
-	public static void init(final ResidenceMain instance) {
-		plugin = instance;
-	}
-
-	public static boolean isResAdminOn(final Player player) {
-		if (plugin.resadminToggle.contains(player.getName())) {
-			return true;
-		}
-		return false;
-	}
-
-	public static boolean isResAdminOn(final String player) {
-		if (plugin.resadminToggle.contains(player.toLowerCase())) {
-			return true;
-		}
-		return false;
-	}
-
-	public static boolean isUseWorldEdit() {
-		return plugin.useWorldEdit;
-	}
-}

src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java

@@ -519,12 +519,6 @@ public class ResidenceMain extends JavaPlugin {
 			ex.printStackTrace();
 		}
 		backup = new DataBackup(this);
-		try {
-			Residence.init(this);
-		} catch (final Exception e) {
-			this.getLogger().warning("领地插件旧接口载入失败!");
-			this.getLogger().warning("可能会导致部分依赖于此插件的插件无法运行!");
-		}
 		new VersionChecker(this);
 	}
 
@@ -772,4 +766,115 @@ public class ResidenceMain extends JavaPlugin {
 			this.getLogger().info("保存默认 " + lang + " 语言文件...");
 		}
 	}
+
+	public static class Residence extends JavaPlugin {
+		public static ChatManager getChatManager() {
+			return instance.chatmanager;
+		}
+
+		public static ConfigManager getConfigManager() {
+			return instance.cmanager;
+		}
+
+		public static File getDataLocation() {
+			return instance.dataFolder;
+		}
+
+		public static Map<String, String> getDeleteConfirm() {
+			return instance.deleteConfirm;
+		}
+
+		public static EconomyInterface getEconomyManager() {
+			return instance.economy;
+		}
+
+		public static EntityManager getEntityManager() {
+			return instance.entitymanager;
+		}
+
+		public static HelpEntry getHelppages() {
+			return instance.helppages;
+		}
+
+		public static WorldItemManager getItemManager() {
+			return instance.imanager;
+		}
+
+		public static Language getLanguage() {
+			if (instance.language == null) {
+				instance.language = new Language();
+			}
+			return instance.language;
+		}
+
+		public static LeaseManager getLeaseManager() {
+			return instance.leasemanager;
+		}
+
+		public static PermissionListManager getPermissionListManager() {
+			return instance.pmanager;
+		}
+
+		public static PermissionManager getPermissionManager() {
+			return instance.gmanager;
+		}
+
+		public static FlagPermissions getPermsByLoc(final Location loc) {
+			final ClaimedResidence res = instance.rmanager.getByLoc(loc);
+			if (res != null) {
+				return res.getPermissions();
+			} else {
+				return instance.wmanager.getPerms(loc.getWorld().getName());
+			}
+		}
+
+		public static FlagPermissions getPermsByLocForPlayer(final Location loc, final Player player) {
+			final ClaimedResidence res = instance.rmanager.getByLoc(loc);
+			if (res != null) {
+				return res.getPermissions();
+			} else if (player != null) {
+				return instance.wmanager.getPerms(player);
+			} else {
+				return instance.wmanager.getPerms(loc.getWorld().getName());
+			}
+		}
+
+		public static RentManager getRentManager() {
+			return instance.rentmanager;
+		}
+
+		public static ResidenceManager getResidenceManager() {
+			return instance.rmanager;
+		}
+
+		public static SelectionManager getSelectionManager() {
+			return instance.smanager;
+		}
+
+		public static TransactionManager getTransactionManager() {
+			return instance.tmanager;
+		}
+
+		public static WorldFlagManager getWorldFlags() {
+			return instance.wmanager;
+		}
+
+		public static boolean isResAdminOn(final Player player) {
+			if (instance.resadminToggle.contains(player.getName())) {
+				return true;
+			}
+			return false;
+		}
+
+		public static boolean isResAdminOn(final String player) {
+			if (instance.resadminToggle.contains(player.toLowerCase())) {
+				return true;
+			}
+			return false;
+		}
+
+		public static boolean isUseWorldEdit() {
+			return instance.useWorldEdit;
+		}
+	}
 }