Versions

Author: NextdoorPsycho

MultiplexorApp/lib/cli/command_help.dart

@@ -185,14 +185,6 @@ const List<CommandHelpGroup> commandHelpGroups = <CommandHelpGroup>[
     'delete [instance] <backup-id> [--instance <name>]',
     'prune [instance] [--keep <n>]',
   ]),
-  CommandHelpGroup('template', <String>[
-    'list',
-    'init <name> [--type <type>] [--mc <version>] [--heap <size>] [--preset <name>] [--isolated]',
-    'show <name>',
-    'apply <template> <name> [--auto-build] [--sync] [--isolated]',
-    'export <instance> <template>',
-    'delete <name>',
-  ]),
   CommandHelpGroup('addons', <String>[
     'catalog [--json]',
     'list [instance] [--mc <version>] [--json]',

MultiplexorApp/lib/cli/local_command.dart

@@ -174,7 +174,6 @@ const Map<String, String> _defaults = <String, String>{
   'mods': 'show-source',
   'config': 'localize',
   'backup': 'list',
-  'template': 'list',
   'content': 'list',
   'addons': 'list',
   'gameplay': 'doctor',
@@ -360,12 +359,6 @@ const Map<String, int> _maximumPositionals = <String, int>{
   'backup verify': 2,
   'backup delete': 2,
   'backup prune': 1,
-  'template list': 0,
-  'template init': 1,
-  'template show': 1,
-  'template apply': 2,
-  'template export': 2,
-  'template delete': 1,
   'addons catalog': 0,
   'addons list': 1,
   'addons set': 1,
@@ -444,11 +437,6 @@ const Map<String, int> _minimumPositionals = <String, int>{
   'backup restore': 1,
   'backup verify': 1,
   'backup delete': 1,
-  'template init': 1,
-  'template show': 1,
-  'template apply': 2,
-  'template export': 2,
-  'template delete': 1,
   'content search': 1,
   'content install': 1,
   'content remove': 1,

MultiplexorApp/lib/models/neoforge_version.dart

@@ -0,0 +1,18 @@
+/// NeoForge 20/21 ids omit Minecraft's leading `1.`; their third component is
+/// the loader build. Year-based ids include three game components followed by
+/// the loader build, including zero for releases such as Minecraft 26.3.
+String? minecraftVersionFromNeoForgeLoader(String loaderVersion) {
+  final RegExpMatch? match = RegExp(
+    r'^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?(?:-beta)?$',
+  ).firstMatch(loaderVersion.trim());
+  if (match == null) return null;
+  final int major = int.parse(match[1]!);
+  final int minor = int.parse(match[2]!);
+  if (major == 20 || major == 21) {
+    if (match[4] != null) return null;
+    return minor == 0 ? '1.$major' : '1.$major.$minor';
+  }
+  if (major < 26 || match[4] == null) return null;
+  final int patch = int.parse(match[3]!);
+  return patch == 0 ? '$major.$minor' : '$major.$minor.$patch';
+}

MultiplexorApp/lib/models/server_minecraft_version.dart

@@ -1,11 +1,13 @@
 import 'dart:io';
 
+import 'neoforge_version.dart';
+
 /// Returns explicit Minecraft metadata, otherwise the version in a recognized
 /// server jar name. Paths are tried in order and symlink targets take precedence
 /// over their aliases. Missing paths can still supply a canonical filename.
 ///
-/// Returns null for custom/hash names and NeoForge's loader-version filenames;
-/// loader versions must never become Minecraft version metadata.
+/// NeoForge installer names use the loader's defined Minecraft version mapping.
+/// Custom and hash names remain unknown.
 String? inferServerMinecraftVersion({
   required String serverType,
   String? minecraft,
@@ -25,6 +27,7 @@ String? inferServerMinecraftVersion({
     'forge',
     'mohist',
     'fabric',
+    'neoforge',
   }.contains(type)) {
     return null;
   }
@@ -42,6 +45,18 @@ String? inferServerMinecraftVersion({
         .toLowerCase();
     if (!filename.endsWith('.jar')) continue;
     final String stem = filename.substring(0, filename.length - 4);
+    if (type == 'neoforge') {
+      final RegExpMatch? installer = RegExp(
+        r'^neoforge-(.+)-installer$',
+      ).firstMatch(stem);
+      if (installer != null) {
+        final String? version = minecraftVersionFromNeoForgeLoader(
+          installer[1]!,
+        );
+        if (version != null) return version;
+      }
+      continue;
+    }
     final String prefix = switch (type) {
       'paper' || 'folia' => '$type-(?:[0-9]{8}-[0-9]{6}-$type-bundler-)?',
       'fabric' => r'fabric-(?:server-mc\.)?',

MultiplexorApp/lib/models/template_summary.dart

@@ -27,7 +27,7 @@ const List<Map<String, Object?>> builtinAddons = <Map<String, Object?>>[
         'type': 'jenkins',
         'url': 'https://ci.ender.zone/job/EssentialsX/',
         'artifactPattern': r'^EssentialsX-[^/]+\.jar$',
-        'minecraftVersions': <String>['26.2'],
+        'minecraftVersions': <String>['26.2', '26.3'],
         'label': 'development',
       },
     ],

MultiplexorApp/lib/services/addons/builtin_addons.dart

@@ -7,7 +7,6 @@ import 'package:path/path.dart' as p;
 import '../models/build_cache.dart';
 import '../models/build_version_catalog.dart';
 import '../models/backup_summary.dart';
-import '../models/template_summary.dart';
 import '../models/consumer_profile.dart';
 import '../models/gameplay_swarm.dart';
 import '../utils/async_work_pool.dart';
@@ -1125,8 +1124,6 @@ class InteractiveWizard {
       case WorkspaceModalAction.diagnostics:
         await _shellRun(<String>['doctor']);
         await Ui.pause();
-      case WorkspaceModalAction.templates:
-        await _createFromTemplate();
       case WorkspaceModalAction.networks:
         await _networkMenu();
       case WorkspaceModalAction.buildTuning:
@@ -1296,7 +1293,6 @@ class InteractiveWizard {
         await _remoteCreateMany();
       case WorkspaceModalAction.buildTuning:
       case WorkspaceModalAction.diagnostics:
-      case WorkspaceModalAction.templates:
       case WorkspaceModalAction.networks:
       case WorkspaceModalAction.pullBuilds:
       case WorkspaceModalAction.wipe:
@@ -4411,20 +4407,6 @@ class InteractiveWizard {
   // ─── Create flow ─────────────────────────────────────────────────────
 
   Future<void> _createInstance() async {
-    if (passthrough.listTemplates().isNotEmpty) {
-      final String choice =
-          await menuSelect<String>('New instance', const <MenuEntry<String>>[
-            MenuEntry<String>('Choose platform and version', value: 'platform'),
-            MenuEntry<String>(
-              'Use an example or saved template',
-              value: 'template',
-            ),
-          ]);
-      if (choice == 'template') {
-        await _createFromTemplate();
-        return;
-      }
-    }
     final String type = await _pickServerPlatform();
     final _BuildVersionChoice versionChoice = await _pickSupportedVersion(type);
     final String version = versionChoice.version;