This commit is contained in:
Modmuss50 2015-09-14 21:23:07 +01:00
parent cf49f01042
commit 29d47ec37e
16 changed files with 181 additions and 13 deletions

View file

@ -70,4 +70,15 @@ public class BlockAlloyFurnace extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -79,4 +79,15 @@ public class BlockAssemblingMachine extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -79,4 +79,15 @@ public class BlockBlastFurnace extends BlockMachineBase {
return IC2Items.getItem("advancedMachine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -14,6 +14,7 @@ import net.minecraft.world.World;
import techreborn.Core;
import techreborn.blocks.BlockMachineBase;
import techreborn.client.GuiHandler;
import techreborn.packets.PacketAesu;
import techreborn.tiles.TileCentrifuge;
import java.util.Random;
@ -83,6 +84,18 @@ public class BlockCentrifuge extends BlockMachineBase {
}
return this.iconFront;
}
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.iconFront;
}
}
@Override

View file

@ -69,4 +69,15 @@ public class BlockChargeBench extends BlockMachineBase {
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -79,4 +79,15 @@ public class BlockChemicalReactor extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -53,4 +53,15 @@ public class BlockDistillationTower extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -83,4 +83,14 @@ public class BlockGrinder extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -78,4 +78,15 @@ public class BlockImplosionCompressor extends BlockMachineBase {
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -80,4 +80,15 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -79,4 +79,15 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
return IC2Items.getItem("advancedMachine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -78,4 +78,15 @@ public class BlockLathe extends BlockMachineBase {
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -21,16 +21,10 @@ import java.util.Random;
public class BlockMatterFabricator extends BlockMachineBase {
@SideOnly(Side.CLIENT)
private IIcon iconFront;
private IIcon iconOff;
@SideOnly(Side.CLIENT)
private IIcon iconFrontOn;
@SideOnly(Side.CLIENT)
private IIcon iconTop;
@SideOnly(Side.CLIENT)
private IIcon iconBottom;
private IIcon iconOn;
public BlockMatterFabricator(Material material) {
super(material);
@ -56,16 +50,26 @@ public class BlockMatterFabricator extends BlockMachineBase {
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
int metadata = getTileMeta(blockAccess, x, y, z);
if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) {
return this.iconFrontOn;
return this.iconOn;
} else {
return this.iconOff;
}
return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop :
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon));
}
@Override
public Item getItemDropped(int meta, Random random, int fortune) {
return IC2Items.getItem("advancedMachine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
return iconOff;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister icon) {
this.iconOn = icon.registerIcon("techreborn:machine/matter_fabricator_off");
this.iconOff = icon.registerIcon("techreborn:machine/matter_fabricator_on");
}
}

View file

@ -79,4 +79,14 @@ public class BlockPlateCuttingMachine extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -72,4 +72,14 @@ public class BlockRollingMachine extends BlockMachineBase {
return IC2Items.getItem("machine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}

View file

@ -53,4 +53,15 @@ public class BlockVacuumFreezer extends BlockMachineBase {
return IC2Items.getItem("advancedMachine").getItem();
}
@Override
public IIcon getIcon(int side, int meta) {
if(side == 1){
return this.iconTop;
} else if(side == 3){
return this.iconFront;
} else {
return this.blockIcon;
}
}
}