Cleanup

* add search option

* mods.browser.sortdate

* mods.browser

* Update bundle_ko.properties

* oopsie

* clearPartiali

* half of my brain cells failed to boot

core/assets/bundles/bundle.properties

@@ -45,6 +45,8 @@ mod.featured.dialog.title = Mod Browser (WIP)
 mods.browser.selected = Selected mod
 mods.browser.add = Install
 mods.github.open = View
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
 
 schematic = Schematic
 schematic.add = Save Schematic...

core/assets/bundles/bundle_ko.properties

@@ -45,6 +45,8 @@ mod.featured.dialog.title = 모드 탐색 (WIP)
 mods.browser.selected = 선택된 모드
 mods.browser.add = 모드 설치
 mods.github.open = 깃허브 사이트 열기
+mods.browser.sortdate = 최근 업데이트
+mods.browser.sortstars = 추천(스타) 수
 
 schematic = 설계도
 schematic.add = 설계도 저장하기

core/src/mindustry/core/NetServer.java

@@ -182,7 +182,7 @@ public class NetServer implements ApplicationListener{
                     return;
                 }
 
-                if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid) || player.ip().equals(con.address))){
+                if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid))){
                     con.kick(KickReason.idInUse);
                     return;
                 }

core/src/mindustry/core/UI.java

@@ -526,16 +526,15 @@ public class UI implements ApplicationListener, Loadable{
         dialog.show();
     }
 
-    //TODO move?
-
     public static String formatAmount(int number){
-        if(number >= 1_000_000_000){
+        int mag = Math.abs(number);
+        if(mag >= 1_000_000_000){
             return Strings.fixed(number / 1_000_000_000f, 1) + "[gray]" + Core.bundle.get("unit.billions") + "[]";
-        }else if(number >= 1_000_000){
+        }else if(mag >= 1_000_000){
             return Strings.fixed(number / 1_000_000f, 1) + "[gray]" + Core.bundle.get("unit.millions") + "[]";
-        }else if(number >= 10_000){
+        }else if(mag >= 10_000){
             return number / 1000 + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
-        }else if(number >= 1000){
+        }else if(mag >= 1000){
             return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
         }else{
             return number + "";

core/src/mindustry/game/Gamemode.java

@@ -31,7 +31,6 @@ public enum Gamemode{
         rules.buildCostMultiplier = 1f;
         rules.buildSpeedMultiplier = 1f;
         rules.unitBuildSpeedMultiplier = 2f;
-        rules.unitHealthMultiplier = 3f;
         rules.attackMode = true;
     }, map -> map.teams.size > 1),
     editor(true, rules -> {

core/src/mindustry/game/Rules.java

@@ -46,8 +46,6 @@ public class Rules{
     public boolean unitAmmo = false;
     /** How fast unit pads build units. */
     public float unitBuildSpeedMultiplier = 1f;
-    /** How much health units start with. */
-    public float unitHealthMultiplier = 1f;
     /** How much damage any other units deal. */
     public float unitDamageMultiplier = 1f;
     /** How much health blocks start with. */

core/src/mindustry/mod/Mods.java

@@ -72,7 +72,7 @@ public class Mods implements Loadable{
 
     /** Imports an external mod file.*/
     public void importMod(Fi file) throws IOException{
-        Fi dest = modDirectory.child(file.name());
+        Fi dest = modDirectory.child(file.name() + (file.extension().isEmpty() ? ".zip" : ""));
         if(dest.exists()){
             throw new IOException("A file with the same name already exists in the mod folder!");
         }
@@ -720,11 +720,7 @@ public class Mods implements Loadable{
         public boolean isSupported(){
             if(isOutdated()) return false;
 
-            int major = getMinMajor(), minor = getMinMinor();
+            return Version.isAtLeast(meta.minGameVersion);
-
-            if(Version.build <= 0) return true;
-
-            return Version.build >= major && Version.revision >= minor;
         }
 
         /** @return whether this mod is outdated, e.g. not compatible with v6. */
@@ -734,33 +730,9 @@ public class Mods implements Loadable{
         }
 
         public int getMinMajor(){
-            int major = 0;
-
             String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
-
+            int dot = ver.indexOf(".");
-            if(ver.contains(".")){
+            return dot != -1 ? Strings.parseInt(ver.substring(0, dot), 0) : Strings.parseInt(ver, 0);
-                String[] split = ver.split("\\.");
-                if(split.length == 2){
-                    major = Strings.parseInt(split[0], 0);
-                }
-            }else{
-                major = Strings.parseInt(ver, 0);
-            }
-
-            return major;
-        }
-
-        public int getMinMinor(){
-            String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
-
-            if(ver.contains(".")){
-                String[] split = ver.split("\\.");
-                if(split.length == 2){
-                    return Strings.parseInt(split[1], 0);
-                }
-            }
-
-            return 0;
         }
 
         @Override

core/src/mindustry/ui/dialogs/CustomRulesDialog.java

@@ -161,7 +161,6 @@ public class CustomRulesDialog extends BaseDialog{
 
         title("@rules.title.unit");
         check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
-        number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
         number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
         number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0.001f, 50f);
 

core/src/mindustry/ui/dialogs/ModsDialog.java

@@ -8,6 +8,7 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.input.*;
 import arc.scene.style.*;
+import arc.scene.ui.*;
 import arc.scene.ui.TextButton.*;
 import arc.struct.*;
 import arc.util.*;
@@ -31,6 +32,7 @@ import static mindustry.Vars.*;
 public class ModsDialog extends BaseDialog{
     private String searchtxt = "";
     private @Nullable Seq<ModListing> modList;
+    private boolean orderDate = true;
 
     public ModsDialog(){
         super("@mods");
@@ -176,6 +178,11 @@ public class ModsDialog extends BaseDialog{
                                 searchtxt = res;
                                 rebuildBrowser[0].run();
                             }).growX().get();
+                            table.button(Icon.list, Styles.clearPartiali, 32f, () -> {
+                                orderDate = !orderDate;
+                                rebuildBrowser[0].run();
+                            }).update(b -> b.getStyle().imageUp = (orderDate ? Icon.list : Icon.star)).size(40f).get()
+                                .addListener(new Tooltip(tip -> tip.label(() -> orderDate ? "@mods.browser.sortdate" : "@mods.browser.sortstars").left()));
                         }).fillX().padBottom(4);
 
                         browser.cont.row();
@@ -186,9 +193,15 @@ public class ModsDialog extends BaseDialog{
                                 tablebrow.clear();
                                 tablebrow.add("@loading");
 
-                                getModList(listings -> {
+                                getModList(rlistings -> {
                                     tablebrow.clear();
 
+                                    Seq<ModListing> listings = rlistings;
+                                    if(!orderDate){
+                                        listings = rlistings.copy();
+                                        listings.sortComparing(m1 -> -m1.stars);
+                                    }
+
                                     for(ModListing mod : listings){
                                         if(mod.hasJava || !searchtxt.isEmpty() && !mod.repo.toLowerCase().contains(searchtxt.toLowerCase()) || (Vars.ios && mod.hasScripts)) continue;
 
@@ -221,13 +234,13 @@ public class ModsDialog extends BaseDialog{
                                             sel.keyDown(KeyCode.escape, sel::hide);
                                             sel.keyDown(KeyCode.back, sel::hide);
                                             sel.show();
-                                        }).width(480f).growX().left().fillY();
+                                        }).width(460f).growX().left().fillY();
                                         tablebrow.row();
                                     }
                                 });
                             };
                             rebuildBrowser[0].run();
-                        });
+                        }).get().setScrollingDisabled(true, false);
                         browser.addCloseButton();
                         browser.show();
                     }).margin(12f);

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

