Merge origin/modernize-codebase-final-final into main

Author: robertpelloni

.github/workflows/gradle.yml

@@ -0,0 +1,25 @@
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 21
+      uses: actions/setup-java@v3
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+    - name: Build with Gradle
+      run: ./gradlew build

.gitignore

@@ -1,16 +1,7 @@
-.idea/
-
-target/
-bin/
-res/data/
-
-
-nullexitautosave.h.zip
-exitautosave.h.zip
-nullexitautosave.h.zip.temp
-
-dependency-reduced-pom.xml
-
+.gradle
+build
+out
+bin
 *.class
 *.bak
 build/

Dockerfile

@@ -0,0 +1,14 @@
+FROM gradle:8.5-jdk21 AS builder
+WORKDIR /app
+COPY . .
+RUN ./gradlew :server:installDist -x test
+
+FROM eclipse-temurin:21-jre-alpine
+WORKDIR /app
+COPY --from=builder /app/server/build/install/server /app/server
+COPY entrypoint.sh /app/
+RUN chmod +x /app/entrypoint.sh
+
+EXPOSE 4444 4445 4446/udp
+
+ENTRYPOINT ["/app/entrypoint.sh"]

README.md

@@ -2,16 +2,93 @@
 
 # bob's game
 
-https://youtu.be/IAD7phjdMQo
+This repository contains the modernized source code for "Bob's Game" (2012), updated to run on modern Java 21 infrastructure.
 
-https://youtu.be/EBC1QKso3II
+## Architecture
 
-## Setup
+The project is split into three Gradle modules:
 
-Open project in IntelliJ or Eclipse.
+- **`:client`**: The game client (LWJGL 3, OpenGL, OpenAL).
+- **`:server`**: The backend infrastructure (Game Server, Index Server, STUN Server).
+- **`:shared`**: Shared logic, networking packets, and utilities.
 
-Run STUN Server, Index Server, Server, and then Client.
+For a detailed breakdown of the project structure and dependencies, see [STRUCTURE.md](STRUCTURE.md).
 
-Or, run Editor, then open bobsgame_v8830.zip. Export data to create local cache server. (to be detailed further)
+## Prerequisites
 
-discussion here: <https://discord.gg/FfDxFc4JuS>
+- JDK 21
+- Docker (optional, for server deployment)
+
+## Building
+
+To build all modules:
+
+```bash
+./gradlew build
+```
+
+## Running the Client
+
+```bash
+./gradlew :client:run
+```
+
+## Running the Editor
+
+To run the legacy Swing-based Level Editor:
+
+```bash
+./gradlew :client:runEditor
+```
+
+**New Editor Features:**
+- **Select All (Ctrl+A)**: Selects the entire map, sprite, or tileset in the respective editors.
+- **Replace Color**: New menu item in "Palette Tools" to swap a color index globally across the tileset.
+
+## Running the Server
+
+You can run the server locally or via Docker.
+
+### Local
+
+```bash
+./gradlew :server:run
+```
+
+### Docker
+
+Build and start the full stack (Game Server, STUN Server, MySQL Database):
+
+```bash
+docker-compose up --build
+```
+
+Configuration is handled via Environment Variables (see `docker-compose.yml`) or a `server.properties` file in the working directory.
+
+## Features
+
+- **Modern Tech Stack**: Java 21, Gradle 8.5, LWJGL 3, Netty 4, HikariCP.
+- **Security**: BCrypt password hashing with automatic legacy migration.
+- **Containerization**: Full Docker support.
+- **CI/CD**: GitHub Actions workflow included.
+
+## Changelog
+
+### Modernization Phase (Current)
+- **Migrated to Gradle**: Multi-module project structure.
+- **Updated Java**: Targeted Java 21.
+- **Upgraded LWJGL**: Migrated from 2 to 3 (GLFW, OpenAL, STB).
+- **Upgraded Netty**: Migrated from 3 to 4.
+- **Security**: Added BCrypt password hashing.
+- **Infrastructure**: Added Docker and CI/CD support.
+- **Editor**: Re-enabled legacy Swing Editor, added 'Select All' and 'Replace Color' features.
+
+## Roadmap
+
+- [x] Modernize Build System (Gradle)
+- [x] Upgrade Java to 21
+- [x] Migrate Networking to Netty 4
+- [x] Migrate Graphics to LWJGL 3
+- [x] Re-enable Level Editor
+- [ ] Port Editor to LibGDX / Scene2D (Future)
+- [ ] Implement remaining TODO items

STRUCTURE.md

