Restructure code

.gitignore

@@ -3,5 +3,3 @@
 *.iws
 .idea/
 .vscode/
-
-*.mapper.dart

app/analysis_options.yaml

@@ -12,6 +12,9 @@ analyzer:
   exclude:
     - "**/*.g.dart"
     - "**/*.freezed.dart"
+    - "build/**/*.dart"
+    - "lib/src/rust/*.dart"
+    - "lib/src/rust/**/*.dart"
   errors:
     invalid_annotation_target: ignore
 linter:

app/lib/game/board/game.dart

@@ -0,0 +1,3 @@
+import 'package:flame/game.dart';
+
+class BoardGame extends FlameGame {}

app/lib/game/board/grid.dart

@@ -0,0 +1,3 @@
+import 'package:flame/components.dart';
+
+class BoardGrid extends Component {}

app/lib/game/board.dart → app/lib/game/world/game.dart

@@ -8,9 +8,9 @@ import 'package:flame/game.dart';
 import 'package:flame_tiled/flame_tiled.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
-import 'package:qeck/game/inventory.dart';
-import 'package:qeck/game/player.dart';
-import 'package:qeck/game/wall.dart';
+import 'package:qeck/game/world/inventory.dart';
+import 'package:qeck/game/world/player.dart';
+import 'package:qeck/game/world/wall.dart';
 import 'package:qeck/services/network.dart';
 
 class SpacedSpriteSheet {
@@ -34,7 +34,7 @@ class SpacedSpriteSheet {
   }
 }
 
-class BoardGame extends FlameGame with KeyboardEvents, HasCollisionDetection {
+class GameWorld extends FlameGame with KeyboardEvents, HasCollisionDetection {
   final NetworkingService networkingService;
   final BoardPlayer _player = BoardPlayer(true);
   final Map<int, BoardPlayer> _players = <int, BoardPlayer>{};
@@ -43,7 +43,7 @@ class BoardGame extends FlameGame with KeyboardEvents, HasCollisionDetection {
   Vector2 get tileSize => _tileSize;
   final VoidCallback onEscape;
 
-  BoardGame({
+  GameWorld({
     required this.networkingService,
     required this.onEscape,
   });
@@ -52,7 +52,11 @@ class BoardGame extends FlameGame with KeyboardEvents, HasCollisionDetection {
 
   @override
   Future<void> onLoad() async {
-    final component = await TiledComponent.load('map.tmx', _tileSize);
+    final component = await TiledComponent.load(
+      'map.tmx',
+      _tileSize,
+      useAtlas: false,
+    );
 
     final objects = component.tileMap.getLayer<ObjectGroup>('Objects')?.objects;
     final spawn = objects?.firstWhere(

app/lib/game/inventory.dart → app/lib/game/world/inventory.dart

@@ -4,7 +4,7 @@ import 'dart:ui';
 import 'package:flame/components.dart';
 import 'package:flame/events.dart';
 import 'package:flame/flame.dart';
-import 'package:qeck/game/board.dart';
+import 'package:qeck/game/world/game.dart';
 
 class HudSpriteSheet {
   final SpacedSpriteSheet _spriteSheet;

app/lib/game/player.dart → app/lib/game/world/player.dart

@@ -8,8 +8,8 @@ import 'package:flame/effects.dart';
 import 'package:flame/extensions.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/text.dart';
-import 'package:qeck/game/board.dart';
-import 'package:qeck/game/wall.dart';
+import 'package:qeck/game/world/game.dart';
+import 'package:qeck/game/world/wall.dart';
 import 'package:qeck/models/message.dart';
 import 'package:qeck/models/state.dart';
 
@@ -50,7 +50,7 @@ extension RendererExtension on PlayerState {
 
 class BoardPlayer
     extends SpriteAnimationGroupComponent<(PlayerState, PlayerDirection)>
-    with HasGameRef<BoardGame>, CollisionCallbacks {
+    with HasGameRef<GameWorld>, CollisionCallbacks {
   final bool isSelf;
   NetworkingUser _user;
 

app/lib/main.dart

@@ -28,8 +28,8 @@ String? dataPath;
 
 Future<void> main(List<String> args) async {
   WidgetsFlutterBinding.ensureInitialized();
-
   usePathUrlStrategy();
+
   final argParser = ArgParser();
   argParser.addOption('path', abbr: 'p');
   final result = argParser.parse(args);
@@ -44,7 +44,7 @@ Future<void> main(List<String> args) async {
       value: settingsCubit,
       child: RepositoryProvider(
         create: (context) => NetworkingService(settingsCubit),
-        child: FlowApp(),
+        child: QeckApp(),
       ),
     ),
   );
@@ -74,8 +74,8 @@ List<Locale> getLocales() =>
         .where((l) => !kUnsupportedLanguages.contains(l.toString()))
         .toList();
 
-class FlowApp extends StatelessWidget {
-  FlowApp({super.key});
+class QeckApp extends StatelessWidget {
+  QeckApp({super.key});
 
   @override
   Widget build(BuildContext context) {

app/lib/models/table.dart

@@ -0,0 +1,53 @@
+import 'package:dart_mappable/dart_mappable.dart';
+
+part 'table.mapper.dart';
+
+@MappableClass()
+class GridLocation with GridLocationMappable {
+  final int x, y;
+
+  GridLocation(this.x, this.y);
+}
+
+@MappableClass()
+class GameTable with GameTableMappable {
+  final Map<GridLocation, TableCell> cells;
+  final Map<GridLocation, GameBoard> boards;
+
+  GameTable({
+    this.cells = const {},
+    this.boards = const {},
+  });
+}
+
+@MappableClass()
+class TableCell with TableCellMappable {
+  final List<GameObject> objects;
+
+  TableCell(this.objects);
+}
+
+@MappableClass()
+class GameBoard with GameBoardMappable {
+  final AssetLocation asset;
+
+  GameBoard(this.asset);
+}
+
+@MappableClass()
+class GameObject with GameObjectMappable {
+  final AssetLocation asset;
+  final String? variation;
+
+  GameObject({
+    required this.asset,
+    this.variation,
+  });
+}
+
+@MappableClass()
+class AssetLocation with AssetLocationMappable {
+  final String namespace, id;
+
+  AssetLocation(this.namespace, this.id);
+}