From c27eac9bedea0ee883c16bfa62fe7da91084bfee Mon Sep 17 00:00:00 2001 From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com> Date: Sun, 15 Jun 2025 21:28:20 +0200 Subject: [PATCH 1/4] Marker `outline` control (#10931) * Marker `outline` control * Text/ShapeText marker outline --- core/src/mindustry/game/MapObjectives.java | 36 +++++--------------- core/src/mindustry/logic/LMarkerControl.java | 1 + gradle.properties | 2 +- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java index b554b9e277..3371998af8 100644 --- a/core/src/mindustry/game/MapObjectives.java +++ b/core/src/mindustry/game/MapObjectives.java @@ -822,13 +822,8 @@ public class MapObjectives implements Iterable, Eachable fontSize = (float)p1; case textHeight -> textHeight = (float)p1; - case labelFlags -> { - if(!Mathf.equal((float)p1, 0f)){ - flags |= WorldLabel.flagBackground; - }else{ - flags &= ~WorldLabel.flagBackground; - } - } + case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f)); + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f)); case radius -> radius = (float)p1; case rotation -> rotation = (float)p1; case color -> color.fromDouble(p1); @@ -838,13 +833,7 @@ public class MapObjectives implements Iterable, Eachable { - if(!Mathf.equal((float)p2, 0f)){ - flags |= WorldLabel.flagOutline; - }else{ - flags &= ~WorldLabel.flagOutline; - } - } + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f)); } } } @@ -962,6 +951,7 @@ public class MapObjectives implements Iterable, Eachable radius = (float)p1; case stroke -> stroke = (float)p1; + case outline -> outline = !Mathf.equal((float)p1, 0f); case rotation -> rotation = (float)p1; case color -> color.fromDouble(p1); case shape -> sides = (int)p1; @@ -1025,25 +1015,14 @@ public class MapObjectives implements Iterable, Eachable fontSize = (float)p1; - case labelFlags -> { - if(!Mathf.equal((float)p1, 0f)){ - flags |= WorldLabel.flagBackground; - }else{ - flags &= ~WorldLabel.flagBackground; - } - } + case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f)); + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f)); } } if(!Double.isNaN(p2)){ switch(type){ - case labelFlags -> { - if(!Mathf.equal((float)p2, 0f)){ - flags |= WorldLabel.flagOutline; - }else{ - flags &= ~WorldLabel.flagOutline; - } - } + case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f)); } } } @@ -1101,6 +1080,7 @@ public class MapObjectives implements Iterable, Eachable endPos.x = (float)p1 * tilesize; case stroke -> stroke = (float)p1; case color -> color1.set(color2.fromDouble(p1)); + case outline -> outline = !Mathf.equal((float)p1, 0f); } } diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java index c24775af02..57780d8187 100644 --- a/core/src/mindustry/logic/LMarkerControl.java +++ b/core/src/mindustry/logic/LMarkerControl.java @@ -11,6 +11,7 @@ public enum LMarkerControl{ color("color"), radius("radius"), stroke("stroke"), + outline("outline"), rotation("rotation"), shape("sides", "fill", "outline"), arc("start", "end"), diff --git a/gradle.properties b/gradle.properties index dffe670de1..08ad9ff775 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=8abaedb419 +archash=79c4cf021d \ No newline at end of file From 067e24318c935f559636d6cdf619c43152a77ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D1=88=D0=B5=D0=B1=D0=BD=D0=B8=D0=BA?= <127457914+VikoMin@users.noreply.github.com> Date: Mon, 16 Jun 2025 07:23:23 +0700 Subject: [PATCH 2/4] Update servers_v7.json (#10937) For new servers --- servers_v7.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index a503cd1491..f97d325400 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -278,11 +278,11 @@ "194.164.245.218:6569", "194.164.245.218:6570", "194.164.245.218:6571", + "194.164.245.218:6572", + "194.164.245.218:6573", + "194.164.245.218:6574", "194.164.245.218:6597", - "194.164.245.218:6598", - "194.164.245.218:6599", - "194.164.245.218:6600", - "194.164.245.218:6601" + "194.164.245.218:6598" ] }, { From 7a1279fc306a0b0106d7d85b001807533f8a40d3 Mon Sep 17 00:00:00 2001 From: grely <182034229+grelylrz@users.noreply.github.com> Date: Mon, 16 Jun 2025 21:48:12 +0500 Subject: [PATCH 3/4] Update servers_v7.json | replaced ip's (#10935) * Update servers_v7.json | replaced ip's * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index f97d325400..0ae0dd8831 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,16 @@ [ + { + "name": "EscoCorp Servers", + "address": [ + "95.215.56.128", + "95.215.56.128:6568", + "95.215.56.128:6569", + "95.215.56.128:6570", + "95.215.56.128:6571", + "95.215.56.128:6572", + "95.215.56.128:6573" + ] + }, { "name": "EchoDustry", "address": [ From 2d14cd2232d15ee2ef38d57c289bb10183c19390 Mon Sep 17 00:00:00 2001 From: grely <182034229+grelylrz@users.noreply.github.com> Date: Mon, 16 Jun 2025 22:27:12 +0500 Subject: [PATCH 4/4] Update servers_v7.json | Okay, this looks like crap. (#10941) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 0ae0dd8831..6d33eca3db 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,6 +1,6 @@ [ { - "name": "EscoCorp Servers", + "name": "EscoCorp", "address": [ "95.215.56.128", "95.215.56.128:6568",