Broken bullshit

Added animation Blender fix reminder

.gitignore

@@ -0,0 +1,15 @@
+# Build artifacts
+build/
+goonscape
+goonscape.exe
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+
+# OS files
+.DS_Store
+Thumbs.db 
+
+resources/models/old_and_test/

.woodpecker.yml

@@ -0,0 +1,25 @@
+pipeline:
+  build:
+    image: golang:1.23
+    commands:
+      # Install build dependencies
+      - apt-get update && apt-get install -y gcc-mingw-w64 cmake zip libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev wayland-protocols libxkbcommon-dev
+      
+      # Build for all platforms
+      - make all
+    
+    when:
+      event: tag
+      tag: v*
+
+  # Optional: Create Gitea release with built artifacts
+  release:
+    image: plugins/gitea-release
+    settings:
+      api_key: 
+        from_secret: gitea_token
+      base_url: https://gitea.boner.be
+      files: build/*.zip
+    when:
+      event: tag
+      tag: v* 

2

@@ -0,0 +1,5 @@
+INFO: 2025/02/10 14:51:58 main.go:15: Starting GoonScape client
+INFO: 2025/02/10 14:51:58 main.go:38: Initializing window
+INFO: 2025/02/10 14:51:58 main.go:55: Loading game assets
+INFO: 2025/02/10 14:51:58 game.go:54: Loading game assets
+INFO: 2025/02/10 14:51:58 assets.go:51: Loading models

Dockerfile.build

@@ -0,0 +1,30 @@
+FROM golang:1.23
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+    gcc-mingw-w64 \
+    cmake \
+    zip \
+    libasound2-dev \
+    mesa-common-dev \
+    libx11-dev \
+    libxrandr-dev \
+    libxi-dev \
+    xorg-dev \
+    libgl1-mesa-dev \
+    libglu1-mesa-dev \
+    libwayland-dev \
+    wayland-protocols \
+    libxkbcommon-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+
+# Copy build scripts
+COPY . /build/
+
+# Set execute permissions
+RUN chmod +x /build/scripts/build.sh
+
+# Build command
+CMD ["make", "all"] 

LICENSE

@@ -1,11 +1,21 @@
-“Commons Clause” License Condition v1.0
+MIT License
 
-The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.
+Copyright (c) 2025 bdnugget
 
-Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you,  right to Sell the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software.  Any license notice or attribution required by the License must also include this Commons Cause License Condition notice.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-Software: GoonScape
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-License: Commons Clause v1.0
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-Licensor: bdnugget
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -0,0 +1,30 @@
+.PHONY: all clean windows linux darwin
+
+include scripts/platforms.mk
+
+BINARY_NAME=goonscape
+VERSION=1.1.0
+BUILD_DIR=build
+ASSETS_DIR=resources
+
+all: clean $(PLATFORMS)
+
+$(PLATFORMS):
+	@echo "Building for $@..."
+	@mkdir -p $(BUILD_DIR)/$@
+	@scripts/build.sh $(word 1,$(subst /, ,$@)) $(word 2,$(subst /, ,$@)) \
+		$(BUILD_DIR)/$@/$(BINARY_NAME)$(if $(findstring windows,$@),.exe,)
+	@cp -r $(ASSETS_DIR) $(BUILD_DIR)/$@/
+	@cd $(BUILD_DIR) && zip -r $(BINARY_NAME)-$(word 1,$(subst /, ,$@))-$(word 2,$(subst /, ,$@))-v$(VERSION).zip $@
+	@echo "Done building for $@"
+
+clean:
+	rm -rf $(BUILD_DIR)
+
+# Development build for current platform
+dev:
+	go build -o $(BINARY_NAME)
+
+# Run tests
+test:
+	go test ./... 

README.md

@@ -0,0 +1,136 @@
+# GoonScape
+
+A multiplayer isometric game inspired by Oldschool RuneScape, built with Go and Raylib.
+
+![GoonScape Screenshot](resources/screenshot.png)
+
+## Features
+
+- 3D isometric world with height-mapped terrain
+- Multiplayer support with client-server architecture
+- Pathfinding and click-to-move navigation
+- Global chat system with floating messages
+- Multiple character models
+- Background music
+
+## Prerequisites
+
+- Go 1.23 or higher
+- GCC (for CGO/SQLite support)
+- OpenGL development libraries
+- Raylib dependencies (see [raylib-go](https://github.com/gen2brain/raylib-go#requirements))
+
+## Installation
+
+### Pre-built Binaries
+The easiest way to get started is to download the latest release from:
+```
+https://gitea.boner.be/bdnugget/goonscape/releases
+```
+Choose the appropriate zip file for your platform:
+- Windows: `goonscape-windows-amd64-v1.1.0.zip`
+- Linux: `goonscape-linux-amd64-v1.1.0.zip`
+
+Extract the zip and run the executable.
+
+### Quick Start
+For development:
+```bash
+# Run directly (recommended for development)
+go run main.go
+
+# Run with local server
+go run main.go -local
+```
+
+### Server Setup
+The server requires CGO for SQLite support:
+```bash
+# Enable CGO
+go env -w CGO_ENABLED=1
+
+# Clone and build server
+git clone https://gitea.boner.be/bdnugget/goonserver.git
+cd goonserver
+go build
+```
+
+### Client Installation
+Then install or build:
+```bash
+# Install the client
+go install gitea.boner.be/bdnugget/goonscape@latest
+```
+
+Or build from source:
+```bash
+git clone https://gitea.boner.be/bdnugget/goonscape.git
+cd goonscape
+go build
+```
+
+## Controls
+
+- **Mouse Click**: Move to location
+- **T**: Open chat
+- **Enter**: Send chat message
+- **Escape**: Cancel chat/Close game (it does both of these at the same time so gg)
+- **Arrow Keys**: Rotate camera
+- **Mouse Wheel**: Zoom in/out
+
+## Configuration
+
+Server connection can be configured using command-line flags:
+
+```bash
+# Connect to default server (boner.be:6969)
+go run main.go
+
+# Connect to local server
+go run main.go -local
+
+# Connect to specific server
+go run main.go -addr somehost        # Uses somehost:6969
+go run main.go -addr somehost:6970   # Uses somehost:6970
+```
+
+Note: The `-local` flag is a shorthand for `-addr localhost:6969` and cannot be used together with `-addr`.
+
+## Building Release Binaries
+
+The project uses Docker to create consistent builds across platforms. To build release binaries:
+
+1. Build the Docker image (only needed once):
+```bash
+sudo docker build -t goonscape-builder -f Dockerfile.build .
+```
+
+2. Create release builds:
+```bash
+sudo docker run -v $(pwd):/build goonscape-builder
+```
+
+This will create zip files in the `build` directory for:
+- Windows (64-bit): `goonscape-windows-amd64-v1.0.0.zip`
+- Linux (64-bit): `goonscape-linux-amd64-v1.0.0.zip`
+
+Each zip contains the binary and all required assets.
+
+## Development
+
+The project uses Protocol Buffers for network communication. If you modify the `.proto` files, regenerate the Go code with:
+```bash
+protoc --go_out=. goonserver/actions/actions.proto
+```
+
+### Fixing the models
+This is a note/reminder to myself. The models and animations are generated with [meshy.ai (referral link, give me credits pls)](https://www.meshy.ai/?utm_source=referral-program&utm_medium=link&utm_content=TUZLRK). Somehow the bones armature things are not in the same root as the model and it becomes like a weird pudding when using the animation. I had to manually fix this in Blender by doing:
+- Selected the char1 mesh thing
+- Alt + P (the right Alt kek) => Clear Parent and Keep Transform
+- Tried to do the same for Armature, they should both be in the Scene collection as siblings, so straight from root
+- Select char1 and press Ctrl + A => All Transforms
+- Repeat for Armature
+- Select char1 and make sure it still has the Armature Modifier attached (via purple wrench icon), I remove it and reapply it just to be sure
+
+When exporting it, I make sure Transform +Y is up direction is turned off, otherwise my gooner walks on the walls instead of the floor lmao
+

assets/assets.go

@@ -1,38 +1,172 @@
 package assets
 
 import (
+	"fmt"
+	"sync"
+
+	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
+var (
+	assetMutex       sync.RWMutex
+	loadedModels     map[string]types.ModelAsset
+	audioMutex       sync.Mutex
+	audioInitialized bool
+)
+
+func init() {
+	loadedModels = make(map[string]types.ModelAsset)
+}
+
+// Helper function to load animations for a model
+func loadModelAnimations(animPaths map[string]string) (types.AnimationSet, error) {
+	var animSet types.AnimationSet
+
+	// Load idle animations if specified
+	if idlePath, ok := animPaths["idle"]; ok {
+		idleAnims := rl.LoadModelAnimations(idlePath)
+		if len(idleAnims) > 0 {
+			animSet.Idle = idleAnims
+			rl.TraceLog(rl.LogInfo, "Loaded idle animation: %s (%d frames, %f seconds)",
+				idlePath, idleAnims[0].FrameCount, float32(idleAnims[0].FrameCount)/60.0)
+		}
+	}
+
+	// Load walk animations if specified
+	if walkPath, ok := animPaths["walk"]; ok {
+		walkAnims := rl.LoadModelAnimations(walkPath)
+		if len(walkAnims) > 0 {
+			animSet.Walk = walkAnims
+			rl.TraceLog(rl.LogInfo, "Loaded walk animation: %s (%d frames, %f seconds)",
+				walkPath, walkAnims[0].FrameCount, float32(walkAnims[0].FrameCount)/60.0)
+		}
+	}
+
+	return animSet, nil
+}
+
 func LoadModels() ([]types.ModelAsset, error) {
-	goonerModel := rl.LoadModel("resources/models/goonion.obj")
+	logging.Info.Println("Loading models")
-	goonerTexture := rl.LoadTexture("resources/models/goonion.png")
+	assetMutex.Lock()
-	rl.SetMaterialTexture(goonerModel.Materials, rl.MapDiffuse, goonerTexture)
+	defer assetMutex.Unlock()
 
-	coomerModel := rl.LoadModel("resources/models/coomer.obj")
+	if len(loadedModels) > 0 {
-	coomerTexture := rl.LoadTexture("resources/models/coomer.png")
+		logging.Info.Println("Returning cached models")
-	rl.SetMaterialTexture(coomerModel.Materials, rl.MapDiffuse, coomerTexture)
+		models := make([]types.ModelAsset, 0, len(loadedModels))
+		for _, model := range loadedModels {
+			models = append(models, model)
+		}
+		return models, nil
+	}
 
-	shrekeModel := rl.LoadModel("resources/models/shreke.obj")
+	// Goonion model and animations
-	shrekeTexture := rl.LoadTexture("resources/models/shreke.png")
+	goonerModel := rl.LoadModel("resources/models/gooner/walk_no_y_transform.glb")
-	rl.SetMaterialTexture(shrekeModel.Materials, rl.MapDiffuse, shrekeTexture)
+	goonerAnims, err := loadModelAnimations(map[string]string{
+		"idle": "resources/models/gooner/idle_no_y_transform.glb",
+		"walk": "resources/models/gooner/walk_no_y_transform.glb",
+	})
+	if err != nil {
+		return nil, err
+	}
 
-	return []types.ModelAsset{
+	// Apply transformations
-		{Model: goonerModel, Texture: goonerTexture},
+	transform := rl.MatrixIdentity()
-		{Model: coomerModel, Texture: coomerTexture},
+	transform = rl.MatrixMultiply(transform, rl.MatrixRotateY(180*rl.Deg2rad))
-		{Model: shrekeModel, Texture: shrekeTexture},
+	transform = rl.MatrixMultiply(transform, rl.MatrixRotateX(-90*rl.Deg2rad))
-	}, nil
+	transform = rl.MatrixMultiply(transform, rl.MatrixScale(1.0, 1.0, 1.0))
+	goonerModel.Transform = transform
+
+	// Coomer model (ready for animations)
+	coomerModel := rl.LoadModel("resources/models/coomer/idle_notransy.glb")
+	coomerAnims, err := loadModelAnimations(map[string]string{
+		"idle": "resources/models/coomer/idle_notransy.glb",
+		"walk": "resources/models/coomer/unsteadywalk_notransy.glb",
+	})
+	if err != nil {
+		return nil, err
+	}
+	coomerModel.Transform = transform
+
+	// Shreke model (ready for animations)
+	shrekeModel := rl.LoadModel("resources/models/shreke/Animation_Slow_Orc_Walk_withSkin.glb")
+	shrekeAnims, err := loadModelAnimations(map[string]string{
+		"idle": "resources/models/shreke/Animation_Slow_Orc_Walk_withSkin.glb",
+		"walk": "resources/models/shreke/Animation_Excited_Walk_M_withSkin.glb",
+	})
+	if err != nil {
+		return nil, err
+	}
+	shrekeModel.Transform = transform
+
+	// Store loaded models
+	models := []types.ModelAsset{
+		{
+			Name:       "gooner",
+			Model:      goonerModel,
+			Animation:  append(goonerAnims.Idle, goonerAnims.Walk...),
+			AnimFrames: int32(len(goonerAnims.Idle) + len(goonerAnims.Walk)),
+			Animations: goonerAnims,
+			YOffset:    0.0,
+		},
+		{
+			Model:      coomerModel,
+			Animation:  append(coomerAnims.Idle, coomerAnims.Walk...),
+			AnimFrames: int32(len(coomerAnims.Idle) + len(coomerAnims.Walk)),
+			Animations: coomerAnims,
+			YOffset:    -4.0,
+		},
+		{
+			Model:      shrekeModel,
+			Animation:  append(shrekeAnims.Idle, shrekeAnims.Walk...),
+			AnimFrames: int32(len(shrekeAnims.Idle) + len(shrekeAnims.Walk)),
+			Animations: shrekeAnims,
+			YOffset:    0.0,
+		},
+	}
+
+	for _, model := range models {
+		loadedModels[model.Name] = model
+	}
+
+	return models, nil
 }
 
 func LoadMusic(filename string) (rl.Music, error) {
-	return rl.LoadMusicStream(filename), nil
+	logging.Info.Printf("Loading music from %s", filename)
+	audioMutex.Lock()
+	defer audioMutex.Unlock()
+
+	if !rl.IsAudioDeviceReady() {
+		err := fmt.Errorf("audio device not initialized")
+		logging.Error.Println(err)
+		return rl.Music{}, err
+	}
+
+	music := rl.LoadMusicStream(filename)
+	if music.CtxType == 0 {
+		err := fmt.Errorf("failed to load music stream")
+		logging.Error.Println(err)
+		return rl.Music{}, err
+	}
+	logging.Info.Println("Music loaded successfully")
+	return music, nil
 }
 
 func UnloadModels(models []types.ModelAsset) {
+	assetMutex.Lock()
+	defer assetMutex.Unlock()
+
 	for _, model := range models {
+		if model.Animation != nil {
+			for i := int32(0); i < model.AnimFrames; i++ {
+				rl.UnloadModelAnimation(model.Animation[i])
+			}
+		}
 		rl.UnloadModel(model.Model)
 		rl.UnloadTexture(model.Texture)
+		delete(loadedModels, model.Name)
 	}
 }
 

config/config.go

@@ -0,0 +1,7 @@
+package config
+
+type Config struct {
+	PlayMusic bool
+}
+
+var Current = Config{PlayMusic: true}

game/camera.go

@@ -10,9 +10,18 @@ var (
 	cameraDistance = float32(20.0)
 	cameraYaw      = float32(145.0)
 	cameraPitch    = float32(45.0)
+	lastMousePos   rl.Vector2 // Add this to track mouse movement
 )
 
 func UpdateCamera(camera *rl.Camera3D, player rl.Vector3, deltaTime float32) {
+	// Adjust target position to be at character's torso height (about half character height)
+	characterHeight := float32(32.0) // Assuming character is roughly 32 units tall
+	targetPos := rl.Vector3{
+		X: player.X,
+		Y: player.Y + characterHeight*0.5, // Focus on middle of character
+		Z: player.Z,
+	}
+
 	wheelMove := rl.GetMouseWheelMove()
 	if wheelMove != 0 {
 		cameraDistance += -wheelMove * 5
@@ -24,6 +33,34 @@ func UpdateCamera(camera *rl.Camera3D, player rl.Vector3, deltaTime float32) {
 		}
 	}
 
+	// Handle middle mouse camera rotation
+	if rl.IsMouseButtonDown(rl.MouseMiddleButton) {
+		currentMousePos := rl.GetMousePosition()
+
+		// If we just started holding the button, initialize last position
+		if !rl.IsMouseButtonPressed(rl.MouseMiddleButton) {
+			mouseDelta := rl.Vector2{
+				X: currentMousePos.X - lastMousePos.X,
+				Y: currentMousePos.Y - lastMousePos.Y,
+			}
+
+			// Adjust rotation speed as needed
+			cameraYaw += mouseDelta.X * 0.5 * deltaTime * 60
+			cameraPitch += mouseDelta.Y * 0.5 * deltaTime * 60
+
+			// Clamp pitch to prevent camera flipping
+			if cameraPitch < 20 {
+				cameraPitch = 20
+			}
+			if cameraPitch > 85 {
+				cameraPitch = 85
+			}
+		}
+
+		lastMousePos = currentMousePos
+	}
+
+	// Keep the keyboard controls too
 	if rl.IsKeyDown(rl.KeyRight) {
 		cameraYaw += 100 * deltaTime
 	}
@@ -47,9 +84,9 @@ func UpdateCamera(camera *rl.Camera3D, player rl.Vector3, deltaTime float32) {
 	cameraPitchRad := float64(cameraPitch) * rl.Deg2rad
 
 	camera.Position = rl.Vector3{
-		X: player.X + cameraDistance*float32(math.Cos(cameraYawRad))*float32(math.Cos(cameraPitchRad)),
+		X: targetPos.X + cameraDistance*float32(math.Cos(cameraYawRad))*float32(math.Cos(cameraPitchRad)),
-		Y: player.Y + cameraDistance*float32(math.Sin(cameraPitchRad)),
+		Y: targetPos.Y + cameraDistance*float32(math.Sin(cameraPitchRad)),
-		Z: player.Z + cameraDistance*float32(math.Sin(cameraYawRad))*float32(math.Cos(cameraPitchRad)),
+		Z: targetPos.Z + cameraDistance*float32(math.Sin(cameraYawRad))*float32(math.Cos(cameraPitchRad)),
 	}
-	camera.Target = player
+	camera.Target = targetPos
 }

game/chat.go

@@ -2,6 +2,7 @@ package game
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"gitea.boner.be/bdnugget/goonscape/types"
@@ -10,14 +11,16 @@ import (
 )
 
 const (
-	maxMessages     = 50
+	maxMessages   = 50
-	chatWindowWidth = 400
+	chatMargin    = 10 // Margin from screen edges
-	chatHeight      = 200
+	chatHeight    = 200
-	messageHeight   = 20
+	messageHeight = 20
-	inputHeight     = 30
+	inputHeight   = 30
+	runeLimit     = 256
 )
 
 type Chat struct {
+	sync.RWMutex
 	messages     []types.ChatMessage
 	inputBuffer  []rune
 	isTyping     bool
@@ -29,7 +32,7 @@ type Chat struct {
 func NewChat() *Chat {
 	return &Chat{
 		messages:    make([]types.ChatMessage, 0, maxMessages),
-		inputBuffer: make([]rune, 0, 256),
+		inputBuffer: make([]rune, 0, runeLimit),
 	}
 }
 
@@ -48,10 +51,13 @@ func (c *Chat) AddMessage(playerID int32, content string) {
 }
 
 func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
+	c.Lock()
+	defer c.Unlock()
 	// Convert protobuf messages to our local type
 	for _, msg := range messages {
 		localMsg := types.ChatMessage{
 			PlayerID: msg.PlayerId,
+			Username: msg.Username,
 			Content:  msg.Content,
 			Time:     time.Unix(0, msg.Timestamp),
 		}
@@ -63,6 +69,12 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
 			}
 			c.messages = append(c.messages, localMsg)
 
+			// Scroll to latest message if it's not already visible
+			visibleMessages := int((chatHeight - inputHeight) / messageHeight)
+			if len(c.messages) > visibleMessages {
+				c.scrollOffset = len(c.messages) - visibleMessages
+			}
+
 			// Add floating message to the player
 			if game, ok := c.userData.(*Game); ok {
 				if msg.PlayerId == game.Player.ID {
@@ -72,13 +84,14 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
 						ExpireTime: time.Now().Add(6 * time.Second),
 					}
 					game.Player.Unlock()
-				} else if otherPlayer, exists := game.OtherPlayers[msg.PlayerId]; exists {
+				} else if otherPlayer, exists := game.OtherPlayers.Load(msg.PlayerId); exists {
-					otherPlayer.Lock()
+					other := otherPlayer.(*types.Player)
-					otherPlayer.FloatingMessage = &types.FloatingMessage{
+					other.Lock()
+					other.FloatingMessage = &types.FloatingMessage{
 						Content:    msg.Content,
 						ExpireTime: time.Now().Add(6 * time.Second),
 					}
-					otherPlayer.Unlock()
+					other.Unlock()
 				}
 			}
 		}
@@ -86,20 +99,40 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
 }
 
 func (c *Chat) Draw(screenWidth, screenHeight int32) {
+	c.RLock()
+	defer c.RUnlock()
+	// Calculate chat window width based on screen width
+	chatWindowWidth := screenWidth - (chatMargin * 2)
+
 	// Draw chat window background
-	chatX := float32(10)
+	chatX := float32(chatMargin)
-	chatY := float32(screenHeight - chatHeight - 10)
+	chatY := float32(screenHeight - chatHeight - chatMargin)
 	rl.DrawRectangle(int32(chatX), int32(chatY), chatWindowWidth, chatHeight, rl.ColorAlpha(rl.Black, 0.5))
 
-	// Draw messages
+	// Draw messages from oldest to newest
 	messageY := chatY + 5
-	startIdx := len(c.messages) - 1 - c.scrollOffset
+	visibleMessages := int((chatHeight - inputHeight) / messageHeight)
-	endIdx := max(0, startIdx-int((chatHeight-inputHeight)/messageHeight))
 
-	for i := startIdx; i >= endIdx && i >= 0; i-- {
+	// Auto-scroll to bottom if no manual scrolling has occurred
+	if c.scrollOffset == 0 {
+		if len(c.messages) > visibleMessages {
+			c.scrollOffset = len(c.messages) - visibleMessages
+		}
+	}
+
+	startIdx := max(0, c.scrollOffset)
+	endIdx := min(len(c.messages), startIdx+visibleMessages)
+
+	for i := startIdx; i < endIdx; i++ {
 		msg := c.messages[i]
-		text := fmt.Sprintf("[%d]: %s", msg.PlayerID, msg.Content)
+		var color rl.Color
-		rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, rl.White)
+		if msg.PlayerID == 0 { // System message
+			color = rl.Gold
+		} else {
+			color = rl.White
+		}
+		text := fmt.Sprintf("%s: %s", msg.Username, msg.Content)
+		rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, color)
 		messageY += messageHeight
 	}
 
@@ -136,14 +169,14 @@ func (c *Chat) Update() (string, bool) {
 
 	key := rl.GetCharPressed()
 	for key > 0 {
-		if len(c.inputBuffer) < 256 {
+		if len(c.inputBuffer) < runeLimit {
 			c.inputBuffer = append(c.inputBuffer[:c.cursorPos], append([]rune{key}, c.inputBuffer[c.cursorPos:]...)...)
 			c.cursorPos++
 		}
 		key = rl.GetCharPressed()
 	}
 
-	if rl.IsKeyPressed(rl.KeyEnter) {
+	if rl.IsKeyPressed(rl.KeyEnter) || rl.IsKeyPressed(rl.KeyKpEnter) {
 		if len(c.inputBuffer) > 0 {
 			message := string(c.inputBuffer)
 			c.inputBuffer = c.inputBuffer[:0]
@@ -154,7 +187,7 @@ func (c *Chat) Update() (string, bool) {
 		c.isTyping = false
 	}
 
-	if rl.IsKeyPressed(rl.KeyEscape) {
+	if rl.IsKeyPressed(rl.KeyEscape) && c.isTyping {
 		c.inputBuffer = c.inputBuffer[:0]
 		c.cursorPos = 0
 		c.isTyping = false
@@ -183,6 +216,13 @@ func max(a, b int) int {
 	return b
 }
 
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
 func clamp(value, min, max int) int {
 	if value < min {
 		return min

game/context.go

@@ -0,0 +1,38 @@
+package game
+
+import (
+	"context"
+	"sync"
+)
+
+type GameContext struct {
+	ctx        context.Context
+	cancel     context.CancelFunc
+	wg         sync.WaitGroup
+	assetsLock sync.RWMutex
+}
+
+func NewGameContext() *GameContext {
+	ctx, cancel := context.WithCancel(context.Background())
+	return &GameContext{
+		ctx:    ctx,
+		cancel: cancel,
+	}
+}
+
+func (gc *GameContext) Shutdown() {
+	gc.cancel()
+	gc.wg.Wait()
+}
+
+func (gc *GameContext) LoadAssets(fn func() error) error {
+	gc.assetsLock.Lock()
+	defer gc.assetsLock.Unlock()
+	return fn()
+}
+
+func (gc *GameContext) UnloadAssets(fn func()) {
+	gc.assetsLock.Lock()
+	defer gc.assetsLock.Unlock()
+	fn()
+}

game/game.go

@@ -1,34 +1,44 @@
 package game
 
 import (
+	"fmt"
+	"os"
+	"sync"
 	"time"
 
+	"sync/atomic"
+
 	"gitea.boner.be/bdnugget/goonscape/assets"
+	"gitea.boner.be/bdnugget/goonscape/config"
+	"gitea.boner.be/bdnugget/goonscape/logging"
+	"gitea.boner.be/bdnugget/goonscape/network"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
+var audioMutex sync.Mutex
+var audioInitOnce sync.Once
+
 type Game struct {
+	ctx          *GameContext
 	Player       *types.Player
-	OtherPlayers map[int32]*types.Player
+	OtherPlayers sync.Map // Using sync.Map for concurrent access
 	Camera       rl.Camera3D
 	Models       []types.ModelAsset
 	Music        rl.Music
 	Chat         *Chat
+	MenuOpen     atomic.Bool
+	QuitChan     chan struct{} // Channel to signal shutdown
+	loginScreen  *LoginScreen
+	isLoggedIn   atomic.Bool
 }
 
 func New() *Game {
 	InitWorld()
 	game := &Game{
-		Player: &types.Player{
+		ctx:          NewGameContext(),
-			PosActual:  rl.NewVector3(5*types.TileSize, 0, 5*types.TileSize),
+		OtherPlayers: sync.Map{},
-			PosTile:    GetTile(5, 5),
-			Speed:      50.0,
-			TargetPath: []types.Tile{},
-			UserData:   nil,
-		},
-		OtherPlayers: make(map[int32]*types.Player),
 		Camera: rl.Camera3D{
 			Position:   rl.NewVector3(0, 10, 10),
 			Target:     rl.NewVector3(0, 0, 0),
@@ -36,29 +46,83 @@ func New() *Game {
 			Fovy:       45.0,
 			Projection: rl.CameraPerspective,
 		},
-		Chat: NewChat(),
+		Chat:        NewChat(),
+		QuitChan:    make(chan struct{}),
+		loginScreen: NewLoginScreen(),
 	}
-	game.Player.UserData = game
 	game.Chat.userData = game
 	return game
 }
 
 func (g *Game) LoadAssets() error {
+	audioMutex.Lock()
+	defer audioMutex.Unlock()
+
+	logging.Info.Println("Loading game assets")
 	var err error
+
+	// Load models first
 	g.Models, err = assets.LoadModels()
 	if err != nil {
+		logging.Error.Printf("Failed to load models: %v", err)
 		return err
 	}
 
-	g.Music, err = assets.LoadMusic("resources/audio/GoonScape2.mp3")
+	// Load music only if enabled
-	if err != nil {
+	if config.Current.PlayMusic {
-		return err
+		logging.Info.Println("Loading music stream")
+		g.Music = rl.LoadMusicStream("resources/audio/GoonScape2.mp3")
+		if g.Music.CtxType == 0 {
+			logging.Error.Println("Failed to load music stream")
+			return fmt.Errorf("failed to load music stream")
+		}
+		logging.Info.Println("Music stream loaded successfully")
+	} else {
+		logging.Info.Println("Music disabled by config")
 	}
 
+	logging.Info.Println("Assets loaded successfully")
 	return nil
 }
 
 func (g *Game) Update(deltaTime float32) {
+	if !g.isLoggedIn.Load() {
+		username, password, isRegistering, submitted := g.loginScreen.Update()
+		if submitted {
+			conn, playerID, err := network.ConnectToServer(username, password, isRegistering)
+			if err != nil {
+				g.loginScreen.SetError(err.Error())
+				return
+			}
+
+			g.Player = &types.Player{
+				Speed:      50.0,
+				TargetPath: []types.Tile{},
+				UserData:   g,
+				QuitDone:   make(chan struct{}),
+				ID:         playerID,
+			}
+			g.AssignModelToPlayer(g.Player)
+
+			go network.HandleServerCommunication(conn, playerID, g.Player, &g.OtherPlayers, g.QuitChan)
+			g.isLoggedIn.Store(true)
+			return
+		}
+		g.loginScreen.Draw()
+		return
+	}
+
+	// Handle ESC for menu
+	if rl.IsKeyPressed(rl.KeyEscape) {
+		g.MenuOpen.Store(!g.MenuOpen.Load())
+		return
+	}
+
+	// Don't process other inputs if menu is open
+	if g.MenuOpen.Load() {
+		return
+	}
+
 	if message, sent := g.Chat.Update(); sent {
 		g.Player.Lock()
 		g.Player.ActionQueue = append(g.Player.ActionQueue, &pb.Action{
@@ -72,14 +136,20 @@ func (g *Game) Update(deltaTime float32) {
 	g.HandleInput()
 
 	if len(g.Player.TargetPath) > 0 {
-		g.Player.MoveTowards(g.Player.TargetPath[0], deltaTime, GetMapGrid())
+		g.Player.Lock()
+		if len(g.Player.TargetPath) > 0 {
+			g.Player.MoveTowards(g.Player.TargetPath[0], deltaTime, GetMapGrid())
+		}
+		g.Player.Unlock()
 	}
 
-	for _, other := range g.OtherPlayers {
+	g.OtherPlayers.Range(func(key, value any) bool {
+		other := value.(*types.Player)
 		if len(other.TargetPath) > 0 {
 			other.MoveTowards(other.TargetPath[0], deltaTime, GetMapGrid())
 		}
-	}
+		return true
+	})
 
 	UpdateCamera(&g.Camera, g.Player.PosActual, deltaTime)
 }
@@ -112,20 +182,43 @@ func (g *Game) DrawMap() {
 	}
 }
 
-func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
+func (g *Game) DrawPlayer(player *types.Player) {
 	player.Lock()
 	defer player.Unlock()
 
+	if player.Model.Meshes == nil {
+		logging.Error.Println("Player model not initialized")
+		return
+	}
+
 	grid := GetMapGrid()
+	modelIndex := int(player.ID) % len(g.Models)
+	modelAsset := g.Models[modelIndex]
+
+	const defaultHeight = 8.0 // Default height above tile, fine tune per model in types.ModelAsset
 	playerPos := rl.Vector3{
 		X: player.PosActual.X,
-		Y: grid[player.PosTile.X][player.PosTile.Y].Height*types.TileHeight + 16.0,
+		Y: grid[player.PosTile.X][player.PosTile.Y].Height*types.TileHeight + defaultHeight + modelAsset.YOffset,
 		Z: player.PosActual.Z,
 	}
 
-	rl.DrawModel(model, playerPos, 16, rl.White)
+	// Check if model has animations
+	if modelAsset.Animations.Idle != nil || modelAsset.Animations.Walk != nil {
+		if player.IsMoving && len(modelAsset.Animations.Walk) > 0 {
+			anim := modelAsset.Animations.Walk[0] // Use first walk animation
+			player.AnimationFrame = player.AnimationFrame % anim.FrameCount
+			rl.UpdateModelAnimation(player.Model, anim, player.AnimationFrame)
+		} else if len(modelAsset.Animations.Idle) > 0 {
+			anim := modelAsset.Animations.Idle[0] // Use first idle animation
+			player.AnimationFrame = player.AnimationFrame % anim.FrameCount
+			rl.UpdateModelAnimation(player.Model, anim, player.AnimationFrame)
+		}
+	}
 
-	if player.FloatingMessage != nil && time.Now().Before(player.FloatingMessage.ExpireTime) {
+	rl.DrawModel(player.Model, playerPos, 16, rl.White)
+
+	// Draw floating messages and path indicators
+	if player.FloatingMessage != nil {
 		screenPos := rl.GetWorldToScreen(rl.Vector3{
 			X: playerPos.X,
 			Y: playerPos.Y + 24.0,
@@ -133,8 +226,6 @@ func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
 		}, g.Camera)
 
 		player.FloatingMessage.ScreenPos = screenPos
-	} else if player.FloatingMessage != nil {
-		player.FloatingMessage = nil
 	}
 
 	if len(player.TargetPath) > 0 {
@@ -157,17 +248,39 @@ func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
 }
 
 func (g *Game) Render() {
+	if !rl.IsWindowReady() {
+		logging.Error.Println("Window not ready for rendering")
+		return
+	}
+
 	rl.BeginDrawing()
-	rl.ClearBackground(rl.RayWhite)
+	defer func() {
+		if rl.IsWindowReady() {
+			rl.EndDrawing()
+		}
+	}()
+
+	if !g.isLoggedIn.Load() {
+		g.loginScreen.Draw()
+		return
+	}
 
 	rl.BeginMode3D(g.Camera)
 	g.DrawMap()
-	g.DrawPlayer(g.Player, g.Player.Model)
+	g.DrawPlayer(g.Player)
-	for id, other := range g.OtherPlayers {
+
-		g.DrawPlayer(other, g.Models[int(id)%len(g.Models)].Model)
+	g.OtherPlayers.Range(func(key, value any) bool {
-	}
+		other := value.(*types.Player)
+		if other.Model.Meshes == nil {
+			g.AssignModelToPlayer(other)
+		}
+		g.DrawPlayer(other)
+		return true
+	})
+
 	rl.EndMode3D()
 
+	// Draw floating messages
 	drawFloatingMessage := func(msg *types.FloatingMessage) {
 		if msg == nil || time.Now().After(msg.ExpireTime) {
 			return
@@ -192,18 +305,41 @@ func (g *Game) Render() {
 		drawFloatingMessage(g.Player.FloatingMessage)
 	}
 
-	for _, other := range g.OtherPlayers {
+	g.OtherPlayers.Range(func(key, value any) bool {
+		other := value.(*types.Player)
 		drawFloatingMessage(other.FloatingMessage)
+		return true
+	})
+
+	// Draw menu if open
+	if g.MenuOpen.Load() {
+		g.DrawMenu()
+	}
+
+	// Only draw chat if menu is not open
+	if !g.MenuOpen.Load() {
+		g.Chat.Draw(int32(rl.GetScreenWidth()), int32(rl.GetScreenHeight()))
 	}
 
 	rl.DrawFPS(10, 10)
-	g.Chat.Draw(int32(rl.GetScreenWidth()), int32(rl.GetScreenHeight()))
-	rl.EndDrawing()
 }
 
 func (g *Game) Cleanup() {
-	assets.UnloadModels(g.Models)
+	// Unload models
-	assets.UnloadMusic(g.Music)
+	if g.Models != nil {
+		assets.UnloadModels(g.Models)
+	}
+
+	// Stop and unload music if enabled
+	if config.Current.PlayMusic && g.Music.CtxType != 0 {
+		rl.StopMusicStream(g.Music)
+		rl.UnloadMusicStream(g.Music)
+	}
+
+	// Close audio device if it's ready
+	if rl.IsAudioDeviceReady() {
+		rl.CloseAudioDevice()
+	}
 }
 
 func (g *Game) HandleInput() {
@@ -223,3 +359,111 @@ func (g *Game) HandleInput() {
 		}
 	}
 }
+
+func (g *Game) DrawMenu() {
+	screenWidth := float32(rl.GetScreenWidth())
+	screenHeight := float32(rl.GetScreenHeight())
+
+	// Semi-transparent background
+	rl.DrawRectangle(0, 0, int32(screenWidth), int32(screenHeight), rl.ColorAlpha(rl.Black, 0.7))
+
+	// Menu title
+	title := "Menu"
+	titleSize := int32(40)
+	titleWidth := rl.MeasureText(title, titleSize)
+	rl.DrawText(title, int32(screenWidth/2)-titleWidth/2, 100, titleSize, rl.White)
+
+	// Menu buttons
+	buttonWidth := float32(200)
+	buttonHeight := float32(40)
+	buttonY := float32(200)
+	buttonSpacing := float32(60)
+
+	menuItems := []string{"Resume", "Settings", "Exit Game"}
+	for _, item := range menuItems {
+		buttonRect := rl.Rectangle{
+			X:      screenWidth/2 - buttonWidth/2,
+			Y:      buttonY,
+			Width:  buttonWidth,
+			Height: buttonHeight,
+		}
+
+		// Check mouse hover
+		mousePoint := rl.GetMousePosition()
+		mouseHover := rl.CheckCollisionPointRec(mousePoint, buttonRect)
+
+		// Draw button
+		if mouseHover {
+			rl.DrawRectangleRec(buttonRect, rl.ColorAlpha(rl.White, 0.3))
+			if rl.IsMouseButtonPressed(rl.MouseLeftButton) {
+				switch item {
+				case "Resume":
+					g.MenuOpen.Store(false)
+				case "Settings":
+					// TODO: Implement settings
+				case "Exit Game":
+					g.Shutdown()
+				}
+			}
+		}
+
+		// Draw button text
+		textSize := int32(20)
+		textWidth := rl.MeasureText(item, textSize)
+		textX := int32(buttonRect.X+buttonRect.Width/2) - textWidth/2
+		textY := int32(buttonRect.Y + buttonRect.Height/2 - float32(textSize)/2)
+		rl.DrawText(item, textX, textY, textSize, rl.White)
+
+		buttonY += buttonSpacing
+	}
+}
+
+func (g *Game) Shutdown() {
+	close(g.QuitChan)
+	<-g.Player.QuitDone
+	rl.CloseWindow()
+	os.Exit(0)
+}
+
+func (g *Game) HandleServerMessages(messages []*pb.ChatMessage) {
+	g.Chat.HandleServerMessages(messages)
+}
+
+func (g *Game) AssignModelToPlayer(player *types.Player) {
+	modelIndex := int(player.ID) % len(g.Models)
+	modelAsset := g.Models[modelIndex]
+
+	player.Model = modelAsset.Model
+	player.Texture = modelAsset.Texture
+	player.AnimationFrame = 0
+}
+
+func (g *Game) Run() {
+	if config.Current.PlayMusic {
+		audioInitOnce.Do(func() {
+			logging.Info.Println("Initializing audio device")
+			rl.InitAudioDevice()
+			if !rl.IsAudioDeviceReady() {
+				logging.Error.Println("Failed to initialize audio device")
+			}
+		})
+		defer func() {
+			logging.Info.Println("Closing audio device")
+			rl.CloseAudioDevice()
+		}()
+	}
+
+	logging.Info.Println("Starting game loop")
+	for !rl.WindowShouldClose() {
+		deltaTime := rl.GetFrameTime()
+		if config.Current.PlayMusic {
+			rl.UpdateMusicStream(g.Music)
+		}
+		g.Update(deltaTime)
+		g.Render()
+	}
+	logging.Info.Println("Game loop ended")
+
+	logging.Info.Println("Closing quit channel")
+	close(g.QuitChan)
+}

game/login.go

@@ -0,0 +1,185 @@
+package game
+
+import (
+	rl "github.com/gen2brain/raylib-go/raylib"
+)
+
+type LoginScreen struct {
+	username      string
+	password      string
+	errorMessage  string
+	isRegistering bool
+	focusedField  int // 0 = username, 1 = password
+}
+
+func NewLoginScreen() *LoginScreen {
+	return &LoginScreen{}
+}
+
+func (l *LoginScreen) Draw() {
+	screenWidth := float32(rl.GetScreenWidth())
+	screenHeight := float32(rl.GetScreenHeight())
+
+	// Draw background
+	rl.DrawRectangle(0, 0, int32(screenWidth), int32(screenHeight), rl.RayWhite)
+
+	// Draw title
+	title := "GoonScape"
+	if l.isRegistering {
+		title += " - Register"
+	} else {
+		title += " - Login"
+	}
+	titleSize := int32(40)
+	titleWidth := rl.MeasureText(title, titleSize)
+	rl.DrawText(title, int32(screenWidth/2)-titleWidth/2, 100, titleSize, rl.Black)
+
+	// Draw input fields
+	inputWidth := float32(200)
+	inputHeight := float32(30)
+	inputX := screenWidth/2 - inputWidth/2
+
+	// Username field
+	rl.DrawRectangleRec(rl.Rectangle{
+		X: inputX, Y: 200,
+		Width: inputWidth, Height: inputHeight,
+	}, rl.LightGray)
+	rl.DrawText(l.username, int32(inputX)+5, 205, 20, rl.Black)
+	if l.focusedField == 0 {
+		rl.DrawRectangleLinesEx(rl.Rectangle{
+			X: inputX - 2, Y: 198,
+			Width: inputWidth + 4, Height: inputHeight + 4,
+		}, 2, rl.Blue)
+	}
+
+	// Password field
+	rl.DrawRectangleRec(rl.Rectangle{
+		X: inputX, Y: 250,
+		Width: inputWidth, Height: inputHeight,
+	}, rl.LightGray)
+	masked := ""
+	for range l.password {
+		masked += "*"
+	}
+	rl.DrawText(masked, int32(inputX)+5, 255, 20, rl.Black)
+	if l.focusedField == 1 {
+		rl.DrawRectangleLinesEx(rl.Rectangle{
+			X: inputX - 2, Y: 248,
+			Width: inputWidth + 4, Height: inputHeight + 4,
+		}, 2, rl.Blue)
+	}
+
+	// Draw error message
+	if l.errorMessage != "" {
+		msgWidth := rl.MeasureText(l.errorMessage, 20)
+		rl.DrawText(l.errorMessage, int32(screenWidth/2)-msgWidth/2, 300, 20, rl.Red)
+	}
+
+	// Draw buttons
+	buttonWidth := float32(100)
+	buttonHeight := float32(30)
+	buttonY := float32(350)
+
+	// Login/Register button
+	actionBtn := rl.Rectangle{
+		X:      screenWidth/2 - buttonWidth - 10,
+		Y:      buttonY,
+		Width:  buttonWidth,
+		Height: buttonHeight,
+	}
+	rl.DrawRectangleRec(actionBtn, rl.Blue)
+	actionText := "Login"
+	if l.isRegistering {
+		actionText = "Register"
+	}
+	actionWidth := rl.MeasureText(actionText, 20)
+	rl.DrawText(actionText,
+		int32(actionBtn.X+actionBtn.Width/2)-actionWidth/2,
+		int32(actionBtn.Y+5),
+		20, rl.White)
+
+	// Switch mode button
+	switchBtn := rl.Rectangle{
+		X:      screenWidth/2 + 10,
+		Y:      buttonY,
+		Width:  buttonWidth,
+		Height: buttonHeight,
+	}
+	rl.DrawRectangleRec(switchBtn, rl.DarkGray)
+	switchText := "Register"
+	if l.isRegistering {
+		switchText = "Login"
+	}
+	switchWidth := rl.MeasureText(switchText, 20)
+	rl.DrawText(switchText,
+		int32(switchBtn.X+switchBtn.Width/2)-switchWidth/2,
+		int32(switchBtn.Y+5),
+		20, rl.White)
+}
+
+func (l *LoginScreen) Update() (string, string, bool, bool) {
+	// Handle input field focus
+	if rl.IsMouseButtonPressed(rl.MouseLeftButton) {
+		mousePos := rl.GetMousePosition()
+		screenWidth := float32(rl.GetScreenWidth())
+		inputWidth := float32(200)
+		inputX := screenWidth/2 - inputWidth/2
+
+		// Check username field
+		if mousePos.X >= inputX && mousePos.X <= inputX+inputWidth &&
+			mousePos.Y >= 200 && mousePos.Y <= 230 {
+			l.focusedField = 0
+		}
+		// Check password field
+		if mousePos.X >= inputX && mousePos.X <= inputX+inputWidth &&
+			mousePos.Y >= 250 && mousePos.Y <= 280 {
+			l.focusedField = 1
+		}
+
+		// Check buttons
+		buttonWidth := float32(100)
+		if mousePos.Y >= 350 && mousePos.Y <= 380 {
+			// Action button
+			if mousePos.X >= screenWidth/2-buttonWidth-10 &&
+				mousePos.X <= screenWidth/2-10 {
+				return l.username, l.password, l.isRegistering, true
+			}
+			// Switch mode button
+			if mousePos.X >= screenWidth/2+10 &&
+				mousePos.X <= screenWidth/2+buttonWidth+10 {
+				l.isRegistering = !l.isRegistering
+			}
+		}
+	}
+
+	// Handle text input
+	key := rl.GetCharPressed()
+	for key > 0 {
+		if l.focusedField == 0 && len(l.username) < 12 {
+			l.username += string(key)
+		} else if l.focusedField == 1 && len(l.password) < 20 {
+			l.password += string(key)
+		}
+		key = rl.GetCharPressed()
+	}
+
+	// Handle backspace
+	if rl.IsKeyPressed(rl.KeyBackspace) {
+		if l.focusedField == 0 && len(l.username) > 0 {
+			l.username = l.username[:len(l.username)-1]
+		} else if l.focusedField == 1 && len(l.password) > 0 {
+			l.password = l.password[:len(l.password)-1]
+		}
+	}
+
+	// Handle tab to switch fields
+	if rl.IsKeyPressed(rl.KeyTab) {
+		l.focusedField = (l.focusedField + 1) % 2
+	}
+
+	return "", "", false, false
+}
+
+func (l *LoginScreen) SetError(msg string) {
+	l.errorMessage = msg
+}

game/pathfinding.go

@@ -83,6 +83,7 @@ func heuristic(a, b types.Tile) float32 {
 }
 
 func distance(a, b types.Tile) float32 {
+	_, _ = a, b
 	return 1.0 // uniform cost for now
 }
 

go.mod

@@ -3,15 +3,15 @@ module gitea.boner.be/bdnugget/goonscape
 go 1.23.0
 
 require (
-	gitea.boner.be/bdnugget/goonserver v0.0.0-20241011195320-f16e8647dc6b
+	gitea.boner.be/bdnugget/goonserver v1.1.0
-	github.com/gen2brain/raylib-go/raylib v0.0.0-20240930075631-c66f9e2942fe
+	github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b
-	google.golang.org/protobuf v1.35.1
+	google.golang.org/protobuf v1.36.3
 )
 
 require (
-	github.com/ebitengine/purego v0.8.0 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
-	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
+	golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 )
 
 replace gitea.boner.be/bdnugget/goonserver => ./goonserver

go.sum

@@ -1,12 +1,16 @@
-github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
-github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/gen2brain/raylib-go/raylib v0.0.0-20240930075631-c66f9e2942fe h1:mInjrbJkUglTM7tBmXG+epnPCE744aj15J7vjJwM4gs=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b h1:JJfspevP3YOXcSKVABizYOv++yMpTJIdPUtoDzF/RWw=
-github.com/gen2brain/raylib-go/raylib v0.0.0-20240930075631-c66f9e2942fe/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

goonserver

@@ -1 +1 @@
-Subproject commit 368fbdbc4743ad5d571789e5ebb7f76cfb964743
+Subproject commit f9ec811b10bbab54e843199eb68156e9e7c143cc

logging/logging.go

@@ -0,0 +1,16 @@
+package logging
+
+import (
+	"log"
+	"os"
+)
+
+var (
+	Info  *log.Logger
+	Error *log.Logger
+)
+
+func init() {
+	Info = log.New(os.Stdout, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
+	Error = log.New(os.Stderr, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
+}

main.go

@@ -1,47 +1,79 @@
 package main
 
 import (
+	"flag"
 	"log"
+	"strings"
 
+	"gitea.boner.be/bdnugget/goonscape/config"
 	"gitea.boner.be/bdnugget/goonscape/game"
+	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/network"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
 func main() {
+	logging.Info.Println("Starting GoonScape client")
+
+	// Raylib log level warn
+	rl.SetTraceLogLevel(rl.LogWarning)
+	// Parse command line flags
+	local := flag.Bool("local", false, "Connect to local server")
+	addr := flag.String("addr", "", "Server address (host or host:port)")
+	noMusic := flag.Bool("no-music", false, "Disable music playback")
+	flag.Parse()
+
+	// Set config before any game initialization
+	config.Current.PlayMusic = !*noMusic
+
+	// Set server address based on flags
+	if *local {
+		if *addr != "" {
+			log.Fatal("Cannot use -local and -addr together")
+		}
+		network.SetServerAddr("localhost:6969")
+	} else if *addr != "" {
+		// If port is not specified, append default port
+		if !strings.Contains(*addr, ":") {
+			*addr += ":6969"
+		}
+		network.SetServerAddr(*addr)
+	}
+
+	logging.Info.Println("Initializing window")
 	rl.InitWindow(1024, 768, "GoonScape")
-	defer rl.CloseWindow()
+	defer func() {
-	rl.InitAudioDevice()
+		logging.Info.Println("Closing window")
+		rl.CloseWindow()
+	}()
+
+	// Initialize audio device first
+	if !rl.IsAudioDeviceReady() {
+		rl.InitAudioDevice()
+		if !rl.IsAudioDeviceReady() {
+			log.Fatal("Failed to initialize audio device")
+		}
+	}
 	defer rl.CloseAudioDevice()
 
 	game := game.New()
+	logging.Info.Println("Loading game assets")
 	if err := game.LoadAssets(); err != nil {
 		log.Fatalf("Failed to load assets: %v", err)
 	}
-	defer game.Cleanup()
+	defer func() {
+		logging.Info.Println("Cleaning up game resources")
+		game.Cleanup()
+	}()
 
-	conn, playerID, err := network.ConnectToServer()
+	if config.Current.PlayMusic {
-	if err != nil {
+		logging.Info.Println("Starting music playback")
-		log.Fatalf("Failed to connect to server: %v", err)
+		rl.PlayMusicStream(game.Music)
+		rl.SetMusicVolume(game.Music, 0.5)
 	}
-	defer conn.Close()
 
-	game.Player.ID = playerID
-	modelIndex := int(playerID) % len(game.Models)
-	game.Player.Model = game.Models[modelIndex].Model
-	game.Player.Texture = game.Models[modelIndex].Texture
-
-	go network.HandleServerCommunication(conn, playerID, game.Player, game.OtherPlayers)
-
-	rl.PlayMusicStream(game.Music)
-	rl.SetMusicVolume(game.Music, 0.5)
 	rl.SetTargetFPS(60)
-
+	logging.Info.Println("Starting game loop")
-	for !rl.WindowShouldClose() {
+	game.Run()
-		rl.UpdateMusicStream(game.Music)
+	logging.Info.Println("Game exited cleanly")
-		deltaTime := rl.GetFrameTime()
-
-		game.Update(deltaTime)
-		game.Render()
-	}
 }

network/network.go

@@ -1,121 +1,240 @@
 package network
 
 import (
+	"bufio"
+	"context"
+	"encoding/binary"
+	"fmt"
+	"io"
 	"log"
 	"net"
+	"sync"
 	"time"
 
-	"gitea.boner.be/bdnugget/goonscape/game"
+	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
 	"google.golang.org/protobuf/proto"
 )
 
-func ConnectToServer() (net.Conn, int32, error) {
+const protoVersion = 1
-	conn, err := net.Dial("tcp", types.ServerAddr)
+
+var serverAddr = "boner.be:6969"
+
+type NetworkManager struct {
+	ctx    context.Context
+	conn   net.Conn
+	reader *bufio.Reader
+	writer *bufio.Writer
+	mu     sync.Mutex
+}
+
+func NewNetworkManager(ctx context.Context) *NetworkManager {
+	return &NetworkManager{
+		ctx: ctx,
+	}
+}
+
+func SetServerAddr(addr string) {
+	serverAddr = addr
+}
+
+func (nm *NetworkManager) Connect(addr string) error {
+	nm.mu.Lock()
+	defer nm.mu.Unlock()
+
+	var err error
+	nm.conn, err = net.Dial("tcp", addr)
 	if err != nil {
-		log.Printf("Failed to dial server: %v", err)
+		return err
-		return nil, 0, err
 	}
 
-	log.Println("Connected to server. Waiting for player ID...")
+	nm.reader = bufio.NewReader(nm.conn)
-	buf := make([]byte, 1024)
+	nm.writer = bufio.NewWriter(nm.conn)
-	n, err := conn.Read(buf)
+
+	go nm.readLoop()
+	return nil
+}
+
+func (nm *NetworkManager) readLoop() {
+	for {
+		select {
+		case <-nm.ctx.Done():
+			return
+		default:
+			// Read and process messages
+		}
+	}
+}
+
+func (nm *NetworkManager) Send(message proto.Message) error {
+	nm.mu.Lock()
+	defer nm.mu.Unlock()
+
+	data, err := proto.Marshal(message)
 	if err != nil {
-		log.Printf("Error reading player ID from server: %v", err)
+		return err
+	}
+
+	// Write length prefix
+	lengthBuf := make([]byte, 4)
+	binary.BigEndian.PutUint32(lengthBuf, uint32(len(data)))
+	if _, err := nm.writer.Write(lengthBuf); err != nil {
+		return err
+	}
+
+	// Write message body
+	if _, err := nm.writer.Write(data); err != nil {
+		return err
+	}
+
+	return nm.writer.Flush()
+}
+
+func ConnectToServer(username, password string, isRegistering bool) (net.Conn, int32, error) {
+	logging.Info.Println("Attempting to connect to server at", serverAddr)
+	conn, err := net.Dial("tcp", serverAddr)
+	if err != nil {
+		logging.Error.Printf("Failed to dial server: %v", err)
 		return nil, 0, err
 	}
+	logging.Info.Println("Connected to server. Authenticating...")
+
+	// Send auth message
+	authAction := &pb.Action{
+		Type:     pb.Action_LOGIN,
+		Username: username,
+		Password: password,
+	}
+	if isRegistering {
+		authAction.Type = pb.Action_REGISTER
+	}
+
+	authBatch := &pb.ActionBatch{
+		Actions:         []*pb.Action{authAction},
+		ProtocolVersion: protoVersion,
+	}
+
+	if err := writeMessage(conn, authBatch); err != nil {
+		conn.Close()
+		return nil, 0, fmt.Errorf("failed to send auth: %v", err)
+	}
+
+	// Read server response
+	reader := bufio.NewReader(conn)
+	lengthBuf := make([]byte, 4)
+	if _, err := io.ReadFull(reader, lengthBuf); err != nil {
+		conn.Close()
+		return nil, 0, fmt.Errorf("failed to read auth response: %v", err)
+	}
+	messageLength := binary.BigEndian.Uint32(lengthBuf)
+
+	messageBuf := make([]byte, messageLength)
+	if _, err := io.ReadFull(reader, messageBuf); err != nil {
+		conn.Close()
+		return nil, 0, fmt.Errorf("failed to read auth response body: %v", err)
+	}
 
 	var response pb.ServerMessage
-	if err := proto.Unmarshal(buf[:n], &response); err != nil {
+	if err := proto.Unmarshal(messageBuf, &response); err != nil {
-		log.Printf("Failed to unmarshal server response: %v", err)
+		conn.Close()
-		return nil, 0, err
+		return nil, 0, fmt.Errorf("failed to unmarshal auth response: %v", err)
+	}
+
+	if response.ProtocolVersion > protoVersion {
+		conn.Close()
+		return nil, 0, fmt.Errorf("server requires newer protocol version (server: %d, client: %d)",
+			response.ProtocolVersion, protoVersion)
+	}
+
+	if !response.AuthSuccess {
+		conn.Close()
+		return nil, 0, fmt.Errorf("authentication failed: %s", response.ErrorMessage)
 	}
 
 	playerID := response.GetPlayerId()
-	log.Printf("Successfully connected with player ID: %d", playerID)
+	log.Printf("Successfully authenticated with player ID: %d", playerID)
 	return conn, playerID, nil
 }
 
-func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Player, otherPlayers map[int32]*types.Player) {
+func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Player, otherPlayers *sync.Map, quitChan <-chan struct{}) {
-	buf := make([]byte, 4096)
+	defer func() {
-
+		logging.Info.Println("Closing connection and cleaning up for player", playerID)
-	actionTicker := time.NewTicker(types.ClientTickRate)
+		conn.Close()
-	defer actionTicker.Stop()
+		close(player.QuitDone)
-
-	go func() {
-		for range actionTicker.C {
-			player.Lock()
-			if len(player.ActionQueue) > 0 {
-				actions := make([]*pb.Action, len(player.ActionQueue))
-				copy(actions, player.ActionQueue)
-
-				batch := &pb.ActionBatch{
-					PlayerId: playerID,
-					Actions:  actions,
-					Tick:     player.CurrentTick,
-				}
-
-				player.ActionQueue = player.ActionQueue[:0]
-				player.Unlock()
-
-				data, err := proto.Marshal(batch)
-				if err != nil {
-					log.Printf("Failed to marshal action batch: %v", err)
-					continue
-				}
-
-				if _, err = conn.Write(data); err != nil {
-					log.Printf("Failed to send actions to server: %v", err)
-					return
-				}
-			} else {
-				player.Unlock()
-			}
-		}
 	}()
 
+	reader := bufio.NewReader(conn)
+	ticker := time.NewTicker(100 * time.Millisecond)
+	defer ticker.Stop()
+
 	for {
-		n, err := conn.Read(buf)
+		select {
-		if err != nil {
+		case <-quitChan:
-			log.Printf("Failed to read from server: %v", err)
 			return
-		}
+		case <-ticker.C:
-
+			// Read message length
-		var serverMessage pb.ServerMessage
+			lengthBuf := make([]byte, 4)
-		if err := proto.Unmarshal(buf[:n], &serverMessage); err != nil {
+			if _, err := io.ReadFull(reader, lengthBuf); err != nil {
-			log.Printf("Failed to unmarshal server message: %v", err)
+				log.Printf("Failed to read message length: %v", err)
-			continue
+				continue
-		}
-
-		player.Lock()
-		player.CurrentTick = serverMessage.CurrentTick
-
-		tickDiff := serverMessage.CurrentTick - player.CurrentTick
-		if tickDiff > types.MaxTickDesync {
-			for _, state := range serverMessage.Players {
-				if state.PlayerId == playerID {
-					player.ForceResync(state)
-					break
-				}
 			}
-		}
+			messageLength := binary.BigEndian.Uint32(lengthBuf)
-		player.Unlock()
 
-		for _, state := range serverMessage.Players {
+			// Read message body
-			if state.PlayerId == playerID {
+			messageBuf := make([]byte, messageLength)
+			if _, err := io.ReadFull(reader, messageBuf); err != nil {
+				log.Printf("Failed to read message body: %v", err)
 				continue
 			}
 
-			if otherPlayer, exists := otherPlayers[state.PlayerId]; exists {
+			// Process server message
-				otherPlayer.UpdatePosition(state, types.ServerTickRate)
+			var serverMessage pb.ServerMessage
-			} else {
+			if err := proto.Unmarshal(messageBuf, &serverMessage); err != nil {
-				otherPlayers[state.PlayerId] = types.NewPlayer(state)
+				log.Printf("Failed to unmarshal server message: %v", err)
+				continue
 			}
-		}
 
-		if g, ok := player.UserData.(*game.Game); ok && len(serverMessage.ChatMessages) > 0 {
+			// Update player states
-			g.Chat.HandleServerMessages(serverMessage.ChatMessages)
+			for _, state := range serverMessage.Players {
+				if state == nil {
+					logging.Error.Println("Received nil player state")
+					continue
+				}
+
+				if state.PlayerId == playerID {
+					player.UpdatePosition(state, types.ServerTickRate)
+				} else if existing, ok := otherPlayers.Load(state.PlayerId); ok {
+					existing.(*types.Player).UpdatePosition(state, types.ServerTickRate)
+				} else {
+					newPlayer := types.NewPlayer(state)
+					otherPlayers.Store(state.PlayerId, newPlayer)
+				}
+			}
+
+			// Handle chat messages
+			if handler, ok := player.UserData.(types.ChatMessageHandler); ok {
+				handler.HandleServerMessages(serverMessage.ChatMessages)
+			}
 		}
 	}
 }
+
+// Helper function to write length-prefixed messages
+func writeMessage(conn net.Conn, msg proto.Message) error {
+	data, err := proto.Marshal(msg)
+	if err != nil {
+		return err
+	}
+
+	// Write length prefix
+	lengthBuf := make([]byte, 4)
+	binary.BigEndian.PutUint32(lengthBuf, uint32(len(data)))
+	if _, err := conn.Write(lengthBuf); err != nil {
+		return err
+	}
+
+	// Write message body
+	_, err = conn.Write(data)
+	return err
+}

scripts/build.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Main build process
+build() {
+    local os=$1
+    local arch=$2
+    local output=$3
+
+    # Set GOOS and GOARCH for cross-compilation
+    export GOOS=$os
+    export GOARCH=$arch
+
+    # Disable CGO only for cross-compilation
+    if [ "$os" != "$(go env GOOS)" ] || [ "$arch" != "$(go env GOARCH)" ]; then
+        export CGO_ENABLED=0
+    fi
+
+    if [ "$os" = "windows" ]; then
+        export CC=x86_64-w64-mingw32-gcc
+        export CXX=x86_64-w64-mingw32-g++
+    fi
+
+    go build -buildvcs=false -ldflags="-s -w" -o $output
+}
+
+# Call build with provided arguments
+build "$1" "$2" "$3" 

scripts/platforms.mk

@@ -0,0 +1 @@
+PLATFORMS=windows/amd64 linux/amd64 

segfault.txt

@@ -0,0 +1,126 @@
+INFO: 2025/02/10 15:53:21 main.go:16: Starting GoonScape client
+INFO: 2025/02/10 15:53:21 main.go:43: Initializing window
+INFO: 2025/02/10 15:53:21 main.go:60: Loading game assets
+INFO: 2025/02/10 15:53:21 game.go:61: Loading game assets
+INFO: 2025/02/10 15:53:21 assets.go:51: Loading models
+INFO: 2025/02/10 15:53:21 game.go:81: Music disabled by config
+INFO: 2025/02/10 15:53:21 game.go:84: Assets loaded successfully
+INFO: 2025/02/10 15:53:21 main.go:76: Starting game loop
+INFO: 2025/02/10 15:53:21 game.go:456: Starting game loop
+malloc(): unsorted double linked list corrupted
+SIGABRT: abort
+PC=0x78a790604c4c m=0 sigcode=18446744073709551610
+signal arrived during cgo execution
+
+goroutine 1 gp=0xc0000061c0 m=0 mp=0xaf8e20 [syscall, locked to thread]:
+runtime.cgocall(0x6da9a0, 0xc00002da50)
+	/usr/lib/go/src/runtime/cgocall.go:167 +0x5b fp=0xc00002da28 sp=0xc00002d9f0 pc=0x46d0fb
+github.com/gen2brain/raylib-go/raylib._Cfunc_EndDrawing()
+	_cgo_gotypes.go:2539 +0x3f fp=0xc00002da50 sp=0xc00002da28 pc=0x51cdbf
+github.com/gen2brain/raylib-go/raylib.EndDrawing(...)
+	/home/bd/.cache/go/mod/github.com/gen2brain/raylib-go/raylib@v0.0.0-20250109172833-6dbba4f81a9b/rcore.go:464
+gitea.boner.be/bdnugget/goonscape/game.(*Game).Render.func1()
+	/home/bd/Projects/go/goonscape/game/game.go:259 +0x36 fp=0xc00002da68 sp=0xc00002da50 pc=0x6b6fb6
+runtime.deferreturn()
+	/usr/lib/go/src/runtime/panic.go:605 +0x5e fp=0xc00002daf8 sp=0xc00002da68 pc=0x4396fe
+gitea.boner.be/bdnugget/goonscape/game.(*Game).Render(0xc0001ae000)
+	/home/bd/Projects/go/goonscape/game/game.go:265 +0x405 fp=0xc00002dbf8 sp=0xc00002daf8 pc=0x6b27a5
+gitea.boner.be/bdnugget/goonscape/game.(*Game).Run(0xc0001ae000)
+	/home/bd/Projects/go/goonscape/game/game.go:463 +0x105 fp=0xc00002dcc0 sp=0xc00002dbf8 pc=0x6b3e85
+main.main()
+	/home/bd/Projects/go/goonscape/main.go:77 +0xb85 fp=0xc00002df50 sp=0xc00002dcc0 pc=0x6b8345
+runtime.main()
+	/usr/lib/go/src/runtime/proc.go:272 +0x28b fp=0xc00002dfe0 sp=0xc00002df50 pc=0x43d84b
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00002dfe8 sp=0xc00002dfe0 pc=0x47ac81
+
+goroutine 2 gp=0xc000006c40 m=nil [force gc (idle)]:
+runtime.gopark(0xaedc20?, 0xaf8e20?, 0x0?, 0x0?, 0x0?)
+	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc0000567a8 sp=0xc000056788 pc=0x47356e
+runtime.goparkunlock(...)
+	/usr/lib/go/src/runtime/proc.go:430
+runtime.forcegchelper()
+	/usr/lib/go/src/runtime/proc.go:337 +0xb3 fp=0xc0000567e0 sp=0xc0000567a8 pc=0x43db93
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000567e8 sp=0xc0000567e0 pc=0x47ac81
+created by runtime.init.7 in goroutine 1
+	/usr/lib/go/src/runtime/proc.go:325 +0x1a
+
+goroutine 3 gp=0xc000007180 m=nil [GC sweep wait]:
+runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
+	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc00006af80 sp=0xc00006af60 pc=0x47356e
+runtime.goparkunlock(...)
+	/usr/lib/go/src/runtime/proc.go:430
+runtime.bgsweep(0xc000080000)
+	/usr/lib/go/src/runtime/mgcsweep.go:277 +0x94 fp=0xc00006afc8 sp=0xc00006af80 pc=0x428714
+runtime.gcenable.gowrap1()
+	/usr/lib/go/src/runtime/mgc.go:204 +0x25 fp=0xc00006afe0 sp=0xc00006afc8 pc=0x41ce25
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00006afe8 sp=0xc00006afe0 pc=0x47ac81
+created by runtime.gcenable in goroutine 1
+	/usr/lib/go/src/runtime/mgc.go:204 +0x66
+
+goroutine 4 gp=0xc000007340 m=nil [GC scavenge wait]:
+runtime.gopark(0xc000080000?, 0x8e5b60?, 0x1?, 0x0?, 0xc000007340?)
+	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000064f78 sp=0xc000064f58 pc=0x47356e
+runtime.goparkunlock(...)
+	/usr/lib/go/src/runtime/proc.go:430
+runtime.(*scavengerState).park(0xaf8060)
+	/usr/lib/go/src/runtime/mgcscavenge.go:425 +0x49 fp=0xc000064fa8 sp=0xc000064f78 pc=0x426149
+runtime.bgscavenge(0xc000080000)
+	/usr/lib/go/src/runtime/mgcscavenge.go:653 +0x3c fp=0xc000064fc8 sp=0xc000064fa8 pc=0x4266bc
+runtime.gcenable.gowrap2()
+	/usr/lib/go/src/runtime/mgc.go:205 +0x25 fp=0xc000064fe0 sp=0xc000064fc8 pc=0x41cdc5
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000064fe8 sp=0xc000064fe0 pc=0x47ac81
+created by runtime.gcenable in goroutine 1
+	/usr/lib/go/src/runtime/mgc.go:205 +0xa5
+
+goroutine 18 gp=0xc000104700 m=nil [finalizer wait]:
+runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
+	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000184e20 sp=0xc000184e00 pc=0x47356e
+runtime.runfinq()
+	/usr/lib/go/src/runtime/mfinal.go:193 +0x145 fp=0xc000184fe0 sp=0xc000184e20 pc=0x41bea5
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000184fe8 sp=0xc000184fe0 pc=0x47ac81
+created by runtime.createfing in goroutine 1
+	/usr/lib/go/src/runtime/mfinal.go:163 +0x3d
+
+goroutine 19 gp=0xc0001048c0 m=nil [chan receive]:
+runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
+	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc00006bf18 sp=0xc00006bef8 pc=0x47356e
+runtime.chanrecv(0xc0001140e0, 0x0, 0x1)
+	/usr/lib/go/src/runtime/chan.go:639 +0x3bc fp=0xc00006bf90 sp=0xc00006bf18 pc=0x40c89c
+runtime.chanrecv1(0x0?, 0x0?)
+	/usr/lib/go/src/runtime/chan.go:489 +0x12 fp=0xc00006bfb8 sp=0xc00006bf90 pc=0x40c4d2
+runtime.unique_runtime_registerUniqueMapCleanup.func1(...)
+	/usr/lib/go/src/runtime/mgc.go:1781
+runtime.unique_runtime_registerUniqueMapCleanup.gowrap1()
+	/usr/lib/go/src/runtime/mgc.go:1784 +0x2f fp=0xc00006bfe0 sp=0xc00006bfb8 pc=0x41fe4f
+runtime.goexit({})
+	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00006bfe8 sp=0xc00006bfe0 pc=0x47ac81
+created by unique.runtime_registerUniqueMapCleanup in goroutine 1
+	/usr/lib/go/src/runtime/mgc.go:1779 +0x96
+
+rax    0x0
+rbx    0x4829
+rcx    0x78a790604c4c
+rdx    0x6
+rdi    0x4829
+rsi    0x4829
+rbp    0x78a7902fc740
+rsp    0x7ffd63425870
+r8     0xffffffff
+r9     0x0
+r10    0x8
+r11    0x246
+r12    0x7ffd634259d0
+r13    0x6
+r14    0x7ffd634259d0
+r15    0x7ffd634259d0
+rip    0x78a790604c4c
+rflags 0x246
+cs     0x33
+fs     0x0
+gs     0x0
+exit status 2

types/player.go

@@ -1,12 +1,34 @@
 package types
 
 import (
+	"sync"
 	"time"
 
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
+type Player struct {
+	sync.RWMutex
+	PosActual             rl.Vector3
+	PosTile               Tile
+	TargetPath            []Tile
+	ActionQueue           []*pb.Action
+	Speed                 float32
+	ID                    int32
+	IsMoving              bool
+	AnimationFrame        int32
+	LastAnimUpdate        time.Time
+	LastUpdateTime        time.Time
+	InterpolationProgress float32
+	FloatingMessage       *FloatingMessage
+	QuitDone              chan struct{}
+	UserData              interface{}
+	Model                 rl.Model
+	Texture               rl.Texture2D
+	Username              string
+}
+
 func (p *Player) MoveTowards(target Tile, deltaTime float32, mapGrid [][]Tile) {
 	p.Lock()
 	defer p.Unlock()
@@ -19,6 +41,33 @@ func (p *Player) MoveTowards(target Tile, deltaTime float32, mapGrid [][]Tile) {
 
 	direction := rl.Vector3Subtract(targetPos, p.PosActual)
 	distance := rl.Vector3Length(direction)
+
+	if distance > 1.0 {
+		wasMoving := p.IsMoving
+		p.IsMoving = true
+
+		if !wasMoving {
+			p.AnimationFrame = 0
+		}
+
+		oldFrame := p.AnimationFrame
+		p.AnimationFrame += int32(deltaTime * 60)
+		rl.TraceLog(rl.LogInfo, "Walk frame update: %d -> %d (delta: %f)",
+			oldFrame, p.AnimationFrame, deltaTime)
+	} else {
+		wasMoving := p.IsMoving
+		p.IsMoving = false
+
+		if wasMoving {
+			p.AnimationFrame = 0
+		}
+
+		oldFrame := p.AnimationFrame
+		p.AnimationFrame += int32(deltaTime * 60)
+		rl.TraceLog(rl.LogInfo, "Idle frame update: %d -> %d (delta: %f)",
+			oldFrame, p.AnimationFrame, deltaTime)
+	}
+
 	if distance > 0 {
 		direction = rl.Vector3Scale(direction, p.Speed*deltaTime/distance)
 	}
@@ -41,9 +90,12 @@ func NewPlayer(state *pb.PlayerState) *Player {
 			Y: float32(state.Y * TileHeight),
 			Z: float32(state.Y * TileSize),
 		},
-		PosTile: Tile{X: int(state.X), Y: int(state.Y)},
+		PosTile:        Tile{X: int(state.X), Y: int(state.Y)},
-		Speed:   50.0,
+		Speed:          50.0,
-		ID:      state.PlayerId,
+		ID:             state.PlayerId,
+		IsMoving:       false,
+		AnimationFrame: 0,
+		LastAnimUpdate: time.Now(),
 	}
 }
 

types/types.go

@@ -1,7 +1,6 @@
 package types
 
 import (
-	"sync"
 	"time"
 
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
@@ -14,30 +13,27 @@ type Tile struct {
 	Walkable bool
 }
 
-type Player struct {
+type AnimationSet struct {
-	sync.Mutex
+	Idle []rl.ModelAnimation
-	PosActual             rl.Vector3
+	Walk []rl.ModelAnimation
-	PosTile               Tile
+	// Can add more animation types later like:
-	TargetPath            []Tile
+	// Attack []ModelAnimation
-	ActionQueue           []*pb.Action
+	// Jump   []ModelAnimation
-	Speed                 float32
-	Model                 rl.Model
-	Texture               rl.Texture2D
-	ID                    int32
-	CurrentTick           int64
-	LastUpdateTime        time.Time
-	InterpolationProgress float32
-	UserData              interface{} // Used to store reference to game
-	FloatingMessage       *FloatingMessage
 }
 
 type ModelAsset struct {
-	Model   rl.Model
+	Model      rl.Model
-	Texture rl.Texture2D
+	Texture    rl.Texture2D
+	Animation  []rl.ModelAnimation // Keep this for compatibility
+	AnimFrames int32               // Keep this for compatibility
+	Animations AnimationSet        // New field for organized animations
+	YOffset    float32             // Additional height offset (added to default 8.0)
+	Name       string
 }
 
 type ChatMessage struct {
 	PlayerID int32
+	Username string
 	Content  string
 	Time     time.Time
 }
@@ -48,6 +44,17 @@ type FloatingMessage struct {
 	ScreenPos  rl.Vector2 // Store the screen position for 2D rendering
 }
 
+type ChatMessageHandler interface {
+	HandleServerMessages([]*pb.ChatMessage)
+}
+
+type PlayerState struct {
+	PlayerId int32
+	X        int32
+	Y        int32
+	Username string
+}
+
 const (
 	MapWidth   = 50
 	MapHeight  = 50
@@ -58,6 +65,4 @@ const (
 	ServerTickRate = 600 * time.Millisecond
 	ClientTickRate = 50 * time.Millisecond
 	MaxTickDesync  = 5
-	// ServerAddr     = "localhost:6969"
-	ServerAddr = "boner.be:6969"
 )