From dabe1f091ac95eea799b92af0585789d6cf17212 Mon Sep 17 00:00:00 2001 From: IliaDenisov Date: Tue, 10 Mar 2026 15:46:18 +0200 Subject: [PATCH] chore: re-package --- client/cmd/ui/main.go | 2 +- client/editor.go | 3 ++- client/go.mod | 2 +- client/mock.go | 2 +- client/ui.go | 3 ++- client/ui_drag.go | 2 +- client/ui_drag_test.go | 2 +- go.work | 12 ++++++------ {error => pkg/error}/generic.go | 0 {error => pkg/error}/generic_test.go | 0 {error => pkg/error}/go.mod | 0 {error => pkg/error}/go.sum | 0 {error => pkg/error}/input.go | 0 {error => pkg/error}/repo.go | 0 {error => pkg/error}/state.go | 0 {model => pkg/model}/go.mod | 0 {model => pkg/model}/go.sum | 0 {model => pkg/model}/order/order.go | 0 {model => pkg/model}/report/battle.go | 0 {model => pkg/model}/report/bombing.go | 0 {model => pkg/model}/report/planet.go | 0 {model => pkg/model}/report/report.go | 0 {model => pkg/model}/report/science.go | 0 {model => pkg/model}/report/ship.go | 0 {model => pkg/model}/rest/command.go | 0 {model => pkg/model}/rest/init.go | 0 {model => pkg/model}/rest/status.go | 0 {util => pkg/util}/fs.go | 0 {util => pkg/util}/go.mod | 0 {util => pkg/util}/go.sum | 0 {util => pkg/util}/map.go | 0 {util => pkg/util}/map_test.go | 0 {util => pkg/util}/number.go | 0 {util => pkg/util}/number_test.go | 0 {util => pkg/util}/string.go | 0 {util => pkg/util}/string_test.go | 0 server/cmd/http/main.go | 2 +- server/go.mod | 2 +- server/internal/bitmap/bitmap_test.go | 2 +- server/internal/controller/battle.go | 3 ++- server/internal/controller/battle_test.go | 5 +++-- server/internal/controller/bombing.go | 3 ++- server/internal/controller/bombing_test.go | 5 +++-- server/internal/controller/cache.go | 3 ++- server/internal/controller/command.go | 3 ++- server/internal/controller/controller.go | 5 +++-- server/internal/controller/controller_export_test.go | 3 ++- server/internal/controller/controller_test.go | 5 +++-- server/internal/controller/fleet.go | 3 ++- server/internal/controller/fleet_send.go | 2 +- server/internal/controller/fleet_send_test.go | 3 ++- server/internal/controller/fleet_test.go | 3 ++- server/internal/controller/generate_game.go | 5 +++-- server/internal/controller/generate_game_test.go | 7 ++++--- server/internal/controller/generate_turn.go | 3 ++- server/internal/controller/order.go | 3 ++- server/internal/controller/planet.go | 3 ++- server/internal/controller/planet_test.go | 5 +++-- server/internal/controller/race.go | 2 +- server/internal/controller/race_test.go | 3 ++- server/internal/controller/report.go | 3 ++- server/internal/controller/route.go | 2 +- server/internal/controller/route_test.go | 4 ++-- server/internal/controller/science.go | 3 ++- server/internal/controller/science_test.go | 5 +++-- server/internal/controller/ship_class.go | 3 ++- server/internal/controller/ship_group.go | 3 ++- server/internal/controller/ship_group_move.go | 2 +- server/internal/controller/ship_group_move_test.go | 3 ++- server/internal/controller/ship_group_send.go | 3 ++- server/internal/controller/ship_group_send_test.go | 3 ++- server/internal/controller/ship_group_test.go | 3 ++- server/internal/controller/ship_group_upgrade.go | 3 ++- .../internal/controller/ship_group_upgrade_test.go | 7 ++++--- server/internal/controller/vote.go | 3 ++- server/internal/controller/vote_test.go | 5 +++-- server/internal/generator/generator_test.go | 3 ++- server/internal/generator/map.go | 2 +- server/internal/generator/planet_test.go | 3 ++- server/internal/generator/plotter/plotter.go | 2 +- server/internal/generator/plotter/plotter_test.go | 2 +- server/internal/model/game/game_test.go | 3 ++- server/internal/model/game/group_test.go | 3 ++- server/internal/model/game/planet_test.go | 3 ++- server/internal/model/game/race_test.go | 3 ++- server/internal/model/game/ship_test.go | 3 ++- server/internal/repo/game.go | 3 ++- server/internal/repo/repo.go | 2 +- server/internal/repo/repo_test.go | 5 +++-- server/internal/router/handler/command.go | 3 ++- server/internal/router/handler/handler.go | 5 +++-- server/internal/router/handler/order.go | 3 ++- server/internal/router/init_test.go | 7 ++++--- server/internal/router/router.go | 3 ++- server/internal/router/router_export_test.go | 3 ++- server/internal/router/router_helper_test.go | 5 +++-- server/internal/router/router_test.go | 3 ++- server/internal/router/status_test.go | 7 ++++--- server/internal/router/turn_test.go | 7 ++++--- 99 files changed, 151 insertions(+), 98 deletions(-) rename {error => pkg/error}/generic.go (100%) rename {error => pkg/error}/generic_test.go (100%) rename {error => pkg/error}/go.mod (100%) rename {error => pkg/error}/go.sum (100%) rename {error => pkg/error}/input.go (100%) rename {error => pkg/error}/repo.go (100%) rename {error => pkg/error}/state.go (100%) rename {model => pkg/model}/go.mod (100%) rename {model => pkg/model}/go.sum (100%) rename {model => pkg/model}/order/order.go (100%) rename {model => pkg/model}/report/battle.go (100%) rename {model => pkg/model}/report/bombing.go (100%) rename {model => pkg/model}/report/planet.go (100%) rename {model => pkg/model}/report/report.go (100%) rename {model => pkg/model}/report/science.go (100%) rename {model => pkg/model}/report/ship.go (100%) rename {model => pkg/model}/rest/command.go (100%) rename {model => pkg/model}/rest/init.go (100%) rename {model => pkg/model}/rest/status.go (100%) rename {util => pkg/util}/fs.go (100%) rename {util => pkg/util}/go.mod (100%) rename {util => pkg/util}/go.sum (100%) rename {util => pkg/util}/map.go (100%) rename {util => pkg/util}/map_test.go (100%) rename {util => pkg/util}/number.go (100%) rename {util => pkg/util}/number_test.go (100%) rename {util => pkg/util}/string.go (100%) rename {util => pkg/util}/string_test.go (100%) diff --git a/client/cmd/ui/main.go b/client/cmd/ui/main.go index dbda6b9..0e47493 100644 --- a/client/cmd/ui/main.go +++ b/client/cmd/ui/main.go @@ -1,6 +1,6 @@ package main -import "github.com/iliadenisov/galaxy/client" +import "galaxy/client" func main() { c := client.NewUI() diff --git a/client/editor.go b/client/editor.go index 64b6b84..a218441 100644 --- a/client/editor.go +++ b/client/editor.go @@ -6,12 +6,13 @@ import ( "math" "sync" + "galaxy/client/world" + "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "github.com/iliadenisov/galaxy/client/world" ) type client struct { diff --git a/client/go.mod b/client/go.mod index e0a1adc..a4fa64f 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,4 +1,4 @@ -module github.com/iliadenisov/galaxy/client +module galaxy/client go 1.26.0 diff --git a/client/mock.go b/client/mock.go index 8bffe5a..7c8bbe1 100644 --- a/client/mock.go +++ b/client/mock.go @@ -3,7 +3,7 @@ package client import ( "image/color" - "github.com/iliadenisov/galaxy/client/world" + "galaxy/client/world" ) func mockWorld() *world.World { diff --git a/client/ui.go b/client/ui.go index bd88806..6795817 100644 --- a/client/ui.go +++ b/client/ui.go @@ -4,9 +4,10 @@ import ( "image" "math" + "galaxy/client/world" + "fyne.io/fyne/v2" "github.com/fogleman/gg" - "github.com/iliadenisov/galaxy/client/world" ) /* diff --git a/client/ui_drag.go b/client/ui_drag.go index 3bc420f..f613687 100644 --- a/client/ui_drag.go +++ b/client/ui_drag.go @@ -5,7 +5,7 @@ import ( "fyne.io/fyne/v2" - "github.com/iliadenisov/galaxy/client/world" + "galaxy/client/world" ) /* diff --git a/client/ui_drag_test.go b/client/ui_drag_test.go index 92956d2..954178c 100644 --- a/client/ui_drag_test.go +++ b/client/ui_drag_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/iliadenisov/galaxy/client/world" + "galaxy/client/world" ) type fakeClient struct { diff --git a/go.work b/go.work index a14ad2a..79a15e1 100644 --- a/go.work +++ b/go.work @@ -2,14 +2,14 @@ go 1.26.0 use ( ./client - ./error - ./model + ./pkg/error + ./pkg/model + ./pkg/util ./server - ./util ) replace ( - galaxy/error v0.0.0 => ./error - galaxy/model v0.0.0 => ./model - galaxy/util v0.0.0 => ./util + galaxy/error v0.0.0 => ./pkg/error + galaxy/model v0.0.0 => ./pkg/model + galaxy/util v0.0.0 => ./pkg/util ) diff --git a/error/generic.go b/pkg/error/generic.go similarity index 100% rename from error/generic.go rename to pkg/error/generic.go diff --git a/error/generic_test.go b/pkg/error/generic_test.go similarity index 100% rename from error/generic_test.go rename to pkg/error/generic_test.go diff --git a/error/go.mod b/pkg/error/go.mod similarity index 100% rename from error/go.mod rename to pkg/error/go.mod diff --git a/error/go.sum b/pkg/error/go.sum similarity index 100% rename from error/go.sum rename to pkg/error/go.sum diff --git a/error/input.go b/pkg/error/input.go similarity index 100% rename from error/input.go rename to pkg/error/input.go diff --git a/error/repo.go b/pkg/error/repo.go similarity index 100% rename from error/repo.go rename to pkg/error/repo.go diff --git a/error/state.go b/pkg/error/state.go similarity index 100% rename from error/state.go rename to pkg/error/state.go diff --git a/model/go.mod b/pkg/model/go.mod similarity index 100% rename from model/go.mod rename to pkg/model/go.mod diff --git a/model/go.sum b/pkg/model/go.sum similarity index 100% rename from model/go.sum rename to pkg/model/go.sum diff --git a/model/order/order.go b/pkg/model/order/order.go similarity index 100% rename from model/order/order.go rename to pkg/model/order/order.go diff --git a/model/report/battle.go b/pkg/model/report/battle.go similarity index 100% rename from model/report/battle.go rename to pkg/model/report/battle.go diff --git a/model/report/bombing.go b/pkg/model/report/bombing.go similarity index 100% rename from model/report/bombing.go rename to pkg/model/report/bombing.go diff --git a/model/report/planet.go b/pkg/model/report/planet.go similarity index 100% rename from model/report/planet.go rename to pkg/model/report/planet.go diff --git a/model/report/report.go b/pkg/model/report/report.go similarity index 100% rename from model/report/report.go rename to pkg/model/report/report.go diff --git a/model/report/science.go b/pkg/model/report/science.go similarity index 100% rename from model/report/science.go rename to pkg/model/report/science.go diff --git a/model/report/ship.go b/pkg/model/report/ship.go similarity index 100% rename from model/report/ship.go rename to pkg/model/report/ship.go diff --git a/model/rest/command.go b/pkg/model/rest/command.go similarity index 100% rename from model/rest/command.go rename to pkg/model/rest/command.go diff --git a/model/rest/init.go b/pkg/model/rest/init.go similarity index 100% rename from model/rest/init.go rename to pkg/model/rest/init.go diff --git a/model/rest/status.go b/pkg/model/rest/status.go similarity index 100% rename from model/rest/status.go rename to pkg/model/rest/status.go diff --git a/util/fs.go b/pkg/util/fs.go similarity index 100% rename from util/fs.go rename to pkg/util/fs.go diff --git a/util/go.mod b/pkg/util/go.mod similarity index 100% rename from util/go.mod rename to pkg/util/go.mod diff --git a/util/go.sum b/pkg/util/go.sum similarity index 100% rename from util/go.sum rename to pkg/util/go.sum diff --git a/util/map.go b/pkg/util/map.go similarity index 100% rename from util/map.go rename to pkg/util/map.go diff --git a/util/map_test.go b/pkg/util/map_test.go similarity index 100% rename from util/map_test.go rename to pkg/util/map_test.go diff --git a/util/number.go b/pkg/util/number.go similarity index 100% rename from util/number.go rename to pkg/util/number.go diff --git a/util/number_test.go b/pkg/util/number_test.go similarity index 100% rename from util/number_test.go rename to pkg/util/number_test.go diff --git a/util/string.go b/pkg/util/string.go similarity index 100% rename from util/string.go rename to pkg/util/string.go diff --git a/util/string_test.go b/pkg/util/string_test.go similarity index 100% rename from util/string_test.go rename to pkg/util/string_test.go diff --git a/server/cmd/http/main.go b/server/cmd/http/main.go index 940d167..9380fe7 100644 --- a/server/cmd/http/main.go +++ b/server/cmd/http/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/iliadenisov/galaxy/server/internal/router" + "galaxy/server/internal/router" ) func main() { diff --git a/server/go.mod b/server/go.mod index 607661a..da190c4 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/iliadenisov/galaxy/server +module galaxy/server go 1.26.0 diff --git a/server/internal/bitmap/bitmap_test.go b/server/internal/bitmap/bitmap_test.go index ebf2624..27c225c 100644 --- a/server/internal/bitmap/bitmap_test.go +++ b/server/internal/bitmap/bitmap_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/iliadenisov/galaxy/server/internal/bitmap" + "galaxy/server/internal/bitmap" ) func TestBitVectorSize(t *testing.T) { diff --git a/server/internal/controller/battle.go b/server/internal/controller/battle.go index 2e04435..5292b8a 100644 --- a/server/internal/controller/battle.go +++ b/server/internal/controller/battle.go @@ -7,8 +7,9 @@ import ( "math/rand/v2" "slices" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) type Battle struct { diff --git a/server/internal/controller/battle_test.go b/server/internal/controller/battle_test.go index 85e9661..2d5c434 100644 --- a/server/internal/controller/battle_test.go +++ b/server/internal/controller/battle_test.go @@ -5,8 +5,9 @@ import ( "slices" "testing" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/bombing.go b/server/internal/controller/bombing.go index 0508ef2..ad7aa32 100644 --- a/server/internal/controller/bombing.go +++ b/server/internal/controller/bombing.go @@ -1,8 +1,9 @@ package controller import ( + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) ProduceBombings() []*game.Bombing { diff --git a/server/internal/controller/bombing_test.go b/server/internal/controller/bombing_test.go index 76ce285..bbfe519 100644 --- a/server/internal/controller/bombing_test.go +++ b/server/internal/controller/bombing_test.go @@ -3,9 +3,10 @@ package controller_test import ( "testing" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/cache.go b/server/internal/controller/cache.go index 05de5b5..8bdad97 100644 --- a/server/internal/controller/cache.go +++ b/server/internal/controller/cache.go @@ -4,8 +4,9 @@ import ( "fmt" "slices" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) type Cache struct { diff --git a/server/internal/controller/command.go b/server/internal/controller/command.go index c73e768..b4ab027 100644 --- a/server/internal/controller/command.go +++ b/server/internal/controller/command.go @@ -5,8 +5,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) // RaceID returns ID of race with given actor's name or error when race not found or extinct diff --git a/server/internal/controller/controller.go b/server/internal/controller/controller.go index 3cf95a6..988b26f 100644 --- a/server/internal/controller/controller.go +++ b/server/internal/controller/controller.go @@ -3,13 +3,14 @@ package controller import ( "errors" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" "galaxy/model/order" "galaxy/model/report" - "github.com/iliadenisov/galaxy/server/internal/repo" + "galaxy/server/internal/repo" ) type Configurer func(*Param) diff --git a/server/internal/controller/controller_export_test.go b/server/internal/controller/controller_export_test.go index fb4ffd4..40fcca0 100644 --- a/server/internal/controller/controller_export_test.go +++ b/server/internal/controller/controller_export_test.go @@ -5,8 +5,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) CreateShips(ri int, shipTypeName string, planetNumber uint, quantity int) error { diff --git a/server/internal/controller/controller_test.go b/server/internal/controller/controller_test.go index 0871e54..b0b2946 100644 --- a/server/internal/controller/controller_test.go +++ b/server/internal/controller/controller_test.go @@ -3,9 +3,10 @@ package controller_test import ( "fmt" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) var ( diff --git a/server/internal/controller/fleet.go b/server/internal/controller/fleet.go index 14d9e79..08c0d63 100644 --- a/server/internal/controller/fleet.go +++ b/server/internal/controller/fleet.go @@ -10,8 +10,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) var fleetStateNil = game.ShipGroupState("-") diff --git a/server/internal/controller/fleet_send.go b/server/internal/controller/fleet_send.go index ca22717..49dc512 100644 --- a/server/internal/controller/fleet_send.go +++ b/server/internal/controller/fleet_send.go @@ -5,7 +5,7 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" ) func (c *Cache) FleetSend(ri, fi int, planetNumber uint) error { diff --git a/server/internal/controller/fleet_send_test.go b/server/internal/controller/fleet_send_test.go index 39e5b1f..6c8b3d2 100644 --- a/server/internal/controller/fleet_send_test.go +++ b/server/internal/controller/fleet_send_test.go @@ -6,7 +6,8 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/fleet_test.go b/server/internal/controller/fleet_test.go index e7b678b..d12e468 100644 --- a/server/internal/controller/fleet_test.go +++ b/server/internal/controller/fleet_test.go @@ -7,8 +7,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/generate_game.go b/server/internal/controller/generate_game.go index 737a0cc..96cde46 100644 --- a/server/internal/controller/generate_game.go +++ b/server/internal/controller/generate_game.go @@ -5,9 +5,10 @@ import ( "math/rand/v2" "slices" + "galaxy/server/internal/generator" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/generator" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func NewGame(r Repo, races []string) (uuid.UUID, error) { diff --git a/server/internal/controller/generate_game_test.go b/server/internal/controller/generate_game_test.go index d5efbf8..258631b 100644 --- a/server/internal/controller/generate_game_test.go +++ b/server/internal/controller/generate_game_test.go @@ -8,10 +8,11 @@ import ( "galaxy/util" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "galaxy/server/internal/repo" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" - "github.com/iliadenisov/galaxy/server/internal/repo" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/generate_turn.go b/server/internal/controller/generate_turn.go index 2d87e62..42a4702 100644 --- a/server/internal/controller/generate_turn.go +++ b/server/internal/controller/generate_turn.go @@ -6,8 +6,9 @@ import ( "galaxy/model/report" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Controller) MakeTurn() error { diff --git a/server/internal/controller/order.go b/server/internal/controller/order.go index 1244604..53a12a7 100644 --- a/server/internal/controller/order.go +++ b/server/internal/controller/order.go @@ -8,8 +8,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Controller) ValidateOrder(actor string, commands ...order.DecodableCommand) (err error) { diff --git a/server/internal/controller/planet.go b/server/internal/controller/planet.go index 1927cea..21bbb35 100644 --- a/server/internal/controller/planet.go +++ b/server/internal/controller/planet.go @@ -9,8 +9,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) PlanetRename(ri int, number int, name string) error { diff --git a/server/internal/controller/planet_test.go b/server/internal/controller/planet_test.go index 36c1667..dea09f5 100644 --- a/server/internal/controller/planet_test.go +++ b/server/internal/controller/planet_test.go @@ -8,9 +8,10 @@ import ( e "galaxy/error" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/race.go b/server/internal/controller/race.go index b910860..aaa906a 100644 --- a/server/internal/controller/race.go +++ b/server/internal/controller/race.go @@ -7,7 +7,7 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" ) func (c *Cache) Relation(r1, r2 int) game.Relation { diff --git a/server/internal/controller/race_test.go b/server/internal/controller/race_test.go index 9e3f177..7411954 100644 --- a/server/internal/controller/race_test.go +++ b/server/internal/controller/race_test.go @@ -5,7 +5,8 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/report.go b/server/internal/controller/report.go index be2064c..75e462c 100644 --- a/server/internal/controller/report.go +++ b/server/internal/controller/report.go @@ -10,8 +10,9 @@ import ( "galaxy/util" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) Report(t uint, battles []*mr.BattleReport, bombings []*mr.Bombing) iter.Seq[*mr.Report] { diff --git a/server/internal/controller/route.go b/server/internal/controller/route.go index 44dd438..474f9c2 100644 --- a/server/internal/controller/route.go +++ b/server/internal/controller/route.go @@ -12,7 +12,7 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" ) func (c *Cache) PlanetRouteSet(ri int, rt game.RouteType, origin, destination uint) error { diff --git a/server/internal/controller/route_test.go b/server/internal/controller/route_test.go index e887775..dc40b20 100644 --- a/server/internal/controller/route_test.go +++ b/server/internal/controller/route_test.go @@ -6,8 +6,8 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/science.go b/server/internal/controller/science.go index 2cd2f17..b97adca 100644 --- a/server/internal/controller/science.go +++ b/server/internal/controller/science.go @@ -8,8 +8,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) ScienceCreate(ri int, name string, drive, weapons, shileds, cargo float64) error { diff --git a/server/internal/controller/science_test.go b/server/internal/controller/science_test.go index 4ef7730..eb00b63 100644 --- a/server/internal/controller/science_test.go +++ b/server/internal/controller/science_test.go @@ -5,9 +5,10 @@ import ( e "galaxy/error" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/ship_class.go b/server/internal/controller/ship_class.go index eedbed8..c01dafd 100644 --- a/server/internal/controller/ship_class.go +++ b/server/internal/controller/ship_class.go @@ -9,8 +9,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) ShipClassCreate(ri int, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error { diff --git a/server/internal/controller/ship_group.go b/server/internal/controller/ship_group.go index 26a2ac0..1c1e6ee 100644 --- a/server/internal/controller/ship_group.go +++ b/server/internal/controller/ship_group.go @@ -11,8 +11,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) // ShipGroup is a proxy func, nothing to cache diff --git a/server/internal/controller/ship_group_move.go b/server/internal/controller/ship_group_move.go index 0894827..d91ceb7 100644 --- a/server/internal/controller/ship_group_move.go +++ b/server/internal/controller/ship_group_move.go @@ -6,7 +6,7 @@ import ( "galaxy/util" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" ) func (c *Cache) MoveShipGroups() { diff --git a/server/internal/controller/ship_group_move_test.go b/server/internal/controller/ship_group_move_test.go index 0804897..0a6b597 100644 --- a/server/internal/controller/ship_group_move_test.go +++ b/server/internal/controller/ship_group_move_test.go @@ -4,7 +4,8 @@ import ( "slices" "testing" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/ship_group_send.go b/server/internal/controller/ship_group_send.go index dc67ed7..8224faa 100644 --- a/server/internal/controller/ship_group_send.go +++ b/server/internal/controller/ship_group_send.go @@ -5,8 +5,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) shipGroupSend(ri int, groupID uuid.UUID, planetNumber uint) error { diff --git a/server/internal/controller/ship_group_send_test.go b/server/internal/controller/ship_group_send_test.go index b45689a..6d46896 100644 --- a/server/internal/controller/ship_group_send_test.go +++ b/server/internal/controller/ship_group_send_test.go @@ -7,7 +7,8 @@ import ( "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/ship_group_test.go b/server/internal/controller/ship_group_test.go index 956566f..df69694 100644 --- a/server/internal/controller/ship_group_test.go +++ b/server/internal/controller/ship_group_test.go @@ -10,8 +10,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/ship_group_upgrade.go b/server/internal/controller/ship_group_upgrade.go index 025e9c0..a2e4e10 100644 --- a/server/internal/controller/ship_group_upgrade.go +++ b/server/internal/controller/ship_group_upgrade.go @@ -7,8 +7,9 @@ import ( e "galaxy/error" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) shipGroupUpgrade(ri int, groupID uuid.UUID, techInput string, limitLevel float64) error { diff --git a/server/internal/controller/ship_group_upgrade_test.go b/server/internal/controller/ship_group_upgrade_test.go index b0c9049..58279e6 100644 --- a/server/internal/controller/ship_group_upgrade_test.go +++ b/server/internal/controller/ship_group_upgrade_test.go @@ -5,10 +5,11 @@ import ( e "galaxy/error" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + g "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" - g "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/controller/vote.go b/server/internal/controller/vote.go index 60c27c3..a76620d 100644 --- a/server/internal/controller/vote.go +++ b/server/internal/controller/vote.go @@ -7,8 +7,9 @@ import ( "math/big" "slices" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) type VoteGroup struct { diff --git a/server/internal/controller/vote_test.go b/server/internal/controller/vote_test.go index 9f85681..d6feae3 100644 --- a/server/internal/controller/vote_test.go +++ b/server/internal/controller/vote_test.go @@ -3,9 +3,10 @@ package controller_test import ( "testing" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/generator/generator_test.go b/server/internal/generator/generator_test.go index 1148ddf..8a3fcdc 100644 --- a/server/internal/generator/generator_test.go +++ b/server/internal/generator/generator_test.go @@ -4,7 +4,8 @@ import ( "fmt" "testing" - "github.com/iliadenisov/galaxy/server/internal/generator" + "galaxy/server/internal/generator" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/generator/map.go b/server/internal/generator/map.go index 16090b3..257553b 100644 --- a/server/internal/generator/map.go +++ b/server/internal/generator/map.go @@ -6,7 +6,7 @@ import ( "galaxy/util" - "github.com/iliadenisov/galaxy/server/internal/generator/plotter" + "galaxy/server/internal/generator/plotter" ) type Map struct { diff --git a/server/internal/generator/planet_test.go b/server/internal/generator/planet_test.go index 5a2b58f..0bfe300 100644 --- a/server/internal/generator/planet_test.go +++ b/server/internal/generator/planet_test.go @@ -4,7 +4,8 @@ import ( "regexp" "testing" - g "github.com/iliadenisov/galaxy/server/internal/generator" + g "galaxy/server/internal/generator" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/generator/plotter/plotter.go b/server/internal/generator/plotter/plotter.go index ea9b9d7..98fa68c 100644 --- a/server/internal/generator/plotter/plotter.go +++ b/server/internal/generator/plotter/plotter.go @@ -6,7 +6,7 @@ import ( "math" "math/rand" - "github.com/iliadenisov/galaxy/server/internal/bitmap" + "galaxy/server/internal/bitmap" ) type Plotter struct { diff --git a/server/internal/generator/plotter/plotter_test.go b/server/internal/generator/plotter/plotter_test.go index a0342c9..17dc7e6 100644 --- a/server/internal/generator/plotter/plotter_test.go +++ b/server/internal/generator/plotter/plotter_test.go @@ -3,7 +3,7 @@ package plotter_test import ( "testing" - "github.com/iliadenisov/galaxy/server/internal/generator/plotter" + "galaxy/server/internal/generator/plotter" ) func TestNewPlotter(t *testing.T) { diff --git a/server/internal/model/game/game_test.go b/server/internal/model/game/game_test.go index 6f2954f..09c7a7b 100644 --- a/server/internal/model/game/game_test.go +++ b/server/internal/model/game/game_test.go @@ -3,7 +3,8 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/model/game/group_test.go b/server/internal/model/game/group_test.go index b17cacb..f47408e 100644 --- a/server/internal/model/game/group_test.go +++ b/server/internal/model/game/group_test.go @@ -6,8 +6,9 @@ import ( "galaxy/util" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/model/game/planet_test.go b/server/internal/model/game/planet_test.go index cdeea5f..f2cd497 100644 --- a/server/internal/model/game/planet_test.go +++ b/server/internal/model/game/planet_test.go @@ -3,7 +3,8 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/model/game/race_test.go b/server/internal/model/game/race_test.go index fab1d02..e920b25 100644 --- a/server/internal/model/game/race_test.go +++ b/server/internal/model/game/race_test.go @@ -3,7 +3,8 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/model/game/ship_test.go b/server/internal/model/game/ship_test.go index b743338..319be2c 100644 --- a/server/internal/model/game/ship_test.go +++ b/server/internal/model/game/ship_test.go @@ -3,7 +3,8 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/server/internal/model/game" + "galaxy/server/internal/model/game" + "github.com/stretchr/testify/assert" ) diff --git a/server/internal/repo/game.go b/server/internal/repo/game.go index 0ab5842..d5dc341 100644 --- a/server/internal/repo/game.go +++ b/server/internal/repo/game.go @@ -18,8 +18,9 @@ import ( "galaxy/model/order" "galaxy/model/report" + "galaxy/server/internal/model/game" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) const ( diff --git a/server/internal/repo/repo.go b/server/internal/repo/repo.go index 4a7f15e..a81068d 100644 --- a/server/internal/repo/repo.go +++ b/server/internal/repo/repo.go @@ -6,7 +6,7 @@ import ( e "galaxy/error" - "github.com/iliadenisov/galaxy/server/internal/repo/fs" + "galaxy/server/internal/repo/fs" ) func NewStorageError(err error) error { diff --git a/server/internal/repo/repo_test.go b/server/internal/repo/repo_test.go index 652f3c3..7fe672d 100644 --- a/server/internal/repo/repo_test.go +++ b/server/internal/repo/repo_test.go @@ -6,9 +6,10 @@ import ( "galaxy/model/order" + "galaxy/server/internal/repo" + "galaxy/server/internal/repo/fs" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/repo" - "github.com/iliadenisov/galaxy/server/internal/repo/fs" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/router/handler/command.go b/server/internal/router/handler/command.go index d12c7d4..0190b17 100644 --- a/server/internal/router/handler/command.go +++ b/server/internal/router/handler/command.go @@ -6,9 +6,10 @@ import ( "fmt" "net/http" + "galaxy/server/internal/controller" + "github.com/go-playground/validator/v10" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" "galaxy/model/order" "galaxy/model/rest" diff --git a/server/internal/router/handler/handler.go b/server/internal/router/handler/handler.go index 26e0aea..b7a9493 100644 --- a/server/internal/router/handler/handler.go +++ b/server/internal/router/handler/handler.go @@ -10,10 +10,11 @@ import ( e "galaxy/error" + "galaxy/server/internal/controller" + "galaxy/server/internal/model/game" + "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/model/game" ) type CommandExecutor interface { diff --git a/server/internal/router/handler/order.go b/server/internal/router/handler/order.go index 3055461..dea1e8e 100644 --- a/server/internal/router/handler/order.go +++ b/server/internal/router/handler/order.go @@ -7,8 +7,9 @@ import ( "galaxy/model/order" "galaxy/model/rest" + "galaxy/server/internal/repo" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/server/internal/repo" ) func OrderHandler(c *gin.Context, executor CommandExecutor) { diff --git a/server/internal/router/init_test.go b/server/internal/router/init_test.go index 33e39b0..5b2acaa 100644 --- a/server/internal/router/init_test.go +++ b/server/internal/router/init_test.go @@ -10,10 +10,11 @@ import ( "galaxy/util" + "galaxy/server/internal/controller" + "galaxy/server/internal/router" + "galaxy/server/internal/router/handler" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/router" - "github.com/iliadenisov/galaxy/server/internal/router/handler" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/router/router.go b/server/internal/router/router.go index 52c257c..2e5441c 100644 --- a/server/internal/router/router.go +++ b/server/internal/router/router.go @@ -6,10 +6,11 @@ import ( "net/http" "os" + "galaxy/server/internal/router/handler" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/validator/v10" - "github.com/iliadenisov/galaxy/server/internal/router/handler" ) const ( diff --git a/server/internal/router/router_export_test.go b/server/internal/router/router_export_test.go index 55b41ad..31d4fa6 100644 --- a/server/internal/router/router_export_test.go +++ b/server/internal/router/router_export_test.go @@ -1,8 +1,9 @@ package router import ( + "galaxy/server/internal/router/handler" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/server/internal/router/handler" ) func SetupRouter(e handler.CommandExecutor) *gin.Engine { diff --git a/server/internal/router/router_helper_test.go b/server/internal/router/router_helper_test.go index ad71f3a..e2aef3a 100644 --- a/server/internal/router/router_helper_test.go +++ b/server/internal/router/router_helper_test.go @@ -7,10 +7,11 @@ import ( "galaxy/model/order" "galaxy/model/rest" + "galaxy/server/internal/router" + "galaxy/server/internal/router/handler" + "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/router" - "github.com/iliadenisov/galaxy/server/internal/router/handler" ) var ( diff --git a/server/internal/router/router_test.go b/server/internal/router/router_test.go index 20656d3..1fe050e 100644 --- a/server/internal/router/router_test.go +++ b/server/internal/router/router_test.go @@ -12,8 +12,9 @@ import ( "galaxy/model/rest" + "galaxy/server/internal/router" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/server/internal/router" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/router/status_test.go b/server/internal/router/status_test.go index 4c80941..4de4fc6 100644 --- a/server/internal/router/status_test.go +++ b/server/internal/router/status_test.go @@ -10,10 +10,11 @@ import ( "galaxy/util" + "galaxy/server/internal/controller" + "galaxy/server/internal/router" + "galaxy/server/internal/router/handler" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/router" - "github.com/iliadenisov/galaxy/server/internal/router/handler" "github.com/stretchr/testify/assert" ) diff --git a/server/internal/router/turn_test.go b/server/internal/router/turn_test.go index e6517a8..6d7bb23 100644 --- a/server/internal/router/turn_test.go +++ b/server/internal/router/turn_test.go @@ -10,10 +10,11 @@ import ( "galaxy/util" + "galaxy/server/internal/controller" + "galaxy/server/internal/router" + "galaxy/server/internal/router/handler" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/server/internal/controller" - "github.com/iliadenisov/galaxy/server/internal/router" - "github.com/iliadenisov/galaxy/server/internal/router/handler" "github.com/stretchr/testify/assert" )