@@ -111,7 +111,7 @@ public class Turret extends ReloadTurret{
         super.setStats();
 
         stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
-        stats.add(Stat.reload, 60f / reloadTime * (alternate ? 1 : shots), StatUnit.none);
+        stats.add(Stat.reload, 60f / (reloadTime + 1) * (alternate ? 1 : shots), StatUnit.none);
         stats.add(Stat.targetsAir, targetAir);
         stats.add(Stat.targetsGround, targetGround);
         if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);

core/src/mindustry/world/blocks/power/PowerGraph.java

@@ -224,7 +224,7 @@ public class PowerGraph{
         lastPowerNeeded = powerNeeded;
         lastPowerProduced = powerProduced;
 
-        lastScaledPowerIn = powerProduced / Time.delta;
+        lastScaledPowerIn = (powerProduced + energyDelta) / Time.delta;
         lastScaledPowerOut = powerNeeded / Time.delta;
         lastCapacity = getTotalBatteryCapacity();
         lastPowerStored = getBatteryStored();

core/src/mindustry/world/blocks/power/PowerNode.java

@@ -226,7 +226,7 @@ public class PowerNode extends PowerBlock{
             for(Point2 point : (Point2[])req.config){
                 otherReq = null;
                 list.each(other -> {
-                    if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req){
+                    if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req && other.block != null && other.block.hasPower){
                         otherReq = other;
                     }
                 });

fastlane/metadata/android/en-US/changelogs/29801.txt

@@ -0,0 +1,9 @@
+[This is a truncated changelog, see Github for full notes]
+As 6.0 is more or less stable now, updates have slowed down significantly. This is likely to be one of the last notable releases before 7.0.
+
+- Fixed same-line logic comments not parsing
+- Fixed mass driver rotating before payload is received
+- Fixed bullets dealing splash damage twice upon collision - splash damage of certain bullets has been increased to compensate
+
+
+