Merge pull request #320 from hilburn/1.7-update

fixed derp and update javadoc
iopleke · Oct 22, 2014 · 23df512 · 23df512
2 parents d99dae4 + d546180
commit 23df512
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/minechem/item/element/ElementEnum.java b/src/main/java/minechem/item/element/ElementEnum.java
@@ -195,7 +195,7 @@ public static void registerElement(ElementEnum element)
 		{
 			throw new IllegalArgumentException("id " + element.id + " is used");
 		}
-		if (element.id>heaviestMass)heaviestMass=element.id+1;
+		if (element.id>=heaviestMass)heaviestMass=element.id+1;
 		elements.put(element.id, element);
 	}
 

diff --git a/src/main/java/minechem/minetweaker/Decomposer.java b/src/main/java/minechem/minetweaker/Decomposer.java
@@ -30,8 +30,9 @@ public class Decomposer {
 
 	/**
 	 * Add Recipe
-	 * @param input   as input stack
-	 * @param outputs as chemical stack array
+	 * @param input   	as input stack
+	 * @param chance	chance of output (Optional)
+	 * @param outputs 	as Ingredient stack array
 	 */
 	@ZenMethod
 	public static void addRecipe(IIngredient input, @Optional double chance, IIngredient[]... multiOutputs) 
@@ -95,8 +96,9 @@ public static void addFluid(ILiquidStack input,IIngredient... outputs)
 
 	/**
 	 * Add Select Recipe
-	 * @param input   as input stack
-	 * @param outputs as recipe output stack array
+	 * @param input   		as input stack
+	 * @param multioutputs 	as recipe output stack array
+	 * @param chance 		chance of any output
 	 */
 	//@ZenMethod
 	public static void addMultiRecipe(IIngredient input, IIngredient[][] multioutputs, @Optional double chance)