Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

98 files changed, 8478 insertions, 2102 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index b904b04556..a448e313ac 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -18,8 +18,10 @@ import gtPlusPlus.core.block.machine.DecayablesChest;
 import gtPlusPlus.core.block.machine.FishTrap;
 import gtPlusPlus.core.block.machine.HeliumGenerator;
 import gtPlusPlus.core.block.machine.Machine_ModularityTable;
+import gtPlusPlus.core.block.machine.Machine_PestKiller;
 import gtPlusPlus.core.block.machine.Machine_PooCollector;
 import gtPlusPlus.core.block.machine.Machine_ProjectTable;
+import gtPlusPlus.core.block.machine.Machine_RoundRobinator;
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
 import gtPlusPlus.core.block.machine.Machine_TradeTable;
 import gtPlusPlus.core.block.machine.Machine_Workbench;
@@ -33,6 +35,7 @@ import net.minecraftforge.fluids.Fluid;
 
 public final class ModBlocks {
 
+	public static Block blockRoundRobinator;
 	public static Block blockCircuitProgrammer;
 	public static Block blockFakeMiningPipe;
 	public static Block blockFakeMiningHead;
@@ -91,6 +94,8 @@ public final class ModBlocks {
 	public static Block blockCustomJukebox;
 	
 	public static Block blockPooCollector;
+	
+	public static Block blockPestKiller;
 
 	public static void init() {
 		Logger.INFO("Initializing Blocks.");
@@ -142,6 +147,10 @@ public final class ModBlocks {
 		blockCustomJukebox = new Machine_SuperJukebox();
 		
 		blockPooCollector = new Machine_PooCollector();
+		
+		blockPestKiller = new Machine_PestKiller();
+		
+		blockRoundRobinator = new Machine_RoundRobinator();
 
 		new BlockGenericRedstoneDetector();
 		new BlockGenericRedstoneTest();
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..6166835f31
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -0,0 +1,315 @@
+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;
+
+	/**
+	 * 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;
+
+	/**
+	 * 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 "+getTileEn