Update

benjaminforras · Dec 23, 2016 · 80beb84 · 80beb84
1 parent b71b507
commit 80beb84
Showing 36 changed files with 252 additions and 248 deletions.
diff --git a/src/main/java/net/techguard/izone/commands/BaseCommand.java b/src/main/java/net/techguard/izone/commands/BaseCommand.java
@@ -1,4 +1,4 @@
-package net.techguard.izone.commands;
+package net.techguard.izone.Commands;
 
 import net.techguard.izone.iZone;
 import org.bukkit.command.ConsoleCommandSender;

diff --git a/src/main/java/net/techguard/izone/commands/CommandManager.java b/src/main/java/net/techguard/izone/commands/CommandManager.java
@@ -1,4 +1,4 @@
-package net.techguard.izone.commands;
+package net.techguard.izone.Commands;
 
 import net.techguard.izone.iZone;
 import org.bukkit.command.CommandSender;
@@ -8,7 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class CommandManager {
 	private final List<BaseCommand> commands;
@@ -60,7 +60,7 @@ else if ((sender instanceof ConsoleCommandSender))
 				return true;
 			} catch (Exception e)
 			{
-				sender.sendMessage(iZone.getPrefix() + phrase("chat_error"));
+				sender.sendMessage(iZone.getPrefix() + tl("chat_error"));
 				e.printStackTrace();
 			}
 		}

diff --git a/src/main/java/net/techguard/izone/commands/iZoneCommand.java b/src/main/java/net/techguard/izone/commands/iZoneCommand.java
@@ -1,12 +1,12 @@
-package net.techguard.izone.commands;
+package net.techguard.izone.Commands;
 
 import net.techguard.izone.Variables;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.ZoneManager;
+import net.techguard.izone.Managers.ZoneManager;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class iZoneCommand extends BaseCommand {
 	public iZoneCommand(iZone instance) {
@@ -22,15 +22,15 @@ public void onPlayerCommand(Player player, String[] cmd) {
 				{
 					ZoneManager.getZones().clear();
 					iZone.instance.reloadConfiguration();
-					player.sendMessage(iZone.getPrefix() + phrase("chat_reload", iZone.instance.getDescription().getVersion()));
+					player.sendMessage(iZone.getPrefix() + tl("chat_reload", iZone.instance.getDescription().getVersion()));
 				}
 				else
 				{
-					player.sendMessage(iZone.getPrefix() + phrase("chat_nopermission"));
+					player.sendMessage(iZone.getPrefix() + tl("chat_nopermission"));
 				}
 			}
 		}
-		player.sendMessage(iZone.getPrefix() + phrase("chat_version", this.plugin.getDescription().getName(), (this.plugin.getDescription().getAuthors().get(0) + ", " + this.plugin.getDescription().getAuthors().get(1))));
+		player.sendMessage(iZone.getPrefix() + tl("chat_version", this.plugin.getDescription().getName(), (this.plugin.getDescription().getAuthors().get(0) + ", " + this.plugin.getDescription().getAuthors().get(1))));
 	}
 
 	public void onSystemCommand(ConsoleCommandSender player, String[] cmd) {
@@ -41,10 +41,10 @@ public void onSystemCommand(ConsoleCommandSender player, String[] cmd) {
 				ZoneManager.getZones().clear();
 				iZone.instance.reloadConfiguration();
 				iZone.instance.loadLanguageFile();
-				player.sendMessage(iZone.getPrefix() + phrase("chat_reload", iZone.instance.getDescription().getVersion()));
+				player.sendMessage(iZone.getPrefix() + tl("chat_reload", iZone.instance.getDescription().getVersion()));
 			}
 		}
