Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'patch-4' of git://github.com/TarzanBuzzyMan/BuildCraft into fixxy

Browse source
This commit is contained in:
Krapht 2013-03-28 17:01:46 +01:00
commit 50030fd815
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/buildcraft/energy/BlockOilFlowing.java
View file

@ -30,9 +30,6 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid {
boolean isOptimalFlowDirection[] = new boolean[4]; boolean isOptimalFlowDirection[] = new boolean[4];
int flowCost[] = new int[4]; int flowCost[] = new int[4];
@SideOnly(Side.CLIENT)
private Icon[] field_94425_a;
public BlockOilFlowing(int i, Material material) { public BlockOilFlowing(int i, Material material) {
super(i, material); super(i, material);
@ -269,13 +266,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister){ public void registerIcons(IconRegister iconRegister){
this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; this.theIcon = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")};
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0];
} }
} }

9
common/buildcraft/energy/BlockOilStill.java
View file

@ -22,9 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockOilStill extends BlockStationary implements ILiquid { public class BlockOilStill extends BlockStationary implements ILiquid {
@SideOnly(Side.CLIENT)
private Icon[] theIcon;
public BlockOilStill(int i, Material material) { public BlockOilStill(int i, Material material) {
super(i, material); super(i, material);
@ -63,10 +60,4 @@ public class BlockOilStill extends BlockStationary implements ILiquid {
this.theIcon = new Icon[] { iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow") }; this.theIcon = new Icon[] { iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow") };
} }
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
return par1 != 0 && par1 != 1 ? this.theIcon[1] : this.theIcon[0];
}
} }