chore: re-package

This commit is contained in:
IliaDenisov
2026-03-10 15:46:18 +02:00
parent bb2bb899de
commit dabe1f091a
99 changed files with 151 additions and 98 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
package main
import "github.com/iliadenisov/galaxy/client"
import "galaxy/client"
func main() {
c := client.NewUI()
+2 -1
View File
@@ -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 {
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/iliadenisov/galaxy/client
module galaxy/client
go 1.26.0
+1 -1
View File
@@ -3,7 +3,7 @@ package client
import (
"image/color"
"github.com/iliadenisov/galaxy/client/world"
"galaxy/client/world"
)
func mockWorld() *world.World {
+2 -1
View File
@@ -4,9 +4,10 @@ import (
"image"
"math"
"galaxy/client/world"
"fyne.io/fyne/v2"
"github.com/fogleman/gg"
"github.com/iliadenisov/galaxy/client/world"
)
/*
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fyne.io/fyne/v2"
"github.com/iliadenisov/galaxy/client/world"
"galaxy/client/world"
)
/*
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/iliadenisov/galaxy/client/world"
"galaxy/client/world"
)
type fakeClient struct {
+6 -6
View File
@@ -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
)
View File
View File
View File
View File
View File
View File
View File
View File
View File
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/iliadenisov/galaxy/server/internal/router"
"galaxy/server/internal/router"
)
func main() {
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/iliadenisov/galaxy/server
module galaxy/server
go 1.26.0
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/iliadenisov/galaxy/server/internal/bitmap"
"galaxy/server/internal/bitmap"
)
func TestBitVectorSize(t *testing.T) {
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+2 -1
View File
@@ -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 {
+2 -1
View File
@@ -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
+3 -2
View File
@@ -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)
@@ -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 {
@@ -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 (
+2 -1
View File
@@ -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("-")
+1 -1
View File
@@ -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 {
@@ -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"
)
+2 -1
View File
@@ -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"
)
+3 -2
View File
@@ -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) {
@@ -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"
)
+2 -1
View File
@@ -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 {
+2 -1
View File
@@ -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) {
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+1 -1
View File
@@ -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 {
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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] {
+1 -1
View File
@@ -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 {
+2 -2
View File
@@ -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"
)
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+2 -1
View File
@@ -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 {
+2 -1
View File
@@ -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
@@ -6,7 +6,7 @@ import (
"galaxy/util"
"github.com/iliadenisov/galaxy/server/internal/model/game"
"galaxy/server/internal/model/game"
)
func (c *Cache) MoveShipGroups() {
@@ -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"
)
@@ -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 {
@@ -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"
)
@@ -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"
)
@@ -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 {
@@ -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"
)
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+2 -1
View File
@@ -4,7 +4,8 @@ import (
"fmt"
"testing"
"github.com/iliadenisov/galaxy/server/internal/generator"
"galaxy/server/internal/generator"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"galaxy/util"
"github.com/iliadenisov/galaxy/server/internal/generator/plotter"
"galaxy/server/internal/generator/plotter"
)
type Map struct {
+2 -1
View File
@@ -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"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"math"
"math/rand"
"github.com/iliadenisov/galaxy/server/internal/bitmap"
"galaxy/server/internal/bitmap"
)
type Plotter struct {
@@ -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) {
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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"
)
+2 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 {
+3 -2
View File
@@ -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"
)
+2 -1
View File
@@ -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"
+3 -2
View File
@@ -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 {
+2 -1
View File
@@ -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) {
+4 -3
View File
@@ -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"
)
+2 -1
View File
@@ -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 (
+2 -1
View File
@@ -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 {
+3 -2
View File
@@ -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 (
+2 -1
View File
@@ -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"
)
+4 -3
View File
@@ -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"
)
+4 -3
View File
@@ -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"
)