Refactored InfoProvider loader

src/components/SearchSeeds/SearchViews/FungalShifts.tsx

@@ -2,12 +2,12 @@
 import React, { useState, useEffect, FC } from "react";
 import { Row, Col, Container, Stack, Button } from "react-bootstrap";
 
-import { FungalInfoProvider } from "../../../services/SeedInfo/infoHandler/InfoProviders/Fungal";
+import { FungalShiftInfoProvider } from "../../../services/SeedInfo/infoHandler/InfoProviders/FungalShift";
 import { IRule } from "../../../services/SeedInfo/infoHandler/IRule";
 import { Square } from "../../helpers";
 import { FlaskMaterialSelect } from "../../MaterialSelect";
 
-const fungalInfoProvider = new FungalInfoProvider({} as any);
+const fungalInfoProvider = new FungalShiftInfoProvider({} as any);
 
 interface IFungalShiftsProps {
   onUpdateConfig: (config: Partial<IRule>) => void;

src/components/SeedInfo/SeedInfoViews/ExcavationsiteCubeChamber.tsx

@@ -10,11 +10,11 @@ const ExcavationsiteCubeChamber = () => {
   const { gameInfoProvider } = useContext(GameInfoContext);
 
   const [wand, setWand] = React.useState(() =>
-    gameInfoProvider.providers.excavationSiteCubeChamber.provide(gameInfoProvider.config.seed),
+    gameInfoProvider.providers.excavationsiteCubeChamber.provide(gameInfoProvider.config.seed),
   );
 
   useEffect(() => {
-    const wand = gameInfoProvider.providers.excavationSiteCubeChamber.provide(gameInfoProvider.config.seed);
+    const wand = gameInfoProvider.providers.excavationsiteCubeChamber.provide(gameInfoProvider.config.seed);
     setWand(wand);
   }, [gameInfoProvider]);
 

src/components/SeedInfo/SeedInfoViews/FungalShifts.tsx

@@ -3,7 +3,7 @@ import { Stack, Form, Tooltip, OverlayTrigger, Table } from "react-bootstrap";
 import { CountdownCircleTimer } from "react-countdown-circle-timer";
 
 import { GameInfoProvider } from "../../../services/SeedInfo/infoHandler";
-import { FungalInfoProvider } from "../../../services/SeedInfo/infoHandler/InfoProviders/Fungal";
+import { FungalShiftInfoProvider } from "../../../services/SeedInfo/infoHandler/InfoProviders/FungalShift";
 import { MaterialInfoProvider } from "../../../services/SeedInfo/infoHandler/InfoProviders/Material";
 import { AlchemyConfigContext } from "../../AlchemyConfigContext";
 import { capitalize } from "../../../services/helpers";
@@ -148,7 +148,7 @@ export const FungalMaterialList: React.FC<IFungalMaterialListProps> = ({
 };
 
 interface IShiftProps {
-  data: ReturnType<FungalInfoProvider["provide"]>[number];
+  data: ReturnType<FungalShiftInfoProvider["provide"]>[number];
   shifted: boolean;
   setShifted: (shifted: boolean) => void;
   materialProvider: MaterialInfoProvider;
@@ -250,7 +250,7 @@ export const Shift: FC<IShiftProps> = props => {
 };
 
 interface IFungalShiftsProps {
-  fungalData: ReturnType<FungalInfoProvider["provide"]>;
+  fungalData: ReturnType<FungalShiftInfoProvider["provide"]>;
   infoProvider: GameInfoProvider;
 }
 

src/components/SeedInfo/SeedInfoViews/HolyMountain.tsx

@@ -514,12 +514,9 @@ const HolyMountainContextProvider = (props: IHolyMountainContextProviderProps) =
   const [perkStacks, setPerkStacks] = useState<IPerkChangeAction[][]>(() => infoProvider.config.perkStacks);
   const perkStack = perkStacks[perkStacks.length - 1];
 
-  const favorites = useFavoritePerks(
-    advanced ? infoProvider.providers.statelessPerk : infoProvider.providers.perk,
-    perkDeck,
-  );
+  const favorites = useFavoritePerks(infoProvider.providers.perk, perkDeck);
   const getPerkData = () => {
-    const perk = infoProvider.providers.statelessPerk;
+    const perk = infoProvider.providers.perk;
     const data = perk.provideStateless(perkStack);
     const hydrated = perk.hydrate(data.perks);
     return {

src/components/Settings/FavoritesSettings.tsx

@@ -8,9 +8,9 @@ import SpellSelect from "../SpellSelect";
 import { ConfigRow, ConfigTitle } from "./helpers";
 
 import useLocalStorage from "../../services/useLocalStorage";
-import { FungalInfoProvider } from "../../services/SeedInfo/infoHandler/InfoProviders/Fungal";
+import { FungalShiftInfoProvider } from "../../services/SeedInfo/infoHandler/InfoProviders/FungalShift";
 
-const fungalInfoProvider = new FungalInfoProvider({} as any);
+const fungalInfoProvider = new FungalShiftInfoProvider({} as any);
 
 const materialsFrom = fungalInfoProvider.fungalData.materials_from.flatMap(m => m.materials);
 const materialsTo = fungalInfoProvider.fungalData.materials_to.map(m => m.material);

src/services/SeedInfo/infoHandler/InfoProviders/Alchemy/index.ts

@@ -70,3 +70,5 @@ export class AlchemyInfoProvider extends InfoProvider {
     return allLC && allAP;
   }
 }
+
+export default AlchemyInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/AlwaysCast.ts

@@ -50,3 +50,5 @@ export class AlwaysCastInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default AlwaysCastInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Biome.ts

@@ -29,3 +29,5 @@ export class BiomeInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default BiomeInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/BiomeModifier.ts

@@ -227,3 +227,5 @@ export class BiomeModifierInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default BiomeModifierInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/ChestRandom.ts

@@ -20,7 +20,7 @@ export interface IItem {
   extra?: any;
 }
 
-export class ChestRandomProvider extends InfoProvider {
+export class ChestRandomInfoProvider extends InfoProvider {
   unlockedSpells: boolean[];
 
   constructor(randoms: IRandom, unlockedSpells: boolean[], spellInfoProvider: SpellInfoProvider) {
@@ -389,3 +389,5 @@ export class ChestRandomProvider extends InfoProvider {
     return true;
   }
 }
+
+export default ChestRandomInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Entity.ts

@@ -29,3 +29,5 @@ export class EntityInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default EntityInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/ExcavationsiteCubeChamber.ts

@@ -36,3 +36,5 @@ export class ExcavationsiteCubeChamberInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default ExcavationsiteCubeChamberInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/FungalShift/FungalShift-base.d.ts

@@ -0,0 +1,55 @@
+// TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
+declare namespace RuntimeExports {
+    let HEAPF32: any;
+    let HEAPF64: any;
+    let HEAP_DATA_VIEW: any;
+    let HEAP8: any;
+    let HEAPU8: any;
+    let HEAP16: any;
+    let HEAPU16: any;
+    let HEAP32: any;
+    let HEAPU32: any;
+    let HEAP64: any;
+    let HEAPU64: any;
+}
+interface WasmModule {
+  _malloc(_0: number): number;
+  _free(_0: number): void;
+}
+
+type EmbindString = ArrayBuffer|Uint8Array|Uint8ClampedArray|Int8Array|string;
+export interface VectorString {
+  push_back(_0: EmbindString): void;
+  resize(_0: number, _1: EmbindString): void;
+  size(): number;
+  get(_0: number): EmbindString | undefined;
+  set(_0: number, _1: EmbindString): boolean;
+  delete(): void;
+}
+
+export type FungalTransformation = {
+  flaskTo: boolean,
+  flaskFrom: boolean,
+  from: VectorString,
+  to: EmbindString,
+  gold_to_x: EmbindString,
+  grass_to_x: EmbindString
+};
+
+export interface VectorFungalTransformation {
+  push_back(_0: FungalTransformation): void;
+  resize(_0: number, _1: FungalTransformation): void;
+  size(): number;
+  get(_0: number): FungalTransformation | undefined;
+  set(_0: number, _1: FungalTransformation): boolean;
+  delete(): void;
+}
+
+interface EmbindModule {
+  VectorString: {new(): VectorString};
+  VectorFungalTransformation: {new(): VectorFungalTransformation};
+  PickForSeed(_0: number, _1: number): VectorFungalTransformation;
+}
+
+export type MainModule = WasmModule & typeof RuntimeExports & EmbindModule;
+export default function MainModuleFactory (options?: unknown): Promise<MainModule>;

src/services/SeedInfo/infoHandler/InfoProviders/FungalShift/FungalShift.d.ts

@@ -0,0 +1,55 @@
+// TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
+declare namespace RuntimeExports {
+    let HEAPF32: any;
+    let HEAPF64: any;
+    let HEAP_DATA_VIEW: any;
+    let HEAP8: any;
+    let HEAPU8: any;
+    let HEAP16: any;
+    let HEAPU16: any;
+    let HEAP32: any;
+    let HEAPU32: any;
+    let HEAP64: any;
+    let HEAPU64: any;
+}
+interface WasmModule {
+  _malloc(_0: number): number;
+  _free(_0: number): void;
+}
+
+type EmbindString = ArrayBuffer|Uint8Array|Uint8ClampedArray|Int8Array|string;
+export interface VectorString {
+  push_back(_0: EmbindString): void;
+  resize(_0: number, _1: EmbindString): void;
+  size(): number;
+  get(_0: number): EmbindString | undefined;
+  set(_0: number, _1: EmbindString): boolean;
+  delete(): void;
+}
+
+export type FungalTransformation = {
+  flaskTo: boolean,
+  flaskFrom: boolean,
+  from: VectorString,
+  to: EmbindString,
+  gold_to_x: EmbindString,
+  grass_to_x: EmbindString
+};
+
+export interface VectorFungalTransformation {
+  push_back(_0: FungalTransformation): void;
+  resize(_0: number, _1: FungalTransformation): void;
+  size(): number;
+  get(_0: number): FungalTransformation | undefined;
+  set(_0: number, _1: FungalTransformation): boolean;
+  delete(): void;
+}
+
+interface EmbindModule {
+  VectorString: {new(): VectorString};
+  VectorFungalTransformation: {new(): VectorFungalTransformation};
+  PickForSeed(_0: number, _1: number): VectorFungalTransformation;
+}
+
+export type MainModule = WasmModule & typeof RuntimeExports & EmbindModule;
+export default function MainModuleFactory (options?: unknown): Promise<MainModule>;

src/services/SeedInfo/infoHandler/InfoProviders/Fungal/index.ts → src/services/SeedInfo/infoHandler/InfoProviders/FungalShift/index.ts

@@ -10,7 +10,7 @@ import type { FungalTransformation, MainModule } from "./Fungal.d.ts";
 
 import createModule from "./Fungal.mjs";
 
-export class FungalInfoProvider extends InfoProvider {
+export class FungalShiftInfoProvider extends InfoProvider {
   readyPromise: Promise<void>;
 
   fungal!: MainModule;
@@ -131,3 +131,5 @@ export type IFungalRule = Array<{
   flaskFrom?: boolean;
   flaskTo?: boolean;
 }>;
+
+export default FungalShiftInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Lottery.ts

@@ -25,3 +25,5 @@ export class LotteryInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default LotteryInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Map/index.ts

@@ -549,3 +549,5 @@ snowCave, 2160684, 1988
 snowCastle, 1104125, 25762
 vault, 2252795, 11505
 */
+
+export default MapInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Material.ts

@@ -57,3 +57,5 @@ export class MaterialInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default MaterialInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/PacifistChest.ts

@@ -49,7 +49,7 @@ const itemMap = {
   "data/entities/items/pickup/heart_fullhp.xml": null,
 };
 
-export class PacifistChestProvider extends InfoProvider {
+export class PacifistChestInfoProvider extends InfoProvider {
   temples = templeData;
 
   chestProvider: ChestRandomProvider;
@@ -109,3 +109,5 @@ export class PacifistChestProvider extends InfoProvider {
     return true;
   }
 }
+
+export default PacifistChestInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Perk/index.ts

@@ -597,3 +597,5 @@ export interface IPerkRule {
   all: string[][];
   deck: string[][];
 }
+
+export default PerkInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Potion.ts

@@ -166,3 +166,5 @@ export class PotionInfoProvider extends InfoProvider {
   //   return isEqual(rule.val, info);
   // }
 }
+
+export default PotionInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/PotionRandomMaterial.ts

@@ -253,3 +253,5 @@ export class PotionRandomMaterialInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default PotionRandomMaterialInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/PotionSecret.ts

@@ -67,3 +67,5 @@ export class PotionSecretInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default PotionSecretInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/PowderStash.ts

@@ -94,3 +94,5 @@ export class PowderStashInfoProvider extends InfoProvider {
   //   return isEqual(rule.val, info);
   // }
 }
+
+export default PowderStashInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Shop.ts

@@ -354,3 +354,5 @@ export class ShopInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default ShopInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/SnowcastleSecretChamber.ts

@@ -6,7 +6,7 @@ import { InfoProvider } from "./Base";
 import { MapInfoProvider } from "./Map";
 
 // Hourglass chamber
-export class SnowcastleSecretChamberProvider extends InfoProvider {
+export class SnowcastleSecretChamberInfoProvider extends InfoProvider {
   mapInfoProvider: MapInfoProvider;
   constructor(randoms, mapInfoProvider: MapInfoProvider) {
     super(randoms);
@@ -29,3 +29,5 @@ export class SnowcastleSecretChamberProvider extends InfoProvider {
     return true;
   }
 }
+
+export default SnowcastleSecretChamberInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/SnowcaveSecretChamber.ts

@@ -16,7 +16,7 @@ const getWandArgs = (wand: string): [number, number, boolean] => {
   return [0, 0, false];
 };
 
-export class SnowcaveSecretChamberProvider extends InfoProvider {
+export class SnowcaveSecretChamberInfoProvider extends InfoProvider {
   wandInfoProvider: WandInfoProvider;
   mapInfoProvider: MapInfoProvider;
   constructor(randoms, mapInfoProvider: MapInfoProvider, wandInfoProvider: WandInfoProvider) {
@@ -41,3 +41,5 @@ export class SnowcaveSecretChamberProvider extends InfoProvider {
     return true;
   }
 }
+
+export default SnowcaveSecretChamberInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Spell.ts

@@ -38,3 +38,5 @@ export class SpellInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default SpellInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/StartingBomb.ts

@@ -35,3 +35,5 @@ export class StartingBombSpellInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default StartingBombSpellInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/StartingFlask.ts

@@ -63,3 +63,5 @@ export class StartingFlaskInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default StartingFlaskInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/StartingSpell.ts

@@ -70,3 +70,5 @@ export class StartingSpellInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default StartingSpellInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/Wand.ts

@@ -678,3 +678,5 @@ export interface IWandRule {
   cards?: string[];
   permanentCard?: string;
 }
+
+export default WandInfoProvider;

src/services/SeedInfo/infoHandler/InfoProviders/WaterCave.ts

@@ -14,3 +14,5 @@ export class WaterCaveInfoProvider extends InfoProvider {
     return true;
   }
 }
+
+export default WaterCaveInfoProvider;