Merge pull request #5 from alkcorp/master

sync fork

3 files changed, 322 insertions, 57 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index 6ae1a52aba..7d8b3eb708 100644
--- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -1,42 +1,27 @@
 package gtPlusPlus.core.block.machine;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-
-public class CircuitProgrammer extends BlockContainer implements ITileTooltip
-{
-	@SideOnly(Side.CLIENT)
-	private IIcon textureTop;
-	@SideOnly(Side.CLIENT)
-	private IIcon textureBottom;
-	@SideOnly(Side.CLIENT)
-	private IIcon textureFront;
+public class CircuitProgrammer extends BasicTileBlockWithTooltip {
 
 	/**
 	 * Determines which tooltip is displayed within the itemblock.
@@ -51,33 +36,7 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 	@SuppressWarnings("deprecation")
 	public CircuitProgrammer(){
 		super(Material.iron);
-		this.setHardness(5f);
-		this.setResistance(1f);
-		this.setBlockName("blockCircuitProgrammer");
-		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockCircuitProgrammer");
 		LanguageRegistry.addName(this, "Circuit Programmer");
-
-	}
-
-	/**
-	 * Gets the block's texture. Args: side, meta
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final int p_149691_1_, final int p_149691_2_)
-	{
-		return p_149691_1_ == 1 ? this.textureTop : (p_149691_1_ == 0 ? this.textureBottom : (this.textureFront));
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister p_149651_1_)
-	{
-		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B");
-		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B");
-		this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G");
-		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I");
 	}
 
 	/**
@@ -142,12 +101,6 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 	}
 
 	@Override
-	public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int number) {
-		InventoryUtils.dropInventoryItems(world, x, y, z, block);
-		super.breakBlock(world, x, y, z, block, number);
-	}
-
-	@Override
 	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) {
 		if (stack.hasDisplayName()) {
 			((TileEntityCircuitProgrammer) world.getTileEntity(x,y,z)).setCustomName(stack.getDisplayName());
@@ -159,4 +112,48 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip
 		return false;
 	}
 
+	@Override
+	public int getMetaCount() {
+		return 0;
+	}
+
+	@Override
+	public String getUnlocalBlockName() {
+		return "blockCircuitProgrammer";
+	}
+
+	@Override
+	protected float initBlockHardness() {
+		return 5f;
+	}
+
+	@Override
+	protected float initBlockResistance() {
+		return 1f;
+	}
+
+	@Override
+	protected CreativeTabs initCreativeTab() {
+		return AddToCreativeTab.tabMachines;
+	}
+
+	@Override
+	protected String getTileEntityName() {
+		return "Circuit Programmer";
+	}
+
+	@Override
+	public CubicObject<String>[] getCustomTextureDirectoryObject() {
+		String[] aTexData = new String[] {
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+				CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I"
+		};
+		CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)};		
+		return aTextureData;
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
new file mode 100644
index 0000000000..11fa80f439
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -0,0 +1,137 @@
+package gtPlusPlus.core.block.machine;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+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.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class Machine_PestKiller extends BlockContainer implements ITileTooltip
+{
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureBottom;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureFront;
+
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 6;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
+
+	@SuppressWarnings("deprecation")
+	public Machine_PestKiller()
+	{
+		super(Material.wood);
+		this.setBlockName("blockPestKiller");
+		this.setHardness(5f);
+		this.setResistance(1f);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockPestKiller");
+		LanguageRegistry.addName(this, "Pest Killer");
+
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int aSide, final int p_149691_2_)
+	{
+		return aSide == 1 ? this.textureTop : (aSide == 0 ? this.textureBottom : this.textureFront);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister p_149651_1_)
+	{
+		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
+		this.textureBottom = p_149651_1_.registerIcon("planks_acacia");
+		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz)
+	{
+		if (world.isRemote) {
+			return true;
+		}
+
+		final TileEntity te = world.getTileEntity(x, y, z);
+		if ((te != null) && (te instanceof TileEntityPestKiller)){
+			player.openGui(GTplusplus.instance, GuiHandler.GUI15, world, x, y, z);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public int getRenderBlockPass() {
+		return 0;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityPestKiller();
+	}
+
+	@Override
+	public void onBlockAdded(final World world, final int x, final int y, final int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
+
+	@Override
+	public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int number) {
+		InventoryUtils.dropInventoryItems(world, x, y, z, block);
+		super.breakBlock(world, x, y, z, block, number);
+	}
+
+	@Override
+	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) {
+		if (stack.hasDisplayName()) {
+			((TileEntityPestKiller) world.getTileEntity(x,y,z)).setCustomName(stack.getDisplayName());
+		}
+	}
+
+	@Override
+	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
new file mode 100644
index 0000000000..dc87b885b9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -0,0 +1,131 @@
+package gtPlusPlus.core.block.machine;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
+	
+
+	public Machine_RoundRobinator(){
+		super(Material.iron);
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz)
+	{
+		if (world.isRemote) {
+			return true;
+		}
+		else {
+
+			boolean mDidScrewDriver = false;
+			// Check For Screwdriver
+			try {
+				final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
+				if (ItemUtils.isToolScrewdriver(mHandStack)) {
+					final TileEntityRoundRobinator tile = (TileEntityRoundRobinator) world.getTileEntity(x, y, z);
+					if (tile != null) {
+						mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
+					}									
+				}
+			}
+			catch (final Throwable t) {}
+
+			if (!mDidScrewDriver) {
+				final TileEntity te = world.getTileEntity(x, y, z);
+				if ((te != null) && (te instanceof TileEntityRoundRobinator)){
+					return ((TileEntityRoundRobinator) te).onRightClick((byte) side, player, x, y, z);
+				}
+				return false;
+			}
+			else {
+				return true;
+			}		
+		}
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityRoundRobinator();
+	}
+
+	@Override
+	public int getMetaCount() {
+		return 5;
+	}
+
+	@Override
+	public String getUnlocalBlockName() {
+		return "blockRoundRobinator";
+	}
+
+	@Override
+	protected float initBlockHardness() {
+		return 1;
+	}
+
+	@Override
+	protected float initBlockResistance() {
+		return 1;
+	}
+
+	@Override
+	protected CreativeTabs initCreativeTab() {
+		return AddToCreativeTab.tabMachines;
+	}
+
+	@Override
+	public int getTooltipID() {
+		return -1;
+	}
+
+	@Override
+	protected String getTileEntityName() {
+		return "Round Robinator";
+	}
+
+	@Override
+	public Class<? extends ItemBlock> getItemBlockClass() {
+		return ItemBlockRoundRobinator.class;
+	}
+
+	@Override
+	public CubicObject<String>[] getCustomTextureDirectoryObject() {
+		AutoMap<String[]> aTemp = new AutoMap<String[]>();
+		for (int i=0;i<5;i++) {
+			String[] aTexData = new String[] {
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+					CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_"+i,
+			};
+			aTemp.put(aTexData);			
+		}
+		AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>();
+		for (String[] y : aTemp) {
+			aTemp2.put(new CubicObject<String>(y));			
+		}
+		CubicObject<String>[] aTextureData = new CubicObject[] {aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), aTemp2.get(3), aTemp2.get(4)};		
+		return aTextureData;
+	}
+
+}
\ No newline at end of file