Use CookieMonsterFramework for save/load, infoMenu

src/Config/Toggles/ToggleBotBar.js

@@ -1,13 +1,12 @@
 import { UpdateBotBar } from '../../Disp/InfoBars/BottomBar';
 import { UpdateBotTimerBarPosition } from '../SpecificToggles';
-import { CMOptions } from '../VariablesAndData';
 
 /**
  * This function toggle the bottom bar
- * It is called by CM.Disp.UpdateAscendState() and a change in CMOptions.BotBar
+ * It is called by CM.Disp.UpdateAscendState() and a change in Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.BotBar
  */
 export default function ToggleBotBar() {
-  if (CMOptions.BotBar === 1) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.BotBar === 1) {
     l('CMBotBar').style.display = '';
     UpdateBotBar();
   } else {

src/Config/Toggles/ToggleDetailedTime.js

@@ -1,12 +1,12 @@
 import { CMSayTime } from '../../Disp/VariablesAndData';
 import { BackupFunctions } from '../../Main/VariablesAndData';
-import { CMOptions } from '../VariablesAndData';
 
 /**
  * This function changes some of the time-displays in the game to be more detailed
  * It is called by a change in CM.Options.DetailedTime
  */
 export default function ToggleDetailedTime() {
-  if (CMOptions.DetailedTime === 1) Game.sayTime = CMSayTime;
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.DetailedTime === 1)
+    Game.sayTime = CMSayTime;
   else Game.sayTime = BackupFunctions.sayTime;
 }

src/Config/Toggles/ToggleGCTimer.js

@@ -1,13 +1,12 @@
 import { CacheGoldenShimmersByID } from '../../Cache/VariablesAndData';
 import { GCTimers } from '../../Disp/VariablesAndData';
-import { CMOptions } from '../VariablesAndData';
 
 /**
  * This function toggles GC Timers are visible
  * It is called by a change in CM.Options.GCTimer
  */
 export default function ToggleGCTimer() {
-  if (CMOptions.GCTimer === 1) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.GCTimer === 1) {
     Object.keys(GCTimers).forEach((i) => {
       GCTimers[i].style.display = 'block';
       GCTimers[i].style.left = CacheGoldenShimmersByID[i].l.style.left;

src/Config/Toggles/ToggleSectionHideButtons.js

@@ -1,11 +1,9 @@
-import { CMOptions } from '../VariablesAndData';
-
 /**
  * This function updates the display setting of the two objects created by CM.Disp.CreateWrinklerButtons()
  * It is called by changes in CM.Options.WrinklerButtons
  */
 export default function ToggleSectionHideButtons() {
-  if (CMOptions.HideSectionsButtons) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.HideSectionsButtons) {
     l('CMSectionHidButtons').style.display = '';
   } else {
     l('CMSectionHidButtons').style.display = 'none';

src/Config/Toggles/ToggleToolWarnPos.js

@@ -1,5 +1,3 @@
-import { CMOptions } from '../VariablesAndData';
-
 /**
  * This function toggles the position of the warnings created by CM.Disp.TooltipCreateWarningSection()
  * It is called by a change in CM.Options.ToolWarnPos
@@ -7,7 +5,7 @@ import { CMOptions } from '../VariablesAndData';
  */
 export default function ToggleToolWarnPos() {
   if (l('CMDispTooltipWarningParent') !== null) {
-    if (CMOptions.ToolWarnPos === 0) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ToolWarnPos === 0) {
       l('CMDispTooltipWarningParent').style.top = 'auto';
       l('CMDispTooltipWarningParent').style.margin = '4px -4px';
       l('CMDispTooltipWarningParent').style.padding = '3px 4px';

src/Config/Toggles/ToggleUpgradeBarAndColour.js

@@ -1,16 +1,15 @@
 import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades';
-import { CMOptions } from '../VariablesAndData';
 
 /**
  * This function toggles the upgrade bar and the colours of upgrades
  * It is called by a change in CM.Options.UpBarColor
  */
 export default function ToggleUpgradeBarAndColor() {
-  if (CMOptions.UpBarColor === 1) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor === 1) {
     // Colours and bar on
     l('CMUpgradeBar').style.display = '';
     UpdateUpgrades();
-  } else if (CMOptions.UpBarColor === 2) {
+  } else if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor === 2) {
     // Colours on and bar off
     l('CMUpgradeBar').style.display = 'none';
     UpdateUpgrades();

src/Config/Toggles/ToggleUpgradeBarFixedPos.js

@@ -1,11 +1,11 @@
-import { CMOptions } from '../VariablesAndData';
-
 /**
  * This function toggles the position of the upgrade bar from fixed or non-fixed mode
  * It is called by a change in CM.Options.UpgradeBarFixedPos
  */
 export default function ToggleUpgradeBarFixedPos() {
-  if (CMOptions.UpgradeBarFixedPos === 1) {
+  if (
+    Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpgradeBarFixedPos === 1
+  ) {
     // Fix to top of screen when scrolling
     l('CMUpgradeBar').style.position = 'sticky';
     l('CMUpgradeBar').style.top = '0px';

src/Config/Toggles/ToggleWrinklerButtons.js

@@ -1,11 +1,12 @@
-import { CMOptions } from '../VariablesAndData';
-
 /**
  * This function updates the display setting of the two objects created by CM.Disp.CreateWrinklerButtons()
  * It is called by changes in CM.Options.WrinklerButtons
  */
 export default function ToggleWrinklerButtons() {
-  if (CMOptions.WrinklerButtons && Game.elderWrath) {
+  if (
+    Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.WrinklerButtons &&
+    Game.elderWrath
+  ) {
     l('PopAllNormalWrinklerButton').style.display = '';
     l('PopFattestWrinklerButton').style.display = '';
   } else {