diff --git a/.gitignore b/.gitignore index d0a0666c26..61926257ab 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ steam_appid.txt ios/robovm.properties packr-out/ config/ +buildSrc/ *.gif /tests/out diff --git a/build.gradle b/build.gradle index 4ad56f59ff..e3ae3ad3e9 100644 --- a/build.gradle +++ b/build.gradle @@ -326,7 +326,7 @@ project(":core"){ annotationProcessor 'com.github.Anuken:jabel:0.9.0' compileOnly project(":annotations") - kapt project(":annotations") + if(!project.hasProperty("noKapt")) kapt project(":annotations") } afterEvaluate{ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 8bfee5a988..80775411ac 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1156,7 +1156,7 @@ setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves -setting.publichost.name = Public Game Visibility +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 35af3f2e99..b559a248b7 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1128,7 +1128,7 @@ setting.sfxvol.name = Гучнасць эфектаў setting.mutesound.name = Заглушыць гук setting.crashreport.name = Адпраўляць ананімныя справаздачы аб вылетах setting.savecreate.name = Аўтаматычнае стварэнне захаванняў -setting.publichost.name = Агульная даступнасць гульні +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Абмежаванне гульцоў setting.chatopacity.name = Непразрыстасць чата setting.lasersopacity.name = Непразрыстасць лазераў энергазабеспячэння diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 759c7bd4b8..ff7771fc5f 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -1140,7 +1140,7 @@ setting.sfxvol.name = Сила на Звуковите Ефекти setting.mutesound.name = Заглуши Звука setting.crashreport.name = ИЗпращай Анонимни Отчети за Сривове setting.savecreate.name = Автоматични Записи -setting.publichost.name = Видимост на Публичните Игри +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Лимит на Играчи setting.chatopacity.name = Плътност на Чата setting.lasersopacity.name = Плътност на Енергийните Лазери diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index 925d9dfd54..166189e37d 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -1143,7 +1143,7 @@ setting.sfxvol.name = Volums dels efectes de so setting.mutesound.name = Silencia el so setting.crashreport.name = Envia informes d’error anònims setting.savecreate.name = Desa automàticament la partida -setting.publichost.name = Visibilitat de la partida pública +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Límit de jugadors setting.chatopacity.name = Opacitat del xat setting.lasersopacity.name = Opacitat dels làsers d’energia diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 16d1683b3d..d96220ed35 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1141,7 +1141,7 @@ setting.sfxvol.name = Hlasitost efektů setting.mutesound.name = Ztišit zvuk setting.crashreport.name = Poslat anonymní hlášení o spadnutí Mindustry setting.savecreate.name = Automaticky ukládat hru -setting.publichost.name = Veřejná viditelnost hry +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Nejvyšší počet hráčů setting.chatopacity.name = Průsvitnost kanálu zpráv setting.lasersopacity.name = Průsvitnost energetického laseru diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 0e2c8d5a67..aea8011160 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX-volumen setting.mutesound.name = Forstum lyde setting.crashreport.name = Send anonyme fejlrapporter setting.savecreate.name = Gem automatisk -setting.publichost.name = Synlighed af offentlige spil +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spiller-grænse setting.chatopacity.name = Chat-gennemsigtighed setting.lasersopacity.name = Strøm-laser-gennemsigtighed diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 22409d6be9..d148a01445 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1153,7 +1153,7 @@ setting.sfxvol.name = Audioeffekt-Lautstärke setting.mutesound.name = Audioeffekte stummschalten setting.crashreport.name = Anonyme Absturzberichte senden setting.savecreate.name = Automatisch speichern -setting.publichost.name = Öffentliche Sichtbarkeit des Spiels +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spielerbegrenzung setting.chatopacity.name = Chat-Deckkraft setting.lasersopacity.name = Power-Laser-Deckkraft diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 0a468fef0c..41b25772f8 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1149,7 +1149,7 @@ setting.sfxvol.name = Volumen del sonido setting.mutesound.name = Silenciar sonido setting.crashreport.name = Enviar registros de errores anónimos setting.savecreate.name = Guardado automático -setting.publichost.name = Visibilidad pública de la partida +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de jugadores setting.chatopacity.name = Opacidad del chat setting.lasersopacity.name = Opacidad de láseres energía diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index a8ab0d2fc9..0c088e1193 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = Heliefektide tugevus setting.mutesound.name = Vaigista heli setting.crashreport.name = Saada automaatseid veateateid setting.savecreate.name = Loo automaatseid salvestisi -setting.publichost.name = Avaliku mängu nähtavus +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Vestlusakna läbipaistmatus setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index c1284ec210..50325ca09e 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1132,7 +1132,7 @@ setting.sfxvol.name = Efektuen bolumena setting.mutesound.name = Isilarazi soinua setting.crashreport.name = Bidali kraskatze txosten automatikoak setting.savecreate.name = Gorde automatikoki -setting.publichost.name = Partidaren ikusgaitasun publikoa +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Txataren opakotasuna setting.lasersopacity.name = Energia laserraren opakutasuna diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 64c142e223..e657836822 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1129,7 +1129,7 @@ setting.sfxvol.name = SFX-voimakkuus setting.mutesound.name = Mykistä äänet setting.crashreport.name = Lähetä anonyymejä kaatumisilmoituksia setting.savecreate.name = Luo tallenuksia automaattisesti -setting.publichost.name = Julkisen pelin näkyvyys +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Pelaajaraja setting.chatopacity.name = Keskustelun läpinäkymättömyys setting.lasersopacity.name = Energia laserin läpinäkymättömyys diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 6a8950a100..bb9ea59e67 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1129,7 +1129,7 @@ setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Mag-send ng Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves -setting.publichost.name = Public Game Visibility +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 9f481dd570..5219de9fe4 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1155,7 +1155,7 @@ setting.sfxvol.name = Volume des Sons et Effets setting.mutesound.name = Couper les Sons et Effets setting.crashreport.name = Envoyer des Rapports de crash anonymes setting.savecreate.name = Sauvegardes Automatiques -setting.publichost.name = Visibilité de la Partie publique +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de Joueurs setting.chatopacity.name = Opacité du Chat setting.lasersopacity.name = Opacité des Connexions laser diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 88c1fbec78..39b911bc3b 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1155,7 +1155,7 @@ setting.sfxvol.name = SFX hangerő setting.mutesound.name = Hang némítása setting.crashreport.name = Névtelen összeomlási jelentések setting.savecreate.name = Automatikus mentés -setting.publichost.name = Nyilvános játék láthatósága +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Játékos limit setting.chatopacity.name = Csevegő átlátszatlansága setting.lasersopacity.name = Villanyvezeték átlátszatlansága diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index 0da00b10b9..37ac2fac03 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -1149,7 +1149,7 @@ setting.sfxvol.name = Volume Efek Suara setting.mutesound.name = Diamkan Suara setting.crashreport.name = Laporkan Masalah setting.savecreate.name = Otomatis Menyimpan -setting.publichost.name = Visibilitas Game Publik +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Batas pemain setting.chatopacity.name = Jelas-Beningnya Pesan setting.lasersopacity.name = Jelas-Beningnya Tenaga Laser diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 7d5cee5309..962f742aa3 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1136,7 +1136,7 @@ setting.sfxvol.name = Volume Effetti setting.mutesound.name = Silenzia Suoni setting.crashreport.name = Invia rapporti anonimi sugli arresti anomali setting.savecreate.name = Salvataggi Automatici -setting.publichost.name = Gioco Visibile Pubblicamente +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite Giocatori setting.chatopacity.name = Opacità Chat setting.lasersopacity.name = Opacità Raggi Energetici diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index b59a37a712..83af7e6755 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1142,7 +1142,7 @@ setting.sfxvol.name = 効果音 音量 setting.mutesound.name = 効果音をミュート setting.crashreport.name = 匿名でクラッシュレポートを送信する setting.savecreate.name = 自動保存 -setting.publichost.name = 誰でもゲームに参加できるようにする +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = プレイヤー数制限 setting.chatopacity.name = チャットの透明度 setting.lasersopacity.name = 電線の透明度 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index c138e309d8..fafa137270 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1141,7 +1141,7 @@ setting.sfxvol.name = 효과음 크기 setting.mutesound.name = 소리 끄기 setting.crashreport.name = 익명으로 오류 보고서 자동 전송 setting.savecreate.name = 자동 저장 활성화 -setting.publichost.name = 공용 서버로 표시 +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = 플레이어 제한 setting.chatopacity.name = 채팅창 투명도 setting.lasersopacity.name = 전선 투명도 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index f644b1b3a1..bc785a4c78 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX Garsumas setting.mutesound.name = Nutildyti Garsus setting.crashreport.name = Siųsti Anoniminius Strigties Pranešimus setting.savecreate.name = Automatiškai Kurti Išsaugojimus -setting.publichost.name = Viešojo Žaidimo Matomumas +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Žaidėjų Limitas setting.chatopacity.name = Pokalbių Lentos Nepermatomumas setting.lasersopacity.name = Elektros Tinklo Nepermatomumas diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 84872be5fa..6e747d38bf 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1142,7 +1142,7 @@ setting.sfxvol.name = SFX Volume setting.mutesound.name = Demp Geluid setting.crashreport.name = Stuur Anonieme Crashmeldingen setting.savecreate.name = Bewaar Saves Automatisch -setting.publichost.name = Publieke Server Zichtbaarheid +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spelerslijst setting.chatopacity.name = Chat Transparantie setting.lasersopacity.name = Stroomdraad Transparantie diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 74169a455d..ea3d7db054 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves -setting.publichost.name = Public Game Visibility +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 4006da0d66..2c7d6c9586 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1140,7 +1140,7 @@ setting.sfxvol.name = Głośność dźwięków setting.mutesound.name = Wycisz dźwięki setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry setting.savecreate.name = Automatyczne tworzenie zapisów -setting.publichost.name = Widoczność gry publicznej +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limit graczy setting.chatopacity.name = Przezroczystość czatu setting.lasersopacity.name = Przezroczystość laserów zasilających diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 187a136e0b..75e2a23295 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1150,7 +1150,7 @@ setting.sfxvol.name = Volume de Efeitos setting.mutesound.name = Desligar Som setting.crashreport.name = Enviar denúncias anônimas de erros setting.savecreate.name = Criar salvamentos automaticamente -setting.publichost.name = Visibilidade do jogo público +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limites de Player setting.chatopacity.name = Opacidade do chat setting.lasersopacity.name = Opacidade do laser diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index a43d85d095..208e560ca3 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = Volume de Efeitos setting.mutesound.name = Desligar Som setting.crashreport.name = Enviar denuncias de crash anonimas setting.savecreate.name = Criar gravamentos automaticamente -setting.publichost.name = Visibilidade do jogo público +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de Jogadores setting.chatopacity.name = Opacidade do chat setting.lasersopacity.name = Opacidade do Power Laser diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 594bee3481..62a12c2af2 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1142,7 +1142,7 @@ setting.sfxvol.name = Volum Efecte Sonore setting.mutesound.name = Sunetul pe Mut setting.crashreport.name = Trimite Rapoarte de Crash anonime setting.savecreate.name = Auto-Creează Salvări -setting.publichost.name = Vizibilitatea Jocurilor Publice +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limita Jucătorilor setting.chatopacity.name = Opacitate Chat setting.lasersopacity.name = Opacitate Laser Electric diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 3e9fa23b84..ae5eadb2d5 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1142,7 +1142,7 @@ setting.sfxvol.name = Громкость эффектов setting.mutesound.name = Заглушить звук setting.crashreport.name = Отправлять анонимные отчёты о вылетах setting.savecreate.name = Автоматическое создание сохранений -setting.publichost.name = Общедоступность игры +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Ограничение игроков setting.chatopacity.name = Непрозрачность чата setting.lasersopacity.name = Непрозрачность лазеров энергоснабжения diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index 8fa9e69023..25a0778287 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -1144,7 +1144,7 @@ setting.sfxvol.name = Jačina Zvučnih Efekata setting.mutesound.name = Nema Zvuka setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Automatski Snimaj Igru -setting.publichost.name = Vidljivost Javne Igre +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limit Igrača setting.chatopacity.name = Prozirnost Četa setting.lasersopacity.name = Prozirnost Energetskih Lasera diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 3a82182162..f5e12f5995 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = Ljudeffektvolym setting.mutesound.name = Stäng Av Ljudeffekter setting.crashreport.name = Skicka Anonyma Krashrapporter setting.savecreate.name = Auto-Create Saves -setting.publichost.name = Public Game Visibility +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Chattgenomskinlighet setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 88b9f11dc2..b3702b3e69 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1143,7 +1143,7 @@ setting.sfxvol.name = ระดับเสียง SFX setting.mutesound.name = ปิดเสียง setting.crashreport.name = ส่งรายงานข้อขัดข้องแบบไม่ระบุตัวตน setting.savecreate.name = สร้างเซฟโดยอัตโนมัติ -setting.publichost.name = การมองเห็นเซิร์ฟเวอร์สาธารณะ +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = จำกัดผู้เล่น setting.chatopacity.name = ความโปร่งแสงของแชท setting.lasersopacity.name = ความโปร่งแสงของลำแสงพลังงาน diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index cabd2f7088..32b50b9a54 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1130,7 +1130,7 @@ setting.sfxvol.name = Ses seviyesi setting.mutesound.name = Sesi kapat setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves -setting.publichost.name = Public Game Visibility +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit setting.chatopacity.name = Chat Opacity setting.lasersopacity.name = Power Laser Opacity diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 2a3c2a8fb7..b26237acc4 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1140,7 +1140,7 @@ setting.sfxvol.name = Oyun Sesi setting.mutesound.name = Sesi Kapat setting.crashreport.name = Anonim Çökme Raporları Gönder setting.savecreate.name = Otomatik Kayıt Oluştur -setting.publichost.name = Halka Açık Sunucular +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Oyuncu Limiti setting.chatopacity.name = Mesajlaşma Opaklığı setting.lasersopacity.name = Enerji Lazeri Opaklığı diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 298033e0b9..88d02346da 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1151,7 +1151,7 @@ setting.sfxvol.name = Гучність звукових ефектів setting.mutesound.name = Заглушити звук setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри setting.savecreate.name = Автоматичне створення збережень -setting.publichost.name = Загальнодоступність гри +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Обмеження гравців setting.chatopacity.name = Непрозорість чату setting.lasersopacity.name = Непрозорість лазерів енергопостачання diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 53cadbfa1c..a7fa4af8c4 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -1144,7 +1144,7 @@ setting.sfxvol.name = Âm lượng SFX setting.mutesound.name = Tắt tiếng setting.crashreport.name = Gửi báo cáo sự cố setting.savecreate.name = Tự động lưu -setting.publichost.name = Hiển thị trò chơi công khai +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Giới hạn người chơi setting.chatopacity.name = Độ mờ trò chuyện setting.lasersopacity.name = Độ mờ kết nối năng lượng diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 8ed46e5e41..46dabee5b7 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1152,7 +1152,7 @@ setting.sfxvol.name = 音效音量 setting.mutesound.name = 禁用音效 setting.crashreport.name = 发送匿名的崩溃报告 setting.savecreate.name = 自动创建存档 -setting.publichost.name = 游戏公开可见 +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = 玩家数量限制 setting.chatopacity.name = 聊天界面不透明度 setting.lasersopacity.name = 电力连接线不透明度 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index aa8aa82eb9..deb30b3855 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1148,7 +1148,7 @@ setting.sfxvol.name = 音效音量 setting.mutesound.name = 靜音 setting.crashreport.name = 傳送匿名當機回報 setting.savecreate.name = 自動建立存檔 -setting.publichost.name = 公開遊戲可見度 +setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = 玩家數限制 setting.chatopacity.name = 聊天框不透明度 setting.lasersopacity.name = 雷射不透明度 diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java index a8d27786ed..7c9e51890f 100644 --- a/core/src/mindustry/net/NetConnection.java +++ b/core/src/mindustry/net/NetConnection.java @@ -1,6 +1,5 @@ package mindustry.net; -import arc.*; import arc.struct.*; import arc.util.*; import mindustry.entities.units.*; @@ -82,17 +81,16 @@ public abstract class NetConnection{ Call.kick(this, reason); } - if(uuid.startsWith("steam:")){ - //run with a 2-frame delay so there is time to send the kick packet, steam handles this weirdly - Core.app.post(() -> Core.app.post(this::close)); - }else{ - close(); - } + kickDisconnect(); netServer.admins.save(); kicked = true; } + protected void kickDisconnect(){ + close(); + } + public boolean isConnected(){ return true; } diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 3092db179f..01e2019401 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -250,9 +250,10 @@ public class JoinDialog extends BaseDialog{ buildServer(host, server.content, false); } - void buildServer(Host host, Table content, boolean inner){ + void buildServer(Host host, Table content, boolean local){ content.top().left(); - String versionString = getVersionString(host); + boolean isBanned = local && Vars.steam && host.description != null && host.description.equals("[banned]"); + String versionString = getVersionString(host) + (isBanned ? "[red] [banned]" : ""); float twidth = targetWidth() - 40f; @@ -260,7 +261,7 @@ public class JoinDialog extends BaseDialog{ Color color = Pal.gray; - if(inner){ + if(local){ content.table(Tex.whiteui, t -> { t.left(); t.setColor(color); @@ -274,7 +275,7 @@ public class JoinDialog extends BaseDialog{ t.setColor(color); t.left(); - if(!host.description.isEmpty()){ + if(!host.description.isEmpty() && !isBanned){ //limit newlines. int count = 0; StringBuilder result = new StringBuilder(host.description.length()); diff --git a/desktop/build.gradle b/desktop/build.gradle index f5a9fca57f..7f4ecdcf0a 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -71,7 +71,9 @@ task steamtest(dependsOn: dist){ doLast{ copy{ from "build/libs/Mindustry.jar" - if(System.properties["os.name"].contains("Mac")){ + if(project.hasProperty("destination")){ + into project.property("destination") + }else if(System.properties["os.name"].contains("Mac")){ into "/Users/anuke/Library/Application Support/Steam/steamapps/common/Mindustry/Mindustry.app/Contents/Resources" }else{ into "/home/anuke/.steam/steam/steamapps/common/Mindustry/jre" diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java index 0d6a760dc3..a08ecf3120 100644 --- a/desktop/src/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -107,6 +107,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, Events.on(WaveEvent.class, e -> updateWave()); Events.run(Trigger.newGame, this::updateWave); + + Events.on(PlayerIpBanEvent.class, e -> updateBans(e.ip)); + Events.on(PlayerIpUnbanEvent.class, e -> updateBans(e.ip)); } public boolean isSteamClient(){ @@ -207,6 +210,12 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, } } + /** Updates the ban list so that lobbies don't appear for banned players. The list will only be updated when a steam player is banned/unbanned. */ + void updateBans(String changed){ + if(changed != null && !changed.startsWith("steam:")) return; //hacky way to ignore non-steam ids + smat.setLobbyData(currentLobby, "banned", netServer.admins.bannedIPs.select(ip -> ip.contains("steam:")).reduce(new StringBuilder(), (ip, str) -> str.append(ip.substring(6)).append(',')).toString()); //list of handles split by commas + } + @Override public void closeServer(){ provider.closeServer(); @@ -263,7 +272,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, //check version if(version != Version.build){ ui.loadfrag.hide(); - ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" + + ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated) + "\n[]" + Core.bundle.format("server.versions", Version.build, version)); smat.leaveLobby(steamIDLobby); return; @@ -321,6 +330,11 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, String mode = smat.getLobbyData(lobby, "gamemode"); //make sure versions are equal, don't list incompatible lobbies if(mode == null || mode.isEmpty() || (Version.build != -1 && Strings.parseInt(smat.getLobbyData(lobby, "version"), -1) != Version.build)) continue; + + String banList = smat.getLobbyData(lobby, "banned"); + + boolean banned = banList.length() > 0 && Structs.contains(banList.split(","), SVars.user.user.getSteamID().getAccountID() + ""); + Host out = new Host( -1, //invalid ping smat.getLobbyData(lobby, "name"), @@ -332,7 +346,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, smat.getLobbyData(lobby, "versionType"), Gamemode.valueOf(mode), smat.getLobbyMemberLimit(lobby), - "", + banned ? "[banned]" : "", null ); hosts.add(out); @@ -365,6 +379,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, smat.setLobbyData(steamID, "versionType", Version.type); smat.setLobbyData(steamID, "wave", state.wave + ""); smat.setLobbyData(steamID, "gamemode", state.rules.mode().name() + ""); + updateBans(null); } } @@ -405,7 +420,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, final SteamID sid; public SteamConnection(SteamID sid){ - super(sid.getAccountID() + ""); + super("steam:" + sid.getAccountID()); this.sid = sid; Log.info("Created STEAM connection: @", sid.getAccountID()); } @@ -437,6 +452,12 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, return true;//state.isConnectionActive(); } + @Override + protected void kickDisconnect(){ + //delay the close so the kick packet can be sent on steam + Time.runTask(10f, this::close); + } + @Override public void close(){ disconnectSteamUser(sid); diff --git a/servers_v7.json b/servers_v7.json index df78ef83f7..68bbcfec89 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "Vndustry", "address": ["140.238.246.78:7000"] }, + { + "name": "STP", + "address": ["23.88.73.88:25617"] + }, { "name": "meiqiuMDT", "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"]