Fixes #170 and fixes #167

This commit is contained in:
Modmuss50 2015-10-07 08:34:24 +01:00
parent 7d052a3292
commit 9c52e0ace7
27 changed files with 41 additions and 112 deletions

View file

@ -74,9 +74,4 @@ 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();
// }//TODO
}

View file

@ -74,12 +74,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -75,8 +75,8 @@ public class BlockBlastFurnace extends BlockMachineBase {
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
public boolean isAdvanced() {
return true;
}
@Override

View file

@ -97,9 +97,4 @@ public class BlockCentrifuge extends BlockMachineBase {
}
}
// @Override
// public Item getItemDropped(int meta, Random random, int fortune) {
// return IC2Items.getItem("machine").getItem();
// }//TODO
}

View file

@ -74,11 +74,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -47,11 +47,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {

View file

@ -78,11 +78,6 @@ 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();
// } //TODO get a standalone way for this
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -75,8 +75,8 @@ public class BlockImplosionCompressor extends BlockMachineBase {
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
public boolean isAdvanced() {
return true;
}
@Override

View file

@ -75,11 +75,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {

View file

@ -75,8 +75,8 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
public boolean isAdvanced() {
return true;
}
@Override

View file

@ -74,11 +74,6 @@ public class BlockLathe extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
// @Override
// public Item getItemDropped(int meta, Random random, int fortune) {
// return IC2Items.getItem("machine").getItem();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -55,9 +55,10 @@ public class BlockMatterFabricator extends BlockMachineBase {
return this.iconOff;
}
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
public boolean isAdvanced() {
return true;
}
@Override

View file

@ -74,11 +74,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -67,11 +67,6 @@ 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();
// }//TODO
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){

View file

@ -48,8 +48,8 @@ public class BlockVacuumFreezer extends BlockMachineBase {
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
public boolean isAdvanced() {
return true;
}
@Override