Merge pull request #1 from alkcorp/DevTop

Dev top

59 files changed, 2876 insertions, 734 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index 9e7f702200..02517097cf 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -70,6 +70,20 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 			}
 		}		
 	}
+	
+	/**
+	 * Generates an AutoMap from a Array.
+	 * @param aArray - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(V[] aArray) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aArray != null && aArray.length > 0) {
+			for (V obj : aArray) {
+				add(obj);
+			}
+		}		
+	}
 
 	@Override
 	public Iterator<V> iterator() {		
diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java b/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
new file mode 100644
index 0000000000..991908e402
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
@@ -0,0 +1,18 @@
+package gtPlusPlus.api.objects.data;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class ConcurrentHashSet<V> extends ConcurrentSet<V> {
+
+	private static final long serialVersionUID = -1293478938482781728L;
+	
+	public ConcurrentHashSet() {
+		this(new ConcurrentHashMap<Integer, V>());
+	}
+	
+	public ConcurrentHashSet(ConcurrentMap<Integer, V> defaultMapType) {
+		super(defaultMapType);
+	}	
+	
+}
diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java b/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java
new file mode 100644
index 0000000000..1d3ffc1c01
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java
@@ -0,0 +1,53 @@
+package gtPlusPlus.api.objects.data;
+
+import java.io.Serializable;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentMap;
+
+public abstract class ConcurrentSet<E> extends AbstractSet<E> implements Serializable {
+
+    private static final long serialVersionUID = -6761513279741915432L;
+
+    private final ConcurrentMap<Integer, E> mInternalMap;
+    
+	private int mInternalID = 0;	
+
+    /**
+     * Creates a new instance which wraps the specified {@code map}.
+     */    
+    public ConcurrentSet(ConcurrentMap<Integer, E> aMap) {
+    	mInternalMap = aMap;
+    }
+
+    @Override
+    public int size() {
+        return mInternalMap.size();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return mInternalMap.containsKey(o);
+    }
+
+    @Override
+    public boolean add(E o) {
+        return mInternalMap.putIfAbsent(mInternalID++, o) == null;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return mInternalMap.remove(o) != null;
+    }
+
+    @Override
+    public void clear() {
+		this.mInternalID = 0;
+        mInternalMap.clear();
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return mInternalMap.values().iterator();
+    }
+}
diff --git a/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java
new file mode 100644
index 0000000000..64f57b4e5a
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java
@@ -0,0 +1,39 @@
+package gtPlusPlus.api.objects.data;
+
+import java.io.Serializable;
+
+import com.google.common.base.Objects;
+
+public class FlexiblePair<K,V> implements Serializable {
+
+	/**
+	 * SVUID
+	 */
+	private static final long serialVersionUID = 1250550491092812443L;
+	private final K key;
+	private V value;
+
+	public FlexiblePair(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;
+	}
+	
+	final public void setValue(V aObj) {
+		value = aObj;
+	}
+
+	@Override
+	public int hashCode() {
+		Integer aCode = Objects.hashCode(getKey(), getValue());		
+		return aCode != null ? aCode : super.hashCode();
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
new file mode 100644
index 0000000000..8c76513d09
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java
@@ -0,0 +1,62 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class CubicObject<T> {
+
+	public final T NORTH;
+	public final T SOUTH;
+
+	public final T WEST;
+	public final T EAST;
+
+	public final T UP;
+	public final T DOWN;	
+	
+	public CubicObject(AutoMap<T> aDataSet) {
+		this(aDataSet.get(0), aDataSet.get(1), aDataSet.get(2), aDataSet.get(3), aDataSet.get(4), aDataSet.get(5));
+	}
+	
+	public CubicObject(T[] aDataSet) {
+		this(aDataSet[0], aDataSet[1], aDataSet[2], aDataSet[3], aDataSet[4], aDataSet[5]);
+	}
+
+	public CubicObject(T aDOWN, T aUP, T aNORTH, T aSOUTH, T aWEST, T aEAST) {
+		DOWN = aDOWN;
+		UP = aUP;
+		NORTH = aNORTH;
+		SOUTH = aSOUTH;
+		WEST = aWEST;
+		EAST = aEAST;
+	}
+
+	public T get(int aSide) {
+		return get(ForgeDirection.getOrientation(aSide));
+	}
+
+	public T get(ForgeDirection aSide) {
+		if (aSide == ForgeDirection.DOWN) {
+			return DOWN;
+		}
+		else if (aSide == ForgeDirection.UP) {
+			return UP;
+		}
+		else if (aSide == ForgeDirection.NORTH) {
+			return NORTH;
+		}
+		else if (aSide == ForgeDirection.SOUTH) {
+			return SOUTH;
+		}
+		else if (aSide == ForgeDirection.WEST) {
+			return WEST;
+		}
+		else if (aSide == ForgeDirection.EAST) {
+			return EAST;
+		}
+		else {
+			return null;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
new file mode 100644
index 0000000000..7c418b5a77
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -0,0 +1,64 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import java.util.HashMap;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.util.IIcon;
+
+/**
+ * A Server Side safe object that can hold {@link IIcon}s.
+ * @author Alkalus
+ *
+ */
+public class SafeTexture implements Runnable {	
+
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<Integer, IIcon>();
+	
+	@SideOnly(Side.CLIENT)
+	private static final HashMap<String, Integer> mPathToHashCash = new HashMap<String, Integer>();
+	
+	private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<String, SafeTexture>();	
+	
+	private final int mHash;
+	
+	private final String mTextureName;
+	
+	private final static String getKey(String aTexPath) {
+		String aNameKey = Utils.sanitizeString(aTexPath);
+		aNameKey = aNameKey.replace('/', ' ');
+		aNameKey = aNameKey.toLowerCase();
+		return aNameKey;
+	}
+	
+	public static SafeTexture register(String aTexturePath) {
+		String aNameKey = getKey(aTexturePath);
+		SafeTexture g = mTextureObjectCache.get(aNameKey);
+		if (g == null) {
+			g = new SafeTexture(aTexturePath);			
+			mTextureObjectCache.put(aNameKey, g);			
+			mPathToHashCash.put(aTexturePath, aTexturePath.hashCode());			
+		}	
+		return g;
+	}
+	
+	private SafeTexture(String aTexturePath) {
+		mTextureName = aTexturePath;
+		mHash = getKey(aTexturePath).hashCode();
+		GregTech_API.sGTBlockIconload.add(this);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon() {
+		return mHashToIconCache.get(mHash);
+	}
+
+	@Override
+	public void run() {
+		mHashToIconCache.put(getKey(mTextureName).hashCode(), GregTech_API.sBlockIcons.registerIcon(mTextureName));	
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
new file mode 100644
index 0000000000..098b670509
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -0,0 +1,309 @@
+package gtPlusPlus.core.block.base;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.api.objects.minecraft.SafeTexture;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip {
+
+	/**
+	 * Each mapped object holds the data for the six sides.
+	 */
+	@SideOnly(Side.CLIENT)
+	private AutoMap<CubicObject<SafeTexture>> mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>();
+
+	/**
+	 * Holds the data for the six sides, each side holds an array of data for each respective meta.
+	 */
+	@SideOnly(Side.CLIENT)
+	private AutoMap<CubicObject<String>> mSidedTexturePathArray = new AutoMap<CubicObject<String>>();
+
+	/**
+	 * Does this block have any meta at all?
+	 * @return
+	 */
+	public final boolean hasMeta() {
+		return getMetaCount() > 0;
+	}
+
+	/**
+	 * The amount of meta this block has.
+	 * @return
+	 */
+	public abstract int getMetaCount();
+
+	/**
+	 * Does this {@link Block} require special {@link ItemBlock} handling?
+	 * @return The {@link Class} that will be used for this {@link Block}.
+	 */
+	public Class<? extends ItemBlock> getItemBlockClass() {
+		return ItemBlock.class;
+	}
+
+	/**
+	 * A lazy way to declare the unlocal name for the block, makes boilerplating easy.
+	 * @return The internal name for this block.
+	 */
+	public abstract String getUnlocalBlockName();
+
+	/**
+	 * Does this Block have {@link ITileTooltip} support?
+	 * @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not.
+	 */
+	public final boolean hasTooltip() {
+		return getTooltipID() >= -1;
+	}
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return Block Hardness.
+	 */
+	protected abstract float initBlockHardness();
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return Block Resistance.
+	 */
+	protected abstract float initBlockResistance();	
+
+	/**
+	 * Lazy Boilerplating.
+	 * @return The {@link CreativeTab} this Block is shown on.
+	 */
+	protected abstract CreativeTabs initCreativeTab();
+
+	/**
+	 * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in {@link #getItemBlockClass}().
+	 * @return 
+	 */
+	@Override
+	public abstract int getTooltipID();
+
+	public BasicTileBlockWithTooltip(Material aBlockMat){
+		super(aBlockMat);
+		//Use Abstract method values
+		this.setHardness(initBlockHardness());
+		this.setResistance(initBlockResistance());
+		this.setBlockName(getUnlocalBlockName());
+		this.setCreativeTab(initCreativeTab());
+		// Register the block last.
+		GameRegistry.registerBlock(this, getItemBlockClass(), getUnlocalBlockName());		
+		Logger.INFO("Registered "+getTileEntityName()+".");
+		if (Utils.isClient()) {
+			// Handle Textures
+			handleTextures();	
+		}
+	}
+
+	/**
+	 * The name of the Tile Entity.
+	 * @return
+	 */
+	protected abstract String getTileEntityName();
+
+	/**
+	 * The String used for texture pathing.
+	 * @return Sanitized {@link String}, containing no spaces or illegal characters.
+	 */
+	private final String getTileEntityNameForTexturePathing() {
+		return Utils.sanitizeString(getTileEntityName().replace(" ", ""));
+	}
+
+	/**
+	 * An array of CubicObjects, one for each meta, else just a single cell array.
+	 * Expected to be null regularly, as the default texture handling should suffice.
+	 * Handy if re-using textures or using a non-standard structure for them. FULL texture path must be used,
+	 * inclusive of the MODID and a colon.
+	 * @return
+	 */
+	public CubicObject<String>[] getCustomTextureDirectoryObject(){
+		return null;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public final IIcon getIcon(final int aSide, final int aMeta) {
+		return mSidedTextureArray.get(aMeta).get(aSide).getIcon();	
+	}
+
+	@Override
+	public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
+		return super.getIcon(aWorld, aX, aY, aZ, aSide);
+	}
+
+	@SideOnly(Side.CLIENT)
+	private final void handleTextures() {
+
+		Logger.INFO("[TeTexture] Building Texture Maps for "+getTileEntityName()+".");
+		//Store them in forge order
+		//DOWN, UP, NORTH, SOUTH, WEST, EAST	
+
+		// Default Path Name, this will make us look inside 'miscutils\textures\blocks'
+		final String aPrefixTexPath = CORE.MODID + ":";
+		// Default Path Name, this will make us look in the sub-directory for this Tile Entity.		
+		final String aTexPathMid =  "TileEntities"+CORE.SEPERATOR+getTileEntityNameForTexturePathing()+CORE.SEPERATOR;
+		// Construct a full path
+		String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
+		// File Name Suffixes, without meta tags
+		String aStringBot;
+		String aStringTop;
+		String aStringBack;
+		String aStringFront;
+		String aStringLeft;
+		String aStringRight;
+		// Do we provide a matrix of custom data to be used for texture processing instead?
+		if (getCustomTextureDirectoryObject() != null) {
+			// Get custom provided texture data.
+			CubicObject<String>[] aDataMap = getCustomTextureDirectoryObject();	
+			Logger.INFO("[TeTexture] Found custom texture data, using this instead. Size: "+aDataMap.length);	
+			// Map each meta string data to the main map.
+			for (int i=0;i<aDataMap.length;i++) {
+				mSidedTexturePathArray.put(aDataMap[i]);
+				Logger.INFO("Mapped value for meta "+i+".");
+			}			
+		}
+		else {	
+			Logger.INFO("[TeTexture] Processing "+(1+getMetaCount())+" sets.");		
+			// Iterate once for each meta
+			for (int i=0;i<(1+getMetaCount());i++) {				
+
+				// File Name Suffixes, without meta tags
+				aStringBot = "Bottom";
+				aStringTop = "Top";
+				aStringBack = "Back";
+				aStringFront = "Front";
+				aStringLeft = "Left";
+				aStringRight = "Right";
+
+				// Add tails if we have meta
+				if (hasMeta()) {
+					aStringBot = aStringBot + "_"+i;
+					aStringTop = aStringTop + "_"+i;
+					aStringBack = aStringBack + "_"+i;
+					aStringFront = aStringFront + "_"+i;
+					aStringLeft = aStringLeft + "_"+i;
+					aStringRight = aStringRight + "_"+i;
+				}
+				// Append the full path
+				aStringBot = aTexPathBuilt + aStringBot;
+				aStringTop = aTexPathBuilt + aStringTop;
+				aStringBack = aTexPathBuilt + aStringBack;
+				aStringFront = aTexPathBuilt + aStringFront;
+				aStringLeft = aTexPathBuilt + aStringLeft;
+				aStringRight = aTexPathBuilt + aStringRight;
+				// Convenience Blob
+				CubicObject<String> aMetaBlob = new CubicObject<String>(aStringBot, aStringTop, aStringBack, aStringFront, aStringLeft, aStringRight);
+				mSidedTexturePathArray.put(aMetaBlob);
+				Logger.INFO("[TeTexture] Added Texture Path data to map for meta "+i);	
+			}
+		}
+		Logger.INFO("[TeTexture] Map size for pathing: "+mSidedTexturePathArray.size());
+
+		// Iteration Index
+		int aIndex = 0;
+
+		// Iterate each CubicObject, holding the six texture paths for each meta.
+		for (CubicObject<String> aMetaBlob : mSidedTexturePathArray) {			
+			// Make a Safe Texture for each side