Create/Use commandPrefix Var For Discord Bot

This commit is contained in:
Dark98
2021-12-06 01:59:31 +00:00
parent 5c02c34569
commit f64b0469c2
9 changed files with 25 additions and 17 deletions
@@ -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)) {
@@ -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"
+ "```");
}
}
@@ -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");
}
}
@@ -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");
}
}
@@ -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");
}
}
@@ -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:");
}
}
@@ -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 {
@@ -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!");
}
}
@@ -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);
}
}