From 5dc205cd8a06b2c80bdb48ae47863219a35a7f76 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 5 Dec 2020 13:39:35 -0300
Subject: [PATCH] Minor cleanup and formatting
---
.../service/base/CustomServiceScript.java | 1 -
.../custom/service/buffer/BufferService.java | 2 -
.../service/discord/AbstractCommand.java | 49 ++++++++--------
.../custom/service/discord/DiscordBot.java | 4 +-
.../discord/commands/OnlineCommand.java | 58 +++++++++----------
5 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/base/CustomServiceScript.java b/src/main/java/com/l2jserver/datapack/custom/service/base/CustomServiceScript.java
index bdc0d38333..b8c567f007 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/base/CustomServiceScript.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/base/CustomServiceScript.java
@@ -45,7 +45,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
import com.l2jserver.gameserver.util.Util;
/**
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java b/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
index d9fbafacaf..fcd6dad200 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
@@ -40,13 +40,11 @@ import com.l2jserver.gameserver.config.Configuration;
import com.l2jserver.gameserver.handler.BypassHandler;
import com.l2jserver.gameserver.handler.ItemHandler;
import com.l2jserver.gameserver.handler.VoicedCommandHandler;
-import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java
index e7c8974603..d65be21bbf 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java
@@ -33,29 +33,28 @@ import static com.l2jserver.gameserver.config.Configuration.discord;
* @version 2.6.2.0
*/
public abstract class AbstractCommand extends ListenerAdapter {
-
- public abstract List<String> getCommands();
-
- public abstract void executeCommand(MessageReceivedEvent event, String[] args, String prefix);
-
- @Override
- public void onMessageReceived(MessageReceivedEvent event) {
- if (event.getAuthor().isBot() || event.getChannelType().equals(ChannelType.PRIVATE))
- {
- return;
- }
- String[] args = event.getMessage().getContentRaw().split(" ");
- if (isCommand(args, discord().getPrefix())) {
- executeCommand(event, args, discord().getPrefix());
- }
- }
-
- private boolean isCommand(String[] args, String prefix) {
- List<String> commands = new ArrayList<>();
- for (String cmd : getCommands()) {
- commands.add(prefix + cmd);
- }
- return commands.contains(args[0]);
- }
-
+
+ public abstract List<String> getCommands();
+
+ public abstract void executeCommand(MessageReceivedEvent event, String[] args, String prefix);
+
+ @Override
+ public void onMessageReceived(MessageReceivedEvent event) {
+ if (event.getAuthor().isBot() || event.getChannelType().equals(ChannelType.PRIVATE)) {
+ return;
+ }
+ String[] args = event.getMessage().getContentRaw().split(" ");
+ if (isCommand(args, discord().getPrefix())) {
+ executeCommand(event, args, discord().getPrefix());
+ }
+ }
+
+ private boolean isCommand(String[] args, String prefix) {
+ List<String> commands = new ArrayList<>();
+ for (String cmd : getCommands()) {
+ commands.add(prefix + cmd);
+ }
+ return commands.contains(args[0]);
+ }
+
}
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java
index 12c30135e5..a91ccc9d5f 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java
@@ -48,12 +48,12 @@ public class DiscordBot {
private static final Logger LOG = LoggerFactory.getLogger(DiscordBot.class);
private static JDA jda;
-
+
private static final Object[] COMMANDS = {
new StartListener(),
new OnlineCommand(),
};
-
+
public static void main(String[] args) {
if (!discord().enableBot()) {
LOG.info("Discord Bot is Disabled.");
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java
index d1081c50ea..6f5554cd27 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java
@@ -34,33 +34,33 @@ import java.util.List;
* @version 2.6.2.0
*/
public class OnlineCommand extends AbstractCommand {
-
- @Override
- public List<String> getCommands() {
- List<String> commands = new ArrayList<>();
- commands.add("online");
- commands.add("on");
- return commands;
- }
-
- @Override
- public void executeCommand(MessageReceivedEvent event, String[] args, String prefix) {
-
- if(args.length > 1) {
- event.getTextChannel().sendMessage(new EmbedBuilder().setColor(Color.RED).setDescription("Please use the command without any Arguments").build()).queue();
- event.getMessage().addReaction("\u274C").queue(); // Bot reacts with X mark.
- return;
- }
- event.getMessage().addReaction("\u2705").queue(); // Bot reacts with check mark.
- final int playersCount = L2World.getInstance().getAllPlayersCount();
- final int gmCount = AdminData.getInstance().getAllGms(true).size();
- // A command that the bot listens to and responds in an embed with online players and Gms
- EmbedBuilder eb = new EmbedBuilder().setColor(Color.CYAN);
- eb.setTitle(event.getAuthor().getName(), event.getAuthor().getEffectiveAvatarUrl());
- eb.setDescription("***___GAME INFO___***");
- eb.addField("Online Players", String.valueOf(playersCount), false);
- eb.addBlankField(false);
- eb.addField("Online GM's", String.valueOf(gmCount), false);
- event.getChannel().sendMessage(eb.build()).queue(); // this actually sends the information to discord.
- }
+
+ @Override
+ public List<String> getCommands() {
+ List<String> commands = new ArrayList<>();
+ commands.add("online");
+ commands.add("on");
+ return commands;
+ }
+
+ @Override
+ public void executeCommand(MessageReceivedEvent event, String[] args, String prefix) {
+
+ if (args.length > 1) {
+ event.getTextChannel().sendMessage(new EmbedBuilder().setColor(Color.RED).setDescription("Please use the command without any Arguments").build()).queue();
+ event.getMessage().addReaction("\u274C").queue(); // Bot reacts with X mark.
+ return;
+ }
+ event.getMessage().addReaction("\u2705").queue(); // Bot reacts with check mark.
+ final int playersCount = L2World.getInstance().getAllPlayersCount();
+ final int gmCount = AdminData.getInstance().getAllGms(true).size();
+ // A command that the bot listens to and responds in an embed with online players and Gms
+ EmbedBuilder eb = new EmbedBuilder().setColor(Color.CYAN);
+ eb.setTitle(event.getAuthor().getName(), event.getAuthor().getEffectiveAvatarUrl());
+ eb.setDescription("***___GAME INFO___***");
+ eb.addField("Online Players", String.valueOf(playersCount), false);
+ eb.addBlankField(false);
+ eb.addField("Online GM's", String.valueOf(gmCount), false);
+ event.getChannel().sendMessage(eb.build()).queue(); // this actually sends the information to discord.
+ }
}
--
GitLab