diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
new file mode 100644
index 000000000..001b22473
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
new file mode 100644
index 000000000..001b22473
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
new file mode 100644
index 000000000..001b22473
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
new file mode 100644
index 000000000..001b22473
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_shield.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_shield.json
new file mode 100644
index 000000000..001b22473
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_shield.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "psi:psi_overload"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_block.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_block.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ebony_block.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_block.json
index 9bf3e3c0b..f9690629e 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_block.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ebony_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_ingot_shapeless.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_ingot_shapeless.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ebony_ingot_shapeless.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_ingot_shapeless.json
index 9024174f6..29e30e565 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_ingot_shapeless.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ebony_ingot_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ebony_ingot_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_block.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_block.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ivory_block.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_block.json
index 1ea847d65..4e2165fd6 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_block.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ivory_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_ingot_shapeless.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_ingot_shapeless.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ivory_ingot_shapeless.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_ingot_shapeless.json
index 129c1970a..f0d8c5bdc 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_ingot_shapeless.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/ivory_ingot_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:ivory_ingot_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psidust_block.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_block.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psidust_block.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_block.json
index 814b54173..56b3904f9 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psidust_block.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psidust_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psidust_shapeless.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_shapeless.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psidust_shapeless.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_shapeless.json
index 4670eca81..30e4c9181 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psidust_shapeless.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psidust_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psidust_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psigem_block.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_block.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psigem_block.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_block.json
index 4b1eac93b..6bc0d852a 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psigem_block.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_block.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:psigem_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psigem_shapeless.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_shapeless.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psigem_shapeless.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_shapeless.json
index 656118d09..282ad69e6 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psigem_shapeless.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psigem_shapeless.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:psigem_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_block.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_block.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_block.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_block.json
index 47494da8b..91b08a286 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_block.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_block.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shapeless.json b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_shapeless.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shapeless.json
rename to src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_shapeless.json
index ffc7a51dc..af888da97 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shapeless.json
+++ b/src/generated/resources/data/psi/advancements/recipes/building_blocks/psimetal_shapeless.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_shapeless"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_axe.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_axe.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_axe.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_axe.json
index 95ba96a81..b6242d1ec 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_axe.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_axe.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_axe"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_boots.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_boots.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_boots.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_boots.json
index a4b83fe48..a514ca838 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_boots.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_boots.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_boots"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_chestplate.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_chestplate.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_chestplate.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_chestplate.json
index 07325994e..cbdd0f5ea 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_chestplate.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_chestplate.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_chestplate"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_helmet.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_helmet.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_helmet.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_helmet.json
index b59ed86f9..504982c70 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_helmet.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_helmet.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_helmet"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_leggings.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_leggings.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_leggings.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_leggings.json
index 8347293a9..0d55ece40 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_exosuit_leggings.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_exosuit_leggings.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_exosuit_leggings"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_pickaxe.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_pickaxe.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_pickaxe.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_pickaxe.json
index 2c028c71a..816847421 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_pickaxe.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_pickaxe.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_pickaxe"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shovel.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_shovel.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shovel.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_shovel.json
index cdb9931c3..de9a0853d 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_shovel.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_shovel.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_shovel"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_sword.json b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_sword.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_sword.json
rename to src/generated/resources/data/psi/advancements/recipes/combat/psimetal_sword.json
index 676bbe6bf..e1b854cdd 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_sword.json
+++ b/src/generated/resources/data/psi/advancements/recipes/combat/psimetal_sword.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_sword"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black.json b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black.json
rename to src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black.json
index 9c82c38a9..e6224f511 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black.json
+++ b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_black"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black_light.json b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black_light.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black_light.json
rename to src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black_light.json
index 931d1d531..ceba556a3 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_black_light.json
+++ b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_black_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_black_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white.json b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white.json
rename to src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white.json
index ee3e26d68..170ab0d36 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white.json
+++ b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_white"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white_light.json b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white_light.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white_light.json
rename to src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white_light.json
index 18644ec0a..3a0c16074 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/psimetal_plate_white_light.json
+++ b/src/generated/resources/data/psi/advancements/recipes/decorations/psimetal_plate_white_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:psimetal_plate_white_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/assembler.json b/src/generated/resources/data/psi/advancements/recipes/misc/assembler.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/assembler.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/assembler.json
index 8c98120fe..5c5a0aac5 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/assembler.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/assembler.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:assembler"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_psimetal.json b/src/generated/resources/data/psi/advancements/recipes/misc/ebony_psimetal.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ebony_psimetal.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/ebony_psimetal.json
index 97002af38..fb2aff576 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ebony_psimetal.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/ebony_psimetal.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:ebony_psimetal"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_heat.json b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_heat.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_heat.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_heat.json
index 8c2db4ba9..81b9baff7 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_heat.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_heat.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_heat"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_light.json b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_light.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_light.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_light.json
index 4ba42c8a6..9d199c1f2 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_light.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_light.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_light"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_stress.json b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_stress.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_stress.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_stress.json
index 41736178b..4d5c2e3e9 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_stress.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_stress.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_stress"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_trigger.json b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_trigger.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_trigger.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_trigger.json
index 130eec6e4..2937364b5 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_trigger.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_trigger.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_trigger"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_water.json b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_water.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_water.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_water.json
index 097501758..1270e47c7 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_sensor_water.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/exosuit_sensor_water.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_sensor_water"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_psimetal.json b/src/generated/resources/data/psi/advancements/recipes/misc/ivory_psimetal.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/ivory_psimetal.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/ivory_psimetal.json
index 488742745..fa5ce71ab 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/ivory_psimetal.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/ivory_psimetal.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:ivory_psimetal"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/programmer.json b/src/generated/resources/data/psi/advancements/recipes/misc/programmer.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/programmer.json
rename to src/generated/resources/data/psi/advancements/recipes/misc/programmer.json
index 5baaffed5..369fc3494 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/programmer.json
+++ b/src/generated/resources/data/psi/advancements/recipes/misc/programmer.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:programmer"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ebony.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ebony.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ebony.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ebony.json
index 9ee47c9dd..172d03be9 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ebony.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ebony.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_assembly_ebony"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_gold.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_gold.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_gold.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_gold.json
index 5c2244892..0a81b0123 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_gold.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_gold.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_assembly_gold"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_iron.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_iron.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_iron.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_iron.json
index a1207536f..471e58f6e 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_iron.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_iron.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_assembly_iron"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ivory.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ivory.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ivory.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ivory.json
index 8a7b9f995..b83c20158 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_ivory.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_ivory.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_assembly_ivory"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_psimetal.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_psimetal.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_psimetal.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_psimetal.json
index d7371a934..007ee62ab 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_assembly_psimetal.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_assembly_psimetal.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_assembly_psimetal"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_basic.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_basic.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_basic.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_basic.json
index 06428c547..e45355838 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_basic.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_basic.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_battery_basic"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_extended.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_extended.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_extended.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_extended.json
index abaeb2771..fbc1782a4 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_extended.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_extended.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_battery_extended"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_ultradense.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_ultradense.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_ultradense.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_ultradense.json
index 45dff8ab1..39680e31a 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_battery_ultradense.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_battery_ultradense.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_battery_ultradense"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_black.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_black.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_black.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_black.json
index f008ba9a3..8959612ab 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_black.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_black.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_black"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_blue.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_blue.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_blue.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_blue.json
index 62961f28c..574fec1ac 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_blue.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_blue.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_blue"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_brown.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_brown.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_brown.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_brown.json
index 8ba2edda4..930960815 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_brown.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_brown.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_brown"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_cyan.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_cyan.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_cyan.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_cyan.json
index 63fe1155b..f13bd04cb 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_cyan.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_cyan.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_cyan"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_empty.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_empty.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_empty.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_empty.json
index 0af5da8d8..7cc72054e 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_empty.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_empty.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_empty"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_gray.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_gray.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_gray.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_gray.json
index 3d714297c..fb0e1e6eb 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_gray.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_gray.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_gray"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_green.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_green.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_green.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_green.json
index 27f2c1f0b..b3281e641 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_green.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_green.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_green"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_blue.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_blue.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_blue.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_blue.json
index a1efd6386..34e4bb105 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_blue.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_blue.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_light_blue"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_gray.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_gray.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_gray.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_gray.json
index 8ea632a3c..03c32964c 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_light_gray.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_light_gray.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_light_gray"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_lime.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_lime.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_lime.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_lime.json
index e4e2453bd..cacfb46fc 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_lime.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_lime.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_lime"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_magenta.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_magenta.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_magenta.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_magenta.json
index 3aed50c50..09b319c39 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_magenta.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_magenta.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_magenta"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_orange.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_orange.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_orange.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_orange.json
index 86fa1a5e1..2ab6a6cb0 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_orange.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_orange.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_orange"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_pink.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_pink.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_pink.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_pink.json
index 4c3f05981..0ac6898e6 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_pink.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_pink.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_pink"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_psi.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_psi.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_psi.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_psi.json
index 9e2e04f7d..3734af32e 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_psi.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_psi.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_psi"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_purple.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_purple.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_purple.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_purple.json
index 90b017132..dc7fb5641 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_purple.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_purple.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_purple"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_rainbow.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_rainbow.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_rainbow.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_rainbow.json
index c84fdac4e..a1e848eb6 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_rainbow.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_rainbow.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_rainbow"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_red.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_red.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_red.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_red.json
index 3334ff437..443439156 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_red.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_red.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_red"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_white.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_white.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_white.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_white.json
index 30b34e192..a98a2cf0c 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_white.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_white.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_white"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_yellow.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_yellow.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_yellow.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_yellow.json
index 659580b5c..c31d7d6b7 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_colorizer_yellow.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_colorizer_yellow.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_colorizer_yellow"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_basic.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_basic.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_core_basic.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_core_basic.json
index 77a2424ce..e2f5633fc 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_basic.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_basic.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_core_basic"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_conductive.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_conductive.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_core_conductive.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_core_conductive.json
index 8ca0922da..7ab01c873 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_conductive.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_conductive.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_core_conductive"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_hyperclocked.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_hyperclocked.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_core_hyperclocked.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_core_hyperclocked.json
index a43a08cab..d6c464398 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_hyperclocked.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_hyperclocked.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_core_hyperclocked"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_overclocked.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_overclocked.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_core_overclocked.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_core_overclocked.json
index 4a8f13457..edea48545 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_overclocked.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_overclocked.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_core_overclocked"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_radiative.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_radiative.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_core_radiative.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_core_radiative.json
index 0c7b59d98..97b5425f2 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_core_radiative.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_core_radiative.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_core_radiative"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_basic.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_basic.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_basic.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_basic.json
index 25bb20660..dc5f2dd3a 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_basic.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_basic.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_socket_basic"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_huge.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_huge.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_huge.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_huge.json
index ce8f99e8c..d58717242 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_huge.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_huge.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_socket_huge"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_large.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_large.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_large.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_large.json
index eb8cd47d0..fa3389e05 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_large.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_large.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_socket_large"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_signaling.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_signaling.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_signaling.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_signaling.json
index b0e915c29..740573cfd 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_signaling.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_signaling.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_socket_signaling"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_transmissive.json b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_transmissive.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_transmissive.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_transmissive.json
index 464f8c089..f28dfcf99 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/cad_socket_transmissive.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/cad_socket_transmissive.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:cad_socket_transmissive"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/detonator.json b/src/generated/resources/data/psi/advancements/recipes/tools/detonator.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/detonator.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/detonator.json
index b038b0e3e..640a0932a 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/detonator.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/detonator.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:detonator"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_controller.json b/src/generated/resources/data/psi/advancements/recipes/tools/exosuit_controller.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/exosuit_controller.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/exosuit_controller.json
index 47bd3a324..55462b90d 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/exosuit_controller.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/exosuit_controller.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:exosuit_controller"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_basic.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_basic.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_basic.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_basic.json
index 82b187b27..429fc8504 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_basic.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_basic.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_basic"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge.json
index 15718246b..dd684380e 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_charge"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge_upgrade.json
index 7f1837f7e..21e5f92f7 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_charge_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_charge_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_charge_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle.json
index 9c7ffc808..fe50fe3ed 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_circle"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle_upgrade.json
index e05fec0b6..9e9d0cd35 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_circle_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_circle_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_circle_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade.json
index 445fa0876..49d0d0657 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_grenade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade_upgrade.json
index ac712504b..30f64c221 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_grenade_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_grenade_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_grenade_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast.json
index 18ceae3f3..b30c8113a 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_loopcast"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast_upgrade.json
index 85ecf06a8..1b8e0a0ff 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_loopcast_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_loopcast_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_loopcast_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine.json
index ebc69fc4e..f6a7e4bff 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_mine"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine_upgrade.json
index fe7bdb21f..c994dca42 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_mine_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_mine_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_mine_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile.json
index e4abcba13..64c6831f2 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_bullet_projectile"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile_upgrade.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile_upgrade.json
similarity index 94%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile_upgrade.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile_upgrade.json
index 61e587bb5..3ff62db63 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_bullet_projectile_upgrade.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_bullet_projectile_upgrade.json
@@ -30,5 +30,6 @@
     "recipes": [
       "psi:spell_bullet_projectile_upgrade"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/spell_drive.json b/src/generated/resources/data/psi/advancements/recipes/tools/spell_drive.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/spell_drive.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/spell_drive.json
index 3f6abaf8c..26ee24265 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/spell_drive.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/spell_drive.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:spell_drive"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/advancements/recipes/psi/vector_ruler.json b/src/generated/resources/data/psi/advancements/recipes/tools/vector_ruler.json
similarity index 93%
rename from src/generated/resources/data/psi/advancements/recipes/psi/vector_ruler.json
rename to src/generated/resources/data/psi/advancements/recipes/tools/vector_ruler.json
index 1dd5f9f12..f5a84f459 100644
--- a/src/generated/resources/data/psi/advancements/recipes/psi/vector_ruler.json
+++ b/src/generated/resources/data/psi/advancements/recipes/tools/vector_ruler.json
@@ -28,5 +28,6 @@
     "recipes": [
       "psi:vector_ruler"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/assembler.json b/src/generated/resources/data/psi/recipes/assembler.json
index 39f58c347..c1873ba8e 100644
--- a/src/generated/resources/data/psi/recipes/assembler.json
+++ b/src/generated/resources/data/psi/recipes/assembler.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/iron"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:cad_assembler"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_assembly_ebony.json b/src/generated/resources/data/psi/recipes/cad_assembly_ebony.json
index 3ce009951..cfb96dc59 100644
--- a/src/generated/resources/data/psi/recipes/cad_assembly_ebony.json
+++ b/src/generated/resources/data/psi/recipes/cad_assembly_ebony.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/ebony_psimetal"
@@ -11,5 +12,6 @@
   ],
   "result": {
     "item": "psi:cad_assembly_ebony_psimetal"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_assembly_gold.json b/src/generated/resources/data/psi/recipes/cad_assembly_gold.json
index feed89f65..94c455dfd 100644
--- a/src/generated/resources/data/psi/recipes/cad_assembly_gold.json
+++ b/src/generated/resources/data/psi/recipes/cad_assembly_gold.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/gold"
@@ -11,5 +12,6 @@
   ],
   "result": {
     "item": "psi:cad_assembly_gold"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_assembly_iron.json b/src/generated/resources/data/psi/recipes/cad_assembly_iron.json
index 0e44024ce..df906f068 100644
--- a/src/generated/resources/data/psi/recipes/cad_assembly_iron.json
+++ b/src/generated/resources/data/psi/recipes/cad_assembly_iron.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/iron"
@@ -11,5 +12,6 @@
   ],
   "result": {
     "item": "psi:cad_assembly_iron"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_assembly_ivory.json b/src/generated/resources/data/psi/recipes/cad_assembly_ivory.json
index 3bec445d3..d75af6fa3 100644
--- a/src/generated/resources/data/psi/recipes/cad_assembly_ivory.json
+++ b/src/generated/resources/data/psi/recipes/cad_assembly_ivory.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/ivory_psimetal"
@@ -11,5 +12,6 @@
   ],
   "result": {
     "item": "psi:cad_assembly_ivory_psimetal"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_assembly_psimetal.json b/src/generated/resources/data/psi/recipes/cad_assembly_psimetal.json
index d572030b9..4f4f1d6a4 100644
--- a/src/generated/resources/data/psi/recipes/cad_assembly_psimetal.json
+++ b/src/generated/resources/data/psi/recipes/cad_assembly_psimetal.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -11,5 +12,6 @@
   ],
   "result": {
     "item": "psi:cad_assembly_psimetal"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_battery_basic.json b/src/generated/resources/data/psi/recipes/cad_battery_basic.json
index ac93a7d0c..1b1df472e 100644
--- a/src/generated/resources/data/psi/recipes/cad_battery_basic.json
+++ b/src/generated/resources/data/psi/recipes/cad_battery_basic.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_battery_basic"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_battery_extended.json b/src/generated/resources/data/psi/recipes/cad_battery_extended.json
index 0ce2a0014..60ee57cc0 100644
--- a/src/generated/resources/data/psi/recipes/cad_battery_extended.json
+++ b/src/generated/resources/data/psi/recipes/cad_battery_extended.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_battery_extended"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_battery_ultradense.json b/src/generated/resources/data/psi/recipes/cad_battery_ultradense.json
index 072420ad6..65d473d4e 100644
--- a/src/generated/resources/data/psi/recipes/cad_battery_ultradense.json
+++ b/src/generated/resources/data/psi/recipes/cad_battery_ultradense.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:gems/psigem"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_battery_ultradense"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_black.json b/src/generated/resources/data/psi/recipes/cad_colorizer_black.json
index a1488b443..359ff2c71 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_black.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_black.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_black"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_blue.json b/src/generated/resources/data/psi/recipes/cad_colorizer_blue.json
index f919952ce..c719b30bd 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_blue.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_blue.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_blue"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_brown.json b/src/generated/resources/data/psi/recipes/cad_colorizer_brown.json
index 0ea3c656d..9b357e46e 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_brown.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_brown.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_brown"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_cyan.json b/src/generated/resources/data/psi/recipes/cad_colorizer_cyan.json
index 8abe40279..99ea89b04 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_cyan.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_cyan.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_cyan"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_empty.json b/src/generated/resources/data/psi/recipes/cad_colorizer_empty.json
index 60d8c0620..5ea55ae1d 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_empty.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_empty.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_empty"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_gray.json b/src/generated/resources/data/psi/recipes/cad_colorizer_gray.json
index 05fd7c860..fd9cfa1aa 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_gray.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_gray.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_gray"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_green.json b/src/generated/resources/data/psi/recipes/cad_colorizer_green.json
index 409de6e40..784af61d9 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_green.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_green.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_green"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_light_blue.json b/src/generated/resources/data/psi/recipes/cad_colorizer_light_blue.json
index 4fb87b8f5..c7d69f1d3 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_light_blue.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_light_blue.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_light_blue"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_light_gray.json b/src/generated/resources/data/psi/recipes/cad_colorizer_light_gray.json
index 70cfaa200..c3cc8e55a 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_light_gray.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_light_gray.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_light_gray"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_lime.json b/src/generated/resources/data/psi/recipes/cad_colorizer_lime.json
index bf724449c..b2fd68b49 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_lime.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_lime.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_lime"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_magenta.json b/src/generated/resources/data/psi/recipes/cad_colorizer_magenta.json
index 23766973d..172a5cb74 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_magenta.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_magenta.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_magenta"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_orange.json b/src/generated/resources/data/psi/recipes/cad_colorizer_orange.json
index f12f6834d..d735d5d85 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_orange.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_orange.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_orange"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_pink.json b/src/generated/resources/data/psi/recipes/cad_colorizer_pink.json
index 57be2e0da..1e947be0b 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_pink.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_pink.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_pink"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_psi.json b/src/generated/resources/data/psi/recipes/cad_colorizer_psi.json
index e72148dfe..21a7a7e80 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_psi.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_psi.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_psi"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_purple.json b/src/generated/resources/data/psi/recipes/cad_colorizer_purple.json
index 800ae5410..87366ab86 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_purple.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_purple.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_purple"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_rainbow.json b/src/generated/resources/data/psi/recipes/cad_colorizer_rainbow.json
index 8c0733adc..bee669857 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_rainbow.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_rainbow.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_rainbow"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_red.json b/src/generated/resources/data/psi/recipes/cad_colorizer_red.json
index 2162359f5..18571319b 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_red.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_red.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_red"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_white.json b/src/generated/resources/data/psi/recipes/cad_colorizer_white.json
index 478513702..ca80aca9b 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_white.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_white.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_white"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_colorizer_yellow.json b/src/generated/resources/data/psi/recipes/cad_colorizer_yellow.json
index 4a406286c..57cfa00e0 100644
--- a/src/generated/resources/data/psi/recipes/cad_colorizer_yellow.json
+++ b/src/generated/resources/data/psi/recipes/cad_colorizer_yellow.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "group": "psi:colorizer",
   "key": {
     "C": {
@@ -22,5 +23,6 @@
   ],
   "result": {
     "item": "psi:cad_colorizer_yellow"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_core_basic.json b/src/generated/resources/data/psi/recipes/cad_core_basic.json
index 885557a4a..aeedb69d1 100644
--- a/src/generated/resources/data/psi/recipes/cad_core_basic.json
+++ b/src/generated/resources/data/psi/recipes/cad_core_basic.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:cad_core_basic"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_core_conductive.json b/src/generated/resources/data/psi/recipes/cad_core_conductive.json
index 3041e9642..b507afbe2 100644
--- a/src/generated/resources/data/psi/recipes/cad_core_conductive.json
+++ b/src/generated/resources/data/psi/recipes/cad_core_conductive.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/glowstone"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:cad_core_conductive"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_core_hyperclocked.json b/src/generated/resources/data/psi/recipes/cad_core_hyperclocked.json
index fc123acdb..4338beb4e 100644
--- a/src/generated/resources/data/psi/recipes/cad_core_hyperclocked.json
+++ b/src/generated/resources/data/psi/recipes/cad_core_hyperclocked.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/redstone"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_core_hyperclocked"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_core_overclocked.json b/src/generated/resources/data/psi/recipes/cad_core_overclocked.json
index a671e612c..f74f456e2 100644
--- a/src/generated/resources/data/psi/recipes/cad_core_overclocked.json
+++ b/src/generated/resources/data/psi/recipes/cad_core_overclocked.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/redstone"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:cad_core_overclocked"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_core_radiative.json b/src/generated/resources/data/psi/recipes/cad_core_radiative.json
index fab8d7047..f2af9413d 100644
--- a/src/generated/resources/data/psi/recipes/cad_core_radiative.json
+++ b/src/generated/resources/data/psi/recipes/cad_core_radiative.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/glowstone"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:cad_core_radiative"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_socket_basic.json b/src/generated/resources/data/psi/recipes/cad_socket_basic.json
index 2853e69c8..5cb5f82dc 100644
--- a/src/generated/resources/data/psi/recipes/cad_socket_basic.json
+++ b/src/generated/resources/data/psi/recipes/cad_socket_basic.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -14,5 +15,6 @@
   ],
   "result": {
     "item": "psi:cad_socket_basic"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_socket_huge.json b/src/generated/resources/data/psi/recipes/cad_socket_huge.json
index a341470d1..a8c836bf7 100644
--- a/src/generated/resources/data/psi/recipes/cad_socket_huge.json
+++ b/src/generated/resources/data/psi/recipes/cad_socket_huge.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/glowstone"
@@ -17,5 +18,6 @@
   ],
   "result": {
     "item": "psi:cad_socket_huge"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_socket_large.json b/src/generated/resources/data/psi/recipes/cad_socket_large.json
index 2c98b7bbc..120c917ba 100644
--- a/src/generated/resources/data/psi/recipes/cad_socket_large.json
+++ b/src/generated/resources/data/psi/recipes/cad_socket_large.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/glowstone"
@@ -14,5 +15,6 @@
   ],
   "result": {
     "item": "psi:cad_socket_large"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_socket_signaling.json b/src/generated/resources/data/psi/recipes/cad_socket_signaling.json
index 45ebb2c44..b0d478a1e 100644
--- a/src/generated/resources/data/psi/recipes/cad_socket_signaling.json
+++ b/src/generated/resources/data/psi/recipes/cad_socket_signaling.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/redstone"
@@ -14,5 +15,6 @@
   ],
   "result": {
     "item": "psi:cad_socket_signaling"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/cad_socket_transmissive.json b/src/generated/resources/data/psi/recipes/cad_socket_transmissive.json
index 5e9d17996..676626af0 100644
--- a/src/generated/resources/data/psi/recipes/cad_socket_transmissive.json
+++ b/src/generated/resources/data/psi/recipes/cad_socket_transmissive.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "forge:dusts/redstone"
@@ -17,5 +18,6 @@
   ],
   "result": {
     "item": "psi:cad_socket_transmissive"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/detonator.json b/src/generated/resources/data/psi/recipes/detonator.json
index cb92ad234..d695c5d75 100644
--- a/src/generated/resources/data/psi/recipes/detonator.json
+++ b/src/generated/resources/data/psi/recipes/detonator.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "B": {
       "tag": "minecraft:buttons"
@@ -17,5 +18,6 @@
   ],
   "result": {
     "item": "psi:detonator"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/bullet_to_drive.json b/src/generated/resources/data/psi/recipes/dynamic/bullet_to_drive.json
index d204a8e7f..9aeb565e6 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/bullet_to_drive.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/bullet_to_drive.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:bullet_to_drive"
+  "type": "psi:bullet_to_drive",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/colorizer_change.json b/src/generated/resources/data/psi/recipes/dynamic/colorizer_change.json
index e8a2996fc..39d7aa40f 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/colorizer_change.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/colorizer_change.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:colorizer_change"
+  "type": "psi:colorizer_change",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/drive_duplicate.json b/src/generated/resources/data/psi/recipes/dynamic/drive_duplicate.json
index b68330d15..8f9db6e77 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/drive_duplicate.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/drive_duplicate.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:drive_duplicate"
+  "type": "psi:drive_duplicate",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/scavenge.json b/src/generated/resources/data/psi/recipes/dynamic/scavenge.json
index d05b9c46c..7a21e4e4c 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/scavenge.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/scavenge.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:scavenge"
+  "type": "psi:scavenge",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/sensor_attach.json b/src/generated/resources/data/psi/recipes/dynamic/sensor_attach.json
index 13a04ea68..ef678b6bd 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/sensor_attach.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/sensor_attach.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:sensor_attach"
+  "type": "psi:sensor_attach",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/dynamic/sensor_remove.json b/src/generated/resources/data/psi/recipes/dynamic/sensor_remove.json
index 13538bc20..10ac73f04 100644
--- a/src/generated/resources/data/psi/recipes/dynamic/sensor_remove.json
+++ b/src/generated/resources/data/psi/recipes/dynamic/sensor_remove.json
@@ -1,3 +1,4 @@
 {
-  "type": "psi:sensor_remove"
+  "type": "psi:sensor_remove",
+  "category": "misc"
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/ebony_block.json b/src/generated/resources/data/psi/recipes/ebony_block.json
index c373d7fce..d52d7331d 100644
--- a/src/generated/resources/data/psi/recipes/ebony_block.json
+++ b/src/generated/resources/data/psi/recipes/ebony_block.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "building",
   "key": {
     "I": {
       "item": "psi:ebony_psimetal"
@@ -12,5 +13,6 @@
   ],
   "result": {
     "item": "psi:ebony_psimetal_block"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/ebony_ingot_shapeless.json b/src/generated/resources/data/psi/recipes/ebony_ingot_shapeless.json
index b3e042dc3..a1f83d639 100644
--- a/src/generated/resources/data/psi/recipes/ebony_ingot_shapeless.json
+++ b/src/generated/resources/data/psi/recipes/ebony_ingot_shapeless.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "building",
   "ingredients": [
     {
       "item": "psi:ebony_psimetal_block"
diff --git a/src/generated/resources/data/psi/recipes/ebony_psimetal.json b/src/generated/resources/data/psi/recipes/ebony_psimetal.json
index 43d4d2135..ec7411b38 100644
--- a/src/generated/resources/data/psi/recipes/ebony_psimetal.json
+++ b/src/generated/resources/data/psi/recipes/ebony_psimetal.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:ebony_psimetal"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_controller.json b/src/generated/resources/data/psi/recipes/exosuit_controller.json
index e43b4cbbb..d4b999ec4 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_controller.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_controller.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:glass"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_controller"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_sensor_heat.json b/src/generated/resources/data/psi/recipes/exosuit_sensor_heat.json
index f959f19e2..2f4c0f1b2 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_sensor_heat.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_sensor_heat.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_sensor_heat"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_sensor_light.json b/src/generated/resources/data/psi/recipes/exosuit_sensor_light.json
index 3824416bf..1cb0129d8 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_sensor_light.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_sensor_light.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_sensor_light"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_sensor_stress.json b/src/generated/resources/data/psi/recipes/exosuit_sensor_stress.json
index cfc1aaa60..5d1a94ebd 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_sensor_stress.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_sensor_stress.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_sensor_stress"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_sensor_trigger.json b/src/generated/resources/data/psi/recipes/exosuit_sensor_trigger.json
index 35ee2c37f..8a159ccd6 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_sensor_trigger.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_sensor_trigger.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_sensor_trigger"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/exosuit_sensor_water.json b/src/generated/resources/data/psi/recipes/exosuit_sensor_water.json
index 282b94d7b..d8008fc47 100644
--- a/src/generated/resources/data/psi/recipes/exosuit_sensor_water.json
+++ b/src/generated/resources/data/psi/recipes/exosuit_sensor_water.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:exosuit_sensor_water"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/ivory_block.json b/src/generated/resources/data/psi/recipes/ivory_block.json
index fab18d4e7..0861193f9 100644
--- a/src/generated/resources/data/psi/recipes/ivory_block.json
+++ b/src/generated/resources/data/psi/recipes/ivory_block.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "building",
   "key": {
     "I": {
       "item": "psi:ivory_psimetal"
@@ -12,5 +13,6 @@
   ],
   "result": {
     "item": "psi:ivory_psimetal_block"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/ivory_ingot_shapeless.json b/src/generated/resources/data/psi/recipes/ivory_ingot_shapeless.json
index c61d27c6a..595f179ee 100644
--- a/src/generated/resources/data/psi/recipes/ivory_ingot_shapeless.json
+++ b/src/generated/resources/data/psi/recipes/ivory_ingot_shapeless.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "building",
   "ingredients": [
     {
       "item": "psi:ivory_psimetal_block"
diff --git a/src/generated/resources/data/psi/recipes/ivory_psimetal.json b/src/generated/resources/data/psi/recipes/ivory_psimetal.json
index 2096d0b13..45dab62db 100644
--- a/src/generated/resources/data/psi/recipes/ivory_psimetal.json
+++ b/src/generated/resources/data/psi/recipes/ivory_psimetal.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:ivory_psimetal"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/programmer.json b/src/generated/resources/data/psi/recipes/programmer.json
index 95b6dbf32..6ce603004 100644
--- a/src/generated/resources/data/psi/recipes/programmer.json
+++ b/src/generated/resources/data/psi/recipes/programmer.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:programmer"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psidust_block.json b/src/generated/resources/data/psi/recipes/psidust_block.json
index 56424edfe..650498367 100644
--- a/src/generated/resources/data/psi/recipes/psidust_block.json
+++ b/src/generated/resources/data/psi/recipes/psidust_block.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "building",
   "key": {
     "I": {
       "item": "psi:psidust"
@@ -12,5 +13,6 @@
   ],
   "result": {
     "item": "psi:psidust_block"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psidust_shapeless.json b/src/generated/resources/data/psi/recipes/psidust_shapeless.json
index 63d53dfc5..65d0e61b6 100644
--- a/src/generated/resources/data/psi/recipes/psidust_shapeless.json
+++ b/src/generated/resources/data/psi/recipes/psidust_shapeless.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "building",
   "ingredients": [
     {
       "item": "psi:psidust_block"
diff --git a/src/generated/resources/data/psi/recipes/psigem_block.json b/src/generated/resources/data/psi/recipes/psigem_block.json
index 079977ba3..aeb37755d 100644
--- a/src/generated/resources/data/psi/recipes/psigem_block.json
+++ b/src/generated/resources/data/psi/recipes/psigem_block.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "building",
   "key": {
     "I": {
       "item": "psi:psigem"
@@ -12,5 +13,6 @@
   ],
   "result": {
     "item": "psi:psigem_block"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psigem_shapeless.json b/src/generated/resources/data/psi/recipes/psigem_shapeless.json
index 82385763b..e00c6422d 100644
--- a/src/generated/resources/data/psi/recipes/psigem_shapeless.json
+++ b/src/generated/resources/data/psi/recipes/psigem_shapeless.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "building",
   "ingredients": [
     {
       "item": "psi:psigem_block"
diff --git a/src/generated/resources/data/psi/recipes/psimetal_axe.json b/src/generated/resources/data/psi/recipes/psimetal_axe.json
index 45359d20c..c2ad5bffa 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_axe.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_axe.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:psimetal_axe"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_block.json b/src/generated/resources/data/psi/recipes/psimetal_block.json
index 8bccc7701..90376ba6c 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_block.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_block.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "building",
   "key": {
     "I": {
       "item": "psi:psimetal"
@@ -12,5 +13,6 @@
   ],
   "result": {
     "item": "psi:psimetal_block"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_exosuit_boots.json b/src/generated/resources/data/psi/recipes/psimetal_exosuit_boots.json
index 67e9938e2..e4a2d852e 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_exosuit_boots.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_exosuit_boots.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -14,5 +15,6 @@
   ],
   "result": {
     "item": "psi:psimetal_exosuit_boots"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_exosuit_chestplate.json b/src/generated/resources/data/psi/recipes/psimetal_exosuit_chestplate.json
index 971895b54..5858d157e 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_exosuit_chestplate.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_exosuit_chestplate.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:psimetal_exosuit_chestplate"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_exosuit_helmet.json b/src/generated/resources/data/psi/recipes/psimetal_exosuit_helmet.json
index 15dd8aed9..a117ed7a6 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_exosuit_helmet.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_exosuit_helmet.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -14,5 +15,6 @@
   ],
   "result": {
     "item": "psi:psimetal_exosuit_helmet"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_exosuit_leggings.json b/src/generated/resources/data/psi/recipes/psimetal_exosuit_leggings.json
index 9c2a7fca2..6dd6d78f9 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_exosuit_leggings.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_exosuit_leggings.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:psimetal_exosuit_leggings"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_pickaxe.json b/src/generated/resources/data/psi/recipes/psimetal_pickaxe.json
index fee62972b..ef6559fb2 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_pickaxe.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_pickaxe.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:psimetal_pickaxe"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_plate_black.json b/src/generated/resources/data/psi/recipes/psimetal_plate_black.json
index 786008075..b3c6cabb4 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_plate_black.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_plate_black.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "C": {
       "tag": "minecraft:coals"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:black_psimetal_plate"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_plate_black_light.json b/src/generated/resources/data/psi/recipes/psimetal_plate_black_light.json
index c58730ffb..741fb7138 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_plate_black_light.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_plate_black_light.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "misc",
   "ingredients": [
     {
       "tag": "forge:dusts/glowstone"
diff --git a/src/generated/resources/data/psi/recipes/psimetal_plate_white.json b/src/generated/resources/data/psi/recipes/psimetal_plate_white.json
index ae540e12c..c51db8494 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_plate_white.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_plate_white.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "C": {
       "tag": "forge:gems/quartz"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:white_psimetal_plate"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_plate_white_light.json b/src/generated/resources/data/psi/recipes/psimetal_plate_white_light.json
index 157372232..63332c2f6 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_plate_white_light.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_plate_white_light.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "misc",
   "ingredients": [
     {
       "tag": "forge:dusts/glowstone"
diff --git a/src/generated/resources/data/psi/recipes/psimetal_shapeless.json b/src/generated/resources/data/psi/recipes/psimetal_shapeless.json
index 41259288c..b0c62834d 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_shapeless.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_shapeless.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "building",
   "ingredients": [
     {
       "item": "psi:psimetal_block"
diff --git a/src/generated/resources/data/psi/recipes/psimetal_shovel.json b/src/generated/resources/data/psi/recipes/psimetal_shovel.json
index 657447807..31110a5ea 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_shovel.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_shovel.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:psimetal_shovel"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/psimetal_sword.json b/src/generated/resources/data/psi/recipes/psimetal_sword.json
index b5d4856c1..d9d79ecd5 100644
--- a/src/generated/resources/data/psi/recipes/psimetal_sword.json
+++ b/src/generated/resources/data/psi/recipes/psimetal_sword.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "G": {
       "tag": "forge:gems/psigem"
@@ -18,5 +19,6 @@
   ],
   "result": {
     "item": "psi:psimetal_sword"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_basic.json b/src/generated/resources/data/psi/recipes/spell_bullet_basic.json
index c0a0a6f3c..b58dcb707 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_basic.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_basic.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -13,5 +14,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_charge.json b/src/generated/resources/data/psi/recipes/spell_bullet_charge.json
index dcb7e2e44..91a2df647 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_charge.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_charge.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": {
       "tag": "forge:dusts/redstone"
@@ -16,5 +17,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_charge"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_charge_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_charge_upgrade.json
index ac9e4dd88..4ae8c8bdb 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_charge_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_charge_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_circle.json b/src/generated/resources/data/psi/recipes/spell_bullet_circle.json
index e3c98529b..49304eb1e 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_circle.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_circle.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": [
       {
@@ -21,5 +22,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_circle"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_circle_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_circle_upgrade.json
index 612c6eac3..8152cd232 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_circle_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_circle_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_grenade.json b/src/generated/resources/data/psi/recipes/spell_bullet_grenade.json
index 83f170004..f07ae433d 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_grenade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_grenade.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": {
       "tag": "forge:gunpowder"
@@ -16,5 +17,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_grenade"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_grenade_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_grenade_upgrade.json
index dffe05684..c6e2e74e0 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_grenade_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_grenade_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_loopcast.json b/src/generated/resources/data/psi/recipes/spell_bullet_loopcast.json
index 30caf9a0b..2d78efa44 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_loopcast.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_loopcast.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": {
       "tag": "forge:string"
@@ -16,5 +17,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_loop"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_loopcast_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_loopcast_upgrade.json
index 089552e91..081c5ca6a 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_loopcast_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_loopcast_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_mine.json b/src/generated/resources/data/psi/recipes/spell_bullet_mine.json
index 673a20319..a7bb75405 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_mine.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_mine.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": {
       "tag": "minecraft:buttons"
@@ -16,5 +17,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_mine"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_mine_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_mine_upgrade.json
index 2e241b8bf..50ddacb22 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_mine_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_mine_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_projectile.json b/src/generated/resources/data/psi/recipes/spell_bullet_projectile.json
index c5c7425a6..c2d1f453d 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_projectile.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_projectile.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "A": {
       "tag": "minecraft:arrows"
@@ -16,5 +17,6 @@
   ],
   "result": {
     "item": "psi:spell_bullet_projectile"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/spell_bullet_projectile_upgrade.json b/src/generated/resources/data/psi/recipes/spell_bullet_projectile_upgrade.json
index 37601f095..761beac71 100644
--- a/src/generated/resources/data/psi/recipes/spell_bullet_projectile_upgrade.json
+++ b/src/generated/resources/data/psi/recipes/spell_bullet_projectile_upgrade.json
@@ -1,5 +1,6 @@
 {
   "type": "psi:bullet_upgrade",
+  "category": "equipment",
   "ingredients": [
     {
       "item": "psi:spell_bullet"
diff --git a/src/generated/resources/data/psi/recipes/spell_drive.json b/src/generated/resources/data/psi/recipes/spell_drive.json
index 6d8b0d8c5..d877d372d 100644
--- a/src/generated/resources/data/psi/recipes/spell_drive.json
+++ b/src/generated/resources/data/psi/recipes/spell_drive.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "I": {
       "tag": "forge:ingots/psimetal"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:spell_drive"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/psi/recipes/vector_ruler.json b/src/generated/resources/data/psi/recipes/vector_ruler.json
index ee11183eb..e44e9bac4 100644
--- a/src/generated/resources/data/psi/recipes/vector_ruler.json
+++ b/src/generated/resources/data/psi/recipes/vector_ruler.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "equipment",
   "key": {
     "D": {
       "tag": "psi:psidust"
@@ -15,5 +16,6 @@
   ],
   "result": {
     "item": "psi:vector_ruler"
-  }
+  },
+  "show_notification": true
 }
\ No newline at end of file
diff --git a/src/main/java/vazkii/psi/common/core/handler/DamageTypeHandler.java b/src/main/java/vazkii/psi/common/core/handler/DamageTypeHandler.java
index 34bf3f7f9..27bc70f54 100644
--- a/src/main/java/vazkii/psi/common/core/handler/DamageTypeHandler.java
+++ b/src/main/java/vazkii/psi/common/core/handler/DamageTypeHandler.java
@@ -24,7 +24,7 @@ public class DamageTypeHandler {
 	@SubscribeEvent
 	public static void registerSerializers(RegisterEvent event) {
 		event.register(Registries.DAMAGE_TYPE, helper -> {
-			helper.register(LibResources.PSI_DAMAGE_TYPE, psiDamageType);
+			helper.register(LibResources.PSI_OVERLOAD, psiDamageType);
 		});
 	}
 }
diff --git a/src/main/java/vazkii/psi/common/core/handler/PlayerDataHandler.java b/src/main/java/vazkii/psi/common/core/handler/PlayerDataHandler.java
index 416a7085a..2e30f3cec 100644
--- a/src/main/java/vazkii/psi/common/core/handler/PlayerDataHandler.java
+++ b/src/main/java/vazkii/psi/common/core/handler/PlayerDataHandler.java
@@ -690,7 +690,7 @@ public void deductPsi(int psi, int cd, boolean sync, boolean shatter) {
 				if(!shatter && overflow > 0) {
 					float dmg = (float) overflow / (loopcasting ? 50 : 125);
 					if(!client) {
-						Holder<DamageType> holder = RegistryManager.VANILLA.getRegistry(Registries.DAMAGE_TYPE).getHolder(LibResources.PSI_DAMAGE_TYPE).get();
+						Holder<DamageType> holder = RegistryManager.VANILLA.getRegistry(Registries.DAMAGE_TYPE).getHolder(LibResources.PSI_OVERLOAD).get();
 						DamageSource overloadSource = new DamageSource(holder);
 						player.hurt(overloadSource, dmg);
 					}
diff --git a/src/main/java/vazkii/psi/common/lib/LibResources.java b/src/main/java/vazkii/psi/common/lib/LibResources.java
index ebeaa620d..ea4602359 100644
--- a/src/main/java/vazkii/psi/common/lib/LibResources.java
+++ b/src/main/java/vazkii/psi/common/lib/LibResources.java
@@ -8,14 +8,17 @@
  */
 package vazkii.psi.common.lib;
 
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.damagesource.DamageType;
 
 public class LibResources {
 
 	public static final String PREFIX_MOD = "psi:";
 	public static final ResourceLocation PATCHOULI_BOOK = new ResourceLocation(LibMisc.MOD_ID, "encyclopaedia_psionica");
 
-	public static final ResourceLocation PSI_DAMAGE_TYPE = new ResourceLocation(LibMisc.MOD_ID, "psi_overload");
+	public static final ResourceKey<DamageType> PSI_OVERLOAD = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(LibMisc.MOD_ID, "psi_overload"));
 
 	public static final String PREFIX_GUI = PREFIX_MOD + "textures/gui/";
 	public static final String PREFIX_MODEL = PREFIX_MOD + "textures/model/";
diff --git a/src/main/java/vazkii/psi/common/lib/ModTags.java b/src/main/java/vazkii/psi/common/lib/ModTags.java
index b85be6942..612f326ca 100644
--- a/src/main/java/vazkii/psi/common/lib/ModTags.java
+++ b/src/main/java/vazkii/psi/common/lib/ModTags.java
@@ -33,12 +33,6 @@ public class ModTags {
 	public static final TagKey<Item> INGOT_IVORY_PSIMETAL = forgeTag("ingots/ivory_psimetal");
 	public static final TagKey<Item> BLOCK_IVORY_PSIMETAL = forgeTag("storage_blocks/ivory_psimetal");
 
-	public static final TagKey<DamageType> PSI_OVERLOAD = damageTag(LibResources.PSI_DAMAGE_TYPE);
-
-	private static TagKey<DamageType> damageTag(ResourceLocation rl) {
-		return TagKey.create(Registries.DAMAGE_TYPE, rl);
-	}
-
 	private static TagKey<Item> tag(String name) {
 		return TagKey.create(Registries.ITEM, prefix(name));
 	}
diff --git a/src/main/java/vazkii/psi/data/DataGenerator.java b/src/main/java/vazkii/psi/data/DataGenerator.java
index 755915515..1700b044a 100644
--- a/src/main/java/vazkii/psi/data/DataGenerator.java
+++ b/src/main/java/vazkii/psi/data/DataGenerator.java
@@ -28,7 +28,6 @@ public static void gatherData(GatherDataEvent event) {
 			event.getGenerator().addProvider(true, new PsiDamageTypeTagsProvider(event.getGenerator().getPackOutput(), event.getLookupProvider(), existingFileHelper));
 			event.getGenerator().addProvider(true, new PsiItemTagProvider(event.getGenerator().getPackOutput(), event.getLookupProvider(), blockTagProvider.contentsGetter(), existingFileHelper));
 			event.getGenerator().addProvider(true, new PsiRecipeGenerator(event.getGenerator().getPackOutput()));
-			event.getGenerator().addProvider(true, new PsiTrickRecipeGenerator(event.getGenerator().getPackOutput()));
 		}
 
 		if(event.includeClient()) {
diff --git a/src/main/java/vazkii/psi/data/PsiBlockModelGenerator.java b/src/main/java/vazkii/psi/data/PsiBlockModelGenerator.java
index 782a61287..48ced0630 100644
--- a/src/main/java/vazkii/psi/data/PsiBlockModelGenerator.java
+++ b/src/main/java/vazkii/psi/data/PsiBlockModelGenerator.java
@@ -27,18 +27,18 @@ public PsiBlockModelGenerator(PackOutput output, ExistingFileHelper exFileHelper
 
 	@Override
 	protected void registerStatesAndModels() {
-		simpleBlock(ModBlocks.psidustBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psidustBlock).getPath(), location("blocks/psidust_block")));
-		simpleBlock(ModBlocks.psimetalBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalBlock).getPath(), location("blocks/psimetal_block")));
-		simpleBlock(ModBlocks.psigemBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psigemBlock).getPath(), location("blocks/psigem_block")));
-		simpleBlock(ModBlocks.psimetalPlateBlack, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateBlack).getPath(), location("blocks/psimetal_plate_black")));
-		simpleBlock(ModBlocks.psimetalPlateWhite, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateWhite).getPath(), location("blocks/psimetal_plate_white")));
+		simpleBlock(ModBlocks.psidustBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psidustBlock).getPath(), location("block/psidust_block")));
+		simpleBlock(ModBlocks.psimetalBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalBlock).getPath(), location("block/psimetal_block")));
+		simpleBlock(ModBlocks.psigemBlock, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psigemBlock).getPath(), location("block/psigem_block")));
+		simpleBlock(ModBlocks.psimetalPlateBlack, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateBlack).getPath(), location("block/psimetal_plate_black")));
+		simpleBlock(ModBlocks.psimetalPlateWhite, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateWhite).getPath(), location("block/psimetal_plate_white")));
 		simpleBlock(ModBlocks.psimetalPlateBlackLight, models().cubeBottomTop(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateBlackLight).getPath(),
-				location("blocks/psimetal_plate_black_light"), location("blocks/psimetal_plate_black"), location("blocks/psimetal_plate_black")));
+				location("block/psimetal_plate_black_light"), location("block/psimetal_plate_black"), location("block/psimetal_plate_black")));
 		simpleBlock(ModBlocks.psimetalPlateWhiteLight, models().cubeBottomTop(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalPlateWhiteLight).getPath(),
-				location("blocks/psimetal_plate_white_light"), location("blocks/psimetal_plate_white"), location("blocks/psimetal_plate_white")));
-		simpleBlock(ModBlocks.psimetalEbony, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalEbony).getPath(), location("blocks/ebony_psimetal_block")));
-		simpleBlock(ModBlocks.psimetalIvory, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalIvory).getPath(), location("blocks/ivory_psimetal_block")));
-		simpleBlock(ModBlocks.conjured, models().withExistingParent(ForgeRegistries.BLOCKS.getKey(ModBlocks.conjured).getPath(), "block/block").texture("particle", location("blocks/empty")));
+				location("block/psimetal_plate_white_light"), location("block/psimetal_plate_white"), location("block/psimetal_plate_white")));
+		simpleBlock(ModBlocks.psimetalEbony, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalEbony).getPath(), location("block/ebony_psimetal_block")));
+		simpleBlock(ModBlocks.psimetalIvory, models().cubeAll(ForgeRegistries.BLOCKS.getKey(ModBlocks.psimetalIvory).getPath(), location("block/ivory_psimetal_block")));
+		simpleBlock(ModBlocks.conjured, models().withExistingParent(ForgeRegistries.BLOCKS.getKey(ModBlocks.conjured).getPath(), "block/block").texture("particle", location("block/empty")));
 	}
 
 	@Nonnull
diff --git a/src/main/java/vazkii/psi/data/PsiDamageTypeTagsProvider.java b/src/main/java/vazkii/psi/data/PsiDamageTypeTagsProvider.java
index 6728e0d58..071c2659d 100644
--- a/src/main/java/vazkii/psi/data/PsiDamageTypeTagsProvider.java
+++ b/src/main/java/vazkii/psi/data/PsiDamageTypeTagsProvider.java
@@ -7,6 +7,7 @@
 import net.minecraftforge.common.data.ExistingFileHelper;
 
 import vazkii.psi.common.lib.LibMisc;
+import vazkii.psi.common.lib.LibResources;
 import vazkii.psi.common.lib.ModTags;
 
 import java.util.concurrent.CompletableFuture;
@@ -19,11 +20,11 @@ public PsiDamageTypeTagsProvider(PackOutput pOutput, CompletableFuture<HolderLoo
 
 	@Override
 	protected void addTags(HolderLookup.Provider pProvider) {
-		this.tag(DamageTypeTags.BYPASSES_ARMOR).addTag(ModTags.PSI_OVERLOAD);
-		this.tag(DamageTypeTags.BYPASSES_SHIELD).addTag(ModTags.PSI_OVERLOAD);
-		this.tag(DamageTypeTags.BYPASSES_RESISTANCE).addTag(ModTags.PSI_OVERLOAD);
-		this.tag(DamageTypeTags.BYPASSES_EFFECTS).addTag(ModTags.PSI_OVERLOAD);
-		this.tag(DamageTypeTags.BYPASSES_ENCHANTMENTS).addTag(ModTags.PSI_OVERLOAD);
+		this.tag(DamageTypeTags.BYPASSES_ARMOR).add(LibResources.PSI_OVERLOAD);
+		this.tag(DamageTypeTags.BYPASSES_SHIELD).add(LibResources.PSI_OVERLOAD);
+		this.tag(DamageTypeTags.BYPASSES_RESISTANCE).add(LibResources.PSI_OVERLOAD);
+		this.tag(DamageTypeTags.BYPASSES_EFFECTS).add(LibResources.PSI_OVERLOAD);
+		this.tag(DamageTypeTags.BYPASSES_ENCHANTMENTS).add(LibResources.PSI_OVERLOAD);
 	}
 
 	@Override
diff --git a/src/main/java/vazkii/psi/data/PsiRecipeGenerator.java b/src/main/java/vazkii/psi/data/PsiRecipeGenerator.java
index b7cc528e2..59b7f8d33 100644
--- a/src/main/java/vazkii/psi/data/PsiRecipeGenerator.java
+++ b/src/main/java/vazkii/psi/data/PsiRecipeGenerator.java
@@ -8,6 +8,7 @@
  */
 package vazkii.psi.data;
 
+import com.google.gson.JsonObject;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.FinishedRecipe;
@@ -16,29 +17,32 @@
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.data.recipes.ShapelessRecipeBuilder;
 import net.minecraft.data.recipes.SpecialRecipeBuilder;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.crafting.conditions.IConditionBuilder;
 import net.minecraftforge.registries.ForgeRegistries;
 
+import vazkii.patchouli.api.PatchouliAPI;
+import vazkii.psi.api.recipe.TrickRecipeBuilder;
 import vazkii.psi.common.Psi;
 import vazkii.psi.common.block.base.ModBlocks;
-import vazkii.psi.common.crafting.recipe.AssemblyScavengeRecipe;
-import vazkii.psi.common.crafting.recipe.BulletToDriveRecipe;
-import vazkii.psi.common.crafting.recipe.BulletUpgradeRecipe;
-import vazkii.psi.common.crafting.recipe.ColorizerChangeRecipe;
-import vazkii.psi.common.crafting.recipe.DriveDuplicateRecipe;
-import vazkii.psi.common.crafting.recipe.SensorAttachRecipe;
-import vazkii.psi.common.crafting.recipe.SensorRemoveRecipe;
+import vazkii.psi.common.crafting.recipe.*;
 import vazkii.psi.common.item.base.ModItems;
 import vazkii.psi.common.lib.LibItemNames;
+import vazkii.psi.common.lib.LibPieceNames;
+import vazkii.psi.common.lib.LibResources;
 import vazkii.psi.common.lib.ModTags;
 
+import javax.annotation.Nonnull;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
@@ -587,10 +591,69 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
 				.requires(ModBlocks.psimetalPlateWhite.asItem())
 				.unlockedBy("has_psimetal", hasPsimetal)
 				.save(consumer, Psi.location("psimetal_plate_white_light"));
+		this.buildTrickRecipes(consumer);
+	}
+
+	protected void buildTrickRecipes(Consumer<FinishedRecipe> consumer) {
+		TrickRecipeBuilder.of(ModItems.psidust).input(Tags.Items.DUSTS_REDSTONE).cad(ModItems.cadAssemblyIron).build(consumer);
+		TrickRecipeBuilder.of(PatchouliAPI.get().getBookStack(LibResources.PATCHOULI_BOOK)).input(Items.BOOK).cad(ModItems.cadAssemblyIron).build(consumer);
+
+		TrickRecipeBuilder.of(ModItems.cadAssemblyPsimetal)
+				.input(ModItems.cadAssemblyGold)
+				.trick(Psi.location(LibPieceNames.TRICK_INFUSION))
+				.cad(ModItems.cadAssemblyIron)
+				.build(consumer, Psi.location("gold_to_psimetal_assembly_upgrade"));
+
+		TrickRecipeBuilder.of(ModItems.psimetal)
+				.input(Tags.Items.INGOTS_GOLD)
+				.trick(Psi.location(LibPieceNames.TRICK_INFUSION))
+				.cad(ModItems.cadAssemblyIron).build(consumer);
+
+		TrickRecipeBuilder.of(ModItems.psigem)
+				.input(Tags.Items.GEMS_DIAMOND)
+				.trick(Psi.location(LibPieceNames.TRICK_GREATER_INFUSION))
+				.cad(ModItems.cadAssemblyPsimetal).build(consumer);
+
+		TrickRecipeBuilder builder = TrickRecipeBuilder.of(ModItems.ebonySubstance)
+				.input(ItemTags.COALS)
+				.trick(Psi.location(LibPieceNames.TRICK_EBONY_IVORY))
+				.cad(ModItems.cadAssemblyPsimetal);
+		dimension(builder, consumer, ForgeRegistries.ITEMS.getKey(ModItems.ebonySubstance), Level.END);
+
+		builder = TrickRecipeBuilder.of(ModItems.ivorySubstance)
+				.input(Tags.Items.GEMS_QUARTZ)
+				.trick(Psi.location(LibPieceNames.TRICK_EBONY_IVORY))
+				.cad(ModItems.cadAssemblyPsimetal);
+		dimension(builder, consumer, ForgeRegistries.ITEMS.getKey(ModItems.ivorySubstance), Level.END);
 	}
 
 	private static void specialRecipe(SimpleCraftingRecipeSerializer<?> serializer, Consumer<FinishedRecipe> consumer) {
 		SpecialRecipeBuilder.special(serializer).save(consumer, Psi.location("dynamic/" + ForgeRegistries.RECIPE_SERIALIZERS.getKey(serializer).getPath()).toString());
 	}
 
+	public static void dimension(TrickRecipeBuilder builder, Consumer<FinishedRecipe> parent,
+								 ResourceLocation id, ResourceKey<Level> dimensionKey) {
+		parent.accept(new DimensionResult(id, builder, dimensionKey));
+	}
+
+	public static class DimensionResult extends TrickRecipeBuilder.Result {
+		private final ResourceKey<Level> dimensionId;
+
+		protected DimensionResult(ResourceLocation id, TrickRecipeBuilder builder, ResourceKey<Level> type) {
+			super(id, builder);
+			this.dimensionId = type;
+		}
+
+		@Override
+		public void serializeRecipeData(@Nonnull JsonObject json) {
+			super.serializeRecipeData(json);
+			json.addProperty("dimension", dimensionId.location().toString());
+		}
+
+		@Nonnull
+		@Override
+		public RecipeSerializer<?> getType() {
+			return DimensionTrickRecipe.SERIALIZER;
+		}
+	}
 }
diff --git a/src/main/java/vazkii/psi/data/PsiTrickRecipeGenerator.java b/src/main/java/vazkii/psi/data/PsiTrickRecipeGenerator.java
deleted file mode 100644
index 2d47f99b7..000000000
--- a/src/main/java/vazkii/psi/data/PsiTrickRecipeGenerator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * This class is distributed as part of the Psi Mod.
- * Get the Source Code in github:
- * https://github.com/Vazkii/Psi
- *
- * Psi is Open Source and distributed under the
- * Psi License: https://psi.vazkii.net/license.php
- */
-package vazkii.psi.data;
-
-import com.google.gson.JsonObject;
-
-import net.minecraft.data.PackOutput;
-import net.minecraft.data.recipes.FinishedRecipe;
-import net.minecraft.data.recipes.RecipeProvider;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.common.Tags;
-import net.minecraftforge.registries.ForgeRegistries;
-
-import vazkii.patchouli.api.PatchouliAPI;
-import vazkii.psi.api.recipe.TrickRecipeBuilder;
-import vazkii.psi.common.Psi;
-import vazkii.psi.common.crafting.recipe.DimensionTrickRecipe;
-import vazkii.psi.common.item.base.ModItems;
-import vazkii.psi.common.lib.LibPieceNames;
-import vazkii.psi.common.lib.LibResources;
-
-import javax.annotation.Nonnull;
-
-import java.util.function.Consumer;
-
-public class PsiTrickRecipeGenerator extends RecipeProvider {
-	public PsiTrickRecipeGenerator(PackOutput output) {
-		super(output);
-	}
-
-	@Override
-	protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
-		TrickRecipeBuilder.of(ModItems.psidust).input(Tags.Items.DUSTS_REDSTONE).cad(ModItems.cadAssemblyIron).build(consumer);
-		TrickRecipeBuilder.of(PatchouliAPI.get().getBookStack(LibResources.PATCHOULI_BOOK)).input(Items.BOOK).cad(ModItems.cadAssemblyIron).build(consumer);
-
-		TrickRecipeBuilder.of(ModItems.cadAssemblyPsimetal)
-				.input(ModItems.cadAssemblyGold)
-				.trick(Psi.location(LibPieceNames.TRICK_INFUSION))
-				.cad(ModItems.cadAssemblyIron)
-				.build(consumer, Psi.location("gold_to_psimetal_assembly_upgrade"));
-
-		TrickRecipeBuilder.of(ModItems.psimetal)
-				.input(Tags.Items.INGOTS_GOLD)
-				.trick(Psi.location(LibPieceNames.TRICK_INFUSION))
-				.cad(ModItems.cadAssemblyIron).build(consumer);
-
-		TrickRecipeBuilder.of(ModItems.psigem)
-				.input(Tags.Items.GEMS_DIAMOND)
-				.trick(Psi.location(LibPieceNames.TRICK_GREATER_INFUSION))
-				.cad(ModItems.cadAssemblyPsimetal).build(consumer);
-
-		TrickRecipeBuilder builder = TrickRecipeBuilder.of(ModItems.ebonySubstance)
-				.input(ItemTags.COALS)
-				.trick(Psi.location(LibPieceNames.TRICK_EBONY_IVORY))
-				.cad(ModItems.cadAssemblyPsimetal);
-		dimension(builder, consumer, ForgeRegistries.ITEMS.getKey(ModItems.ebonySubstance), Level.END);
-
-		builder = TrickRecipeBuilder.of(ModItems.ivorySubstance)
-				.input(Tags.Items.GEMS_QUARTZ)
-				.trick(Psi.location(LibPieceNames.TRICK_EBONY_IVORY))
-				.cad(ModItems.cadAssemblyPsimetal);
-		dimension(builder, consumer, ForgeRegistries.ITEMS.getKey(ModItems.ivorySubstance), Level.END);
-	}
-
-	public static void dimension(TrickRecipeBuilder builder, Consumer<FinishedRecipe> parent,
-			ResourceLocation id, ResourceKey<Level> dimensionKey) {
-		parent.accept(new DimensionResult(id, builder, dimensionKey));
-	}
-
-	public static class DimensionResult extends TrickRecipeBuilder.Result {
-		private final ResourceKey<Level> dimensionId;
-
-		protected DimensionResult(ResourceLocation id, TrickRecipeBuilder builder, ResourceKey<Level> type) {
-			super(id, builder);
-			this.dimensionId = type;
-		}
-
-		@Override
-		public void serializeRecipeData(@Nonnull JsonObject json) {
-			super.serializeRecipeData(json);
-			json.addProperty("dimension", dimensionId.location().toString());
-		}
-
-		@Nonnull
-		@Override
-		public RecipeSerializer<?> getType() {
-			return DimensionTrickRecipe.SERIALIZER;
-		}
-	}
-}
diff --git a/src/main/resources/data/psi/damage_type/psi_overload.json b/src/main/resources/data/psi/damage_type/psi_overload.json
new file mode 100644
index 000000000..15989d374
--- /dev/null
+++ b/src/main/resources/data/psi/damage_type/psi_overload.json
@@ -0,0 +1,5 @@
+{
+    "exhaustion": 0.0,
+    "message_id": "psi_overload",
+    "scaling": "when_caused_by_living_non_player"
+  }
\ No newline at end of file