> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

2 files changed, 110 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/util/array/AutoMap.java b/src/Java/gtPlusPlus/core/util/array/AutoMap.java
new file mode 100644
index 0000000000..ea5e1dd25e
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/array/AutoMap.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.core.util.array;
+
+import java.io.Serializable;
+import java.util.*;
+
+public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable {
+
+	/**
+	 * The Internal Map
+	 */
+	private Map<Integer, V> mInternalMap = new HashMap<Integer, V>();
+	
+	/**
+	 * The Internal ID
+	 */
+	private int mInternalID = 0;
+	private static final long serialVersionUID = 3771412318075131790L;
+
+	@Override
+	public Iterator<V> iterator() {		
+		return values().iterator();
+	}
+
+	public synchronized boolean setValue(V object){
+		int mOriginalID = this.mInternalID;
+		put(object);		
+		if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID){
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+	
+	public synchronized V put(V object){
+		return set(object);
+	}
+	
+	public synchronized V set(V object){
+		return mInternalMap.put(mInternalID++, object);
+	}
+	
+	public synchronized V get(int id){
+		return mInternalMap.get(id);
+	}
+	
+	public synchronized Collection<V> values(){
+		return mInternalMap.values();
+	}
+	
+	public synchronized int size(){
+		return mInternalMap.size();
+	}
+	
+	public synchronized int hashcode(){
+		return mInternalMap.hashCode();
+	}
+	
+	public synchronized boolean containsKey(int key){
+		return mInternalMap.containsKey(key);
+	}
+	
+	public synchronized boolean containsValue(V value){
+		return mInternalMap.containsValue(value);
+	}
+	
+	public synchronized boolean isEmpty(){
+		return mInternalMap.isEmpty();
+	}
+	
+	public synchronized boolean clear(){
+		this.mInternalID = 0;
+		this.mInternalMap.clear();
+		return true;
+	}
+  
+}
diff --git a/src/Java/gtPlusPlus/core/util/array/Quad.java b/src/Java/gtPlusPlus/core/util/array/Quad.java
new file mode 100644
index 0000000000..417c3b6ebc
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/array/Quad.java
@@ -0,0 +1,33 @@
+package gtPlusPlus.core.util.array;
+
+public class Quad<K,V,C,R> {
+
+	private final K key;
+	private final V value;
+	private final C value2;
+	private final R value3;
+
+	public Quad(final K key, final V value, final C value2, final R value3){
+		this.key = key;
+		this.value = value;
+		this.value2 = value2;
+		this.value3 = value3;
+	}
+
+	final public K getKey(){
+		return this.key;
+	}
+	
+	final public V getValue_1(){
+		return this.value;
+	}
+
+	final public C getValue_2(){
+		return this.value2;
+	}
+
+	final public R getValue_3(){
+		return this.value3;
+	}
+
+}
\ No newline at end of file