diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index f0e63dbb7d..da52f23269 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -290,6 +290,7 @@ public class NetClient implements ApplicationListener{ @Remote(called = Loc.client, variants = Variant.one) public static void connect(String ip, int port){ + if(!steam && ip.startsWith("steam:")) return; netClient.disconnectQuietly(); logic.reset(); diff --git a/core/src/mindustry/world/draw/DrawRotator.java b/core/src/mindustry/world/draw/DrawRotator.java index 5d75b77825..3bbf1accc8 100644 --- a/core/src/mindustry/world/draw/DrawRotator.java +++ b/core/src/mindustry/world/draw/DrawRotator.java @@ -2,16 +2,22 @@ package mindustry.world.draw; import arc.*; import arc.graphics.g2d.*; +import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.production.GenericCrafter.*; public class DrawRotator extends DrawBlock{ public TextureRegion rotator, top; + public boolean drawSpinSprite = false; @Override public void draw(GenericCrafterBuild build){ Draw.rect(build.block.region, build.x, build.y); - Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f); + if(drawSpinSprite){ + Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * 2f); + }else{ + Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f); + } if(top.found()) Draw.rect(top, build.x, build.y); } diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java index 92b8803f85..d4b8236afa 100644 --- a/desktop/src/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -312,6 +312,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, for(int i = 0; i < matches; i++){ try{ SteamID lobby = smat.getLobbyByIndex(i); + if(smat.getLobbyData(lobby, "hidden").equals("true")) continue; String mode = smat.getLobbyData(lobby, "gamemode"); //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; diff --git a/servers_v7.json b/servers_v7.json index 4541f5c7fd..9e6ad5f4ab 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "mindustry.pl", - "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl:6966"] + "address": ["46.105.36.238:6000", "46.105.36.238:6666", "46.105.36.238:6966"] }, { "name": "C.A.M.S.",