Minor changes

Author: Clashsoft

src/main/java/clashsoft/brewingapi/potion/PotionTypeList.java

@@ -61,6 +61,11 @@ public void setSplash(boolean flag)
 		((ItemPotion2) this.stack.getItem()).setSplash(this.stack, flag);
 	}
 
+	public void setStack(ItemStack stack)
+	{
+		this.load(stack, true);
+	}
+	
 	/**
 	 * Loads this {@link PotionTypeList} from the given {@link ItemStack}
 	 * {@code stack} the syncs the list with it. If {@code oldEffects} is true
@@ -89,7 +94,7 @@ public void load(ItemStack stack, boolean oldEffects)
 					IPotionType type = PotionType.getFromNBT(compound);
 					if (type != null)
 					{
-						super.add(type);
+						this.add(type);
 					}
 				}
 			}

src/main/java/clashsoft/brewingapi/potion/recipe/PotionRecipes.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import clashsoft.brewingapi.potion.PotionList;
+import clashsoft.brewingapi.potion.PotionTypeList;
 import clashsoft.brewingapi.potion.base.IPotionBase;
 import clashsoft.brewingapi.potion.type.IPotionType;
 import clashsoft.brewingapi.potion.type.PotionType;
@@ -29,6 +30,87 @@ public static List<IPotionRecipe> getRecipes()
 		return recipes;
 	}
 
+	/**
+	 * Checks if the given {@link ItemStack} {@code ingredient} is a valid
+	 * potion ingredient.
+	 * 
+	 * @param ingredient
+	 *            the igredient
+	 * @return true, if the stack is a valid potion ingredient
+	 */
+	public static boolean isIngredient(ItemStack ingredient)
+	{
+		for (IPotionRecipe recipe : recipes)
+		{
+			if (CSStacks.equals(recipe.getIngredient(), ingredient))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Checks if the given {@link ItemStack} {@code ingredient} is applicable to
+	 * the given {@link ItemStack} {@code potion}. It does that by going through
+	 * the list of all {@link PotionRecipe}s and calling their
+	 * {@link IPotionRecipe#canApply(ItemStack, PotionTypeList)}. If one of
+	 * these calls returns {@code true}, the ingredient is applicable and
+	 * {@code true} is returned.
+	 * 
+	 * @param ingredient
+	 *            the ingredient
+	 * @param potion
+	 *            the potion
+	 * @return true, if the ingredient is applicable to the potion.
+	 */
+	public static boolean canApplyIngredient(ItemStack input, ItemStack ingredient)
+	{
+		return canApplyIngredient(new PotionTypeList(input), ingredient);
+	}
+	
+	public static boolean canApplyIngredient(PotionTypeList input, ItemStack ingredient)
+	{
+		for (IPotionRecipe recipe : recipes)
+		{
+			if (recipe.canApply(ingredient, input))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Applies the given {@link ItemStack} {@code ingredient} to the given
+	 * {@link ItemStack} {@code potion}. It does that by going through the list
+	 * of all {@link PotionRecipe}s and calling their
+	 * {@link IPotionRecipe#apply(PotionTypeList)} method.
+	 * 
+	 * @param ingredient
+	 *            the ingredient
+	 * @param potion
+	 *            the potion
+	 * @return the potion with applied ingredients
+	 */
+	public static ItemStack applyIngredient(ItemStack input, ItemStack ingredient)
+	{
+		return applyIngredient(new PotionTypeList(input), ingredient);
+	}
+	
+	public static ItemStack applyIngredient(PotionTypeList input, ItemStack ingredient)
+	{
+		for (IPotionRecipe recipe : recipes)
+		{
+			if (recipe.canApply(ingredient, input))
+			{
+				recipe.apply(ingredient, input);
+			}
+		}
+		input.save();
+		return input.getPotion();
+	}
+	
 	/**
 	 * Gets a {@link PotionRecipe} from the given {@link ItemStack}
 	 * {@code ingredient}.

src/main/java/clashsoft/brewingapi/potion/type/PotionType.java

@@ -3,7 +3,6 @@
 import java.util.*;
 
 import clashsoft.brewingapi.item.ItemPotion2;
-import clashsoft.brewingapi.potion.PotionTypeList;
 import clashsoft.brewingapi.potion.base.IPotionBase;
 import clashsoft.brewingapi.potion.base.PotionBase;
 import clashsoft.brewingapi.potion.recipe.IPotionRecipe;
@@ -389,13 +388,17 @@ public static IPotionType getRandom(Random random)
 	public static IPotionType getFromEffect(PotionEffect effect)
 	{
 		if (effect == null)
+		{
 			return null;
+		}
 
-		IPotionType potionType = getFromEffect_(effect);
+		IPotionType potionType = getFromID(effect.getPotionID());
 		if (potionType != null)
 		{
+			// Type exists, create a delegate with the custom potion effect.
 			return new PotionTypeDelegate(effect, potionType);
 		}
+		// Type does not exist, create a dummy type and register it.
 		return new DummyPotionType(effect, effect.getAmplifier(), effect.getDuration()).register();
 	}
 
@@ -446,70 +449,31 @@ public static List<IPotionType> getPotionTypes(ItemStack potion)
 	}
 
 	/**
-	 * Checks if the given {@link ItemStack} {@code ingredient} is a valid
-	 * potion ingredient.
-	 * 
-	 * @param ingredient
-	 *            the igredient
-	 * @return true, if the stack is a valid potion ingredient
+	 * @deprecated Use {@link PotionRecipes#isIngredient(ItemStack)} instead.
 	 */
 	public static boolean isPotionIngredient(ItemStack ingredient)
 	{
 		return PotionRecipes.get(ingredient) != null;
 	}
 
 	/**
-	 * Applies the given {@link ItemStack} {@code ingredient} to the given
-	 * {@link ItemStack} {@code potion}. It does that by going through the list
-	 * of all {@link PotionRecipe}s and calling their
-	 * {@link IPotionRecipe#apply(PotionTypeList)} method.
-	 * 
-	 * @param ingredient
-	 *            the ingredient
-	 * @param potion
-	 *            the potion
-	 * @return the potion with applied ingredients
+	 * @deprecated Use
+	 *             {@link PotionRecipes#applyIngredient(ItemStack, ItemStack)}
+	 *             instead.
 	 */
 	public static ItemStack applyIngredient(ItemStack ingredient, ItemStack potion)
 	{
-		PotionTypeList potionTypes = new PotionTypeList(potion);
-		for (IPotionRecipe recipe : PotionRecipes.getRecipes())
-		{
-			if (recipe.canApply(ingredient, potionTypes))
-			{
-				recipe.apply(ingredient, potionTypes);
-			}
-		}
-		potionTypes.save();
-		
-		return potionTypes.getPotion();
+		return PotionRecipes.applyIngredient(potion, ingredient);
 	}
 
 	/**
-	 * Checks if the given {@link ItemStack} {@code ingredient} is applicable to
-	 * the given {@link ItemStack} {@code potion}. It does that by going through
-	 * the list of all {@link PotionRecipe}s and calling their
-	 * {@link IPotionRecipe#canApply(ItemStack, PotionTypeList)}. If one of
-	 * these calls returns {@code true}, the ingredient is applicable and
-	 * {@code true} is returned.
-	 * 
-	 * @param ingredient
-	 *            the ingredient
-	 * @param potion
-	 *            the potion
-	 * @return true, if the ingredient is applicable to the potion.
+	 * @deprecated Use
+	 *             {@link PotionRecipes#applyIngredient(ItemStack, ItemStack)}
+	 *             instead.
 	 */
 	public static boolean canApplyIngredient(ItemStack ingredient, ItemStack potion)
 	{
-		PotionTypeList potionTypes = new PotionTypeList(potion);
-		for (IPotionRecipe recipe : PotionRecipes.getRecipes())
-		{
-			if (recipe.canApply(ingredient, potionTypes))
-			{
-				return true;
-			}
-		}
-		return false;
+		return PotionRecipes.canApplyIngredient(potion, ingredient);
 	}
 
 	public static IPotionType getFromID(int potionID)

src/main/java/clashsoft/brewingapi/tileentity/TileEntityBrewingStand2.java

@@ -103,14 +103,7 @@ private void brewPotions()
 			PotionTypeList potionTypes = this.potionTypes[i];
 			if (potionTypes != null)
 			{
-				for (IPotionRecipe recipe : PotionRecipes.getRecipes())
-				{
-					if (recipe.canApply(ingredient, potionTypes))
-					{
-						recipe.apply(ingredient, potionTypes);
-					}
-				}
-				potionTypes.save();
+				this.brewingItemStacks[i] = PotionRecipes.applyIngredient(potionTypes, ingredient);
 			}
 		}