-		player.sendMessage(iZone.getPrefix() + phrase("chat_version", this.plugin.getDescription().getName(), (this.plugin.getDescription().getAuthors().get(0) + ", " + this.plugin.getDescription().getAuthors().get(1))));
+		player.sendMessage(iZone.getPrefix() + tl("chat_version", this.plugin.getDescription().getName(), (this.plugin.getDescription().getAuthors().get(0) + ", " + this.plugin.getDescription().getAuthors().get(1))));
 	}
 
 	protected String[] getUsage() {

diff --git a/src/main/java/net/techguard/izone/commands/zmod/allowCommand.java b/src/main/java/net/techguard/izone/commands/zmod/allowCommand.java
@@ -1,16 +1,16 @@
-package net.techguard.izone.commands.zmod;
+package net.techguard.izone.Commands.zmod;
 
 import net.milkbowl.vault.economy.Economy;
 import net.techguard.izone.Variables;
-import net.techguard.izone.configuration.ConfigManager;
+import net.techguard.izone.Configuration.ConfigManager;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.VaultManager;
-import net.techguard.izone.managers.ZoneManager;
-import net.techguard.izone.zones.Zone;
+import net.techguard.izone.Managers.VaultManager;
+import net.techguard.izone.Managers.ZoneManager;
+import net.techguard.izone.Zones.Zone;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class allowCommand extends zmodBase {
 	public allowCommand(iZone instance) {
@@ -26,7 +26,7 @@ public void onCommand(Player player, String[] cmd) {
 			Zone zone = ZoneManager.getZone(name);
 			if ((!zone.getOwners().contains(player.getName())) && (!player.hasPermission(Variables.PERMISSION_OWNER)))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_notowner"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_notowner"));
 				return;
 			}
 			if (!zone.getAllowed().contains(target))
@@ -41,21 +41,21 @@ public void onCommand(Player player, String[] cmd) {
 					}
 					else
 					{
-						player.sendMessage(iZone.getPrefix() + phrase("notenough_money", vault.format(ConfigManager.getAllowPlayerPrice())));
+						player.sendMessage(iZone.getPrefix() + tl("notenough_money", vault.format(ConfigManager.getAllowPlayerPrice())));
 						return;
 					}
 				}
 				zone.Add(target);
-				player.sendMessage(iZone.getPrefix() + phrase("zone_adduser", player));
+				player.sendMessage(iZone.getPrefix() + tl("zone_adduser", player));
 			}
 			else
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_cantadduser"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_cantadduser"));
 			}
 		}
 		else
 		{
-			player.sendMessage(iZone.getPrefix() + phrase("zone_not_found"));
+			player.sendMessage(iZone.getPrefix() + tl("zone_not_found"));
 		}
 	}
 

diff --git a/src/main/java/net/techguard/izone/commands/zmod/createCommand.java b/src/main/java/net/techguard/izone/commands/zmod/createCommand.java
@@ -1,20 +1,20 @@
-package net.techguard.izone.commands.zmod;
+package net.techguard.izone.Commands.zmod;
 
 import net.milkbowl.vault.economy.Economy;
 import net.techguard.izone.Variables;
-import net.techguard.izone.configuration.ConfigManager;
+import net.techguard.izone.Configuration.ConfigManager;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.VaultManager;
-import net.techguard.izone.managers.ZoneManager;
-import net.techguard.izone.zones.Settings;
-import net.techguard.izone.zones.Zone;
+import net.techguard.izone.Managers.VaultManager;
+import net.techguard.izone.Managers.ZoneManager;
+import net.techguard.izone.Zones.Settings;
+import net.techguard.izone.Zones.Zone;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class createCommand extends zmodBase {
 	public createCommand(iZone instance) {
@@ -30,8 +30,8 @@ public void onCommand(Player player, String[] cmd) {
 			Location[] c = {settings.getBorder1(), settings.getBorder2()};
 			if ((c[0] == null) || (c[1] == null))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_create_border"));
-				player.sendMessage(iZone.getPrefix() + phrase("zone_create_hint", Material.getMaterial(ConfigManager.getDefineTool()).name()));
+				player.sendMessage(iZone.getPrefix() + tl("zone_create_border"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_create_hint", Material.getMaterial(ConfigManager.getDefineTool()).name()));
 				return;
 			}
 
@@ -44,12 +44,12 @@ public void onCommand(Player player, String[] cmd) {
 					if (permission.equals("max"))
 					{
 						String size = settings.getOwnedZones() + "/" + settings.getMaxZones();
-						player.sendMessage(iZone.getPrefix() + phrase("zone_create_many", size));
+						player.sendMessage(iZone.getPrefix() + tl("zone_create_many", size));
 					}
 					if (permission.startsWith("size"))
 					{
 						Vector maxSize = settings.getMaxSize();
-						player.sendMessage(iZone.getPrefix() + phrase("zone_create_big", permission.split(":")[1], maxSize.getX(), maxSize.getY(), maxSize.getZ()));
+						player.sendMessage(iZone.getPrefix() + tl("zone_create_big", permission.split(":")[1], maxSize.getX(), maxSize.getY(), maxSize.getZ()));
 					}
 					return;
 				}
@@ -65,23 +65,23 @@ public void onCommand(Player player, String[] cmd) {
 				}
 				else
 				{
-					player.sendMessage(iZone.getPrefix() + phrase("notenough_money", vault.format(ConfigManager.getCreateZonePrice())));
+					player.sendMessage(iZone.getPrefix() + tl("notenough_money", vault.format(ConfigManager.getCreateZonePrice())));
 					return;
 				}
 			}
 			if (ZoneManager.checkZoneInside(c))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_create_error"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_create_error"));
 				return;
 			}
 			Zone zone = ZoneManager.add(name, c);
 			zone.Add("o:" + player.getName());
 
