tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add check for old separators, add colorblind support to Logistical Transporter

Browse source
This commit is contained in:
Aidan Brady 2014-01-02 22:11:40 -05:00
parent 7ad60f0796
commit 26f8aef381
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -740,6 +740,13 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
return true;
}
@Override
public boolean onRightClick(EntityPlayer player, int side)
{
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + color != null ? color.getName() : "None"));
return true;
}
@Override
public EnumColor getColor()
{

9
common/mekanism/generators/common/block/BlockGenerator.java
View file

@ -352,7 +352,14 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
@Override
public TileEntity createTileEntity(World world, int metadata)
{
return GeneratorType.getFromMetadata(metadata).create();
GeneratorType type = GeneratorType.getFromMetadata(metadata);
if(type != null)
{
return type.create();
}
return null;
}
@Override