+ Added some new Monster Killer Baubles. Kill nearby mobs for power, power cost scales with HP total, left and other EntityLiving stats.

+ Added new constructors for AutoMaps.
+ Added a Wrapper (AABB) for AxisAlignedBB.
$ Fixed Hot Titanium Ingot recipe.

1 files changed, 40 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index fe2caa466d..3583a04a74 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -31,6 +31,46 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 		mInternalNameMap = new LinkedHashMap<String, Integer>();
 	}
 	
+	/**
+	 * Generates an AutoMap from the List.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(List<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+	/**
+	 * Generates an AutoMap from a Set.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(Set<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+	/**
+	 * Generates an AutoMap from a Collection.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(Collection<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+
 	@Override
 	public Iterator<V> iterator() {		
 		return values().iterator();