Refactoring and task queue tests

src/Task/BalanceHeroResourcesTask.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
@@ -7,6 +6,7 @@ import { path } from '../utils';
 import { GoToHeroVillageAction } from '../Action/GoToHeroVillageAction';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class BalanceHeroResourcesTask extends TaskController {

src/Task/BuildBuildingTask.ts

@@ -3,10 +3,10 @@ import { CheckBuildingRemainingTimeAction } from '../Action/CheckBuildingRemaini
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { path } from '../utils';
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class BuildBuildingTask extends TaskController {

src/Task/GrabVillageState.ts

@@ -1,6 +1,6 @@
 import { TaskController, registerTask, ActionDefinition } from './TaskController';
 import { scanAllVillagesBundle } from './ActionBundles';
-import { Task } from '../Queue/TaskQueue';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class GrabVillageState extends TaskController {

src/Task/ResourcesToLevel.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask, ActionDefinition } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
@@ -6,6 +5,7 @@ import { path } from '../utils';
 import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class ResourcesToLevel extends TaskController {

src/Task/SendOnAdventureTask.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
@@ -7,6 +6,7 @@ import { ClickButtonAction } from '../Action/ClickButtonAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class SendOnAdventureTask extends TaskController {

src/Task/SendResourcesTask.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask, ActionDefinition } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
@@ -7,6 +6,7 @@ import { SendResourcesAction } from '../Action/SendResourcesAction';
 import { ClickButtonAction } from '../Action/ClickButtonAction';
 import { scanAllVillagesBundle } from './ActionBundles';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class SendResourcesTask extends TaskController {

src/Task/TaskController.ts

@@ -1,8 +1,8 @@
-import { Task } from '../Queue/TaskQueue';
 import { Scheduler } from '../Scheduler';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 const taskMap: { [name: string]: Function | undefined } = {};
 

src/Task/TrainTroopTask.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
@@ -6,6 +5,7 @@ import { TrainTrooperAction } from '../Action/TrainTrooperAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class TrainTroopTask extends TaskController {

src/Task/UpdateResourceContracts.ts

@@ -1,4 +1,3 @@
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { path } from '../utils';
@@ -7,6 +6,7 @@ import { UpdateBuildingTaskResourcesAction } from '../Action/UpdateBuildingTaskR
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class UpdateResourceContracts extends TaskController {

src/Task/UpgradeBuildingTask.ts

@@ -1,5 +1,4 @@
 import { UpgradeBuildingAction } from '../Action/UpgradeBuildingAction';
-import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { GoToPageAction } from '../Action/GoToPageAction';
 import { CheckBuildingRemainingTimeAction } from '../Action/CheckBuildingRemainingTimeAction';
@@ -7,6 +6,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerTask
 export class UpgradeBuildingTask extends TaskController {