Updated TR Bundle to the latest V7 prealpha (#5505)

* Updated TR Bundle to the latest V7 prealpha

* Update bundle_tr.properties

android/src/mindustry/android/AndroidLauncher.java

@@ -84,9 +84,9 @@ public class AndroidLauncher extends AndroidApplication{
                             try{
                                 //try to load own class first
                                 loadedClass = findClass(name);
-                            }catch(ClassNotFoundException e){
+                            }catch(ClassNotFoundException | NoClassDefFoundError e){
                                 //use parent if not found
-                                loadedClass = super.loadClass(name, resolve);
+                                return parent.loadClass(name);
                             }
                         }
 

annotations/src/main/java/mindustry/annotations/entity/EntityIO.java

@@ -143,7 +143,8 @@ public class EntityIO{
                 if(sl) cont("if(!islocal)");
 
                 if(sf){
-                    st(field.name + lastSuf + " = this." + field.name + targetSuf);
+                    //TODO adding + targetSuf to the assignment fixes units being interpolated incorrectly during physics, but makes interpolation snap instead.
+                    st(field.name + lastSuf + " = this." + field.name);
                 }
 
                 io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");

core/assets/bundles/bundle_de.properties

@@ -460,6 +460,7 @@ toolmode.drawteams = Teams zeichnen
 toolmode.drawteams.description = Zeichnet Teams statt Blöcke.
 
 filters.empty = [lightgray]Keine Filter! Füge einen mit dem unteren Knopf hinzu.
+
 filter.distort = Verzerren
 filter.noise = Rauschen
 filter.enemyspawn = Gegnerischer Spawn Auswahl
@@ -476,6 +477,7 @@ filter.clear = Löschen
 filter.option.ignore = Ignorieren
 filter.scatter = Streuen
 filter.terrain = Landschaft
+
 filter.option.scale = Skalierung
 filter.option.chance = Wahrscheinlichkeit
 filter.option.mag = Größe
@@ -490,6 +492,7 @@ filter.option.block = Block
 filter.option.floor = Boden
 filter.option.flooronto = Zielboden
 filter.option.target = Ziel
+filter.option.replacement = Ersatz
 filter.option.wall = Wand
 filter.option.ore = Erz
 filter.option.floor2 = Sekundärer Boden
@@ -675,6 +678,7 @@ unit.nobuild = [scarlet]Einheit kann nicht bauen!
 lastaccessed = [lightgray]Zuletzt konfiguriert: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <öffne Spiel um zu zeigen>
 stat.description = Beschreibung
 stat.input = Eingang
 stat.output = Ausgang
@@ -991,6 +995,7 @@ rules.waves = Wellen
 rules.attack = Angriff-Modus
 rules.buildai = KI kann bauen
 rules.corecapture = Kern nach Zerstörung einnehmen
+rules.polygoncoreprotection = Polygonaler Kernschutz
 rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team)
 rules.blockhealthmultiplier = Block-Lebenspunkte-Multiplikator
 rules.blockdamagemultiplier = Block-Schaden-Multiplikator
@@ -1161,6 +1166,7 @@ block.spore-cluster.name = Sporen-Cluster
 block.metal-floor.name = Metallboden 1
 block.metal-floor-2.name = Metallboden 2
 block.metal-floor-3.name = Metallboden 3
+block.metal-floor-4.name = Metallboden 4
 block.metal-floor-5.name = Metallboden 5
 block.metal-floor-damaged.name = beschädigter Metallboden
 block.dark-panel-1.name = Dunkles Panel 1
@@ -1585,6 +1591,8 @@ lst.sensor = Gibt Daten über einen Block oder eine Einheit wieder.
 lst.set = Setzt eine Variable fest.
 lst.operation = Verändert eine Variable.
 lst.end = Springt wieder nach oben.
+lst.wait = Wartet eine bestimmte Zeit.
+lst.lookup = Sucht ein Item, eine Flüssigkeit, eine Einheit oder einen Block.\nGesamtmengen von jeder Sache können mit \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nabgerufen werden.
 lst.jump = Falls die Bedingung erfüllt ist, wird woanders weitergemacht.
 lst.unitbind = Speichert eine Einheit einer Sorte als [accent]@unit[].
 lst.unitcontrol = Steuert [accent]@unit[].

core/assets/bundles/bundle_in_ID.properties

@@ -1591,6 +1591,8 @@ lst.sensor = Mengambil data dari bangunan atau unit.
 lst.set = Menentukan sebuah variabel.
 lst.operation = Melakukan operasi pada 1-2 variabel.
 lst.end = Loncati ke awal dari tumpukan perintah.
+lst.wait = Memberi jeda dalam detik yang ditentukan.
+lst.lookup = Mencari tipe barang/cairan/unit/blok dengan ID.\nJumlah hitungan dari setiap tipe dapat dilihat dengan:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Loncati secara bersyarat ke pernyataan berikutnya.
 lst.unitbind = Menautkan ke unit jenis berikutnya, dan menyimpannya di [accent]@unit[].
 lst.unitcontrol = Mengendalikan unit yang saat ini dihubungkan.

core/assets/bundles/bundle_tr.properties

@@ -460,6 +460,7 @@ toolmode.drawteams = Takım Çiz
 toolmode.drawteams.description = Bloklar yerine takımları çizer..
 
 filters.empty = [lightgray]Hiç filtre yok! Aşağıdaki butonla bir adet ekleyin.
+
 filter.distort = Çarpıt
 filter.noise = Gürültü
 filter.enemyspawn = Düşman Doğma Alanı Seçimi
@@ -476,6 +477,7 @@ filter.clear = Temizle
 filter.option.ignore = Yoksay
 filter.scatter = Saç
 filter.terrain = Arazi
+
 filter.option.scale = Ölçek
 filter.option.chance = Şans
 filter.option.mag = Genlik
@@ -490,6 +492,7 @@ filter.option.block = Blok
 filter.option.floor = Zemin
 filter.option.flooronto = Hedef Zemin
 filter.option.target = Target
+filter.option.replacement = Değiştirme
 filter.option.wall = Duvar
 filter.option.ore = Maden
 filter.option.floor2 = İkincil Duvar
@@ -675,6 +678,7 @@ unit.nobuild = [scarlet]Birlik inşa edemiyor
 lastaccessed = [lightgray]Son Erişme: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <görüntülenecek haritayı yükle>
 stat.description = Amaç
 stat.input = Giriş
 stat.output = Çıkış
@@ -991,6 +995,7 @@ rules.waves = Dalgalar
 rules.attack = Saldırı Modu
 rules.buildai = Yapay Zeka İnşası
 rules.corecapture = Yıkımca Çekirdeği Elegeçir
+rules.polygoncoreprotection = Çokgenli Çekirdek Koruması
 rules.enemyCheat = Sonsuz AI (Kırmızı Takım) Kaynakları
 rules.blockhealthmultiplier = Blok Canı Çarpanı
 rules.blockdamagemultiplier = Blok Hasarı Çarpanı
@@ -1161,7 +1166,8 @@ block.spore-cluster.name = Spor Kümesi
 block.metal-floor.name = Metal Zemin 1
 block.metal-floor-2.name = Metal Zemin 2
 block.metal-floor-3.name = Metal Zemin 3
-block.metal-floor-5.name = Metal Zemin 4
+block.metal-floor-4.name = Metal Zemin 4
+block.metal-floor-5.name = Metal Zemin 5
 block.metal-floor-damaged.name = Hasarlı Metal Zemin
 block.dark-panel-1.name = Kara Panel 1
 block.dark-panel-2.name = Kara Panel 2

core/src/mindustry/ClientLauncher.java

@@ -149,7 +149,16 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
                 }
                 mods.eachClass(Mod::init);
                 finished = true;
