From df3597a33020bd6bbb83f6bdf898109366c301f2 Mon Sep 17 00:00:00 2001 From: Jordan Orelli Date: Mon, 2 Nov 2020 01:42:44 +0000 Subject: [PATCH] merge server and sim packages as sim package --- internal/app/game_view.go | 2 +- internal/{server => }/sim/effect.go | 0 internal/{server => }/sim/entity.go | 0 internal/{server => }/sim/floor.go | 0 internal/{server => }/sim/player.go | 0 internal/{server => }/sim/point.go | 0 internal/{server => }/sim/request.go | 0 internal/{server => }/sim/room.go | 0 internal/{server => sim}/server.go | 7 +++---- internal/{server => sim}/session.go | 13 ++++++------- internal/{server => }/sim/tile.go | 0 internal/{server => }/sim/world.go | 0 main.go | 4 ++-- 13 files changed, 12 insertions(+), 14 deletions(-) rename internal/{server => }/sim/effect.go (100%) rename internal/{server => }/sim/entity.go (100%) rename internal/{server => }/sim/floor.go (100%) rename internal/{server => }/sim/player.go (100%) rename internal/{server => }/sim/point.go (100%) rename internal/{server => }/sim/request.go (100%) rename internal/{server => }/sim/room.go (100%) rename internal/{server => sim}/server.go (96%) rename internal/{server => sim}/session.go (94%) rename internal/{server => }/sim/tile.go (100%) rename internal/{server => }/sim/world.go (100%) diff --git a/internal/app/game_view.go b/internal/app/game_view.go index 507e0f1..0203a5d 100644 --- a/internal/app/game_view.go +++ b/internal/app/game_view.go @@ -3,7 +3,7 @@ package app import ( "github.com/gdamore/tcell/v2" "github.com/jordanorelli/astro-domu/internal/math" - "github.com/jordanorelli/astro-domu/internal/server/sim" + "github.com/jordanorelli/astro-domu/internal/sim" "github.com/jordanorelli/astro-domu/internal/wire" "github.com/jordanorelli/blammo" ) diff --git a/internal/server/sim/effect.go b/internal/sim/effect.go similarity index 100% rename from internal/server/sim/effect.go rename to internal/sim/effect.go diff --git a/internal/server/sim/entity.go b/internal/sim/entity.go similarity index 100% rename from internal/server/sim/entity.go rename to internal/sim/entity.go diff --git a/internal/server/sim/floor.go b/internal/sim/floor.go similarity index 100% rename from internal/server/sim/floor.go rename to internal/sim/floor.go diff --git a/internal/server/sim/player.go b/internal/sim/player.go similarity index 100% rename from internal/server/sim/player.go rename to internal/sim/player.go diff --git a/internal/server/sim/point.go b/internal/sim/point.go similarity index 100% rename from internal/server/sim/point.go rename to internal/sim/point.go diff --git a/internal/server/sim/request.go b/internal/sim/request.go similarity index 100% rename from internal/server/sim/request.go rename to internal/sim/request.go diff --git a/internal/server/sim/room.go b/internal/sim/room.go similarity index 100% rename from internal/server/sim/room.go rename to internal/sim/room.go diff --git a/internal/server/server.go b/internal/sim/server.go similarity index 96% rename from internal/server/server.go rename to internal/sim/server.go index e58e3c0..5da565b 100644 --- a/internal/server/server.go +++ b/internal/sim/server.go @@ -1,4 +1,4 @@ -package server +package sim import ( "context" @@ -12,7 +12,6 @@ import ( "github.com/gorilla/websocket" "github.com/jordanorelli/astro-domu/internal/errors" - "github.com/jordanorelli/astro-domu/internal/server/sim" "github.com/jordanorelli/astro-domu/internal/wire" "github.com/jordanorelli/blammo" ) @@ -20,7 +19,7 @@ import ( type Server struct { *blammo.Log http *http.Server - world *sim.World + world *World sync.Mutex lastSessionID int @@ -42,7 +41,7 @@ func (s *Server) Start(host string, port int) error { s.Log = blammo.NewLog("astro", options...).Child("server") } - s.world = sim.NewWorld(s.Log.Child("world")) + s.world = NewWorld(s.Log.Child("world")) go s.world.Run(3) addr := fmt.Sprintf("%s:%d", host, port) diff --git a/internal/server/session.go b/internal/sim/session.go similarity index 94% rename from internal/server/session.go rename to internal/sim/session.go index 3c1ff98..cb840d6 100644 --- a/internal/server/session.go +++ b/internal/sim/session.go @@ -1,4 +1,4 @@ -package server +package sim import ( "encoding/json" @@ -6,7 +6,6 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/jordanorelli/astro-domu/internal/server/sim" "github.com/jordanorelli/astro-domu/internal/wire" "github.com/jordanorelli/blammo" ) @@ -47,7 +46,7 @@ func (sn *session) run() { } // read reads for messages on the underlying websocket. -func (sn *session) read(c chan sim.Request) { +func (sn *session) read(c chan Request) { for { t, b, err := sn.conn.ReadMessage() if err != nil { @@ -93,16 +92,16 @@ func (sn *session) read(c chan sim.Request) { switch v := req.Body.(type) { case *wire.Login: sn.Name = v.Name - c <- sim.Request{ + c <- Request{ From: sn.Name, Seq: req.Seq, - Wants: &sim.SpawnPlayer{ + Wants: &SpawnPlayer{ Name: sn.Name, Outbox: sn.outbox, }, } - case sim.Effect: - c <- sim.Request{ + case Effect: + c <- Request{ From: sn.Name, Seq: req.Seq, Wants: v, diff --git a/internal/server/sim/tile.go b/internal/sim/tile.go similarity index 100% rename from internal/server/sim/tile.go rename to internal/sim/tile.go diff --git a/internal/server/sim/world.go b/internal/sim/world.go similarity index 100% rename from internal/server/sim/world.go rename to internal/sim/world.go diff --git a/main.go b/main.go index a289ece..3118a19 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "github.com/jordanorelli/astro-domu/internal/app" "github.com/jordanorelli/astro-domu/internal/exit" - "github.com/jordanorelli/astro-domu/internal/server" + "github.com/jordanorelli/astro-domu/internal/sim" "github.com/jordanorelli/blammo" ) @@ -37,7 +37,7 @@ func main() { case "client": runClient(os.Args[2]) case "server": - s := server.Server{} + s := sim.Server{} if err := s.Start("127.0.0.1", 12805); err != nil { exit.WithMessage(1, "unable to start server: %v", err) }