Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-19 14:12:50 +02:00
commit f31e41447c
11 files changed
+85 -79

No files matched your search

@@ -221,6 +221,7 @@ public class TConstructRegistry
public static HashMap<Integer, ToolMaterial> toolMaterials = new HashMap<Integer, ToolMaterial>(40);
public static HashMap<String, ToolMaterial> toolMaterialStrings = new HashMap<String, ToolMaterial>(40);
public static List<Integer> defaultToolPartMaterials = new LinkedList<Integer>();
public static List<Integer> defaultShardMaterials = new LinkedList<Integer>();
public static void addDefaultToolPartMaterial(int materialID)
{
@@ -230,6 +231,14 @@ public class TConstructRegistry
defaultToolPartMaterials.add(materialID);
}
public static void addDefaultShardMaterial(int materialID)
{
if(!toolMaterials.containsKey(materialID))
logger.error("[TCon API] Can't add default shard: Material ID " + materialID + " is unknown.");
else
defaultShardMaterials.add(materialID);
}
/**
* Adds a tool material to the registry
*