Завтра доделаю..

Author: nazrin

src/smp/Main.java

@@ -2,6 +2,7 @@
 
 import arc.Events;
 import arc.util.CommandHandler;
+import arc.util.Timer;
 import mindustry.Vars;
 import mindustry.game.EventType;
 import mindustry.mod.*;
@@ -50,12 +51,6 @@ public void init() {
         } catch (UnknownHostException e) {
             throw new RuntimeException(e);
         }
-        Events.on(EventType.PlayerJoin.class, plr -> {
-            joinEvent(plr.player);
-        });
-        Events.on(EventType.PlayerLeave.class, playerLeave -> {
-            leaveEvent(playerLeave.player);
-        });
         Vars.net.handleServer(Packets.Connect.class, (con, connect) -> {
             Events.fire(new EventType.ConnectionEvent(con));
             MongoDbPlayerIpCheck(con);
@@ -65,6 +60,12 @@ public void init() {
             }
             kickIfBanned(con);
         });
+        Events.on(EventType.PlayerJoin.class, plr -> {
+            joinEvent(plr.player);
+        });
+        Events.on(EventType.PlayerLeave.class, playerLeave -> {
+            leaveEvent(playerLeave.player);
+        });
     }
 
     @Override
@@ -87,7 +88,6 @@ public void registerClientCommands(CommandHandler handler){
         StatsCommand statsCommands = new StatsCommand();
         ServerHopCommand serverHopCommand = new ServerHopCommand();
         register = new CommandRegister(handler);
-        register.updateCommands();
         register.registerCommand(testCommand);
         register.registerCommand(helpCommand);
         register.registerCommand(whisperCommand);
@@ -99,6 +99,9 @@ public void registerClientCommands(CommandHandler handler){
                 statsCommands,
                 serverHopCommand);
 
+        Timer.schedule(() -> {
+            register.updateCommands();
+        }, 5);
         /* admin commands */
 
         AdminChatCommand adminChatCommand = new AdminChatCommand();

src/smp/commands/ds/discord/admin/ListPunishmentsCommand.java

@@ -1,16 +1,21 @@
 package smp.commands.ds.discord.admin;
 
+import org.javacord.api.entity.message.embed.Embed;
+import org.javacord.api.entity.message.embed.EmbedBuilder;
 import org.javacord.api.event.message.MessageCreateEvent;
 import smp.commands.ds.discord.DiscordCommand;
 import smp.database.players.FindPlayerData;
 import smp.functions.Utilities;
 import smp.models.PlayerData;
 import smp.models.Punishment;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import static arc.util.Strings.canParseInt;
 import static java.lang.Integer.parseInt;
+import static smp.discord.embeds.PunishmentEmbed.punishmentEmbed;
 import static smp.functions.Wrappers.formatBanTime;
 
 public class ListPunishmentsCommand extends DiscordCommand {
@@ -22,20 +27,16 @@ public ListPunishmentsCommand() {
     public void run(MessageCreateEvent listener) {
         String[] args = this.params;
         PlayerData plr = null;
-
+        System.out.println(args[0]);
         if (canParseInt(args[0])) {
             plr = FindPlayerData.getPlayerData(parseInt(args[0]));
         } else {
             plr = FindPlayerData.getPlayerData(args[0]);
         }
-        StringBuilder builder = new StringBuilder();
         for (Punishment punishment : plr.punishments){
-            builder.append("Punishment type: ").append(punishment.punishmentType).append("\n");
-            builder.append("Punishment reason: ").append(punishment.punishmentReason).append("\n");
-            builder.append("Punishment expire date: ").append("<t:").append(punishment.punishmentDuration).append(">").append("\n");
-            builder.append("Punishment moderator: ").append(punishment.punishmentModerator).append("\n");
-            builder.append("\n\n");
+            System.out.println("yaya");
+            listener.getChannel().sendMessage(punishmentEmbed(punishment));
         }
-        listener.getChannel().sendMessage(builder.toString());
+
     }
 }

src/smp/commands/ds/discord/admin/WarnCommand.java

@@ -34,7 +34,7 @@ public void run(MessageCreateEvent listener) {
 
         if (time == null) {listener.getChannel().sendMessage("Incorrect time!"); return;}
 
-        Utilities.banPlayer(time, reason, plr, listener.getMessageAuthor().asUser().get());
+        Utilities.warnPlayer(time, reason, plr, listener.getMessageAuthor().asUser().get());
         listener.getChannel().sendMessage("Warned: " + plr.name);
     }
 }

src/smp/commands/ds/discord/console/ConHelpCommand.java

@@ -0,0 +1,25 @@
+package smp.commands.ds.discord.console;
+
+import org.javacord.api.event.message.MessageCreateEvent;
+import smp.commands.ds.discord.DiscordCommand;
+
+import static smp.commands.CommandRegister.discordCommands;
+
+public class ConHelpCommand extends DiscordCommand {
+    public ConHelpCommand() {
+        super("conhelp", " -> Shows the list of console commands", 0, false, true);
+    }
+
+    @Override
+    public void run(MessageCreateEvent listener) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("```\n");
+        for (DiscordCommand cmd : discordCommands){
+            if (cmd.isConsole) {
+                builder.append(cmd.name).append(cmd.desc).append("\n");
+            }
+        }
+        builder.append("```");
+        listener.getChannel().sendMessage(builder.toString());
+    }
+}