@@ -0,0 +1,45 @@
+# Project Structure & Dashboard
+
+## Modules
+
+### Root Project
+*   `build.gradle`: Root build configuration (versions, plugins, repositories).
+*   `settings.gradle`: Module definitions (`include 'client', 'server', 'shared'`).
+
+### `:shared`
+*   **Path**: `shared/src/main/java/com/bobsgame`
+*   **Purpose**: Common logic shared between Client and Server.
+*   **Key Packages**:
+    *   `utils`: `HexDumper`, `Compression`, `Ternary`.
+    *   `net`: `WaveData` (Audio), Networking constants.
+
+### `:server`
+*   **Path**: `server/src/main/java/com/bobsgame`
+*   **Purpose**: The authoritative game server and STUN server.
+*   **Key Components**:
+    *   `ServerMain`: Entry point.
+    *   `GameServerTCP`: Netty-based TCP server handler.
+    *   `UDPConnection`: Netty-based UDP handling.
+    *   `DBHandler`: Database interaction (HikariCP/MySQL).
+    *   `Match`: Handles game session logic.
+
+### `:client`
+*   **Path**: `client/src/main/java/com/bobsgame`
+*   **Purpose**: The Game Client (LWJGL 3) and Level Editor (Swing).
+*   **Key Components**:
+    *   `ClientMain`: Game entry point.
+    *   `EditorMain`: Level Editor entry point (Swing).
+    *   `GameClientTCP`: Netty-based client networking.
+    *   `Texture`, `Font`: Custom rendering wrappers (stb/GL).
+
+## Resources (`res/`)
+*   `gfx/`: Sprites and textures.
+*   `sfx/`: Audio files.
+*   `music/`: Background music.
+*   `maps/`: Game maps (`.map`).
+*   `tilesets/`: Tileset definitions.
+
+## Documentation
+*   `README.md`: General usage and setup.
+*   `HANDOFF.md`: Modernization details and notes for developers.
+*   `docs/`: Legacy documentation and todo lists.

client/build.gradle

@@ -0,0 +1,73 @@
+import org.gradle.internal.os.OperatingSystem
+
+plugins {
+    id 'java'
+    id 'application'
+}
+
+project.ext.lwjglVersion = "3.3.3"
+
+switch (OperatingSystem.current()) {
+    case OperatingSystem.LINUX:
+        project.ext.lwjglNatives = "natives-linux"
+        break
+    case OperatingSystem.MAC_OS:
+        project.ext.lwjglNatives = "natives-macos"
+        break
+    case OperatingSystem.WINDOWS:
+        project.ext.lwjglNatives = "natives-windows"
+        break
+}
+
+dependencies {
+    implementation project(':shared')
+    implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
+
+    implementation "org.lwjgl:lwjgl"
+    implementation "org.lwjgl:lwjgl-glfw"
+    implementation "org.lwjgl:lwjgl-opengl"
+    implementation "org.lwjgl:lwjgl-openal"
+    implementation "org.lwjgl:lwjgl-stb"
+    implementation "org.lwjgl:lwjgl-jemalloc"
+
+    runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc::$lwjglNatives"
+
+    implementation files('../libs/TWL.jar')
+    implementation files('../libs/TWLEffects.jar')
+    implementation files('../libs/ibxm77.jar')
+
+    implementation 'com.googlecode.soundlibs:jorbis:0.0.17.4'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
+    implementation 'net.java.jinput:jinput:2.0.9'
+    implementation 'commons-net:commons-net:3.8.0'
+    implementation 'com.restfb:restfb:2022.10.0'
+    implementation 'xpp3:xpp3:1.1.4c'
+
+    // Editor dependencies were here but removed/excluded
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main/java', '../libs/twl-lwjgl3/src']
+        }
+        resources {
+            srcDirs = ['src/main/resources', '../res']
+        }
+    }
+}
+
+application {
+    mainClass = 'com.bobsgame.ClientMain'
+}
+
+tasks.register('runEditor', JavaExec) {
+    mainClass = 'com.bobsgame.EditorMain'
+    classpath = sourceSets.main.runtimeClasspath
+    jvmArgs = ['-Djava.library.path=../libs/natives'] // Might not be needed with LWJGL3
+}

…c/main/java/com/bobsgame/ClientMain.java …c/main/java/com/bobsgame/ClientMain.javasrc/main/java/com/bobsgame/ClientMain.java renamed to client/src/main/java/com/bobsgame/ClientMain.java src/main/java/com/bobsgame/ClientMain.java renamed to client/src/main/java/com/bobsgame/ClientMain.java

@@ -368,31 +368,6 @@ public void showControlsImage() {
 		}
 	}
 
-	public void makeGhostThread() {
-		// ghost thread to prevent stuttering
-		// this is due to windows aero, for some reason creating a ghost thread prevents it for some fucking reason
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					Thread.currentThread().setName("ClientMain_ghostThreadToPreventAeroStutter");
-				} catch (SecurityException e) {
-					e.printStackTrace();
-				}
-
-				while (exit == false) {
-					try {
-						Thread.sleep(16);//this only seems to work at 16
-
-						//Thread.yield(); //high cpu usage
-						//if(Display.isActive()==false)Display.processMessages();
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		}).start();
-	}
 
 	public void initDebugLogger() {
 		Logger rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
@@ -702,7 +677,6 @@ public void setFacebookCredentials(String facebookID, String accessToken) {
 	}
 
 	public void mainLoop() {
-		makeGhostThread();
 		focus();
 		StatsUtils.initTimers();