From 9f8394f70d5cdc4e9a4a21eb2d4fcb1737de684f Mon Sep 17 00:00:00 2001
From: Zac <zac460@hotmail.co.uk>
Date: Fri, 15 Nov 2024 18:46:02 +0000
Subject: [PATCH] Rename screen package to screens

---
 cmd/main.go                             | 10 +++++-----
 common/textbox.go                       |  1 -
 {screen => screens}/multiplayer.go      |  2 +-
 {screen => screens}/multiplayer_host.go |  2 +-
 {screen => screens}/multiplayer_join.go |  2 +-
 {screen => screens}/multiplayer_menu.go |  2 +-
 screen/screen.go => screens/screens.go  |  2 +-
 {screen => screens}/singleplayer.go     |  2 +-
 {screen => screens}/title.go            |  2 +-
 9 files changed, 12 insertions(+), 13 deletions(-)
 rename {screen => screens}/multiplayer.go (99%)
 rename {screen => screens}/multiplayer_host.go (99%)
 rename {screen => screens}/multiplayer_join.go (99%)
 rename {screen => screens}/multiplayer_menu.go (99%)
 rename screen/screen.go => screens/screens.go (99%)
 rename {screen => screens}/singleplayer.go (99%)
 rename {screen => screens}/title.go (99%)

diff --git a/cmd/main.go b/cmd/main.go
index 4784cdd..dedaaca 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/go-2048-battle/debug"
 	"github.com/z-riley/go-2048-battle/log"
-	"github.com/z-riley/go-2048-battle/screen"
+	"github.com/z-riley/go-2048-battle/screens"
 	"github.com/z-riley/turdgl"
 )
 
@@ -35,18 +35,18 @@ func main() {
 	}
 
 	// Parse starting screen arg
-	screenStr := flag.String("screen", string(screen.Title), "starting screen")
+	screenStr := flag.String("screen", string(screens.Title), "starting screen")
 	flag.Parse()
 
 	// Create screens
-	screen.Init(win)
-	screen.SetScreen(screen.ID(*screenStr), nil)
+	screens.Init(win)
+	screens.SetScreen(screens.ID(*screenStr), nil)
 
 	debugWidget := debug.NewDebugWidget(win)
 
 	// Main game loop
 	for win.IsRunning() {
-		screen.Update()
+		screens.Update()
 
 		if config.Debug {
 			// Add debug overlay
diff --git a/common/textbox.go b/common/textbox.go
index 55c8fbc..c9e009d 100644
--- a/common/textbox.go
+++ b/common/textbox.go
@@ -158,7 +158,6 @@ func NewTooltip() *turdgl.TextBox {
 		SetStyle(turdgl.Style{Colour: ArenaBackgroundColour})
 
 	return turdgl.NewTextBox(r, "Click to edit", FontPathMedium).
-		SetTextOffset(turdgl.Vec{Y: 4}).
 		SetTextSize(16).
 		SetTextColour(LightGreyTextColour)
 }
diff --git a/screen/multiplayer.go b/screens/multiplayer.go
similarity index 99%
rename from screen/multiplayer.go
rename to screens/multiplayer.go
index 4fc7afb..bc71c07 100644
--- a/screen/multiplayer.go
+++ b/screens/multiplayer.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"fmt"
diff --git a/screen/multiplayer_host.go b/screens/multiplayer_host.go
similarity index 99%
rename from screen/multiplayer_host.go
rename to screens/multiplayer_host.go
index 3e81999..3335563 100644
--- a/screen/multiplayer_host.go
+++ b/screens/multiplayer_host.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"errors"
diff --git a/screen/multiplayer_join.go b/screens/multiplayer_join.go
similarity index 99%
rename from screen/multiplayer_join.go
rename to screens/multiplayer_join.go
index 7ce8787..a7911b2 100644
--- a/screen/multiplayer_join.go
+++ b/screens/multiplayer_join.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"context"
diff --git a/screen/multiplayer_menu.go b/screens/multiplayer_menu.go
similarity index 99%
rename from screen/multiplayer_menu.go
rename to screens/multiplayer_menu.go
index 4a8b0fd..fdc0068 100644
--- a/screen/multiplayer_menu.go
+++ b/screens/multiplayer_menu.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/go-2048-battle/common"
diff --git a/screen/screen.go b/screens/screens.go
similarity index 99%
rename from screen/screen.go
rename to screens/screens.go
index 572610b..5e4427b 100644
--- a/screen/screen.go
+++ b/screens/screens.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/turdgl"
diff --git a/screen/singleplayer.go b/screens/singleplayer.go
similarity index 99%
rename from screen/singleplayer.go
rename to screens/singleplayer.go
index ba21c35..d1b6eda 100644
--- a/screen/singleplayer.go
+++ b/screens/singleplayer.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"fmt"
diff --git a/screen/title.go b/screens/title.go
similarity index 99%
rename from screen/title.go
rename to screens/title.go
index d7d4940..fa9d7cd 100644
--- a/screen/title.go
+++ b/screens/title.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/go-2048-battle/common"