Allow making composite bones in part builder

SlimeKnights · Nov 21, 2022 · 46c8454 · 46c8454
1 parent ddc10f8
commit 46c8454
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/blazing_bone.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/blazing_bone.json
@@ -1,5 +1,5 @@
 {
-  "craftable": false,
+  "craftable": true,
   "tier": 4,
   "sortOrder": 3,
   "hidden": false

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/bloodbone.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/bloodbone.json
@@ -1,5 +1,5 @@
 {
-  "craftable": false,
+  "craftable": true,
   "tier": 2,
   "sortOrder": 2,
   "hidden": false

diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/definition/necronium.json b/src/generated/resources/data/tconstruct/tinkering/materials/definition/necronium.json
@@ -15,7 +15,7 @@
     ],
     "type": "forge:or"
   },
-  "craftable": false,
+  "craftable": true,
   "tier": 3,
   "sortOrder": 7,
   "hidden": false

diff --git a/...main/java/slimeknights/tconstruct/library/data/material/AbstractMaterialDataProvider.java b/...main/java/slimeknights/tconstruct/library/data/material/AbstractMaterialDataProvider.java
@@ -124,10 +124,15 @@ protected void addMaterial(MaterialId location, int tier, int order, boolean cra
     addMaterial(location, tier, order, craftable, false, null);
   }
 
+  /** Creates a new compat material */
+  protected void addCompatMaterial(MaterialId location, int tier, int order, String tagName, boolean craftable) {
+    ICondition condition = new OrCondition(ConfigEnabledCondition.FORCE_INTEGRATION_MATERIALS, tagExistsCondition(tagName));
+    addMaterial(location, tier, order, craftable, false, condition);
+  }
+
   /** Creates a new compat material */
   protected void addCompatMetalMaterial(MaterialId location, int tier, int order, String ingotName) {
-    ICondition condition = new OrCondition(ConfigEnabledCondition.FORCE_INTEGRATION_MATERIALS, tagExistsCondition("ingots/" + ingotName));
-    addMaterial(location, tier, order, false, false, condition);
+    addCompatMaterial(location, tier, order, "ingots/" + ingotName, false);
   }
 
   /** Creates a new compat material */

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java
@@ -33,7 +33,7 @@ protected void addMaterials() {
     // tier 2
     addMaterial(MaterialIds.iron,        2, ORDER_GENERAL, false);
     addMaterial(MaterialIds.searedStone, 2, ORDER_HARVEST, false);
-    addMaterial(MaterialIds.bloodbone,   2, ORDER_WEAPON,  false);
+    addMaterial(MaterialIds.bloodbone,   2, ORDER_WEAPON,  true);
     addMaterial(MaterialIds.slimewood,   2, ORDER_SPECIAL, true);
     // tier 2 - nether
     addMaterial(MaterialIds.scorchedStone, 2, ORDER_NETHER, false);
@@ -59,7 +59,7 @@ protected void addMaterials() {
     addMaterial(MaterialIds.queensSlime, 4, ORDER_GENERAL, false);
     addMaterial(MaterialIds.hepatizon,   4, ORDER_HARVEST, false);
     addMaterial(MaterialIds.manyullyn,   4, ORDER_WEAPON,  false);
-    addMaterial(MaterialIds.blazingBone, 4, ORDER_SPECIAL, false);
+    addMaterial(MaterialIds.blazingBone, 4, ORDER_SPECIAL, true);
     //addMetalMaterial(MaterialIds.soulsteel, 4, ORDER_SPECIAL, false, 0x6a5244);
     // tier 4 - binding
     addMaterial(MaterialIds.ancientHide, 4, ORDER_BINDING, false);
@@ -81,7 +81,7 @@ protected void addMaterials() {
     addCompatMetalMaterial(MaterialIds.bronze,          3, ORDER_COMPAT + ORDER_HARVEST);
     addCompatMetalMaterial(MaterialIds.constantan,      3, ORDER_COMPAT + ORDER_HARVEST);
     addCompatMetalMaterial(MaterialIds.invar,           3, ORDER_COMPAT + ORDER_WEAPON);
-    addCompatMetalMaterial(MaterialIds.necronium,       3, ORDER_COMPAT + ORDER_WEAPON, "uranium");
+    addCompatMaterial     (MaterialIds.necronium,       3, ORDER_COMPAT + ORDER_WEAPON, "ingots/uranium", true);
     addCompatMetalMaterial(MaterialIds.electrum,        3, ORDER_COMPAT + ORDER_SPECIAL);
     addCompatMetalMaterial(MaterialIds.platedSlimewood, 3, ORDER_COMPAT + ORDER_SPECIAL, "brass");