Skip to content

Commit 305521f

Browse files
committed
App Store compliance for sound import
1 parent a010a5d commit 305521f

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

scripts/draw_window_sound_import/draw_window_sound_import.gml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ function draw_window_sound_import() {
2929
x1, y1,
3030
((language == 0) ?
3131
"This assistant will help you get sound files from your Minecraft:" + "\n" +
32-
"Java Edition installation or from the Mojang server." :
33-
"本向导将帮助您从您的 Minecraft:Java 版或 Mojang 服务器获取音效"
32+
"Java Edition installation" + condstr(os_type != os_macosx, " or from the Mojang server") + "." :
33+
"本向导将帮助您从您的 Minecraft:Java " + condstr(os_type != os_macosx, "Mojang 服务器") + "获取音效"
3434
)
3535
)
3636
y1 += 33
37-
if (draw_checkbox(x1, y1, sound_import_download_toggle, ((language == 0) ? "Download from Mojang" : "从 Mojang 下载"), "", (sound_import_download_toggle && sound_import_status == 1), 1)) {
38-
sound_import_download_toggle = !sound_import_download_toggle
39-
sound_import_asset_indexes = []
40-
update_asset_index_menu()
37+
if (os_type != os_macosx) {
38+
if (draw_checkbox(x1, y1, sound_import_download_toggle, ((language == 0) ? "Download from Mojang" : "从 Mojang 下载"), "", (sound_import_download_toggle && sound_import_status == 1), 1)) {
39+
sound_import_download_toggle = !sound_import_download_toggle
40+
sound_import_asset_indexes = []
41+
update_asset_index_menu()
42+
}
4143
}
4244
y1 += 17
4345
if (!sound_import_download_toggle) {
@@ -65,15 +67,20 @@ function draw_window_sound_import() {
6567
// Change button
6668
x1 = startx + width - 72 - 20;
6769
if (draw_button2(x1, y1, 72, ((language == 0) ? "Change" : "更改"), false, true)) {
68-
var fn = string(get_save_filename_ext("",
69-
((language == 0) ? "Select Minecraft installation directory" : "选择Minecraft安装目录"),
70-
mc_install_path,
71-
((language == 0) ? "Minecraft installation directory" : "Minecraft安装目录")));
70+
if (os_type != os_macosx) {
71+
var fn = string(get_save_filename_ext("",
72+
((language == 0) ? "Select Minecraft installation directory" : "选择Minecraft安装目录"),
73+
mc_install_path,
74+
((language == 0) ? "Minecraft installation directory" : "Minecraft安装目录")));
75+
} else {
76+
var fn = string(get_directory(mc_install_path));
77+
}
7278
if (fn != "") {
7379
mc_install_path = filename_dir(fn);
7480
mc_install_path = string_replace_all(mc_install_path, "Select Minecraft installation directory", "")
7581
mc_install_path = string_replace_all(mc_install_path, "选择Minecraft安装目录", "")
7682
if (os_type != os_windows && string_char_at(mc_install_path, string_length(mc_install_path)) != "/") mc_install_path = mc_install_path + "/"
83+
if (os_type = os_macosx) macos_bookmark_store(mc_install_path, mc_install_path, 0)
7784
}
7885
update_asset_index_menu();
7986
}

scripts/sound_import/sound_import.gml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function find_asset_indexes() {
2727
else message("在所选位置未找到有Minecraft安装!", "音效导入");
2828
return [];
2929
}
30+
if (os_type = os_macosx) macos_bookmark_begin(mc_install_path)
3031

3132
// Search for .json files in the assets/ folder
3233
var assets_dir = get_assets_dir();

0 commit comments

Comments
 (0)