use external empty-epsilon-js and open-epsilon

CommaSword · Feb 2, 2018 · 3a10eec · 3a10eec
1 parent e6ab41c
commit 3a10eec
Show file tree

Hide file tree

Showing 26 changed files with 80 additions and 1,478 deletions.
diff --git a/src/ecr/commands.ts b/src/ecr/commands.ts
@@ -1,7 +1,7 @@
 import {normInputString, Request, withUser} from "../session/command-utils";
 import {RootModuleBuilder} from "@fugazi/connector/scripts/bin/components";
 import {EcrModuleClient} from "./rpc";
-import {ESystem} from "../empty-epsilon/model";
+import {ESystem} from "empty-epsilon-js";
 import {Entries} from "../excalibur/entries";
 import {User} from "../session/users";
 

diff --git a/src/ecr/driver.ts b/src/ecr/driver.ts
@@ -1,7 +1,6 @@
 import {Driver} from "./logic";
-import {ESystem, ESystemNames} from "../empty-epsilon/model";
+import {ESystem, ESystemNames, EEDriverWithHooks} from "empty-epsilon-js";
 import {Observable} from "rxjs";
-import {EEDriverWithHooks} from "../empty-epsilon/driver";
 
 export const repair_per_second = 0.007;
 export const heat_per_second = 0.05 * /* heat_sanity_factor */ 0.28;

diff --git a/src/ecr/index.ts b/src/ecr/index.ts
@@ -1,8 +1,7 @@
-import {EEDriverWithHooks} from "../empty-epsilon/driver";
+import {EEDriverWithHooks, ESystem} from "empty-epsilon-js";
 import {EcrDriver} from "./driver";
 import {EcrLogic, lowercaseInfraSystemNames} from "./logic";
-import {OscDriver} from "../osc/osc-driver";
-import {ESystem} from "../empty-epsilon/model";
+import {OscDriver} from "open-epsilon";
 import {MetaArgument, OscMessage} from "osc";
 import {Observable, Subscription} from "rxjs";
 import {EcrModel, EcrState, ESwitchBoard} from "./model";

diff --git a/src/ecr/logic.ts b/src/ecr/logic.ts
@@ -1,5 +1,5 @@
-import {PrimarySystem, PrimarySystemStatus, EcrModel, SwitchBoard, SwitchBoardStatus, ESwitchBoard} from "./model";
-import {ESystem} from "../empty-epsilon/model";
+import {PrimarySystemStatus, EcrModel, SwitchBoard, SwitchBoardStatus, ESwitchBoard} from "./model";
+import {ESystem} from "empty-epsilon-js";
 import {setTimedInterval} from "../core/timing";
 import {Observable} from "rxjs/Observable";
 

diff --git a/src/ecr/model.ts b/src/ecr/model.ts
@@ -1,4 +1,4 @@
-import {ESystem} from "../empty-epsilon/model";
+import {ESystem} from "empty-epsilon-js";
 
 export interface PrimarySystemStatus {
 

diff --git a/src/ecr/rpc.ts b/src/ecr/rpc.ts
@@ -1,6 +1,6 @@
 import * as  rpc from 'json-rpc2';
 import * as net from "net";
-import {ESystem} from "../empty-epsilon/model";
+import {ESystem} from "empty-epsilon-js";
 import {EcrModule} from "./index";
 
 export type Options = {

diff --git a/src/empty-epsilon/driver.ts b/src/empty-epsilon/driver.ts
diff --git a/src/empty-epsilon/model.ts b/src/empty-epsilon/model.ts