From d2faea6f71b9bdb0011bd315fcb0a219316de216 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Mon, 6 Dec 2021 01:20:48 +0000 Subject: [PATCH] More Multi World Stuff Update Integrations(Discord Bot/Website Stuff) For Multiple Worlds Added More XP Rate Dialogue Stuff --- .../rs2/game/dialogues/DialogueHandler.java | 12 +++++++ .../rs2/game/dialogues/DialogueOptions.java | 33 +++++++++++++++---- .../integrations/PlayersOnlineWebsite.java | 2 +- .../integrations/RegisteredAccsWebsite.java | 2 +- .../rs2/integrations/discord/JavaCord.java | 2 +- .../discord/commands/Commands.java | 17 +++++----- .../integrations/discord/commands/Forum.java | 2 +- .../discord/commands/Hiscores.java | 2 +- .../integrations/discord/commands/Issues.java | 3 +- .../integrations/discord/commands/Online.java | 5 +-- .../discord/commands/Players.java | 3 +- .../integrations/discord/commands/Vote.java | 2 +- .../discord/commands/Website.java | 2 +- .../com/rs2/net/packets/impl/Commands.java | 13 ++++++-- 14 files changed, 72 insertions(+), 28 deletions(-) diff --git a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java index aaa91a96..f4aa7f54 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java @@ -7614,6 +7614,18 @@ public class DialogueHandler { sendOption("Yes", "No"); player.dialogueAction = 10004; break; + case 10005: + sendOption("x2", "x5", "x10"); + player.dialogueAction = 10005; + break; + case 10006: + sendOption("x5", "x10"); + player.dialogueAction = 10006; + break; + case 10007: + sendOption("x10", "Don't Change"); + player.dialogueAction = 10007; + break; } } public void chatboxText(String text, String text1, String text2, diff --git a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java index 4ebb930d..1da6698f 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java @@ -104,6 +104,11 @@ public class DialogueOptions { player.getDialogueHandler().sendStatement("You summoned your shop!"); BotHandler.playerShop(player); return; + case 10005: + player.setXPRate(2); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); + return; } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -192,6 +197,11 @@ public class DialogueOptions { player.getDialogueHandler().sendStatement("You close your shop!"); BotHandler.closeShop(player); return; + case 10005: + player.setXPRate(5); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); + return; } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -283,6 +293,11 @@ public class DialogueOptions { player.getDialogueHandler().sendStatement("You withdraw " + Bot.formatSellPrice(BotHandler.checkCoins(player)) + " from your shop!"); BotHandler.takeCoins(player); return; + case 10005: + player.setXPRate(10); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); + return; } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -628,19 +643,21 @@ public class DialogueOptions { player.getPacketSender().showInterface(3559); player.canChangeAppearance = true; player.closeTutorialInterface = true; - player.nextChat = 0; - player.dialogueAction = 0; } else if (player.getXPRate() != 10) { player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); player.getPacketSender().sendMessage("::xprate"); - player.dialogueAction = 0; - player.getPacketSender().closeAllWindows(); } else { player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate()); - player.dialogueAction = 0; - player.getPacketSender().closeAllWindows(); } return; + } else if(player.dialogueAction == 10006) { + player.setXPRate(5); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); + } else if(player.dialogueAction == 10007) { + player.setXPRate(10); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); @@ -870,6 +887,10 @@ public class DialogueOptions { } else if (player.dialogueAction == 10004) { player.getDialogueHandler().sendDialogues(10002, 2244); return; + } else if(player.dialogueAction == 10006) { + player.setXPRate(10); + player.getPacketSender().sendMessage("Your XP Rate Is Now Set To x" + player.getXPRate() + " You Can Increase Your Rate In The Future By Using"); + player.getPacketSender().sendMessage("::xprate"); } player.dialogueAction = 0; player.getPacketSender().closeAllWindows(); diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java b/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java index 5e34806d..2e1fd0f5 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java @@ -13,7 +13,7 @@ public class PlayersOnlineWebsite { private static void setWebsitePlayersOnline(int amount) throws IOException { URL url; - url = new URL(GameConstants.WEBSITE_LINK + "/playersonline.php?pass=" + password + "&amount=" + amount); + url = new URL(GameConstants.WEBSITE_LINK + "/playersonline.php?pass=" + password + "&amount=" + amount + "&world=" + GameConstants.WORLD); url.openStream().close(); } diff --git a/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java b/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java index 14efc934..79eadf71 100644 --- a/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java @@ -12,7 +12,7 @@ public class RegisteredAccsWebsite { private static void setAccountsRegistered(int amount) throws IOException { URL url; - url = new URL(GameConstants.WEBSITE_LINK + "/accountsregistered.php?pass=" + password + "&amount=" + amount); + url = new URL(GameConstants.WEBSITE_LINK + "/accountsregistered.php?pass=" + password + "&amount=" + amount + "&world=" + GameConstants.WORLD); url.openStream().close(); } 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 f964317a..403c2e09 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 @@ -39,7 +39,7 @@ public class JavaCord { } api.addMessageCreateListener(event -> { - if (event.getMessageContent().startsWith("::movehome")) { + if (event.getMessageContent().startsWith("::w" + GameConstants.WORLD + " movehome")) { if (event.getMessageAuthor().isServerAdmin()) { System.out.println("perms"); event.getChannel().sendMessage("perms"); 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 8c7a9615..6a11ed2c 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,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.GameConstants; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -8,22 +9,22 @@ public class Commands implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::commands")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " commands")) { event.getChannel().sendMessage("```fix" + System.lineSeparator() + - "::forum/::forums" + "::w(World ID) forum/::(World ID) forums" + System.lineSeparator() + - "::hiscores/::highscores" + "::(World ID) hiscores/::(World ID) highscores" + System.lineSeparator() + - "::issues/::bugs" + "::(World ID) issues/::(World ID) bugs" + System.lineSeparator() + - "::online" + "::(World ID) online" + System.lineSeparator() + - "::players" + "::(World ID) players" + System.lineSeparator() + - "::vote" + "::(World ID) vote" + System.lineSeparator() + - "::website/::site" + "::(World ID) website/::(World ID) 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 b746b3c1..7bbea9e0 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 @@ -10,7 +10,7 @@ public class Forum implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::forum") || message.getContent().equalsIgnoreCase("::forums")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " forum") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " 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 c3ccd26e..43bcd2cb 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 @@ -10,7 +10,7 @@ public class Hiscores implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::hiscores") || message.getContent().equalsIgnoreCase("::highscores")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " hiscores") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " 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 83760dc6..aa54ecff 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,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.GameConstants; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -8,7 +9,7 @@ public class Issues implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::issues") || message.getContent().equalsIgnoreCase("::bugs")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " issues") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " 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 e040e743..5e9fda64 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 @@ -1,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.GameConstants; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; @@ -10,8 +11,8 @@ public class Online implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::online")) { - event.getChannel().sendMessage(":tada: " + JavaCord.serverName + " is Online! :tada:"); + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " online")) { + event.getChannel().sendMessage(":tada: " + JavaCord.serverName + " World:" + GameConstants.WORLD + " is Online! :tada:"); } } } \ No newline at end of file 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 3d3fa556..94061252 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,5 +1,6 @@ package com.rs2.integrations.discord.commands; +import com.rs2.GameConstants; 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 Players implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::players")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " 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 5c73a72f..da2cda18 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 @@ -10,7 +10,7 @@ public class Vote implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::vote")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " 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 b391eb3b..4ab22947 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 @@ -10,7 +10,7 @@ public class Website implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); - if (message.getContent().equalsIgnoreCase("::website") || message.getContent().equalsIgnoreCase("::site")) { + if (message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " website") || message.getContent().equalsIgnoreCase("::w" + GameConstants.WORLD + " site")) { event.getChannel().sendMessage(GameConstants.WEBSITE_LINK); } } diff --git a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java index f0090705..4d17b6af 100644 --- a/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java @@ -47,14 +47,21 @@ public class Commands implements PacketType { switch (playerCommand.toLowerCase()) { case "xprate": case "XPRate": - if(player.getXPRate() == 0 || player.playerRights == 3) { + if(player.getXPRate() == 0/* || player.playerRights == 3*/) { player.getDialogueHandler().sendDialogues(10001, 2244); return; + } else if (player.getXPRate() == 1) { + player.getDialogueHandler().sendDialogues(10005, 2244); + return; + } else if (player.getXPRate() == 2) { + player.getDialogueHandler().sendDialogues(10006, 2244); + return; + } else if (player.getXPRate() == 5) { + player.getDialogueHandler().sendDialogues(10007, 2244); + return; } else if (player.getXPRate() == 10) { player.getPacketSender().sendMessage("You Already Have The Highest XP Rate"); return; - } else { - player.getDialogueHandler().sendDialogues(10001, 2244); } break; case "toggleyell":