diff --git a/assets/common/component_recipe_book.ron b/assets/common/component_recipe_book.ron
index 42b439e6d3..778936e342 100644
--- a/assets/common/component_recipe_book.ron
+++ b/assets/common/component_recipe_book.ron
@@ -1,17 +1,11 @@
-{
+[
 /// MODULAR WEAPONS/HAMMERS/PRIMARY COMPONENTS
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
+        material: ("common.items.mineral.ingot.bronze", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -19,17 +13,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
+        material: ("common.items.mineral.ingot.iron", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -37,17 +25,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
+        material: ("common.items.mineral.ingot.steel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -55,17 +37,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
+        material: ("common.items.mineral.ingot.cobalt", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -73,17 +49,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -91,17 +61,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.hammer",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -109,648 +73,432 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.spikedmace",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.warhammer",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.maul",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greatmace",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.greathammer",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Hammer,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Hammer,
             item: "common.items.crafting_ing.modular.primary.hammer.ornate",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
@@ -758,17 +506,11 @@
     ),
 /// MODULAR WEAPONS/SWORDS/PRIMARY COMPONENTS
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
+        material: ("common.items.mineral.ingot.bronze", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -776,17 +518,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
+        material: ("common.items.mineral.ingot.iron", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -794,17 +530,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
+        material: ("common.items.mineral.ingot.steel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -812,17 +542,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
+        material: ("common.items.mineral.ingot.cobalt", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -830,17 +554,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -848,17 +566,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.longsword",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -866,648 +578,432 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sawblade",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.katana",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.zweihander",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.sabre",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.greatsword",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Sword,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sword,
             item: "common.items.crafting_ing.modular.primary.sword.ornate",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
@@ -1515,17 +1011,11 @@
     ),
 /// MODULAR WEAPONS/AXES/PRIMARY COMPONENTS
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
+        material: ("common.items.mineral.ingot.bronze", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1533,17 +1023,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
+        material: ("common.items.mineral.ingot.iron", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1551,17 +1035,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
+        material: ("common.items.mineral.ingot.steel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1569,17 +1047,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
+        material: ("common.items.mineral.ingot.cobalt", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1587,17 +1059,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1605,17 +1071,11 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.axe",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
@@ -1623,648 +1083,432 @@
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.jagged",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.battleaxe",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.poleaxe",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.labrys",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.greataxe",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bronze",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.bronze"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bronze"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.mineral.ingot.bronze", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.iron",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.iron"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.iron"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.mineral.ingot.iron", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.steel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.steel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.steel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.mineral.ingot.steel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.cobalt",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.cobalt"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.cobalt"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.mineral.ingot.cobalt", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.bloodsteel",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.bloodsteel"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.bloodsteel"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.mineral.ingot.bloodsteel", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
         craft_sprite: Some(Anvil),
     ),
     (
-        toolkind: Axe,
-        material: "common.items.mineral.ingot.orichalcum",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Axe,
             item: "common.items.crafting_ing.modular.primary.axe.ornate",
-            components: [
-                "common.items.mineral.ingot.orichalcum"
-            ],
         ),
-        material: (Item("common.items.mineral.ingot.orichalcum"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.mineral.ingot.orichalcum", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.tool.craftsman_hammer"), 0),
         ],
@@ -2272,17 +1516,11 @@
     ),
 /// MODULAR WEAPONS/BOWS/PRIMARY COMPONENTS
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
+        material: ("common.items.log.wood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2290,17 +1528,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
+        material: ("common.items.log.bamboo", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2308,17 +1540,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
+        material: ("common.items.log.hardwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2326,17 +1552,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
+        material: ("common.items.log.ironwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2344,17 +1564,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
+        material: ("common.items.log.frostwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2362,17 +1576,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.bow",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
+        material: ("common.items.log.eldwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
@@ -2380,648 +1588,432 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.composite",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.greatbow",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.longbow",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.ornate",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.shortbow",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Bow,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Bow,
             item: "common.items.crafting_ing.modular.primary.bow.warbow",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.sticky_thread"), 3),
         ],
@@ -3029,665 +2021,443 @@
     ),
 /// MODULAR WEAPONS/FIRE STAFFS/PRIMARY COMPONENTS
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.brand",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.grandstaff",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.longpole",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.ornate",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.pole",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.rod",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.wood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
+        material: ("common.items.log.wood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3695,17 +2465,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.bamboo",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
+        material: ("common.items.log.bamboo", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3713,17 +2477,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.hardwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
+        material: ("common.items.log.hardwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3731,17 +2489,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.ironwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
+        material: ("common.items.log.ironwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3749,17 +2501,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.frostwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
+        material: ("common.items.log.frostwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3767,17 +2513,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Staff,
-        material: "common.items.log.eldwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Staff,
             item: "common.items.crafting_ing.modular.primary.staff.staff",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
+        material: ("common.items.log.eldwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -3786,665 +2526,443 @@
     ),
 /// MODULAR WEAPONS/NATURE SCEPTRES/PRIMARY COMPONENTS
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.long_tusk"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.arbor",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.long_tusk"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.long_tusk", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.strong_pincer"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.cane",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.strong_pincer"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.strong_pincer", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.sharp_fang"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crook",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.sharp_fang"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.sharp_fang", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.claw"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.crozier",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.claw"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.claw", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.large_horn"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.grandsceptre",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.large_horn"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.large_horn", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1)),
+        material: ("common.items.log.wood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 1)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 2)),
+        material: ("common.items.log.bamboo", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 2)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5)),
+        material: ("common.items.log.hardwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 5)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 10)),
+        material: ("common.items.log.ironwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 10)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 20)),
+        material: ("common.items.log.frostwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 20)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: Some("common.items.crafting_ing.animal_misc.elegant_crest"),
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.ornate",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
-        modifier: Some((Item("common.items.crafting_ing.animal_misc.elegant_crest"), 50)),
+        material: ("common.items.log.eldwood", 5),
+        modifier: Some(("common.items.crafting_ing.animal_misc.elegant_crest", 50)),
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.wood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.wood"
-            ],
         ),
-        material: (Item("common.items.log.wood"), 5),
+        material: ("common.items.log.wood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -4452,17 +2970,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.bamboo",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.bamboo"
-            ],
         ),
-        material: (Item("common.items.log.bamboo"), 5),
+        material: ("common.items.log.bamboo", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -4470,17 +2982,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.hardwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.hardwood"
-            ],
         ),
-        material: (Item("common.items.log.hardwood"), 5),
+        material: ("common.items.log.hardwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -4488,17 +2994,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.ironwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.ironwood"
-            ],
         ),
-        material: (Item("common.items.log.ironwood"), 5),
+        material: ("common.items.log.ironwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -4506,17 +3006,11 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.frostwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.frostwood"
-            ],
         ),
-        material: (Item("common.items.log.frostwood"), 5),
+        material: ("common.items.log.frostwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
@@ -4524,21 +3018,15 @@
         craft_sprite: Some(CraftingBench),
     ),
     (
-        toolkind: Sceptre,
-        material: "common.items.log.eldwood",
-        modifier: None,
-    ): (
-        output: ItemComponents(
+        output: ToolPrimaryComponent(
+            toolkind: Sceptre,
             item: "common.items.crafting_ing.modular.primary.sceptre.sceptre",
-            components: [
-                "common.items.log.eldwood"
-            ],
         ),
-        material: (Item("common.items.log.eldwood"), 5),
+        material: ("common.items.log.eldwood", 5),
         modifier: None,
         additional_inputs: [
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
-}
\ No newline at end of file
+]
\ No newline at end of file