From 3a5329d278640a2fac7641b36b227faf41fa9336 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sat, 18 Jul 2020 17:09:18 +0300
Subject: [PATCH] Move building queue info to Core

---
 src/Action/CheckBuildingRemainingTimeAction.ts | 2 +-
 src/{Game.ts => Core/BuildingQueueInfo.ts}     | 1 +
 src/Grabber/VillageOverviewPageGrabber.ts      | 2 +-
 src/Page/VillageBlock.ts                       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{Game.ts => Core/BuildingQueueInfo.ts} (99%)

diff --git a/src/Action/CheckBuildingRemainingTimeAction.ts b/src/Action/CheckBuildingRemainingTimeAction.ts
index 3319557..8690eb7 100644
--- a/src/Action/CheckBuildingRemainingTimeAction.ts
+++ b/src/Action/CheckBuildingRemainingTimeAction.ts
@@ -1,9 +1,9 @@
 import { ActionController, registerAction } from './ActionController';
 import { GrabError, TryLaterError } from '../Errors';
 import { grabBuildingQueueInfo } from '../Page/VillageBlock';
-import { BuildingQueueInfo } from '../Game';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
+import { BuildingQueueInfo } from '../Core/BuildingQueueInfo';
 
 @registerAction
 export class CheckBuildingRemainingTimeAction extends ActionController {
diff --git a/src/Game.ts b/src/Core/BuildingQueueInfo.ts
similarity index 99%
rename from src/Game.ts
rename to src/Core/BuildingQueueInfo.ts
index 305684b..f4592aa 100644
--- a/src/Game.ts
+++ b/src/Core/BuildingQueueInfo.ts
@@ -1,5 +1,6 @@
 export class BuildingQueueInfo {
     readonly seconds: number;
+
     constructor(seconds: number) {
         this.seconds = seconds;
     }
diff --git a/src/Grabber/VillageOverviewPageGrabber.ts b/src/Grabber/VillageOverviewPageGrabber.ts
index 9021dd7..b17fce0 100644
--- a/src/Grabber/VillageOverviewPageGrabber.ts
+++ b/src/Grabber/VillageOverviewPageGrabber.ts
@@ -2,9 +2,9 @@ import { Grabber } from './Grabber';
 import { grabBuildingQueueInfo, grabResourcesPerformance } from '../Page/VillageBlock';
 import { parseLocation, timestamp } from '../utils';
 import { GrabError } from '../Errors';
-import { BuildingQueueInfo } from '../Game';
 import { ProductionQueue } from '../Core/ProductionQueue';
 import { grabResourceSlots } from '../Page/SlotBlock';
+import { BuildingQueueInfo } from '../Core/BuildingQueueInfo';
 
 export class VillageOverviewPageGrabber extends Grabber {
     grab(): void {
diff --git a/src/Page/VillageBlock.ts b/src/Page/VillageBlock.ts
index 2996afa..b1c00e3 100644
--- a/src/Page/VillageBlock.ts
+++ b/src/Page/VillageBlock.ts
@@ -1,8 +1,8 @@
-import { BuildingQueueInfo } from '../Game';
 import { GrabError } from '../Errors';
 import { getNumber, parseLocation } from '../utils';
 import { Resources } from '../Core/Resources';
 import { Coordinates, Village, VillageList } from '../Core/Village';
+import { BuildingQueueInfo } from '../Core/BuildingQueueInfo';
 
 function getVillageListItems() {
     const $elements = jQuery('#sidebarBoxVillagelist ul li a');