Move some packages into the common directory

z-riley · Nov 15, 2024 · d77b825 · d77b825
1 parent 5f8c208
commit d77b825
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 19 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -30,8 +30,9 @@ func main() {
 	}
 	defer win.Destroy()
 
-	// Register window-level keybinds (for development only)
-	win.RegisterKeybind(turdgl.KeyLCtrl, turdgl.KeyPress, func() { win.Quit() })
+	if config.Debug {
+		win.RegisterKeybind(turdgl.KeyLCtrl, turdgl.KeyPress, func() { win.Quit() })
+	}
 
 	// Parse starting screen arg
 	screenStr := flag.String("screen", string(screen.Title), "starting screen")

diff --git a/common/arena.go b/common/arena.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/z-riley/go-2048-battle/backend"
-	"github.com/z-riley/go-2048-battle/backend/grid"
+	"github.com/z-riley/go-2048-battle/common/backend"
+	"github.com/z-riley/go-2048-battle/common/backend/grid"
 	"github.com/z-riley/go-2048-battle/log"
 	"github.com/z-riley/turdgl"
 	"golang.org/x/exp/constraints"

diff --git a/common/arena_test.go b/common/arena_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	"github.com/z-riley/go-2048-battle/backend/grid"
+	"github.com/z-riley/go-2048-battle/common/backend/grid"
 )
 
 func TestGenerateRowAnimations(t *testing.T) {

diff --git a/backend/backend.go → common/backend/backend.go b/backend/backend.go → common/backend/backend.go
@@ -3,8 +3,8 @@ package backend
 import (
 	"encoding/json"
 
-	"github.com/z-riley/go-2048-battle/backend/grid"
-	"github.com/z-riley/go-2048-battle/backend/store"
+	"github.com/z-riley/go-2048-battle/common/backend/grid"
+	"github.com/z-riley/go-2048-battle/common/backend/store"
 	"github.com/z-riley/go-2048-battle/log"
 )
 

diff --git a/backend/backend_test.go → common/backend/backend_test.go b/backend/backend_test.go → common/backend/backend_test.go
diff --git a/backend/grid/grid.go → common/backend/grid/grid.go b/backend/grid/grid.go → common/backend/grid/grid.go
diff --git a/backend/grid/grid_test.go → common/backend/grid/grid_test.go b/backend/grid/grid_test.go → common/backend/grid/grid_test.go
diff --git a/backend/grid/iter.go → common/backend/grid/iter.go b/backend/grid/iter.go → common/backend/grid/iter.go
diff --git a/backend/store/store.go → common/backend/store/store.go b/backend/store/store.go → common/backend/store/store.go
diff --git a/backend/store/store_test.go → common/backend/store/store_test.go b/backend/store/store_test.go → common/backend/store/store_test.go
diff --git a/backend/timer.go → common/backend/timer.go b/backend/timer.go → common/backend/timer.go
diff --git a/comms/ip.go → common/comms/ip.go b/comms/ip.go → common/comms/ip.go
diff --git a/comms/messages.go → common/comms/messages.go b/comms/messages.go → common/comms/messages.go
@@ -3,7 +3,7 @@ package comms
 import (
 	"encoding/json"
 
-	"github.com/z-riley/go-2048-battle/backend"
+	"github.com/z-riley/go-2048-battle/common/backend"
 )
 
 // Message contains data for multiplayer mode communication. The Type field

diff --git a/config/config.go b/config/config.go
@@ -1,8 +1,17 @@
+// Package config contains global configuration.
 package config
 
 const (
-	Version   = "0.0.1"
-	WinWidth  = 1200
+	// Version is used to check compatibility with other go-2048-battle clients when
+	// in versus mode.
+	Version = "0.0.1"
+
+	// Debug enables debugging and diagnostics features which are useful for development.
+	Debug = false
+
+	// WinWidth specifies the pixel width of the window.
+	WinWidth = 1200
+
+	// WinHeight specifies the pixel height of the window.
 	WinHeight = 768
-	Debug     = true
 )
diff --git a/screen/multiplayer.go b/screen/multiplayer.go
@@ -6,10 +6,10 @@ import (
 	"strconv"
 
 	"github.com/brunoga/deep"
-	"github.com/z-riley/go-2048-battle/backend"
-	"github.com/z-riley/go-2048-battle/backend/grid"
 	"github.com/z-riley/go-2048-battle/common"
-	"github.com/z-riley/go-2048-battle/comms"
+	"github.com/z-riley/go-2048-battle/common/backend"
+	"github.com/z-riley/go-2048-battle/common/backend/grid"
+	"github.com/z-riley/go-2048-battle/common/comms"
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/go-2048-battle/log"
 	"github.com/z-riley/turdgl"

diff --git a/screen/multiplayer_host.go b/screen/multiplayer_host.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/moby/moby/pkg/namesgenerator"
 	"github.com/z-riley/go-2048-battle/common"
-	"github.com/z-riley/go-2048-battle/comms"
+	"github.com/z-riley/go-2048-battle/common/comms"
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/go-2048-battle/log"
 	"github.com/z-riley/turdgl"

diff --git a/screen/multiplayer_join.go b/screen/multiplayer_join.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/moby/moby/pkg/namesgenerator"
-	"github.com/z-riley/go-2048-battle/backend/store"
 	"github.com/z-riley/go-2048-battle/common"
-	"github.com/z-riley/go-2048-battle/comms"
+	"github.com/z-riley/go-2048-battle/common/backend/store"
+	"github.com/z-riley/go-2048-battle/common/comms"
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/go-2048-battle/log"
 	"github.com/z-riley/turdgl"

diff --git a/screen/screens.go → screen/screen.go b/screen/screens.go → screen/screen.go
diff --git a/screen/singleplayer.go b/screen/singleplayer.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"github.com/brunoga/deep"
-	"github.com/z-riley/go-2048-battle/backend"
-	"github.com/z-riley/go-2048-battle/backend/grid"
 	"github.com/z-riley/go-2048-battle/common"
+	"github.com/z-riley/go-2048-battle/common/backend"
+	"github.com/z-riley/go-2048-battle/common/backend/grid"
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/turdgl"
 )