From d3e26c7c166723f726afb8632df425305616387f Mon Sep 17 00:00:00 2001 From: summetdev Date: Tue, 20 Oct 2020 13:33:28 +0300 Subject: [PATCH 1/5] Admin chat command --- core/src/mindustry/core/NetServer.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index d9f944c1aa..1bdf70f771 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -299,6 +299,15 @@ public class NetServer implements ApplicationListener{ } }); + clientCommands.register("a", "", "Send a message only to admins.", (args, player) -> { + if(!player.admin){ + player.sendMessage("[scarlet]You must be admin to use this command."); + return; + } + + Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[#FF4000]" + NetClient.colorizeName(player.id, player.name))); + }); + //duration of a a kick in seconds int kickDuration = 60 * 60; //voting round duration in seconds From 89fca49b91681b6969fa273ac98c89583211742d Mon Sep 17 00:00:00 2001 From: summetdev Date: Tue, 20 Oct 2020 13:51:21 +0300 Subject: [PATCH 2/5] Put admin color to Pal --- core/src/mindustry/core/NetServer.java | 3 ++- core/src/mindustry/graphics/Pal.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 1bdf70f771..304cc7bbb4 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -18,6 +18,7 @@ import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.game.Teams.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.net.*; import mindustry.net.Administration.*; import mindustry.net.Packets.*; @@ -305,7 +306,7 @@ public class NetServer implements ApplicationListener{ return; } - Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[#FF4000]" + NetClient.colorizeName(player.id, player.name))); + Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[" + Pal.adminChat + "]" + NetClient.colorizeName(player.id, player.name))); }); //duration of a a kick in seconds diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 753bbbbbed..62e48199bb 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -94,5 +94,7 @@ public class Pal{ redDust = Color.valueOf("ffa480"), redderDust = Color.valueOf("ff7b69"), - plasticSmoke = Color.valueOf("f1e479"); + plasticSmoke = Color.valueOf("f1e479"), + + adminChat = Color.valueOf("ff4000"); } From 9f95aa035d76f21e5b862de921dceed5701fde79 Mon Sep 17 00:00:00 2001 From: summetdev Date: Tue, 20 Oct 2020 13:56:09 +0300 Subject: [PATCH 3/5] Indents --- core/src/mindustry/graphics/Pal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 62e48199bb..8bb3cd9e70 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -96,5 +96,5 @@ public class Pal{ plasticSmoke = Color.valueOf("f1e479"), - adminChat = Color.valueOf("ff4000"); + adminChat = Color.valueOf("ff4000"); } From 0c1c0f95574c474a651b3d38f00d96412f15fc94 Mon Sep 17 00:00:00 2001 From: summetdev Date: Tue, 20 Oct 2020 13:56:53 +0300 Subject: [PATCH 4/5] Admin -> A --- core/src/mindustry/core/NetServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 304cc7bbb4..082d94101d 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -306,7 +306,7 @@ public class NetServer implements ApplicationListener{ return; } - Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[" + Pal.adminChat + "]" + NetClient.colorizeName(player.id, player.name))); + Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[" + Pal.adminChat + "]" + NetClient.colorizeName(player.id, player.name))); }); //duration of a a kick in seconds From ffb94576ac6e749af5544cffe3ba5b801a33d3a7 Mon Sep 17 00:00:00 2001 From: Summet Date: Tue, 20 Oct 2020 15:04:03 +0300 Subject: [PATCH 5/5] Better colors Co-authored-by: Patrick 'Quezler' Mounier --- core/src/mindustry/core/NetServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 082d94101d..198b1bdaae 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -306,7 +306,7 @@ public class NetServer implements ApplicationListener{ return; } - Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[" + Pal.adminChat + "]" + NetClient.colorizeName(player.id, player.name))); + Groups.player.each(Player::admin, a -> a.sendMessage(args[0], player, "[#" + Pal.adminChat.toString() + "]" + NetClient.colorizeName(player.id, player.name))); }); //duration of a a kick in seconds