Armor Textures Aren't Showing In Game Since 1.21.4

Hi,

I'm in the process of updating a mod from 1.21.1 to 1.21.8 and It looks like the way armor materials are created/registered has changes since around 1.21.4. My textures for the armors are no longer visible in game.

Here's an example of one of my ArmorMaterials:

public interface CustomArmorMaterials {

    ArmorMaterial OAK_WOOD = new ArmorMaterial(
            2, makeDefense(1, 2, 3, 1, 3), 12, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, ModTags.Items.CAN_REPAIR_OAK_WOOD, EquipmentAssets.OAK_WOOD
    );
  
  //...
    
  }

Ive also created an EquipmentAsset for each e.g:

public interface EquipmentAssets {
    ResourceKey<? extends Registry<EquipmentAsset>> ROOT_ID = ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(ExtraArmor.MODID, "equipment_assets"));

    ResourceKey<EquipmentAsset> OAK_WOOD = createId("oak_wood");
  
  //..
}

My textures are named like 

oak_wood_layer_1.png

and 

oak_wood_layer_2.png

and they are placed in:

resources/assets/modid/textures/models/armor

I have also tried the another folder strucute recommended for data packs by creating 'humanoid', 'humanoid_leggings' and 'horse armor' directories in 'resources/assets/modid/textures/entity/equipment' and placing the textures in there without the 'layer_1' and 'layer_2' parts but that also didn't work.

Is there a guide anywhere for armor textures in 1.21.4+

Any help is appreciated!