Skip to content

Commit 9b91ca7

Browse files
author
nazrin
committed
Setting and Rank system has been applied!
1 parent 559b226 commit 9b91ca7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+614
-161
lines changed

‎src/smp/Main.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import mindustry.mod.*;
88
import mindustry.net.Packets;
99
import smp.commands.CommandRegister;
10-
import smp.commands.admin.AdminChatCommand;
11-
import smp.commands.admin.RevertCommand;
12-
import smp.commands.basic.*;
10+
import smp.commands.mindustry.admin.AdminChatCommand;
11+
import smp.commands.mindustry.admin.RevertCommand;
12+
import smp.commands.mindustry.basic.*;
1313
import smp.database.players.Counter;
1414

1515
import java.net.UnknownHostException;

‎src/smp/Variables.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import mindustry.core.NetServer;
77
import mindustry.gen.Groups;
88
import mindustry.net.Administration;
9-
import smp.commands.basic.VotekickCommand;
9+
import smp.commands.mindustry.basic.VotekickCommand;
1010

1111
public class Variables {
1212

@@ -30,11 +30,16 @@ public static int votesRequired(){
3030

3131
public static NetServer.ChatFormatter chatFormatter = (player, message) -> player == null ? message : "[coral][[" + player.coloredName() + "[coral]]:[white] " + message;
3232

33-
public static long mindustryModeratorID = 1127228853505507359L;
33+
public static long mindustryModeratorID;
3434

35-
public static long mindustryConsoleID = 1127228950633005067L;
35+
public static long mindustryConsoleID;
3636

37-
public static long messageLogChannelID = 1134453759959896096L;
37+
public static long messageLogChannelID;
38+
39+
public static long messageBanLogChannelID;
3840

3941
public static String discordURL;
42+
43+
public static String discordToken;
44+
4045
}

‎src/smp/commands/CommandRegister.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import arc.util.Log;
66
import mindustry.Vars;
77
import mindustry.gen.Player;
8-
import smp.commands.discord.DiscordCommand;
8+
import smp.commands.ds.discord.DiscordCommand;
99

1010
import static arc.util.Log.log;
1111

src/smp/commands/discord/DiscordCommand.java renamed to src/smp/commands/ds/discord/DiscordCommand.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord;
22

3-
import arc.struct.OrderedSet;
4-
import arc.struct.Seq;
53
import org.javacord.api.entity.user.User;
64
import org.javacord.api.event.message.MessageCreateEvent;
7-
import smp.commands.CommandParameter;
8-
import smp.errors.MindustryErrors;
9-
10-
import java.io.IOException;
115

126
public class DiscordCommand {
137
public final String name, desc;

src/smp/commands/discord/AdminAddCommand.java renamed to src/smp/commands/ds/discord/admin/AdminAddCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord.admin;
22

33
import mindustry.gen.Groups;
44
import mindustry.gen.Player;
55
import org.javacord.api.event.message.MessageCreateEvent;
6+
import smp.commands.ds.discord.DiscordCommand;
67

78
import static mindustry.Vars.netServer;
89

src/smp/commands/discord/AdminRewCommand.java renamed to src/smp/commands/ds/discord/admin/AdminRewCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord.admin;
22

33
import mindustry.gen.Groups;
44
import org.javacord.api.event.message.MessageCreateEvent;
5+
import smp.commands.ds.discord.DiscordCommand;
56
import smp.database.players.FindPlayerData;
67
import smp.models.PlayerData;
78

src/smp/commands/discord/BanCommand.java renamed to src/smp/commands/ds/discord/admin/BanCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord.admin;
22

33
import org.javacord.api.event.message.MessageCreateEvent;
4+
import smp.commands.ds.discord.DiscordCommand;
45
import smp.database.players.FindPlayerData;
56
import smp.functions.Utilities;
67
import smp.models.PlayerData;

‎src/smp/commands/ds/discord/admin/PardonCommand.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package smp.commands.ds.discord.admin;
2+
3+
import mindustry.Vars;
4+
import org.javacord.api.event.message.MessageCreateEvent;
5+
import smp.commands.ds.discord.DiscordCommand;
6+
import smp.database.players.FindPlayerData;
7+
import smp.functions.Utilities;
8+
import smp.models.PlayerData;
9+
10+
import java.util.Date;
11+
12+
import static arc.util.Strings.canParseInt;
13+
import static java.lang.Integer.parseInt;
14+
import static smp.functions.Wrappers.formatBanTime;
15+
16+
public class PardonCommand extends DiscordCommand {
17+
public PardonCommand() {
18+
super("pardon", " <id/name/uuid> - Removes the kick effect from player.", 1,true, false);
19+
}
20+
21+
@Override
22+
public void run(MessageCreateEvent listener) {
23+
String[] args = this.params;
24+
PlayerData plr = null;
25+
26+
if (canParseInt(args[0])) {
27+
plr = FindPlayerData.getPlayerData(parseInt(args[0]));
28+
} else {
29+
plr = FindPlayerData.getPlayerData(args[0]);
30+
}
31+
32+
if (plr == null) {listener.getChannel().sendMessage("Could not find that player!"); return;}
33+
34+
Vars.netServer.admins.kickedIPs.remove(plr.ip);
35+
listener.getChannel().sendMessage("Player has been pardoned!");
36+
}
37+
}

src/smp/commands/discord/UnbanCommand.java renamed to src/smp/commands/ds/discord/admin/UnbanCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord.admin;
22

33
import org.javacord.api.event.message.MessageCreateEvent;
4+
import smp.commands.ds.discord.DiscordCommand;
45
import smp.database.players.FindPlayerData;
56
import smp.functions.Utilities;
67
import smp.models.PlayerData;

src/smp/commands/discord/HelpCommand.java renamed to src/smp/commands/ds/discord/basic/HelpCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package smp.commands.discord;
1+
package smp.commands.ds.discord.basic;
22

33
import org.javacord.api.event.message.MessageCreateEvent;
4+
import smp.commands.ds.discord.DiscordCommand;
45

56
import static smp.commands.CommandRegister.discordCommands;
67

0 commit comments

Comments
 (0)