Finish basic game mode support

Author: CodeDoctorDE

api/lib/src/models/config.dart

@@ -152,5 +152,6 @@ final class SetonixConfig with SetonixConfigMappable {
     whitelistEnabled: other.whitelistEnabled ?? whitelistEnabled,
     apiEndpoint: other.apiEndpoint ?? apiEndpoint,
     endpointSecret: other.endpointSecret ?? endpointSecret,
+    gameMode: other.gameMode ?? gameMode,
   );
 }

api/lib/src/models/data.dart

@@ -38,17 +38,19 @@ class SetonixData extends ArchiveData<SetonixData> {
     : identifier = identifier ?? createPackIdentifier(data),
       super.fromBytes();
 
-  factory SetonixData.fromMode(ItemLocation? location, GameMode? mode) {
+  factory SetonixData.fromMode(
+    PackItem<GameMode>? mode, {
+    Set<String> packs = const {},
+  }) {
+    if (mode == null) return SetonixData.empty();
     var data = SetonixData.empty().setInfo(
       GameInfo(
-        packs: [?location?.namespace],
-        script: location,
-        teams: mode?.teams ?? const {},
+        packs: {...packs, mode.namespace}.toList(),
+        gameMode: mode.location,
+        teams: mode.item.teams,
       ),
     );
-    for (final entry
-        in mode?.tables.entries ??
-            Iterable<MapEntry<String, GameTable>>.empty()) {
+    for (final entry in mode.item.tables.entries) {
       data = data.setTable(entry.value, entry.key);
     }
     return data;
@@ -413,6 +415,6 @@ final class PackItem<T> {
   String get namespace => location.namespace;
   String get id => location.id;
 
-  PackItem<E> withItem<E>(E backgroundTranslation) =>
-      PackItem(pack: pack, location: location, item: backgroundTranslation);
+  PackItem<E> withItem<E>(E item) =>
+      PackItem(pack: pack, location: location, item: item);
 }

api/lib/src/models/info.dart

@@ -8,9 +8,9 @@ part 'info.mapper.dart';
 class GameInfo with GameInfoMappable {
   final Map<String, GameTeam> teams;
   final List<String> packs;
-  final ItemLocation? script;
+  final ItemLocation? gameMode;
 
-  const GameInfo({this.teams = const {}, this.packs = const [], this.script});
+  const GameInfo({this.teams = const {}, this.packs = const [], this.gameMode});
 }
 
 @MappableEnum()

api/lib/src/models/info.mapper.dart

@@ -159,7 +159,8 @@ class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
       );
     });
     if (!state.multiplayer.isClient) {
-      _loadScript(state.world.info.script);
+      final mode = state.world.info.gameMode;
+      if (mode != null) _loadGameMode(mode);
     }
   }
 
@@ -227,10 +228,20 @@ class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
     }
   }
 
