From 51a55318d09a0da4481eddc52bd97d37e7f2b834 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 21 Jan 2013 19:17:14 +0000 Subject: Revert /gc change. Simplify firework syntax, and add help Merge branch 'patch-26' of git://github.com/necrodoom/Essentials into 2.9 --- .../src/com/earth2me/essentials/MetaItemStack.java | 35 +++--- .../essentials/commands/Commandfirework.java | 126 +++++++++++---------- .../earth2me/essentials/commands/Commandgc.java | 30 ++--- Essentials/src/messages.properties | 4 +- Essentials/src/messages_cs.properties | 2 + Essentials/src/messages_da.properties | 2 + Essentials/src/messages_de.properties | 2 + Essentials/src/messages_en.properties | 2 + Essentials/src/messages_es.properties | 2 + Essentials/src/messages_fi.properties | 2 + Essentials/src/messages_fr.properties | 2 + Essentials/src/messages_it.properties | 2 + Essentials/src/messages_nl.properties | 2 + Essentials/src/messages_pl.properties | 2 + Essentials/src/messages_pt.properties | 2 + Essentials/src/messages_se.properties | 42 +++---- Essentials/src/plugin.yml | 4 +- 17 files changed, 141 insertions(+), 122 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/com/earth2me/essentials/MetaItemStack.java index 5eadc3935..c28e16671 100644 --- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java +++ b/Essentials/src/com/earth2me/essentials/MetaItemStack.java @@ -137,6 +137,13 @@ public class MetaItemStack meta.setTitle(title); stack.setItemMeta(meta); } + else if (split.length > 1 && split[0].equalsIgnoreCase("power") && stack.getType() == Material.FIREWORK) + { + final int power = Util.isInt(split[1]) ? Integer.parseInt(split[1]) : 0; + final FireworkMeta meta = (FireworkMeta)stack.getItemMeta(); + meta.setPower(power > 3 ? 4 : power); + stack.setItemMeta(meta); + } else if (stack.getType() == Material.FIREWORK) //WARNING - Meta for fireworks will be ignored after this point. { addFireworkMeta(user, false, string, ess); @@ -168,7 +175,7 @@ public class MetaItemStack } } - public void addFireworkMeta(final CommandSender user, final boolean allowShortName, final String string, final IEssentials ess) + public void addFireworkMeta(final CommandSender user, final boolean allowShortName, final String string, final IEssentials ess) throws Exception { if (stack.getType() == Material.FIREWORK) { @@ -193,7 +200,9 @@ public class MetaItemStack } else { - user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); + user.sendMessage(_("fireworkSyntax")); + throw new Exception(_("invalidFireworkFormat", split[1], split[0])); + } } builder.withColor(primaryColors); @@ -208,7 +217,8 @@ public class MetaItemStack } else { - user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); + user.sendMessage(_("fireworkSyntax")); + throw new Exception(_("invalidFireworkFormat", split[1], split[0])); } if (finalEffect != null) { @@ -227,7 +237,8 @@ public class MetaItemStack } else { - user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); + user.sendMessage(_("fireworkSyntax")); + throw new Exception(_("invalidFireworkFormat", split[1], split[0])); } } if (!fadeColors.isEmpty()) @@ -250,23 +261,11 @@ public class MetaItemStack } else { - user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); + user.sendMessage(_("fireworkSyntax")); + throw new Exception(_("invalidFireworkFormat", split[1], split[0])); } } } - else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p"))) - { - try - { - int power = Integer.parseInt(split[1]); - fmeta.setPower(power > 3 ? 4 : power); - } - catch (NumberFormatException e) - { - user.sendMessage(_("invalidFireworkFormat", split[1], split[0])); - } - stack.setItemMeta(fmeta); - } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java index c1f553fae..a9ad48dbb 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java @@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.MetaItemStack; import com.earth2me.essentials.User; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.regex.Pattern; import org.bukkit.DyeColor; @@ -43,85 +42,88 @@ public class Commandfirework extends EssentialsCommand @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (args.length > 0) + final ItemStack stack = user.getItemInHand(); + if (stack.getType() == Material.FIREWORK) { - final ItemStack stack = user.getItemInHand(); - if (stack.getType() == Material.FIREWORK) + if (args.length > 0) { - if (args.length > 0) + if (args[0].equalsIgnoreCase("clear")) { - if (args[0].equalsIgnoreCase("clear")) + FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); + fmeta.clearEffects(); + stack.setItemMeta(fmeta); + user.sendMessage(_("fireworkEffectsCleared")); + } + else if (args.length > 1 && (args[0].equalsIgnoreCase("power") || (args[0].equalsIgnoreCase("p")))) + { + FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); + try { - FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); - fmeta.clearEffects(); - stack.setItemMeta(fmeta); + int power = Integer.parseInt(args[1]); + fmeta.setPower(power > 3 ? 4 : power); } - else + catch (NumberFormatException e) + { + throw new Exception(_("invalidFireworkFormat", args[1], args[0])); + } + stack.setItemMeta(fmeta); + } + else if ((args[0].equalsIgnoreCase("fire") || (args[0].equalsIgnoreCase("p"))) + && user.isAuthorized("essentials.firework.fire")) + { + int amount; + try { - final MetaItemStack mStack = new MetaItemStack(stack); - boolean fire = false; - int amount = 1; - for (String arg : args) + final int serverLimit = ess.getSettings().getSpawnMobLimit(); + amount = Integer.parseInt(args[1]); + if (amount > serverLimit) { - final String[] split = splitPattern.split(arg, 2); - mStack.addFireworkMeta(user, true, arg, ess); - - if (split.length > 1 && split[0].equalsIgnoreCase("fire") && user.isAuthorized("essentials.firework.fire")) - { - fire = true; - try - { - amount = Integer.parseInt(split[1]); - int serverLimit = ess.getSettings().getSpawnMobLimit(); - if (amount > serverLimit) - { - amount = serverLimit; - user.sendMessage(_("mobSpawnLimit")); - } - } - catch (NumberFormatException e) - { - amount = 1; - } - } + amount = serverLimit; + user.sendMessage(_("mobSpawnLimit")); } + } + catch (Exception e) + { + amount = 1; + } + for (int i = 0; i < amount; i++) + { + Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK); + FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta(); + firework.setFireworkMeta(fmeta); + } + } + else + { + final MetaItemStack mStack = new MetaItemStack(stack); + for (String arg : args) + { + final String[] split = splitPattern.split(arg, 2); + mStack.addFireworkMeta(user, true, arg, ess); + } - if (fire) - { - for (int i = 0; i < amount; i++) - { - Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK); - FireworkMeta fmeta = (FireworkMeta)mStack.getItemStack().getItemMeta(); - if (mStack.isValidFirework()) - { - FireworkEffect effect = mStack.getFireworkBuilder().build(); - fmeta.addEffect(effect); - } - firework.setFireworkMeta(fmeta); - } - } - else if (!mStack.isValidFirework()) - { - user.sendMessage(_("fireworkColor")); - } - else - { - FireworkMeta fmeta = (FireworkMeta)mStack.getItemStack().getItemMeta(); - FireworkEffect effect = mStack.getFireworkBuilder().build(); - fmeta.addEffect(effect); - stack.setItemMeta(fmeta); - } + if (mStack.isValidFirework()) + { + FireworkMeta fmeta = (FireworkMeta)mStack.getItemStack().getItemMeta(); + FireworkEffect effect = mStack.getFireworkBuilder().build(); + fmeta.addEffect(effect); + stack.setItemMeta(fmeta); + } + else + { + user.sendMessage(_("fireworkSyntax")); + throw new Exception(_("fireworkColor")); } } } else { - user.sendMessage(_("holdFirework")); + throw new NotEnoughArgumentsException(); } } else { - throw new NotEnoughArgumentsException(); + throw new Exception(_("holdFirework")); } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java index 3595603ce..b1988b04e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgc.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgc.java @@ -42,28 +42,20 @@ public class Commandgc extends EssentialsCommand sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024))); List worlds = server.getWorlds(); - if (worlds.size() > 3 && args.length == 0) + for (World w : worlds) { - sender.sendMessage(_("messageTruncated", commandLabel, "all")); - } - else - { - for (World w : worlds) + String worldType = "World"; + switch (w.getEnvironment()) { - String worldType = "World"; - switch (w.getEnvironment()) - { - case NETHER: - worldType = "Nether"; - break; - case THE_END: - worldType = "The End"; - break; - } - - sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size())); + case NETHER: + worldType = "Nether"; + break; + case THE_END: + worldType = "The End"; + break; } - } + sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size())); + } } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index a2922861b..9982d4f76 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -486,7 +486,7 @@ denyChangeTitle=\u00a74You cannot change the title of this book denyBookEdit=\u00a74You cannot unlock this book bookLocked=\u00a76This book is now locked holdBook=\u00a74You are not holding a writable book -fireworkColor=\u00a74Error: \u00a7cInvalid firework charge parameters inserted, must set a color first. +fireworkColor=\u00a7cInvalid firework charge parameters inserted, must set a color first. holdFirework=\u00a74You must be holding a firework to add effects invalidFireworkFormat=\u00a76The option \u00a74{0} \u00a76is not a valid value for \u00a74{1} muteNotify=\u00a74{0} \u00a76has muted \u00a74{1} @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76for all online playe resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 35d91bc40..d1f6149e5 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -497,3 +497,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 306f2ea9f..344d81cc0 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index f8f42dcf7..dea191e4c 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index a2922861b..15f07ee91 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76for all online playe resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 06ee18bb8..88f02a05c 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index c8d889975..2ee333150 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index c3dba0036..593cf2ec8 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 887938960..13358e00e 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 332cc20ef..b67ed4d2e 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index ba5212a5a..fb3dff7b6 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 9327384c6..1bb18549e 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -494,3 +494,5 @@ resetBal=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all online play resetBalAll=\u00a76Balance has been reset to \u00a7a{0} \u00a76 for all players messageTruncated=\u00a74Message truncated, to see the full output type:\u00a7c /{0} {1} userAFK=\u00a75{0} \u00a75is currently AFK and may not respond +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index b92f7456c..08d24ef80 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -467,30 +467,32 @@ teleportationDisabledFor=\u00a76Teleportering inaktiverat f\u00f6r {0} kitOnce=\u00a74Du kan inte av\u00e4nda det kitet igen. fullStack=\u00a74Du har redan en full stapel oversizedTempban=\u00a74Du kan inte banna en spelare just vid denna tidpunkt. -recipeNone=Inga recept existerar för {0} +recipeNone=Inga recept existerar f\u00c3\u00b6r {0} invalidNumber=Felaktigt nummer recipeBadIndex=Det finns inget recept med det numret recipeNothing=ingenting -recipe=\u00a76Recept för \u00a7c{0}\u00a76 ({1} av {2}) -recipeFurnace=\u00a76Smält \u00a7c{0} +recipe=\u00a76Recept f\u00c3\u00b6r \u00a7c{0}\u00a76 ({1} av {2}) +recipeFurnace=\u00a76Sm\u00c3\u00a4lt \u00a7c{0} recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X -recipeGridItem=\ \u00a7{0}X \u00a76är \u00a7c{1} -recipeMore=\u00a76Skriv /{0} \u00a7c{1}\u00a76 för att se andra recept för \u00a7c{2} +recipeGridItem=\ \u00a7{0}X \u00a76\u00c3\u00a4r \u00a7c{1} +recipeMore=\u00a76Skriv /{0} \u00a7c{1}\u00a76 f\u00c3\u00b6r att se andra recept f\u00c3\u00b6r \u00a7c{2} recipeWhere=\u00a76Var: {0} recipeShapeless=\u00a76Kombinera \u00a7c{0} -editBookContents=\u00a7eDu kan nu ändra innehållet i denna bok -bookAuthorSet=\u00a76Författaren av boken är nu{0} -bookTitleSet=\u00a76Titeln av boken har blivit ändrad till {0} -denyChangeAuthor=\u00a74Du kan inte byta författare på denna bok -denyChangeTitle=\u00a74Du kan inte byta titel på denna bok -denyBookEdit=\u00a74Du kan inte låsa upp denna boken -bookLocked=\u00a7cDenna bok är nu låst -holdBook=\u00a74Boken du håller i är inte skrivbar -fireworkColor=\u00a74Du måste lägga till en färg till fyrverkeripjäsen för att lägga till en effekt -holdFirework=\u00a74Du måste hålla i en fyrverkeripjäs för att lägga till effekter -invalidFireworkFormat=\u00a76Alternativet \u00a74{0} \u00a76is är inte ett korrekt alternativ för \u00a74{1} +editBookContents=\u00a7eDu kan nu \u00c3\u00a4ndra inneh\u00c3\u00a5llet i denna bok +bookAuthorSet=\u00a76F\u00c3\u00b6rfattaren av boken \u00c3\u00a4r nu{0} +bookTitleSet=\u00a76Titeln av boken har blivit \u00c3\u00a4ndrad till {0} +denyChangeAuthor=\u00a74Du kan inte byta f\u00c3\u00b6rfattare p\u00c3\u00a5 denna bok +denyChangeTitle=\u00a74Du kan inte byta titel p\u00c3\u00a5 denna bok +denyBookEdit=\u00a74Du kan inte l\u00c3\u00a5sa upp denna boken +bookLocked=\u00a7cDenna bok \u00c3\u00a4r nu l\u00c3\u00a5st +holdBook=\u00a74Boken du h\u00c3\u00a5ller i \u00c3\u00a4r inte skrivbar +fireworkColor=\u00a74Du m\u00c3\u00a5ste l\u00c3\u00a4gga till en f\u00c3\u00a4rg till fyrverkeripj\u00c3\u00a4sen f\u00c3\u00b6r att l\u00c3\u00a4gga till en effekt +holdFirework=\u00a74Du m\u00c3\u00a5ste h\u00c3\u00a5lla i en fyrverkeripj\u00c3\u00a4s f\u00c3\u00b6r att l\u00c3\u00a4gga till effekter +invalidFireworkFormat=\u00a76Alternativet \u00a74{0} \u00a76is \u00c3\u00a4r inte ett korrekt alternativ f\u00c3\u00b6r \u00a74{1} muteNotify=\u00a74{0} \u00a76har tystat \u00a74{1} -resetBal=\u00a76Balansen har blivit återställd till \u00a7a{0} \u00a76 för alla spelare som är online -resetBalAll=\u00a76Balansen har blivit återställd till \u00a7a{0} \u00a76 för alla spelare -messageTruncated=\u00a74Meddelandet har blivit förkortat, för att se allt, skriv:\u00a7c /{0} {1} -userAFK=\u00a75{0} \u00a75är för närvarande borta och svarar kanske inte +resetBal=\u00a76Balansen har blivit \u00c3\u00a5terst\u00c3\u00a4lld till \u00a7a{0} \u00a76 f\u00c3\u00b6r alla spelare som \u00c3\u00a4r online +resetBalAll=\u00a76Balansen har blivit \u00c3\u00a5terst\u00c3\u00a4lld till \u00a7a{0} \u00a76 f\u00c3\u00b6r alla spelare +messageTruncated=\u00a74Meddelandet har blivit f\u00c3\u00b6rkortat, f\u00c3\u00b6r att se allt, skriv:\u00a7c /{0} {1} +userAFK=\u00a75{0} \u00a75\u00c3\u00a4r f\u00c3\u00b6r n\u00c3\u00a4rvarande borta och svarar kanske inte +fireworkEffectsCleared=\u00a76Removed all effects from held stack. +fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 5bf0b2101..c410c53e8 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -120,8 +120,8 @@ commands: usage: / [small|skull] aliases: [efireball,fireskull,efireskull,fireentity,efireentity] firework: - description: Adds a charge or clears all effects of a firework - usage: / [clear|fire|power|params] + description: Allows you to modify a stack of fireworks + usage: / [|power [amount]|clear] aliases: [efirework] gamemode: description: Change player gamemode. -- cgit v1.2.3