fs storage

client/go.mod

@@ -4,10 +4,13 @@ go 1.26.0
 
 require (
 	fyne.io/fyne/v2 v2.7.3
+	galaxy/loader v0.0.0
 	github.com/fogleman/gg v1.3.0
 	github.com/stretchr/testify v1.11.1
 )
 
+replace galaxy/loader v0.0.0 => ../loader/
+
 require (
 	fyne.io/systray v1.12.0 // indirect
 	github.com/BurntSushi/toml v1.6.0 // indirect
@@ -28,11 +31,10 @@ require (
 	github.com/hack-pad/safejs v0.1.1 // indirect
 	github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect
 	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/nicksnyder/go-i18n/v2 v2.6.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/rymdport/portal v0.4.2 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
@@ -41,6 +43,5 @@ require (
 	golang.org/x/net v0.50.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

client/go.sum

@@ -47,23 +47,18 @@ github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wH
 github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nicksnyder/go-i18n/v2 v2.6.1 h1:JDEJraFsQE17Dut9HFDHzCoAWGEQJom5s0TRd17NIEQ=
 github.com/nicksnyder/go-i18n/v2 v2.6.1/go.mod h1:Vee0/9RD3Quc/NmwEjzzD7VTZ+Ir7QbXocrkhOzmUKA=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
 github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
 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/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU=

client/plugin/plugin.go

@@ -0,0 +1,8 @@
+package main
+
+import (
+	"galaxy/client"
+	"galaxy/loader"
+)
+
+var Factory loader.ClientInit = client.NewClient

game/cmd/http/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"galaxy/server/internal/router"
+	"galaxy/game/internal/router"
 )
 
 func main() {

game/go.mod

@@ -1,4 +1,4 @@
-module galaxy/server
+module galaxy/game
 
 go 1.26.0
 

game/internal/bitmap/bitmap_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"galaxy/server/internal/bitmap"
+	"galaxy/game/internal/bitmap"
 )
 
 func TestBitVectorSize(t *testing.T) {

game/internal/controller/battle.go

@@ -7,7 +7,7 @@ import (
 	"math/rand/v2"
 	"slices"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/battle_test.go

@@ -5,8 +5,8 @@ import (
 	"slices"
 	"testing"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/bombing.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/bombing_test.go

@@ -3,8 +3,8 @@ package controller_test
 import (
 	"testing"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/cache.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"slices"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/command.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/controller.go

@@ -3,14 +3,14 @@ package controller
 import (
 	"errors"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 
 	"galaxy/model/order"
 	"galaxy/model/report"
 
-	"galaxy/server/internal/repo"
+	"galaxy/game/internal/repo"
 )
 
 type Configurer func(*Param)

game/internal/controller/controller_export_test.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/controller_test.go

@@ -3,8 +3,8 @@ package controller_test
 import (
 	"fmt"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/fleet.go

@@ -10,7 +10,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/fleet_send.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 )
 
 func (c *Cache) FleetSend(ri, fi int, planetNumber uint) error {

game/internal/controller/fleet_send_test.go

@@ -6,7 +6,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/fleet_test.go

@@ -7,7 +7,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/generate_game.go

@@ -5,8 +5,8 @@ import (
 	"math/rand/v2"
 	"slices"
 
-	"galaxy/server/internal/generator"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/generator"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/generate_game_test.go

@@ -8,9 +8,9 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
-	"galaxy/server/internal/repo"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
+	"galaxy/game/internal/repo"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/generate_turn.go

@@ -6,7 +6,7 @@ import (
 
 	"galaxy/model/report"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/order.go

@@ -8,7 +8,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/planet.go

@@ -9,7 +9,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/planet_test.go

@@ -8,8 +8,8 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/race.go

@@ -7,7 +7,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 )
 
 func (c *Cache) Relation(r1, r2 int) game.Relation {

game/internal/controller/race_test.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/report.go

@@ -10,7 +10,7 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/route.go

@@ -12,7 +12,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 )
 
 func (c *Cache) PlanetRouteSet(ri int, rt game.RouteType, origin, destination uint) error {

game/internal/controller/route_test.go

@@ -6,8 +6,8 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/science.go

@@ -8,7 +8,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/science_test.go

@@ -5,8 +5,8 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/ship_class.go

@@ -9,7 +9,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/ship_group.go

@@ -11,7 +11,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/ship_group_move.go

@@ -6,7 +6,7 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 )
 
 func (c *Cache) MoveShipGroups() {

game/internal/controller/ship_group_move_test.go

@@ -4,7 +4,7 @@ import (
 	"slices"
 	"testing"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/ship_group_send.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/ship_group_send_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/controller/ship_group_test.go

@@ -10,7 +10,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/ship_group_upgrade.go

@@ -7,7 +7,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/ship_group_upgrade_test.go

@@ -5,9 +5,9 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
-	g "galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
+	g "galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/controller/vote.go

@@ -7,7 +7,7 @@ import (
 	"math/big"
 	"slices"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/controller/vote_test.go

@@ -3,8 +3,8 @@ package controller_test
 import (
 	"testing"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/generator/generator_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"galaxy/server/internal/generator"
+	"galaxy/game/internal/generator"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/generator/map.go

@@ -6,7 +6,7 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/generator/plotter"
+	"galaxy/game/internal/generator/plotter"
 )
 
 type Map struct {

game/internal/generator/planet_test.go

@@ -4,7 +4,7 @@ import (
 	"regexp"
 	"testing"
 
-	g "galaxy/server/internal/generator"
+	g "galaxy/game/internal/generator"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/generator/plotter/plotter.go

@@ -6,7 +6,7 @@ import (
 	"math"
 	"math/rand"
 
-	"galaxy/server/internal/bitmap"
+	"galaxy/game/internal/bitmap"
 )
 
 type Plotter struct {

game/internal/generator/plotter/plotter_test.go

@@ -3,7 +3,7 @@ package plotter_test
 import (
 	"testing"
 
-	"galaxy/server/internal/generator/plotter"
+	"galaxy/game/internal/generator/plotter"
 )
 
 func TestNewPlotter(t *testing.T) {

game/internal/model/game/game_test.go

@@ -3,7 +3,7 @@ package game_test
 import (
 	"testing"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/model/game/group_test.go

@@ -6,7 +6,7 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/model/game/planet_test.go

@@ -3,7 +3,7 @@ package game_test
 import (
 	"testing"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/model/game/race_test.go

@@ -3,7 +3,7 @@ package game_test
 import (
 	"testing"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/model/game/ship_test.go

@@ -3,7 +3,7 @@ package game_test
 import (
 	"testing"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

game/internal/repo/fs/fs_test.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"testing"
 
-	"galaxy/server/internal/repo/fs"
+	"galaxy/game/internal/repo/fs"
 	"galaxy/util"
 
 	"github.com/stretchr/testify/assert"

game/internal/repo/game.go

@@ -18,7 +18,7 @@ import (
 	"galaxy/model/order"
 	"galaxy/model/report"
 
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/model/game"
 
 	"github.com/google/uuid"
 )

game/internal/repo/repo.go

@@ -6,7 +6,7 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/repo/fs"
+	"galaxy/game/internal/repo/fs"
 )
 
 func NewStorageError(err error) error {

game/internal/repo/repo_test.go

@@ -6,8 +6,8 @@ import (
 
 	"galaxy/model/order"
 
-	"galaxy/server/internal/repo"
-	"galaxy/server/internal/repo/fs"
+	"galaxy/game/internal/repo"
+	"galaxy/game/internal/repo/fs"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/router/handler/command.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"galaxy/server/internal/controller"
+	"galaxy/game/internal/controller"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"

game/internal/router/handler/handler.go

@@ -10,8 +10,8 @@ import (
 
 	e "galaxy/error"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/model/game"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/model/game"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"

game/internal/router/handler/order.go

@@ -7,7 +7,7 @@ import (
 	"galaxy/model/order"
 	"galaxy/model/rest"
 
-	"galaxy/server/internal/repo"
+	"galaxy/game/internal/repo"
 
 	"github.com/gin-gonic/gin"
 )

game/internal/router/init_test.go

@@ -10,9 +10,9 @@ import (
 
 	"galaxy/util"
 
-	"galaxy/server/internal/controller"
-	"galaxy/server/internal/router"
-	"galaxy/server/internal/router/handler"
+	"galaxy/game/internal/controller"
+	"galaxy/game/internal/router"
+	"galaxy/game/internal/router/handler"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

game/internal/router/router.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"os"
 
-	"galaxy/server/internal/router/handler"
+	"galaxy/game/internal/router/handler"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"

game/internal/router/router_export_test.go

@@ -1,7 +1,7 @@
 package router
 
 import (
-	"galaxy/server/internal/router/handler"
+	"galaxy/game/internal/router/handler"
 
 	"github.com/gin-gonic/gin"
 )

game/internal/router/router_helper_test.go

@@ -7,8 +7,8 @@ import (
 	"galaxy/model/order"
 	"galaxy/model/rest"
 
-	"galaxy/server/internal/router"
-	"galaxy/server/internal/router/handler"
+	"galaxy/game/internal/router"
+	"galaxy/game/internal/router/handler"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"