diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java index fa1fd083..ede8f260 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java @@ -20,6 +20,7 @@ import java.io.IOException; public class JavaCord { public static String serverName = GameConstants.SERVER_NAME; + public static String commandPrefix = "::w" + GameConstants.WORLD; public static String token; public static DiscordApi api = null; @@ -42,9 +43,9 @@ public class JavaCord { } api.addMessageCreateListener(event -> { - if (event.getMessageContent().startsWith("::w" + GameConstants.WORLD + " kick")) { + if (event.getMessageContent().startsWith(commandPrefix + " kick")) { if (event.getMessageAuthor().isServerAdmin()) { - String playerToKick = event.getMessageContent().replace("::w" + GameConstants.WORLD + " kick ", ""); + String playerToKick = event.getMessageContent().replace( commandPrefix + " kick ", ""); for (Player player2 : PlayerHandler.players) { if (player2 != null) { if (player2.playerName.equalsIgnoreCase(playerToKick)) { diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java index 6a11ed2c..17b6faaa 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java @@ -1,6 +1,7 @@ package com.rs2.integrations.discord.commands; import com.rs2.GameConstants; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -9,22 +10,22 @@ public class Commands implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " commands")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " commands")) { event.getChannel().sendMessage("```fix" + System.lineSeparator() + - "::w(World ID) forum/::(World ID) forums" + JavaCord.commandPrefix + " forum/" + JavaCord.commandPrefix + " forums" + System.lineSeparator() + - "::(World ID) hiscores/::(World ID) highscores" + JavaCord.commandPrefix + " hiscores/" + JavaCord.commandPrefix + " highscores" + System.lineSeparator() + - "::(World ID) issues/::(World ID) bugs" + JavaCord.commandPrefix + " issues/" + JavaCord.commandPrefix + " bugs" + System.lineSeparator() + - "::(World ID) online" + JavaCord.commandPrefix + " online" + System.lineSeparator() + - "::(World ID) players" + JavaCord.commandPrefix + " players" + System.lineSeparator() + - "::(World ID) vote" + JavaCord.commandPrefix + " vote" + System.lineSeparator() + - "::(World ID) website/::(World ID) site" + JavaCord.commandPrefix + " website/" + JavaCord.commandPrefix + " site" + "```"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java index 7bbea9e0..d5a6991c 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java @@ -1,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -10,7 +11,7 @@ public class Forum implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " forum") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " forums")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " forum") || message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " forums")) { event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/forums/index.php"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java index 43bcd2cb..fc72e2bb 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java @@ -1,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -10,7 +11,7 @@ public class Hiscores implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " hiscores") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " highscores")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " hiscores") || message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " highscores")) { event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/hiscores.html"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java index aa54ecff..c5c5726b 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java @@ -1,6 +1,7 @@ package com.rs2.integrations.discord.commands; import com.rs2.GameConstants; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -9,7 +10,7 @@ public class Issues implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " issues") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " bugs")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " issues") || message.getContent().equalsIgnoreCase(JavaCord.commandPrefix+ " bugs")) { event.getChannel().sendMessage("https://github.com/2006-Scape/2006Scape/issues"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java index 5e9fda64..cf0376b5 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java @@ -11,7 +11,7 @@ public class Online implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " online")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " online")) { event.getChannel().sendMessage(":tada: " + JavaCord.serverName + " World:" + GameConstants.WORLD + " is Online! :tada:"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java index 94061252..5da35770 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java @@ -1,6 +1,7 @@ package com.rs2.integrations.discord.commands; import com.rs2.GameConstants; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -11,7 +12,7 @@ public class Players implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " players")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " players")) { if (PlayerHandler.getPlayerCount() != 1) { event.getChannel().sendMessage("There are currently " + PlayerHandler.getPlayerCount() + " players online (" + PlayerHandler.getNonPlayerCount() + " staff online)."); } else { diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java index da2cda18..88587bc8 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java @@ -1,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -10,7 +11,7 @@ public class Vote implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " vote")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " vote")) { event.getChannel().sendMessage("Visit " + GameConstants.WEBSITE_LINK + "/vote.html then type \"::claimvote\" in-game to receive your reward!"); } } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java index 4ab22947..73ded7eb 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java @@ -1,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.integrations.discord.JavaCord; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -10,7 +11,7 @@ public class Website implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " website") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " site")) { + if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " website") || message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " site")) { event.getChannel().sendMessage(GameConstants.WEBSITE_LINK); } }