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

@@ -29,6 +29,7 @@ import tconstruct.util.config.PHConstruct;
public class SmelteryBlock extends InventoryBlock
{
Random rand;
String texturePrefix = "";
public SmelteryBlock(int id)
{
@@ -41,6 +42,12 @@ public class SmelteryBlock extends InventoryBlock
this.setUnlocalizedName("tconstruct.Smeltery");
}
public SmelteryBlock(int id, String prefix)
{
this(id);
texturePrefix = prefix;
}
/* Rendering */
@Override
@@ -55,6 +62,10 @@ public class SmelteryBlock extends InventoryBlock
String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver",
"searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" };
if (!texturePrefix.equals(""))
for (int i = 0; i < textureNames.length; i++)
textureNames[i] = texturePrefix + "_" + textureNames[i];
return textureNames;
}