diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index 44fcddd2c0..ccc9690fc5 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -21,9 +21,11 @@ public class LogicDialog extends BaseDialog{ canvas = new LCanvas(); shouldPause = true; - addCloseButton(); - buttons.getCells().first().width(170f); + addCloseListener(); + + buttons.defaults().size(160f, 64f); + buttons.button("@back", Icon.left, this::hide); buttons.button("@edit", Icon.edit, () -> { BaseDialog dialog = new BaseDialog("@editor.export"); @@ -51,7 +53,7 @@ public class LogicDialog extends BaseDialog{ dialog.addCloseButton(); dialog.show(); - }).width(170f); + }); buttons.button("@add", Icon.add, () -> { BaseDialog dialog = new BaseDialog("@add"); @@ -75,7 +77,7 @@ public class LogicDialog extends BaseDialog{ }); dialog.addCloseButton(); dialog.show(); - }).width(170f).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions); + }).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions); add(canvas).grow(); diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 4d35ea220f..fe1d861f0f 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -99,7 +99,7 @@ public class Sector{ } public String name(){ - if(preset != null) return preset.localizedName; + if(preset != null && info.name == null) return preset.localizedName; return info.name == null ? id + "" : info.name; } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 9b541949ef..ca72b0c62c 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -136,7 +136,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ if(to.near().contains(launchSector)) return launchSector; Sector launchFrom = launchSector; - if(launchFrom == null){ + if(launchFrom == null || (to.preset == null && !to.near().contains(launchSector))){ //TODO pick one with the most resources launchFrom = to.near().find(Sector::hasBase); if(launchFrom == null && to.preset != null){