diff --git a/client/go.mod b/client/go.mod new file mode 100644 index 0000000..ab8f2a9 --- /dev/null +++ b/client/go.mod @@ -0,0 +1,3 @@ +module github.com/iliadenisov/galaxy/client + +go 1.26.0 diff --git a/internal/error/generic.go b/error/generic.go similarity index 100% rename from internal/error/generic.go rename to error/generic.go diff --git a/internal/error/generic_test.go b/error/generic_test.go similarity index 100% rename from internal/error/generic_test.go rename to error/generic_test.go diff --git a/error/go.mod b/error/go.mod new file mode 100644 index 0000000..b2a4fd8 --- /dev/null +++ b/error/go.mod @@ -0,0 +1,11 @@ +module galaxy/error + +go 1.26.0 + +require github.com/stretchr/testify v1.11.1 + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/error/go.sum b/error/go.sum new file mode 100644 index 0000000..c4c1710 --- /dev/null +++ b/error/go.sum @@ -0,0 +1,10 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/error/input.go b/error/input.go similarity index 100% rename from internal/error/input.go rename to error/input.go diff --git a/internal/error/repo.go b/error/repo.go similarity index 100% rename from internal/error/repo.go rename to error/repo.go diff --git a/internal/error/state.go b/error/state.go similarity index 100% rename from internal/error/state.go rename to error/state.go diff --git a/go.work b/go.work new file mode 100644 index 0000000..95f14dc --- /dev/null +++ b/go.work @@ -0,0 +1,15 @@ +go 1.26.0 + +use ( + ./client + ./error + ./model + ./server + ./util +) + +replace ( + galaxy/error v0.0.0 => ./error + galaxy/model v0.0.0 => ./model + galaxy/util v0.0.0 => ./util +) diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000..302e2e1 --- /dev/null +++ b/go.work.sum @@ -0,0 +1,14 @@ +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= +golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/model/go.mod b/model/go.mod new file mode 100644 index 0000000..0b5ea0c --- /dev/null +++ b/model/go.mod @@ -0,0 +1,3 @@ +module galaxy/model + +go 1.26.0 diff --git a/internal/model/order/order.go b/model/order/order.go similarity index 100% rename from internal/model/order/order.go rename to model/order/order.go diff --git a/internal/model/report/battle.go b/model/report/battle.go similarity index 100% rename from internal/model/report/battle.go rename to model/report/battle.go diff --git a/internal/model/report/bombing.go b/model/report/bombing.go similarity index 100% rename from internal/model/report/bombing.go rename to model/report/bombing.go diff --git a/internal/model/report/planet.go b/model/report/planet.go similarity index 100% rename from internal/model/report/planet.go rename to model/report/planet.go diff --git a/internal/model/report/report.go b/model/report/report.go similarity index 98% rename from internal/model/report/report.go rename to model/report/report.go index a8acb65..1a0d98e 100644 --- a/internal/model/report/report.go +++ b/model/report/report.go @@ -3,8 +3,9 @@ package report import ( "encoding/json" + n "galaxy/util" + "github.com/google/uuid" - n "github.com/iliadenisov/galaxy/internal/number" ) type Float float64 diff --git a/internal/model/report/science.go b/model/report/science.go similarity index 100% rename from internal/model/report/science.go rename to model/report/science.go diff --git a/internal/model/report/ship.go b/model/report/ship.go similarity index 100% rename from internal/model/report/ship.go rename to model/report/ship.go diff --git a/internal/model/rest/command.go b/model/rest/command.go similarity index 100% rename from internal/model/rest/command.go rename to model/rest/command.go diff --git a/internal/model/rest/init.go b/model/rest/init.go similarity index 100% rename from internal/model/rest/init.go rename to model/rest/init.go diff --git a/internal/model/rest/status.go b/model/rest/status.go similarity index 100% rename from internal/model/rest/status.go rename to model/rest/status.go diff --git a/cmd/http/main.go b/server/cmd/http/main.go similarity index 74% rename from cmd/http/main.go rename to server/cmd/http/main.go index 4d715e6..940d167 100644 --- a/cmd/http/main.go +++ b/server/cmd/http/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/iliadenisov/galaxy/internal/router" + "github.com/iliadenisov/galaxy/server/internal/router" ) func main() { diff --git a/go.mod b/server/go.mod similarity index 97% rename from go.mod rename to server/go.mod index 2c7fb3b..a6a3e08 100644 --- a/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/iliadenisov/galaxy +module github.com/iliadenisov/galaxy/server go 1.26.0 diff --git a/go.sum b/server/go.sum similarity index 100% rename from go.sum rename to server/go.sum diff --git a/internal/bitmap/assets_test/circle_case_00.txt b/server/internal/bitmap/assets_test/circle_case_00.txt similarity index 100% rename from internal/bitmap/assets_test/circle_case_00.txt rename to server/internal/bitmap/assets_test/circle_case_00.txt diff --git a/internal/bitmap/assets_test/circle_case_01.txt b/server/internal/bitmap/assets_test/circle_case_01.txt similarity index 100% rename from internal/bitmap/assets_test/circle_case_01.txt rename to server/internal/bitmap/assets_test/circle_case_01.txt diff --git a/internal/bitmap/assets_test/circle_case_02.txt b/server/internal/bitmap/assets_test/circle_case_02.txt similarity index 100% rename from internal/bitmap/assets_test/circle_case_02.txt rename to server/internal/bitmap/assets_test/circle_case_02.txt diff --git a/internal/bitmap/assets_test/circle_case_03.txt b/server/internal/bitmap/assets_test/circle_case_03.txt similarity index 100% rename from internal/bitmap/assets_test/circle_case_03.txt rename to server/internal/bitmap/assets_test/circle_case_03.txt diff --git a/internal/bitmap/assets_test/circle_case_04.txt b/server/internal/bitmap/assets_test/circle_case_04.txt similarity index 100% rename from internal/bitmap/assets_test/circle_case_04.txt rename to server/internal/bitmap/assets_test/circle_case_04.txt diff --git a/internal/bitmap/bitmap.go b/server/internal/bitmap/bitmap.go similarity index 100% rename from internal/bitmap/bitmap.go rename to server/internal/bitmap/bitmap.go diff --git a/internal/bitmap/bitmap_test.go b/server/internal/bitmap/bitmap_test.go similarity index 98% rename from internal/bitmap/bitmap_test.go rename to server/internal/bitmap/bitmap_test.go index 22104bb..ebf2624 100644 --- a/internal/bitmap/bitmap_test.go +++ b/server/internal/bitmap/bitmap_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/iliadenisov/galaxy/internal/bitmap" + "github.com/iliadenisov/galaxy/server/internal/bitmap" ) func TestBitVectorSize(t *testing.T) { diff --git a/internal/bitmap/export_test.go b/server/internal/bitmap/export_test.go similarity index 100% rename from internal/bitmap/export_test.go rename to server/internal/bitmap/export_test.go diff --git a/internal/controller/battle.go b/server/internal/controller/battle.go similarity index 99% rename from internal/controller/battle.go rename to server/internal/controller/battle.go index 86b75c6..2e04435 100644 --- a/internal/controller/battle.go +++ b/server/internal/controller/battle.go @@ -8,7 +8,7 @@ import ( "slices" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) type Battle struct { diff --git a/internal/controller/battle_test.go b/server/internal/controller/battle_test.go similarity index 98% rename from internal/controller/battle_test.go rename to server/internal/controller/battle_test.go index 8850dc0..85e9661 100644 --- a/internal/controller/battle_test.go +++ b/server/internal/controller/battle_test.go @@ -5,8 +5,8 @@ import ( "slices" "testing" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/battle_transform.go b/server/internal/controller/battle_transform.go similarity index 97% rename from internal/controller/battle_transform.go rename to server/internal/controller/battle_transform.go index 0043c45..9df3041 100644 --- a/internal/controller/battle_transform.go +++ b/server/internal/controller/battle_transform.go @@ -1,8 +1,9 @@ package controller import ( + "galaxy/model/report" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/report" ) func TransformBattle(c *Cache, b *Battle) *report.BattleReport { diff --git a/internal/controller/bombing.go b/server/internal/controller/bombing.go similarity index 98% rename from internal/controller/bombing.go rename to server/internal/controller/bombing.go index d3eaa12..0508ef2 100644 --- a/internal/controller/bombing.go +++ b/server/internal/controller/bombing.go @@ -2,7 +2,7 @@ package controller import ( "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) ProduceBombings() []*game.Bombing { diff --git a/internal/controller/bombing_test.go b/server/internal/controller/bombing_test.go similarity index 97% rename from internal/controller/bombing_test.go rename to server/internal/controller/bombing_test.go index 6d50969..76ce285 100644 --- a/internal/controller/bombing_test.go +++ b/server/internal/controller/bombing_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/cache.go b/server/internal/controller/cache.go similarity index 97% rename from internal/controller/cache.go rename to server/internal/controller/cache.go index 60d9e4c..05de5b5 100644 --- a/internal/controller/cache.go +++ b/server/internal/controller/cache.go @@ -5,7 +5,7 @@ import ( "slices" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) type Cache struct { diff --git a/internal/controller/command.go b/server/internal/controller/command.go similarity index 98% rename from internal/controller/command.go rename to server/internal/controller/command.go index f38a5fd..c73e768 100644 --- a/internal/controller/command.go +++ b/server/internal/controller/command.go @@ -3,9 +3,10 @@ package controller import ( "strings" + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "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/internal/controller/controller.go b/server/internal/controller/controller.go similarity index 96% rename from internal/controller/controller.go rename to server/internal/controller/controller.go index 0a72b28..3cf95a6 100644 --- a/internal/controller/controller.go +++ b/server/internal/controller/controller.go @@ -4,10 +4,12 @@ import ( "errors" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/report" - "github.com/iliadenisov/galaxy/internal/repo" + "github.com/iliadenisov/galaxy/server/internal/model/game" + + "galaxy/model/order" + "galaxy/model/report" + + "github.com/iliadenisov/galaxy/server/internal/repo" ) type Configurer func(*Param) diff --git a/internal/controller/controller_export_test.go b/server/internal/controller/controller_export_test.go similarity index 97% rename from internal/controller/controller_export_test.go rename to server/internal/controller/controller_export_test.go index 6c528d7..fb4ffd4 100644 --- a/internal/controller/controller_export_test.go +++ b/server/internal/controller/controller_export_test.go @@ -3,9 +3,10 @@ package controller import ( "iter" + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) CreateShips(ri int, shipTypeName string, planetNumber uint, quantity int) error { diff --git a/internal/controller/controller_test.go b/server/internal/controller/controller_test.go similarity index 97% rename from internal/controller/controller_test.go rename to server/internal/controller/controller_test.go index a27e0ad..0871e54 100644 --- a/internal/controller/controller_test.go +++ b/server/internal/controller/controller_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) var ( diff --git a/internal/controller/fleet.go b/server/internal/controller/fleet.go similarity index 98% rename from internal/controller/fleet.go rename to server/internal/controller/fleet.go index 52002f3..14d9e79 100644 --- a/internal/controller/fleet.go +++ b/server/internal/controller/fleet.go @@ -6,10 +6,12 @@ import ( "math" "slices" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) var fleetStateNil = game.ShipGroupState("-") diff --git a/internal/controller/fleet_send.go b/server/internal/controller/fleet_send.go similarity index 91% rename from internal/controller/fleet_send.go rename to server/internal/controller/fleet_send.go index 719ae0d..ca22717 100644 --- a/internal/controller/fleet_send.go +++ b/server/internal/controller/fleet_send.go @@ -1,9 +1,11 @@ package controller import ( - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) FleetSend(ri, fi int, planetNumber uint) error { diff --git a/internal/controller/fleet_send_test.go b/server/internal/controller/fleet_send_test.go similarity index 97% rename from internal/controller/fleet_send_test.go rename to server/internal/controller/fleet_send_test.go index 6bfaa67..39e5b1f 100644 --- a/internal/controller/fleet_send_test.go +++ b/server/internal/controller/fleet_send_test.go @@ -4,8 +4,9 @@ import ( "slices" "testing" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/fleet_test.go b/server/internal/controller/fleet_test.go similarity index 98% rename from internal/controller/fleet_test.go rename to server/internal/controller/fleet_test.go index 9a33723..e7b678b 100644 --- a/internal/controller/fleet_test.go +++ b/server/internal/controller/fleet_test.go @@ -5,9 +5,10 @@ import ( "slices" "testing" + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/generate_game.go b/server/internal/controller/generate_game.go similarity index 96% rename from internal/controller/generate_game.go rename to server/internal/controller/generate_game.go index eb99ed8..737a0cc 100644 --- a/internal/controller/generate_game.go +++ b/server/internal/controller/generate_game.go @@ -6,8 +6,8 @@ import ( "slices" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/generator" - "github.com/iliadenisov/galaxy/internal/model/game" + "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/internal/controller/generate_game_test.go b/server/internal/controller/generate_game_test.go similarity index 88% rename from internal/controller/generate_game_test.go rename to server/internal/controller/generate_game_test.go index 7a0e51d..d5efbf8 100644 --- a/internal/controller/generate_game_test.go +++ b/server/internal/controller/generate_game_test.go @@ -6,11 +6,12 @@ import ( "strings" "testing" + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/repo" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/controller/generate_turn.go b/server/internal/controller/generate_turn.go similarity index 97% rename from internal/controller/generate_turn.go rename to server/internal/controller/generate_turn.go index f1cb6bc..2d87e62 100644 --- a/internal/controller/generate_turn.go +++ b/server/internal/controller/generate_turn.go @@ -4,9 +4,10 @@ import ( "maps" "slices" + "galaxy/model/report" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/model/report" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Controller) MakeTurn() error { diff --git a/internal/controller/order.go b/server/internal/controller/order.go similarity index 98% rename from internal/controller/order.go rename to server/internal/controller/order.go index 740074d..1244604 100644 --- a/internal/controller/order.go +++ b/server/internal/controller/order.go @@ -4,10 +4,12 @@ import ( "errors" "fmt" + "galaxy/model/order" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/model/order" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Controller) ValidateOrder(actor string, commands ...order.DecodableCommand) (err error) { diff --git a/internal/controller/planet.go b/server/internal/controller/planet.go similarity index 97% rename from internal/controller/planet.go rename to server/internal/controller/planet.go index 927c3ee..1927cea 100644 --- a/internal/controller/planet.go +++ b/server/internal/controller/planet.go @@ -5,11 +5,12 @@ import ( "iter" "slices" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/number" - "github.com/iliadenisov/galaxy/internal/util" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) PlanetRename(ri int, number int, name string) error { @@ -184,7 +185,7 @@ func (c *Cache) TurnPlanetProductions() { cost := sg.StateUpgrade.Cost() if productionAvailable >= cost { for i := range sg.StateUpgrade.UpgradeTech { - sg.Tech = sg.Tech.Set(sg.StateUpgrade.UpgradeTech[i].Tech, number.Fixed3(sg.StateUpgrade.UpgradeTech[i].Level.F())) + sg.Tech = sg.Tech.Set(sg.StateUpgrade.UpgradeTech[i].Tech, util.Fixed3(sg.StateUpgrade.UpgradeTech[i].Level.F())) } productionAvailable -= cost } diff --git a/internal/controller/planet_test.go b/server/internal/controller/planet_test.go similarity index 98% rename from internal/controller/planet_test.go rename to server/internal/controller/planet_test.go index 26ea51b..36c1667 100644 --- a/internal/controller/planet_test.go +++ b/server/internal/controller/planet_test.go @@ -4,11 +4,13 @@ import ( "slices" "testing" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/number" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) @@ -280,7 +282,7 @@ func TestProduceShip(t *testing.T) { (&hw).Material = 900. // no material deficit r = controller.ProduceShip(&hw, hw.ProductionCapacity(), BattleShip.EmptyMass()) assert.Equal(t, uint(1), r) - assert.Equal(t, number.Fixed12(1./9.), (*hw.Production.Progress).F()) + assert.Equal(t, util.Fixed12(1./9.), (*hw.Production.Progress).F()) // // real report data diff --git a/internal/controller/race.go b/server/internal/controller/race.go similarity index 97% rename from internal/controller/race.go rename to server/internal/controller/race.go index 8f3bb76..b910860 100644 --- a/internal/controller/race.go +++ b/server/internal/controller/race.go @@ -5,9 +5,9 @@ import ( "iter" "slices" - e "github.com/iliadenisov/galaxy/internal/error" + e "galaxy/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) Relation(r1, r2 int) game.Relation { diff --git a/internal/controller/race_test.go b/server/internal/controller/race_test.go similarity index 96% rename from internal/controller/race_test.go rename to server/internal/controller/race_test.go index 46c082f..9e3f177 100644 --- a/internal/controller/race_test.go +++ b/server/internal/controller/race_test.go @@ -3,8 +3,9 @@ package controller_test import ( "testing" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/report.go b/server/internal/controller/report.go similarity index 99% rename from internal/controller/report.go rename to server/internal/controller/report.go index 4de5ee4..be2064c 100644 --- a/internal/controller/report.go +++ b/server/internal/controller/report.go @@ -6,10 +6,12 @@ import ( "iter" "slices" + mr "galaxy/model/report" + + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" - mr "github.com/iliadenisov/galaxy/internal/model/report" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/controller/report_test.go b/server/internal/controller/report_test.go similarity index 98% rename from internal/controller/report_test.go rename to server/internal/controller/report_test.go index 008583e..78618cc 100644 --- a/internal/controller/report_test.go +++ b/server/internal/controller/report_test.go @@ -3,7 +3,7 @@ package controller_test import ( "testing" - "github.com/iliadenisov/galaxy/internal/model/report" + "galaxy/model/report" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/route.go b/server/internal/controller/route.go similarity index 98% rename from internal/controller/route.go rename to server/internal/controller/route.go index f8342a2..44dd438 100644 --- a/internal/controller/route.go +++ b/server/internal/controller/route.go @@ -8,9 +8,11 @@ import ( "math/rand/v2" "slices" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) PlanetRouteSet(ri int, rt game.RouteType, origin, destination uint) error { diff --git a/internal/controller/route_test.go b/server/internal/controller/route_test.go similarity index 99% rename from internal/controller/route_test.go rename to server/internal/controller/route_test.go index 114f4e3..e887775 100644 --- a/internal/controller/route_test.go +++ b/server/internal/controller/route_test.go @@ -4,9 +4,10 @@ import ( "slices" "testing" - "github.com/iliadenisov/galaxy/internal/controller" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/science.go b/server/internal/controller/science.go similarity index 94% rename from internal/controller/science.go rename to server/internal/controller/science.go index 6e5d232..2cd2f17 100644 --- a/internal/controller/science.go +++ b/server/internal/controller/science.go @@ -4,10 +4,12 @@ import ( "fmt" "slices" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/controller/science_test.go b/server/internal/controller/science_test.go similarity index 97% rename from internal/controller/science_test.go rename to server/internal/controller/science_test.go index 565995d..4ef7730 100644 --- a/internal/controller/science_test.go +++ b/server/internal/controller/science_test.go @@ -3,10 +3,11 @@ package controller_test import ( "testing" + e "galaxy/error" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/ship_class.go b/server/internal/controller/ship_class.go similarity index 97% rename from internal/controller/ship_class.go rename to server/internal/controller/ship_class.go index a4af175..eedbed8 100644 --- a/internal/controller/ship_class.go +++ b/server/internal/controller/ship_class.go @@ -5,10 +5,12 @@ import ( "iter" "slices" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/controller/ship_class_test.go b/server/internal/controller/ship_class_test.go similarity index 99% rename from internal/controller/ship_class_test.go rename to server/internal/controller/ship_class_test.go index 15fcf06..e04f165 100644 --- a/internal/controller/ship_class_test.go +++ b/server/internal/controller/ship_class_test.go @@ -5,7 +5,8 @@ import ( "strconv" "testing" - e "github.com/iliadenisov/galaxy/internal/error" + e "galaxy/error" + "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/ship_group.go b/server/internal/controller/ship_group.go similarity index 97% rename from internal/controller/ship_group.go rename to server/internal/controller/ship_group.go index c23db4c..26a2ac0 100644 --- a/internal/controller/ship_group.go +++ b/server/internal/controller/ship_group.go @@ -7,11 +7,12 @@ import ( "maps" "slices" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/number" - "github.com/iliadenisov/galaxy/internal/util" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) // ShipGroup is a proxy func, nothing to cache @@ -526,16 +527,16 @@ func (c *Cache) unsafeCreateShips(ri int, classID uuid.UUID, planet uint, quanti st := c.MustShipType(ri, classID) level := func(t game.Tech) float64 { if t == game.TechDrive && st.DriveBlockMass() > 0 { - return number.Fixed3(c.g.Race[ri].TechLevel(game.TechDrive)) + return util.Fixed3(c.g.Race[ri].TechLevel(game.TechDrive)) } if t == game.TechWeapons && st.WeaponsBlockMass() > 0 { - return number.Fixed3(c.g.Race[ri].TechLevel(game.TechWeapons)) + return util.Fixed3(c.g.Race[ri].TechLevel(game.TechWeapons)) } if t == game.TechShields && st.ShieldsBlockMass() > 0 { - return number.Fixed3(c.g.Race[ri].TechLevel(game.TechShields)) + return util.Fixed3(c.g.Race[ri].TechLevel(game.TechShields)) } if t == game.TechCargo && st.CargoBlockMass() > 0 { - return number.Fixed3(c.g.Race[ri].TechLevel(game.TechCargo)) + return util.Fixed3(c.g.Race[ri].TechLevel(game.TechCargo)) } return 0 } diff --git a/internal/controller/ship_group_move.go b/server/internal/controller/ship_group_move.go similarity index 93% rename from internal/controller/ship_group_move.go rename to server/internal/controller/ship_group_move.go index b2f6d2a..0894827 100644 --- a/internal/controller/ship_group_move.go +++ b/server/internal/controller/ship_group_move.go @@ -4,8 +4,9 @@ import ( "fmt" "iter" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) MoveShipGroups() { diff --git a/internal/controller/ship_group_move_test.go b/server/internal/controller/ship_group_move_test.go similarity index 96% rename from internal/controller/ship_group_move_test.go rename to server/internal/controller/ship_group_move_test.go index 3c9ed93..0804897 100644 --- a/internal/controller/ship_group_move_test.go +++ b/server/internal/controller/ship_group_move_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/ship_group_send.go b/server/internal/controller/ship_group_send.go similarity index 94% rename from internal/controller/ship_group_send.go rename to server/internal/controller/ship_group_send.go index 7914813..dc67ed7 100644 --- a/internal/controller/ship_group_send.go +++ b/server/internal/controller/ship_group_send.go @@ -1,10 +1,12 @@ package controller import ( + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/util" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) func (c *Cache) shipGroupSend(ri int, groupID uuid.UUID, planetNumber uint) error { diff --git a/internal/controller/ship_group_send_test.go b/server/internal/controller/ship_group_send_test.go similarity index 95% rename from internal/controller/ship_group_send_test.go rename to server/internal/controller/ship_group_send_test.go index 016a4aa..b45689a 100644 --- a/internal/controller/ship_group_send_test.go +++ b/server/internal/controller/ship_group_send_test.go @@ -3,10 +3,11 @@ package controller_test import ( "testing" - "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" + e "galaxy/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/google/uuid" + + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/ship_group_test.go b/server/internal/controller/ship_group_test.go similarity index 97% rename from internal/controller/ship_group_test.go rename to server/internal/controller/ship_group_test.go index d4a5528..956566f 100644 --- a/internal/controller/ship_group_test.go +++ b/server/internal/controller/ship_group_test.go @@ -6,10 +6,12 @@ import ( "strings" "testing" + "galaxy/util" + + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/number" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) @@ -177,9 +179,9 @@ func TestShipGroupBreak(t *testing.T) { assert.NotNil(t, c.ShipGroup(3).FleetID) assert.Equal(t, game.CargoColonist.Ref(), c.ShipGroup(0).CargoType) - assert.Equal(t, 24.6, number.Fixed3(c.ShipGroup(0).Load.F())) + assert.Equal(t, 24.6, util.Fixed3(c.ShipGroup(0).Load.F())) assert.Equal(t, game.CargoColonist.Ref(), c.ShipGroup(3).CargoType) - assert.Equal(t, 8.2, number.Fixed3(c.ShipGroup(3).Load.F())) + assert.Equal(t, 8.2, util.Fixed3(c.ShipGroup(3).Load.F())) // group #1 -> MAX 6 off the fleet assert.NoError(t, g.ShipGroupBreak(Race_0.Name, c.ShipGroup(0).ID, uuid.New(), 6)) // group #1 (0) @@ -452,22 +454,22 @@ func TestShipGroupUnload(t *testing.T) { // unload MAT on foreign planet / limited assert.NoError(t, g.ShipGroupUnload(Race_0.Name, c.ShipGroup(5).ID, 20.1)) - assert.Equal(t, 20.1, number.Fixed3(c.MustPlanet(R1_Planet_1_num).Material.F())) + assert.Equal(t, 20.1, util.Fixed3(c.MustPlanet(R1_Planet_1_num).Material.F())) assert.Equal(t, game.CargoMaterial.Ref(), c.ShipGroup(5).CargoType) - assert.Equal(t, 79.9, number.Fixed3(c.ShipGroup(5).Load.F())) + assert.Equal(t, 79.9, util.Fixed3(c.ShipGroup(5).Load.F())) // unload MAT on foreign planet / ALL assert.NoError(t, g.ShipGroupUnload(Race_0.Name, c.ShipGroup(5).ID, 0)) - assert.Equal(t, 100.0, number.Fixed3(c.MustPlanet(R1_Planet_1_num).Material.F())) - assert.Equal(t, 0.0, number.Fixed3(c.ShipGroup(5).Load.F())) + assert.Equal(t, 100.0, util.Fixed3(c.MustPlanet(R1_Planet_1_num).Material.F())) + assert.Equal(t, 0.0, util.Fixed3(c.ShipGroup(5).Load.F())) assert.Nil(t, c.ShipGroup(5).CargoType) // unload ALL c.ShipGroup(0).CargoType = game.CargoColonist.Ref() c.ShipGroup(0).Load = 100 assert.NoError(t, g.ShipGroupUnload(Race_0.Name, c.ShipGroup(0).ID, 101)) - assert.Equal(t, 100.0, number.Fixed3(c.MustPlanet(R0_Planet_0_num).Colonists.F())) - assert.Equal(t, 0.0, number.Fixed3(c.ShipGroup(0).Load.F())) + assert.Equal(t, 100.0, util.Fixed3(c.MustPlanet(R0_Planet_0_num).Colonists.F())) + assert.Equal(t, 0.0, util.Fixed3(c.ShipGroup(0).Load.F())) assert.Nil(t, c.ShipGroup(0).CargoType) } diff --git a/internal/controller/ship_group_upgrade.go b/server/internal/controller/ship_group_upgrade.go similarity index 98% rename from internal/controller/ship_group_upgrade.go rename to server/internal/controller/ship_group_upgrade.go index a81b221..025e9c0 100644 --- a/internal/controller/ship_group_upgrade.go +++ b/server/internal/controller/ship_group_upgrade.go @@ -5,9 +5,10 @@ import ( "slices" "strings" + e "galaxy/error" + "github.com/google/uuid" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" + "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/internal/controller/ship_group_upgrade_test.go b/server/internal/controller/ship_group_upgrade_test.go similarity index 96% rename from internal/controller/ship_group_upgrade_test.go rename to server/internal/controller/ship_group_upgrade_test.go index 420dcb7..b0c9049 100644 --- a/internal/controller/ship_group_upgrade_test.go +++ b/server/internal/controller/ship_group_upgrade_test.go @@ -3,11 +3,12 @@ package controller_test import ( "testing" + e "galaxy/error" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - g "github.com/iliadenisov/galaxy/internal/model/game" + "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/internal/controller/vote.go b/server/internal/controller/vote.go similarity index 98% rename from internal/controller/vote.go rename to server/internal/controller/vote.go index 21b094d..60c27c3 100644 --- a/internal/controller/vote.go +++ b/server/internal/controller/vote.go @@ -8,7 +8,7 @@ import ( "slices" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) type VoteGroup struct { diff --git a/internal/controller/vote_test.go b/server/internal/controller/vote_test.go similarity index 98% rename from internal/controller/vote_test.go rename to server/internal/controller/vote_test.go index dd0a33a..9f85681 100644 --- a/internal/controller/vote_test.go +++ b/server/internal/controller/vote_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/generator/generator.go b/server/internal/generator/generator.go similarity index 100% rename from internal/generator/generator.go rename to server/internal/generator/generator.go diff --git a/internal/generator/generator_test.go b/server/internal/generator/generator_test.go similarity index 98% rename from internal/generator/generator_test.go rename to server/internal/generator/generator_test.go index 6533d30..1148ddf 100644 --- a/internal/generator/generator_test.go +++ b/server/internal/generator/generator_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/iliadenisov/galaxy/internal/generator" + "github.com/iliadenisov/galaxy/server/internal/generator" "github.com/stretchr/testify/assert" ) diff --git a/internal/generator/map.go b/server/internal/generator/map.go similarity index 93% rename from internal/generator/map.go rename to server/internal/generator/map.go index ab6ce44..16090b3 100644 --- a/internal/generator/map.go +++ b/server/internal/generator/map.go @@ -4,8 +4,9 @@ import ( "fmt" "math/rand" - "github.com/iliadenisov/galaxy/internal/generator/plotter" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + + "github.com/iliadenisov/galaxy/server/internal/generator/plotter" ) type Map struct { diff --git a/internal/generator/map_test.go b/server/internal/generator/map_test.go similarity index 84% rename from internal/generator/map_test.go rename to server/internal/generator/map_test.go index b03b37f..d74f06a 100644 --- a/internal/generator/map_test.go +++ b/server/internal/generator/map_test.go @@ -4,7 +4,8 @@ import ( "fmt" "testing" - "github.com/iliadenisov/galaxy/internal/number" + "galaxy/util" + "github.com/stretchr/testify/assert" ) @@ -21,7 +22,7 @@ func TestShortDistance(t *testing.T) { t.Run(fmt.Sprint(i), func(t *testing.T) { m := Map{Width: tc.w, Height: tc.h} d := m.ShortDistance(Coordinate{tc.x1, tc.y1}, Coordinate{tc.x2, tc.y2}) - assert.Equal(t, tc.d, number.Fixed3(d)) + assert.Equal(t, tc.d, util.Fixed3(d)) }) } } diff --git a/internal/generator/planet.go b/server/internal/generator/planet.go similarity index 100% rename from internal/generator/planet.go rename to server/internal/generator/planet.go diff --git a/internal/generator/planet_test.go b/server/internal/generator/planet_test.go similarity index 92% rename from internal/generator/planet_test.go rename to server/internal/generator/planet_test.go index 95b16bc..5a2b58f 100644 --- a/internal/generator/planet_test.go +++ b/server/internal/generator/planet_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - g "github.com/iliadenisov/galaxy/internal/generator" + g "github.com/iliadenisov/galaxy/server/internal/generator" "github.com/stretchr/testify/assert" ) diff --git a/internal/generator/plotter/plotter.go b/server/internal/generator/plotter/plotter.go similarity index 97% rename from internal/generator/plotter/plotter.go rename to server/internal/generator/plotter/plotter.go index db33536..ea9b9d7 100644 --- a/internal/generator/plotter/plotter.go +++ b/server/internal/generator/plotter/plotter.go @@ -6,7 +6,7 @@ import ( "math" "math/rand" - "github.com/iliadenisov/galaxy/internal/bitmap" + "github.com/iliadenisov/galaxy/server/internal/bitmap" ) type Plotter struct { diff --git a/internal/generator/plotter/plotter_test.go b/server/internal/generator/plotter/plotter_test.go similarity index 96% rename from internal/generator/plotter/plotter_test.go rename to server/internal/generator/plotter/plotter_test.go index 3d7ddd2..a0342c9 100644 --- a/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/internal/generator/plotter" + "github.com/iliadenisov/galaxy/server/internal/generator/plotter" ) func TestNewPlotter(t *testing.T) { diff --git a/internal/generator/settings.go b/server/internal/generator/settings.go similarity index 100% rename from internal/generator/settings.go rename to server/internal/generator/settings.go diff --git a/internal/model/game/bombing.go b/server/internal/model/game/bombing.go similarity index 100% rename from internal/model/game/bombing.go rename to server/internal/model/game/bombing.go diff --git a/internal/model/game/fleet.go b/server/internal/model/game/fleet.go similarity index 100% rename from internal/model/game/fleet.go rename to server/internal/model/game/fleet.go diff --git a/internal/model/game/game.go b/server/internal/model/game/game.go similarity index 95% rename from internal/model/game/game.go rename to server/internal/model/game/game.go index 5449860..b8b8900 100644 --- a/internal/model/game/game.go +++ b/server/internal/model/game/game.go @@ -5,8 +5,9 @@ import ( "fmt" "maps" + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/number" ) type Float float64 @@ -20,7 +21,7 @@ func (f Float) Add(v float64) Float { } func (f Float) F() float64 { - return number.Fixed12(float64(f)) + return util.Fixed12(float64(f)) } type TechSet map[Tech]Float diff --git a/internal/model/game/game_test.go b/server/internal/model/game/game_test.go similarity index 96% rename from internal/model/game/game_test.go rename to server/internal/model/game/game_test.go index 23f890b..6f2954f 100644 --- a/internal/model/game/game_test.go +++ b/server/internal/model/game/game_test.go @@ -3,7 +3,7 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/model/game/group.go b/server/internal/model/game/group.go similarity index 100% rename from internal/model/game/group.go rename to server/internal/model/game/group.go diff --git a/internal/model/game/group_test.go b/server/internal/model/game/group_test.go similarity index 95% rename from internal/model/game/group_test.go rename to server/internal/model/game/group_test.go index 6f7714f..b17cacb 100644 --- a/internal/model/game/group_test.go +++ b/server/internal/model/game/group_test.go @@ -4,9 +4,10 @@ import ( "math/rand/v2" "testing" + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/number" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) @@ -116,9 +117,9 @@ func TestBombingPower(t *testing.T) { game.TechCargo: game.F(1.0), }, } - assert.Equal(t, 139.295, number.Fixed3(sg.BombingPower(&BattleStation))) + assert.Equal(t, 139.295, util.Fixed3(sg.BombingPower(&BattleStation))) sg.Number = 2 - assert.Equal(t, 278.590, number.Fixed3(sg.BombingPower(&BattleStation))) + assert.Equal(t, 278.590, util.Fixed3(sg.BombingPower(&BattleStation))) } func TestDriveEffective(t *testing.T) { diff --git a/internal/model/game/map.go b/server/internal/model/game/map.go similarity index 100% rename from internal/model/game/map.go rename to server/internal/model/game/map.go diff --git a/internal/model/game/planet.go b/server/internal/model/game/planet.go similarity index 100% rename from internal/model/game/planet.go rename to server/internal/model/game/planet.go diff --git a/internal/model/game/planet_test.go b/server/internal/model/game/planet_test.go similarity index 98% rename from internal/model/game/planet_test.go rename to server/internal/model/game/planet_test.go index 4f9861b..cdeea5f 100644 --- a/internal/model/game/planet_test.go +++ b/server/internal/model/game/planet_test.go @@ -3,7 +3,7 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/model/game/production.go b/server/internal/model/game/production.go similarity index 100% rename from internal/model/game/production.go rename to server/internal/model/game/production.go diff --git a/internal/model/game/race.go b/server/internal/model/game/race.go similarity index 100% rename from internal/model/game/race.go rename to server/internal/model/game/race.go diff --git a/internal/model/game/race_test.go b/server/internal/model/game/race_test.go similarity index 91% rename from internal/model/game/race_test.go rename to server/internal/model/game/race_test.go index 2095df5..fab1d02 100644 --- a/internal/model/game/race_test.go +++ b/server/internal/model/game/race_test.go @@ -3,7 +3,7 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/model/game/route.go b/server/internal/model/game/route.go similarity index 100% rename from internal/model/game/route.go rename to server/internal/model/game/route.go diff --git a/internal/model/game/science.go b/server/internal/model/game/science.go similarity index 100% rename from internal/model/game/science.go rename to server/internal/model/game/science.go diff --git a/internal/model/game/ship.go b/server/internal/model/game/ship.go similarity index 100% rename from internal/model/game/ship.go rename to server/internal/model/game/ship.go diff --git a/internal/model/game/ship_test.go b/server/internal/model/game/ship_test.go similarity index 91% rename from internal/model/game/ship_test.go rename to server/internal/model/game/ship_test.go index c5c0210..b743338 100644 --- a/internal/model/game/ship_test.go +++ b/server/internal/model/game/ship_test.go @@ -3,7 +3,7 @@ package game_test import ( "testing" - "github.com/iliadenisov/galaxy/internal/model/game" + "github.com/iliadenisov/galaxy/server/internal/model/game" "github.com/stretchr/testify/assert" ) diff --git a/internal/model/game/state.go b/server/internal/model/game/state.go similarity index 100% rename from internal/model/game/state.go rename to server/internal/model/game/state.go diff --git a/internal/repo/fs/fs.go b/server/internal/repo/fs/fs.go similarity index 100% rename from internal/repo/fs/fs.go rename to server/internal/repo/fs/fs.go diff --git a/internal/repo/fs/fs_test.go b/server/internal/repo/fs/fs_test.go similarity index 98% rename from internal/repo/fs/fs_test.go rename to server/internal/repo/fs/fs_test.go index c5c5256..6935eec 100644 --- a/internal/repo/fs/fs_test.go +++ b/server/internal/repo/fs/fs_test.go @@ -5,7 +5,8 @@ import ( "path/filepath" "testing" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/fs/helper_test.go b/server/internal/repo/fs/helper_test.go similarity index 100% rename from internal/repo/fs/helper_test.go rename to server/internal/repo/fs/helper_test.go diff --git a/internal/repo/fs/util.go b/server/internal/repo/fs/util.go similarity index 100% rename from internal/repo/fs/util.go rename to server/internal/repo/fs/util.go diff --git a/internal/repo/fs/util_test.go b/server/internal/repo/fs/util_test.go similarity index 98% rename from internal/repo/fs/util_test.go rename to server/internal/repo/fs/util_test.go index 5c96b64..5e65edf 100644 --- a/internal/repo/fs/util_test.go +++ b/server/internal/repo/fs/util_test.go @@ -5,8 +5,9 @@ import ( "path/filepath" "testing" + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/util" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/game.go b/server/internal/repo/game.go similarity index 98% rename from internal/repo/game.go rename to server/internal/repo/game.go index 8504914..0ab5842 100644 --- a/internal/repo/game.go +++ b/server/internal/repo/game.go @@ -15,10 +15,11 @@ import ( "errors" "fmt" + "galaxy/model/order" + "galaxy/model/report" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/report" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) const ( diff --git a/internal/repo/repo.go b/server/internal/repo/repo.go similarity index 93% rename from internal/repo/repo.go rename to server/internal/repo/repo.go index 4dc2166..4a7f15e 100644 --- a/internal/repo/repo.go +++ b/server/internal/repo/repo.go @@ -4,8 +4,9 @@ import ( "encoding" "errors" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/repo/fs" + e "galaxy/error" + + "github.com/iliadenisov/galaxy/server/internal/repo/fs" ) func NewStorageError(err error) error { diff --git a/internal/repo/repo_export_test.go b/server/internal/repo/repo_export_test.go similarity index 83% rename from internal/repo/repo_export_test.go rename to server/internal/repo/repo_export_test.go index 09a4b83..83fdcdb 100644 --- a/internal/repo/repo_export_test.go +++ b/server/internal/repo/repo_export_test.go @@ -1,8 +1,9 @@ package repo import ( + "galaxy/model/order" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/order" ) func LoadOrder_T(s Storage, t uint, id uuid.UUID) (*order.Order, bool, error) { diff --git a/internal/repo/repo_test.go b/server/internal/repo/repo_test.go similarity index 95% rename from internal/repo/repo_test.go rename to server/internal/repo/repo_test.go index d1b3a12..652f3c3 100644 --- a/internal/repo/repo_test.go +++ b/server/internal/repo/repo_test.go @@ -4,10 +4,11 @@ import ( "path/filepath" "testing" + "galaxy/model/order" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/repo" - "github.com/iliadenisov/galaxy/internal/repo/fs" + "github.com/iliadenisov/galaxy/server/internal/repo" + "github.com/iliadenisov/galaxy/server/internal/repo/fs" "github.com/stretchr/testify/assert" ) diff --git a/internal/router/command_test.go b/server/internal/router/command_test.go similarity index 99% rename from internal/router/command_test.go rename to server/internal/router/command_test.go index d2dd288..92f6ed4 100644 --- a/internal/router/command_test.go +++ b/server/internal/router/command_test.go @@ -6,8 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" + "galaxy/model/order" + "galaxy/model/rest" + "github.com/stretchr/testify/assert" ) diff --git a/internal/router/handler/command.go b/server/internal/router/handler/command.go similarity index 98% rename from internal/router/handler/command.go rename to server/internal/router/handler/command.go index 5beb5e1..d12c7d4 100644 --- a/internal/router/handler/command.go +++ b/server/internal/router/handler/command.go @@ -8,12 +8,13 @@ import ( "github.com/go-playground/validator/v10" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/controller" + + "galaxy/model/order" + "galaxy/model/rest" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" ) func CommandHandler(c *gin.Context, executor CommandExecutor) { diff --git a/internal/router/handler/handler.go b/server/internal/router/handler/handler.go similarity index 91% rename from internal/router/handler/handler.go rename to server/internal/router/handler/handler.go index 5cfc6d4..26e0aea 100644 --- a/internal/router/handler/handler.go +++ b/server/internal/router/handler/handler.go @@ -5,13 +5,15 @@ import ( "net/http" "os" + "galaxy/model/order" + "galaxy/model/rest" + + e "galaxy/error" + "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" - "github.com/iliadenisov/galaxy/internal/controller" - e "github.com/iliadenisov/galaxy/internal/error" - "github.com/iliadenisov/galaxy/internal/model/game" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" + "github.com/iliadenisov/galaxy/server/internal/controller" + "github.com/iliadenisov/galaxy/server/internal/model/game" ) type CommandExecutor interface { diff --git a/internal/router/handler/init.go b/server/internal/router/handler/init.go similarity index 89% rename from internal/router/handler/init.go rename to server/internal/router/handler/init.go index df59222..d61b378 100644 --- a/internal/router/handler/init.go +++ b/server/internal/router/handler/init.go @@ -3,8 +3,9 @@ package handler import ( "net/http" + "galaxy/model/rest" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/internal/model/rest" ) func InitHandler(c *gin.Context, executor CommandExecutor) { diff --git a/internal/router/handler/order.go b/server/internal/router/handler/order.go similarity index 81% rename from internal/router/handler/order.go rename to server/internal/router/handler/order.go index d9e0b1c..3055461 100644 --- a/internal/router/handler/order.go +++ b/server/internal/router/handler/order.go @@ -4,10 +4,11 @@ import ( "errors" "net/http" + "galaxy/model/order" + "galaxy/model/rest" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/repo" + "github.com/iliadenisov/galaxy/server/internal/repo" ) func OrderHandler(c *gin.Context, executor CommandExecutor) { diff --git a/internal/router/handler/status.go b/server/internal/router/handler/status.go similarity index 100% rename from internal/router/handler/status.go rename to server/internal/router/handler/status.go diff --git a/internal/router/handler/turn.go b/server/internal/router/handler/turn.go similarity index 100% rename from internal/router/handler/turn.go rename to server/internal/router/handler/turn.go diff --git a/internal/router/init_test.go b/server/internal/router/init_test.go similarity index 80% rename from internal/router/init_test.go rename to server/internal/router/init_test.go index e577cb5..33e39b0 100644 --- a/internal/router/init_test.go +++ b/server/internal/router/init_test.go @@ -6,12 +6,14 @@ import ( "net/http/httptest" "testing" + "galaxy/model/rest" + + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/router" - "github.com/iliadenisov/galaxy/internal/router/handler" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/router/middleware.go b/server/internal/router/middleware.go similarity index 100% rename from internal/router/middleware.go rename to server/internal/router/middleware.go diff --git a/internal/router/order_test.go b/server/internal/router/order_test.go similarity index 99% rename from internal/router/order_test.go rename to server/internal/router/order_test.go index bf1b0a6..93844c6 100644 --- a/internal/router/order_test.go +++ b/server/internal/router/order_test.go @@ -6,8 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" + "galaxy/model/order" + "galaxy/model/rest" + "github.com/stretchr/testify/assert" ) diff --git a/internal/router/router.go b/server/internal/router/router.go similarity index 97% rename from internal/router/router.go rename to server/internal/router/router.go index 2bbe036..52c257c 100644 --- a/internal/router/router.go +++ b/server/internal/router/router.go @@ -9,7 +9,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/validator/v10" - "github.com/iliadenisov/galaxy/internal/router/handler" + "github.com/iliadenisov/galaxy/server/internal/router/handler" ) const ( diff --git a/internal/router/router_export_test.go b/server/internal/router/router_export_test.go similarity index 72% rename from internal/router/router_export_test.go rename to server/internal/router/router_export_test.go index 883fea2..55b41ad 100644 --- a/internal/router/router_export_test.go +++ b/server/internal/router/router_export_test.go @@ -2,7 +2,7 @@ package router import ( "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/internal/router/handler" + "github.com/iliadenisov/galaxy/server/internal/router/handler" ) func SetupRouter(e handler.CommandExecutor) *gin.Engine { diff --git a/internal/router/router_helper_test.go b/server/internal/router/router_helper_test.go similarity index 87% rename from internal/router/router_helper_test.go rename to server/internal/router/router_helper_test.go index 1e19d75..ad71f3a 100644 --- a/internal/router/router_helper_test.go +++ b/server/internal/router/router_helper_test.go @@ -4,12 +4,13 @@ import ( "encoding/json" "net/http" + "galaxy/model/order" + "galaxy/model/rest" + "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/model/order" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/router" - "github.com/iliadenisov/galaxy/internal/router/handler" + "github.com/iliadenisov/galaxy/server/internal/router" + "github.com/iliadenisov/galaxy/server/internal/router/handler" ) var ( diff --git a/internal/router/router_test.go b/server/internal/router/router_test.go similarity index 94% rename from internal/router/router_test.go rename to server/internal/router/router_test.go index 5f47b07..20656d3 100644 --- a/internal/router/router_test.go +++ b/server/internal/router/router_test.go @@ -10,9 +10,10 @@ import ( "sync/atomic" "testing" + "galaxy/model/rest" + "github.com/gin-gonic/gin" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/router" + "github.com/iliadenisov/galaxy/server/internal/router" "github.com/stretchr/testify/assert" ) diff --git a/internal/router/status_test.go b/server/internal/router/status_test.go similarity index 85% rename from internal/router/status_test.go rename to server/internal/router/status_test.go index 19fb7e3..4c80941 100644 --- a/internal/router/status_test.go +++ b/server/internal/router/status_test.go @@ -6,12 +6,14 @@ import ( "net/http/httptest" "testing" + "galaxy/model/rest" + + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/router" - "github.com/iliadenisov/galaxy/internal/router/handler" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/router/turn_test.go b/server/internal/router/turn_test.go similarity index 87% rename from internal/router/turn_test.go rename to server/internal/router/turn_test.go index b0a754b..e6517a8 100644 --- a/internal/router/turn_test.go +++ b/server/internal/router/turn_test.go @@ -6,12 +6,14 @@ import ( "net/http/httptest" "testing" + "galaxy/model/rest" + + "galaxy/util" + "github.com/google/uuid" - "github.com/iliadenisov/galaxy/internal/controller" - "github.com/iliadenisov/galaxy/internal/model/rest" - "github.com/iliadenisov/galaxy/internal/router" - "github.com/iliadenisov/galaxy/internal/router/handler" - "github.com/iliadenisov/galaxy/internal/util" + "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/internal/router/validator.go b/server/internal/router/validator.go similarity index 96% rename from internal/router/validator.go rename to server/internal/router/validator.go index af4ff86..2a80816 100644 --- a/internal/router/validator.go +++ b/server/internal/router/validator.go @@ -3,8 +3,9 @@ package router import ( "strings" + "galaxy/util" + "github.com/go-playground/validator/v10" - "github.com/iliadenisov/galaxy/internal/util" ) var notBlankStringValidator validator.Func = func(fl validator.FieldLevel) bool { diff --git a/internal/util/fs.go b/util/fs.go similarity index 100% rename from internal/util/fs.go rename to util/fs.go diff --git a/util/go.mod b/util/go.mod new file mode 100644 index 0000000..f253f2d --- /dev/null +++ b/util/go.mod @@ -0,0 +1,3 @@ +module galaxy/util + +go 1.26.0 diff --git a/internal/util/map.go b/util/map.go similarity index 100% rename from internal/util/map.go rename to util/map.go diff --git a/internal/util/map_test.go b/util/map_test.go similarity index 88% rename from internal/util/map_test.go rename to util/map_test.go index 648f9a5..24b24a5 100644 --- a/internal/util/map_test.go +++ b/util/map_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/iliadenisov/galaxy/internal/number" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + "github.com/stretchr/testify/assert" ) @@ -21,7 +21,7 @@ func TestShortDistance(t *testing.T) { } { t.Run(fmt.Sprint(i), func(t *testing.T) { d := util.ShortDistance(tc.w, tc.h, tc.x1, tc.y1, tc.x2, tc.y2) - assert.Equal(t, tc.d, number.Fixed3(d)) + assert.Equal(t, tc.d, util.Fixed3(d)) }) } } @@ -49,8 +49,8 @@ func TestNextTravelCoord(t *testing.T) { t.Run(fmt.Sprint(i), func(t *testing.T) { tx, ty, arrived := util.NextTravelCoord(tc.w, tc.h, tc.ox, tc.oy, tc.dx, tc.dy, tc.delta) assert.Equal(t, tc.arrived, arrived) - assert.Equal(t, tc.tx, number.Fixed3(tx)) - assert.Equal(t, tc.ty, number.Fixed3(ty)) + assert.Equal(t, tc.tx, util.Fixed3(tx)) + assert.Equal(t, tc.ty, util.Fixed3(ty)) }) } } diff --git a/internal/number/number.go b/util/number.go similarity index 95% rename from internal/number/number.go rename to util/number.go index 831cb3c..c0d66c8 100644 --- a/internal/number/number.go +++ b/util/number.go @@ -1,4 +1,4 @@ -package number +package util import ( "math" diff --git a/internal/number/number_test.go b/util/number_test.go similarity index 97% rename from internal/number/number_test.go rename to util/number_test.go index f14a6c2..796a4d0 100644 --- a/internal/number/number_test.go +++ b/util/number_test.go @@ -1,4 +1,4 @@ -package number +package util import ( "fmt" diff --git a/internal/util/string.go b/util/string.go similarity index 100% rename from internal/util/string.go rename to util/string.go diff --git a/internal/util/string_test.go b/util/string_test.go similarity index 99% rename from internal/util/string_test.go rename to util/string_test.go index ec74eb6..3d2f560 100644 --- a/internal/util/string_test.go +++ b/util/string_test.go @@ -5,7 +5,8 @@ import ( "testing" "unicode/utf8" - "github.com/iliadenisov/galaxy/internal/util" + "galaxy/util" + "github.com/stretchr/testify/assert" )