diff --git a/pom.xml b/pom.xml index 69b42c4..78f988e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.citycraft Residence - 2.8.0.8 + 2.8.1.0 Residence 重制版本的领地插件 - 喵♂呜 @@ -55,7 +55,7 @@ http://ci.citycraft.cn:8080 - &c修改包名称 &a保留原有API接口... + &e还原protection包路径 &a兼容部分老插件... UTF-8 diff --git a/src/main/java/cn/citycraft/Residence/ResidenceMain.java b/src/main/java/cn/citycraft/Residence/ResidenceMain.java index f6929ff..bfae9cd 100644 --- a/src/main/java/cn/citycraft/Residence/ResidenceMain.java +++ b/src/main/java/cn/citycraft/Residence/ResidenceMain.java @@ -34,6 +34,12 @@ import org.bukkit.plugin.java.JavaPlugin; import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.event.ResidenceCommandEvent; +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.earth2me.essentials.Essentials; import cn.citycraft.PluginHelper.commands.HandlerMainCommand; @@ -60,12 +66,6 @@ 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java index 48a233e..e97a6f3 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java @@ -7,13 +7,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.CuboidArea; +import com.bekvon.bukkit.residence.protection.ResidenceManager; 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java index ce31840..3e5ce17 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandBank extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java index bc007dd..35529a5 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandCheck extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java index d348d1c..0d61add 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandClearFlags.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java index 7c66695..0c4c487 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandClearFlags extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java index 6626a54..0c23351 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java @@ -7,9 +7,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java index c695f0d..6f02fb3 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java @@ -8,9 +8,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java index 59b5709..9ab6ab2 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java @@ -6,11 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java index 317eaed..7f2c4ef 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java @@ -6,9 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java index f7324b0..8e5113d 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java @@ -5,10 +5,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandGive.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java index d4fcf7e..d1876cc 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandGset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java index 5d8c38c..ed25900 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandGset extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java index a680cd1..2aef0e6 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java @@ -6,9 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java index 81f4fc1..8c980cd 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java @@ -7,11 +7,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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.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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java index 70e8a70..9d0cb11 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java @@ -6,11 +6,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.LeaseManager; +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.LeaseManager; -import cn.citycraft.Residence.protection.ResidenceManager; import cn.citycraft.Residence.text.Language; public class CommandLease extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java index bc25fd6..98081cf 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandList.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandListAll.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java index 586a812..e724e44 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandListAllHidden.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java index 6c09a49..84bdaa4 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java @@ -6,9 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java index f1c5ac0..6720bfa 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java @@ -6,9 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java index 872d4a5..0672fb2 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.FlagPermissions; +import com.bekvon.bukkit.residence.protection.PermissionListManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java index e58aaae..8f5ecd0 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java @@ -7,10 +7,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandLset extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java index c2f5557..32f76b8 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java @@ -6,13 +6,14 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java index f79c0f7..521ac13 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java @@ -6,11 +6,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java index 6bce187..93cffac 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandPset.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java index 07f09b8..2c60d04 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandPset extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java index 9cfce78..db4b903 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java @@ -9,10 +9,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandRemove extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java index aff05c7..1ae0a63 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java @@ -6,9 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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 { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java index 418f289..c1065f1 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/commandsub/CommandRenameArea.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java index 72ebba6..0591e7e 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandRenameArea extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java index cff9f36..45e8197 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java @@ -10,12 +10,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.CuboidArea; +import com.bekvon.bukkit.residence.protection.ResidenceManager; + 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java index e9c5eb1..6711044 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandServer extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java index 7a437fd..7503289 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandSet extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java index aba04db..21d2767 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java @@ -5,10 +5,11 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; +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; import cn.citycraft.Residence.text.Language; public class CommandSetOwner extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java index 9a65ad6..2b22c2d 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandSubList extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java index 70768cb..a9d5a64 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java @@ -7,12 +7,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ResidenceManager; 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; diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java index 3014963..6fe2003 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandTp extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java index 44cac25..998a88e 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java @@ -6,10 +6,11 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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; import cn.citycraft.Residence.text.Language; public class CommandTpSet extends BaseCommand { diff --git a/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java b/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java index f2362d9..4df8007 100644 --- a/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java +++ b/src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java @@ -6,12 +6,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +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.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 { diff --git a/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java b/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java index f50fdca..8df67db 100644 --- a/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java +++ b/src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java @@ -8,8 +8,9 @@ package cn.citycraft.Residence.economy; import org.bukkit.ChatColor; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; + import cn.citycraft.Residence.ResidenceMain; -import cn.citycraft.Residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java b/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java index 2eab47e..f808862 100644 --- a/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java +++ b/src/main/java/cn/citycraft/Residence/economy/TransactionManager.java @@ -15,12 +15,13 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/economy/rent/RentManager.java b/src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java index 8389c9d..305ffb5 100644 --- a/src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java +++ b/src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java @@ -18,11 +18,11 @@ import org.bukkit.plugin.PluginManager; import com.bekvon.bukkit.residence.event.ResidenceRentEvent; import com.bekvon.bukkit.residence.event.ResidenceRentEvent.RentEventType; +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/cn/citycraft/Residence/itemlist/ResidenceItemList.java b/src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java index 53a75c3..7c52c78 100644 --- a/src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java +++ b/src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java @@ -11,9 +11,10 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/listeners/ResidenceBlockListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java index 3ee5f22..7c4964a 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java @@ -19,9 +19,10 @@ import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; +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; import org.bukkit.event.block.BlockPistonExtendEvent; import org.bukkit.event.block.BlockPistonRetractEvent; diff --git a/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java index 5a2010c..8047fce 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java @@ -37,10 +37,11 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingPlaceEvent; +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/cn/citycraft/Residence/listeners/ResidencePlayerListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java index 89b6288..a11fdc8 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java @@ -38,14 +38,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.Plugin; import com.bekvon.bukkit.residence.event.ResidenceChangedEvent; +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/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java index 4e68a98..b2d082d 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java @@ -14,8 +14,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractAtEntityEvent; +import com.bekvon.bukkit.residence.protection.FlagPermissions; + import cn.citycraft.Residence.ResidenceMain; -import cn.citycraft.Residence.protection.FlagPermissions; /** * diff --git a/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java b/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java index 2cf6cc5..4500c47 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java +++ b/src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java @@ -12,9 +12,10 @@ import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; +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/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java index 09a3403..2c79245 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java @@ -9,10 +9,11 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; +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/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java index 6a2070a..cdcf1b4 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java @@ -13,11 +13,11 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; 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/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java index 7740541..800a68f 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java @@ -9,10 +9,11 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; +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/cn/citycraft/Residence/manager/ConfigManager.java b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java index 32d80ca..e6d8f47 100644 --- a/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java +++ b/src/main/java/cn/citycraft/Residence/manager/ConfigManager.java @@ -13,9 +13,10 @@ import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; +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/cn/citycraft/Residence/permissions/PermissionGroup.java b/src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java index 355b3c7..c5501b1 100644 --- a/src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java +++ b/src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java @@ -15,10 +15,11 @@ import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/permissions/PermissionManager.java b/src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java index 8ce8273..e0e8fa9 100644 --- a/src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java +++ b/src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java @@ -16,8 +16,9 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import com.bekvon.bukkit.residence.protection.FlagPermissions; + import cn.citycraft.Residence.ResidenceMain; -import cn.citycraft.Residence.protection.FlagPermissions; import cn.citycraft.Residence.vaultinterface.ResidenceVaultAdapter; /** diff --git a/src/main/java/cn/citycraft/Residence/runnable/HealTask.java b/src/main/java/cn/citycraft/Residence/runnable/HealTask.java index 1aeb33f..f392f17 100644 --- a/src/main/java/cn/citycraft/Residence/runnable/HealTask.java +++ b/src/main/java/cn/citycraft/Residence/runnable/HealTask.java @@ -4,8 +4,9 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/selection/SelectionManager.java b/src/main/java/cn/citycraft/Residence/selection/SelectionManager.java index e12ae5e..fec60c7 100644 --- a/src/main/java/cn/citycraft/Residence/selection/SelectionManager.java +++ b/src/main/java/cn/citycraft/Residence/selection/SelectionManager.java @@ -16,9 +16,10 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.Player; +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/cn/citycraft/Residence/selection/WECUI.java b/src/main/java/cn/citycraft/Residence/selection/WECUI.java index 8701796..d60650d 100644 --- a/src/main/java/cn/citycraft/Residence/selection/WECUI.java +++ b/src/main/java/cn/citycraft/Residence/selection/WECUI.java @@ -6,12 +6,11 @@ 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/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java index f9cdb0d..24d8f7e 100644 --- a/src/main/java/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -6,6 +6,13 @@ import java.util.Map; import org.bukkit.Location; import org.bukkit.entity.Player; +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 cn.citycraft.Residence.ResidenceMain; import cn.citycraft.Residence.chat.ChatManager; import cn.citycraft.Residence.economy.EconomyInterface; @@ -15,12 +22,6 @@ 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; 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 4bdae3f..6cccc8a 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 c8f5406..bce7a30 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 d6a28d9..99da572 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 60e3ee1..3834ab7 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 eb7fe5b..dd013e3 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java @@ -8,7 +8,7 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; /** * 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 e8702f4..5d5e73a 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java @@ -8,8 +8,8 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; -import cn.citycraft.Residence.protection.CuboidArea; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.CuboidArea; /** * 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 1a7a175..e0b9ad2 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java @@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; /** * 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 e680262..c63567e 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 374c5b7..6d68a22 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java @@ -8,8 +8,8 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; -import cn.citycraft.Residence.protection.FlagPermissions.FlagState; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; /** * 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 25a0820..3952420 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 b5179e6..f4e28f8 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java @@ -7,8 +7,8 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; -import cn.citycraft.Residence.protection.FlagPermissions.FlagState; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; /** * 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 5163d15..70ab37d 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java @@ -6,7 +6,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; /** * 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 091d8fa..b8db4c5 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 f388521..4b22112 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 faa2689..f6030ed 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 cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.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 d444cba..166b042 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java @@ -8,7 +8,7 @@ package com.bekvon.bukkit.residence.event; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; /** * 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 bf552b4..afd83b0 100644 --- a/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java +++ b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java @@ -9,7 +9,7 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import cn.citycraft.Residence.protection.ClaimedResidence; +import com.bekvon.bukkit.residence.protection.ClaimedResidence; /** * diff --git a/src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java index 0d4b3ac..d1142d2 100644 --- a/src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java @@ -1,7 +1,7 @@ /* * To change this template, choose Tools | Templates and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/cn/citycraft/Residence/protection/CuboidArea.java b/src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java similarity index 98% rename from src/main/java/cn/citycraft/Residence/protection/CuboidArea.java rename to src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java index 754acfd..1090b68 100644 --- a/src/main/java/cn/citycraft/Residence/protection/CuboidArea.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.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 cn.citycraft.Residence.protection.ResidenceManager.ChunkRef; +import com.bekvon.bukkit.residence.protection.ResidenceManager.ChunkRef; /** * diff --git a/src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java rename to src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java index cc05729..adff4fd 100644 --- a/src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/cn/citycraft/Residence/protection/LeaseManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/LeaseManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java index 0b11354..ca89e96 100644 --- a/src/main/java/cn/citycraft/Residence/protection/LeaseManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.Collections; import java.util.Date; diff --git a/src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java index fec299c..883503f 100644 --- a/src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java index ff5e90a..411cc42 100644 --- a/src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java similarity index 99% rename from src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java index 8d81bdb..38cca9f 100644 --- a/src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java similarity index 98% rename from src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java index ca30332..e3e0069 100644 --- a/src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package cn.citycraft.Residence.protection; +package com.bekvon.bukkit.residence.protection; import java.util.HashMap; import java.util.Map;