diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 95d88a6dac..36603d9fc5 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -525,6 +525,7 @@ details = Details... edit = Edit variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Name: diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index de3615c533..47d7270874 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -525,6 +525,7 @@ details = Падрабязнасці... edit = Рэдагаваць... variables = Пераменныя logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Назва: diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index a163a86fe6..315ce6bb51 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -525,6 +525,7 @@ details = Детайли... edit = Редактирай... variables = Променливи logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Име: diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index 9eccd7a8db..e1f089030b 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -525,6 +525,7 @@ details = Detalls edit = Edita variables = Variables logic.clear.confirm = Esteu segur que voleu esborrar tot el codi d’aquest processador? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nom: diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 6b15316f8a..85cc08f6d6 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -525,6 +525,7 @@ details = Podrobnosti... edit = Upravit... variables = Hodnoty logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Vestavěné proměnné editor.name = Jméno: diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 7ae35a8d64..ce39fd0166 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -525,6 +525,7 @@ details = Detaljer... edit = Rediger... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Navn: diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 916971be08..17be0d8cc4 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -525,6 +525,7 @@ details = Details edit = Bearbeiten variables = Variablen logic.clear.confirm = Willst du wirklich den gesamten Code aus diesem Prozessor löschen? +logic.restart = Restart logic.globals = Eingebaute Variablen editor.name = Name: diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 9ab67dad1d..579e85b327 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -525,6 +525,7 @@ details = Detalles... edit = Editar... variables = Variables logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nombre: diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index d9d17f6e85..e960337890 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -525,6 +525,7 @@ details = Üksikasjad... edit = Muuda... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nimi: diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 3783fa2c55..e7c8ba91ec 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -525,6 +525,7 @@ details = Xehetasunak... edit = Editatu... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Izena: diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 72cbc95f28..b5d85d1836 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -525,6 +525,7 @@ details = Yksityiskohdat... edit = Muokkaa... variables = Muuttujat logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nimi: diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 4108fb8a0d..29ecea4948 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -525,6 +525,7 @@ details = Details... edit = Edit... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Name: diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index f7e496dab2..36905ffa4e 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -525,6 +525,7 @@ details = Détails... edit = Modifier... variables = Variables logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nom : diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index d46d8f20f0..7128f2b66c 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -525,6 +525,7 @@ details = Részletek… edit = Szerkesztés variables = Változók logic.clear.confirm = Biztosan törölni akarod az összes kódot ebből a processzorból? +logic.restart = Restart logic.globals = Beépített változók editor.name = Név: diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index 03aa0e0c10..f7c0d91f8f 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -525,6 +525,7 @@ details = Detail... edit = Sunting variables = Variabel logic.clear.confirm = Apakah Anda yakin ingin menghapus semua kode dari prosesor ini? +logic.restart = Restart logic.globals = Variabel Bawaan editor.name = Nama: diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index d1096c53c0..a498d55a09 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -525,6 +525,7 @@ details = Dettagli... edit = Modifica... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nome: diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index f3f999f284..a0da33c086 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -525,6 +525,7 @@ details = 詳細... edit = 編集... variables = 変数 logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = 名前: diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index d687076aa3..199c20cf57 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -525,6 +525,7 @@ details = 설명... edit = 편집... variables = 변수 logic.clear.confirm = 이 프로세서의 모든 코드를 삭제하시겠습니까? +logic.restart = Restart logic.globals = 내장 변수 editor.name = 이름: diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 6fff802208..af20f2fc69 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -525,6 +525,7 @@ details = Detaliau... edit = Redaguoti... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Pavadinimas: diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index f525a1cac8..d4616cf12f 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -525,6 +525,7 @@ details = Details... edit = Bewerk... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Naam: diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 8548f9fc50..10f1778ea0 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -525,6 +525,7 @@ details = Details... edit = Edit... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Name: diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index b488c2529b..ceef74aff1 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -525,6 +525,7 @@ details = Detale... edit = Edytuj... variables = Zmienne logic.clear.confirm = Czy na pewno chcesz wyczyścić cały kod z tego procesora?? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nazwa: diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 442d664e3a..6556f0f741 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -525,6 +525,7 @@ details = Detalhes... edit = Editar... variables = Variáveis logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nome: diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 1502b07513..cb10cf5686 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -525,6 +525,7 @@ details = Detalhes... edit = Editar... variables = Variáveis logic.clear.confirm = Tens a certeza que querea apagar todo o código deste procesador? +logic.restart = Restart logic.globals = Variáveis Embutidas editor.name = Nome: diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index cd601d7c6b..117a9a8d0e 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -525,6 +525,7 @@ details = Detalii... edit = Editează... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Nume: diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 48e808c53c..f4cb5b7fe3 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -525,6 +525,7 @@ details = Подробности... edit = Редактировать... variables = Переменные logic.clear.confirm = Вы уверены, что хотите удалить весь код из этого процессора? +logic.restart = Restart logic.globals = Встроенные переменные editor.name = Название: diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index 765e8859e3..132a6027dc 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -525,6 +525,7 @@ details = Detalji... edit = Izmeni... variables = Varijabla logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Ime: diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index b1b8f15a09..08a4d26c4d 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -525,6 +525,7 @@ details = Details... edit = Redigera... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Namn: diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 4f77a68ab2..be8249b5d5 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -525,6 +525,7 @@ details = รายละเอียด... edit = แก้ไข... variables = ตัวแปร logic.clear.confirm = คุณแน่ใจหรือว่าจะเคลียร์โค้ดทั้งหมดของตัวประมวลผลนี้? +logic.restart = Restart logic.globals = ตัวแปรค่าเริ่มต้น editor.name = ชื่อ: diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 17c4dc9f47..b7ff72d3f7 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -525,6 +525,7 @@ details = Details... edit = Edit... variables = Vars logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = isim: diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index a7f5377eb7..5e079eb65b 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -525,6 +525,7 @@ details = Detaylar... edit = Düzenle... variables = Değişkenler logic.clear.confirm = Bu işlemciden bütün kodları silmek istediğinze emin misiniz? +logic.restart = Restart logic.globals = Dahili Değişkenler editor.name = İsim: diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index f8b2632d32..dbcd8b2a4d 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -525,6 +525,7 @@ details = Подробиці… edit = Змінити… variables = Змінні logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = Built-in Variables editor.name = Ім’я: diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 37afca90ea..2a46bf6dee 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -525,6 +525,7 @@ details = Chi tiết... edit = Chỉnh sửa variables = Biến số logic.clear.confirm = Bạn có muốn xóa sạch tất cả mã khỏi bộ xử lý này? +logic.restart = Restart logic.globals = Biến số sẵn có editor.name = Tên: diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 8b64e417eb..d170e57beb 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -525,6 +525,7 @@ details = 详情 edit = 编辑 variables = 变量 logic.clear.confirm = 确定要清除此处理器中的所有代码吗? +logic.restart = Restart logic.globals = 内建变量 editor.name = 名称: diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 4f3ff1e1c7..79b802f7e6 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -525,6 +525,7 @@ details = 詳細資訊…… edit = 編輯…… variables = 變數 logic.clear.confirm = Are you sure you want to clear all code from this processor? +logic.restart = Restart logic.globals = 內建變數 editor.name = 名稱: diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index 10e0d74ed3..047e54c99c 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -31,7 +31,7 @@ public class LogicDialog extends BaseDialog{ boolean privileged; @Nullable LExecutor executor; GlobalVarsDialog globalsDialog = new GlobalVarsDialog(); - boolean wasRows, wasPortrait; + boolean wasRows, wasPortrait, forceRestart; public LogicDialog(){ super("logic"); @@ -142,7 +142,14 @@ public class LogicDialog extends BaseDialog{ }catch(Throwable e){ ui.showException(e); } - }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null); + }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null).row(); + + t.button("@logic.restart", Icon.refresh, style, () -> { + forceRestart = true; + dialog.hide(); + hide(); + }).marginLeft(12f); + }); }); @@ -336,6 +343,7 @@ public class LogicDialog extends BaseDialog{ public void show(String code, LExecutor executor, boolean privileged, Cons modified){ this.executor = executor; this.privileged = privileged; + this.forceRestart = false; canvas.statements.clearChildren(); canvas.rebuild(); canvas.privileged = privileged; @@ -346,7 +354,7 @@ public class LogicDialog extends BaseDialog{ canvas.load(""); } this.consumer = result -> { - if(!result.equals(code)){ + if(forceRestart || !result.equals(code)){ modified.get(result); } };