delete the unused tool config file

Author: dmitmel

metadata.json

@@ -0,0 +1,3 @@
+{
+  "version": "3.0.0-alpha"
+}

scripts/create-dist-archive.py

@@ -11,19 +11,17 @@
 from shutil import copyfileobj
 import time
 
-
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-with open(os.path.join(PROJECT_DIR, "tool.config.json")) as f:
+with open(os.path.join(PROJECT_DIR, "metadata.json")) as f:
   MODLOADER_METADATA = json.load(f)
 
-MODLOADER_NAME = MODLOADER_METADATA["name"]
 MODLOADER_VERSION = MODLOADER_METADATA["version"]
-MODLOADER_DIR_NAME = MODLOADER_NAME
+MODLOADER_DIR_NAME = "ccloader"
 
 # specific archive extensions are appended when the respective archives are packed
-ARCHIVE_NAME_QUICK_INSTALL = "{}_{}_quick-install".format(MODLOADER_NAME, MODLOADER_VERSION)
-ARCHIVE_NAME_PACKAGE = "{}_{}_package".format(MODLOADER_NAME, MODLOADER_VERSION)
+ARCHIVE_NAME_QUICK_INSTALL = "ccloader_{}_quick-install".format(MODLOADER_VERSION)
+ARCHIVE_NAME_PACKAGE = "ccloader_{}_package".format(MODLOADER_VERSION)
 
 DEFAULT_FILE_MODE = 0o644
 DEFAULT_DIR_MODE = 0o755
@@ -180,7 +178,7 @@ def add(path, recursive=True):
     add("LICENSE")
     add("main.css")
     add("main.html")
-    add("tool.config.json")
+    add("metadata.json")
     add("common/", recursive=False)
     add("common/dist/")
     add("common/vendor-libs/")

src/config.ts

@@ -17,18 +17,16 @@ export interface ConfigModule {
 }
 
 export interface ConfigModuleContext {
-  modloaderName: string;
   modloaderVersion: semver.SemVer;
 }
 
-export async function load(
-  modloaderName: string,
-  modloaderVersion: semver.SemVer,
-): Promise<Config> {
+const CONFIG_SCRIPT_NAME = `ccloader-user-config.js`;
+
+export async function load(modloaderVersion: semver.SemVer): Promise<Config> {
   let config = createDefaultConfig();
-  let ctx: ConfigModuleContext = { modloaderName, modloaderVersion };
+  let ctx: ConfigModuleContext = { modloaderVersion };
 
-  let configScriptPath = `${modloaderName}-user-config.js`;
+  let configScriptPath = CONFIG_SCRIPT_NAME;
 
   // there is no way to check if an error thrown by `import()` was a network
   // error (such as the 404 status code) and error messages thrown by it

src/modloader.ts

@@ -20,9 +20,9 @@ export async function boot(): Promise<void> {
   consoleM.inject();
 
   let modloaderMetadata = await loadModloaderMetadata();
-  console.log(`${modloaderMetadata.name} ${modloaderMetadata.version}`);
+  console.log(`CCLoader ${modloaderMetadata.version}`);
 
-  let config = await configM.load(modloaderMetadata.name, modloaderMetadata.version);
+  let config = await configM.load(modloaderMetadata.version);
 
   try {
     await modDataStorage.readImmediately();
@@ -65,7 +65,7 @@ export async function boot(): Promise<void> {
 
   let virtualPackages = new Map<ModID, semver.SemVer>()
     .set('crosscode', gameVersion)
-    .set(modloaderMetadata.name, modloaderMetadata.version);
+    .set('ccloader', modloaderMetadata.version);
   if (typeof process !== 'undefined') {
     virtualPackages.set('nw', new semver.SemVer(process.versions.nw));
   }
@@ -113,7 +113,7 @@ export async function boot(): Promise<void> {
   );
 
   window.modloader = {
-    name: modloaderMetadata.name,
+    name: 'ccloader',
     version: modloaderMetadata.version,
     gameVersion,
     gameVersionHotfix,
@@ -158,13 +158,10 @@ export async function boot(): Promise<void> {
   console.log('crosscode with mods is now fully loaded!');
 }
 
-async function loadModloaderMetadata(): Promise<{
-  name: string;
-  version: semver.SemVer;
-}> {
-  let toolJsonText = await files.loadText(`${CCLOADER_DIR}tool.config.json`);
-  let data = JSON.parse(toolJsonText) as { name: string; version: string };
-  return { name: data.name, version: new semver.SemVer(data.version) };
+async function loadModloaderMetadata(): Promise<{ version: semver.SemVer }> {
+  let toolJsonText = await files.loadText(`${CCLOADER_DIR}metadata.json`);
+  let data = JSON.parse(toolJsonText) as { version: string };
+  return { version: new semver.SemVer(data.version) };
 }
 
 async function loadAllModMetadataInDir(modsDir: string, installedMods: ModsMap): Promise<number> {