More code cleanup

core/assets/bundles/bundle_cs.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Jsi si jistý žechceš tuto mapu smazat? tato akce je nevr
 map.random = [accent]Náhodná mapa
 map.nospawn = Tato mapa nemá žádná jádra pro hráče ke spawnutí! přidej[ROYAL] blue[] jádro na tuto mapu v editoru.
 map.nospawn.pvp = Tato mapa nemá žádné nepřátelské jádra pro hráče ke spawnutí! přidej[SCARLET] red[] jádro na tuto mapu v editoru.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Chyba v načítání mapy: poškozený nebo neplatný soubor mapy.
 editor.brush = Štětec
 editor.openin = Otevřít v editoru.

core/assets/bundles/bundle_de.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Bist du sicher, dass du diese Karte löschen willst? Die Ak
 map.random = [accent]Zufällige Karte
 map.nospawn = Diese Karte hat keine Kerne in denen die Spieler beginnen können! Füge einen [ROYAL]blue[] Kern zu dieser Karte im Editor hinzu.
 map.nospawn.pvp = Diese Karte hat keine gegnerischen Kerne wo Gegner starten könnten! Füge über den Editor [SCARLET] rote[] Kerne zu dieser Karte hinzu.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Fehler beim Laden der Karte: Beschädigtes oder invalide Karten Datei.
 editor.brush = Pinsel
 editor.openin = Öffne im Editor

core/assets/bundles/bundle_es.properties

@@ -182,6 +182,7 @@ map.delete.confirm = ¿Estás seguro de querer borrar este mapa? ¡Recuerda que
 map.random = [accent]Mapa Aleatorio
 map.nospawn = ¡Este mapa no tiene ningún núcleo en el cual pueda aparecer el jugador! Agrega un núcleo[ROYAL] blue[] al mapa con el editor.
 map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezca el jugador! Añade un núcleo[SCARLET] red[] a este mapa en el editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error cargando el mapa: archivo corrupto o inválido.
 editor.brush = Pincel
 editor.openin = Abrir en el Editor

core/assets/bundles/bundle_fr.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Êtes-vous sûr de supprimer cette carte? Cette action ne p
 map.random = [accent]Carte aléatoire
 map.nospawn = Cette carte n'a pas de base pour que le joueur y apparaisse! Ajouter une [ROYAL]base bleue[] sur cette carte dans l'éditeur.
 map.nospawn.pvp = Cette carte n'a pas de base ennemies pour qu'un joueur ennemi y apparaisse! Ajouter au moins une [SCARLET]Base rouge[] sur cette carte dans l'éditeur.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur

core/assets/bundles/bundle_fr_BE.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Êtes-vous sûr de vouloir effacer cette carte ? Cette acti
 map.random = [accent]Carte aléatoire
 map.nospawn = Cette carte ne possède pas de base pour que le joueur puisse apparaître !Ajouter un [ROYAL]base bleue[] sur cette carte dans l'éditeur.
 map.nospawn.pvp = Cette carte ne contient aucune base ennemi dans lequel le joueur apparaît!\nAjoutez des bases[SCARLET] rouge[] à cette carte dans l'éditeur.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur

core/assets/bundles/bundle_in_ID.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Are you sure you want to delete this map? This action canno
 map.random = [accent]Random Map
 map.nospawn = This map does not have any cores for the player to spawn in! Add a [ROYAL]blue[] core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 editor.brush = Brush
 editor.openin = Open In Editor

core/assets/bundles/bundle_it.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Sei sicuro di voler eliminare questa mappa? Non potrai torn
 map.random = [accent]Mappa casuale
 map.nospawn = Questa mappa non possiede un nucleo dove spawnare! Aggiungine uno nell'editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Errore nel caricamento della mappa: file mappa corrotto o non valido.
 editor.brush = Pennello
 editor.openin = Apri nell'editor

core/assets/bundles/bundle_ja.properties

@@ -182,6 +182,7 @@ map.delete.confirm = マップを削除してもよろしいですか? これは
 map.random = [accent]ランダムマップ
 map.nospawn = このマップにはスポーンするためのプレイヤーのコアがありません! [ROYAL]青い[]コアをエディターでマップに追加してください。
 map.nospawn.pvp = このマップには敵がスポーンするためのプレイヤーのコアがありません! [SCARLET]赤い[]コアをエディターでマップに追加してください。
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = マップの読み込みエラー: ファイルが無効、または破損しています。
 editor.brush = ブラシ
 editor.openin = エディターで開く

