diff --git a/game/game.go b/game/game.go index 3ecee3b..e3a0485 100644 --- a/game/game.go +++ b/game/game.go @@ -8,7 +8,7 @@ import ( // Game container type Game struct { - Model *app.App + App *app.App Screen res.Screen Mouse res.Mouse @@ -16,9 +16,9 @@ type Game struct { } // NewGame returns a new game -func NewGame(mod *app.App) Game { +func NewGame(app *app.App) Game { return Game{ - Model: mod, + App: app, Screen: res.Screen{Image: nil, Width: 0, Height: 0}, canvasHelper: newCanvasHelper(), } @@ -48,7 +48,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) { // Update the game. func (g *Game) Update() error { g.updateMouse() - g.Model.Update() + g.App.Update() return nil } @@ -57,7 +57,7 @@ func (g *Game) Draw(screen *ebiten.Image) { g.Screen.Image = screen g.Screen.Width = screen.Bounds().Dx() g.Screen.Height = screen.Bounds().Dy() - g.Model.UpdateUI() + g.App.UpdateUI() } func (g *Game) updateMouse() { diff --git a/game/run.go b/game/run.go index 5f93d45..0f7b740 100644 --- a/game/run.go +++ b/game/run.go @@ -47,14 +47,14 @@ func run(g *Game, name string, mapLoc save.MapLocation, load save.LoadType, isEd func runMenu(g *Game, tab int) { ebiten.SetVsyncEnabled(true) - g.Model = app.New() + g.App = app.New() - ecs.AddResource(&g.Model.World, &g.Screen) + ecs.AddResource(&g.App.World, &g.Screen) sprites := res.NewSprites(GameData, "data/gfx", "paper") - ecs.AddResource(&g.Model.World, &sprites) + ecs.AddResource(&g.App.World, &sprites) - achievements := achievements.New(&g.Model.World, GameData, "data/json/achievements.json", "user/achievements.json") + achievements := achievements.New(&g.App.World, GameData, "data/json/achievements.json", "user/achievements.json") fonts := res.NewFonts(GameData) ui := menu.NewUI(GameData, saveFolder, mapsFolder, tab, &sprites, &fonts, achievements, @@ -66,135 +66,135 @@ func runMenu(g *Game, tab int) { }, ) - ecs.AddResource(&g.Model.World, &ui) + ecs.AddResource(&g.App.World, &ui) - g.Model.AddSystem(&menu.UpdateUI{}) - g.Model.AddUISystem(&menu.DrawUI{}) + g.App.AddSystem(&menu.UpdateUI{}) + g.App.AddUISystem(&menu.DrawUI{}) - g.Model.Initialize() + g.App.Initialize() } func runGame(g *Game, load save.LoadType, name string, mapLoc save.MapLocation, tileSet string, isEditor bool) error { ebiten.SetVsyncEnabled(true) - g.Model = app.New() + g.App = app.New() // Register components for deserialization, // where it does not happen in systems already. - _ = ecs.ComponentID[comp.CardAnimation](&g.Model.World) + _ = ecs.ComponentID[comp.CardAnimation](&g.App.World) // =========== Resources =========== rules := res.NewRules(GameData, "data/json/rules.json") - ecs.AddResource(&g.Model.World, &rules) + ecs.AddResource(&g.App.World, &rules) gameSpeed := res.GameSpeed{ MinSpeed: -2, MaxSpeed: 3, } - ecs.AddResource(&g.Model.World, &gameSpeed) + ecs.AddResource(&g.App.World, &gameSpeed) gameTick := res.GameTick{} - ecs.AddResource(&g.Model.World, &gameTick) + ecs.AddResource(&g.App.World, &gameTick) terrain := res.NewTerrain(rules.WorldSize, rules.WorldSize) - ecs.AddResource(&g.Model.World, &terrain) + ecs.AddResource(&g.App.World, &terrain) terrainEntities := res.TerrainEntities{Grid: res.NewGrid[ecs.Entity](rules.WorldSize, rules.WorldSize)} - ecs.AddResource(&g.Model.World, &terrainEntities) + ecs.AddResource(&g.App.World, &terrainEntities) landUse := res.NewLandUse(rules.WorldSize, rules.WorldSize) - ecs.AddResource(&g.Model.World, &landUse) + ecs.AddResource(&g.App.World, &landUse) landUseEntities := res.LandUseEntities{Grid: res.NewGrid[ecs.Entity](rules.WorldSize, rules.WorldSize)} - ecs.AddResource(&g.Model.World, &landUseEntities) + ecs.AddResource(&g.App.World, &landUseEntities) buildable := res.NewBuildable(rules.WorldSize, rules.WorldSize) - ecs.AddResource(&g.Model.World, &buildable) + ecs.AddResource(&g.App.World, &buildable) selection := res.Selection{} - ecs.AddResource(&g.Model.World, &selection) + ecs.AddResource(&g.App.World, &selection) bounds := res.WorldBounds{} - ecs.AddResource(&g.Model.World, &bounds) + ecs.AddResource(&g.App.World, &bounds) editor := res.EditorMode{IsEditor: isEditor} - ecs.AddResource(&g.Model.World, &editor) + ecs.AddResource(&g.App.World, &editor) saveTime := res.SaveTime{} - ecs.AddResource(&g.Model.World, &saveTime) + ecs.AddResource(&g.App.World, &saveTime) randomTerrains := res.RandomTerrains{ TotalAvailable: rules.InitialRandomTerrains, } - ecs.AddResource(&g.Model.World, &randomTerrains) + ecs.AddResource(&g.App.World, &randomTerrains) update := res.UpdateInterval{ Interval: TPS, Countdown: 60, } - ecs.AddResource(&g.Model.World, &update) + ecs.AddResource(&g.App.World, &update) sprites := res.NewSprites(GameData, "data/gfx", tileSet) - ecs.AddResource(&g.Model.World, &sprites) + ecs.AddResource(&g.App.World, &sprites) view := res.NewView(sprites.TileWidth, sprites.TileHeight) - ecs.AddResource(&g.Model.World, &view) + ecs.AddResource(&g.App.World, &view) production := res.NewProduction() - ecs.AddResource(&g.Model.World, &production) + ecs.AddResource(&g.App.World, &production) stock := res.NewStock(rules.InitialResources) - ecs.AddResource(&g.Model.World, &stock) + ecs.AddResource(&g.App.World, &stock) - ecs.AddResource(&g.Model.World, &g.Screen) - ecs.AddResource(&g.Model.World, &g.Mouse) + ecs.AddResource(&g.App.World, &g.Screen) + ecs.AddResource(&g.App.World, &g.Mouse) saveEvent := res.SaveEvent{} - ecs.AddResource(&g.Model.World, &saveEvent) + ecs.AddResource(&g.App.World, &saveEvent) fonts := res.NewFonts(GameData) - ecs.AddResource(&g.Model.World, &fonts) + ecs.AddResource(&g.App.World, &fonts) - factory := res.NewEntityFactory(&g.Model.World) - ecs.AddResource(&g.Model.World, &factory) + factory := res.NewEntityFactory(&g.App.World) + ecs.AddResource(&g.App.World, &factory) - achievements := achievements.New(&g.Model.World, GameData, "data/json/achievements.json", "user/achievements.json") - ecs.AddResource(&g.Model.World, achievements) + achievements := achievements.New(&g.App.World, GameData, "data/json/achievements.json", "user/achievements.json") + ecs.AddResource(&g.App.World, achievements) // =========== Systems =========== if load == save.LoadTypeGame { - g.Model.AddSystem(&sys.InitTerrainLoaded{}) + g.App.AddSystem(&sys.InitTerrainLoaded{}) } else if load == save.LoadTypeMap { - g.Model.AddSystem(&sys.InitTerrainMap{ + g.App.AddSystem(&sys.InitTerrainMap{ FS: GameData, MapFolder: mapsFolder, Map: mapLoc, }) } else { - g.Model.AddSystem(&sys.InitTerrain{}) + g.App.AddSystem(&sys.InitTerrain{}) } - g.Model.AddSystem(&sys.InitUI{}) - - g.Model.AddSystem(&sys.Tick{}) - g.Model.AddSystem(&sys.UpdateProduction{}) - g.Model.AddSystem(&sys.UpdatePopulation{}) - g.Model.AddSystem(&sys.DoProduction{}) - g.Model.AddSystem(&sys.DoConsumption{}) - g.Model.AddSystem(&sys.Haul{}) - g.Model.AddSystem(&sys.UpdateStats{}) - g.Model.AddSystem(&sys.RemoveMarkers{ + g.App.AddSystem(&sys.InitUI{}) + + g.App.AddSystem(&sys.Tick{}) + g.App.AddSystem(&sys.UpdateProduction{}) + g.App.AddSystem(&sys.UpdatePopulation{}) + g.App.AddSystem(&sys.DoProduction{}) + g.App.AddSystem(&sys.DoConsumption{}) + g.App.AddSystem(&sys.Haul{}) + g.App.AddSystem(&sys.UpdateStats{}) + g.App.AddSystem(&sys.RemoveMarkers{ MaxTime: TPS, }) - g.Model.AddSystem(&sys.Build{}) - g.Model.AddSystem(&sys.AssignHaulers{}) - g.Model.AddSystem(&sys.Achievements{ + g.App.AddSystem(&sys.Build{}) + g.App.AddSystem(&sys.AssignHaulers{}) + g.App.AddSystem(&sys.Achievements{ PlayerFile: "user/achievements.json", }) - g.Model.AddSystem(&sys.PanAndZoom{ + g.App.AddSystem(&sys.PanAndZoom{ PanButton: ebiten.MouseButton1, ZoomInKey: '+', ZoomOutKey: '-', @@ -203,15 +203,15 @@ func runGame(g *Game, load save.LoadType, name string, mapLoc save.MapLocation, MaxZoom: 4, }) - g.Model.AddSystem(&sys.UpdateUI{}) - g.Model.AddSystem(&sys.Cheats{}) - g.Model.AddSystem(&sys.SaveGame{ + g.App.AddSystem(&sys.UpdateUI{}) + g.App.AddSystem(&sys.Cheats{}) + g.App.AddSystem(&sys.SaveGame{ SaveFolder: "save", MapFolder: "maps", Name: name, MainMenuFunc: func() { runMenu(g, 0) }, }) - g.Model.AddSystem(&sys.GameControls{ + g.App.AddSystem(&sys.GameControls{ PauseKey: ebiten.KeySpace, SlowerKey: '[', FasterKey: ']', @@ -220,22 +220,22 @@ func runGame(g *Game, load save.LoadType, name string, mapLoc save.MapLocation, // =========== UI Systems =========== - g.Model.AddUISystem(&render.CenterView{}) - g.Model.AddUISystem(&render.Terrain{}) - g.Model.AddUISystem(&render.Markers{ + g.App.AddUISystem(&render.CenterView{}) + g.App.AddUISystem(&render.Terrain{}) + g.App.AddUISystem(&render.Markers{ MinOffset: view.TileHeight * 2, MaxOffset: view.TileHeight*2 + 30, Duration: TPS, }) - g.Model.AddUISystem(&render.UI{}) - g.Model.AddUISystem(&render.CardAnimation{ + g.App.AddUISystem(&render.UI{}) + g.App.AddUISystem(&render.CardAnimation{ MaxOffset: 200, Duration: TPS / 4, }) // =========== Load game =========== if load == save.LoadTypeGame { - err := save.LoadWorld(&g.Model.World, saveFolder, name) + err := save.LoadWorld(&g.App.World, saveFolder, name) if err != nil { return err } @@ -245,9 +245,11 @@ func runGame(g *Game, load save.LoadType, name string, mapLoc save.MapLocation, view.TileHeight = sprites.TileHeight } + addRepl(g.App) + // =========== Run =========== - g.Model.Initialize() + g.App.Initialize() return nil } diff --git a/game/run_nowasm.go b/game/run_nowasm.go index 3be63fc..3d5e660 100644 --- a/game/run_nowasm.go +++ b/game/run_nowasm.go @@ -3,7 +3,14 @@ package game import ( + "os" + "strings" + "github.com/hajimehoshi/ebiten/v2" + "github.com/mlange-42/ark-repl/repl" + "github.com/mlange-42/ark-tools/app" + "github.com/mlange-42/ark/ecs" + "github.com/mlange-42/tiny-world/game/res" ) type canvasHelper struct{} @@ -16,3 +23,28 @@ func (c *canvasHelper) isMouseInside(width, height int) bool { x, y := ebiten.CursorPosition() return x >= 0 && y >= 0 && x < width && y < height } + +func addRepl(app *app.App) { + startServer := len(os.Args) > 1 && os.Args[1] == "monitor" + if !startServer { + return + } + + callbacks := repl.Callbacks{ + Pause: func(out *strings.Builder) { + ecs.GetResource[res.GameSpeed](&app.World).Pause = true + }, + Resume: func(out *strings.Builder) { + ecs.GetResource[res.GameSpeed](&app.World).Pause = false + }, + Ticks: func() int { + return int(ecs.GetResource[res.GameTick](&app.World).Tick) + }, + } + + repl := repl.NewRepl(&app.World, callbacks) + + app.AddUISystem(repl.System()) + + repl.StartServer(":9000") +} diff --git a/game/run_wasm.go b/game/run_wasm.go index ffdf02e..12881a6 100644 --- a/game/run_wasm.go +++ b/game/run_wasm.go @@ -4,6 +4,8 @@ package game import ( "syscall/js" + + "github.com/mlange-42/ark-tools/app" ) type canvasHelper struct { @@ -41,3 +43,5 @@ func (c *canvasHelper) onMouseLeave(this js.Value, args []js.Value) interface{} c.mouseInside = false return nil } + +func addRepl(app *app.App) {} diff --git a/go.mod b/go.mod index 18907b9..c2bd033 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/ebitenui/ebitenui v0.7.2 github.com/hajimehoshi/ebiten/v2 v2.9.1 github.com/mlange-42/ark v0.6.1 + github.com/mlange-42/ark-repl v0.0.0-20251008145212-e1503a00bccd github.com/mlange-42/ark-serde v0.3.0 github.com/mlange-42/ark-tools v0.2.1 github.com/spf13/cobra v1.10.1 @@ -16,15 +17,22 @@ require ( github.com/ebitengine/hideconsole v1.0.0 // indirect github.com/ebitengine/purego v0.9.0 // indirect github.com/frustra/bbcode v0.0.0-20201127003707-6ef347fbe1c8 // indirect + github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/tcell/v2 v2.7.4 // indirect github.com/go-text/typesetting v0.3.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jezek/xgb v1.1.1 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mum4k/termdash v0.20.0 // indirect + github.com/nsf/termbox-go v1.1.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/spf13/pflag v1.0.9 // indirect golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect golang.org/x/image v0.32.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.36.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.30.0 // indirect ) diff --git a/go.sum b/go.sum index b258c29..55418fb 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,10 @@ github.com/ebitenui/ebitenui v0.7.2 h1:gSMiKvgJbrbYo57hrYeI3vRzE12kIFDNq4X09WLgM github.com/ebitenui/ebitenui v0.7.2/go.mod h1:QiJoDflkWoBv4V/LKErS3cgzTZHrXDQyqajef7IA8vM= github.com/frustra/bbcode v0.0.0-20201127003707-6ef347fbe1c8 h1:sdIsYe6Vv7KIWZWp8KqSeTl+XlF17d+wHCC4lbxFcYs= github.com/frustra/bbcode v0.0.0-20201127003707-6ef347fbe1c8/go.mod h1:0QBxkXxN+o4FyZgLI9FHY/oUizheze3+bNY/kgCKL+4= +github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU= +github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg= github.com/go-text/typesetting v0.3.0 h1:OWCgYpp8njoxSRpwrdd1bQOxdjOXDj9Rqart9ML4iF4= github.com/go-text/typesetting v0.3.0/go.mod h1:qjZLkhRgOEYMhU9eHBr3AR4sfnGJvOXNLt8yRAySFuY= github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0= @@ -25,18 +29,33 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4= github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mlange-42/ark v0.6.1 h1:7Trx9ZADNCZc9TlWAxAhIkgwVVMc8/19T9knK5U46II= github.com/mlange-42/ark v0.6.1/go.mod h1:gkS9cuklENPTmSjL2z4DcJgJsIVqF1yNwFlx48Hz/Sw= +github.com/mlange-42/ark-repl v0.0.0-20251008145212-e1503a00bccd h1:/WWzcoVBjQIsC0zxgAH/I2td8Vr6GA3+YqXHUr9MIs0= +github.com/mlange-42/ark-repl v0.0.0-20251008145212-e1503a00bccd/go.mod h1:PG1QwzQzjgdykj6XH1+7u4qjHPwlVPr4EIIUPcTrYdg= github.com/mlange-42/ark-serde v0.3.0 h1:3oy0Bd3m4YO9d/h15ULUIcpSokGSaYSs2R0jKZzmYNU= github.com/mlange-42/ark-serde v0.3.0/go.mod h1:gpQHLwLO5lqwgKba5fw2peDG4VfUus7u6zvhnN3Jj/A= github.com/mlange-42/ark-tools v0.2.1 h1:O1NQZvn8C/DXQTHNh/3xKbByHC6MRNvPh1XZv/4hHdk= github.com/mlange-42/ark-tools v0.2.1/go.mod h1:/zQ7Scy3+EscNO1zAiyD3ecnKADbDbNSa/nG/WrTCeU= +github.com/mum4k/termdash v0.20.0 h1:g6yZvE7VJmuefJmDrSrv5Az8IFTTSCqG0x8xiOMPbyM= +github.com/mum4k/termdash v0.20.0/go.mod h1:/kPwGKcOhLawc2OmWJPLQ5nzR5PmcbiKMcVv9/413b4= +github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY= +github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo= github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= 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/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -48,16 +67,50 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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=