Merge branch 'master' of https://github.com/TechReborn/TechReborn

src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockDieselGenerator extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -54,4 +59,10 @@ public class BlockDragonEggSiphoner extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockGasTurbine.java

@@ -1,12 +1,16 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
 import java.util.Map;
+import java.util.Random;
+
 import net.minecraftforge.fluids.*;
 import net.minecraft.util.ChatComponentText;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -71,4 +75,10 @@ public class BlockGasTurbine extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -54,4 +59,10 @@ public class BlockHeatGenerator extends BlockMachineBase{
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockLightningRod.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockLightningRod extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockMagicEnergyConverter extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockPlasmaGenerator extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java

@@ -1,12 +1,16 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
 import java.util.Map;
+import java.util.Random;
+
 import net.minecraftforge.fluids.*;
 import net.minecraft.util.ChatComponentText;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -71,4 +75,10 @@ public class BlockSemiFluidGenerator extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.generator;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockThermalGenerator extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java

@@ -1,8 +1,16 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+import ic2.core.Ic2Items;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 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;
@@ -86,4 +94,9 @@ public class BlockAlloySmelter extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
 }

src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -85,4 +90,10 @@ public class BlockAssemblingMachine extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -87,4 +92,10 @@ public class BlockBlastFurnace extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("advancedMachine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockCentrifuge.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockCentrifuge extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -86,4 +91,10 @@ public class BlockChemicalReactor extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockDistillationTower.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockDistillationTower extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockGrinder.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockGrinder extends BlockMachineBase{
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -84,4 +89,10 @@ public class BlockImplosionCompressor extends BlockMachineBase{
 						: (side == metadata ? this.iconFront : this.blockIcon));
 
 	}
+	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("advancedMachine").getItem();
+	}
 }

src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -68,4 +73,10 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("advancedMachine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockLathe.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -86,4 +91,9 @@ public class BlockLathe extends BlockMachineBase {
 
 	}
 
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
 }

src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -67,4 +72,10 @@ public class BlockMatterFabricator extends BlockMachineBase{
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("advancedMachine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -85,4 +90,10 @@ public class BlockPlateCuttingMachine extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockRollingMachine.java

@@ -1,8 +1,13 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
@@ -66,4 +71,10 @@ public class BlockRollingMachine extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("machine").getItem();
+	}
+
 }

src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java

@@ -1,7 +1,12 @@
 package techreborn.blocks.machine;
 
+import ic2.api.item.IC2Items;
+
+import java.util.Random;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import techreborn.blocks.BlockMachineBase;
 import cpw.mods.fml.relauncher.Side;
@@ -45,4 +50,10 @@ public class BlockVacuumFreezer extends BlockMachineBase {
 
 	}
 	
+	@Override
+	public Item getItemDropped(int meta, Random random, int fortune)
+	{
+		return IC2Items.getItem("advancedMachine").getItem();
+	}
+
 }