core/assets/bundles/bundle_ko.properties

@@ -182,6 +182,7 @@ map.delete.confirm = 이 맵을 삭제하시겠습니까? 이 명령은 취소
 map.random = [accent]랜덤 맵
 map.nospawn = 이 맵에 플레이어가 스폰 할 코어가 없습니다! 맵 편집기에서 [ROYAL]파란색[]코어를 맵에 추가하세요.
 map.nospawn.pvp = 이 맵에는 적팀 코어가 없습니다! 에디터에서 [SCARLET]빨간팀[] 코어를 추가하세요.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = 파일이 잘못되었거나 손상되어 맵을 열 수 없습니다.
 editor.brush = 브러쉬
 editor.openin = 편집기 열기

core/assets/bundles/bundle_nl.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Are you sure you want to delete this map? This action canno
 map.random = [accent]Random Map
 map.nospawn = This map does not have any cores for the player to spawn in! Add a[ROYAL] blue[] core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 editor.brush = Brush
 editor.openin = Open In Editor

core/assets/bundles/bundle_pl.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Jesteś pewny, że chcesz usunąć tę mapę? Nie będzie m
 map.random = [accent]Losowa mapa
 map.nospawn = Ta mapa nie zawiera żadnego rdzenia! Musisz dodać [ROYAL]niebieski[] rdzeń do tej mapy.
 map.nospawn.pvp = Ta mapa nie ma żadnego rdzenia przeciwnika, aby mogli się zrespić przeciwnicy! Dodaj[SCARLET] czerwony[] rdzeń do mapy w edytorze.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error podczas ładowania mapy: uszkodzony lub niepoprawny plik mapy.
 editor.brush = Pędzel
 editor.openin = Otwórz w edytorze

core/assets/bundles/bundle_pt_BR.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Certeza que quer deletar este mapa? Isto não pode ser desf
 map.random = [accent]Mapa aleatório
 map.nospawn = Esse mapa não contém um [yellow]núcleo[] para o jogador Nascer! [ROYAL]blue[] Coloque um [yellow]núcleo[] no editor de mapa.
 map.nospawn.pvp = Esse mapa não tem núcleos inimigos para os jogadores nascerem! Adicione[SCARLET] Núcleos vermelhos[] no mapa no editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Erro ao carregar o mapa: Arquivo de mapa invalido ou corrupto.
 editor.brush = Pincel
 editor.openin = Abrir no Editor

core/assets/bundles/bundle_ru.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Вы действительно хотите удалить
 map.random = [accent]Случайная карта
 map.nospawn = Эта карта не имеет ядер, в которых игрок может появиться! Добавьте[ROYAL] синее[] ядро на эту карту в редакторе карт.
 map.nospawn.pvp = У этой карты нет вражеских ядер, в которых игрок может появиться! Добавьте[SCARLET] красные[] ядра к этой карте в редакторе.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Ошибка загрузки карты: повреждённый или недопустимый файл карты.
 editor.brush = Кисть
 editor.openin = Открыть в редакторе

core/assets/bundles/bundle_tk.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Haritayi silmek istedigine emin misin? Bu geri alinamaz!
 map.random = [accent]Rasgele harita
 map.nospawn = Haritada Oyncularin cikmasi icin cekirdek yok! Haritaya[ROYAL]Mavi[] cekirdek ekle.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Harita yuklenemedi. Gecersiz yada bozuk dosya.
 editor.brush = Firca
 editor.openin = Editorde ac

core/assets/bundles/bundle_tr.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Are you sure you want to delete this map? This action canno
 map.random = [accent]Random Map
 map.nospawn = This map does not have any cores for the player to spawn in! Add a [ROYAL]blue[] core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 editor.brush = Brush
 editor.openin = Open In Editor

core/assets/bundles/bundle_uk_UA.properties

@@ -182,6 +182,7 @@ map.delete.confirm = Ви впевнені, що хочете видалити
 map.random = [accent]Випадкова мапа
 map.nospawn = Ця мапа не має жодного ядра для спавну гравця! Додайте[ROYAL] сине[] ядро в цю мапу редакторі.
 map.nospawn.pvp = У цієї мапи немає ворожих ядер, в яких гравець може з'явитися! Додайте[SCARLET] червоне[] ядро до цієї мапи в редакторі.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Помилка завантаження мапи: пошкоджений або невірний файл мапи.
 editor.brush = Пензлик
 editor.openin = Відкрити в редакторі

