mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-07 16:49:07 +00:00
Discord Bot Update
Bot Activity Now Displays Current Players Online(Updated Every Minute? don't really understand game ticks xD) Fixed ::commands Command Added HeatMap & Issues Commands
This commit is contained in:
@@ -11,6 +11,7 @@ import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
|
|||||||
import redone.integrations.PlayersOnlineWebsite;
|
import redone.integrations.PlayersOnlineWebsite;
|
||||||
import redone.integrations.RegisteredAccsWebsite;
|
import redone.integrations.RegisteredAccsWebsite;
|
||||||
import redone.integrations.SettingsLoader;
|
import redone.integrations.SettingsLoader;
|
||||||
|
import redone.integrations.discord.DiscordActivity;
|
||||||
import redone.integrations.discord.JavaCord;
|
import redone.integrations.discord.JavaCord;
|
||||||
import redone.event.CycleEventHandler;
|
import redone.event.CycleEventHandler;
|
||||||
import redone.event.TaskScheduler;
|
import redone.event.TaskScheduler;
|
||||||
@@ -191,6 +192,7 @@ public class Server {
|
|||||||
CycleEventHandler.getSingleton().process();
|
CycleEventHandler.getSingleton().process();
|
||||||
PlayersOnlineWebsite.addUpdatePlayersOnlineTask();
|
PlayersOnlineWebsite.addUpdatePlayersOnlineTask();
|
||||||
RegisteredAccsWebsite.addUpdateRegisteredUsersTask();
|
RegisteredAccsWebsite.addUpdateRegisteredUsersTask();
|
||||||
|
DiscordActivity.updateActivity();
|
||||||
if (System.currentTimeMillis() - lastMassSave > 300000) {
|
if (System.currentTimeMillis() - lastMassSave > 300000) {
|
||||||
for (Player p : PlayerHandler.players) {
|
for (Player p : PlayerHandler.players) {
|
||||||
if (p == null) {
|
if (p == null) {
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package redone.integrations.discord;
|
||||||
|
|
||||||
|
import redone.game.players.PlayerHandler;
|
||||||
|
|
||||||
|
public class DiscordActivity {
|
||||||
|
|
||||||
|
private static int count = 50;
|
||||||
|
|
||||||
|
public static void updateActivity() {
|
||||||
|
if (!JavaCord.token.equals("")) {
|
||||||
|
if (count == 0) {
|
||||||
|
if (PlayerHandler.getPlayerCount() != 1) {
|
||||||
|
JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Players Online");
|
||||||
|
System.out.println("Discord Activity Updated");
|
||||||
|
count = 100;
|
||||||
|
} else {
|
||||||
|
JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Player Online");
|
||||||
|
System.out.println("Discord Activity Updated");
|
||||||
|
count = 100;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
count--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,7 @@ public class JavaCord {
|
|||||||
|
|
||||||
public static String serverName = "2006-ReBotted";
|
public static String serverName = "2006-ReBotted";
|
||||||
public static String token;
|
public static String token;
|
||||||
private static DiscordApi api = null;
|
public static DiscordApi api = null;
|
||||||
|
|
||||||
public static void init() throws IOException {
|
public static void init() throws IOException {
|
||||||
if (token != null && !token.equals("")) { //If the token was loaded by loadSettings:
|
if (token != null && !token.equals("")) { //If the token was loaded by loadSettings:
|
||||||
@@ -29,7 +29,9 @@ public class JavaCord {
|
|||||||
//System.out.println("You can invite the bot by using the following url: " + api.createBotInvite());
|
//System.out.println("You can invite the bot by using the following url: " + api.createBotInvite());
|
||||||
api.addListener(new Commands());
|
api.addListener(new Commands());
|
||||||
api.addListener(new Forum());
|
api.addListener(new Forum());
|
||||||
|
api.addListener(new HeatMap());
|
||||||
api.addListener(new Hiscores());
|
api.addListener(new Hiscores());
|
||||||
|
api.addListener(new Issues());
|
||||||
api.addListener(new Online());
|
api.addListener(new Online());
|
||||||
api.addListener(new Players());
|
api.addListener(new Players());
|
||||||
api.addListener(new Vote());
|
api.addListener(new Vote());
|
||||||
|
|||||||
@@ -9,12 +9,15 @@ public class Commands implements MessageCreateListener {
|
|||||||
public void onMessageCreate(MessageCreateEvent event) {
|
public void onMessageCreate(MessageCreateEvent event) {
|
||||||
Message message = event.getMessage();
|
Message message = event.getMessage();
|
||||||
if (message.getContent().equalsIgnoreCase("::commands")) {
|
if (message.getContent().equalsIgnoreCase("::commands")) {
|
||||||
event.getChannel().sendMessage("```fix`"
|
event.getChannel().sendMessage("```" +
|
||||||
+ System.lineSeparator() +
|
|
||||||
"::forum/::forums"
|
"::forum/::forums"
|
||||||
+ System.lineSeparator() +
|
+ System.lineSeparator() +
|
||||||
|
"::heatmap"
|
||||||
|
+ System.lineSeparator() +
|
||||||
"::hiscores/::highscores"
|
"::hiscores/::highscores"
|
||||||
+ System.lineSeparator() +
|
+ System.lineSeparator() +
|
||||||
|
"::issues/::bugs"
|
||||||
|
+ System.lineSeparator() +
|
||||||
"::online"
|
"::online"
|
||||||
+ System.lineSeparator() +
|
+ System.lineSeparator() +
|
||||||
"::players"
|
"::players"
|
||||||
@@ -22,8 +25,7 @@ public class Commands implements MessageCreateListener {
|
|||||||
"::vote"
|
"::vote"
|
||||||
+ System.lineSeparator() +
|
+ System.lineSeparator() +
|
||||||
"::website/::site"
|
"::website/::site"
|
||||||
+ System.lineSeparator() +
|
+ "```");
|
||||||
"```");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package redone.integrations.discord.commands;
|
||||||
|
|
||||||
|
import org.javacord.api.entity.message.Message;
|
||||||
|
import org.javacord.api.event.message.MessageCreateEvent;
|
||||||
|
import org.javacord.api.listener.message.MessageCreateListener;
|
||||||
|
|
||||||
|
public class HeatMap implements MessageCreateListener {
|
||||||
|
@Override
|
||||||
|
public void onMessageCreate(MessageCreateEvent event) {
|
||||||
|
Message message = event.getMessage();
|
||||||
|
if (message.getContent().equalsIgnoreCase("::heatmap")) {
|
||||||
|
event.getChannel().sendMessage("https://2006rebotted.tk/heatmap.html");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package redone.integrations.discord.commands;
|
||||||
|
|
||||||
|
import org.javacord.api.entity.message.Message;
|
||||||
|
import org.javacord.api.event.message.MessageCreateEvent;
|
||||||
|
import org.javacord.api.listener.message.MessageCreateListener;
|
||||||
|
|
||||||
|
public class Issues implements MessageCreateListener {
|
||||||
|
@Override
|
||||||
|
public void onMessageCreate(MessageCreateEvent event) {
|
||||||
|
Message message = event.getMessage();
|
||||||
|
if (message.getContent().equalsIgnoreCase("::issues") || message.getContent().equalsIgnoreCase("::bugs")) {
|
||||||
|
event.getChannel().sendMessage("https://github.com/dginovker/2006rebotted/issues");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user