src/smp/discord/Bot.java

@@ -71,6 +71,8 @@ public static void initBot(){
         DeleteMapCommand deleteMapCommand = new DeleteMapCommand();
         UploadMapCommand uploadMapCommand = new UploadMapCommand();
         ListPunishmentsCommand listPunishmentsCommand = new ListPunishmentsCommand();
+        WarnCommand warnCommand = new WarnCommand();
+        ConHelpCommand conHelpCommand= new ConHelpCommand();
         registerDiscordCommand(listPlayersCommand,
                 adminAddCommand,
                 adminRewCommand,
@@ -90,7 +92,9 @@ public static void initBot(){
                 pardonCommand,
                 deleteMapCommand,
                 uploadMapCommand,
-                listPunishmentsCommand);
+                listPunishmentsCommand,
+                warnCommand,
+                conHelpCommand);
         Events.on(EventType.PlayerChatEvent.class, event  -> {
             if (event.message.startsWith("/")) {
                 return;

src/smp/discord/DiscordCommandHandler.java

@@ -40,8 +40,10 @@ public static void handleMessage(MessageCreateEvent listener){
                         return;
                     };
                     command.cmdUser = listener.getMessage().getUserAuthor().get();
-                    String argsAfter = joinArrayString(newArray, command.argCount-1);
-                    newArray[command.argCount-1] = argsAfter;
+                    if (sepArray.length != 1) {
+                        String argsAfter = joinArrayString(newArray, command.argCount - 1);
+                        newArray[command.argCount - 1] = argsAfter;
+                    }
                     command.params = newArray;
                     command.run(listener);
                     return;

src/smp/discord/embeds/BanEmbed.java

@@ -12,7 +12,7 @@ public static EmbedBuilder banEmbed(PlayerData data, String reason, long banTime
                 .setColor(Color.RED)
                 .addField("**ID**", String.valueOf(data.id))
                 .addField("**Name**", data.name)
-                .addField("**Reason**", reason)
+                .addField("**Reason**", reason, true)
                 .addField("**Expires**", "<t:" + banTime / 1000 + ":D>")
                 .addField("**Moderator**", moderator);
     }

src/smp/discord/embeds/PunishmentEmbed.java

@@ -0,0 +1,20 @@
+package smp.discord.embeds;
+
+import org.javacord.api.entity.message.embed.EmbedBuilder;
+import smp.models.PlayerData;
+import smp.models.Punishment;
+
+import java.awt.*;
+
+public class PunishmentEmbed {
+    public static EmbedBuilder punishmentEmbed(Punishment punishment) {
+
+        return new EmbedBuilder()
+                .setTitle("Punishment")
+                .setColor(Color.RED)
+                .addField("**Punishment Type**", punishment.punishmentType)
+                .addField("**Reason**", punishment.punishmentReason)
+                .addField("**Expires**", "<t:" + punishment.punishmentDuration + ">", true)
+                .addField("**Moderator**", punishment.punishmentModerator);
+    }
+}

src/smp/events/PlayerJoinEvent.java

@@ -4,6 +4,7 @@
 import arc.util.Strings;
 import mindustry.gen.Call;
 import mindustry.gen.Player;
+import smp.menus.Menus.WelcomeMenu;
 import smp.models.PlayerData;
 
 import static smp.database.players.PlayerChecks.MongoDbPlayerRankCheck;
@@ -12,6 +13,8 @@
 import static smp.functions.Checks.kickIfBanned;
 
 public class PlayerJoinEvent {
+    public static WelcomeMenu welcomeMenu = new WelcomeMenu();
+
     public static void joinEvent(Player plr){
         PlayerData data = findPlayerDataOrCreate(plr);
         fillData(data, plr);
@@ -20,5 +23,6 @@ public static void joinEvent(Player plr){
         MongoDbPlayerRankCheck(plr.uuid());
         Call.sendMessage(Strings.format(joinMessage + " [grey][" + data.id + "]", plr.name()));
         Log.info(plr.plainName() + " joined! " + "[" + data.id + "]");
+        welcomeMenu.run(plr.con());
     }
 }

src/smp/functions/Checks.java

@@ -23,6 +23,11 @@ public static void kickIfBanned(NetConnection player){
         Date date = new Date();
         if (lastBan.punishmentDuration > date.getTime()) {
             String timeUntilUnban = timeToDuration(lastBan.punishmentDuration);
+            player.kick("[red]You have been banned!\n\n" +
+                    "[white]Reason: " + lastBan.punishmentReason + "\n\n"
+                    +"[white]Moderator: " + lastBan.punishmentModerator + "\n\n"
+                    +"[white]Duration: " + timeUntilUnban + " until unban" +
+                    "\n\nIf you think this is a mistake, make sure to appeal ban in our discord: " + discordURL, 0);
         }
     }
     public static void kickIfBanned(Player player){