TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix recipe command

Browse source
This commit is contained in:
Chris Ward 2012-12-20 01:35:55 +11:00
parent 4e399778b4
commit f57b3595ed
14 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Essentials/src/com/earth2me/essentials/commands/Commandrecipe.java
View file

@ -86,21 +86,31 @@ public class Commandrecipe extends EssentialsCommand
Map<Character, ItemStack> recipeMap = recipe.getIngredientMap(); Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
if (!(sender instanceof Player)) if (!(sender instanceof Player))
{ {
HashMap<ItemStack, String> colorMap = new HashMap<ItemStack, String>(); HashMap<Material, String> colorMap = new HashMap<Material, String>();
int i = 1; int i = 1;
for (Character c : "abcdefghi".toCharArray()) for (Character c : "abcdefghi".toCharArray())
{ {
if (!colorMap.containsKey(recipeMap.get(c))) ItemStack item = recipeMap.get(c);
if (!colorMap.containsKey(item == null ? null : item.getType()))
{ {
colorMap.put(recipeMap.get(c), String.valueOf(i++)); colorMap.put(item == null ? null : item.getType(), String.valueOf(i++));
} }
} }
sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('a')), colorMap.get(recipeMap.get('b')), colorMap.get(recipeMap.get('c')))); Material[][] materials = new Material[3][3];
sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('d')), colorMap.get(recipeMap.get('e')), colorMap.get(recipeMap.get('f')))); for (int j = 0; j < recipe.getShape().length; j++)
sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('g')), colorMap.get(recipeMap.get('h')), colorMap.get(recipeMap.get('i')))); {
for (int k = 0; k < recipe.getShape()[j].length(); k++)
{
ItemStack item = recipe.getIngredientMap().get(recipe.getShape()[j].toCharArray()[k]);
materials[j][k] = item == null ? null : item.getType();
}
}
sender.sendMessage(_("recipeGrid", colorMap.get(materials[0][0]), colorMap.get(materials[0][1]), colorMap.get(materials[0][2])));
sender.sendMessage(_("recipeGrid", colorMap.get(materials[1][0]), colorMap.get(materials[1][1]), colorMap.get(materials[1][2])));
sender.sendMessage(_("recipeGrid", colorMap.get(materials[2][0]), colorMap.get(materials[2][1]), colorMap.get(materials[2][2])));
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
for (ItemStack items : colorMap.keySet().toArray(new ItemStack[colorMap.size()])) for (Material items : colorMap.keySet().toArray(new Material[colorMap.size()]))
{ {
s.append(_("recipeGridItem", colorMap.get(items), getMaterialName(items))); s.append(_("recipeGridItem", colorMap.get(items), getMaterialName(items)));
} }

2
Essentials/src/messages.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_cs.properties
View file

@ -474,10 +474,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_da.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_de.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_en.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_es.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_fi.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_fr.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_it.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_nl.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_pl.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_pt.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}

2
Essentials/src/messages_se.properties
View file

@ -471,10 +471,10 @@ recipeNone=No recipes exist for {0}
invalidNumber=Invalid Number invalidNumber=Invalid Number
recipeBadIndex=There is no recipe by that number recipeBadIndex=There is no recipe by that number
recipeNothing=nothing recipeNothing=nothing
recipeShapeless=\u00a7eCombine \u00a7c{0}
recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2}) recipe=\u00a76Recipe for \u00a7c{0}\u00a76 ({1} of {2})
recipeFurnace=\u00a76Smelt \u00a7c{0} recipeFurnace=\u00a76Smelt \u00a7c{0}
recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X recipeGrid=\u00a7{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1} recipeGridItem=\ \u00a7{0}X \u00a76is \u00a7c{1}
recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2} recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}
recipeWhere=\u00a76Where: {0} recipeWhere=\u00a76Where: {0}
recipeShapeless=\u00a76Combine \u00a7c{0}