david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix imports after changes to folder structure

Browse Source
This commit is contained in:
Daniël van Noord
2021-07-20 18:08:53 +02:00
parent 82c872ef18
commit 8c118b6aef
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Disp/MenuSections/createMenuInfo.js
View File

@@ -13,8 +13,8 @@ export default function createMenuInfo() {
); );
if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.infoMenu) { if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.infoMenu) {
menuDiv.appendChild(menuFunctions.createInfoListing(ModDescription)); menuDiv.appendChild(menuFunctions.listings.createInfoListing(ModDescription));
menuDiv.appendChild(menuFunctions.createInfoListing(LatestReleaseNotes)); menuDiv.appendChild(menuFunctions.listings.createInfoListing(LatestReleaseNotes));
} }
return menuDiv; return menuDiv;

6
src/InitSaveLoad/init.js
View File

@@ -4,7 +4,6 @@ import CMDrawHook from '../Disp/DrawHook';
import CMClickHook from '../Main/ClickHook'; import CMClickHook from '../Main/ClickHook';
import InitializeCookieMonster from '../Main/Initialization'; import InitializeCookieMonster from '../Main/Initialization';
import CMLoopHook from '../Main/LoopHook'; 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: * 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 * It starts the further initialization of CookieMonster and registers hooks
*/ */
export default function init() { export default function init() {
isInitializing = true;
let proceed = true; let proceed = true;
// Load Cookie Monster Mod Framework and register mod // Load Cookie Monster Mod Framework and register mod
initFunctions.initModFramework(); initFunctions.initModFramework();
window.cookieMonsterFrameworkData.isInitializing = true;
initFunctions.registerMod('cookieMonsterMod'); initFunctions.registerMod('cookieMonsterMod');
if (Game.version !== Number(VersionMajor)) { if (Game.version !== Number(VersionMajor)) {
@@ -31,7 +30,6 @@ export default function init() {
Game.registerHook('click', CMClickHook); Game.registerHook('click', CMClickHook);
Game.registerHook('draw', CMDrawHook); Game.registerHook('draw', CMDrawHook);
Game.registerHook('logic', CMLoopHook); Game.registerHook('logic', CMLoopHook);
isInitializing = false;
} }
window.cookieMonsterFrameworkData.isInitializing = false;
} }

4
src/InitSaveLoad/load.js
View File

@@ -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 headers from '../Data/headers';
import { VersionMajor, VersionMinor } from '../Data/Moddata.ts'; import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
@@ -13,7 +13,7 @@ import InitData from '../Sim/InitializeData/InitData';
*/ */
export default function load(str) { export default function load(str) {
InitData(); InitData();
loadMod('cookieMonsterMod', str, settings, headers, CMLoopHook); saveAndLoadingFunctions.loadMod('cookieMonsterMod', str, settings, headers, CMLoopHook);
UpdateColours(); UpdateColours();
if ( if (
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.version !== Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.version !==