-  Future<void> _loadScript(ItemLocation? location) async {
+  Future<void> _loadGameMode(ItemLocation? location) async {
     try {
       if (location == null) return;
-      pluginSystem.loadLuaPluginFromLocation(state.assetManager, location);
+      final gameMode = state.assetManager
+          .getPack(location.namespace)
+          ?.getMode(location.id);
+      if (gameMode == null) return;
+      final script = gameMode.script;
+      if (script != null && script.isNotEmpty) {
+        pluginSystem.loadLuaPluginFromLocation(
+          state.assetManager,
+          ItemLocation(location.namespace, script),
+        );
+      }
       // ignore: empty_catches
     } catch (e) {}
   }

app/lib/bloc/world/bloc.dart

@@ -0,0 +1,3 @@
+{
+  "script": "hello.lua"
+}

app/pack/modes/hello.json

@@ -0,0 +1,5 @@
+print("Hello from Lua script!")
+
+Events.CellHideChanged.Connect(function()
+  print("cell hide changed")
+end)

app/pack/scripts/hello.lua

@@ -38,16 +38,13 @@ final class PluginSystem {
     String name,
     FutureOr<SetonixPlugin> Function(PluginServerInterface) pluginBuilder,
   ) async {
+    unregisterPlugin(name);
     final pluginServer = _PluginServerInterfaceImpl(server, name);
     final plugin = await pluginBuilder(pluginServer);
     return _plugins[name] = plugin;
   }
 
-  Future<SetonixPlugin> registerLuauPlugin(
-    String name,
-    String code, {
-    void Function(String)? onPrint,
-  }) {
+  Future<SetonixPlugin> registerLuauPlugin(String name, String code) {
     if (!_nativeEnabled) throw Exception('Native not enabled');
     return registerPlugin(
       name,
@@ -72,30 +69,22 @@ final class PluginSystem {
         .getPack(location.namespace)
         ?.getScript(location.id);
     if (data == null) return;
-    loadLuaPlugin(assetManager, data, name);
-  }
-
-  void loadLuaPlugin(
-    AssetManager assetManager,
-    String script, [
-    String name = 'game',
-  ]) {
-    unregisterPlugin(name);
-    final location = ItemLocation.fromString(script);
-    final data = assetManager
-        .getPack(location.namespace)
-        ?.getScript(location.id);
-    if (data == null) return;
-    registerLuauPlugin(name, data, onPrint: (e) => server.print(e, name));
+    registerLuauPlugin(name, data);
   }
 
   bool get _nativeEnabled => RustLib.instance.initialized;
 
+  Iterable<String> get plugins => _plugins.keys;
+
   void dispose([bool disposeNative = true]) {
-    List<String>.from(_plugins.keys).forEach(unregisterPlugin);
+    unregisterAll();
     if (disposeNative) disposePluginSystem();
   }
 
+  void unregisterAll() {
+    List<String>.from(_plugins.keys).forEach(unregisterPlugin);
+  }
+
   void fire(Event event) {
     for (final plugin in _plugins.values) {
       plugin.eventSystem.fire(event);

plugin/lib/src/plugin.dart

@@ -16,6 +16,8 @@ Future<ServerProcessed> _computeEvent(
   );
 }
 
+const scriptSuffix = '.lua';
+
 class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
     with ServerInterface {
   final SetonixServer server;
@@ -52,14 +54,14 @@ class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
       processed.responses.forEach(process);
       if (event is WorldInitialized) {
         server.log(
-          "World initialized${(event.info?.script != null) ? " with script ${event.info?.script}" : ""}",
+          "World initialized${(event.info?.gameMode != null) ? " with script ${event.info?.gameMode}" : ""}",
           level: LogLevel.info,
         );
         _serverPlugin = await _pluginSystem.registerPlugin(
           '',
           SetonixPlugin.new,
         );
-        await _loadScripts((newState ?? state).info.script);
+        await _loadScripts((newState ?? state).info.gameMode);
       }
       if (newState == null) return;
       emit(newState);
@@ -79,11 +81,19 @@ class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
     }
   }
 
-  Future<void> _loadScripts(ItemLocation? location) async {
+  Future<void> _loadGameMode(ItemLocation location) async {
+    final mode = assetManager.getPack(location.namespace)?.getMode(location.id);
+    if (mode == null) return;
+    final script = mode.script;
+    if (script == null) return;
+    final scriptLocation = ItemLocation.fromString(script, location.namespace);
+    pluginSystem.loadLuaPluginFromLocation(assetManager, scriptLocation);
+  }
+
+  Future<void> _loadScripts(ItemLocation? mode) async {
+    pluginSystem.unregisterAll();
     try {
-      if (location != null) {
-        pluginSystem.loadLuaPluginFromLocation(assetManager, location);
-      }
+      if (mode != null) await _loadGameMode(mode);
     } catch (e) {
       server.log('Error loading script: $e', level: LogLevel.error);
     }
@@ -94,16 +104,19 @@ class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
     }
     final scriptFiles = (await scriptsFolder.list().toList())
         .whereType<File>()
-        .where((file) => file.path.endsWith('.lua'));
+        .where((file) => file.path.endsWith(scriptSuffix));
     server.log(
       "Found ${scriptFiles.length} script file(s)",
       level: LogLevel.info,
     );
     for (final file in scriptFiles) {
       try {
         final code = await file.readAsString();
-        final relativePath = file.path.substring(scriptsFolder.path.length + 1);
-        pluginSystem.registerLuauPlugin(relativePath, code);
+        final relativePath = file.path.substring(
+          scriptsFolder.path.length + 1,
+          file.path.length - scriptSuffix.length,
+        );
+        await pluginSystem.registerLuauPlugin(relativePath, code);
       } catch (e) {
         server.log(
           'Error loading script from ${file.path}: $e',
@@ -114,7 +127,7 @@ class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
   }
 
   Future<void> init() async {
-    await _loadScripts(state.info.script);
+    await _loadScripts(state.info.gameMode);
   }
 
   Future<void> resetWorld([ItemLocation? mode]) async {
@@ -124,7 +137,7 @@ class WorldBloc extends Bloc<PlayableWorldEvent, WorldState>
 
   Future<void> save({bool force = false}) async {
     var file = File(
-      worldName == defaultWorldName ? 'world.stnx' : 'worlds/$worldName.stnx',
+      '${worldName == defaultWorldName ? SetonixServer.defaultWorldName : '${SetonixServer.worldDirectory}/$worldName'}${SetonixServer.worldSuffix}',
     );
     if (!await file.exists()) {
       await file.create(recursive: true);

server/lib/src/bloc.dart

@@ -10,7 +10,9 @@ class ConfigManager {
   SetonixConfig _argsConfig = SetonixConfig();
 
   ConfigManager({SetonixConfig? argsConfig, SetonixConfig? envConfig})
-    : _envConfig = envConfig ?? SetonixConfig.fromEnvironment();
+    : _envConfig = (envConfig ?? SetonixConfig.fromEnvironment()).merge(
+        argsConfig ?? SetonixConfig(),
+      );
 
   SetonixConfig _mergeConfig() {
     return _config.merge(_envConfig).merge(_argsConfig);