diff --git a/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json b/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json
index ceaab2d90..6cd859352 100644
--- a/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json
@@ -34,8 +34,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:ah_6"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json b/src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json
index 4d9bf7bb9..162500218 100644
--- a/src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json
@@ -25,8 +25,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:annihilator"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json b/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json
index 20444c438..f6809f7de 100644
--- a/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json
@@ -28,8 +28,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:bmp_2"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json b/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json
index 2b1f8ccc0..6d7b7dc3f 100644
--- a/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json
@@ -17,8 +17,10 @@
   "result": {
     "id": "superbwarfare:c4_bomb",
     "count": 2,
-    "nbt": {
-      "Control": true
+    "components": {
+      "minecraft:custom_data": {
+        "Control": true
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json b/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json
index 925366baf..68baf0d0b 100644
--- a/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json
@@ -22,8 +22,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:laser_tower"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json b/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json
index 505ede3c0..63780b933 100644
--- a/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json
@@ -28,8 +28,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:lav_150"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json b/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json
index 9467102ba..116bdc4c1 100644
--- a/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json
@@ -11,8 +11,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:mk_42"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json b/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json
index 2d74b497f..2c54fd362 100644
--- a/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json
+++ b/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json
@@ -11,8 +11,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:mle_1934"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json b/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json
index fd2b709a0..ea35c84a7 100644
--- a/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json
@@ -28,8 +28,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:prism_tank"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json b/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json
index cdc23e439..a9750d81d 100644
--- a/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json
@@ -37,8 +37,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:speedboat"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json b/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json
index d785837bd..1559960d8 100644
--- a/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json
@@ -19,8 +19,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:tom_6"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json b/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json
index f1f1b6e48..f212f1c65 100644
--- a/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json
@@ -21,8 +21,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:wheel_chair"
       }
     }
diff --git a/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json b/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json
index 2fa9264c4..b23ef999d 100644
--- a/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json
+++ b/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json
@@ -28,8 +28,9 @@
   },
   "result": {
     "id": "superbwarfare:container",
-    "nbt": {
-      "BlockEntityTag": {
+    "components": {
+      "minecraft:block_entity_data": {
+        "id": "superbwarfare:container",
         "EntityType": "superbwarfare:yx_100"
       }
     }