diff --git a/pom.xml b/pom.xml index c8c5605..69b42c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.citycraft Residence - 2.8.0.7 + 2.8.0.8 Residence 重制版本的领地插件 - 喵♂呜 @@ -55,7 +55,7 @@ http://ci.citycraft.cn:8080 - 修复BaseCommand基类错误... + &c修改包名称 &a保留原有API接口... UTF-8 diff --git a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java b/src/main/java/cn/citycraft/Residence/ResidenceMain.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java rename to src/main/java/cn/citycraft/Residence/ResidenceMain.java index 9870715..f6929ff 100644 --- a/src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java +++ b/src/main/java/cn/citycraft/Residence/ResidenceMain.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in * the editor. */ -package com.bekvon.bukkit.residence; +package cn.citycraft.Residence; import java.io.File; import java.io.FileNotFoundException; @@ -32,51 +32,52 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import com.bekvon.bukkit.residence.chat.ChatManager; -import com.bekvon.bukkit.residence.commandmain.CommandRc; -import com.bekvon.bukkit.residence.commandmain.CommandRes; -import com.bekvon.bukkit.residence.commandmain.CommandResLoad; -import com.bekvon.bukkit.residence.commandmain.CommandResReload; -import com.bekvon.bukkit.residence.commandmain.CommandResWorld; -import com.bekvon.bukkit.residence.economy.EconomyInterface; -import com.bekvon.bukkit.residence.economy.EssentialsEcoAdapter; -import com.bekvon.bukkit.residence.economy.TransactionManager; -import com.bekvon.bukkit.residence.economy.rent.RentManager; +import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.event.ResidenceCommandEvent; -import com.bekvon.bukkit.residence.itemlist.WorldItemManager; -import com.bekvon.bukkit.residence.listeners.ResidenceBlockListener; -import com.bekvon.bukkit.residence.listeners.ResidenceEntityListener; -import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener; -import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener_1_8; -import com.bekvon.bukkit.residence.listeners.bugfix.ResidenceBugFix; -import com.bekvon.bukkit.residence.manager.ConfigManager; -import com.bekvon.bukkit.residence.manager.EntityManager; -import com.bekvon.bukkit.residence.manager.FlagManager; -import com.bekvon.bukkit.residence.permissions.PermissionManager; -import com.bekvon.bukkit.residence.persistance.YMLSaveHelper; -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.runnable.AutoSaveTask; -import com.bekvon.bukkit.residence.runnable.HealTask; -import com.bekvon.bukkit.residence.runnable.LeaseTask; -import com.bekvon.bukkit.residence.runnable.RentTask; -import com.bekvon.bukkit.residence.runnable.TaskManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.selection.WorldEditSelectionManager; -import com.bekvon.bukkit.residence.text.Language; -import com.bekvon.bukkit.residence.text.help.HelpEntry; -import com.bekvon.bukkit.residence.text.help.InformationPager; -import com.bekvon.bukkit.residence.utils.DataBackup; -import com.bekvon.bukkit.residence.vaultinterface.ResidenceVaultAdapter; import com.earth2me.essentials.Essentials; import cn.citycraft.PluginHelper.commands.HandlerMainCommand; import cn.citycraft.PluginHelper.config.FileConfig; import cn.citycraft.PluginHelper.utils.VersionChecker; +import cn.citycraft.Residence.chat.ChatManager; +import cn.citycraft.Residence.commandmain.CommandRc; +import cn.citycraft.Residence.commandmain.CommandRes; +import cn.citycraft.Residence.commandmain.CommandResLoad; +import cn.citycraft.Residence.commandmain.CommandResReload; +import cn.citycraft.Residence.commandmain.CommandResWorld; +import cn.citycraft.Residence.economy.EconomyInterface; +import cn.citycraft.Residence.economy.EssentialsEcoAdapter; +import cn.citycraft.Residence.economy.TransactionManager; +import cn.citycraft.Residence.economy.rent.RentManager; +import cn.citycraft.Residence.itemlist.WorldItemManager; +import cn.citycraft.Residence.listeners.ResidenceBlockListener; +import cn.citycraft.Residence.listeners.ResidenceEntityListener; +import cn.citycraft.Residence.listeners.ResidencePlayerListener; +import cn.citycraft.Residence.listeners.ResidencePlayerListener_1_8; +import cn.citycraft.Residence.listeners.bugfix.ResidenceBugFix; +import cn.citycraft.Residence.manager.ConfigManager; +import cn.citycraft.Residence.manager.EntityManager; +import cn.citycraft.Residence.manager.FlagManager; +import cn.citycraft.Residence.permissions.PermissionManager; +import cn.citycraft.Residence.persistance.YMLSaveHelper; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.protection.LeaseManager; +import cn.citycraft.Residence.protection.PermissionListManager; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.protection.WorldFlagManager; +import cn.citycraft.Residence.runnable.AutoSaveTask; +import cn.citycraft.Residence.runnable.HealTask; +import cn.citycraft.Residence.runnable.LeaseTask; +import cn.citycraft.Residence.runnable.RentTask; +import cn.citycraft.Residence.runnable.TaskManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.selection.WorldEditSelectionManager; +import cn.citycraft.Residence.text.Language; +import cn.citycraft.Residence.text.help.HelpEntry; +import cn.citycraft.Residence.text.help.InformationPager; +import cn.citycraft.Residence.utils.DataBackup; +import cn.citycraft.Residence.vaultinterface.ResidenceVaultAdapter; /** * @@ -91,10 +92,10 @@ public class ResidenceMain extends JavaPlugin { public final static String[] validLanguages = { "English", "Chinese" }; public final static Pattern VER_REGEX = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); protected static ResidenceMain instance; + private ConfigManager cmanager; protected DataBackup backup; protected ResidenceBlockListener blistener; protected ChatManager chatmanager; - protected ConfigManager cmanager; protected FileConfig config; protected File dataFolder; protected Map deleteConfirm; @@ -228,6 +229,10 @@ public class ResidenceMain extends JavaPlugin { return rentmanager; } + public List getResadminToggle() { + return resadminToggle; + } + public ResidenceManager getResidenceManager() { return rmanager; } @@ -374,7 +379,7 @@ public class ResidenceMain extends JavaPlugin { if (!dataFolder.isDirectory()) { dataFolder.mkdirs(); } - cmanager = new ConfigManager(this); + cmanager = (new ConfigManager(this)); final String multiworld = cmanager.getMultiworldPlugin(); if (multiworld != null) { final Plugin plugin = this.getServer().getPluginManager().getPlugin(multiworld); @@ -566,7 +571,7 @@ public class ResidenceMain extends JavaPlugin { @Override public void saveConfig() { config.save(); - }; + } public void saveYml() throws IOException { final File saveFolder = new File(dataFolder, "Save"); @@ -673,6 +678,10 @@ public class ResidenceMain extends JavaPlugin { if (cmanager.showIntervalMessages()) { this.getLogger().info(" - 保存插件数据..."); } + }; + + public void setLanguage(final Language language) { + this.language = language; } public void turnResAdminOn(final Player player) { diff --git a/src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java b/src/main/java/cn/citycraft/Residence/chat/ChatChannel.java similarity index 95% rename from src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java rename to src/main/java/cn/citycraft/Residence/chat/ChatChannel.java index b3eb530..3f346a5 100644 --- a/src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java +++ b/src/main/java/cn/citycraft/Residence/chat/ChatChannel.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.chat; +package cn.citycraft.Residence.chat; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,10 @@ import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import com.bekvon.bukkit.residence.ResidenceMain; import com.bekvon.bukkit.residence.event.ResidenceChatEvent; +import cn.citycraft.Residence.ResidenceMain; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java b/src/main/java/cn/citycraft/Residence/chat/ChatManager.java similarity index 92% rename from src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java rename to src/main/java/cn/citycraft/Residence/chat/ChatManager.java index 59cdeab..837a3ad 100644 --- a/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java +++ b/src/main/java/cn/citycraft/Residence/chat/ChatManager.java @@ -3,12 +3,12 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.chat; +package cn.citycraft.Residence.chat; import java.util.HashMap; import java.util.Map; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRc.java b/src/main/java/cn/citycraft/Residence/commandmain/CommandRc.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRc.java rename to src/main/java/cn/citycraft/Residence/commandmain/CommandRc.java index b0f4536..2727221 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRc.java +++ b/src/main/java/cn/citycraft/Residence/commandmain/CommandRc.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandmain; +package cn.citycraft.Residence.commandmain; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,10 +6,9 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.chat.ChatChannel; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.chat.ChatChannel; public class CommandRc extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRes.java b/src/main/java/cn/citycraft/Residence/commandmain/CommandRes.java similarity index 63% rename from src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRes.java rename to src/main/java/cn/citycraft/Residence/commandmain/CommandRes.java index 286eb6b..c537bc3 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRes.java +++ b/src/main/java/cn/citycraft/Residence/commandmain/CommandRes.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandmain; +package cn.citycraft.Residence.commandmain; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,53 +6,52 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.commandsub.CommandArea; -import com.bekvon.bukkit.residence.commandsub.CommandBank; -import com.bekvon.bukkit.residence.commandsub.CommandCheck; -import com.bekvon.bukkit.residence.commandsub.CommandCheckSelf; -import com.bekvon.bukkit.residence.commandsub.CommandClearFlags; -import com.bekvon.bukkit.residence.commandsub.CommandCompass; -import com.bekvon.bukkit.residence.commandsub.CommandConfirm; -import com.bekvon.bukkit.residence.commandsub.CommandCreate; -import com.bekvon.bukkit.residence.commandsub.CommandCurrent; -import com.bekvon.bukkit.residence.commandsub.CommandDefault; -import com.bekvon.bukkit.residence.commandsub.CommandGive; -import com.bekvon.bukkit.residence.commandsub.CommandGset; -import com.bekvon.bukkit.residence.commandsub.CommandInfo; -import com.bekvon.bukkit.residence.commandsub.CommandKick; -import com.bekvon.bukkit.residence.commandsub.CommandLease; -import com.bekvon.bukkit.residence.commandsub.CommandLimits; -import com.bekvon.bukkit.residence.commandsub.CommandList; -import com.bekvon.bukkit.residence.commandsub.CommandListAll; -import com.bekvon.bukkit.residence.commandsub.CommandListAllHidden; -import com.bekvon.bukkit.residence.commandsub.CommandListHidden; -import com.bekvon.bukkit.residence.commandsub.CommandLists; -import com.bekvon.bukkit.residence.commandsub.CommandLset; -import com.bekvon.bukkit.residence.commandsub.CommandMarket; -import com.bekvon.bukkit.residence.commandsub.CommandMaterial; -import com.bekvon.bukkit.residence.commandsub.CommandMessage; -import com.bekvon.bukkit.residence.commandsub.CommandMirror; -import com.bekvon.bukkit.residence.commandsub.CommandPset; -import com.bekvon.bukkit.residence.commandsub.CommandRemove; -import com.bekvon.bukkit.residence.commandsub.CommandRemoveAll; -import com.bekvon.bukkit.residence.commandsub.CommandRename; -import com.bekvon.bukkit.residence.commandsub.CommandRenameArea; -import com.bekvon.bukkit.residence.commandsub.CommandSelect; -import com.bekvon.bukkit.residence.commandsub.CommandServer; -import com.bekvon.bukkit.residence.commandsub.CommandSet; -import com.bekvon.bukkit.residence.commandsub.CommandSetOwner; -import com.bekvon.bukkit.residence.commandsub.CommandSubList; -import com.bekvon.bukkit.residence.commandsub.CommandSubZone; -import com.bekvon.bukkit.residence.commandsub.CommandTool; -import com.bekvon.bukkit.residence.commandsub.CommandTp; -import com.bekvon.bukkit.residence.commandsub.CommandTpSet; -import com.bekvon.bukkit.residence.commandsub.CommandUnStuck; -import com.bekvon.bukkit.residence.commandsub.CommandVersion; - import cn.citycraft.PluginHelper.commands.BaseCommand; import cn.citycraft.PluginHelper.commands.DefaultCommand; import cn.citycraft.PluginHelper.commands.HandlerSubCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.commandsub.CommandArea; +import cn.citycraft.Residence.commandsub.CommandBank; +import cn.citycraft.Residence.commandsub.CommandCheck; +import cn.citycraft.Residence.commandsub.CommandCheckSelf; +import cn.citycraft.Residence.commandsub.CommandClearFlags; +import cn.citycraft.Residence.commandsub.CommandCompass; +import cn.citycraft.Residence.commandsub.CommandConfirm; +import cn.citycraft.Residence.commandsub.CommandCreate; +import cn.citycraft.Residence.commandsub.CommandCurrent; +import cn.citycraft.Residence.commandsub.CommandDefault; +import cn.citycraft.Residence.commandsub.CommandGive; +import cn.citycraft.Residence.commandsub.CommandGset; +import cn.citycraft.Residence.commandsub.CommandInfo; +import cn.citycraft.Residence.commandsub.CommandKick; +import cn.citycraft.Residence.commandsub.CommandLease; +import cn.citycraft.Residence.commandsub.CommandLimits; +import cn.citycraft.Residence.commandsub.CommandList; +import cn.citycraft.Residence.commandsub.CommandListAll; +import cn.citycraft.Residence.commandsub.CommandListAllHidden; +import cn.citycraft.Residence.commandsub.CommandListHidden; +import cn.citycraft.Residence.commandsub.CommandLists; +import cn.citycraft.Residence.commandsub.CommandLset; +import cn.citycraft.Residence.commandsub.CommandMarket; +import cn.citycraft.Residence.commandsub.CommandMaterial; +import cn.citycraft.Residence.commandsub.CommandMessage; +import cn.citycraft.Residence.commandsub.CommandMirror; +import cn.citycraft.Residence.commandsub.CommandPset; +import cn.citycraft.Residence.commandsub.CommandRemove; +import cn.citycraft.Residence.commandsub.CommandRemoveAll; +import cn.citycraft.Residence.commandsub.CommandRename; +import cn.citycraft.Residence.commandsub.CommandRenameArea; +import cn.citycraft.Residence.commandsub.CommandSelect; +import cn.citycraft.Residence.commandsub.CommandServer; +import cn.citycraft.Residence.commandsub.CommandSet; +import cn.citycraft.Residence.commandsub.CommandSetOwner; +import cn.citycraft.Residence.commandsub.CommandSubList; +import cn.citycraft.Residence.commandsub.CommandSubZone; +import cn.citycraft.Residence.commandsub.CommandTool; +import cn.citycraft.Residence.commandsub.CommandTp; +import cn.citycraft.Residence.commandsub.CommandTpSet; +import cn.citycraft.Residence.commandsub.CommandUnStuck; +import cn.citycraft.Residence.commandsub.CommandVersion; public class CommandRes extends BaseCommand implements DefaultCommand { HandlerSubCommand hdsubcmd; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResLoad.java b/src/main/java/cn/citycraft/Residence/commandmain/CommandResLoad.java similarity index 89% rename from src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResLoad.java rename to src/main/java/cn/citycraft/Residence/commandmain/CommandResLoad.java index 7dd71e9..f75ea00 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResLoad.java +++ b/src/main/java/cn/citycraft/Residence/commandmain/CommandResLoad.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandmain; +package cn.citycraft.Residence.commandmain; import java.util.logging.Level; import java.util.logging.Logger; @@ -9,9 +9,8 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; public class CommandResLoad extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResReload.java b/src/main/java/cn/citycraft/Residence/commandmain/CommandResReload.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResReload.java rename to src/main/java/cn/citycraft/Residence/commandmain/CommandResReload.java index d8f6cf5..044d870 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResReload.java +++ b/src/main/java/cn/citycraft/Residence/commandmain/CommandResReload.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandmain; +package cn.citycraft.Residence.commandmain; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,9 +6,8 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; public class CommandResReload extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResWorld.java b/src/main/java/cn/citycraft/Residence/commandmain/CommandResWorld.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResWorld.java rename to src/main/java/cn/citycraft/Residence/commandmain/CommandResWorld.java index 386d578..0ccac0f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResWorld.java +++ b/src/main/java/cn/citycraft/Residence/commandmain/CommandResWorld.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandmain; +package cn.citycraft.Residence.commandmain; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,9 +6,8 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; -import com.bekvon.bukkit.residence.ResidenceMain; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; public class CommandResWorld extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java similarity index 84% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java index 59e30b6..48a233e 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -7,15 +7,15 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.CuboidArea; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.text.Language; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.CuboidArea; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; public class CommandArea extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java index db294cc..ce31840 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandBank extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java similarity index 84% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java index cb4a067..bc007dd 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandCheck extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheckSelf.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java similarity index 83% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheckSelf.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java index 8eff7de..d348d1c 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheckSelf.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.FlagPermissions; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.FlagPermissions; public class CommandCheckSelf extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java similarity index 79% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java index 92300ef..7c66695 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandClearFlags extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java index 20424e7..6626a54 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -7,11 +7,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandCompass extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandConfirm.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java similarity index 83% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandConfirm.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java index ea1e689..c695f0d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandConfirm.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import java.util.Map; @@ -8,11 +8,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandConfirm extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java index 4b7764a..59b5709 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,13 +6,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.text.Language; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; public class CommandCreate extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCurrent.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCurrent.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java index 085ee2e..317eaed 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCurrent.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,11 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandCurrent extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java similarity index 77% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java index dfc6058..f7324b0 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java @@ -1,15 +1,14 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandDefault extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java similarity index 81% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java index fc687b0..d4fcf7e 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandGive extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java index d7e0f01..5d8c38c 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandGset extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandInfo.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandInfo.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java index 6ba389b..a680cd1 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandInfo.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,11 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandInfo extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandKick.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandKick.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java index 23e5787..81f4fc1 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandKick.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -7,13 +7,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandKick extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java similarity index 88% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java index ae39a5b..70e8a70 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,13 +6,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.LeaseManager; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.LeaseManager; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandLease extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLimits.java similarity index 78% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandLimits.java index fca2549..c7f893d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLimits.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionManager; public class CommandLimits extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java similarity index 84% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandList.java index 29d07de..bc25fd6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandList extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java similarity index 81% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java index 0e9b3e8..586a812 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandListAll extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAllHidden.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java similarity index 81% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAllHidden.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java index 6dc6728..6c09a49 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAllHidden.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,11 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandListAllHidden extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java index dc58581..f1c5ac0 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,11 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandListHidden extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLists.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java similarity index 85% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLists.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java index 632dc27..872d4a5 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLists.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.FlagPermissions; -import com.bekvon.bukkit.residence.protection.PermissionListManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.protection.PermissionListManager; +import cn.citycraft.Residence.text.Language; public class CommandLists extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java similarity index 84% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java index 13d89c6..e58aaae 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -7,12 +7,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandLset extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java similarity index 89% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java index bd41a84..c2f5557 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,16 +6,15 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.economy.TransactionManager; -import com.bekvon.bukkit.residence.economy.rent.RentManager; -import com.bekvon.bukkit.residence.manager.ConfigManager; -import com.bekvon.bukkit.residence.permissions.PermissionManager; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.economy.TransactionManager; +import cn.citycraft.Residence.economy.rent.RentManager; +import cn.citycraft.Residence.manager.ConfigManager; +import cn.citycraft.Residence.permissions.PermissionManager; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; public class CommandMarket extends BaseCommand { ConfigManager cmanager; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMaterial.java similarity index 85% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandMaterial.java index 016c0b9..0069bf6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMaterial.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -7,10 +7,9 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.text.Language; public class CommandMaterial extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMessage.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMessage.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java index 7ef797e..f79c0f7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMessage.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,13 +6,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; import cn.citycraft.PluginHelper.utils.StringUtil; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandMessage extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java index 7eaf392..6bce187 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandMirror extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java similarity index 86% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java index 470f220..07f09b8 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandPset extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemove.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java similarity index 90% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemove.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java index 45d28fc..9cfce78 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemove.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import java.util.Map; @@ -9,12 +9,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandRemove extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemoveAll.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemoveAll.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java index 7cab51d..aff05c7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemoveAll.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,11 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandRemoveAll extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java index 94c0222..418f289 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java @@ -1,14 +1,13 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ResidenceManager; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ResidenceManager; public class CommandRename extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java similarity index 77% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java index fa3732f..72ebba6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandRenameArea extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java similarity index 88% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java index 89d4874..cff9f36 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import java.util.logging.Level; import java.util.logging.Logger; @@ -10,15 +10,14 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.CuboidArea; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.CuboidArea; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; public class CommandSelect extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java similarity index 80% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java index d967ea3..e9c5eb1 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandServer extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java similarity index 81% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java index bbda4cc..7a437fd 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandSet extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSetOwner.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java similarity index 83% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSetOwner.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java index ddbaddc..aba04db 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSetOwner.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java @@ -1,16 +1,15 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandSetOwner extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubList.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java similarity index 79% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubList.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java index 9bceae5..9a65ad6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubList.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandSubList extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java similarity index 83% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java index 2e4c4cf..70768cb 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -7,14 +7,14 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.selection.SelectionManager; -import com.bekvon.bukkit.residence.text.Language; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; public class CommandSubZone extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandTool.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandTool.java index 5c02138..adcff77 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandTool.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -7,11 +7,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.manager.ConfigManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.manager.ConfigManager; +import cn.citycraft.Residence.text.Language; public class CommandTool extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java similarity index 76% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java index 517301b..3014963 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandTp extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTpSet.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java similarity index 76% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTpSet.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java index 7a9f04f..44cac25 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTpSet.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,12 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandTpSet extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandUnStuck.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java similarity index 74% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandUnStuck.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java index 571dd8e..f2362d9 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandUnStuck.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,14 +6,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.permissions.PermissionManager; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.ResidenceManager; -import com.bekvon.bukkit.residence.text.Language; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.permissions.PermissionManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.text.Language; public class CommandUnStuck extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandVersion.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandVersion.java similarity index 92% rename from src/main/java/com/bekvon/bukkit/residence/commandsub/CommandVersion.java rename to src/main/java/cn/citycraft/Residence/commandsub/CommandVersion.java index 3ff87fb..1a50b27 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandVersion.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandVersion.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.commandsub; +package cn.citycraft.Residence.commandsub; import java.util.List; @@ -7,9 +7,8 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; -import com.bekvon.bukkit.residence.ResidenceMain; - import cn.citycraft.PluginHelper.commands.BaseCommand; +import cn.citycraft.Residence.ResidenceMain; public class CommandVersion extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java b/src/main/java/cn/citycraft/Residence/economy/EconomyInterface.java similarity index 89% rename from src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java rename to src/main/java/cn/citycraft/Residence/economy/EconomyInterface.java index 9f4a61b..0a97f73 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java +++ b/src/main/java/cn/citycraft/Residence/economy/EconomyInterface.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.economy; +package cn.citycraft.Residence.economy; public interface EconomyInterface { public double getBalance(String playerName); diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java b/src/main/java/cn/citycraft/Residence/economy/EssentialsEcoAdapter.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java rename to src/main/java/cn/citycraft/Residence/economy/EssentialsEcoAdapter.java index c8798a6..96efbf3 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java +++ b/src/main/java/cn/citycraft/Residence/economy/EssentialsEcoAdapter.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy; +package cn.citycraft.Residence.economy; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.api.Economy; diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java b/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java similarity index 94% rename from src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java rename to src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java index 4b4f7a1..f50fdca 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java +++ b/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java @@ -3,13 +3,13 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy; +package cn.citycraft.Residence.economy; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java b/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java similarity index 96% rename from src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java rename to src/main/java/cn/citycraft/Residence/economy/TransactionManager.java index 156cabf..2eab47e 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java +++ b/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy; +package cn.citycraft.Residence.economy; import java.util.Collections; import java.util.Date; @@ -15,12 +15,12 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.permissions.PermissionManager; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.CuboidArea; -import com.bekvon.bukkit.residence.protection.ResidenceManager; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.permissions.PermissionManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.CuboidArea; +import cn.citycraft.Residence.protection.ResidenceManager; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java b/src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java rename to src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java index 8ca0dea..8389c9d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java +++ b/src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy.rent; +package cn.citycraft.Residence.economy.rent; import java.util.Date; import java.util.HashMap; @@ -16,12 +16,13 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import com.bekvon.bukkit.residence.ResidenceMain; import com.bekvon.bukkit.residence.event.ResidenceRentEvent; import com.bekvon.bukkit.residence.event.ResidenceRentEvent.RentEventType; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions.FlagState; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java b/src/main/java/cn/citycraft/Residence/economy/rent/RentableLand.java similarity index 94% rename from src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java rename to src/main/java/cn/citycraft/Residence/economy/rent/RentableLand.java index 374d347..b217d5d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java +++ b/src/main/java/cn/citycraft/Residence/economy/rent/RentableLand.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy.rent; +package cn.citycraft.Residence.economy.rent; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java b/src/main/java/cn/citycraft/Residence/economy/rent/RentedLand.java similarity index 95% rename from src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java rename to src/main/java/cn/citycraft/Residence/economy/rent/RentedLand.java index 021391c..8852c94 100644 --- a/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java +++ b/src/main/java/cn/citycraft/Residence/economy/rent/RentedLand.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.economy.rent; +package cn.citycraft.Residence.economy.rent; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java b/src/main/java/cn/citycraft/Residence/itemlist/ItemList.java similarity index 99% rename from src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java rename to src/main/java/cn/citycraft/Residence/itemlist/ItemList.java index 3aa1577..d06d56d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java +++ b/src/main/java/cn/citycraft/Residence/itemlist/ItemList.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.itemlist; +package cn.citycraft.Residence.itemlist; import org.bukkit.ChatColor; import java.util.ArrayList; diff --git a/src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java b/src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java similarity index 88% rename from src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java rename to src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java index a6da02a..53a75c3 100644 --- a/src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java +++ b/src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.itemlist; +package cn.citycraft.Residence.itemlist; import java.util.Map; @@ -11,9 +11,9 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java b/src/main/java/cn/citycraft/Residence/itemlist/WorldItemList.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java rename to src/main/java/cn/citycraft/Residence/itemlist/WorldItemList.java index ce6d1a2..87249de 100644 --- a/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java +++ b/src/main/java/cn/citycraft/Residence/itemlist/WorldItemList.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.itemlist; +package cn.citycraft.Residence.itemlist; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java b/src/main/java/cn/citycraft/Residence/itemlist/WorldItemManager.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java rename to src/main/java/cn/citycraft/Residence/itemlist/WorldItemManager.java index e3865ca..1e9cbae 100644 --- a/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java +++ b/src/main/java/cn/citycraft/Residence/itemlist/WorldItemManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.itemlist; +package cn.citycraft.Residence.itemlist; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java rename to src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java index 0c1190a..3ee5f22 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.listeners; +package cn.citycraft.Residence.listeners; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -18,15 +18,16 @@ import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; + import org.bukkit.event.block.BlockPistonExtendEvent; import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockSpreadEvent; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; - /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java rename to src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java index 4385852..5a2010c 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.listeners; +package cn.citycraft.Residence.listeners; import java.util.ArrayList; import java.util.Iterator; @@ -37,10 +37,10 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingPlaceEvent; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.manager.EntityManager; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.manager.EntityManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java similarity index 96% rename from src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java rename to src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java index 7d1f0b3..89b6288 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java @@ -3,7 +3,7 @@ * the editor. */ -package com.bekvon.bukkit.residence.listeners; +package cn.citycraft.Residence.listeners; import java.util.ArrayList; import java.util.HashMap; @@ -37,15 +37,15 @@ import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.Plugin; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.chat.ChatChannel; import com.bekvon.bukkit.residence.event.ResidenceChangedEvent; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import cn.citycraft.PluginHelper.utils.ActionBar; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.chat.ChatChannel; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener_1_8.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java similarity index 86% rename from src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener_1_8.java rename to src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java index 02d3aad..4e68a98 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener_1_8.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java @@ -3,7 +3,7 @@ * the editor. */ -package com.bekvon.bukkit.residence.listeners; +package cn.citycraft.Residence.listeners; import org.bukkit.ChatColor; import org.bukkit.entity.Entity; @@ -14,8 +14,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractAtEntityEvent; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.FlagPermissions; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.FlagPermissions; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/bugfix/ResidenceBugFix.java b/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java similarity index 91% rename from src/main/java/com/bekvon/bukkit/residence/listeners/bugfix/ResidenceBugFix.java rename to src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java index 5b98f37..2cf6cc5 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/bugfix/ResidenceBugFix.java +++ b/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.listeners.bugfix; +package cn.citycraft.Residence.listeners.bugfix; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -12,9 +12,9 @@ import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; public class ResidenceBugFix implements Listener { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKillingListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java similarity index 82% rename from src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKillingListener.java rename to src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java index 5f68670..09a3403 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKillingListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.listeners.flag; +package cn.citycraft.Residence.listeners.flag; import org.bukkit.ChatColor; import org.bukkit.entity.Arrow; @@ -9,10 +9,10 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.manager.EntityManager; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.manager.EntityManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; public class ResidenceAnimalKillingListener implements Listener { EntityManager entitymanager; diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceFlyListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java similarity index 87% rename from src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceFlyListener.java rename to src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java index 7834d87..6a2070a 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceFlyListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.listeners.flag; +package cn.citycraft.Residence.listeners.flag; import java.util.HashMap; @@ -10,13 +10,14 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import com.bekvon.bukkit.residence.ResidenceMain; import com.bekvon.bukkit.residence.event.ResidenceChangedEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent; import com.bekvon.bukkit.residence.event.ResidenceFlagChangeEvent; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; -import com.bekvon.bukkit.residence.protection.ResidencePermissions; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.protection.ResidencePermissions; public class ResidenceFlyListener implements Listener { diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceInteractListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java similarity index 78% rename from src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceInteractListener.java rename to src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java index 0bafa9b..7740541 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceInteractListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.listeners.flag; +package cn.citycraft.Residence.listeners.flag; import org.bukkit.Location; import org.bukkit.Material; @@ -9,10 +9,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.manager.EntityManager; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.manager.EntityManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; public class ResidenceInteractListener implements Listener { EntityManager entitymanager; diff --git a/src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java rename to src/main/java/cn/citycraft/Residence/manager/ConfigManager.java index f8603b2..32d80ca 100644 --- a/src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java @@ -1,7 +1,7 @@ /* * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.manager; +package cn.citycraft.Residence.manager; import java.util.HashMap; import java.util.List; @@ -13,10 +13,9 @@ import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.FlagPermissions; - import cn.citycraft.PluginHelper.config.FileConfig; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.FlagPermissions; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java b/src/main/java/cn/citycraft/Residence/manager/EntityManager.java similarity index 90% rename from src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java rename to src/main/java/cn/citycraft/Residence/manager/EntityManager.java index 2921ad5..b2b44a5 100644 --- a/src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/EntityManager.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.manager; +package cn.citycraft.Residence.manager; import org.bukkit.entity.Bat; import org.bukkit.entity.Chicken; @@ -18,7 +18,7 @@ import org.bukkit.entity.Squid; import org.bukkit.entity.Villager; import org.bukkit.entity.Wolf; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; public class EntityManager { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java b/src/main/java/cn/citycraft/Residence/manager/FlagManager.java similarity index 75% rename from src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java rename to src/main/java/cn/citycraft/Residence/manager/FlagManager.java index f95561d..312d057 100644 --- a/src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/FlagManager.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.manager; +package cn.citycraft.Residence.manager; import java.util.HashMap; import java.util.Map.Entry; @@ -6,12 +6,11 @@ import java.util.Map.Entry; import org.bukkit.event.Listener; import org.bukkit.plugin.PluginManager; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.listeners.flag.ResidenceAnimalKillingListener; -import com.bekvon.bukkit.residence.listeners.flag.ResidenceFlyListener; -import com.bekvon.bukkit.residence.listeners.flag.ResidenceInteractListener; - import cn.citycraft.PluginHelper.config.FileConfig; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.listeners.flag.ResidenceAnimalKillingListener; +import cn.citycraft.Residence.listeners.flag.ResidenceFlyListener; +import cn.citycraft.Residence.listeners.flag.ResidenceInteractListener; public class FlagManager { FileConfig config; diff --git a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java b/src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java rename to src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java index 53d82a4..355b3c7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java +++ b/src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.permissions; +package cn.citycraft.Residence.permissions; import java.util.HashMap; import java.util.Iterator; @@ -15,10 +15,10 @@ import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.CuboidArea; -import com.bekvon.bukkit.residence.protection.FlagPermissions; -import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.CuboidArea; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.protection.FlagPermissions.FlagState; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java b/src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java similarity index 95% rename from src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java rename to src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java index c0b2c98..8ce8273 100644 --- a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java +++ b/src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.permissions; +package cn.citycraft.Residence.permissions; import java.util.Collections; import java.util.HashMap; @@ -16,9 +16,9 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.FlagPermissions; -import com.bekvon.bukkit.residence.vaultinterface.ResidenceVaultAdapter; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.vaultinterface.ResidenceVaultAdapter; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java b/src/main/java/cn/citycraft/Residence/permissions/PermissionsInterface.java similarity index 86% rename from src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java rename to src/main/java/cn/citycraft/Residence/permissions/PermissionsInterface.java index 72e5f71..a266e66 100644 --- a/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java +++ b/src/main/java/cn/citycraft/Residence/permissions/PermissionsInterface.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.permissions; +package cn.citycraft.Residence.permissions; import org.bukkit.entity.Player; diff --git a/src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java b/src/main/java/cn/citycraft/Residence/persistance/YMLSaveHelper.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java rename to src/main/java/cn/citycraft/Residence/persistance/YMLSaveHelper.java index ec5819b..9dadd4f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java +++ b/src/main/java/cn/citycraft/Residence/persistance/YMLSaveHelper.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.persistance; +package cn.citycraft.Residence.persistance; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java b/src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java rename to src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java index 59da623..0d4b3ac 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java +++ b/src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java @@ -1,7 +1,7 @@ /* * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.ArrayList; import java.util.Collection; @@ -16,14 +16,15 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.economy.ResidenceBank; -import com.bekvon.bukkit.residence.economy.TransactionManager; import com.bekvon.bukkit.residence.event.ResidenceTPEvent; -import com.bekvon.bukkit.residence.itemlist.ItemList.ListType; -import com.bekvon.bukkit.residence.itemlist.ResidenceItemList; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.text.help.InformationPager; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.economy.ResidenceBank; +import cn.citycraft.Residence.economy.TransactionManager; +import cn.citycraft.Residence.itemlist.ResidenceItemList; +import cn.citycraft.Residence.itemlist.ItemList.ListType; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.text.help.InformationPager; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java b/src/main/java/cn/citycraft/Residence/protection/CuboidArea.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java rename to src/main/java/cn/citycraft/Residence/protection/CuboidArea.java index 1090b68..754acfd 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java +++ b/src/main/java/cn/citycraft/Residence/protection/CuboidArea.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -18,7 +18,7 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; -import com.bekvon.bukkit.residence.protection.ResidenceManager.ChunkRef; +import cn.citycraft.Residence.protection.ResidenceManager.ChunkRef; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java similarity index 99% rename from src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java rename to src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java index f500646..cc05729 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java +++ b/src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.ArrayList; import java.util.Collections; @@ -19,7 +19,7 @@ import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java b/src/main/java/cn/citycraft/Residence/protection/LeaseManager.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java rename to src/main/java/cn/citycraft/Residence/protection/LeaseManager.java index 0ba4015..0b11354 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java +++ b/src/main/java/cn/citycraft/Residence/protection/LeaseManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.Collections; import java.util.Date; @@ -16,11 +16,12 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.economy.EconomyInterface; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent.DeleteCause; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.economy.EconomyInterface; +import cn.citycraft.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java b/src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java rename to src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java index f37c546..fec299c 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java +++ b/src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.Collections; import java.util.HashMap; @@ -14,7 +14,7 @@ import java.util.Map.Entry; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java b/src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java similarity index 99% rename from src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java rename to src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java index c3bb48e..ff5e90a 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java +++ b/src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +23,15 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import com.bekvon.bukkit.residence.ResidenceMain; import com.bekvon.bukkit.residence.event.ResidenceCreationEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent; -import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent.DeleteCause; import com.bekvon.bukkit.residence.event.ResidenceRenameEvent; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.selection.WECUI; -import com.bekvon.bukkit.residence.text.help.InformationPager; +import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent.DeleteCause; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.selection.WECUI; +import cn.citycraft.Residence.text.help.InformationPager; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java b/src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java rename to src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java index b7e21a9..8d81bdb 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java +++ b/src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.ArrayList; import java.util.Collections; @@ -16,13 +16,14 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import com.bekvon.bukkit.residence.ResidenceMain; import com.bekvon.bukkit.residence.event.ResidenceFlagChangeEvent; import com.bekvon.bukkit.residence.event.ResidenceFlagCheckEvent; -import com.bekvon.bukkit.residence.event.ResidenceFlagEvent.FlagType; import com.bekvon.bukkit.residence.event.ResidenceOwnerChangeEvent; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.permissions.PermissionManager; +import com.bekvon.bukkit.residence.event.ResidenceFlagEvent.FlagType; + +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.permissions.PermissionManager; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java b/src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java similarity index 97% rename from src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java rename to src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java index a40e9c3..ca30332 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java +++ b/src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence.protection; +package cn.citycraft.Residence.protection; import java.util.HashMap; import java.util.Map; @@ -15,7 +15,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/AutoSaveTask.java b/src/main/java/cn/citycraft/Residence/runnable/AutoSaveTask.java similarity index 77% rename from src/main/java/com/bekvon/bukkit/residence/runnable/AutoSaveTask.java rename to src/main/java/cn/citycraft/Residence/runnable/AutoSaveTask.java index 57381f8..f94c946 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/AutoSaveTask.java +++ b/src/main/java/cn/citycraft/Residence/runnable/AutoSaveTask.java @@ -1,8 +1,8 @@ -package com.bekvon.bukkit.residence.runnable; +package cn.citycraft.Residence.runnable; import org.bukkit.Bukkit; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; public class AutoSaveTask implements Runnable { ResidenceMain res; diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java b/src/main/java/cn/citycraft/Residence/runnable/HealTask.java similarity index 81% rename from src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java rename to src/main/java/cn/citycraft/Residence/runnable/HealTask.java index 34516bd..1aeb33f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java +++ b/src/main/java/cn/citycraft/Residence/runnable/HealTask.java @@ -1,11 +1,11 @@ -package com.bekvon.bukkit.residence.runnable; +package cn.citycraft.Residence.runnable; import org.bukkit.Bukkit; import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.protection.ClaimedResidence; public class HealTask implements Runnable { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/LeaseTask.java b/src/main/java/cn/citycraft/Residence/runnable/LeaseTask.java similarity index 75% rename from src/main/java/com/bekvon/bukkit/residence/runnable/LeaseTask.java rename to src/main/java/cn/citycraft/Residence/runnable/LeaseTask.java index 184afbf..3ad607d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/LeaseTask.java +++ b/src/main/java/cn/citycraft/Residence/runnable/LeaseTask.java @@ -1,6 +1,6 @@ -package com.bekvon.bukkit.residence.runnable; +package cn.citycraft.Residence.runnable; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; public class LeaseTask implements Runnable { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/RentTask.java b/src/main/java/cn/citycraft/Residence/runnable/RentTask.java similarity index 75% rename from src/main/java/com/bekvon/bukkit/residence/runnable/RentTask.java rename to src/main/java/cn/citycraft/Residence/runnable/RentTask.java index 13410e0..6f5bc6d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/RentTask.java +++ b/src/main/java/cn/citycraft/Residence/runnable/RentTask.java @@ -1,6 +1,6 @@ -package com.bekvon.bukkit.residence.runnable; +package cn.citycraft.Residence.runnable; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; public class RentTask implements Runnable { ResidenceMain plugin; diff --git a/src/main/java/com/bekvon/bukkit/residence/runnable/TaskManager.java b/src/main/java/cn/citycraft/Residence/runnable/TaskManager.java similarity index 86% rename from src/main/java/com/bekvon/bukkit/residence/runnable/TaskManager.java rename to src/main/java/cn/citycraft/Residence/runnable/TaskManager.java index 470c50c..4276dbd 100644 --- a/src/main/java/com/bekvon/bukkit/residence/runnable/TaskManager.java +++ b/src/main/java/cn/citycraft/Residence/runnable/TaskManager.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.runnable; +package cn.citycraft.Residence.runnable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java b/src/main/java/cn/citycraft/Residence/selection/SelectionManager.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java rename to src/main/java/cn/citycraft/Residence/selection/SelectionManager.java index 1099616..e12ae5e 100644 --- a/src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java +++ b/src/main/java/cn/citycraft/Residence/selection/SelectionManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.selection; +package cn.citycraft.Residence.selection; import java.util.Collections; import java.util.HashMap; @@ -16,9 +16,9 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; -import com.bekvon.bukkit.residence.permissions.PermissionGroup; -import com.bekvon.bukkit.residence.protection.CuboidArea; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.permissions.PermissionGroup; +import cn.citycraft.Residence.protection.CuboidArea; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java b/src/main/java/cn/citycraft/Residence/selection/WECUI.java similarity index 86% rename from src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java rename to src/main/java/cn/citycraft/Residence/selection/WECUI.java index 743774b..8701796 100644 --- a/src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java +++ b/src/main/java/cn/citycraft/Residence/selection/WECUI.java @@ -1,16 +1,17 @@ /** * */ -package com.bekvon.bukkit.residence.selection; +package cn.citycraft.Residence.selection; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.selections.CuboidSelection; import com.sk89q.worldedit.bukkit.selections.Selection; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * @author Administrator * diff --git a/src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java b/src/main/java/cn/citycraft/Residence/selection/WorldEditSelectionManager.java similarity index 96% rename from src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java rename to src/main/java/cn/citycraft/Residence/selection/WorldEditSelectionManager.java index 4c4a454..db3c293 100644 --- a/src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java +++ b/src/main/java/cn/citycraft/Residence/selection/WorldEditSelectionManager.java @@ -2,18 +2,19 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.bekvon.bukkit.residence.selection; +package cn.citycraft.Residence.selection; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ResidenceMain; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.selections.CuboidSelection; import com.sk89q.worldedit.bukkit.selections.Selection; import com.sk89q.worldedit.regions.CuboidRegion; +import cn.citycraft.Residence.ResidenceMain; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/text/Language.java b/src/main/java/cn/citycraft/Residence/text/Language.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/text/Language.java rename to src/main/java/cn/citycraft/Residence/text/Language.java index f603dc2..0720a0b 100644 --- a/src/main/java/com/bekvon/bukkit/residence/text/Language.java +++ b/src/main/java/cn/citycraft/Residence/text/Language.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.text; +package cn.citycraft.Residence.text; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java b/src/main/java/cn/citycraft/Residence/text/help/HelpEntry.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java rename to src/main/java/cn/citycraft/Residence/text/help/HelpEntry.java index 638aecb..6dd08b4 100644 --- a/src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java +++ b/src/main/java/cn/citycraft/Residence/text/help/HelpEntry.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.text.help; +package cn.citycraft.Residence.text.help; import java.util.ArrayList; import java.util.Arrays; @@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java b/src/main/java/cn/citycraft/Residence/text/help/InformationPager.java similarity index 95% rename from src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java rename to src/main/java/cn/citycraft/Residence/text/help/InformationPager.java index 8647803..4b44529 100644 --- a/src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java +++ b/src/main/java/cn/citycraft/Residence/text/help/InformationPager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.text.help; +package cn.citycraft.Residence.text.help; import java.util.Arrays; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java b/src/main/java/cn/citycraft/Residence/utils/DataBackup.java similarity index 96% rename from src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java rename to src/main/java/cn/citycraft/Residence/utils/DataBackup.java index c877181..dcbdec7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java +++ b/src/main/java/cn/citycraft/Residence/utils/DataBackup.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.utils; +package cn.citycraft.Residence.utils; import java.io.File; import java.io.FileInputStream; @@ -15,7 +15,7 @@ import java.util.zip.ZipOutputStream; import org.bukkit.Bukkit; import org.bukkit.World; -import com.bekvon.bukkit.residence.ResidenceMain; +import cn.citycraft.Residence.ResidenceMain; public class DataBackup { private final File BackupDir; diff --git a/src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java b/src/main/java/cn/citycraft/Residence/vaultinterface/ResidenceVaultAdapter.java similarity index 95% rename from src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java rename to src/main/java/cn/citycraft/Residence/vaultinterface/ResidenceVaultAdapter.java index 163af95..5942928 100644 --- a/src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java +++ b/src/main/java/cn/citycraft/Residence/vaultinterface/ResidenceVaultAdapter.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package com.bekvon.bukkit.residence.vaultinterface; +package cn.citycraft.Residence.vaultinterface; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; @@ -13,8 +13,8 @@ import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; -import com.bekvon.bukkit.residence.economy.EconomyInterface; -import com.bekvon.bukkit.residence.permissions.PermissionsInterface; +import cn.citycraft.Residence.economy.EconomyInterface; +import cn.citycraft.Residence.permissions.PermissionsInterface; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java index d7ad8df..f9cdb0d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -6,23 +6,24 @@ import java.util.Map; import org.bukkit.Location; import org.bukkit.entity.Player; -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; +import cn.citycraft.Residence.ResidenceMain; +import cn.citycraft.Residence.chat.ChatManager; +import cn.citycraft.Residence.economy.EconomyInterface; +import cn.citycraft.Residence.economy.TransactionManager; +import cn.citycraft.Residence.economy.rent.RentManager; +import cn.citycraft.Residence.itemlist.WorldItemManager; +import cn.citycraft.Residence.manager.ConfigManager; +import cn.citycraft.Residence.manager.EntityManager; +import cn.citycraft.Residence.permissions.PermissionManager; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions; +import cn.citycraft.Residence.protection.LeaseManager; +import cn.citycraft.Residence.protection.PermissionListManager; +import cn.citycraft.Residence.protection.ResidenceManager; +import cn.citycraft.Residence.protection.WorldFlagManager; +import cn.citycraft.Residence.selection.SelectionManager; +import cn.citycraft.Residence.text.Language; +import cn.citycraft.Residence.text.help.HelpEntry; public class Residence { static ResidenceMain instance; @@ -32,111 +33,111 @@ public class Residence { } public static ChatManager getChatManager() { - return instance.chatmanager; + return instance.getChatManager(); } public static ConfigManager getConfigManager() { - return instance.cmanager; + return instance.getConfigManager(); } public static File getDataLocation() { - return instance.dataFolder; + return instance.getDataFolder(); } public static Map getDeleteConfirm() { - return instance.deleteConfirm; + return instance.getDeleteConfirm(); } public static EconomyInterface getEconomyManager() { - return instance.economy; + return instance.getEconomyManager(); } public static EntityManager getEntityManager() { - return instance.entitymanager; + return instance.getEntityManager(); } public static HelpEntry getHelppages() { - return instance.helppages; + return instance.getHelppages(); } public static WorldItemManager getItemManager() { - return instance.imanager; + return instance.getItemManager(); } public static Language getLanguage() { - if (instance.language == null) { - instance.language = new Language(); + if (instance.getLanguage() == null) { + instance.setLanguage(new Language()); } - return instance.language; + return instance.getLanguage(); } public static LeaseManager getLeaseManager() { - return instance.leasemanager; + return instance.getLeaseManager(); } public static PermissionListManager getPermissionListManager() { - return instance.pmanager; + return instance.getPermissionListManager(); } public static PermissionManager getPermissionManager() { - return instance.gmanager; + return instance.getPermissionManager(); } public static FlagPermissions getPermsByLoc(final Location loc) { - final ClaimedResidence res = instance.rmanager.getByLoc(loc); + final ClaimedResidence res = getResidenceManager().getByLoc(loc); if (res != null) { return res.getPermissions(); } else { - return instance.wmanager.getPerms(loc.getWorld().getName()); + return getWorldFlags().getPerms(loc.getWorld().getName()); } } public static FlagPermissions getPermsByLocForPlayer(final Location loc, final Player player) { - final ClaimedResidence res = instance.rmanager.getByLoc(loc); + final ClaimedResidence res = getResidenceManager().getByLoc(loc); if (res != null) { return res.getPermissions(); } else if (player != null) { - return instance.wmanager.getPerms(player); + return getWorldFlags().getPerms(player); } else { - return instance.wmanager.getPerms(loc.getWorld().getName()); + return getWorldFlags().getPerms(loc.getWorld().getName()); } } public static RentManager getRentManager() { - return instance.rentmanager; + return instance.getRentManager(); } public static ResidenceManager getResidenceManager() { - return instance.rmanager; + return instance.getResidenceManager(); } public static SelectionManager getSelectionManager() { - return instance.smanager; + return instance.getSelectionManager(); } public static TransactionManager getTransactionManager() { - return instance.tmanager; + return instance.getTransactionManager(); } public static WorldFlagManager getWorldFlags() { - return instance.wmanager; + return instance.getWorldFlags(); } public static boolean isResAdminOn(final Player player) { - if (instance.resadminToggle.contains(player.getName())) { + if (instance.getResadminToggle().contains(player.getName())) { return true; } return false; } public static boolean isResAdminOn(final String player) { - if (instance.resadminToggle.contains(player.toLowerCase())) { + if (instance.getResadminToggle().contains(player.toLowerCase())) { return true; } return false; } public static boolean isUseWorldEdit() { - return instance.useWorldEdit; + return instance.isUseWorldEdit(); } } diff --git a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java index 6cccc8a..4bdae3f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java @@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.event.Cancellable; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java index bce7a30..c8f5406 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java @@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java index 99da572..d6a28d9 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java @@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java index 3834ab7..60e3ee1 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java @@ -3,7 +3,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * The {@link ResidenceChangedEvent} is fired when a player transitions between residences and/or diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java index c741125..eb7fe5b 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java @@ -4,11 +4,12 @@ */ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java index 2b2246c..e8702f4 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java @@ -5,11 +5,12 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.CuboidArea; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.CuboidArea; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java index d208bac..1a7a175 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java @@ -5,10 +5,11 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java index c63567e..e680262 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java @@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java index aec72a0..374c5b7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java @@ -5,11 +5,12 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions.FlagState; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java index 3952420..25a0820 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java @@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.event.HandlerList; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java index c483f21..b5179e6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java @@ -5,10 +5,11 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.FlagPermissions.FlagState; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java index 2ace8cb..5163d15 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java @@ -4,9 +4,10 @@ */ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java index b8db4c5..091d8fa 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java @@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java index 4b22112..f388521 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java @@ -7,7 +7,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java index f6030ed..faa2689 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java @@ -1,6 +1,6 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import cn.citycraft.Residence.protection.ClaimedResidence; public class ResidenceRenameEvent extends ResidenceEvent { protected String NewResName; diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java index 75ab3b9..d444cba 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java @@ -5,10 +5,11 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * * @author Administrator diff --git a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java index 70550a5..bf552b4 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java @@ -5,11 +5,12 @@ package com.bekvon.bukkit.residence.event; -import com.bekvon.bukkit.residence.protection.ClaimedResidence; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; +import cn.citycraft.Residence.protection.ClaimedResidence; + /** * * @author Administrator