From b7f7be839db9fff81b274a69fa303a4aa788e103 Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Tue, 20 Jul 2021 02:34:14 +0400 Subject: [PATCH 1/4] Update .pl servers (#5599) * Update .pl servers * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.", From aab2437c4ca94af660de3be4209c01e57f5db919 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 19 Jul 2021 18:42:03 -0400 Subject: [PATCH 2/4] Dont disconnect when connecting to steam servers on non steam (#5617) This will allow sending steam players to steam servers while completely ignoring non steam ones. --- core/src/mindustry/core/NetClient.java | 1 + 1 file changed, 1 insertion(+) 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(); From fde23ceea06ce4041ca94d7bf64a90f5f9f2cccd Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Tue, 20 Jul 2021 08:11:53 +0900 Subject: [PATCH 3/4] SpinSprite DrawRotator for json mods (#5619) --- core/src/mindustry/world/draw/DrawRotator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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); } From b58f202e9e1ef11dc58098c2d4132e4093bbc4cf Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 19 Jul 2021 20:57:36 -0400 Subject: [PATCH 4/4] Allow hiding of steam servers (#5618) * Allow hiding of steam servers Theres no way to hide them while keeping them public in the steam api so instead this jank is needed. This wont do anything on a vanilla install but will allow people hosting headless steam servers to hide them if they only use the server to verify if players are on steam or not. * Hide only when hidden = true --- desktop/src/mindustry/desktop/steam/SNet.java | 1 + 1 file changed, 1 insertion(+) 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;