dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new block textures

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-23 01:36:06 +01:00
parent 7ec94f6b6b
commit 7044d56ecb
30 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/storagecraft/block/BlockController.java
View File

@@ -13,7 +13,7 @@ import storagecraft.tile.TileController;
public class BlockController extends BlockBase implements ITileEntityProvider
{
private IIcon sideIcon;
private IIcon[] icons = new IIcon[6];
private IIcon[] icons = new IIcon[8];
public BlockController()
{
@@ -48,7 +48,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider
@Override
public void registerBlockIcons(IIconRegister register)
{
for (int i = 0; i <= 5; ++i)
for (int i = 0; i <= 7; ++i)
{
icons[i] = register.registerIcon("storagecraft:controller" + i);
}
@@ -66,7 +66,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider
TileController controller = (TileController) world.getTileEntity(x, y, z);
return icons[(int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * 5f)];
return icons[(int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * 7f)];
}
@Override

22
src/main/java/storagecraft/block/BlockDetector.java
View File

@@ -12,7 +12,8 @@ import storagecraft.tile.TileDetector;
public class BlockDetector extends BlockBase implements ITileEntityProvider
{
private IIcon frontIcon;
private IIcon poweredIcon;
private IIcon unpoweredIcon;
private IIcon sideIcon;
public BlockDetector()
@@ -60,31 +61,32 @@ public class BlockDetector extends BlockBase implements ITileEntityProvider
@Override
public void registerBlockIcons(IIconRegister register)
{
frontIcon = register.registerIcon("storagecraft:detector");
poweredIcon = register.registerIcon("storagecraft:detectorPowered");
unpoweredIcon = register.registerIcon("storagecraft:detectorUnpowered");
sideIcon = register.registerIcon("storagecraft:generic");
}
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
{
TileDetector tile = (TileDetector) world.getTileEntity(x, y, z);
if (side == tile.getDirection().ordinal())
if (side == 0 || side == 1)
{
return frontIcon;
return sideIcon;
}
return sideIcon;
TileDetector tile = (TileDetector) world.getTileEntity(x, y, z);
return tile.providesPower() ? poweredIcon : unpoweredIcon;
}
@Override
public IIcon getIcon(int side, int meta)
{
if (side == 3)
if (side == 0 || side == 1)
{
return frontIcon;
return sideIcon;
}
return sideIcon;
return unpoweredIcon;
}
}