From f89306c42c85ca0025517adf4b9754c214814115 Mon Sep 17 00:00:00 2001 From: Riaku Date: Fri, 19 Apr 2013 14:48:46 -0500 Subject: adding /antioch command to stop error http://pastebin.com/gJBJTVPd no new permission nodes. no new locales. this is an easter egg for OPs so the messages probably shouldn't be in locale. --- .../src/net/ess3/commands/Commandantioch.java | 23 ++++++++++++++++++++++ Essentials/src/plugin.yml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Essentials/src/net/ess3/commands/Commandantioch.java diff --git a/Essentials/src/net/ess3/commands/Commandantioch.java b/Essentials/src/net/ess3/commands/Commandantioch.java new file mode 100644 index 000000000..e9447e0c6 --- /dev/null +++ b/Essentials/src/net/ess3/commands/Commandantioch.java @@ -0,0 +1,23 @@ +package net.ess3.commands; + +import net.ess3.api.IUser; +import net.ess3.utils.LocationUtil; +import org.bukkit.Location; +import org.bukkit.Server; +import org.bukkit.entity.TNTPrimed; + +// This command has a theme message that only shows if you supply a parameter #EasterEgg +public class Commandantioch extends EssentialsCommand +{ + public void run(final Server server, final IUser user, final String commandLabel, final String[] args) throws Exception + { + if (args.length > 0) + { + ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,"); + ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it."); + } + + final Location loc = LocationUtil.getTarget(user.getPlayer()); + loc.getWorld().spawn(loc, TNTPrimed.class); + } +} \ No newline at end of file diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 3dfe5bd22..779ed52ad 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -12,7 +12,7 @@ commands: usage: / aliases: [eafk] antioch: - description: 'A little surprise for operators.' + description: A little surprise for operators. usage: / [message] aliases: [eantioch,grenade,tnt,egrenade,etnt] back: -- cgit v1.2.3 From 8c5620667afd3075ecf12189665ff39dba20a8f5 Mon Sep 17 00:00:00 2001 From: Riaku Date: Fri, 19 Apr 2013 14:59:39 -0500 Subject: moving commandAntioch to extras --- .../src/net/ess3/commands/Commandantioch.java | 23 --------------------- .../net/ess3/extra/commands/Commandantioch.java | 24 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 Essentials/src/net/ess3/commands/Commandantioch.java create mode 100644 EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java diff --git a/Essentials/src/net/ess3/commands/Commandantioch.java b/Essentials/src/net/ess3/commands/Commandantioch.java deleted file mode 100644 index e9447e0c6..000000000 --- a/Essentials/src/net/ess3/commands/Commandantioch.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.ess3.commands; - -import net.ess3.api.IUser; -import net.ess3.utils.LocationUtil; -import org.bukkit.Location; -import org.bukkit.Server; -import org.bukkit.entity.TNTPrimed; - -// This command has a theme message that only shows if you supply a parameter #EasterEgg -public class Commandantioch extends EssentialsCommand -{ - public void run(final Server server, final IUser user, final String commandLabel, final String[] args) throws Exception - { - if (args.length > 0) - { - ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,"); - ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it."); - } - - final Location loc = LocationUtil.getTarget(user.getPlayer()); - loc.getWorld().spawn(loc, TNTPrimed.class); - } -} \ No newline at end of file diff --git a/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java b/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java new file mode 100644 index 000000000..dacb24c93 --- /dev/null +++ b/EssentialsExtra/src/net/ess3/extra/commands/Commandantioch.java @@ -0,0 +1,24 @@ +package net.ess3.extra.commands; + +import net.ess3.api.IUser; +import net.ess3.commands.EssentialsCommand; +import net.ess3.utils.LocationUtil; +import org.bukkit.Location; +import org.bukkit.Server; +import org.bukkit.entity.TNTPrimed; + +// This command has a theme message that only shows if you supply a parameter #EasterEgg +public class Commandantioch extends EssentialsCommand +{ + public void run(final Server server, final IUser user, final String commandLabel, final String[] args) throws Exception + { + if (args.length > 0) + { + ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,"); + ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it."); + } + + final Location loc = LocationUtil.getTarget(user.getPlayer()); + loc.getWorld().spawn(loc, TNTPrimed.class); + } +} \ No newline at end of file -- cgit v1.2.3 From 27eb723fa06483d0585e4a0a02c740a45e2ed8ec Mon Sep 17 00:00:00 2001 From: Riaku Date: Fri, 19 Apr 2013 16:35:48 -0500 Subject: change itemdb output to use locale added ItemDatabaseResponse to messages.properties --- Essentials/src/messages.properties | 1 + Essentials/src/net/ess3/commands/Commanditemdb.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 718ce306b..cdc021857 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -507,5 +507,6 @@ recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 to see other recipes for \u00a7c{2} recipeWhere=\u00a76Where: {0} invalidIpAddress=\u00a74Invalid IP address +ItemDatabaseResponse=\u00a7c{0}\u00a76- {1}\u00a76:{2} #, java-format Hello\ {0},\ how\ are\ you?=\u00a7fHello \u00a74{0}\u00a7f, how are you? diff --git a/Essentials/src/net/ess3/commands/Commanditemdb.java b/Essentials/src/net/ess3/commands/Commanditemdb.java index 6cb9885f1..b00a0c53b 100644 --- a/Essentials/src/net/ess3/commands/Commanditemdb.java +++ b/Essentials/src/net/ess3/commands/Commanditemdb.java @@ -30,7 +30,8 @@ public class Commanditemdb extends EssentialsCommand } final Material itemType = itemStack.getType(); final int id = itemType.getId(); - sender.sendMessage(itemStack.getType().toString() + "- " + id + ":" + Integer.toString(itemStack.getData().getData())); + final String data = Integer.toString(itemStack.getData().getData()); + sender.sendMessage(_("ItemDatabaseResponse", itemStack.getType().toString(), id, data)); if (id != 0) { final int maxuses = itemType.getMaxDurability(); -- cgit v1.2.3