Skip to content

Commit ca42805

Browse files
committed
fix: burninate "Open" and "Minecraft" from the entire project
1 parent dba101d commit ca42805

11 files changed

Lines changed: 17 additions & 17 deletions

File tree

objects/obj_presence/Other_70.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (ev_type == "DiscordReady" || ready || o.presence)
66
{
77
show_debug_message("date: " + string(date_current_datetime()));
88
np_setpresence_timestamps(date_current_datetime(), 0, false);
9-
np_setpresence_more("Minecraft Note Block Studio", "", false);
9+
np_setpresence_more("Note Block Studio", "", false);
1010
ready = true;
1111

1212
//np_setpresence() should ALWAYS come the last!!

scripts/control_create/control_create.gml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ function control_create() {
580580
} else {
581581
acrylic = 0
582582
can_draw_mica = 0
583-
if (language != 1) show_message("Minecraft Note Block Studio encountered an error creating blurred background sprite, the transparency effect will be disabled.\n This usually happens when your desktop wallpaper is either too tall or too long.")
584-
else show_message("Minecraft Note Block Studio 在创建模糊背景贴图时遇到错误,透明效果将被关闭。\n这种情况一般是由于您的桌面壁纸图片过高或过长。")
583+
if (language != 1) show_message("Note Block Studio encountered an error creating blurred background sprite. The transparency effect will be disabled.\nThis usually happens when your desktop wallpaper is either too tall or too long.")
584+
else show_message("Note Block Studio 在创建模糊背景贴图时遇到错误,透明效果将被关闭。\n这种情况一般是由于您的桌面壁纸图片过高或过长。")
585585
}
586586
if (show_welcome) window = w_greeting
587587
draw_accent_init()
@@ -643,8 +643,8 @@ function control_create() {
643643
// Implemented in a better way that takes multiple instances into account.
644644
if (file_find_first(backup_directory + "*.nbs", 0) != "" && !port_taken && !isplayer) {
645645
var isrecover = 0
646-
if (language != 1) isrecover = question("Minecraft Note Block Studio quit unexpectedly while you were working on a song. Do you want to recover your work?\n\n(If you click 'No', you'll be prompted to recover it again the next time you open the program.)", "Auto-recovery")
647-
else isrecover = question("Minecraft Note Block Studio在您工作时意外关闭了。要恢复您的文档吗?\n\n(如果点击“No”,下次打开软件时将会再次提示恢复。)", "自动恢复")
646+
if (language != 1) isrecover = question("Note Block Studio quit unexpectedly while you were working on a song. Do you want to recover your work?\n\n(If you click 'No', you'll be prompted to recover it again the next time you open the program.)", "Auto-recovery")
647+
else isrecover = question("Note Block Studio在您工作时意外关闭了。要恢复您的文档吗?\n\n(如果点击“No”,下次打开软件时将会再次提示恢复。)", "自动恢复")
648648
if (isrecover) {
649649
// Create restore folder
650650
if (!directory_exists_lib(restore_directory)) {

scripts/control_draw/control_draw.gml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function control_draw() {
3939
showmenu = 0
4040
cursmarker = 0
4141
compx = 160
42-
window_set_caption(condstr((protocol_data != pointer_null), song_download_display_name, condstr((filename = "" || filename = "-player") && (midiname = "" || !isplayer), condstr(language != 1, "Unsaved song", "新文件")) + condstr(filename != "-player", filename_name(filename)) + condstr((filename = "" || filename = "-player") && midiname != "" && isplayer, midiname) + condstr(changed && filename != "" && filename != "-player", "*")) + " - Minecraft Note Block Studio" + condstr(isplayer, " - Player Mode"))
42+
window_set_caption(condstr((protocol_data != pointer_null), song_download_display_name, condstr((filename = "" || filename = "-player") && (midiname = "" || !isplayer), condstr(language != 1, "Unsaved song", "新文件")) + condstr(filename != "-player", filename_name(filename)) + condstr((filename = "" || filename = "-player") && midiname != "" && isplayer, midiname) + condstr(changed && filename != "" && filename != "-player", "*")) + " - Note Block Studio" + condstr(isplayer, " - Player Mode"))
4343
// Performance indicator: "(" + string_format(currspeed * 100, 1, 0) + "%) "
4444
draw_set_alpha(1)
4545
draw_theme_color()
@@ -1904,7 +1904,7 @@ function control_draw() {
19041904
if (draw_icon(icons.HELP, xx, yy, "Watch tutorial videos")) {
19051905
open_url("http://www.youtube.com/playlist?list=PL7EA4F0D271DA6E86")
19061906
} xx += 25 if (xx > rw - 312) break
1907-
if (draw_icon(icons.INTERNET, xx, yy, "Visit the Open Note Block Studio website")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
1907+
if (draw_icon(icons.INTERNET, xx, yy, "Visit the Note Block Studio website")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
19081908
break
19091909
}
19101910
if (isplayer) if (draw_icon(icons.EDITMODE_KEY, xx, yy, condstr(dropmode, "Exit", "Enter") + " the drop mode", 0, dropmode)) {dropmode = !dropmode if (dropmode) window_maximize() else window_setnormal()} if (isplayer) xx += 25
@@ -1925,7 +1925,7 @@ function control_draw() {
19251925
if (draw_icon(icons.HELP, xx, yy, "教程视频")) {
19261926
open_url("https://www.bilibili.com/video/BV1Mx411a76p")
19271927
} xx += 25 if (xx > rw - 312) break
1928-
if (draw_icon(icons.INTERNET, xx, yy, "访问 Open Note Block Studio 官方网站")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
1928+
if (draw_icon(icons.INTERNET, xx, yy, "访问 Note Block Studio 官方网站")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
19291929
break
19301930
}
19311931
if (isplayer) if (draw_icon(icons.EDITMODE_KEY, xx, yy, condstr(dropmode, "关闭", "开启") + "下落模式", 0, dropmode)) {dropmode = !dropmode if (dropmode) window_maximize() else window_setnormal()} if (isplayer) xx += 25

scripts/datapack_export/datapack_export.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function datapack_export() {
5757
functiondir = dat_makefolders(path, namespace, function_registry)
5858

5959
//pack.mcmeta
60-
inputString = "{\n\t\"pack\": {\n\t\t\"pack_format\": " + string(pack_format) + ",\n\t\t\"description\": \"" + o.dat_name + "\\nMade with Minecraft Note Block Studio\"\n\t}\n}"
60+
inputString = "{\n\t\"pack\": {\n\t\t\"pack_format\": " + string(pack_format) + ",\n\t\t\"description\": \"" + o.dat_name + "\\nMade with Note Block Studio\"\n\t}\n}"
6161
dat_writefile(inputString, tempdir + "pack.mcmeta")
6262

6363
//Minecraft folder:

scripts/download_song_start/download_song_start.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function download_song_start(download_url) {
1818
var is_nbs = string_last_pos(".nbs", download_url_noparams) == len - 3;
1919
var is_zip = string_last_pos(".zip", download_url_noparams) == len - 3;
2020
if (!(is_nbs || is_zip)) {
21-
if (language != 1) message("Couldn't verify if the file you're trying to open is a valid song!", "Minecraft Note Block Studio")
22-
else message("所打开的文件不属于可以读取的格式!", "Minecraft Note Block Studio")
21+
if (language != 1) message("Couldn't verify if the file you're trying to open is a valid song!", "Note Block Studio")
22+
else message("所打开的文件不属于可以读取的格式!", "Note Block Studio")
2323
game_end()
2424
} else {
2525
var song_download_ext = string_copy(download_url_noparams, string_last_pos(".", download_url_noparams), string_length(download_url_noparams));

scripts/draw_debug_overlay/draw_debug_overlay.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function draw_debug_overlay(){
5151
case w_setaccent: cwindow = "w_setaccent" break
5252
default: cwindow = string(window) break
5353
}
54-
yy = draw_debug_overlay_stack(xx, yy, "Open Note Block Studio v" + version)
54+
yy = draw_debug_overlay_stack(xx, yy, "Note Block Studio v" + version)
5555
yy = draw_debug_overlay_stack(xx, yy, string(fps) + " FPS (" + string_format(fps / game_get_speed(gamespeed_fps) * 100, 1, 0) + "%) ")
5656
yy = draw_debug_overlay_stack(xx, yy, "Window: " + string(cwindow))
5757
yy = draw_debug_overlay_stack(xx, yy, os_info[? condstr(os_type = os_windows, "video_adapter_description", "gl_renderer_string: GL_RENDERER")])

scripts/draw_window_about/draw_window_about.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function draw_window_about() {
1212
draw_sprite_ext(spr_logo, window_icon, x1 + 80, y1 + 50, 1, 1, 0, c_white, draw_get_alpha())
1313
draw_set_halign(fa_center)
1414
draw_theme_font(font_info_med_bold)
15-
draw_text_dynamic(x1 + 150, y1 + 200, "Open Note Block Studio")
15+
draw_text_dynamic(x1 + 150, y1 + 200, "Note Block Studio")
1616
draw_theme_font(font_main)
1717
if (language != 1) {
1818
if (RUN_FROM_IDE != 1){

scripts/draw_window_greeting/draw_window_greeting.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function draw_window_greeting() {
3838
draw_window(x1, y1, x1 + 700, y1 + 430)
3939
draw_sprite_ext(spr_logo, window_icon, x1 + 64, y1 + 50, 1, 1, 0, c_white, draw_get_alpha())
4040
draw_theme_font(font_info_med_bold)
41-
draw_text_center(x1 + 132, y1 + 213, "Open Note Block Studio")
41+
draw_text_center(x1 + 132, y1 + 213, "Note Block Studio")
4242
draw_theme_font(font_main_bold)
4343
var dev_label_offset = (is_prerelease) ? 15 : 0
4444
if (RUN_FROM_IDE != 1) {

scripts/lang_en_us/lang_en_us.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function lang_en_us(){
283283
text_draw_icon_instruments = "Edit instruments"
284284
text_draw_icon_midi_manager = "MIDI device manager"
285285
text_draw_icon_tutorial = "Watch tutorial videos"
286-
text_draw_icon_website = "Visit the Open Note Block Studio website"
286+
text_draw_icon_website = "Visit the Note Block Studio website"
287287
text_draw_master_vol = "Master Volume: "
288288
text_draw_minecraft_compatible = "Fully compatible"
289289
text_draw_minecraft_compatible_popup = "This song is compatible with both schematics and data packs.\n(Click for more info.)"

scripts/log_init/log_init.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function log_init() {
99
return false
1010
}
1111

12-
file_text_write_string(f, "__ Minecraft Note Block Studio log __");
12+
file_text_write_string(f, "__ Note Block Studio log __");
1313
file_text_writeln(f)
1414
file_text_close(f)
1515

0 commit comments

Comments
 (0)