manual merge of master branch changes up to commit 1387bc6

This commit is contained in:
Progwml6 committed 2013-11-23 09:31:19 -05:00
1 parent 2d99d5dba2
commit 14d357ccf6
23 files changed
+317 -172

No files matched your search

@@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack;
public class MetalPattern extends Pattern
{
public MetalPattern(int id, String partType, String patternType, String folder)
public MetalPattern(int id, String patternType, String folder)
{
super(id, partType, patternType, folder);
super(id, patternName, getPatternNames(patternType), folder);
}
protected static String[] getPatternNames (String partType)
@@ -19,11 +19,13 @@ public class MetalPattern extends Pattern
for (int i = 0; i < patternName.length; i++)
if (!(patternName[i].equals("")))
names[i] = partType + patternName[i];
else
names[i] = "";
return names;
}
private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign",
"knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead" };
"knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" };
public void getSubItems (int id, CreativeTabs tab, List list)
{