$ Tree Farmer Work.

% Package cleanup.
- Removed /Bed command.

11 files changed, 6 insertions, 198 deletions

diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 0909e4bf2d..e15f8ba202 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -34,10 +34,10 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
diff --git a/src/Java/gtPlusPlus/core/util/array/AutoMap.java b/src/Java/gtPlusPlus/core/util/array/AutoMap.java
deleted file mode 100644
index ea5e1dd25e..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/AutoMap.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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/BlockPos.java b/src/Java/gtPlusPlus/core/util/array/BlockPos.java
deleted file mode 100644
index fbf7676627..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/BlockPos.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.core.util.array;
-
-import java.io.Serializable;
-
-public class BlockPos implements Serializable{
-
-	private static final long serialVersionUID = -7271947491316682006L;
-	public final int xPos;
-	public final int yPos;
-	public final int zPos;
-	public final int dim;
-	
-	public BlockPos(int x, int y, int z){
-		this(x, y, z, 0);
-	}
-	
-	public BlockPos(int x, int y, int z, int dim){
-		this.xPos = x;
-		this.yPos = y;
-		this.zPos = z;
-		this.dim = dim;
-	}
-	
-	public String getLocationString() {
-		return "[X: "+this.xPos+"][Y: "+this.yPos+"][Z: "+this.zPos+"]";
-	}
-	
-}
diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/core/util/array/Pair.java
deleted file mode 100644
index 1d2c0ef7cb..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/Pair.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gtPlusPlus.core.util.array;
-
-import java.io.Serializable;
-
-public class Pair<K,V> implements Serializable {
-
-	/**
-	 * SVUID
-	 */
-	private static final long serialVersionUID = 1250550491092812443L;
-	private final K key;
-	private final V value;
-
-	public Pair(final K key, final V value){
-		this.key = key;
-		this.value = value;
-	}
-
-	final public K getKey(){
-		return this.key;
-	}
-
-	final public V getValue(){
-		return this.value;
-	}
-
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/array/Quad.java b/src/Java/gtPlusPlus/core/util/array/Quad.java
deleted file mode 100644
index 417c3b6ebc..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/Quad.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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
diff --git a/src/Java/gtPlusPlus/core/util/array/Triplet.java b/src/Java/gtPlusPlus/core/util/array/Triplet.java
deleted file mode 100644
index 01f836ae72..0000000000
--- a/src/Java/gtPlusPlus/core/util/array/Triplet.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gtPlusPlus.core.util.array;
-
-public class Triplet<K,V,C> {
-
-	private final K key;
-	private final V value;
-	private final C count;
-
-	public Triplet(final K key, final V value, final C value2){
-		this.key = key;
-		this.value = value;
-		this.count = value2;
-	}
-
-	final public K getValue_1(){
-		return this.key;
-	}
-
-	final public V getValue_2(){
-		return this.value;
-	}
-
-	final public C getValue_3(){
-		return this.count;
-	}
-
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
index 79c643a95d..27412d647f 100644
--- a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
@@ -5,7 +5,7 @@ import java.lang.reflect.Method;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.util.array.BlockPos;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import ic2.core.IC2Potion;
 import ic2.core.item.armor.ItemArmorHazmat;
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 367539b49d..d5caad9dee 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -10,6 +10,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.BasicSpawnEgg;
 import gtPlusPlus.core.item.base.dusts.BaseItemDust;
@@ -23,7 +24,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.core.util.wrapper.var;
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 313d1059ca..6d61335fe8 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -4,8 +4,8 @@ import java.util.Map;
 import java.util.Random;
 
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
diff --git a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
index 2e8e29c372..c9ac557fee 100644
--- a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
+++ b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.util.nbt;
 import baubles.api.BaubleType;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.api.objects.data.Pair;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
diff --git a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
index 0fd2d8c6a5..bf0ac3d1f5 100644
--- a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
+++ b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
@@ -5,7 +5,7 @@ import java.net.InetAddress;
 import java.util.Random;
 import java.util.UUID;
 
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
+import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE;
 
 /**
  *