Merge pull request #68 from Qubus0/fix_missing_mod_dir_name

fix validating mod dir name

Author: Qubus0

addons/mod_loader/mod_data.gd

@@ -45,24 +45,22 @@ func load_manifest() -> void:
 	# Load meta data file
 	var manifest_path := get_required_mod_file_path(required_mod_files.MANIFEST)
 	var manifest_dict := ModLoaderUtils.get_json_as_dict(manifest_path)
-
 	ModLoaderUtils.log_debug_json_print("%s loaded manifest data -> " % dir_name, manifest_dict, LOG_NAME)
 
 	var mod_manifest := ModManifest.new(manifest_dict)
 
-	if not mod_manifest:
-		is_loadable = false
-		return
-
+	is_loadable = has_manifest(mod_manifest)
+	if not is_loadable: return
+	is_loadable = is_mod_dir_name_same_as_id(mod_manifest)
+	if not is_loadable: return
 	manifest = mod_manifest
 
 
 # Validates if [member dir_name] matches [method ModManifest.get_mod_id]
-func is_mod_dir_name_same_as_id() -> bool:
-	var manifest_id := manifest.get_mod_id()
+func is_mod_dir_name_same_as_id(mod_manifest: ModManifest) -> bool:
+	var manifest_id := mod_manifest.get_mod_id()
 	if not dir_name == manifest_id:
-		ModLoaderUtils.log_fatal('Mod directory name "%s" does not match the data in manifest.json. Expected "%s"' % [ dir_name, manifest_id ], LOG_NAME)
-		is_loadable = false
+		ModLoaderUtils.log_fatal('Mod directory name "%s" does not match the data in manifest.json. Expected "%s" (Format: {namespace}-{name})' % [ dir_name, manifest_id ], LOG_NAME)
 		return false
 	return true
 
@@ -81,8 +79,11 @@ func has_required_files() -> bool:
 
 
 # Validates if manifest is set
-func has_manifest() -> bool:
-	return not manifest == null
+func has_manifest(mod_manifest: ModManifest) -> bool:
+	if mod_manifest == null:
+		ModLoaderUtils.log_fatal("Mod manifest could not be created correctly due to errors.", LOG_NAME)
+		return false
+	return true
 
 
 # Converts enum indices [member required_mod_files] into their respective file paths

addons/mod_loader/mod_loader.gd

@@ -325,6 +325,7 @@ func _init_mod_data(mod_folder_path):
 	var local_mod_path = str(UNPACKED_DIR, dir_name)
 
 	var mod := ModData.new(local_mod_path)
+	mod.dir_name = dir_name
 	mod_data[dir_name] = mod
 
 	# Get the mod file paths