Feature/merge w ith mv serialization

CLAUDE.md

@@ -8,7 +8,10 @@ Neon is a roguelike game engine written in Java 21, consisting of:
 - **neon**: The main game engine and editor
 - **darkness**: A sample game built with the engine
 
-The project is currently being migrated from Java 1.7 to Java 21, with recent changes including upgrading from Nashorn to GraalVM for JavaScript scripting support.
+The project has been migrated from Java 1.7 to Java 21, with key changes including:
+- Upgrading from Nashorn to GraalVM for JavaScript scripting
+- Migrating from MapDB/JDBM to H2 MVStore for persistent storage
+- Adopting Google Java Format for code formatting
 
 ## Build and Development Commands
 
@@ -27,9 +30,34 @@ This creates `target/neon-<version>-jar-with-dependencies.jar` which can be run
 java -jar target/neon-<version>-jar-with-dependencies.jar
 ```
 
+### Running the Application
+After packaging, the JAR can be run directly. The application will start with a main menu where you can:
+- Start a new game using the "darkness" sample game
+- Load a saved game
+- Open the editor to create/modify game content
+
+The main entry point is `neon.Main`, which initializes the Engine and Client with bidirectional LocalPort communication.
+
 ### Running Tests
 ```bash
+# Run all tests
 mvn test
+
+# Run a specific test class
+mvn test -Dtest=ClassName
+
+# Run a specific test method
+mvn test -Dtest=ClassName#methodName
+```
+
+### Code Formatting
+The project uses Google Java Format via the `fmt-maven-plugin`:
+```bash
+# Format all source files (runs automatically during build)
+mvn fmt:format
+
+# Check formatting without making changes
+mvn fmt:check
 ```
 
 ## Architecture
@@ -192,8 +220,16 @@ The engine uses **GraalVM Polyglot** for JavaScript scripting:
 - Located in `darkness/scripts/` directory
 
 ## Java 21 Migration Notes
-The project is migrating from Java 1.7 to Java 21:
-- **Branch**: `feature/java21` (main development branch for migration)
+The project has been migrated from Java 1.7 to Java 21:
 - **Scripting engine**: Migrated from Nashorn (removed in Java 15+) to GraalVM Polyglot
 - **Compiler**: Now uses Java 21 source/target with `maven.compiler.source/target` set to 21
+- **Storage**: Migrated from MapDB/JDBM to H2 MVStore for persistent collections
+- **Formatting**: Google Java Format automatically applied during build
 - Some legacy code may still exist from the Java 1.7 era and should be modernized as needed
+
+## Testing
+The project uses JUnit 5 (Jupiter) for testing:
+- Test files are located in `src/test/java/`
+- Uses Mockito for mocking (version 5.11.0)
+- XMLUnit for XML comparison testing
+- Integration tests exist for critical systems like serialization (`DataStoreIntegrationTest`)

darkness/objects/crafting.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <items>
-  <craft id="shirt_chain" result="shirt_chain" raw="iron" amount="2" cost="1000" />
+  <craft id="shirt_chain_craft" result="shirt_chain" raw="iron" amount="2" cost="1000" />
 </items>
 

darkness/objects/items.xml

@@ -105,8 +105,8 @@
     <stats slot="shirt" />
   </clothing>
   <list id="shirt">
-    <creature id="wool shirt" l="1" />
-    <creature id="silk shirt" l="10" />
+    <item id="wool shirt" l="1" />
+    <item id="silk shirt" l="10" />
   </list>
   <container id="chest" color="brown" char="■" />
   <container id="altar" color="gray" char="Ħ" />

darkness/signs.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <signs>
-  <sign id="s_alraun" name="alraun"><ability id="spell_resistance" size="20" /><power id="heal_p" /></sign>
+  <sign id="s_alraun" name="alraun">
+    <ability id="spell_resistance" size="20" />
+    <power id="heal_p" />
+  </sign>
 </signs>

data/locale/locale.en

@@ -0,0 +1,4 @@
+$newGame=New Game
+$loadGame=Load Game
+$options=Options
+$quit=Quit

neon.ini.xml

@@ -1,8 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <root>
-    <files/>
-    <log/>
-    <threads generate="on"/>
-    <ai>2</ai>
-    <log>FINER</log>
-    <lang>en</lang>
-</root>
+  <files>
+    <file>src/test/resources/sampleMod1</file>
+  </files>
+  <log>finest</log>
+  <threads generate="on" />
+  <ai>10</ai>
+  <lang>en</lang>
+  <keys>qwerty</keys>
+</root>

pom.xml

@@ -144,11 +144,16 @@
             <artifactId>tinylaf</artifactId>
             <version>1.4.0</version>
         </dependency>
-
         <dependency>
-            <groupId>org.fluttercode.jtexgen</groupId>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>2.11.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.priewe</groupId>
             <artifactId>jtexgen</artifactId>
-            <version>1.2</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/neon/Main.java

@@ -47,7 +47,7 @@ public static void main(String[] args) throws IOException {
 
     // create engine and ui
     Engine engine = new Engine(sPort);
-    GameContext context = engine.getContext();
+    GameContext context = engine.getGameEngineState();
     Client client = new Client(cPort, version, context);
 
     // custom look and feels are sometimes stricter than normal ones, apparently