diff --git a/.classpath b/.classpath index aff554c..2c705bb 100644 --- a/.classpath +++ b/.classpath @@ -1,20 +1,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index ab8b4ab..9687fa1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,19 @@ 4.0.0 - cn.CityCraft + cn.citycraft Residence 2.7.0.6-SNAPSHOT Residence ${project.name} src - - - src - - **/*.java - - - + + + src/main/resources + true + + maven-compiler-plugin diff --git a/src/com/bekvon/bukkit/residence/config/Config.java b/src/com/bekvon/bukkit/residence/config/Config.java deleted file mode 100644 index 8694f7c..0000000 --- a/src/com/bekvon/bukkit/residence/config/Config.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.bekvon.bukkit.residence.config; - -import java.io.File; -import java.io.IOException; - -import org.bukkit.plugin.Plugin; - -public class Config extends ConfigLoader { - private static String CONFIG_NAME = "config.yml"; - private static FileConfig instance; - private static File file; - - public Config(Plugin p) { - super(p, CONFIG_NAME); - file = new File(p.getDataFolder(), CONFIG_NAME); - instance = super.getInstance(); - } - - public Config(Plugin p, String ver) { - super(p, CONFIG_NAME, ver); - instance = super.getInstance(); - } - - public static void load(Plugin p) { - new Config(p); - } - - public static void load(Plugin p, String ver) { - new Config(p, ver); - } - - public static FileConfig getInstance() { - return instance; - } - - public static String getMessage(String path) { - String message = instance.getString(path); - if (message != null) - message = message.replaceAll("&", "§"); - return message; - } - - public static String[] getStringArray(String path) { - return instance.getStringList(path).toArray(new String[0]); - } - - public static void save(){ - try { - instance.save(file); - } catch (IOException e) { - saveError(file); - e.printStackTrace(); - } - } -} diff --git a/src/com/bekvon/bukkit/residence/config/ConfigLoader.java b/src/com/bekvon/bukkit/residence/config/ConfigLoader.java deleted file mode 100644 index 06c9d62..0000000 --- a/src/com/bekvon/bukkit/residence/config/ConfigLoader.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.bekvon.bukkit.residence.config; - -import java.io.File; -import java.io.IOException; - -import org.bukkit.plugin.Plugin; - -public class ConfigLoader extends FileConfig { - protected static FileConfig config; - protected static boolean tip = true; - protected static Plugin plugin; - - public static FileConfig getInstance() { - return config; - } - - public static void saveError(File file) { - plugin.getLogger().info("配置文件" + file.getName() + "保存错误..."); - } - - public ConfigLoader(Plugin p, File file) { - ConfigLoader.plugin = p; - config = loadConfig(p, file, null, true); - } - - public ConfigLoader(Plugin p, File file, boolean res) { - ConfigLoader.plugin = p; - config = loadConfig(p, file, null, res); - } - - public ConfigLoader(Plugin p, File file, String ver) { - ConfigLoader.plugin = p; - config = loadConfig(p, file, ver, true); - } - - public ConfigLoader(Plugin p, File file, String ver, boolean res) { - ConfigLoader.plugin = p; - config = loadConfig(p, file, ver, res); - } - - public ConfigLoader(Plugin p, String filename) { - ConfigLoader.plugin = p; - config = loadConfig(p, new File(p.getDataFolder(), filename), null, true); - } - - public ConfigLoader(Plugin p, String filename, boolean res) { - ConfigLoader.plugin = p; - config = loadConfig(p, new File(p.getDataFolder(), filename), null, res); - } - - public ConfigLoader(Plugin p, String filename, String ver) { - ConfigLoader.plugin = p; - config = loadConfig(p, new File(p.getDataFolder(), filename), ver, true); - } - - public ConfigLoader(Plugin p, String filename, String ver, boolean res) { - ConfigLoader.plugin = p; - config = loadConfig(p, new File(p.getDataFolder(), filename), ver, true); - } - - private void fileCreate(Plugin p, File file, boolean res) { - if (res) { - p.saveResource(file.getName(), false); - } else { - try { - p.getLogger().info("创建新的配置文件" + file.getAbsolutePath() + "..."); - file.createNewFile(); - } catch (IOException e) { - p.getLogger().info("配置文件" + file.getName() + "创建失败..."); - e.printStackTrace(); - } - } - } - - public FileConfig loadConfig(Plugin p, File file, String ver, boolean res) { - tip = res; - FileConfig tempConfig; - if (!file.getParentFile().exists()) { - file.getParentFile().mkdirs(); - p.getLogger().info("创建新的文件夹" + file.getParentFile().getAbsolutePath() + "..."); - } - if (!file.exists()) { - fileCreate(p, file, res); - } else { - if (ver != null) { - FileConfig configcheck = init(file); - String version = configcheck.getString("version"); - if (version == null || !version.equals(ver)) { - p.saveResource(file.getName(), true); - p.getLogger().warning("配置文件: " + file.getName() + " 版本过低 正在升级..."); - } - } - } - if (tip) { - p.getLogger().info("载入配置文件: " + file.getName() + (ver != null ? " 版本: " + ver : "")); - } - tempConfig = init(file); - if (cantload) { - p.getLogger().warning("配置文件错误,写入默认的配置文件!"); - fileCreate(p, file, res); - tempConfig = init(file); - } - return tempConfig; - } - -} diff --git a/src/com/bekvon/bukkit/residence/config/FileConfig.java b/src/com/bekvon/bukkit/residence/config/FileConfig.java deleted file mode 100644 index f097d25..0000000 --- a/src/com/bekvon/bukkit/residence/config/FileConfig.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.bekvon.bukkit.residence.config; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; -import java.util.logging.Level; - -import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.configuration.Configuration; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.configuration.file.YamlConstructor; -import org.bukkit.configuration.file.YamlRepresenter; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.representer.Representer; - -import com.google.common.base.Charsets; -import com.google.common.io.Files; - -/** - * An implementation of {@link Configuration} which saves all files in Yaml. Note that this - * implementation is not synchronized. - */ -public class FileConfig extends YamlConfiguration { - - public static boolean cantload = false; - - public static FileConfig init(File file) { - return FileConfig.loadConfiguration(file); - } - - public static FileConfig loadConfiguration(File file) { - Validate.notNull(file, "File cannot be null"); - FileConfig config = new FileConfig(); - try { - config.load(file); - } catch (FileNotFoundException ex) { - cantload = true; - } catch (IOException ex) { - Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex); - cantload = true; - } catch (InvalidConfigurationException ex) { - Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex); - cantload = true; - } - return config; - } - - protected final DumperOptions yamlOptions = new DumperOptions(); - - protected final Representer yamlRepresenter = new YamlRepresenter(); - - protected final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions); - - @Override - public void load(File file) throws FileNotFoundException, IOException, InvalidConfigurationException { - Validate.notNull(file, "File cannot be null"); - final FileInputStream stream = new FileInputStream(file); - load(new InputStreamReader(stream, Charsets.UTF_8)); - } - - @Override - public void load(Reader reader) throws IOException, InvalidConfigurationException { - BufferedReader input = (reader instanceof BufferedReader) ? (BufferedReader) reader - : new BufferedReader(reader); - StringBuilder builder = new StringBuilder(); - try { - String line; - while ((line = input.readLine()) != null) { - builder.append(line); - builder.append('\n'); - } - } finally { - input.close(); - } - loadFromString(builder.toString()); - } - - @Override - public void save(File file) throws IOException { - Validate.notNull(file, "File cannot be null"); - Files.createParentDirs(file); - String data = saveToString(); - Writer writer = new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8); - try { - writer.write(data); - } finally { - writer.close(); - } - } - - @Override - public String saveToString() { - yamlOptions.setIndent(options().indent()); - yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - String header = buildHeader(); - String dump = yaml.dump(getValues(false)); - if (dump.equals(BLANK_CONFIG)) { - dump = ""; - } - return header + dump; - } -} diff --git a/src/com/bekvon/bukkit/residence/ConfigManager.java b/src/main/java/com/bekvon/bukkit/residence/ConfigManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/ConfigManager.java rename to src/main/java/com/bekvon/bukkit/residence/ConfigManager.java diff --git a/src/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java similarity index 95% rename from src/com/bekvon/bukkit/residence/Residence.java rename to src/main/java/com/bekvon/bukkit/residence/Residence.java index f75d443..ae70d75 100644 --- a/src/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -32,7 +32,6 @@ import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import com.bekvon.bukkit.residence.chat.ChatManager; -import com.bekvon.bukkit.residence.config.Config; import com.bekvon.bukkit.residence.config.FileConfig; import com.bekvon.bukkit.residence.economy.EconomyInterface; import com.bekvon.bukkit.residence.economy.EssentialsEcoAdapter; @@ -55,8 +54,8 @@ 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.VersionChecker; import com.bekvon.bukkit.residence.utils.DataBackup; +import com.bekvon.bukkit.residence.utils.VersionChecker; import com.bekvon.bukkit.residence.vaultinterface.ResidenceVaultAdapter; import com.earth2me.essentials.Essentials; @@ -96,6 +95,7 @@ public class Residence extends JavaPlugin { protected static int autosaveBukkitId = -1; protected static boolean initsuccess = false; protected static List resadminToggle; + protected static FileConfig config; private final static String[] validLanguages = { "English", "Chinese" @@ -280,12 +280,11 @@ public class Residence extends JavaPlugin { File outFile = new File(new File(this.getDataFolder(), "Language"), lang + ".yml"); File checkFile = new File(new File(this.getDataFolder(), "Language"), "temp-" + lang + ".yml"); if (outFile.isFile()) { - FileConfig testconfig = new FileConfig(); - testconfig.load(outFile); + FileConfig testconfig = new FileConfig(this, outFile); int oldversion = testconfig.getInt("FieldsVersion", 0); if (!this.writeDefaultFileFromJar(checkFile, "languagefiles/" + lang + ".yml", false)) return false; - FileConfig testconfig2 = new FileConfig(); + FileConfig testconfig2 = new FileConfig(this, checkFile); testconfig2.load(checkFile); int newversion = testconfig2.getInt("FieldsVersion", oldversion); if (checkFile.isFile()) { @@ -310,10 +309,7 @@ public class Residence extends JavaPlugin { @Override public FileConfiguration getConfig() { - if (Config.getInstance() == null) { - Config.load(this); - } - return Config.getInstance(); + return config; } private void loadEssentialsEconomy() { @@ -327,8 +323,7 @@ public class Residence extends JavaPlugin { } public void loadLang(File langFile) throws FileNotFoundException, IOException, InvalidConfigurationException { - FileConfig langconfig = new FileConfig(); - langconfig.load(langFile); + FileConfig langconfig = new FileConfig(this, langFile); helppages = HelpEntry.parseHelp(langconfig, "CommandHelp"); HelpEntry.setLinesPerPage(langconfig.getInt("HelpLinesPerPage", 7)); InformationPager.setLinesPerPage(langconfig.getInt("HelpLinesPerPage", 7)); @@ -595,7 +590,7 @@ public class Residence extends JavaPlugin { @Override public void reloadConfig() { - Config.load(this); + config.reload(); } public void reloadPlugin() { @@ -607,7 +602,7 @@ public class Residence extends JavaPlugin { @Override public void saveConfig() { - Config.save(); + config.save(); } private void saveYml() throws IOException { diff --git a/src/com/bekvon/bukkit/residence/ResidenceCommandListener.java b/src/main/java/com/bekvon/bukkit/residence/ResidenceCommandListener.java similarity index 100% rename from src/com/bekvon/bukkit/residence/ResidenceCommandListener.java rename to src/main/java/com/bekvon/bukkit/residence/ResidenceCommandListener.java diff --git a/src/com/bekvon/bukkit/residence/chat/ChatChannel.java b/src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java similarity index 100% rename from src/com/bekvon/bukkit/residence/chat/ChatChannel.java rename to src/main/java/com/bekvon/bukkit/residence/chat/ChatChannel.java diff --git a/src/com/bekvon/bukkit/residence/chat/ChatManager.java b/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/chat/ChatManager.java rename to src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java diff --git a/src/main/java/com/bekvon/bukkit/residence/config/FileConfig.java b/src/main/java/com/bekvon/bukkit/residence/config/FileConfig.java new file mode 100644 index 0000000..e766c7b --- /dev/null +++ b/src/main/java/com/bekvon/bukkit/residence/config/FileConfig.java @@ -0,0 +1,198 @@ +package com.bekvon.bukkit.residence.config; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.logging.Logger; + +import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; +import org.bukkit.configuration.Configuration; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.configuration.file.YamlConstructor; +import org.bukkit.configuration.file.YamlRepresenter; +import org.bukkit.plugin.Plugin; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.representer.Representer; + +import com.google.common.base.Charsets; +import com.google.common.io.Files; + +/** + * An implementation of {@link Configuration} which saves all files in Yaml. + * Note that this + * implementation is not synchronized. + */ +public class FileConfig extends YamlConfiguration { + protected File file; + protected Logger loger; + protected Plugin plugin; + + protected final DumperOptions yamlOptions = new DumperOptions(); + + protected final Representer yamlRepresenter = new YamlRepresenter(); + + protected final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions); + + private FileConfig(File file) { + Validate.notNull(file, "File cannot be null"); + this.file = file; + loger = Bukkit.getLogger(); + init(file); + } + + private FileConfig(InputStream stream) { + loger = Bukkit.getLogger(); + init(stream); + } + + public FileConfig(Plugin plugin, File file) { + Validate.notNull(file, "File cannot be null"); + Validate.notNull(plugin, "Plugin cannot be null"); + this.plugin = plugin; + this.file = file; + loger = plugin.getLogger(); + check(file); + init(file); + } + + public FileConfig(Plugin plugin, String filename) { + this(plugin, new File(plugin.getDataFolder(), filename)); + } + + private void check(File file) { + String filename = file.getName(); + InputStream stream = plugin.getResource(filename); + + try { + if (!file.exists()) { + file.getParentFile().mkdirs(); + if (stream == null) { + file.createNewFile(); + loger.info("配置文件 " + filename + " 不存在 创建新文件..."); + } else { + plugin.saveResource(filename, true); + loger.info("配置文件 " + filename + " 不存在 从插件释放..."); + } + } else { + if (stream == null) { + return; + } + FileConfig newcfg = new FileConfig(stream); + FileConfig oldcfg = new FileConfig(file); + String newver = newcfg.getString("version"); + String oldver = oldcfg.getString("version"); + if (newver != null && newver != oldver) { + loger.warning("配置文件: " + filename + " 版本 " + oldver + " 过低 正在升级到 " + newver + " ..."); + try { + oldcfg.save(new File(file.getParent(), filename + ".backup")); + loger.warning("配置文件: " + filename + " 已备份为 " + filename + ".backup !"); + } catch (IOException e) { + loger.warning("配置文件: " + filename + "备份失败!"); + } + plugin.saveResource(filename, true); + loger.info("配置文件: " + filename + "升级成功!"); + } + } + } catch (IOException e) { + loger.info("配置文件 " + filename + " 创建失败..."); + } + } + + private void init(File file) { + Validate.notNull(file, "File cannot be null"); + FileInputStream stream; + try { + stream = new FileInputStream(file); + init(stream); + } catch (FileNotFoundException e) { + loger.info("配置文件 " + file.getName() + " 不存在..."); + } + } + + private void init(InputStream stream) { + Validate.notNull(stream, "Stream cannot be null"); + try { + this.load(new InputStreamReader(stream, Charsets.UTF_8)); + } catch (IOException ex) { + loger.info("配置文件 " + file.getName() + " 读取错误..."); + } catch (InvalidConfigurationException ex) { + loger.info("配置文件 " + file.getName() + " 格式错误..."); + } + } + + @Override + public void load(File file) throws FileNotFoundException, IOException, InvalidConfigurationException { + Validate.notNull(file, "File cannot be null"); + final FileInputStream stream = new FileInputStream(file); + load(new InputStreamReader(stream, Charsets.UTF_8)); + } + + @Override + public void load(Reader reader) throws IOException, InvalidConfigurationException { + BufferedReader input = (reader instanceof BufferedReader) ? (BufferedReader) reader : new BufferedReader(reader); + StringBuilder builder = new StringBuilder(); + try { + String line; + while ((line = input.readLine()) != null) { + builder.append(line); + builder.append('\n'); + } + } finally { + input.close(); + } + loadFromString(builder.toString()); + } + + public void reload() { + init(file); + } + + public void save() { + if (file == null) { + loger.info("未定义配置文件路径 保存失败!"); + } + try { + this.save(file); + } catch (IOException e) { + loger.info("配置文件 " + file.getName() + " 保存错误..."); + e.printStackTrace(); + } + } + + @Override + public void save(File file) throws IOException { + Validate.notNull(file, "File cannot be null"); + Files.createParentDirs(file); + String data = saveToString(); + Writer writer = new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8); + try { + writer.write(data); + } finally { + writer.close(); + } + } + + @Override + public String saveToString() { + yamlOptions.setIndent(options().indent()); + yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + String header = buildHeader(); + String dump = yaml.dump(getValues(false)); + if (dump.equals(BLANK_CONFIG)) { + dump = ""; + } + return header + dump; + } +} diff --git a/src/com/bekvon/bukkit/residence/economy/EconomyInterface.java b/src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/EconomyInterface.java rename to src/main/java/com/bekvon/bukkit/residence/economy/EconomyInterface.java diff --git a/src/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java b/src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java rename to src/main/java/com/bekvon/bukkit/residence/economy/EssentialsEcoAdapter.java diff --git a/src/com/bekvon/bukkit/residence/economy/ResidenceBank.java b/src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/ResidenceBank.java rename to src/main/java/com/bekvon/bukkit/residence/economy/ResidenceBank.java diff --git a/src/com/bekvon/bukkit/residence/economy/TransactionManager.java b/src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/TransactionManager.java rename to src/main/java/com/bekvon/bukkit/residence/economy/TransactionManager.java diff --git a/src/com/bekvon/bukkit/residence/economy/rent/RentManager.java b/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/rent/RentManager.java rename to src/main/java/com/bekvon/bukkit/residence/economy/rent/RentManager.java diff --git a/src/com/bekvon/bukkit/residence/economy/rent/RentableLand.java b/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/rent/RentableLand.java rename to src/main/java/com/bekvon/bukkit/residence/economy/rent/RentableLand.java diff --git a/src/com/bekvon/bukkit/residence/economy/rent/RentedLand.java b/src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java similarity index 100% rename from src/com/bekvon/bukkit/residence/economy/rent/RentedLand.java rename to src/main/java/com/bekvon/bukkit/residence/economy/rent/RentedLand.java diff --git a/src/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/CancellableResidenceEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/CancellableResidencePlayerFlagEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceChangedEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceChatEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceCommandEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCommandEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceCommandEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceCommandEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceCreationEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceDeleteEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagChangeEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagCheckEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceFlagEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceOwnerChangeEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidencePlayerEventInterface.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEventInterface.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidencePlayerEventInterface.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerEventInterface.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidencePlayerFlagEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceRenameEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceRentEvent.java diff --git a/src/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java b/src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java similarity index 100% rename from src/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java rename to src/main/java/com/bekvon/bukkit/residence/event/ResidenceTPEvent.java diff --git a/src/com/bekvon/bukkit/residence/itemlist/ItemList.java b/src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java similarity index 100% rename from src/com/bekvon/bukkit/residence/itemlist/ItemList.java rename to src/main/java/com/bekvon/bukkit/residence/itemlist/ItemList.java diff --git a/src/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java b/src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java similarity index 100% rename from src/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java rename to src/main/java/com/bekvon/bukkit/residence/itemlist/ResidenceItemList.java diff --git a/src/com/bekvon/bukkit/residence/itemlist/WorldItemList.java b/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java similarity index 100% rename from src/com/bekvon/bukkit/residence/itemlist/WorldItemList.java rename to src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemList.java diff --git a/src/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java b/src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java rename to src/main/java/com/bekvon/bukkit/residence/itemlist/WorldItemManager.java diff --git a/src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java similarity index 100% rename from src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java rename to src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java diff --git a/src/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java similarity index 100% rename from src/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java rename to src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java diff --git a/src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java similarity index 100% rename from src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java rename to src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java diff --git a/src/com/bekvon/bukkit/residence/permissions/PermissionGroup.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java similarity index 100% rename from src/com/bekvon/bukkit/residence/permissions/PermissionGroup.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java diff --git a/src/com/bekvon/bukkit/residence/permissions/PermissionManager.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/permissions/PermissionManager.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java diff --git a/src/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java similarity index 100% rename from src/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java diff --git a/src/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java b/src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java similarity index 100% rename from src/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java rename to src/main/java/com/bekvon/bukkit/residence/persistance/YMLSaveHelper.java diff --git a/src/com/bekvon/bukkit/residence/protection/ClaimedResidence.java b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/ClaimedResidence.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java diff --git a/src/com/bekvon/bukkit/residence/protection/CuboidArea.java b/src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/CuboidArea.java rename to src/main/java/com/bekvon/bukkit/residence/protection/CuboidArea.java diff --git a/src/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/FlagPermissions.java rename to src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java diff --git a/src/com/bekvon/bukkit/residence/protection/LeaseManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/LeaseManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java diff --git a/src/com/bekvon/bukkit/residence/protection/PermissionListManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/PermissionListManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/PermissionListManager.java diff --git a/src/com/bekvon/bukkit/residence/protection/ResidenceManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/ResidenceManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java diff --git a/src/com/bekvon/bukkit/residence/protection/ResidencePermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/ResidencePermissions.java rename to src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java diff --git a/src/com/bekvon/bukkit/residence/protection/WorldFlagManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/protection/WorldFlagManager.java rename to src/main/java/com/bekvon/bukkit/residence/protection/WorldFlagManager.java diff --git a/src/com/bekvon/bukkit/residence/selection/SelectionManager.java b/src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/selection/SelectionManager.java rename to src/main/java/com/bekvon/bukkit/residence/selection/SelectionManager.java diff --git a/src/com/bekvon/bukkit/residence/selection/WECUI.java b/src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java similarity index 100% rename from src/com/bekvon/bukkit/residence/selection/WECUI.java rename to src/main/java/com/bekvon/bukkit/residence/selection/WECUI.java diff --git a/src/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java b/src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java rename to src/main/java/com/bekvon/bukkit/residence/selection/WorldEditSelectionManager.java diff --git a/src/com/bekvon/bukkit/residence/text/Language.java b/src/main/java/com/bekvon/bukkit/residence/text/Language.java similarity index 100% rename from src/com/bekvon/bukkit/residence/text/Language.java rename to src/main/java/com/bekvon/bukkit/residence/text/Language.java diff --git a/src/com/bekvon/bukkit/residence/text/help/HelpEntry.java b/src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java similarity index 100% rename from src/com/bekvon/bukkit/residence/text/help/HelpEntry.java rename to src/main/java/com/bekvon/bukkit/residence/text/help/HelpEntry.java diff --git a/src/com/bekvon/bukkit/residence/text/help/InformationPager.java b/src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java similarity index 100% rename from src/com/bekvon/bukkit/residence/text/help/InformationPager.java rename to src/main/java/com/bekvon/bukkit/residence/text/help/InformationPager.java diff --git a/src/com/bekvon/bukkit/residence/utils/ActionBar.java b/src/main/java/com/bekvon/bukkit/residence/utils/ActionBar.java similarity index 100% rename from src/com/bekvon/bukkit/residence/utils/ActionBar.java rename to src/main/java/com/bekvon/bukkit/residence/utils/ActionBar.java diff --git a/src/com/bekvon/bukkit/residence/utils/DataBackup.java b/src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java similarity index 100% rename from src/com/bekvon/bukkit/residence/utils/DataBackup.java rename to src/main/java/com/bekvon/bukkit/residence/utils/DataBackup.java diff --git a/src/com/bekvon/bukkit/residence/utils/VersionChecker.java b/src/main/java/com/bekvon/bukkit/residence/utils/VersionChecker.java similarity index 100% rename from src/com/bekvon/bukkit/residence/utils/VersionChecker.java rename to src/main/java/com/bekvon/bukkit/residence/utils/VersionChecker.java diff --git a/src/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java b/src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java similarity index 100% rename from src/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java rename to src/main/java/com/bekvon/bukkit/residence/vaultinterface/ResidenceVaultAdapter.java diff --git a/src/config.yml b/src/main/resources/config.yml similarity index 100% rename from src/config.yml rename to src/main/resources/config.yml diff --git a/src/languagefiles/Chinese.yml b/src/main/resources/languagefiles/Chinese.yml similarity index 100% rename from src/languagefiles/Chinese.yml rename to src/main/resources/languagefiles/Chinese.yml diff --git a/src/languagefiles/English.yml b/src/main/resources/languagefiles/English.yml similarity index 100% rename from src/languagefiles/English.yml rename to src/main/resources/languagefiles/English.yml diff --git a/src/plugin.yml b/src/main/resources/plugin.yml similarity index 93% rename from src/plugin.yml rename to src/main/resources/plugin.yml index effdd94..a06faf1 100644 --- a/src/plugin.yml +++ b/src/main/resources/plugin.yml @@ -5,7 +5,7 @@ website: http://ci.citycraft.cn:8800/jenkins/job/Residence/ description: Cuboid Residence Plugin authors: [bekvon,nate302,t00thpick1,喵♂呜] contributors: [lemon42,smbarbour,inorixu,Shayana_fr] -softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit,My Worlds] +softdepend: [Vault,Essentials,RealPlugin,BOSEconomy,iConomy,bPermissions,PermissionsBukkit,Permissions,WorldEdit] commands: res: description: Manage Residences