maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
joflashstudios 2015-06-06 15:58:37 -04:00
commit ee798923f5
25 changed files with 277 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java
View file

@ -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;
@ -66,5 +71,11 @@ public class BlockDieselGenerator extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java
View file

@ -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;
@ -53,5 +58,11 @@ public class BlockDragonEggSiphoner extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

12
src/main/java/techreborn/blocks/generator/BlockGasTurbine.java
View file

@ -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;
@ -70,5 +74,11 @@ public class BlockGasTurbine extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java
View file

@ -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;
@ -53,5 +58,11 @@ public class BlockHeatGenerator extends BlockMachineBase{
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockLightningRod.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockLightningRod extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockMagicEnergyConverter extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockPlasmaGenerator extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

12
src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java
View file

@ -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;
@ -70,5 +74,11 @@ public class BlockSemiFluidGenerator extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java
View file

@ -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;
@ -66,5 +71,11 @@ public class BlockThermalGenerator extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

15
src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java
View file

@ -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;
@ -85,5 +93,10 @@ public class BlockAlloySmelter extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java
View file

@ -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,5 +89,11 @@ public class BlockAssemblingMachine extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java
View file

@ -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;
@ -86,5 +91,11 @@ public class BlockBlastFurnace extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("advancedMachine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockCentrifuge.java
View file

@ -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,5 +71,11 @@ public class BlockCentrifuge extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java
View file

@ -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,5 +90,11 @@ public class BlockChemicalReactor extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockDistillationTower.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockDistillationTower extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockGrinder.java
View file

@ -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,5 +71,11 @@ public class BlockGrinder extends BlockMachineBase{
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java
View file

@ -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();
}
}

11
src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java
View file

@ -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,5 +72,11 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java
View file

@ -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,5 +71,11 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("advancedMachine").getItem();
}
}

10
src/main/java/techreborn/blocks/machine/BlockLathe.java
View file

@ -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();
}
}

11
src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java
View file

@ -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,5 +71,11 @@ public class BlockMatterFabricator extends BlockMachineBase{
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("advancedMachine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java
View file

@ -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,5 +89,11 @@ public class BlockPlateCuttingMachine extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockRollingMachine.java
View file

@ -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;
@ -65,5 +70,11 @@ public class BlockRollingMachine extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("machine").getItem();
}
}

11
src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java
View file

@ -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;
@ -44,5 +49,11 @@ public class BlockVacuumFreezer extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return IC2Items.getItem("advancedMachine").getItem();
}
}