move phetioValueType to MaterialProperty, #273

Signed-off-by: Michael Kauzmann <[email protected]>
phetsims · Jul 24, 2024 · b2146d7 · b2146d7
1 parent 5c559fa
commit b2146d7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/js/buoyancy/model/applications/Bottle.ts b/js/buoyancy/model/applications/Bottle.ts
@@ -246,10 +246,8 @@ export default class Bottle extends ApplicationsMass {
       Material.MATERIAL_R,
       Material.MATERIAL_S
     ], {
-      valueType: Material,
       reentrant: true,
-      tandem: materialInsidePropertyTandem,
-      phetioValueType: ReferenceIO( IOType.ObjectIO )
+      tandem: materialInsidePropertyTandem
     } );
 
     this.materialInsideVolumeProperty = new NumberProperty( BOTTLE_INITIAL_INTERIOR_VOLUME, {

diff --git a/js/buoyancy/model/shapes/BuoyancyShapesModel.ts b/js/buoyancy/model/shapes/BuoyancyShapesModel.ts
@@ -27,8 +27,6 @@ import isSettingPhetioStateProperty from '../../../../../tandem/js/isSettingPhet
 import MassTag from '../../../common/model/MassTag.js';
 import Duck from './Duck.js';
 import BuoyancyShapeModel from './BuoyancyShapeModel.js';
-import ReferenceIO from '../../../../../tandem/js/types/ReferenceIO.js';
-import IOType from '../../../../../tandem/js/types/IOType.js';
 import MaterialProperty from '../../../common/model/MaterialProperty.js';
 
 export type BuoyancyShapesModelOptions = DensityBuoyancyModelOptions;
@@ -62,8 +60,7 @@ export default class BuoyancyShapesModel extends DensityBuoyancyModel {
       // This hack is a way of saying, we do not create or support a custom material in this case.
       Material.WOOD,
       this.availableMaterials, {
-        tandem: objectsTandem.createTandem( 'materialProperty' ),
-        phetioValueType: ReferenceIO( IOType.ObjectIO )
+        tandem: objectsTandem.createTandem( 'materialProperty' )
       } );
 
     this.scale = new Scale( this.engine, this.gravityProperty, {

diff --git a/js/common/model/Mass.ts b/js/common/model/Mass.ts
@@ -203,10 +203,7 @@ export default abstract class Mass extends PhetioObject {
       phetioType: Mass.MassIO,
       inputEnabledPropertyOptions: {},
       materialPropertyOptions: {
-        valueType: Material,
-        reentrant: true,
-        phetioValueType: ReferenceIO( IOType.ObjectIO ),
-        phetioFeatured: true
+        reentrant: true
       },
       customMaterialOptions: {},
       volumePropertyOptions: {},

diff --git a/js/common/model/MaterialProperty.ts b/js/common/model/MaterialProperty.ts
@@ -15,6 +15,8 @@ import MappedWrappedProperty from './MappedWrappedProperty.js';
 import { combineOptions, EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import PickRequired from '../../../../phet-core/js/types/PickRequired.js';
 import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js';
+import IOType from '../../../../tandem/js/types/IOType.js';
+import ReferenceIO from '../../../../tandem/js/types/ReferenceIO.js';
 
 type SelfOptions = EmptySelfOptions;
 
@@ -27,6 +29,8 @@ export default class MaterialProperty extends MappedWrappedProperty<Material> {
   // Note the material could be the customMaterial
   public constructor( material: Material, customMaterial: Material, availableMaterials: Material[], providedOptions: MaterialPropertyOptions ) {
     super( material, customMaterial, availableMaterials, combineOptions<MaterialPropertyOptions>( {
+      valueType: Material,
+      phetioValueType: ReferenceIO( IOType.ObjectIO ),
       phetioFeatured: true
     }, providedOptions ) );
     this.densityProperty = this.dynamicValueProperty;

diff --git a/js/common/model/Pool.ts b/js/common/model/Pool.ts
@@ -77,8 +77,6 @@ export default class Pool extends Basin {
                                ] : [];
 
     this.fluidMaterialProperty = new MaterialProperty( Material.WATER, customFluidMaterial, availableMaterials, {
-      valueType: Material,
-      phetioValueType: ReferenceIO( IOType.ObjectIO ),
       tandem: fluidMaterialPropertyTandem,
       phetioDocumentation: 'The material of the fluid in the pool'
     } );