From 588732c856ecfc5a560845381b6a9c0a5d5cf6e5 Mon Sep 17 00:00:00 2001 From: Gadgetroch <46190566+Gadgetroch@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:46:37 +0100 Subject: [PATCH 1/4] Update servers_v7.json (#9367) Good morning, Compared to your recommendations, everything was done except 2 things: I left the connection/disconnect message because I am logging this in my discord server (protected channel) I left the maps at default, to see over time. Thank's --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index f8984c7fea..2c3686ad46 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -259,5 +259,9 @@ { "name": "SkyPlex", "address": ["mc-skyplex.net"] + }, + { + "name": "Gadgetroch's Server", + "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"] } ] From 68b06fdea695603b759c255759af684f6bee42c1 Mon Sep 17 00:00:00 2001 From: BalaM314 <71201189+BalaM314@users.noreply.github.com> Date: Tue, 12 Dec 2023 19:17:40 +0530 Subject: [PATCH 2/4] Allow fetching unitCount by type, and buildCount without type (#9374) * Allow fetching unitCount by type, and buildCount without type * show in processor ui --- core/src/mindustry/logic/LExecutor.java | 11 +++++++++-- core/src/mindustry/logic/LStatements.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 01e5266fea..16dfe01bf2 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1360,13 +1360,20 @@ public class LExecutor{ exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i)); } } - case unitCount -> exec.setnum(result, data.units.size); + case unitCount -> { + UnitType type = exec.obj(extra) instanceof UnitType u ? u : null; + if(type == null){ + exec.setnum(result, data.units.size); + }else{ + exec.setnum(result, data.unitsByType[type.id].size); + } + } case coreCount -> exec.setnum(result, data.cores.size); case playerCount -> exec.setnum(result, data.players.size); case buildCount -> { Block block = exec.obj(extra) instanceof Block b ? b : null; if(block == null){ - exec.setobj(result, null); + exec.setnum(result, data.buildings.size); }else{ exec.setnum(result, data.getBuildings(block).size); } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 1a9e0473d8..30b7b52b56 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -1748,7 +1748,7 @@ public class LStatements{ fields(table, index, i -> index = i); } - if(type == FetchType.buildCount || type == FetchType.build){ + if(type == FetchType.buildCount || type == FetchType.build || type == FetchType.unitCount){ row(table); fields(table, "block", extra, i -> extra = i); From 5d5783bf54119c30d18065d84649a9c1beaac477 Mon Sep 17 00:00:00 2001 From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com> Date: Thu, 14 Dec 2023 06:04:17 +0800 Subject: [PATCH 3/4] Update servers_v7.json (#9376) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 2c3686ad46..bc3f73b8c2 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -234,7 +234,7 @@ }, { "name": "Extra Utilities", - "address": ["222.186.59.147:15142", "222.186.59.147:15143"] + "address": ["222.186.59.147:15142", "222.186.59.147:15143", "p1.i9mr.com:44922", "p1.i9mr.com:44834"] }, { "name": "Alex Multiverse", From 175153e8707bf30e3587ab26c042f77defe39863 Mon Sep 17 00:00:00 2001 From: Estcool9 <111180796+Estcool9@users.noreply.github.com> Date: Wed, 13 Dec 2023 23:05:15 +0100 Subject: [PATCH 4/4] Update servers_v7.json Add My server mindustry est1.be (#9378) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index bc3f73b8c2..a760a6979e 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "STP", "address": ["23.88.73.88:25617"] }, + { + "name" : "LesGarsCools", + "address": ["est1.be"] + }, { "name": "meiqiuMDT", "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"]