commit1

src/GameOptions/ui/GameOptionsSidebar.tsx

@@ -13,7 +13,6 @@ import {
 import { Box, Button, List, ListItemButton, Paper, Tooltip, Typography } from "@mui/material";
 import { default as React, useRef, useState } from "react";
 import { FileDiagnosticModal } from "../../Diagnostic/FileDiagnosticModal";
-import { IPlayer } from "../../PersonObjects/IPlayer";
 import { ImportData, saveObject } from "../../SaveObject";
 import { Settings } from "../../Settings/Settings";
 import { StyleEditorButton } from "../../Themes/ui/StyleEditorButton";
@@ -22,15 +21,13 @@ import { ConfirmationModal } from "../../ui/React/ConfirmationModal";
 import { DeleteGameButton } from "../../ui/React/DeleteGameButton";
 import { SnackbarEvents, ToastVariant } from "../../ui/React/Snackbar";
 import { SoftResetButton } from "../../ui/React/SoftResetButton";
-import { IRouter } from "../../ui/Router";
+import { Router } from "../../ui/GameRoot";
 import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { GameOptionsTab } from "../GameOptionsTab";
 
 interface IProps {
   tab: GameOptionsTab;
   setTab: (tab: GameOptionsTab) => void;
-  player: IPlayer;
-  router: IRouter;
   save: () => void;
   export: () => void;
   forceKill: () => void;
@@ -94,7 +91,7 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => {
 
   function compareSaveGame(): void {
     if (!importData) return;
-    props.router.toImportSave(importData.base64);
+    Router.toImportSave(importData.base64);
     setImportSaveOpen(false);
     setImportData(null);
   }
@@ -219,12 +216,12 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => {
           </Button>
         </Tooltip>
         <Tooltip title="Head to the theme browser to see a collection of prebuilt themes.">
-          <Button startIcon={<Palette />} onClick={() => props.router.toThemeBrowser()} sx={{ gridArea: "browse" }}>
+          <Button startIcon={<Palette />} onClick={() => Router.toThemeBrowser()} sx={{ gridArea: "browse" }}>
             Theme Browser
           </Button>
         </Tooltip>
         <Box sx={{ gridArea: "theme", "& .MuiButton-root": { height: "100%", width: "100%" } }}>
-          <ThemeEditorButton router={props.router} />
+          <ThemeEditorButton />
         </Box>
         <Box sx={{ gridArea: "style", "& .MuiButton-root": { height: "100%", width: "100%" } }}>
           <StyleEditorButton />