core/assets/bundles/bundle_zh_CN.properties

@@ -182,6 +182,7 @@ map.delete.confirm = 确认要删除地图吗？这个操作无法撤销！
 map.random = [accent]随机地图
 map.nospawn = 这个地图没有核心！请在编辑器中添加一个[ROYAL]蓝色[]的核心。
 map.nospawn.pvp = 这个地图没有敌人的核心！请在编辑器中添加一个[ROYAL]红色[]的核心。
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = 地图载入错误：地图文件可能已经损坏。
 editor.brush = 笔刷
 editor.openin = 在编辑器中打开

core/assets/bundles/bundle_zh_TW.properties

@@ -182,6 +182,7 @@ map.delete.confirm = 確認要刪除地圖嗎？此操作無法撤回！
 map.random = [accent]隨機地圖
 map.nospawn = 這個地圖沒有核心！請在編輯器中添加一個[ROYAL]藍色[]的核心。
 map.nospawn.pvp = 這個地圖沒有核心讓敵人重生！請在編輯器中添加一個[SCARLET]紅色[]的核心。
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = 地圖載入錯誤：地圖可能已經損壞。
 editor.brush = 粉刷
 editor.openin = 在編輯器中開啟

core/src/io/anuke/mindustry/core/World.java

@@ -457,9 +457,7 @@ public class World implements ApplicationListener{
             }
 
             for(int x = 0; x < tiles.length; x++){
-                for(int y = 0; y < tiles[0].length; y++){
-                    dark[x][y] = writeBuffer[x][y];
-                }
+                System.arraycopy(writeBuffer[x], 0, dark[x], 0, tiles[0].length);
             }
         }
 

core/src/io/anuke/mindustry/editor/generation/OreFilter.java

@@ -1,7 +1,6 @@
 package io.anuke.mindustry.editor.generation;
 
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.editor.generation.FilterOption.BlockOption;
 import io.anuke.mindustry.editor.generation.FilterOption.SliderOption;
 import io.anuke.mindustry.world.Block;
 

core/src/io/anuke/mindustry/entities/effect/Puddle.java

@@ -305,9 +305,10 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai
         y = data.readFloat();
         liquid = content.liquid(data.readByte());
         targetAmount = data.readShort() / 4f;
-        tile = world.tile(data.readInt());
+        int pos = data.readInt();
+        tile = world.tile(pos);
 
-        map.put(tile.pos(), this);
+        map.put(pos, this);
     }
 
     @Override

core/src/io/anuke/mindustry/ui/TreeLayout.java

@@ -237,9 +237,8 @@ public class TreeLayout{
             }
             executeShifts(v);
             float midpoint = (v.children[0].prelim + v.children[v.children.length-1].prelim) / 2f;
-            TreeNode w = leftSibling;
-            if(w != null){
-                v.prelim = w.prelim + getDistance(v, w);
+            if(leftSibling != null){
+                v.prelim = leftSibling.prelim + getDistance(v, leftSibling);
                 v.mode = v.prelim - midpoint;
             }else{
                 v.prelim = midpoint;

core/src/io/anuke/mindustry/world/Build.java

@@ -186,7 +186,8 @@ public class Build{
                 Tile tile = world.tile(x + point.x, y + point.y);
                 if(tile != null && !tile.floor().isDeep()) return true;
             }
-            return world.tile(x, y) != null && !world.tile(x, y).floor().isDeep();
+            Tile tile = world.tile(x, y);
+            return tile != null && !tile.floor().isDeep();
         }
         return false;
     }

core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java

@@ -231,7 +231,7 @@ public class Conveyor extends Block{
             pos.y = Mathf.clamp(pos.y, 0, nextMax);
 
             if(pos.y >= 0.9999f && offloadDir(tile, pos.item)){
-                if(next.block() instanceof Conveyor){
+                if(next != null && next.block() instanceof Conveyor){
                     ConveyorEntity othere = next.entity();
 
                     ItemPos ni = pos2.set(othere.convey.get(othere.lastInserted), ItemPos.updateShorts);

tools/src/io/anuke/mindustry/BundleLauncher.java

@@ -4,13 +4,13 @@ import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.OrderedMap;
 import io.anuke.arc.function.BiFunction;
 import io.anuke.arc.util.Log;
+import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.io.PropertiesUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;