From 20a3107b3f93590b991b09f78b9e3c97e43b8a4f Mon Sep 17 00:00:00 2001 From: nullevoy <89076920+stacktrace-error@users.noreply.github.com> Date: Sat, 1 Jul 2023 15:21:53 +0200 Subject: [PATCH 1/9] add sides to HoverPart (#8784) * add sides to HoverPart * weird elude --- core/src/mindustry/entities/part/HoverPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/part/HoverPart.java b/core/src/mindustry/entities/part/HoverPart.java index 3d69e4874ad1..4822a6513ebf 100644 --- a/core/src/mindustry/entities/part/HoverPart.java +++ b/core/src/mindustry/entities/part/HoverPart.java @@ -7,7 +7,7 @@ public class HoverPart extends DrawPart{ public float radius = 4f; public float x, y, rotation, phase = 50f, stroke = 3f, minStroke = 0.12f; - public int circles = 2; + public int circles = 2, sides = 4; public Color color = Color.white; public boolean mirror = false; public float layer = -1f, layerOffset = 0f; @@ -40,7 +40,7 @@ public void draw(PartParams params){ rx = params.x + Tmp.v1.x, ry = params.y + Tmp.v1.y; - Lines.square(rx, ry, radius * fin, params.rotation - 45f); + Lines.poly(rx, ry, sides, radius * fin, params.rotation); } } From be96ddf463ae8fbec2043c60a3b0b31f6247d174 Mon Sep 17 00:00:00 2001 From: FourGamingStudio <123074279+FourGamingStudio@users.noreply.github.com> Date: Sat, 1 Jul 2023 21:56:59 +0700 Subject: [PATCH 2/9] Four Family (#8785) add server. --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index d1d542f3ed22..a516071f54fc 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -179,5 +179,9 @@ "name": "Official Mindustry Events", "address": ["event.baseduser.eu.org"], "prioritized": true + }, + { + "name": "Four Family", + "address": ["118.127.8.162:25503"] } ] From 3e5898fff18729dc6f13455359ef751b3024d411 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 2 Jul 2023 11:06:55 -0400 Subject: [PATCH 3/9] Disabled team switch outside of sandbox/PvP --- .../ui/fragments/PlayerListFragment.java | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index efdf671cdbeb..8dae9f2acf19 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -196,33 +196,36 @@ public void draw(){ }).row(); } - t.button("@player.team", Icon.redo, bstyle, () -> { - var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name); - teamSelect.setFillParent(false); - - var group = new ButtonGroup<>(); - - int i = 0; - - for(Team team : Team.baseTeams){ - var b = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei); - b.margin(4f); - b.getImageCell().grow(); - b.getStyle().imageUpColor = team.color; - b.clicked(() -> { - Call.adminRequest(user, AdminAction.switchTeam, team); - teamSelect.hide(); - }); - teamSelect.cont.add(b).size(50f).checked(a -> user.team() == team).group(group); + //there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat + if(state.rules.pvp || state.rules.infiniteResources){ + t.button("@player.team", Icon.redo, bstyle, () -> { + var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name); + teamSelect.setFillParent(false); + + var group = new ButtonGroup<>(); + + int i = 0; + + for(Team team : Team.baseTeams){ + var b = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei); + b.margin(4f); + b.getImageCell().grow(); + b.getStyle().imageUpColor = team.color; + b.clicked(() -> { + Call.adminRequest(user, AdminAction.switchTeam, team); + teamSelect.hide(); + }); + teamSelect.cont.add(b).size(50f).checked(a -> user.team() == team).group(group); - if(i++ % 3 == 2) teamSelect.cont.row(); - } + if(i++ % 3 == 2) teamSelect.cont.row(); + } - teamSelect.addCloseButton(); - teamSelect.show(); + teamSelect.addCloseButton(); + teamSelect.show(); - dialog.hide(); - }).row(); + dialog.hide(); + }).row(); + } if(!net.client() && !user.isLocal()){ t.button("@player.admin", Icon.admin, Styles.togglet, () -> { From f88654cdc195996cc2c5f55edffb4092219e2ea1 Mon Sep 17 00:00:00 2001 From: CommandLine <71168720+Def-Try@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:52:58 +0300 Subject: [PATCH 4/9] 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 a516071f54fc..cbbef820e105 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -57,7 +57,7 @@ }, { "name": "Darkdustry", - "address": ["128.140.88.66:3000", "128.140.88.66:3001", "128.140.88.66:3002", "128.140.88.66:3003", "128.140.88.66:3004", "128.140.88.66:3005", "128.140.88.66:3006", "128.140.88.66:3007", "128.140.88.66:3008", "128.140.88.66:3009", "128.140.88.66:3010"] + "address": ["130.61.78.82:3000", "130.61.78.82:3001", "130.61.78.82:3002", "130.61.78.82:3003", "130.61.78.82:3004", "130.61.78.82:3005", "130.61.78.82:3006", "130.61.78.82:3007", "130.61.78.82:3008", "130.61.78.82:3009", "130.61.78.82:3010"] }, { "name": "Chaotic Neutral", From 778d92b816505eb77ad23c6f2240336aeec89ec5 Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:30:03 +0530 Subject: [PATCH 5/9] Removal of dead ips and slight ip change Also Eradicationdustry -> Eradication Mindustry because it sounds better --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index cbbef820e105..b6d917ede227 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -104,8 +104,8 @@ "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404"] }, { - "name": "Eradicationdustry", - "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.yeet.ml:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry2.mindustry.me:6567", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678"] + "name": "Eradication Mindustry", + "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678"] }, { "name": "Conservatory", From 383d8b89e70a1640bd280116be17dacb99b851bc Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:35:33 +0530 Subject: [PATCH 6/9] Forgot an ip --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index b6d917ede227..9faac9f8b5c8 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -105,7 +105,7 @@ }, { "name": "Eradication Mindustry", - "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678"] + "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"] }, { "name": "Conservatory", From 4b4033e9e78a07c45f9046a27d53fc4bbe225d12 Mon Sep 17 00:00:00 2001 From: Tentyanuk <91948148+SSTentacleSS@users.noreply.github.com> Date: Sat, 8 Jul 2023 22:49:10 +0300 Subject: [PATCH 7/9] 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 cbbef820e105..76c90bfbaa06 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -97,7 +97,7 @@ }, { "name": "OMNIDUSTRY", - "address": ["80.90.179.146", "80.90.179.146:6568", "80.90.179.146:6569", "80.90.179.146:6570", "80.90.179.146:6571", "80.90.179.146:6572", "80.90.179.146:6573", "80.90.179.146:6574"] + "address": ["omnidustry.ru", "omnidustry.ru:6568", "omnidustry.ru:6569", "omnidustry.ru:6570", "omnidustry.ru:6571", "omnidustry.ru:6572", "omnidustry.ru:6573", "omnidustry.ru:6574"] }, { "name": "The Devil", From b6a195cc802a61f2e7209b57723655d36ade4b27 Mon Sep 17 00:00:00 2001 From: thedimas <51395517+thedimas3007@users.noreply.github.com> Date: Tue, 18 Jul 2023 22:32:34 +0200 Subject: [PATCH 8/9] 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 cbbef820e105..a0441edfc53a 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -37,7 +37,7 @@ }, { "name": "thedimas", - "address": ["91.209.226.11", "91.209.226.11:6503","91.209.226.11:6505", "91.209.226.11:6506", "91.209.226.11:6507", "91.209.226.11:6508", "91.209.226.11:6509", "91.209.226.11:6510", "91.209.226.11:6511", "91.209.226.11:6512", "91.209.226.11:6513"] + "address": ["167.86.69.235", "167.86.69.235:6503","167.86.69.235:6505", "167.86.69.235:6506", "167.86.69.235:6507", "167.86.69.235:6508", "167.86.69.235:6509", "167.86.69.235:6510", "167.86.69.235:6511", "167.86.69.235:6512", "167.86.69.235:6513"] }, { "name": "HexPvP Network", From dd5037d9d2ff3097e92bb4b22d6525c389435f7b Mon Sep 17 00:00:00 2001 From: Tentyanuk <91948148+SSTentacleSS@users.noreply.github.com> Date: Sat, 22 Jul 2023 07:43:35 +0300 Subject: [PATCH 9/9] 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 76c90bfbaa06..1a5905d54a98 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -97,7 +97,7 @@ }, { "name": "OMNIDUSTRY", - "address": ["omnidustry.ru", "omnidustry.ru:6568", "omnidustry.ru:6569", "omnidustry.ru:6570", "omnidustry.ru:6571", "omnidustry.ru:6572", "omnidustry.ru:6573", "omnidustry.ru:6574"] + "address": ["109.94.209.233", "109.94.209.233:6568", "109.94.209.233:6569", "109.94.209.233:6570", "109.94.209.233:6571", "109.94.209.233:6572", "109.94.209.233:6573", "109.94.209.233:6574"] }, { "name": "The Devil",