diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index e6ca89e23b..1be513c7de 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -112,7 +112,6 @@ public class LCanvas extends Table{ jumps.cullable = false; }).grow().get(); - //pane.setClip(false); pane.setFlickScroll(false); //load old scroll percent diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index 588d35cfc7..318ebe04d0 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -7,6 +7,7 @@ import arc.func.*; import arc.util.*; import arc.util.async.*; import arc.util.serialization.*; +import mindustry.*; import mindustry.core.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -39,7 +40,7 @@ public class BeControl{ public BeControl(){ if(active()){ Timer.schedule(() -> { - if(checkUpdates && !mobile){ + if(Vars.clientLoaded && checkUpdates && !mobile){ checkUpdate(t -> {}); } }, updateInterval, updateInterval); diff --git a/core/src/mindustry/ui/dialogs/BaseDialog.java b/core/src/mindustry/ui/dialogs/BaseDialog.java index 42fb7ac7ff..b99b164ca4 100644 --- a/core/src/mindustry/ui/dialogs/BaseDialog.java +++ b/core/src/mindustry/ui/dialogs/BaseDialog.java @@ -4,6 +4,7 @@ import arc.*; import arc.scene.ui.*; import arc.util.*; import mindustry.core.GameState.*; +import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.graphics.*; @@ -43,7 +44,12 @@ public class BaseDialog extends Dialog{ } protected void onResize(Runnable run){ - resized(run); + Events.on(ResizeEvent.class, event -> { + if(isShown() && Core.scene.getDialog() == this){ + run.run(); + updateScrollFocus(); + } + }); } public void addCloseListener(){ diff --git a/desktop/build.gradle b/desktop/build.gradle index 7cd4befa2a..4c8a14f86f 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,4 +1,4 @@ -sourceSets.main.java.srcDirs = ["src/" ] +sourceSets.main.java.srcDirs = ["src/"] project.ext.mainClassName = "mindustry.desktop.DesktopLauncher" project.ext.assetsDir = new File("../core/assets") @@ -70,9 +70,9 @@ task steamtest(dependsOn: dist){ } //required templates: -//- Windows64 -//- Windows32 (not provided by Packr!) +//- Windows32: Not provided by Packr! This uses Java 8 //required JDKs: +//- Windows64 //- Linux64 //- Mac platforms.each{ platform ->