-                Events.fire(new ClientLoadEvent());
+                var event = new ClientLoadEvent();
+                //a temporary measure for compatibility with certain mods
+                Events.fireWrap(event.getClass(), event, listener -> {
+                    try{
+                        listener.get(event);
+                    }catch(NoSuchFieldError | NoSuchMethodError | NoClassDefFoundError error){
+                        Log.err(error);
+                    }
+
+                });
                 clientLoaded = true;
                 super.resize(graphics.getWidth(), graphics.getHeight());
                 app.post(() -> app.post(() -> app.post(() -> app.post(() -> {

core/src/mindustry/Vars.java

@@ -148,6 +148,8 @@ public class Vars implements Loadable{
     public static int maxTextureSize = 2048;
     /** Whether to show the core landing animation. */
     public static boolean showLandAnimation = true;
+    /** Whether to check for memory use before taking screenshots. */
+    public static boolean checkScreenshotMemory = true;
     /** Whether to prompt the user to confirm exiting. */
     public static boolean confirmExit = true;
     /** if true, UI is not drawn */

core/src/mindustry/ai/BlockIndexer.java

@@ -285,7 +285,7 @@ public class BlockIndexer{
         for(int i = 0; i < activeTeams.size; i++){
             Team enemy = activeTeams.items[i];
 
-            if(enemy == team || team == Team.derelict) continue;
+            if(enemy == team || (team == Team.derelict && !state.rules.coreCapture)) continue;
 
             Building entity = indexer.findTile(enemy, x, y, range, pred, true);
             if(entity != null){
@@ -360,7 +360,7 @@ public class BlockIndexer{
     private void process(Tile tile){
         var team = tile.team();
         //only process entity changes with centered tiles
-        if(tile.isCenter() && team != Team.derelict){
+        if(tile.isCenter() && tile.build != null){
             var data = team.data();
             if(tile.block().flags.size() > 0 && tile.isCenter()){
                 TileArray[] map = getFlagged(team);

core/src/mindustry/ai/Pathfinder.java

@@ -119,9 +119,11 @@ public class Pathfinder implements Runnable{
             }
         }
 
+        int tid = tile.getTeamID();
+
         return PathTile.get(
             tile.build == null || !solid || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80),
-            tile.getTeamID(),
+            tid == 0 && tile.build != null && state.rules.coreCapture ? 255 : tid, //use teamid = 255 when core capture is enabled to mark out derelict structures
             solid,
             tile.floor().isLiquid,
             tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air),

core/src/mindustry/ai/types/LogicAI.java

@@ -104,7 +104,7 @@ public class LogicAI extends AIController{
         //look where moving if there's nothing to aim at
         if(!shoot){
             unit.lookAt(unit.prefRotation());
-        }else if(unit.hasWeapons() && unit.mounts.length > 0){ //if there is, look at the object
+        }else if(unit.hasWeapons() && unit.mounts.length > 0 && !unit.mounts[0].weapon.ignoreRotation){ //if there is, look at the object
             unit.lookAt(unit.mounts[0].aimX, unit.mounts[0].aimY);
         }
     }

core/src/mindustry/async/PhysicsProcess.java

@@ -24,6 +24,7 @@ public class PhysicsProcess implements AsyncProcess{
     @Override
     public void begin(){
         if(physics == null) return;
+        boolean local = !Vars.net.client();
 
         //remove stale entities
         refs.removeAll(ref -> {
@@ -60,8 +61,9 @@ public class PhysicsProcess implements AsyncProcess{
             ref.body.layer =
                 entity.type.allowLegStep ? layerLegs :
                 entity.isGrounded() ? layerGround : layerFlying;
-            ref.x = entity.x();
+            ref.x = entity.x;
-            ref.y = entity.y();
+            ref.y = entity.y;
+            ref.body.local = local || entity.isLocal();
         }
     }
 
@@ -156,6 +158,10 @@ public class PhysicsProcess implements AsyncProcess{
 
             for(int i = 0; i < bodies.size; i++){
                 PhysicsBody body = bodies.items[i];
+
+                //for clients, the only body that collides is the local one; all other physics simulations are handled by the server.
+                if(!body.local) continue;
+
                 body.hitbox(rect);
 
                 seq.size = 0;
@@ -174,12 +180,16 @@ public class PhysicsProcess implements AsyncProcess{
                         float ms = body.mass + other.mass;
                         float m1 = other.mass / ms, m2 = body.mass / ms;
 
+                        //first body is always local due to guard check above
                         body.x += vec.x * m1 / scl;
                         body.y += vec.y * m1 / scl;
+
+                        if(other.local){
                             other.x -= vec.x * m2 / scl;
                             other.y -= vec.y * m2 / scl;
                         }
                     }
+                }
                 body.collided = true;
             }
         }
@@ -187,7 +197,7 @@ public class PhysicsProcess implements AsyncProcess{
         public static class PhysicsBody implements QuadTreeObject{
             public float x, y, radius, mass;
             public int layer = 0;
-            public boolean collided = false;
+            public boolean collided = false, local = true;
 
             @Override
             public void hitbox(Rect out){

core/src/mindustry/content/Blocks.java

@@ -51,7 +51,7 @@ public class Blocks implements ContentList{
     melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadVoid, payloadSource, illuminator,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator,
 
     //defense
     copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
@@ -1589,13 +1589,13 @@ public class Blocks implements ContentList{
             shots = 4;
             burstSpacing = 5;
             inaccuracy = 10f;
-            range = 210f;
+            range = 215f;
             xRand = 6f;
             size = 2;
             health = 300 * size * size;
             shootSound = Sounds.missile;
 
-            limitRange(2f);
+            limitRange(5f);
         }};
 
         salvo = new ItemTurret("salvo"){{
@@ -1610,7 +1610,7 @@ public class Blocks implements ContentList{
 
             size = 2;
             range = 190f;
-            reloadTime = 34f;
+            reloadTime = 31f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
             cooldown = 0.03f;
@@ -1978,7 +1978,7 @@ public class Blocks implements ContentList{
         }};
 
         repairPoint = new RepairPoint("repair-point"){{
-            requirements(Category.units, with(Items.lead, 20, Items.copper, 20, Items.silicon, 15));
+            requirements(Category.units, with(Items.lead, 25, Items.copper, 25, Items.silicon, 20));
             repairSpeed = 0.5f;
             repairRadius = 65f;
             beamWidth = 0.73f;
@@ -1987,16 +1987,16 @@ public class Blocks implements ContentList{
         }};
 
         repairTurret = new RepairPoint("repair-turret"){{
-            requirements(Category.units, with(Items.silicon, 70, Items.thorium, 60, Items.plastanium, 60));
+            requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 80));
             size = 2;
             length = 6f;
-            repairSpeed = 4f;
+            repairSpeed = 3f;
             repairRadius = 140f;
             powerUse = 5f;
             beamWidth = 1.1f;
             pulseRadius = 6.1f;
-            coolantUse = 0.15f;
+            coolantUse = 0.16f;
-            coolantMultiplier = 1.7f;
+            coolantMultiplier = 1.5f;
             acceptCoolant = true;
         }};
 
@@ -2068,12 +2068,12 @@ public class Blocks implements ContentList{
             alwaysUnlocked = true;
         }};
 
-        payloadVoid = new PayloadVoid("payload-void"){{
+        payloadSource = new PayloadSource("payload-source"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
         }};
 
-        payloadSource = new PayloadSource("payload-source"){{
+        payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
         }};

core/src/mindustry/content/Bullets.java

@@ -257,7 +257,6 @@ public class Bullets implements ContentList{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             splashDamageRadius = 30f;
             splashDamage = 30f * 1.5f;
             ammoMultiplier = 5f;
@@ -274,7 +273,6 @@ public class Bullets implements ContentList{
             width = 7f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             homingPower = 0.08f;
             splashDamageRadius = 20f;
             splashDamage = 20f * 1.5f;
@@ -288,7 +286,6 @@ public class Bullets implements ContentList{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             splashDamageRadius = 25f;
             splashDamage = 25f * 1.4f;
             hitEffect = Fx.blastExplosion;

core/src/mindustry/content/Fx.java

@@ -854,7 +854,7 @@ public class Fx{
     fireRemove = new Effect(70f, e -> {
         if(Fire.regions[0] == null) return;
         alpha(e.fout());
-        rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x, e.y);
+        rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x + Mathf.randomSeedRange((int)e.y, 2), e.y + Mathf.randomSeedRange((int)e.x, 2));
         Drawf.light(e.x, e.y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * e.fout());
     }),
 

core/src/mindustry/content/UnitTypes.java

@@ -87,7 +87,7 @@ public class UnitTypes implements ContentList{
         mace = new UnitType("mace"){{
             speed = 0.45f;
             hitSize = 10f;
-            health = 530;
+            health = 540;
             armor = 4f;
 
             immunities.add(StatusEffects.burning);
@@ -96,7 +96,7 @@ public class UnitTypes implements ContentList{
                 top = false;
                 shootSound = Sounds.flame;
                 shootY = 2f;
-                reload = 12f;
+                reload = 11f;
                 recoil = 1f;
                 ejectEffect = Fx.none;
                 bullet = new BulletType(4.1f, 32f){{
@@ -572,7 +572,7 @@ public class UnitTypes implements ContentList{
                     speed = 1f;
                     splashDamageRadius = 60f;
                     instantDisappear = true;
-                    splashDamage = 88f;
+                    splashDamage = 90f;
                     killShooter = true;
                     hittable = false;
                     collidesAir = true;
@@ -581,7 +581,7 @@ public class UnitTypes implements ContentList{
         }};
 
         atrax = new UnitType("atrax"){{
-            speed = 0.5f;
+            speed = 0.54f;
             drag = 0.4f;
             hitSize = 13f;
             rotateSpeed = 3f;
@@ -621,7 +621,7 @@ public class UnitTypes implements ContentList{
         }};
 
         spiroct = new UnitType("spiroct"){{
-            speed = 0.45f;
+            speed = 0.48f;
             drag = 0.4f;
             hitSize = 15f;
             rotateSpeed = 3f;
@@ -1125,10 +1125,10 @@ public class UnitTypes implements ContentList{
             BulletType fragBullet = new FlakBulletType(4f, 5){{
                 shootEffect = Fx.shootBig;
                 ammoMultiplier = 4f;
-                splashDamage = 50f;
+                splashDamage = 60f;
                 splashDamageRadius = 25f;
                 collidesGround = true;
-                lifetime = 38f;
+                lifetime = 47f;
 
                 status = StatusEffects.blasted;
                 statusDuration = 60f;
@@ -1148,12 +1148,12 @@ public class UnitTypes implements ContentList{
                 rotate = true;
 
                 bullet = new LaserBulletType(){{
-                    damage = 100f;
+                    damage = 110f;
                     sideAngle = 20f;
                     sideWidth = 1.5f;
                     sideLength = 80f;
                     width = 25f;
-                    length = 200f;
+                    length = 230f;
                     shootEffect = Fx.shockwave;
                     colors = new Color[]{Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
                 }};
@@ -2113,7 +2113,7 @@ public class UnitTypes implements ContentList{
 
                         bullet = new ContinuousLaserBulletType(){{
                             maxRange = 90f;
-                            damage = 26f;
+                            damage = 27f;
                             length = 95f;
                             hitEffect = Fx.hitMeltHeal;
                             drawSize = 200f;
@@ -2144,7 +2144,7 @@ public class UnitTypes implements ContentList{
                 x = 70f/4f;
                 y = -26f/4f;
 
-                reload = 70f;
+                reload = 65f;
                 shake = 3f;
                 rotateSpeed = 2f;
                 shadow = 30f;
@@ -2161,7 +2161,7 @@ public class UnitTypes implements ContentList{
                     timeIncrease = 3f;
                     timeDuration = 60f * 20f;
                     powerDamageScl = 3f;
-                    damage = 50;
+                    damage = 60;
                     hitColor = lightColor = Pal.heal;
                     lightRadius = 70f;
                     clipSize = 250f;
@@ -2177,7 +2177,7 @@ public class UnitTypes implements ContentList{
                     trailWidth = 6f;
                     trailColor = Pal.heal;
                     trailInterval = 3f;
-                    splashDamage = 60f;
+                    splashDamage = 70f;
                     splashDamageRadius = rad;
                     hitShake = 4f;
                     trailRotation = true;

core/src/mindustry/core/Logic.java

@@ -247,11 +247,11 @@ public class Logic implements ApplicationListener{
                 Events.fire(new GameOverEvent(state.rules.waveTeam));
             }else if(state.rules.attackMode){
                 //count # of teams alive
-                int countAlive = state.teams.getActive().count(TeamData::hasCore);
+                int countAlive = state.teams.getActive().count(t -> t.hasCore() && t.team != Team.derelict);
 
                 if((countAlive <= 1 || (!state.rules.pvp && state.rules.defaultTeam.core() == null)) && !state.gameOver){
                     //find team that won
-                    TeamData left = state.teams.getActive().find(TeamData::hasCore);
+                    TeamData left = state.teams.getActive().find(t -> t.hasCore() && t.team != Team.derelict);
                     Events.fire(new GameOverEvent(left == null ? Team.derelict : left.team));
                     state.gameOver = true;
                 }

core/src/mindustry/core/NetServer.java

@@ -48,7 +48,7 @@ public class NetServer implements ApplicationListener{
         if(state.rules.pvp){
             //find team with minimum amount of players and auto-assign player to that.
             TeamData re = state.teams.getActive().min(data -> {
-                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active()) return Integer.MAX_VALUE;
+                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active() || data.team == Team.derelict) return Integer.MAX_VALUE;
 
                 int count = 0;
                 for(Player other : players){
@@ -472,6 +472,10 @@ public class NetServer implements ApplicationListener{
                     return;
                 }
 
+                if(!player.dead() && player.unit().isCommanding()){
+                    player.unit().clearCommand();
+                }
+
                 player.getInfo().lastSyncTime = Time.millis();
                 Call.worldDataBegin(player.con);
                 netServer.sendWorldData(player);

core/src/mindustry/core/Renderer.java

@@ -11,6 +11,7 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.async.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
@@ -355,7 +356,7 @@ public class Renderer implements ApplicationListener{
         int w = world.width() * tilesize, h = world.height() * tilesize;
         int memory = w * h * 4 / 1024 / 1024;
 
-        if(memory >= (mobile ? 65 : 120)){
+        if(Vars.checkScreenshotMemory && memory >= (mobile ? 65 : 120)){
             ui.showInfo("@screenshot.invalid");
             return;
         }

core/src/mindustry/editor/WaveGraph.java

@@ -53,7 +53,7 @@ public class WaveGraph extends Table{
 
                     for(int i = 0; i < values.length; i++){
                         int val = values[i][type.id];
-                        float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max;
+                        float cx = graphX + i*spacing, cy = graphY + val * graphH / max;
                         Lines.linePoint(cx, cy);
                     }
 
@@ -69,7 +69,7 @@ public class WaveGraph extends Table{
                         sum += values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -84,7 +84,7 @@ public class WaveGraph extends Table{
                         sum += (type.health) * values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -92,29 +92,29 @@ public class WaveGraph extends Table{
             }
 
             //how many numbers can fit here
-            float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2);
+            float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2);
 
             int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
 
             Draw.color(Color.lightGray);
             for(int i = 0; i < max; i += markSpace){
-                float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX;
+                float cy = graphY + i * graphH / max, cx = graphX;
                 //Lines.line(cx, cy, cx + len, cy);
 
                 lay.setText(font, "" + i);
 
-                font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
+                font.draw("" + i, cx, cy + lay.height/2f, Align.right);
             }
 
             float len = Scl.scl(4f);
             font.setColor(Color.lightGray);
 
             for(int i = 0; i < values.length; i++){
-                float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX;
+                float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
 
                 Lines.line(cx, cy, cx, cy + len);
                 if(i == values.length/2){
-                    font.draw("" + (i + from + 1), cx, cy - 2f, Align.center);
+                    font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
                 }
             }
             font.setColor(Color.white);

core/src/mindustry/entities/Puddles.java

@@ -52,22 +52,22 @@ public class Puddles{
         Puddle p = map.get(tile.pos());
         if(p == null){
             Puddle puddle = Puddle.create();
-            puddle.tile(tile);
+            puddle.tile = tile;
-            puddle.liquid(liquid);
+            puddle.liquid = liquid;
-            puddle.amount(amount);
+            puddle.amount = amount;
-            puddle.generation(generation);
+            puddle.generation = generation;
             puddle.set((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f);
             puddle.add();
             map.put(tile.pos(), puddle);
-        }else if(p.liquid() == liquid){
+        }else if(p.liquid == liquid){
-            p.accepting(Math.max(amount, p.accepting()));
+            p.accepting = Math.max(amount, p.accepting);
 
-            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount() >= maxLiquid / 2f){
+            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount >= maxLiquid / 2f){
-                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid().color);
+                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid.color);
                 p.lastRipple = Time.time;
             }
         }else{
-            p.amount(p.amount() + reactPuddle(p.liquid(), liquid, amount, p.tile(), (p.x() + source.worldx())/2f, (p.y() + source.worldy())/2f));
+            p.amount += reactPuddle(p.liquid, liquid, amount, p.tile, (p.x + source.worldx())/2f, (p.y + source.worldy())/2f);
         }
     }
 

core/src/mindustry/entities/comp/BoundedComp.java

@@ -1,6 +1,7 @@
 package mindustry.entities.comp;
 
 import arc.math.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 
@@ -24,7 +25,7 @@ abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
             if(x > world.unitWidth()) dx -= (x - world.unitWidth())/warpDst;
             if(y > world.unitHeight()) dy -= (y - world.unitHeight())/warpDst;
 
-            velAddNet(dx, dy);
+            velAddNet(dx * Time.delta, dy * Time.delta);
         }
 
         //clamp position if not flying

core/src/mindustry/entities/comp/FireComp.java

@@ -28,6 +28,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
     public static final TextureRegion[] regions = new TextureRegion[frames];
 
     @Import float time, lifetime, x, y;
+    @Import int id;
 
     Tile tile;
     private transient Block block;
@@ -116,7 +117,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
 
         Draw.alpha(Mathf.clamp(warmup / warmupDuration));
         Draw.z(Layer.effect);
-        Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x, y);
+        Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x + Mathf.randomSeedRange((int)y, 2), y + Mathf.randomSeedRange((int)x, 2));
         Draw.reset();
 
         Drawf.light(x, y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * Mathf.clamp(warmup / warmupDuration));

core/src/mindustry/entities/comp/HealthComp.java

@@ -1,6 +1,5 @@
 package mindustry.entities.comp;
 
-import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
@@ -34,7 +33,7 @@ abstract class HealthComp implements Entityc, Posc{
     void kill(){
         if(dead) return;
 
-        health = 0;
+        health = Math.min(health, 0);
         dead = true;
         killed();
         remove();
@@ -86,7 +85,7 @@ abstract class HealthComp implements Entityc, Posc{
     }
 
     void clampHealth(){
-        health = Mathf.clamp(health, 0, maxHealth);
+        health = Math.min(health, maxHealth);
     }
 
     /** Heals by a flat amount. */

core/src/mindustry/entities/comp/UnitComp.java

@@ -397,7 +397,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             //move down
             elevation -= type.fallSpeed * Time.delta;
 
-            if(isGrounded()){
+            if(isGrounded() || health <= -maxHealth){
                 Call.unitDestroy(id);
             }
         }
@@ -528,7 +528,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Override
     public void killed(){
         wasPlayer = isLocal();
-        health = 0;
+        health = Math.min(health, 0);
         dead = true;
 
         //don't waste time when the unit is already on the ground, just destroy it

core/src/mindustry/entities/comp/WaterMoveComp.java

@@ -19,7 +19,7 @@ import static mindustry.Vars.*;
 
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
-    @Import float x, y, rotation;
+    @Import float x, y, rotation, speedMultiplier;
     @Import UnitType type;
 
     private transient Trail tleft = new Trail(1), tright = new Trail(1);
@@ -74,7 +74,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
     @Replace
     public float floorSpeedMultiplier(){
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
-        return on.isDeep() ? 1.3f : 1f;
+        return (on.isDeep() ? 1.3f : 1f) * speedMultiplier;
     }
 
     public boolean onLiquid(){

core/src/mindustry/game/Team.java

@@ -97,7 +97,7 @@ public class Team implements Comparable<Team>{
     }
 
     public boolean isEnemy(Team other){
-        return state.teams.areEnemies(this, other);
+        return this != other;
     }
 
     public Seq<CoreBuild> cores(){

core/src/mindustry/game/Teams.java

@@ -49,7 +49,7 @@ public class Teams{
 
     public boolean eachEnemyCore(Team team, Boolf<CoreBuild> ret){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(CoreBuild tile : data.cores){
                     if(ret.get(tile)){
                         return true;
@@ -62,7 +62,7 @@ public class Teams{
 
     public void eachEnemyCore(Team team, Cons<Building> ret){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(Building tile : data.cores){
                     ret.get(tile);
                 }
@@ -91,11 +91,6 @@ public class Teams{
         return get(team).active();
     }
 
-    /** Returns whether {@param other} is an enemy of {@param #team}. */
-    public boolean areEnemies(Team team, Team other){
-        return team != other;
-    }
-
     public boolean canInteract(Team team, Team other){
         return team == other || other == Team.derelict;
     }
@@ -216,7 +211,7 @@ public class Teams{
             Seq<Team> enemies = new Seq<>();
 
             for(TeamData other : active){
-                if(areEnemies(data.team, other.team)){
+                if(data.team != other.team){
                     enemies.add(other.team);
                 }
             }

core/src/mindustry/graphics/BlockRenderer.java

@@ -165,6 +165,7 @@ public class BlockRenderer{
 
             darkEvents.each(pos -> {
                 var tile = world.tile(pos);
+                if(tile == null) return;
                 float darkness = world.getDarkness(tile.x, tile.y);
                 //then draw the shadow
                 Draw.colorl(darkness <= 0f ? 1f : 1f - Math.min((darkness + 0.5f) / 4f, 1f));

core/src/mindustry/input/InputHandler.java

@@ -1242,12 +1242,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             diagonal = !diagonal;
         }
 
+        int endRotation = -1;
         if(diagonal){
             var start = world.build(startX, startY);
             var end = world.build(endX, endY);
             if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
                     && block.canReplace(end.block) && block.canReplace(start.block)){
                 points = Placement.upgradeLine(startX, startY, endX, endY);
+                endRotation = end.rotation;
             }else{
                 points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
             }
@@ -1281,6 +1283,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                 int result = baseRotation;
                 if(next != null){
                     result = Tile.relativeTo(point.x, point.y, next.x, next.y);
+                }else if(endRotation != -1){
+                    result = endRotation;
                 }else if(block.conveyorPlacement && i > 0){
                     Point2 prev = points.get(i - 1);
                     result = Tile.relativeTo(prev.x, prev.y, point.x, point.y);

core/src/mindustry/mod/ModClassLoader.java

@@ -11,6 +11,10 @@ public class ModClassLoader extends ClassLoader{
         }
     };
 
+    public ModClassLoader(ClassLoader parent){
+        super(parent);
+    }
+
     public void addChild(ClassLoader child){
         children.add(child);
     }

core/src/mindustry/mod/Mods.java

@@ -39,7 +39,7 @@ public class Mods implements Loadable{
 
     private int totalSprites;
     private MultiPacker packer;
-    private ModClassLoader mainLoader = new ModClassLoader();
+    private ModClassLoader mainLoader = new ModClassLoader(getClass().getClassLoader());
 
     Seq<LoadedMod> mods = new Seq<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();

core/src/mindustry/net/ArcNetProvider.java

@@ -391,7 +391,15 @@ public class ArcNetProvider implements NetProvider{
                 //no compression, copy over buffer
                 if(compression == 0){
                     buffer.position(0).limit(length);
+                    if(byteBuffer.hasArray()){
                         buffer.put(byteBuffer.array(), byteBuffer.position(), length);
+                    }else{
+                        byte[] readcopy = new byte[length];
+                        int pos = byteBuffer.position();
+                        byteBuffer.get(readcopy);
+                        byteBuffer.position(pos);
+                        buffer.put(readcopy);
+                    }
                     buffer.position(0);
                     packet.read(reads.get(), length);
                     //move read packets forward

core/src/mindustry/net/Net.java

@@ -97,7 +97,7 @@ public class Net{
 
             if(e instanceof BufferUnderflowException || e instanceof BufferOverflowException){
                 error = Core.bundle.get("error.io");
-            }else if(error.equals("mismatch")){
+            }else if(error.equals("mismatch") || (e instanceof IndexOutOfBoundsException && e.getStackTrace()[0].getClassName().contains("java.nio"))){
                 error = Core.bundle.get("error.mismatch");
             }else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address")) || Strings.neatError(e).contains("address associated")){
                 error = Core.bundle.get("error.invalidaddress");

core/src/mindustry/world/Block.java

@@ -843,7 +843,7 @@ public class Block extends UnlockableContent{
         //load specific team regions
         teamRegions = new TextureRegion[Team.all.length];
         for(Team team : Team.all){
-            teamRegions[team.id] = teamRegion.found() ? Core.atlas.find(name + "-team-" + team.name, teamRegion) : teamRegion;
+            teamRegions[team.id] = teamRegion.found() && team.hasPalette ? Core.atlas.find(name + "-team-" + team.name, teamRegion) : teamRegion;
         }
 
         if(variants != 0){

core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -100,18 +100,28 @@ public class LiquidTurret extends Turret{
         @Override
         protected void findTarget(){
             if(extinguish && liquids.current().canExtinguish()){
+                Fire result = null;
+                float mindst = 0f;
                 int tr = (int)(range / tilesize);
                 for(int x = -tr; x <= tr; x++){
                     for(int y = -tr; y <= tr; y++){
-                        Tile other = world.tileWorld(x + tile.x, y + tile.y);
+                        Tile other = world.tile(x + tile.x, y + tile.y);
+                        var fire = Fires.get(x + tile.x, y + tile.y);
+                        float dst = fire == null ? 0 : dst2(fire);
                         //do not extinguish fires on other team blocks
-                        if(other != null && Fires.has(x + tile.x, y + tile.y) && (other.build == null || other.team() == team)){
+                        if(other != null && fire != null && Fires.has(other.x, other.y) && dst <= range * range && (result == null || dst < mindst) && (other.build == null || other.team() == team)){
-                            target = Fires.get(x + tile.x, y + tile.y);
+                            result = fire;
+                            mindst = dst;
+                        }
+                    }
+                }
+
+                if(result != null){
+                    target = result;
+                    //don't run standard targeting
                     return;
                 }
             }
-                }
-            }
 
             super.findTarget();
         }

core/src/mindustry/world/blocks/distribution/PayloadRouter.java

@@ -43,6 +43,10 @@ public class PayloadRouter extends PayloadConveyor{
                 do{
                     rotation = (rotation + 1) % 4;
                     onProximityUpdate();
+                    //force update to transfer if necessary
+                    if(next instanceof PayloadConveyorBuild && !(next instanceof PayloadRouterBuild)){
+                        next.updateTile();
+                    }
                     //this condition intentionally uses "accept from itself" conditions, because payload conveyors only accept during the start
                     //"accept from self" conditions are for dropped payloads and are less restrictive
                 }while((blocked || next == null || !next.acceptPayload(next, item)) && ++rotations < 4);

core/src/mindustry/world/blocks/production/Fracker.java

@@ -1,6 +1,7 @@
 package mindustry.world.blocks.production;
 
 import arc.graphics.g2d.*;
+import arc.math.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -67,6 +68,8 @@ public class Fracker extends SolidPump{
                 super.updateTile();
                 accumulator += delta() * efficiency();
             }else{
+                warmup = Mathf.lerpDelta(warmup, 0f, 0.02f);
+                lastPump = 0f;
                 dumpLiquid(result);
             }
         }

core/src/mindustry/world/blocks/production/Separator.java

@@ -30,6 +30,7 @@ public class Separator extends Block{
         solid = true;
         hasItems = true;
         hasLiquids = true;
+        sync = true;
     }
 
     @Override
@@ -45,6 +46,12 @@ public class Separator extends Block{
         public float progress;
         public float totalProgress;
         public float warmup;
+        public int seed;
+
+        @Override
+        public void created(){
+            seed = Mathf.randomSeed(tile.pos(), 0, Integer.MAX_VALUE - 1);
+        }
 
         @Override
         public boolean shouldAmbientSound(){
@@ -91,7 +98,7 @@ public class Separator extends Block{
                 int sum = 0;
                 for(ItemStack stack : results) sum += stack.amount;
 
-                int i = Mathf.random(sum);
+                int i = Mathf.randomSeed(seed++, 0, sum);
                 int count = 0;
                 Item item = null;
 
@@ -121,11 +128,19 @@ public class Separator extends Block{
             return !consumes.itemFilters.get(item.id);
         }
 
+        //TODO write seed in 128 release, don't write it now for compatibility with 127.x
+        //@Override
+        //public byte version(){
+        //    return 1;
+        //}
+
         @Override
         public void write(Writes write){
             super.write(write);
             write.f(progress);
             write.f(warmup);
+            //TODO see above
+            //write.i(seed);
         }
 
         @Override
@@ -133,6 +148,8 @@ public class Separator extends Block{
             super.read(read, revision);
             progress = read.f();
             warmup = read.f();
+            //TODO see above
+            //if(revision == 1) seed = read.i();
         }
     }
 }

desktop/src/mindustry/desktop/steam/SNet.java

@@ -88,8 +88,12 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                                 net.handleException(t);
                             }
                         }
-                    }catch(SteamException e){
+                    }catch(Exception e){
+                        if(net.server()){
                             Log.err(e);
+                        }else{
+                            net.showError(e);
+                        }
                     }
                 }
             }
@@ -303,7 +307,8 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                 try{
                     SteamID lobby = smat.getLobbyByIndex(i);
                     String mode = smat.getLobbyData(lobby, "gamemode");
-                    if(mode == null || mode.isEmpty() || Strings.parseInt(smat.getLobbyData(lobby, "version"), -1) == -1) continue;
+                    //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;
                     Host out = new Host(
                         -1, //invalid ping
                         smat.getLobbyData(lobby, "name"),

gradle.properties

@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=57b86e6bf0312aa8e8bc3b737c7d8f31fbe7a162
+archash=1142cfc35b6671c6a2c5566632ff044a46527b82

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servers_be.json

@@ -2,9 +2,6 @@
   {
     "address": "be.mindustry.nydus.app:6567"
   },
-  {
-    "address": "157.90.180.53:25777"
-  },
   {
     "address": "mindustry.pl:7777"
   },
@@ -12,6 +9,6 @@
     "address": "v7.mindurka.tk:9999"
   },
   {
-    "address": "mindustry.me:7000"
+    "address": "c-n.ddns.net:6567"
   }
 ]

servers_v6.json

@@ -21,7 +21,7 @@
   },
   {
     "name": "C.A.M.S.",
-    "address": ["routerchain.ddns.net", "nikochio.ddns.net", "play.thedimas.pp.ua"]
+    "address": ["baseduser.eu.org:6568", "nikochio.ddns.net", "play.thedimas.pp.ua"]
   },
   {
     "name": "BE6.RUN",
@@ -101,14 +101,10 @@
   },
   {
     "name": "Sakura", 
-    "address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587"]
+    "address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587", "160.16.207.141:26810"]
   },
   {
     "name": "MeowLand",
     "address": ["34.134.111.15"]
-  },
-  {
-    "name": "[accent]Mindustry [red]Reborn",
-    "address": ["mindustry.me", "mindustry.me:1000", "mindustry.me:2000", "mindustry.me:3000"]
   }
 ]

servers_v7.json

@@ -1,5 +1,45 @@
 [
   {
     "address": "mindustry.us.to"
+  },
+  {
+    "name": "mindustry.pl",
+    "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl:6966"]
+  },
+  {
+    "name": "C.A.M.S.",
+    "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua"]
+  }
+  {
+    "name": "hexpvp.ml",
+    "address": "hexpvp.ml"
+  },
+  {
+    "name": "[accent]Mindustry [red]Reborn",
+    "address": "mindustry.me:7000"
+  },
+  {
+    "name": "Omega",
+    "address": "157.90.180.53:25777"
+  },
+  {
+    "name": "MeowLand",
+    "address": "34.134.111.15"
+  },
+  {
+    "name": "Mindurka",
+    "address": ["mindurka.tk", "mindurka.tk:4000"] 
+  },
+  {
+    "name": "Chaotic Neutral",
+    "address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"]
+  },
+  {
+    "name": "XCore",
+    "address": ["35.202.253.94" , "35.202.253.94:2000"]
+  },
+  {
+    "name": "Obvilion Network",
+    "address": "obvilionnetwork.ru:7004"
   }
 ]

tests/src/test/java/ModTestBM.java

@@ -24,7 +24,7 @@ public class ModTestBM extends GenericModTest{
         assertNotNull(type, "A mod block must be loaded.");
         assertSame(type.buildVisibility, BuildVisibility.shown, "A mod block must be buildable.");
 
-        world.loadMap(ApplicationTests.testMap);
+        world.loadMap(maps.loadInternalMap("groundZero"));
         Tile t = world.tile(3, 3);
 
         t.setBlock(type);

tests/src/test/java/ModTestHAI.java

@@ -4,6 +4,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import org.junit.jupiter.api.*;
 
+import static mindustry.Vars.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 //grabs a version-locked Heavy Armaments Industries commit and makes sure it initializes correctly
@@ -22,7 +23,7 @@ public class ModTestHAI extends GenericModTest{
         assertNotNull(type, "A mod unit must be loaded.");
         assertTrue(type.weapons.size > 0, "A mod unit must have a weapon.");
 
-        Vars.world.loadMap(ApplicationTests.testMap);
+        Vars.world.loadMap(maps.loadInternalMap("groundZero"));
 
         Unit unit = type.spawn(0, 0);