Dropping mysteryMaterials option, #270

phetsims · Jul 26, 2024 · 1cbf15d · 1cbf15d
1 parent 48df1e9
commit 1cbf15d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 20 deletions.
diff --git a/js/buoyancy-basics/view/BuoyancyBasicsExploreScreenView.ts b/js/buoyancy-basics/view/BuoyancyBasicsExploreScreenView.ts
@@ -76,8 +76,7 @@ export default class BuoyancyBasicsExploreScreenView extends BuoyancyScreenView<
         customKeepsConstantDensity: true,
         tandem: tandem,
         minCustomMass: 0.1,
-        maxCustomMass: 15,
-        mysteryMaterials: []
+        maxCustomMass: 15
       }
     );
 

diff --git a/js/buoyancy/view/BuoyancyExploreScreenView.ts b/js/buoyancy/view/BuoyancyExploreScreenView.ts
@@ -85,8 +85,7 @@ export default class BuoyancyExploreScreenView extends BuoyancyScreenView<Buoyan
       this.popupLayer,
       {
         tandem: tandem,
-        minCustomMass: 0.1,
-        mysteryMaterials: [ Material.MATERIAL_X, Material.MATERIAL_Y ]
+        minCustomMass: 0.1
       }
     );
 

diff --git a/js/buoyancy/view/BuoyancyLabScreenView.ts b/js/buoyancy/view/BuoyancyLabScreenView.ts
@@ -133,8 +133,7 @@ export default class BuoyancyLabScreenView extends BuoyancyScreenView<BuoyancyLa
       {
         tandem: tandem.createTandem( 'blockPanel' ),
         minCustomMass: 0.1,
-        maxVolumeLiters: maxBlockVolume,
-        mysteryMaterials: [ Material.MATERIAL_O, Material.MATERIAL_P ]
+        maxVolumeLiters: maxBlockVolume
       }
     ) ] );
 

diff --git a/js/common/view/ABControlsNode.ts b/js/common/view/ABControlsNode.ts
@@ -15,13 +15,8 @@ import Cuboid from '../model/Cuboid.js';
 import BlockControlNode, { BlockControlNodeOptions } from './BlockControlNode.js';
 import DensityBuoyancyCommonColors from './DensityBuoyancyCommonColors.js';
 import ABPanelsNode from './ABPanelsNode.js';
-import Material from '../model/Material.js';
 
-type SelfOptions = {
-  mysteryMaterials?: Material[]; // TODO AV: delete, https://github.com/phetsims/density-buoyancy-common/issues/270
-};
-
-export type ABControlsNodeOptions = SelfOptions & BlockControlNodeOptions & { tandem: Tandem };
+export type ABControlsNodeOptions = BlockControlNodeOptions & { tandem: Tandem };
 
 export default class ABControlsNode extends ABPanelsNode {
 

diff --git a/js/common/view/BlockControlNode.ts b/js/common/view/BlockControlNode.ts
@@ -12,19 +12,14 @@ import Cube from '../model/Cube.js';
 import Cuboid from '../model/Cuboid.js';
 import MaterialMassVolumeControlNode, { MaterialMassVolumeControlNodeOptions } from './MaterialMassVolumeControlNode.js';
 import DensityBuoyancyCommonConstants from '../DensityBuoyancyCommonConstants.js';
-import Material from '../model/Material.js';
 import NumberControl, { NumberControlOptions } from '../../../../scenery-phet/js/NumberControl.js';
 import DensityBuoyancyCommonStrings from '../../DensityBuoyancyCommonStrings.js';
 import { combineOptions } from '../../../../phet-core/js/optionize.js';
 import PrecisionSliderThumb from './PrecisionSliderThumb.js';
 import UnitConversionProperty from '../../../../axon/js/UnitConversionProperty.js';
 import Range from '../../../../dot/js/Range.js';
 
-type SelfOptions = {
-  mysteryMaterials: Material[]; // Provide empty list to opt out. // TODO AV: delete, https://github.com/phetsims/density-buoyancy-common/issues/270
-};
-
-export type BlockControlNodeOptions = MaterialMassVolumeControlNodeOptions & SelfOptions;
+export type BlockControlNodeOptions = MaterialMassVolumeControlNodeOptions;
 
 export default class BlockControlNode extends MaterialMassVolumeControlNode {
   public constructor( cuboid: Cuboid, listParent: Node, numberControlMassPropertyFeatured: boolean, options: BlockControlNodeOptions ) {

diff --git a/js/density/view/DensityIntroScreenView.ts b/js/density/view/DensityIntroScreenView.ts
@@ -56,8 +56,7 @@ export default class DensityIntroScreenView extends DensityBuoyancyScreenView<De
       model.massB,
       this.popupLayer, {
         tandem: tandem,
-        maxCustomMass: 10,
-        mysteryMaterials: []
+        maxCustomMass: 10
       } );
 
     const accordionTandem = tandem.createTandem( 'densityAccordionBox' );