rebuild priject...

Signed-off-by: j502647092 <jtb1@163.com>
master
j502647092 2015-05-28 20:58:37 +08:00
parent e0604098ae
commit 00470cb3b4
2 changed files with 80 additions and 76 deletions

View File

@ -1,50 +1,52 @@
package cn.citycraft.ResFly; package cn.citycraft.ResFly;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import cn.citycraft.ResFly.config.Config; import cn.citycraft.ResFly.config.Config;
import cn.citycraft.ResFly.listen.PlayerListen; import cn.citycraft.ResFly.listen.PlayerListen;
import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.bekvon.bukkit.residence.protection.FlagPermissions;
public class ResFly extends JavaPlugin { public class ResFly extends JavaPlugin {
public String servername; public String servername;
public String pluginname; public String pluginname;
public void onLoad() { public String getfullmsg(String path) {
Config.load(this); return servername + pluginname + " " + getmessage(path);
servername = getmessage("servername"); }
pluginname = getmessage("pluginname");
} public String getmessage(String path) {
return Config.getMessage(path);
public void onEnable() { }
PluginManager pm = this.getServer().getPluginManager();
Plugin res = pm.getPlugin("Residence"); @Override
if (Config.getInstance().getBoolean("ResFly.Enable", true)) { public void onEnable() {
if (res != null && res.isEnabled()) { PluginManager pm = this.getServer().getPluginManager();
FlagPermissions.addFlag("fly"); Plugin res = pm.getPlugin("Residence");
FlagPermissions.addResidenceOnlyFlag("fly"); if (Config.getInstance().getBoolean("ResFly.Enable", true)) {
Bukkit.getPluginManager() if (res != null && res.isEnabled()) {
.registerEvents(new PlayerListen(this), this); FlagPermissions.addFlag("fly");
getLogger().info("玩家领地飞行控制已加载!"); FlagPermissions.addResidenceOnlyFlag("fly");
} else { Bukkit.getPluginManager()
getLogger().info("未找到领地插件停止加载领地飞行!"); .registerEvents(new PlayerListen(this), this);
pm.disablePlugin(this); getLogger().info("玩家领地飞行控制已加载!");
return; } else {
} getLogger().info("未找到领地插件停止加载领地飞行!");
} pm.disablePlugin(this);
} return;
}
public String getfullmsg(String path) { }
return servername + pluginname + " " + getmessage(path); }
}
@Override
public String getmessage(String path) { public void onLoad() {
return Config.getMessage(path); Config.load(this);
} servername = getmessage("servername");
pluginname = getmessage("pluginname");
} }
}

View File

@ -30,15 +30,9 @@ import com.google.common.io.Files;
*/ */
public class FileConfig extends YamlConfiguration { public class FileConfig extends YamlConfiguration {
protected final DumperOptions yamlOptions = new DumperOptions();
protected final Representer yamlRepresenter = new YamlRepresenter();
protected final Yaml yaml = new Yaml(new YamlConstructor(),
yamlRepresenter, yamlOptions);
public static FileConfig init(File file) { public static FileConfig init(File file) {
return FileConfig.loadConfiguration(file); return FileConfig.loadConfiguration(file);
} }
public static FileConfig loadConfiguration(File file) { public static FileConfig loadConfiguration(File file) {
Validate.notNull(file, "File cannot be null"); Validate.notNull(file, "File cannot be null");
FileConfig config = new FileConfig(); FileConfig config = new FileConfig();
@ -52,6 +46,34 @@ public class FileConfig extends YamlConfiguration {
} }
return config; 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 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 @Override
public String saveToString() { public String saveToString() {
@ -65,24 +87,4 @@ public class FileConfig extends YamlConfiguration {
} }
return header + dump; return header + dump;
} }
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));
}
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();
}
}
} }