502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00
Code Releases Activity

modify package name keep old API...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-10-29 19:52:00 +08:00
parent abe758de62
commit ff82c8a726
116 changed files with 534 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.citycraft</groupId>
<artifactId>Residence</artifactId>
<version>2.8.0.7</version>
<version>2.8.0.8</version>
<name>Residence</name>
<description>重制版本的领地插件 - 喵♂呜</description>
<build>
@@ -55,7 +55,7 @@
</build>
<properties>
<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
<update.description>修复BaseCommand基类错误...</update.description>
<update.description>&amp;c修改包名称 &amp;a保留原有API接口...</update.description>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>

95
src/main/java/com/bekvon/bukkit/residence/ResidenceMain.java → src/main/java/cn/citycraft/Residence/ResidenceMain.java
View File

@@ -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<String, String> deleteConfirm;
@@ -228,6 +229,10 @@ public class ResidenceMain extends JavaPlugin {
return rentmanager;
}
public List<String> 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) {

5
src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java → src/main/java/cn/citycraft/Residence/chat/ChatChannel.java
View File

@@ -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

4
src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java → src/main/java/cn/citycraft/Residence/chat/ChatManager.java
View File

@@ -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;
/**
*

7
src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRc.java → src/main/java/cn/citycraft/Residence/commandmain/CommandRc.java
View File

@@ -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;

89
src/main/java/com/bekvon/bukkit/residence/commandmain/CommandRes.java → src/main/java/cn/citycraft/Residence/commandmain/CommandRes.java
View File

@@ -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;

5
src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResLoad.java → src/main/java/cn/citycraft/Residence/commandmain/CommandResLoad.java
View File

@@ -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;

5
src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResReload.java → src/main/java/cn/citycraft/Residence/commandmain/CommandResReload.java
View File

@@ -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;

5
src/main/java/com/bekvon/bukkit/residence/commandmain/CommandResWorld.java → src/main/java/cn/citycraft/Residence/commandmain/CommandResWorld.java
View File

@@ -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;

14
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java → src/main/java/cn/citycraft/Residence/commandsub/CommandArea.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java → src/main/java/cn/citycraft/Residence/commandsub/CommandBank.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java → src/main/java/cn/citycraft/Residence/commandsub/CommandCheck.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheckSelf.java → src/main/java/cn/citycraft/Residence/commandsub/CommandCheckSelf.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java → src/main/java/cn/citycraft/Residence/commandsub/CommandClearFlags.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java → src/main/java/cn/citycraft/Residence/commandsub/CommandCompass.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandConfirm.java → src/main/java/cn/citycraft/Residence/commandsub/CommandConfirm.java
View File

@@ -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;

10
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java → src/main/java/cn/citycraft/Residence/commandsub/CommandCreate.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCurrent.java → src/main/java/cn/citycraft/Residence/commandsub/CommandCurrent.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java → src/main/java/cn/citycraft/Residence/commandsub/CommandDefault.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java → src/main/java/cn/citycraft/Residence/commandsub/CommandGive.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java → src/main/java/cn/citycraft/Residence/commandsub/CommandGset.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandInfo.java → src/main/java/cn/citycraft/Residence/commandsub/CommandInfo.java
View File

@@ -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;

13
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandKick.java → src/main/java/cn/citycraft/Residence/commandsub/CommandKick.java
View File

@@ -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;

13
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java → src/main/java/cn/citycraft/Residence/commandsub/CommandLease.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLimits.java → src/main/java/cn/citycraft/Residence/commandsub/CommandLimits.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandList.java → src/main/java/cn/citycraft/Residence/commandsub/CommandList.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAll.java → src/main/java/cn/citycraft/Residence/commandsub/CommandListAll.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListAllHidden.java → src/main/java/cn/citycraft/Residence/commandsub/CommandListAllHidden.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandListHidden.java → src/main/java/cn/citycraft/Residence/commandsub/CommandListHidden.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLists.java → src/main/java/cn/citycraft/Residence/commandsub/CommandLists.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java → src/main/java/cn/citycraft/Residence/commandsub/CommandLset.java
View File

@@ -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;

19
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java → src/main/java/cn/citycraft/Residence/commandsub/CommandMarket.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java → src/main/java/cn/citycraft/Residence/commandsub/CommandMaterial.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMessage.java → src/main/java/cn/citycraft/Residence/commandsub/CommandMessage.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java → src/main/java/cn/citycraft/Residence/commandsub/CommandMirror.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java → src/main/java/cn/citycraft/Residence/commandsub/CommandPset.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemove.java → src/main/java/cn/citycraft/Residence/commandsub/CommandRemove.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRemoveAll.java → src/main/java/cn/citycraft/Residence/commandsub/CommandRemoveAll.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java → src/main/java/cn/citycraft/Residence/commandsub/CommandRename.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java → src/main/java/cn/citycraft/Residence/commandsub/CommandRenameArea.java
View File

@@ -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;

17
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java → src/main/java/cn/citycraft/Residence/commandsub/CommandSelect.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java → src/main/java/cn/citycraft/Residence/commandsub/CommandServer.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java → src/main/java/cn/citycraft/Residence/commandsub/CommandSet.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSetOwner.java → src/main/java/cn/citycraft/Residence/commandsub/CommandSetOwner.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubList.java → src/main/java/cn/citycraft/Residence/commandsub/CommandSubList.java
View File

@@ -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;

12
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java → src/main/java/cn/citycraft/Residence/commandsub/CommandSubZone.java
View File

@@ -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;

9
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java → src/main/java/cn/citycraft/Residence/commandsub/CommandTool.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java → src/main/java/cn/citycraft/Residence/commandsub/CommandTp.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTpSet.java → src/main/java/cn/citycraft/Residence/commandsub/CommandTpSet.java
View File

@@ -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;

15
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandUnStuck.java → src/main/java/cn/citycraft/Residence/commandsub/CommandUnStuck.java
View File

@@ -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;

5
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandVersion.java → src/main/java/cn/citycraft/Residence/commandsub/CommandVersion.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java → src/main/java/cn/citycraft/Residence/economy/EconomyInterface.java
View File

@@ -1,4 +1,4 @@
package com.bekvon.bukkit.residence.economy;
package cn.citycraft.Residence.economy;
public interface EconomyInterface {
public double getBalance(String playerName);

2
src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java → src/main/java/cn/citycraft/Residence/economy/EssentialsEcoAdapter.java
View File

@@ -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;

6
src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java → src/main/java/cn/citycraft/Residence/economy/ResidenceBank.java
View File

@@ -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;
/**
*

14
src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java → src/main/java/cn/citycraft/Residence/economy/TransactionManager.java
View File

@@ -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;
/**
*

11
src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java → src/main/java/cn/citycraft/Residence/economy/rent/RentManager.java
View File

@@ -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;
/**
*

2
src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java → src/main/java/cn/citycraft/Residence/economy/rent/RentableLand.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java → src/main/java/cn/citycraft/Residence/economy/rent/RentedLand.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java → src/main/java/cn/citycraft/Residence/itemlist/ItemList.java
View File

@@ -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;

8
src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java → src/main/java/cn/citycraft/Residence/itemlist/ResidenceItemList.java
View File

@@ -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;
/**
*

2
src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java → src/main/java/cn/citycraft/Residence/itemlist/WorldItemList.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java → src/main/java/cn/citycraft/Residence/itemlist/WorldItemManager.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java → src/main/java/cn/citycraft/Residence/listeners/ResidenceBlockListener.java
View File

@@ -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

10
src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java → src/main/java/cn/citycraft/Residence/listeners/ResidenceEntityListener.java
View File

@@ -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;
/**
*

12
src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java → src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java
View File

@@ -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;
/**
*

6
src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener_1_8.java → src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener_1_8.java
View File

@@ -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;
/**
*

8
src/main/java/com/bekvon/bukkit/residence/listeners/bugfix/ResidenceBugFix.java → src/main/java/cn/citycraft/Residence/listeners/bugfix/ResidenceBugFix.java
View File

@@ -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;

10
src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKillingListener.java → src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceAnimalKillingListener.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceFlyListener.java → src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceFlyListener.java
View File

@@ -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 {

10
src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceInteractListener.java → src/main/java/cn/citycraft/Residence/listeners/flag/ResidenceInteractListener.java
View File

@@ -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;

7
src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java → src/main/java/cn/citycraft/Residence/manager/ConfigManager.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java → src/main/java/cn/citycraft/Residence/manager/EntityManager.java
View File

@@ -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;

11
src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java → src/main/java/cn/citycraft/Residence/manager/FlagManager.java
View File

@@ -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;

10
src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java → src/main/java/cn/citycraft/Residence/permissions/PermissionGroup.java
View File

@@ -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;
/**
*

8
src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java → src/main/java/cn/citycraft/Residence/permissions/PermissionManager.java
View File

@@ -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;
/**
*

2
src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java → src/main/java/cn/citycraft/Residence/permissions/PermissionsInterface.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java → src/main/java/cn/citycraft/Residence/persistance/YMLSaveHelper.java
View File

@@ -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;

17
src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java → src/main/java/cn/citycraft/Residence/protection/ClaimedResidence.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java → src/main/java/cn/citycraft/Residence/protection/CuboidArea.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java → src/main/java/cn/citycraft/Residence/protection/FlagPermissions.java
View File

@@ -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;
/**
*

9
src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java → src/main/java/cn/citycraft/Residence/protection/LeaseManager.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java → src/main/java/cn/citycraft/Residence/protection/PermissionListManager.java
View File

@@ -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;
/**
*

13
src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java → src/main/java/cn/citycraft/Residence/protection/ResidenceManager.java
View File

@@ -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;
/**
*

11
src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java → src/main/java/cn/citycraft/Residence/protection/ResidencePermissions.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java → src/main/java/cn/citycraft/Residence/protection/WorldFlagManager.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/runnable/AutoSaveTask.java → src/main/java/cn/citycraft/Residence/runnable/AutoSaveTask.java
View File

@@ -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;

6
src/main/java/com/bekvon/bukkit/residence/runnable/HealTask.java → src/main/java/cn/citycraft/Residence/runnable/HealTask.java
View File

@@ -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;

4
src/main/java/com/bekvon/bukkit/residence/runnable/LeaseTask.java → src/main/java/cn/citycraft/Residence/runnable/LeaseTask.java
View File

@@ -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;

4
src/main/java/com/bekvon/bukkit/residence/runnable/RentTask.java → src/main/java/cn/citycraft/Residence/runnable/RentTask.java
View File

@@ -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;

2
src/main/java/com/bekvon/bukkit/residence/runnable/TaskManager.java → src/main/java/cn/citycraft/Residence/runnable/TaskManager.java
View File

@@ -1,4 +1,4 @@
package com.bekvon.bukkit.residence.runnable;
package cn.citycraft.Residence.runnable;
import java.util.ArrayList;
import java.util.List;

8
src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java → src/main/java/cn/citycraft/Residence/selection/SelectionManager.java
View File

@@ -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;
/**
*

5
src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java → src/main/java/cn/citycraft/Residence/selection/WECUI.java
View File

@@ -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
*

5
src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java → src/main/java/cn/citycraft/Residence/selection/WorldEditSelectionManager.java
View File

@@ -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

2
src/main/java/com/bekvon/bukkit/residence/text/Language.java → src/main/java/cn/citycraft/Residence/text/Language.java
View File

@@ -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;

4
src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java → src/main/java/cn/citycraft/Residence/text/help/HelpEntry.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java → src/main/java/cn/citycraft/Residence/text/help/InformationPager.java
View File

@@ -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;
/**
*

4
src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java → src/main/java/cn/citycraft/Residence/utils/DataBackup.java
View File

@@ -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;

6
src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java → src/main/java/cn/citycraft/Residence/vaultinterface/ResidenceVaultAdapter.java
View File

@@ -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;
/**
*

89
src/main/java/com/bekvon/bukkit/residence/Residence.java
View File

@@ -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<String, String> 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();
}
}

2
src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java
View File

@@ -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;
/**
*

Some files were not shown because too many files have changed in this diff Show More