feat: complete import sound feature

Author: Bentroen

scripts/control_create/control_create.gml

@@ -488,10 +488,12 @@ function control_create() {
 	// Import sounds
 	mc_default_path = string_copy(game_save_id, 0, string_last_pos("\\", string_copy(game_save_id, 1, string_length(game_save_id) - 1))) + ".minecraft\\";
 	mc_install_path = mc_default_path;
+	sound_import_selected_asset_index = "";
 	sound_import_asset_index_select = 0;
 	sound_import_asset_index_count = -1;
 	sound_import_asset_indexes = [];
 	sound_import_menu_str = "";
+	sound_import_status = 0;
 
 	// Schematic
 	reset_schematic_export(0)

scripts/draw_abutton/draw_abutton.gml

@@ -1,13 +1,13 @@
-function draw_abutton(argument0, argument1) {
+function draw_abutton(argument0, argument1, lock=false) {
 	// draw_abutton(x, y)
 	var xx, yy, m;
 	xx = argument0
 	yy = argument1
-	m = mouse_rectangle(xx, yy, 17, 18) && sb_drag = -1 && w_isdragging = 0
+	m = !lock && mouse_rectangle(xx, yy, 17, 18) && sb_drag = -1 && w_isdragging = 0
 	if (m) m += mouse_check_button(mb_left)
 	if (hires && theme = 3) draw_sprite_ext(spr_button_arrow_hires, m + 3 * (fdark && theme = 3), xx, yy, 0.25, 0.25, 0, -1, draw_get_alpha())
 	else draw_sprite(spr_button_arrow, m + 3 * theme + 3 * (fdark && theme = 3), xx, yy)
-	return (m && mouse_check_button_released(mb_left))
+	if (!lock) return (m && mouse_check_button_released(mb_left))
 
 
 

scripts/draw_window_sound_import/draw_window_sound_import.gml

@@ -6,8 +6,8 @@ function draw_window_sound_import() {
 	var x1, y1, a, n;
 
 	// Window frame
-	var width = 400;
-	var height = 300;
+	var width = 480;
+	var height = 320;
 	var startx = floor((rw - width) / 2);
 	var starty = floor((rh - height) / 2) + windowoffset;
 	var x1 = startx;
@@ -27,80 +27,102 @@ function draw_window_sound_import() {
 	y1 += 20;
 	draw_text_dynamic(
 		x1, y1,
-		"This assistant will help you extract sound files from your Minecraft:" + "\n" +
-		"Java Edition installation." + "\n" +
-		"Before continuing, ensure you have launched the version you want from " + "\n" +
-		"the Minecraft Launcher!" + "\n" +
-		"Click 'Find asset lists' to look for the available asset lists, select one" + "\n" +
-		"from the list, and then click 'Import' to look for sounds!"
+		"This assistant will help you extract sound files from your Minecraft: Java Edition" + "\n" +
+		"installation." + "\n" +
+		"Before continuing, ensure you have launched the version you want from the" + "\n" +
+		"Minecraft Launcher." + "\n" +
+		"Select a version from the list, and then click 'Import' to look for sounds!"
 	)
 
 	// Minecraft installation path
 	x1 = startx;
-	y1 += 120;
+	y1 += 100;
 	draw_text_dynamic(x1, y1, "1. Set your Minecraft installation path:");
+	x1 += 16;
 	y1 += 20;
-	draw_text_dynamic(x1, y1, mc_install_path);
+	draw_text_dynamic(x1, y1, string_truncate(mc_install_path, 280, true));
 	x1 += 300;
 
 	// Change button
 	y1 -= 4
 	if (draw_button2(x1, y1, 72, "Change", false, true)) {
 		var fn = string(get_save_filename_ext("", "Select Minecraft installation directory", mc_install_path, "Minecraft installation directory"));
 		if (fn != "") mc_install_path = filename_dir(fn);
+		update_asset_index_menu();
 	}
 	x1 += 76;
 
 	// Use default button
 	if (draw_button2(x1, y1, 72, "Use default", false, true)) {
-		mc_install_path = mc_default_path
+		mc_install_path = mc_default_path;
+		update_asset_index_menu();
 	}
 	y1 += 4
 
-	// Import sounds button
-	x1 = startx;
-	y1 += 30;
-	draw_text_dynamic(x1, y1, "2. Search for available asset lists:");
-	y1 += 20;
-	if (draw_button2(x1, y1, 112, "Find asset lists", false, true)) {
-		sound_import_asset_indexes = find_asset_indexes();
-		show_debug_message(sound_import_asset_indexes);
-		
-		// Create menu
-		for (var i = 0; i < array_length(sound_import_asset_indexes); i++) {
-			sound_import_menu_str += check(sound_import_asset_index_select = i);
-			sound_import_menu_str += sound_import_asset_indexes[i] + "|";
-		}
-		sound_import_menu_str = string_delete(sound_import_menu_str, string_length(sound_import_menu_str), 1)
-		
-	}
-	
 	// Asset index select menu
 	x1 = startx;
-	y1 += 30;
-	draw_text_dynamic(x1, y1, "3. Select the asset list to copy sounds from:");
+	y1 += 40;
+	draw_text_dynamic(x1, y1, "2. Select the asset list to copy sounds from:");
+	x1 += 16;
 	y1 += 20;
-	draw_area(x1, y1, x1 + 140, y1 + 16);
-	if (draw_abutton(x1, y1)) {
+	y1 += 1;
+	draw_area(x1, y1, x1 + 100, y1 + 20);
+	draw_text_dynamic(x1 + 4, y1 + 4, sound_import_selected_asset_index);
+	if (draw_abutton(x1 + 100 - 16, y1 + 1, sound_import_menu_str == "")) {
 		show_debug_message(sound_import_menu_str);
 		menu = show_menu_ext("sound_import_asset_index", x1, y1, sound_import_menu_str);
 	}
-	x1 += 144
-	
-	// Located sounds count
-	if (sound_import_asset_index_count > -1) {
-		draw_text_dynamic(x1, y1, sound_import_asset_index_count + " sounds located!")
-	}
+	y1 -= 1;
+	x1 += 110;
 
 	// Copy sounds button
-	if (draw_button2(x1, y1, 112, "Get sounds", false, true)) {
-		asset_indexes = load_asset_index(sound_import_asset_index_select, copy = true)
+	var is_locked = sound_import_selected_asset_index == "";
+	if (draw_button2(x1, y1, 112, "Get sounds", is_locked, false)) {
+		load_asset_index(true);
 	}
 
 	x1 = startx;
 	y1 += 30;
-
 
+	// Status text
+	x1 += 16;
+	draw_theme_font(font_main_bold);
+	draw_theme_color();
 
-
-}
+	// 0 = idle; 1 = copying; 2 = copying done
+	if (sound_import_status == 2) {
+		if (theme == 3 && fdark || theme == 2) draw_set_color(c_lime);
+		else draw_set_color(c_green);
+		draw_text_dynamic(x1, y1, string(sound_import_asset_index_count) + " sounds have been copied!");
+	} else if (sound_import_status == 1) {
+		draw_text_dynamic(x1, y1, "Copying sounds... please wait!");
+	} else {
+		if (sound_import_asset_index_count > 0) {
+			draw_text_dynamic(x1, y1, string(sound_import_asset_index_count) + " sounds located!");
+		} else {
+			draw_set_color(c_red);
+			draw_text_dynamic(x1, y1, "No sounds located! Check your Minecraft installation path.");
+		}
+	}
+	draw_theme_color();
+	draw_theme_font(font_main);
+	
+	// Instrument settings button
+	x1 = startx + 12;
+	y1 = starty + height - 20 - 12;
+	if (draw_button2(x1, y1, 120, "Instrument settings...", false, true)) {
+		window = w_instruments;
+	}
+	// Sounds folder button
+	x1 += 120 + 12;
+	if (draw_button2(x1, y1, 120, "Open sounds folder", false, true)) {
+		open_url(sounds_directory);
+	}
+	
+	// OK button
+	x1 = startx + width - 72 - 8 - 12;
+	if (draw_button2(x1, y1, 72, "OK", false, false)) {
+		sound_import_status = 0;
+		window = 0;
+	}
+}

scripts/menu_click/menu_click.gml

@@ -171,7 +171,7 @@ function menu_click(argument0) {
 			ins -= floor((ins) / 26) // subtract the "More..." entries to get the instrument number
 	        if (sel < insoffset + 1) {instrument = instrument_list[| ins]; selected_vel = 100; selected_pan = 100; selected_pit = 0}
 	        if (sel = insoffset + 1) window = w_instruments
-			if (sel = insoffset + 2) window = w_sound_import
+			if (sel = insoffset + 2) { window = w_sound_import update_asset_index_menu() }
 	        if (sel = insoffset + 3) window = w_songinfoedit
 	        if (sel = insoffset + 4) window = w_properties
 	        if (sel = insoffset + 5) {selection_place(0) window = w_stats}
@@ -393,7 +393,7 @@ function menu_click(argument0) {
 		}
 		case "sound_import_asset_index": {
 			sound_import_asset_index_select = sel;
-			sound_import_asset_index_count = load_asset_index(sel, false);
+			update_asset_index_menu();
 			break;
 		}
 	}

scripts/sound_import/sound_import.gml

@@ -1,17 +1,24 @@
-function find_asset_indexes() {
-
-	if (!directory_exists(mc_install_path)) {
-		show_message("No Minecraft installation was found\nat the selected location!");
-		return;
-	}
+function get_assets_dir() {
+	var assets_dir = mc_install_path;
 
-	var assets_dir = mc_install_path
 	if (string_char_at(assets_dir, string_length(assets_dir)) != "\\") {
 		assets_dir = assets_dir + "\\";
 	}
+	
 	assets_dir = assets_dir + "assets\\";
+	return assets_dir;
+}
+
+
+function find_asset_indexes() {
+
+	if (!directory_exists(mc_install_path)) {
+		show_message("No Minecraft installation was found\nat the selected location!");
+		return [];
+	}
 
 	// Search for .json files in the assets/ folder
+	var assets_dir = get_assets_dir();
 	show_debug_message("Looking for index files at " + assets_dir);
 	var asset_indexes = [];
 	var file_name = file_find_first(assets_dir + "indexes\\*.json", 0);
@@ -26,12 +33,42 @@ function find_asset_indexes() {
 }
 
 
-function load_asset_index(index_name, copy = false) {
+function update_asset_index_menu() {
+	sound_import_asset_indexes = find_asset_indexes();
+	show_debug_message(sound_import_asset_indexes);
 
+	if (array_length(sound_import_asset_indexes) == 0) {
+		sound_import_asset_index_select = 0;
+		sound_import_selected_asset_index = "";
+		sound_import_asset_index_count = 0;
+	} else {
+		if (sound_import_asset_index_select > array_length(sound_import_asset_indexes) - 1) {
+			sound_import_asset_index_select = 0;
+		}
+		sound_import_selected_asset_index = sound_import_asset_indexes[sound_import_asset_index_select];
+	}	
+
+	// Create menu
+	sound_import_menu_str = "";
+	for (var i = 0; i < array_length(sound_import_asset_indexes); i++) {
+		sound_import_menu_str += check(sound_import_asset_index_select == i);
+		sound_import_menu_str += sound_import_asset_indexes[i] + "|";
+	}
+	sound_import_menu_str = string_delete(sound_import_menu_str, string_length(sound_import_menu_str), 1)
+	
+	// Load selected asset index
+	load_asset_index(false);
+}
+
+
+function load_asset_index(copy = false) {
 	// Loads an asset index.
 
 	// Open and parse asset index
-	var asset_index_path = assets_dir + "indexes\\" + "16.json"
+	var assets_dir = get_assets_dir();
+	var selected_asset_list = sound_import_selected_asset_index;
+	if (selected_asset_list == "") return;
+	var asset_index_path = assets_dir + "indexes\\" + selected_asset_list + ".json";
 	if (!file_exists(asset_index_path)) {
 		show_message("The file for the specified asset index could not be found!")
 		return;
@@ -49,12 +86,13 @@ function load_asset_index(index_name, copy = false) {
 
 	var sounds_mc_subdir = sounds_directory + "minecraft";
 
-	if (directory_exists_lib(sounds_mc_subdir)) {
+	if (copy && directory_exists_lib(sounds_mc_subdir)) {
 		if (!message_yesnocancel("An existing folder with imported Minecraft sounds has been found in your Sounds folder. Would you like to replace it?", "Warning")) {
 			return;
 		} else {
 			directory_delete_lib(sounds_mc_subdir);
 		}
+		sound_import_status = 1;
 	}
 
 	for (var i = array_length(keys) - 1; i >= 0; --i) {
@@ -75,7 +113,7 @@ function load_asset_index(index_name, copy = false) {
 
 		if (copy) {
 			var src = assets_dir + "objects\\" + string_copy(hash, 1, 2) + "\\" + hash;
-			var dst = sounds_mc_subdir + string_replace(key, "minecraft/sounds/", "");
+			var dst = sounds_mc_subdir + string_replace(key, "minecraft/sounds/", "\\");
 
 			if (!file_exists_lib(src)) {
 				continue;
@@ -91,7 +129,10 @@ function load_asset_index(index_name, copy = false) {
 		//show_debug_message(dst);
 	}
 
-	return count;
+	if (copy) sound_import_status = 2;
+	else sound_import_status = 0;
+	
+	sound_import_asset_index_count = count;
 }