-			player.sendMessage(iZone.getPrefix() + phrase("zone_create_success", zone.getName()));
+			player.sendMessage(iZone.getPrefix() + tl("zone_create_success", zone.getName()));
 		}
 		else
 		{
-			player.sendMessage(iZone.getPrefix() + phrase("zone_create_error2"));
+			player.sendMessage(iZone.getPrefix() + tl("zone_create_error2"));
 		}
 	}
 

diff --git a/src/main/java/net/techguard/izone/commands/zmod/deleteCommand.java b/src/main/java/net/techguard/izone/commands/zmod/deleteCommand.java
@@ -1,18 +1,18 @@
-package net.techguard.izone.commands.zmod;
+package net.techguard.izone.Commands.zmod;
 
 import net.milkbowl.vault.economy.Economy;
 import net.techguard.izone.Variables;
-import net.techguard.izone.configuration.ConfigManager;
+import net.techguard.izone.Configuration.ConfigManager;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.VaultManager;
-import net.techguard.izone.managers.ZoneManager;
-import net.techguard.izone.zones.Zone;
+import net.techguard.izone.Managers.VaultManager;
+import net.techguard.izone.Managers.ZoneManager;
+import net.techguard.izone.Zones.Zone;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.io.File;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class deleteCommand extends zmodBase {
 	public deleteCommand(iZone instance) {
@@ -27,7 +27,7 @@ public void onCommand(Player player, String[] cmd) {
 			Zone zone = ZoneManager.getZone(name);
 			if ((!zone.getOwners().contains(player.getName())) && (!player.hasPermission(Variables.PERMISSION_OWNER)))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_notowner"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_notowner"));
 				return;
 			}
 			if (ConfigManager.isVaultEnabled())
@@ -40,18 +40,18 @@ public void onCommand(Player player, String[] cmd) {
 				}
 				else
 				{
-					player.sendMessage(iZone.getPrefix() + phrase("notenough_money", vault.format(ConfigManager.getDeleteZonePrice())));
+					player.sendMessage(iZone.getPrefix() + tl("notenough_money", vault.format(ConfigManager.getDeleteZonePrice())));
 					return;
 				}
 			}
 			ZoneManager.delete(zone);
 			File file = zone.getSaveFile();
 			file.delete();
-			player.sendMessage(iZone.getPrefix() + phrase("zone_deleted", zone.getName()));
+			player.sendMessage(iZone.getPrefix() + tl("zone_deleted", zone.getName()));
 		}
 		else
 		{
-			player.sendMessage(iZone.getPrefix() + phrase("zone_not_found"));
+			player.sendMessage(iZone.getPrefix() + tl("zone_not_found"));
 		}
 	}
 

diff --git a/src/main/java/net/techguard/izone/commands/zmod/disallowCommand.java b/src/main/java/net/techguard/izone/commands/zmod/disallowCommand.java
@@ -1,16 +1,16 @@
-package net.techguard.izone.commands.zmod;
+package net.techguard.izone.Commands.zmod;
 
 import net.milkbowl.vault.economy.Economy;
 import net.techguard.izone.Variables;
