From 8c118b6aeffd81f4da1dd098ec01dd15a2eb1a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Tue, 20 Jul 2021 18:08:53 +0200
Subject: [PATCH] Fix imports after changes to folder structure

---
 src/Disp/MenuSections/createMenuInfo.js | 4 ++--
 src/InitSaveLoad/init.js                | 6 ++----
 src/InitSaveLoad/load.js                | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Disp/MenuSections/createMenuInfo.js b/src/Disp/MenuSections/createMenuInfo.js
index 38dc99f..d84bd81 100644
--- a/src/Disp/MenuSections/createMenuInfo.js
+++ b/src/Disp/MenuSections/createMenuInfo.js
@@ -13,8 +13,8 @@ export default function createMenuInfo() {
   );
 
   if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.infoMenu) {
-    menuDiv.appendChild(menuFunctions.createInfoListing(ModDescription));
-    menuDiv.appendChild(menuFunctions.createInfoListing(LatestReleaseNotes));
+    menuDiv.appendChild(menuFunctions.listings.createInfoListing(ModDescription));
+    menuDiv.appendChild(menuFunctions.listings.createInfoListing(LatestReleaseNotes));
   }
 
   return menuDiv;
diff --git a/src/InitSaveLoad/init.js b/src/InitSaveLoad/init.js
index 9129992..1cb5a96 100644
--- a/src/InitSaveLoad/init.js
+++ b/src/InitSaveLoad/init.js
@@ -4,7 +4,6 @@ import CMDrawHook from '../Disp/DrawHook';
 import CMClickHook from '../Main/ClickHook';
 import InitializeCookieMonster from '../Main/Initialization';
 import CMLoopHook from '../Main/LoopHook';
-import { isInitializing } from './Variables'; // eslint-disable-line no-unused-vars
 
 /**
  * This creates a init function for the CM object. Per Game code/comments:
@@ -13,11 +12,11 @@ import { isInitializing } from './Variables'; // eslint-disable-line no-unused-v
  * It starts the further initialization of CookieMonster and registers hooks
  */
 export default function init() {
-  isInitializing = true;
   let proceed = true;
 
   // Load Cookie Monster Mod Framework and register mod
   initFunctions.initModFramework();
+  window.cookieMonsterFrameworkData.isInitializing = true;
   initFunctions.registerMod('cookieMonsterMod');
 
   if (Game.version !== Number(VersionMajor)) {
@@ -31,7 +30,6 @@ export default function init() {
     Game.registerHook('click', CMClickHook);
     Game.registerHook('draw', CMDrawHook);
     Game.registerHook('logic', CMLoopHook);
-
-    isInitializing = false;
   }
+  window.cookieMonsterFrameworkData.isInitializing = false;
 }
diff --git a/src/InitSaveLoad/load.js b/src/InitSaveLoad/load.js
index 6b5df51..80fa532 100644
--- a/src/InitSaveLoad/load.js
+++ b/src/InitSaveLoad/load.js
@@ -1,4 +1,4 @@
-import loadMod from '@cookiemonsterteam/cookiemonsterframework/src/saveDataFunctions/loadMod';
+import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index';
 
 import headers from '../Data/headers';
 import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
@@ -13,7 +13,7 @@ import InitData from '../Sim/InitializeData/InitData';
  */
 export default function load(str) {
   InitData();
-  loadMod('cookieMonsterMod', str, settings, headers, CMLoopHook);
+  saveAndLoadingFunctions.loadMod('cookieMonsterMod', str, settings, headers, CMLoopHook);
   UpdateColours();
   if (
     Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.version !==