TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-03 11:06:08 +00:00
Code Issues Projects Releases Wiki Activity

Swap method order on recipe

Browse source
This commit is contained in:
KHobbits 2012-12-21 03:21:35 +00:00
parent 226a75472c
commit a8a8b52977
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,18 @@ public class Commandrecipe extends EssentialsCommand
public void shapedRecipe(CommandSender sender, ShapedRecipe recipe) public void shapedRecipe(CommandSender sender, ShapedRecipe recipe)
{ {
Map<Character, ItemStack> recipeMap = recipe.getIngredientMap(); Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
if (!(sender instanceof Player)) if (sender instanceof Player)
{
User user = ess.getUser(sender);
user.setRecipeSee(true);
InventoryView view = user.openWorkbench(null, true);
for (Entry<Character, ItemStack> e : ((ShapedRecipe)recipe).getIngredientMap().entrySet())
{
view.setItem(" abcdefghi".indexOf(e.getKey()), e.getValue());
}
}
else
{ {
HashMap<Material, String> colorMap = new HashMap<Material, String>(); HashMap<Material, String> colorMap = new HashMap<Material, String>();
int i = 1; int i = 1;
@ -116,22 +127,23 @@ public class Commandrecipe extends EssentialsCommand
} }
sender.sendMessage(_("recipeWhere", s.toString())); sender.sendMessage(_("recipeWhere", s.toString()));
} }
else
{
User user = ess.getUser(sender);
user.setRecipeSee(true);
InventoryView view = user.openWorkbench(null, true);
for (Entry<Character, ItemStack> e : ((ShapedRecipe)recipe).getIngredientMap().entrySet())
{
view.setItem(" abcdefghi".indexOf(e.getKey()), e.getValue());
}
}
} }
public void shapelessRecipe(CommandSender sender, ShapelessRecipe recipe) public void shapelessRecipe(CommandSender sender, ShapelessRecipe recipe)
{ {
List<ItemStack> ingredients = recipe.getIngredientList(); List<ItemStack> ingredients = recipe.getIngredientList();
if (!(sender instanceof Player)) if (sender instanceof Player)
{
User user = ess.getUser(sender);
user.setRecipeSee(true);
InventoryView view = user.openWorkbench(null, true);
for (int i = 0; i < ingredients.size(); i++)
{
view.setItem(i + 1, ingredients.get(i));
}
}
else
{ {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
for (int i = 0; i < ingredients.size(); i++) for (int i = 0; i < ingredients.size(); i++)
@ -145,16 +157,6 @@ public class Commandrecipe extends EssentialsCommand
} }
sender.sendMessage(_("recipeShapeless", s.toString())); sender.sendMessage(_("recipeShapeless", s.toString()));
} }
else
{
User user = ess.getUser(sender);
user.setRecipeSee(true);
InventoryView view = user.openWorkbench(null, true);
for (int i = 0; i < ingredients.size(); i++)
{
view.setItem(i + 1, ingredients.get(i));
}
}
} }
public String getMaterialName(ItemStack stack) public String getMaterialName(ItemStack stack)