Final all the things - Recipe

a480091617e9e472dc114865e77be786e3b04015

1 files changed, 30 insertions, 23 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java
index 48614a174..df40e9df1 100644
--- a/Essentials/src/net/ess3/commands/Commandrecipe.java
+++ b/Essentials/src/net/ess3/commands/Commandrecipe.java
@@ -22,13 +22,10 @@ public class Commandrecipe extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final ItemStack item = ess.getItemDb().get(args[0]);
-		final List<Recipe> recipes = ess.getServer().getRecipesFor(item);
-		if (recipes.size() < 1)
-		{
-			throw new Exception(_("recipeNone", getMaterialName(item)));
-		}
+
+		final ItemStack itemType = ess.getItemDb().get(args[0]);
 		int recipeNo = 0;
+
 		if (args.length > 1)
 		{
 			if (Util.isInt(args[1]))
@@ -40,36 +37,46 @@ public class Commandrecipe extends EssentialsCommand
 				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"));
 		}
-		final Recipe recipe = recipes.get(recipeNo);
-		sender.sendMessage(_("recipe", getMaterialName(item), recipeNo + 1, recipes.size()));
-		if (recipe instanceof FurnaceRecipe)
+
+		final Recipe selectedRecipe = recipesOfType.get(recipeNo);
+		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())));
 	}
 
-	public void shapedRecipe(CommandSender sender, ShapedRecipe recipe)
+	public void shapedRecipe(final CommandSender sender, final ShapedRecipe recipe)
 	{
 		final Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
 		if (sender instanceof IUser)
@@ -81,7 +88,7 @@ public class Commandrecipe extends EssentialsCommand
 			{
 				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)
 					{
 						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();
 		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)
 		{
@@ -163,7 +170,7 @@ public class Commandrecipe extends EssentialsCommand
 		return getMaterialName(stack.getType());
 	}
 
-	public String getMaterialName(Material type)
+	public String getMaterialName(final Material type)
 	{
 		if (type == null)
 		{