mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Merge branch 'master' into weaponry
Conflicts: src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
commit
65ce5f23c2
11 files changed
+163
-67
No files matched your search
@@ -220,6 +220,15 @@ public class TConstructRegistry
|
||||
// Materials
|
||||
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 void addDefaultToolPartMaterial(int materialID)
|
||||
{
|
||||
if(!toolMaterials.containsKey(materialID))
|
||||
logger.error("[TCon API] Can't add default toolpart: Material ID " + materialID + " is unknown.");
|
||||
else
|
||||
defaultToolPartMaterials.add(materialID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a tool material to the registry
|
||||
|
||||
Reference in new issue
Block a user