Added PotionRecipes.addRecipe for effects

Author: Clashsoft

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

@@ -1,15 +1,18 @@
 package clashsoft.brewingapi.potion.recipe;
 
+import gnu.trove.map.hash.TCustomHashMap;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import gnu.trove.map.hash.TCustomHashMap;
 import clashsoft.brewingapi.potion.type.IPotionType;
 import clashsoft.brewingapi.potion.type.PotionBase;
+import clashsoft.brewingapi.potion.type.PotionType;
 import clashsoft.cslib.minecraft.util.ItemStackHashingStrategy;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.potion.PotionEffect;
 
 public class PotionRecipes
 {
@@ -86,7 +89,7 @@ public static void registerRecipe(PotionRecipe recipe)
 	/**
 	 * Creates and registers a new {@link PotionRecipe} from the given
 	 * {@link ItemStack} {@code input} and the given {@link IPotionType}
-	 * {@code output}.
+	 * {@code potionType}.
 	 * 
 	 * @param input
 	 *            the input stack
@@ -101,7 +104,7 @@ public static void addRecipe(ItemStack ingredient, IPotionType potionType)
 	/**
 	 * Creates and registers a new {@link PotionRecipe} from the given
 	 * {@link ItemStack} {@code input}, the given {@link PotionBase}
-	 * {@code base} and the given {@link IPotionType} {@code output}.
+	 * {@code base} and the given {@link IPotionType} {@code potionType}.
 	 * 
 	 * @param input
 	 *            the input stack
@@ -115,4 +118,39 @@ public static void addRecipe(ItemStack ingredient, PotionBase base, IPotionType
 		if (ingredient != null)
 			registerRecipe(new PotionRecipe(ingredient, base, potionType));
 	}
+	
+	/**
+	 * Creates and registers a new {@link PotionRecipe} from the given
+	 * {@link ItemStack} {@code input} and the given {@link PotionEffect}
+	 * {@code effect}.This automatically finds a {@link PotionType} for the
+	 * effect.
+	 * 
+	 * @param input
+	 *            the input stack
+	 * @param effect
+	 *            the output effect
+	 */
+	public static void addRecipe(ItemStack ingredient, PotionEffect effect)
+	{
+		addRecipe(ingredient, null, effect);
+	}
+	
+	/**
+	 * Creates and registers a new {@link PotionRecipe} from the given
+	 * {@link ItemStack} {@code input}, the given {@link PotionBase}
+	 * {@code base} and the given {@link PotionEffect} {@code effect}. This
+	 * automatically finds a {@link PotionType} for the effect.
+	 * 
+	 * @param input
+	 *            the input stack
+	 * @param base
+	 *            the required potion base
+	 * @param effect
+	 *            the output effect
+	 */
+	public static void addRecipe(ItemStack ingredient, PotionBase base, PotionEffect effect)
+	{
+		if (ingredient != null)
+			registerRecipe(new PotionRecipe(ingredient, base, PotionType.getFromEffect(effect)));
+	}
 }

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

@@ -20,16 +20,16 @@
 public interface IPotionType extends Comparable<IPotionType>
 {
 	/** Name of the tag compound that stores the potion type list */
-	public static final String		COMPOUND_NAME	= "Brewing";
+	public static final String					COMPOUND_NAME	= "Brewing";
 
 	/** Version identifier for NBTs. **/
-	public static final String		NBT_VERSION		= "1.1";
+	public static final String					NBT_VERSION		= "1.1";
 
 	/** List that stores ALL PotionTypes, also PotionBase types **/
-	public static TIntObjectMap		potionTypes		= new TIntObjectHashMap();
-	public static List<IPotionType>	potionTypeList	= new ArrayList();
-	public static List<IPotionType>	combinableTypes	= new ArrayList();
-	public static List<IPotionType>	effectTypes		= new ArrayList();
+	public static TIntObjectMap<IPotionType>	potionTypes		= new TIntObjectHashMap();
+	public static List<IPotionType>				potionTypeList	= new ArrayList();
+	public static List<IPotionType>				combinableTypes	= new ArrayList();
+	public static List<IPotionType>				effectTypes		= new ArrayList();
 
 	/**
 	 * Returns an unique identifier for this potion type.

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

@@ -388,17 +388,20 @@ public static IPotionType getRandom(Random rng)
 
 	public static IPotionType getFromEffect(PotionEffect effect)
 	{
+		if (effect == null)
+			return null;
+		
 		IPotionType potionType = getFromEffect_(effect);
 		if (potionType != null)
 		{
 			return new PotionTypeDelegate(effect, potionType);
 		}
-		return effect == null ? null : new PotionType(effect, effect.getAmplifier(), effect.getDuration());
+		return new PotionType(effect, effect.getAmplifier(), effect.getDuration());
 	}
 
 	protected static IPotionType getFromEffect_(PotionEffect effect)
 	{
-		return effect == null ? null : (IPotionType) getFromID(effect.getPotionID());
+		return effect == null ? null : getFromID(effect.getPotionID());
 	}
 
 	/**
@@ -560,16 +563,9 @@ public static boolean hasBase(IPotionType type, List<IPotionType> types)
 		return false;
 	}
 
-	public static PotionType getFromID(int potionID)
+	public static IPotionType getFromID(int potionID)
 	{
-		for (IPotionType pt : potionTypeList)
-		{
-			if (pt.getPotionID() == potionID)
-			{
-				return (PotionType) pt;
-			}
-		}
-		return null;
+		return potionTypes.get(potionID);
 	}
 
 	/**