Merge Fix

Author: AlexD717

fission/src/mirabuf/ProtectedZoneSceneObject.ts

@@ -15,7 +15,7 @@ import {
 } from "@/util/TypeConversions"
 import { deltaFieldTransformsPhysicalProp } from "@/util/threejs/MeshCreation"
 import { MiraType } from "./MirabufLoader"
-import MatchMode, { MatchModeType } from "@/systems/MatchMode"
+import MatchMode, { MatchModeType } from "@/systems/match_mode/MatchMode"
 
 export enum ContactType {
     ROBOT_ENTERS = "Robot Enters",

fission/src/test/PreferencesSystem.test.ts

@@ -6,7 +6,7 @@ import {
     MotorPreferences,
     RobotPreferences,
 } from "@/systems/preferences/PreferenceTypes"
-import { MatchModeType } from "@/systems/MatchMode"
+import { MatchModeType } from "@/systems/match_mode/MatchMode"
 import { ContactType } from "@/mirabuf/ProtectedZoneSceneObject"
 
 describe("Preferences System Global Values", () => {

fission/src/test/mirabuf/ProtectedZoneSceneObject.test.ts

@@ -3,7 +3,7 @@ import ProtectedZoneSceneObject, { ContactType } from "../../mirabuf/ProtectedZo
 import MirabufSceneObject from "../../mirabuf/MirabufSceneObject"
 import Jolt from "@azaleacolburn/jolt-physics"
 import { createBodyMock } from "../mocks/jolt"
-import { MatchModeType } from "@/systems/MatchMode"
+import { MatchModeType } from "@/systems/match_mode/MatchMode"
 import { MiraType } from "@/mirabuf/MirabufLoader"
 import SimulationSystem from "@/systems/simulation/SimulationSystem"
 import { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"
@@ -45,7 +45,7 @@ vi.mock("@/systems/simulation/SimulationSystem", () => ({
     },
 }))
 
-vi.mock("@/systems/MatchMode", () => ({
+vi.mock("@/systems/match_mode/MatchMode", () => ({
     MatchModeType: {
         SANDBOX: "Sandbox",
         AUTONOMOUS: "Autonomous",

fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ManageProtectedZonesInterface.tsx

@@ -5,7 +5,7 @@ import ScrollView from "@/components/ScrollView"
 import Stack, { StackDirection } from "@/components/Stack"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import { PAUSE_REF_ASSEMBLY_CONFIG } from "@/systems/physics/PhysicsSystem"
-import { MatchModeType } from "@/systems/MatchMode"
+import { MatchModeType } from "@/systems/match_mode/MatchMode"
 import { ContactType } from "@/mirabuf/ProtectedZoneSceneObject"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"

fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ProtectedZoneConfigInterface.tsx

@@ -22,7 +22,7 @@ import {
 import { deltaFieldTransformsPhysicalProp } from "@/util/threejs/MeshCreation"
 import { ConfigurationSavedEvent } from "../../ConfigurationSavedEvent"
 import Dropdown from "@/ui/components/Dropdown"
-import { MatchModeType } from "@/systems/MatchMode"
+import { MatchModeType } from "@/systems/match_mode/MatchMode"
 
 const MATCH_MODE_OPTIONS: MatchModeType[] = [
     MatchModeType.SANDBOX,