-import net.techguard.izone.configuration.ConfigManager;
+import net.techguard.izone.Configuration.ConfigManager;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.VaultManager;
-import net.techguard.izone.managers.ZoneManager;
-import net.techguard.izone.zones.Zone;
+import net.techguard.izone.Managers.VaultManager;
+import net.techguard.izone.Managers.ZoneManager;
+import net.techguard.izone.Zones.Zone;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class disallowCommand extends zmodBase {
 	public disallowCommand(iZone instance) {
@@ -26,7 +26,7 @@ public void onCommand(Player player, String[] cmd) {
 			Zone zone = ZoneManager.getZone(name);
 			if ((!zone.getOwners().contains(player.getName())) && (!player.hasPermission(Variables.PERMISSION_OWNER)))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_notowner"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_notowner"));
 				return;
 			}
 			if (zone.getAllowed().contains(target))
@@ -41,21 +41,21 @@ public void onCommand(Player player, String[] cmd) {
 					}
 					else
 					{
-						player.sendMessage(iZone.getPrefix() + phrase("notenough_money", vault.format(ConfigManager.getDisallowPlayerPrice())));
+						player.sendMessage(iZone.getPrefix() + tl("notenough_money", vault.format(ConfigManager.getDisallowPlayerPrice())));
 						return;
 					}
 				}
 				zone.Remove(target);
-				player.sendMessage(iZone.getPrefix() + phrase("zone_removeuser", target));
+				player.sendMessage(iZone.getPrefix() + tl("zone_removeuser", target));
 			}
 			else
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_cantremoveuser"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_cantremoveuser"));
 			}
 		}
 		else
 		{
-			player.sendMessage(iZone.getPrefix() + phrase("zone_not_found"));
+			player.sendMessage(iZone.getPrefix() + tl("zone_not_found"));
 		}
 	}
 

diff --git a/src/main/java/net/techguard/izone/commands/zmod/expandCommand.java b/src/main/java/net/techguard/izone/commands/zmod/expandCommand.java
@@ -1,16 +1,16 @@
-package net.techguard.izone.commands.zmod;
+package net.techguard.izone.Commands.zmod;
 
 import net.techguard.izone.Variables;
 import net.techguard.izone.iZone;
-import net.techguard.izone.managers.ZoneManager;
-import net.techguard.izone.zones.Settings;
-import net.techguard.izone.zones.Zone;
+import net.techguard.izone.Managers.ZoneManager;
+import net.techguard.izone.Zones.Settings;
+import net.techguard.izone.Zones.Zone;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import static net.techguard.izone.Phrases.phrase;
+import static net.techguard.izone.Utils.Localization.I18n.tl;
 
 public class expandCommand extends zmodBase {
 	public expandCommand(iZone instance) {
@@ -25,7 +25,7 @@ public void onCommand(Player player, String[] cmd) {
 			Zone zone = ZoneManager.getZone(name);
 			if ((!zone.getOwners().contains(player.getName())) && (!player.hasPermission(Variables.PERMISSION_OWNER)))
 			{
-				player.sendMessage(iZone.getPrefix() + phrase("zone_notowner"));
+				player.sendMessage(iZone.getPrefix() + tl("zone_notowner"));
 				return;
 			}
 			BlockFace  dir          = BlockFace.SELF;
@@ -116,16 +116,16 @@ else if (dir == BlockFace.WEST)
 			if (permission.startsWith("size"))
 			{
 				Vector maxSize = Settings.getSett(player).getMaxSize();
-				player.sendMessage(iZone.getPrefix() + phrase("zone_expand_big", permission.split(":")[1], (int) maxSize.getX(), (int) maxSize.getY(), (int) maxSize.getZ()));
+				player.sendMessage(iZone.getPrefix() + tl("zone_expand_big", permission.split(":")[1], (int) maxSize.getX(), (int) maxSize.getY(), (int) maxSize.getZ()));
 				return;
 			}
 			zone.setBorder(1, newerBorders[0]);
 			zone.setBorder(2, newerBorders[1]);
-			player.sendMessage(iZone.getPrefix() + phrase("zone_expand_success", zone.getName(), size, dir));
+			player.sendMessage(iZone.getPrefix() + tl("zone_expand_success", zone.getName(), size, dir));
 		}
 		else
 		{
-			player.sendMessage(iZone.getPrefix() + phrase("zone_not_found"));
+			player.sendMessage(iZone.getPrefix() + tl("zone_not_found"));
 		}
 	}