From 4b8d072854e4d61b92a6b351a063e555d3200082 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 22 Aug 2019 16:13:39 -0400 Subject: [PATCH] testing --- desktop/build.gradle | 10 +++++++--- .../io/anuke/mindustry/desktop/DesktopPlatform.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index 4f86c101bf..0a668f8680 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -49,8 +49,12 @@ task dist(type: Jar, dependsOn: classes){ task steamtest(dependsOn: dist){ doLast{ copy{ - from "build/libs/Mindustry-linux-release.jar" - into "/home/anuke/.steam/steam/steamapps/common/Mindustry" + from "build/libs/Mindustry.jar" + if(System.properties["os.name"].contains("Mac")){ + into "/home/anuke/.steam/steam/steamapps/common/Mindustry" + }else{ + into "/home/anuke/.steam/steam/steamapps/common/Mindustry" + } rename { String fileName -> fileName.replace("Mindustry-linux-release", "desktop-release") } @@ -152,6 +156,6 @@ PackrConfig.Platform.values().each{ platform -> } finalizedBy "zip${platform.toString()}" - + } } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index 0eae889f37..0d46dee83b 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -54,7 +54,7 @@ public class DesktopPlatform extends Platform{ Label[] label = {null}; Core.scene.table(t -> { t.top().left(); - t.update(() -> t.toFront()); + t.update(t::toFront); t.table("guideDim", f -> { label[0] = f.add("").get(); });