minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-28 16:59:51 +02:00
Code Issues Releases Wiki Activity

Final all the things - Recipe

Browse Source 
a480091617
This commit is contained in:
Chris Ward
2013-01-09 20:07:36 +11:00
parent 556f218cbd
commit 0177eca6e0
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Essentials/src/net/ess3/commands/Commandrecipe.java
View File

@@ -22,13 +22,10 @@ public class Commandrecipe extends EssentialsCommand
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final ItemStack item = ess.getItemDb().get(args[0]);
final List<Recipe> recipes = ess.getServer().getRecipesFor(item); final ItemStack itemType = ess.getItemDb().get(args[0]);
if (recipes.size() < 1)
{
throw new Exception(_("recipeNone", getMaterialName(item)));
}
int recipeNo = 0; int recipeNo = 0;
if (args.length > 1) if (args.length > 1)
{ {
if (Util.isInt(args[1])) if (Util.isInt(args[1]))
@@ -40,36 +37,46 @@ public class Commandrecipe extends EssentialsCommand
throw new Exception(_("invalidNumber")); throw new Exception(_("invalidNumber"));
} }
} }
if (recipeNo < 0 || recipeNo >= recipes.size())
final List<Recipe> recipesOfType = ess.getServer().getRecipesFor(itemType);
if (recipesOfType.size() < 1)
{
throw new Exception(_("recipeNone", getMaterialName(itemType)));
}
if (recipeNo < 0 || recipeNo >= recipesOfType.size())
{ {
throw new Exception(_("recipeBadIndex")); throw new Exception(_("recipeBadIndex"));
} }
final Recipe recipe = recipes.get(recipeNo);
sender.sendMessage(_("recipe", getMaterialName(item), recipeNo + 1, recipes.size())); final Recipe selectedRecipe = recipesOfType.get(recipeNo);
if (recipe instanceof FurnaceRecipe) sender.sendMessage(_("recipe", getMaterialName(itemType), recipeNo + 1, recipesOfType.size()));
if (selectedRecipe instanceof FurnaceRecipe)
{ {
furnaceRecipe(sender, (FurnaceRecipe)recipe); furnaceRecipe(sender, (FurnaceRecipe)selectedRecipe);
} }
else if (recipe instanceof ShapedRecipe) else if (selectedRecipe instanceof ShapedRecipe)
{ {
shapedRecipe(sender, (ShapedRecipe)recipe); shapedRecipe(sender, (ShapedRecipe)selectedRecipe);
} }
else if (recipe instanceof ShapelessRecipe) else if (selectedRecipe instanceof ShapelessRecipe)
{ {
shapelessRecipe(sender, (ShapelessRecipe)recipe); shapelessRecipe(sender, (ShapelessRecipe)selectedRecipe);
} }
if (recipes.size() > 1 && args.length == 1)
if (recipesOfType.size() > 1 && args.length == 1)
{ {
sender.sendMessage(_("recipeMore", commandLabel, args[0], getMaterialName(item))); sender.sendMessage(_("recipeMore", commandLabel, args[0], getMaterialName(itemType)));
} }
} }
public void furnaceRecipe(CommandSender sender, FurnaceRecipe recipe) public void furnaceRecipe(final CommandSender sender, final FurnaceRecipe recipe)
{ {
sender.sendMessage(_("recipeFurnace", getMaterialName(recipe.getInput()))); sender.sendMessage(_("recipeFurnace", getMaterialName(recipe.getInput())));
} }
public void shapedRecipe(CommandSender sender, ShapedRecipe recipe) public void shapedRecipe(final CommandSender sender, final ShapedRecipe recipe)
{ {
final Map<Character, ItemStack> recipeMap = recipe.getIngredientMap(); final Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
if (sender instanceof IUser) if (sender instanceof IUser)
@@ -81,7 +88,7 @@ public class Commandrecipe extends EssentialsCommand
{ {
for (int k = 0; k < recipe.getShape()[j].length(); k++) for (int k = 0; k < recipe.getShape()[j].length(); k++)
{ {
ItemStack item = recipe.getIngredientMap().get(recipe.getShape()[j].toCharArray()[k]); final ItemStack item = recipe.getIngredientMap().get(recipe.getShape()[j].toCharArray()[k]);
if(item == null) if(item == null)
{ {
continue; continue;
@@ -125,7 +132,7 @@ public class Commandrecipe extends EssentialsCommand
} }
} }
public void shapelessRecipe(CommandSender sender, ShapelessRecipe recipe) public void shapelessRecipe(final CommandSender sender, final ShapelessRecipe recipe)
{ {
final List<ItemStack> ingredients = recipe.getIngredientList(); final List<ItemStack> ingredients = recipe.getIngredientList();
if (sender instanceof IUser) if (sender instanceof IUser)
@@ -154,7 +161,7 @@ public class Commandrecipe extends EssentialsCommand
} }
} }
public String getMaterialName(ItemStack stack) public String getMaterialName(final ItemStack stack)
{ {
if (stack == null) if (stack == null)
{ {
@@ -163,7 +170,7 @@ public class Commandrecipe extends EssentialsCommand
return getMaterialName(stack.getType()); return getMaterialName(stack.getType());
} }
public String getMaterialName(Material type) public String getMaterialName(final Material type)
{ {
if (type == null) if (type == null)
{ {