From 23bb21d8d75e1f631a6d5f27c87a843c02d651a3 Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Thu, 28 May 2015 20:58:54 +0800
Subject: [PATCH] rebuild priject...

Signed-off-by: j502647092 <jtb1@163.com>
---
 .../TeleportRandom/TeleportRandom.java        | 35 ++++++------
 src/cn/citycraft/Utils/config/FileConfig.java | 54 ++++++++++---------
 2 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/cn/citycraft/TeleportRandom/TeleportRandom.java b/src/cn/citycraft/TeleportRandom/TeleportRandom.java
index 6d79568..8a914d2 100644
--- a/src/cn/citycraft/TeleportRandom/TeleportRandom.java
+++ b/src/cn/citycraft/TeleportRandom/TeleportRandom.java
@@ -17,12 +17,12 @@ public class TeleportRandom extends JavaPlugin implements CommandExecutor {
 	public String servername;
 	public String pluginname;
 
-	public void onLoad() {
-		Config.load(this, "1.0");
-		servername = getmessage("servername");
-		pluginname = getmessage("pluginname");
+	public String getmessage(String path) {
+		String message = Config.getMessage(path).replaceAll("&", "§");
+		return message;
 	}
 
+	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String string,
 			String[] args) {
 		if (cmd.getName().equalsIgnoreCase("tpr")) {
@@ -50,6 +50,13 @@ public class TeleportRandom extends JavaPlugin implements CommandExecutor {
 		return false;
 	}
 
+	@Override
+	public void onLoad() {
+		Config.load(this, "1.0");
+		servername = getmessage("servername");
+		pluginname = getmessage("pluginname");
+	}
+
 	public void RandomTP(String[] limit, Player p) {
 		Random rr = new Random();
 		int lr = Config.getInstance().getInt("default");
@@ -92,11 +99,12 @@ public class TeleportRandom extends JavaPlugin implements CommandExecutor {
 				p.sendMessage(servername + pluginname
 						+ getmessage("Message.Protect"));
 				this.getServer().getScheduler()
-						.runTaskLater(this, new Runnable() {
-							public void run() {
-								trl.getBlock().setType(rbm);
-							}
-						}, 200);
+				.runTaskLater(this, new Runnable() {
+					@Override
+					public void run() {
+						trl.getBlock().setType(rbm);
+					}
+				}, 200);
 			}
 		}
 		Location nrl = new Location(world, x, y + 3, z);
@@ -104,12 +112,7 @@ public class TeleportRandom extends JavaPlugin implements CommandExecutor {
 		p.sendMessage(servername
 				+ pluginname
 				+ getmessage("Message.Tip")
-						.replaceAll("%world%", world.getName())
-						.replaceAll("%x%", x + "").replaceAll("%z%", z + ""));
-	}
-
-	public String getmessage(String path) {
-		String message = Config.getMessage(path).replaceAll("&", "§");
-		return message;
+				.replaceAll("%world%", world.getName())
+				.replaceAll("%x%", x + "").replaceAll("%z%", z + ""));
 	}
 }
diff --git a/src/cn/citycraft/Utils/config/FileConfig.java b/src/cn/citycraft/Utils/config/FileConfig.java
index f381ae8..7671cbf 100644
--- a/src/cn/citycraft/Utils/config/FileConfig.java
+++ b/src/cn/citycraft/Utils/config/FileConfig.java
@@ -30,15 +30,9 @@ import com.google.common.io.Files;
  */
 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) {
 		return FileConfig.loadConfiguration(file);
 	}
-
 	public static FileConfig loadConfiguration(File file) {
 		Validate.notNull(file, "File cannot be null");
 		FileConfig config = new FileConfig();
@@ -52,6 +46,34 @@ public class FileConfig extends YamlConfiguration {
 		}
 		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
 	public String saveToString() {
@@ -65,24 +87,4 @@ public class FileConfig extends YamlConfiguration {
 		}
 		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();
-		}
-	}
 }