diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/events')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java | 10 | ||||
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java index 4ce7dc4..8413cc2 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java @@ -1,9 +1,8 @@ package net.tylermurphy.hideAndSeek.events; -import static net.tylermurphy.hideAndSeek.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.entity.EntityType; @@ -13,6 +12,7 @@ import org.bukkit.inventory.meta.FireworkMeta; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.util.Util; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; public class Taunt { @@ -65,8 +65,8 @@ public class Taunt { } } if(taunted != null) { - taunted.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "Oh no! You have been chosed to be taunted."); - Util.broadcastMessage(tauntPrefix + " A random hider will be taunted in the next 30s"); + taunted.sendMessage(message("TAUNTED").toString()); + Util.broadcastMessage(tauntPrefix + message("TAUNT")); tauntPlayer = taunted.getName(); Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { public void run() { @@ -87,7 +87,7 @@ public class Taunt { .withTrail() .build()); fw.setFireworkMeta(fwm); - Util.broadcastMessage(tauntPrefix + " Taunt has been activated"); + Util.broadcastMessage(tauntPrefix + message("TAUNT_ACTIVATE")); } tauntPlayer = ""; waitTaunt(); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java index 70c4986..5884a94 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java @@ -1,5 +1,8 @@ package net.tylermurphy.hideAndSeek.events; +import static net.tylermurphy.hideAndSeek.configuration.Localization.*; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; + import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.WorldBorder; @@ -7,8 +10,6 @@ import org.bukkit.WorldBorder; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.util.Util; -import static net.tylermurphy.hideAndSeek.Config.*; - public class Worldborder { private final int temp; @@ -28,7 +29,7 @@ public class Worldborder { private void decreaceWorldborder() { if(temp != Main.plugin.gameId) return; if(currentWorldborderSize-100 > 100) { - Util.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s"); + Util.broadcastMessage(worldborderPrefix + message("WORLDBORDER_DECREASING")); currentWorldborderSize -= 100; World world = Bukkit.getWorld("hideandseek_"+spawnWorld); WorldBorder border = world.getWorldBorder(); |