From 7ba097c640e3cd1b022de55fe88d8e881c5785fd Mon Sep 17 00:00:00 2001 From: "Luke Anderson (stuntguy3000)" Date: Wed, 16 Apr 2014 16:13:51 +0930 Subject: [PATCH] Improve messages/formatting --- Essentials/src/com/earth2me/essentials/Teleport.java | 2 +- .../com/earth2me/essentials/commands/Commandtree.java | 1 - Essentials/src/info.txt | 2 +- Essentials/src/messages.properties | 11 ++++++----- Essentials/src/messages_en.properties | 7 ++++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index c17181dd8..2267d18ed 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -148,7 +148,7 @@ public class Teleport implements net.ess3.api.ITeleport { ITarget target = new PlayerTarget(entity); teleport(teleportOwner, target, chargeFor, cause); - teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); + teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName())); } //This is used when teleporting to stored location diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java index 6240cf435..1a50e8f55 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java @@ -22,7 +22,6 @@ public class Commandtree extends EssentialsCommand TreeType tree = TreeType.BIRCH; try // update check { - if (args.length < 1) { throw new NotEnoughArgumentsException(); diff --git a/Essentials/src/info.txt b/Essentials/src/info.txt index 6a89c2201..fabe982a3 100644 --- a/Essentials/src/info.txt +++ b/Essentials/src/info.txt @@ -53,4 +53,4 @@ Minecraft colors: &6Time of world:&r {WORLDTIME24} &6Date of world:&r {WORLDDATE} &6Plugin list:&r {PLUGINS} -&6Version of Craftbukkit:&r {VERSION} +&6Version of CraftBukkit:&r {VERSION} diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 084f0eff7..e128d4b8d 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -420,11 +420,12 @@ teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you. teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76. teleportTop=\u00a76Teleporting to top. teleportationCommencing=\u00a76Teleportation commencing... -teleportationDisabled=\u00a76Teleportation disabled. -teleportationDisabledFor=\u00a76Teleportation disabled for \u00a7c{0}\u00a76. -teleportationEnabled=\u00a76Teleportation enabled. -teleportationEnabledFor=\u00a76Teleportation enabled for \u00a7c{0}\u00a76. +teleportationDisabled=\u00a76Teleportation \u00a7cdisabled\u00a76. +teleportationDisabledFor=\u00a76Teleportation \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76. +teleportationEnabled=\u00a76Teleportation \u00a7cenabled\u00a76. +teleportationEnabledFor=\u00a76Teleportation \u00a7cenabled \u00a76for \u00a7c{0}\u00a76. teleporting=\u00a76Teleporting... +teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76. tempBanned=Temporarily banned from server for {0}. tempbanExempt=\u00a74You may not tempban that player. thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world. @@ -535,7 +536,7 @@ ignoreExempt=\u00a74You cannot ignore that player. unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled. noMetaJson=JSON Metadata is not supported in this version of Bukkit. maxMoney=\u00a74This transaction would exceed the balance limit for this account. -skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76. +skullChanged=\u00a76Skull changed to \u00a7c{0}\u00a76. alphaNames=\u00a74Player names can only contain letters, numbers and underscores. givenSkull=\u00a76You have been given the skull of \u00a7c{0}\u00a76. noPermissionSkull=\u00a74You do not have permission to modify that skull. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 084f0eff7..7d5f222d9 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -420,9 +420,9 @@ teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you. teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76. teleportTop=\u00a76Teleporting to top. teleportationCommencing=\u00a76Teleportation commencing... -teleportationDisabled=\u00a76Teleportation disabled. +teleportationDisabled=\u00a76Teleportation \u00a7disabled\u00a76. teleportationDisabledFor=\u00a76Teleportation disabled for \u00a7c{0}\u00a76. -teleportationEnabled=\u00a76Teleportation enabled. +teleportationEnabled=\u00a76Teleportation \u00a7enabled\u00a76. teleportationEnabledFor=\u00a76Teleportation enabled for \u00a7c{0}\u00a76. teleporting=\u00a76Teleporting... tempBanned=Temporarily banned from server for {0}. @@ -535,7 +535,7 @@ ignoreExempt=\u00a74You cannot ignore that player. unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled. noMetaJson=JSON Metadata is not supported in this version of Bukkit. maxMoney=\u00a74This transaction would exceed the balance limit for this account. -skullChanged=\u00a76Skull changed to \u00a7c{0}.\u00a76. +skullChanged=\u00a76Skull changed to \u00a7c{0}\u00a76. alphaNames=\u00a74Player names can only contain letters, numbers and underscores. givenSkull=\u00a76You have been given the skull of \u00a7c{0}\u00a76. noPermissionSkull=\u00a74You do not have permission to modify that skull. @@ -547,3 +547,4 @@ mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters. mailDelay=Too many mails have been sent within the last minute. Maximum\: {0} seenAccounts=\u00a76Player has also been known as:\u00a7c {0} unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable item. +teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.