manual merges of up to 9a578fc

This commit is contained in:
Progwml6 committed 2013-12-11 23:47:07 -05:00
1 parent 655780cc0c
commit 0c9c8100ad
21 files changed
+218 -56

No files matched your search

@@ -33,6 +33,12 @@ public class SearedBlock extends InventoryBlock
setStepSound(soundMetalFootstep);
}
public SearedBlock(int id, String texture)
{
this(id);
this.texturePrefix = texture;
}
@Override
public TileEntity createTileEntity (World world, int metadata)
{
@@ -181,11 +187,17 @@ public class SearedBlock extends InventoryBlock
return SearedRender.searedModel;
}
String texturePrefix = "";
@Override
public String[] getTextureNames ()
{
String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" };
if (!texturePrefix.equals(""))
for (int i = 0; i < textureNames.length; i++)
textureNames[i] = texturePrefix + "_" + textureNames[i];
return textureNames;
}