>>of( // https://stackoverflow.com/a/28833677/2703239
+ () -> Optional.ofNullable(OnlineSenders.get(key)), // Find first non-null
+ () -> Optional.ofNullable(ConnectedSenders.get(key)), // This doesn't support the public chat, but it'll always return null for it
+ () -> Optional.ofNullable(UnconnectedSenders.get(key)), () -> {
+ val dsender = new DiscordSender(author, channel);
+ UnconnectedSenders.put(key, dsender);
+ return Optional.of(dsender);
+ }).map(Supplier::get).filter(Optional::isPresent).map(Optional::get).findFirst().get();
+ }
+}
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
index 3afc038..74ee6a2 100755
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
@@ -1,58 +1,219 @@
-package buttondevteam.discordplugin.listeners;
-
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.ConnectCommand;
-import buttondevteam.lib.player.TBMCPlayerGetInfoEvent;
-import buttondevteam.lib.player.TBMCPlayerJoinEvent;
-import discord4j.core.object.entity.Member;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Snowflake;
-import lombok.val;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.ServerCommandEvent;
-import reactor.core.publisher.Mono;
-
-public class MCListener implements Listener {
- @EventHandler
- public void onPlayerJoin(TBMCPlayerJoinEvent e) {
- if (ConnectCommand.WaitingToConnect.containsKey(e.GetPlayer().PlayerName().get())) {
- @SuppressWarnings("ConstantConditions") User user = DiscordPlugin.dc
- .getUserById(Snowflake.of(ConnectCommand.WaitingToConnect.get(e.GetPlayer().PlayerName().get()))).block();
- if (user == null) return;
- e.getPlayer().sendMessage("§bTo connect with the Discord account @" + user.getUsername() + "#" + user.getDiscriminator()
- + " do /discord accept");
- e.getPlayer().sendMessage("§bIf it wasn't you, do /discord decline");
- }
- }
-
- @EventHandler
- public void onGetInfo(TBMCPlayerGetInfoEvent e) {
- if (DiscordPlugin.SafeMode)
- return;
- DiscordPlayer dp = e.getPlayer().getAs(DiscordPlayer.class);
- if (dp == null || dp.getDiscordID() == null || dp.getDiscordID().equals(""))
- return;
- val userOpt = DiscordPlugin.dc.getUserById(Snowflake.of(dp.getDiscordID())).onErrorResume(t -> Mono.empty()).blockOptional();
- if (!userOpt.isPresent()) return;
- User user = userOpt.get();
- e.addInfo("Discord tag: " + user.getUsername() + "#" + user.getDiscriminator());
- val memberOpt = user.asMember(DiscordPlugin.mainServer.getId()).onErrorResume(t -> Mono.empty()).blockOptional();
- if (!memberOpt.isPresent()) return;
- Member member = memberOpt.get();
- val prOpt = member.getPresence().blockOptional();
- if (!prOpt.isPresent()) return;
- val pr = prOpt.get();
- e.addInfo(pr.getStatus().toString());
- if (pr.getActivity().isPresent()) {
- val activity = pr.getActivity().get();
- e.addInfo(activity.getType() + ": " + activity.getName());
- }
- }
-
- @EventHandler
- public void onServerCommand(ServerCommandEvent e) {
- DiscordPlugin.Restart = !e.getCommand().equalsIgnoreCase("stop"); // The variable is always true except if stopped
- }
-}
+package buttondevteam.discordplugin.listeners;
+
+import buttondevteam.discordplugin.*;
+import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.TBMCSystemChatEvent;
+import buttondevteam.lib.player.*;
+import com.earth2me.essentials.CommandSource;
+import lombok.val;
+import net.ess3.api.events.AfkStatusChangeEvent;
+import net.ess3.api.events.MuteStatusChangeEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.*;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.BroadcastMessageEvent;
+import org.bukkit.event.server.ServerCommandEvent;
+import org.bukkit.plugin.AuthorNagException;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredListener;
+import sx.blah.discord.handle.obj.IRole;
+import sx.blah.discord.handle.obj.IUser;
+import sx.blah.discord.util.DiscordException;
+import sx.blah.discord.util.MissingPermissionsException;
+
+import java.util.Arrays;
+import java.util.logging.Level;
+
+public class MCListener implements Listener {
+ @EventHandler(priority = EventPriority.HIGHEST)
+ public void onPlayerLogin(PlayerLoginEvent e) {
+ if (e.getResult() != Result.ALLOWED)
+ return;
+ MCChatListener.ConnectedSenders.values().stream()
+ .filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
+ .ifPresent(dcp -> callEventExcludingSome(new PlayerQuitEvent(dcp, "")));
+ }
+
+ @EventHandler(priority = EventPriority.LOWEST)
+ public void onPlayerJoin(TBMCPlayerJoinEvent e) {
+ if (e.getPlayer() instanceof DiscordConnectedPlayer)
+ return; // Don't show the joined message for the fake player
+ Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
+ final Player p = e.getPlayer();
+ DiscordPlayer dp = e.GetPlayer().getAs(DiscordPlayer.class);
+ if (dp != null) {
+ val user = DiscordPlugin.dc.getUserByID(Long.parseLong(dp.getDiscordID()));
+ MCChatListener.OnlineSenders.put(dp.getDiscordID(),
+ new DiscordPlayerSender(user, user.getOrCreatePMChannel(), p));
+ MCChatListener.OnlineSenders.put("P" + dp.getDiscordID(),
+ new DiscordPlayerSender(user, DiscordPlugin.chatchannel, p));
+ }
+ if (ConnectCommand.WaitingToConnect.containsKey(e.GetPlayer().PlayerName().get())) {
+ IUser user = DiscordPlugin.dc
+ .getUserByID(Long.parseLong(ConnectCommand.WaitingToConnect.get(e.GetPlayer().PlayerName().get())));
+ p.sendMessage("§bTo connect with the Discord account @" + user.getName() + "#" + user.getDiscriminator()
+ + " do /discord accept");
+ p.sendMessage("§bIf it wasn't you, do /discord decline");
+ }
+ if (!DiscordPlugin.hooked)
+ MCChatListener.sendSystemMessageToChat(e.GetPlayer().PlayerName().get() + " joined the game");
+ MCChatListener.ListC = 0;
+ ChromaBot.getInstance().updatePlayerList();
+ });
+ }
+
+ @EventHandler(priority = EventPriority.HIGHEST)
+ public void onPlayerLeave(TBMCPlayerQuitEvent e) {
+ if (e.getPlayer() instanceof DiscordConnectedPlayer)
+ return; // Only care about real users
+ MCChatListener.OnlineSenders.entrySet()
+ .removeIf(entry -> entry.getValue().getUniqueId().equals(e.getPlayer().getUniqueId()));
+ Bukkit.getScheduler().runTask(DiscordPlugin.plugin,
+ () -> MCChatListener.ConnectedSenders.values().stream()
+ .filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
+ .ifPresent(dcp -> callEventExcludingSome(new PlayerJoinEvent(dcp, ""))));
+ Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin,
+ ChromaBot.getInstance()::updatePlayerList, 5);
+ }
+
+ @EventHandler(priority = EventPriority.HIGHEST)
+ public void onPlayerKick(PlayerKickEvent e) {
+ if (!DiscordPlugin.hooked && !e.getReason().equals("The server is restarting")
+ && !e.getReason().equals("Server closed")) // The leave messages errored with the previous setup, I could make it wait since I moved it here, but instead I have a special
+ MCChatListener.sendSystemMessageToChat(e.getPlayer().getName() + " left the game"); // message for this - Oh wait this doesn't even send normally because of the hook
+ }
+
+ @EventHandler
+ public void onGetInfo(TBMCPlayerGetInfoEvent e) {
+ if (DiscordPlugin.SafeMode)
+ return;
+ DiscordPlayer dp = e.getPlayer().getAs(DiscordPlayer.class);
+ if (dp == null || dp.getDiscordID() == null || dp.getDiscordID().equals(""))
+ return;
+ IUser user = DiscordPlugin.dc.getUserByID(Long.parseLong(dp.getDiscordID()));
+ e.addInfo("Discord tag: " + user.getName() + "#" + user.getDiscriminator());
+ e.addInfo(user.getPresence().getStatus().toString());
+ if (user.getPresence().getActivity().isPresent() && user.getPresence().getText().isPresent())
+ e.addInfo(user.getPresence().getActivity().get() + ": " + user.getPresence().getText().get());
+ }
+
+ @EventHandler(priority = EventPriority.LOW)
+ public void onPlayerDeath(PlayerDeathEvent e) {
+ if (!DiscordPlugin.hooked)
+ MCChatListener.sendSystemMessageToChat(e.getDeathMessage());
+ }
+
+ @EventHandler
+ public void onPlayerAFK(AfkStatusChangeEvent e) {
+ if (e.isCancelled() || !e.getAffected().getBase().isOnline())
+ return;
+ MCChatListener.sendSystemMessageToChat(DPUtils.sanitizeString(e.getAffected().getBase().getDisplayName())
+ + " is " + (e.getValue() ? "now" : "no longer") + " AFK.");
+ }
+
+ @EventHandler
+ public void onServerCommand(ServerCommandEvent e) {
+ DiscordPlugin.Restart = !e.getCommand().equalsIgnoreCase("stop"); // The variable is always true except if stopped
+ }
+
+ @EventHandler
+ public void onPlayerMute(MuteStatusChangeEvent e) {
+ try {
+ DPUtils.performNoWait(() -> {
+ final IRole role = DiscordPlugin.dc.getRoleByID(164090010461667328L);
+ final CommandSource source = e.getAffected().getSource();
+ if (!source.isPlayer())
+ return;
+ final IUser user = DiscordPlugin.dc.getUserByID(
+ Long.parseLong(TBMCPlayerBase.getPlayer(source.getPlayer().getUniqueId(), TBMCPlayer.class)
+ .getAs(DiscordPlayer.class).getDiscordID())); // TODO: Use long
+ if (e.getValue())
+ user.addRole(role);
+ else
+ user.removeRole(role);
+ });
+ } catch (DiscordException | MissingPermissionsException ex) {
+ TBMCCoreAPI.SendException("Failed to give/take Muted role to player " + e.getAffected().getName() + "!",
+ ex);
+ }
+ }
+
+ @EventHandler
+ public void onChatSystemMessage(TBMCSystemChatEvent event) {
+ MCChatListener.sendSystemMessageToChat(event);
+ }
+
+ @EventHandler
+ public void onBroadcastMessage(BroadcastMessageEvent event) {
+ MCChatListener.sendSystemMessageToChat(event.getMessage());
+ }
+
+ private static final String[] EXCLUDED_PLUGINS = {"ProtocolLib", "LibsDisguises"};
+
+ public static void callEventExcludingSome(Event event) {
+ callEventExcluding(event, EXCLUDED_PLUGINS);
+ }
+
+ /**
+ * Calls an event with the given details.
+ *
+ * This method only synchronizes when the event is not asynchronous.
+ *
+ * @param event Event details
+ * @param plugins The plugins to exclude. Not case sensitive.
+ */
+ private static void callEventExcluding(Event event, String... plugins) { // Copied from Spigot-API and modified a bit
+ if (event.isAsynchronous()) {
+ if (Thread.holdsLock(Bukkit.getPluginManager())) {
+ throw new IllegalStateException(
+ event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
+ }
+ if (Bukkit.getServer().isPrimaryThread()) {
+ throw new IllegalStateException(
+ event.getEventName() + " cannot be triggered asynchronously from primary server thread.");
+ }
+ fireEventExcluding(event, plugins);
+ } else {
+ synchronized (Bukkit.getPluginManager()) {
+ fireEventExcluding(event, plugins);
+ }
+ }
+ }
+
+ private static void fireEventExcluding(Event event, String... plugins) {
+ HandlerList handlers = event.getHandlers(); // Code taken from SimplePluginManager in Spigot-API
+ RegisteredListener[] listeners = handlers.getRegisteredListeners();
+ val server = Bukkit.getServer();
+
+ for (RegisteredListener registration : listeners) {
+ if (!registration.getPlugin().isEnabled()
+ || Arrays.stream(plugins).anyMatch(p -> p.equalsIgnoreCase(registration.getPlugin().getName())))
+ continue; // Modified to exclude plugins
+
+ try {
+ registration.callEvent(event);
+ } catch (AuthorNagException ex) {
+ Plugin plugin = registration.getPlugin();
+
+ if (plugin.isNaggable()) {
+ plugin.setNaggable(false);
+
+ server.getLogger().log(Level.SEVERE,
+ String.format("Nag author(s): '%s' of '%s' about the following: %s",
+ plugin.getDescription().getAuthors(), plugin.getDescription().getFullName(),
+ ex.getMessage()));
+ }
+ } catch (Throwable ex) {
+ server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to "
+ + registration.getPlugin().getDescription().getFullName(), ex);
+ }
+ }
+ }
+}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/ChannelconCommand.java b/src/main/java/buttondevteam/discordplugin/mcchat/ChannelconCommand.java
deleted file mode 100644
index e8307f3..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/ChannelconCommand.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.*;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.player.TBMCPlayer;
-import discord4j.core.object.entity.GuildChannel;
-import discord4j.core.object.entity.Message;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Permission;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-@SuppressWarnings("SimplifyOptionalCallChains") //Java 11
-@CommandClass(helpText = {"Channel connect", //
- "This command allows you to connect a Minecraft channel to a Discord channel (just like how the global chat is connected to #minecraft-chat).", //
- "You need to have access to the MC channel and have manage permissions on the Discord channel.", //
- "You also need to have your Minecraft account connected. In #bot use /connect .", //
- "Call this command from the channel you want to use.", //
- "Usage: @Bot channelcon ", //
- "Use the ID (command) of the channel, for example `g` for the global chat.", //
- "To remove a connection use @ChromaBot channelcon remove in the channel.", //
- "Mentioning the bot is needed in this case because the / prefix only works in #bot.", //
- "Invite link: " //
-})
-@RequiredArgsConstructor
-public class ChannelconCommand extends ICommand2DC {
- private final MinecraftChatModule module;
-
- @Command2.Subcommand
- public boolean remove(Command2DCSender sender) {
- val message = sender.getMessage();
- if (checkPerms(message, null)) return true;
- if (MCChatCustom.removeCustomChat(message.getChannelId()))
- DPUtils.reply(message, Mono.empty(), "channel connection removed.").subscribe();
- else
- DPUtils.reply(message, Mono.empty(), "this channel isn't connected.").subscribe();
- return true;
- }
-
- @Command2.Subcommand
- public boolean toggle(Command2DCSender sender, @Command2.OptionalArg String toggle) {
- val message = sender.getMessage();
- if (checkPerms(message, null)) return true;
- val cc = MCChatCustom.getCustomChat(message.getChannelId());
- if (cc == null)
- return respond(sender, "this channel isn't connected.");
- Supplier togglesString = () -> Arrays.stream(ChannelconBroadcast.values()).map(t -> t.toString().toLowerCase() + ": " + ((cc.toggles & t.flag) == 0 ? "disabled" : "enabled")).collect(Collectors.joining("\n"))
- + "\n\n" + TBMCSystemChatEvent.BroadcastTarget.stream().map(target -> target.getName() + ": " + (cc.brtoggles.contains(target) ? "enabled" : "disabled")).collect(Collectors.joining("\n"));
- if (toggle == null) {
- DPUtils.reply(message, Mono.empty(), "toggles:\n" + togglesString.get()).subscribe();
- return true;
- }
- String arg = toggle.toUpperCase();
- val b = Arrays.stream(ChannelconBroadcast.values()).filter(t -> t.toString().equals(arg)).findAny();
- if (!b.isPresent()) {
- val bt = TBMCSystemChatEvent.BroadcastTarget.get(arg);
- if (bt == null) {
- DPUtils.reply(message, Mono.empty(), "cannot find toggle. Toggles:\n" + togglesString.get()).subscribe();
- return true;
- }
- final boolean add;
- if (add = !cc.brtoggles.contains(bt))
- cc.brtoggles.add(bt);
- else
- cc.brtoggles.remove(bt);
- return respond(sender, "'" + bt.getName() + "' " + (add ? "en" : "dis") + "abled");
- }
- //A B | F
- //------- A: original - B: mask - F: new
- //0 0 | 0
- //0 1 | 1
- //1 0 | 1
- //1 1 | 0
- // XOR
- cc.toggles ^= b.get().flag;
- DPUtils.reply(message, Mono.empty(), "'" + b.get().toString().toLowerCase() + "' " + ((cc.toggles & b.get().flag) == 0 ? "disabled" : "enabled")).subscribe();
- return true;
- }
-
- @Command2.Subcommand
- public boolean def(Command2DCSender sender, String channelID) {
- val message = sender.getMessage();
- if (!module.allowCustomChat().get()) {
- sender.sendMessage("channel connection is not allowed on this Minecraft server.");
- return true;
- }
- val channel = message.getChannel().block();
- if (checkPerms(message, channel)) return true;
- if (MCChatCustom.hasCustomChat(message.getChannelId()))
- return respond(sender, "this channel is already connected to a Minecraft channel. Use `@ChromaBot channelcon remove` to remove it.");
- val chan = Channel.getChannels().filter(ch -> ch.ID.equalsIgnoreCase(channelID) || (Arrays.stream(ch.IDs().get()).anyMatch(cid -> cid.equalsIgnoreCase(channelID)))).findAny();
- if (!chan.isPresent()) { //TODO: Red embed that disappears over time (kinda like the highlight messages in OW)
- DPUtils.reply(message, channel, "MC channel with ID '" + channelID + "' not found! The ID is the command for it without the /.").subscribe();
- return true;
- }
- if (!message.getAuthor().isPresent()) return true;
- val author = message.getAuthor().get();
- val dp = DiscordPlayer.getUser(author.getId().asString(), DiscordPlayer.class);
- val chp = dp.getAs(TBMCPlayer.class);
- if (chp == null) {
- DPUtils.reply(message, channel, "you need to connect your Minecraft account. On the main server in " + DPUtils.botmention() + " do " + DiscordPlugin.getPrefix() + "connect ").subscribe();
- return true;
- }
- DiscordConnectedPlayer dcp = DiscordConnectedPlayer.create(message.getAuthor().get(), channel, chp.getUUID(), Bukkit.getOfflinePlayer(chp.getUUID()).getName(), module);
- //Using a fake player with no login/logout, should be fine for this event
- String groupid = chan.get().getGroupID(dcp);
- if (groupid == null && !(chan.get() instanceof ChatRoom)) { //ChatRooms don't allow it unless the user joins, which happens later
- DPUtils.reply(message, channel, "sorry, you cannot use that Minecraft channel.").subscribe();
- return true;
- }
- if (chan.get() instanceof ChatRoom) { //ChatRooms don't work well
- DPUtils.reply(message, channel, "chat rooms are not supported yet.").subscribe();
- return true;
- }
- /*if (MCChatListener.getCustomChats().stream().anyMatch(cc -> cc.groupID.equals(groupid) && cc.mcchannel.ID.equals(chan.get().ID))) {
- DPUtils.reply(message, null, "sorry, this MC chat is already connected to a different channel, multiple channels are not supported atm.");
- return true;
- }*/ //TODO: "Channel admins" that can connect channels?
- MCChatCustom.addCustomChat(channel, groupid, chan.get(), author, dcp, 0, new HashSet<>());
- if (chan.get() instanceof ChatRoom)
- DPUtils.reply(message, channel, "alright, connection made to the room!").subscribe();
- else
- DPUtils.reply(message, channel, "alright, connection made to group `" + groupid + "`!").subscribe();
- return true;
- }
-
- @SuppressWarnings("ConstantConditions")
- private boolean checkPerms(Message message, @Nullable MessageChannel channel) {
- if (channel == null)
- channel = message.getChannel().block();
- if (!(channel instanceof GuildChannel)) {
- DPUtils.reply(message, channel, "you can only use this command in a server!").subscribe();
- return true;
- }
- var perms = ((GuildChannel) channel).getEffectivePermissions(message.getAuthor().map(User::getId).get()).block();
- if (!perms.contains(Permission.ADMINISTRATOR) && !perms.contains(Permission.MANAGE_CHANNELS)) {
- DPUtils.reply(message, channel, "you need to have manage permissions for this channel!").subscribe();
- return true;
- }
- return false;
- }
-
- @Override
- public String[] getHelpText(Method method, Command2.Subcommand ann) {
- return new String[]{ //
- "Channel connect", //
- "This command allows you to connect a Minecraft channel to a Discord channel (just like how the global chat is connected to #minecraft-chat).", //
- "You need to have access to the MC channel and have manage permissions on the Discord channel.", //
- "You also need to have your Minecraft account connected. In " + DPUtils.botmention() + " use " + DiscordPlugin.getPrefix() + "connect .", //
- "Call this command from the channel you want to use.", //
- "Usage: " + Objects.requireNonNull(DiscordPlugin.dc.getSelf().block()).getMention() + " channelcon ", //
- "Use the ID (command) of the channel, for example `g` for the global chat.", //
- "To remove a connection use @ChromaBot channelcon remove in the channel.", //
- "Mentioning the bot is needed in this case because the " + DiscordPlugin.getPrefix() + " prefix only works in " + DPUtils.botmention() + ".", //
- "Invite link: "
- };
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCommand.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCommand.java
deleted file mode 100755
index 4319cf9..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import discord4j.core.object.entity.PrivateChannel;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
-@CommandClass(helpText = {
- "MC Chat",
- "This command enables or disables the Minecraft chat in private messages.", //
- "It can be useful if you don't want your messages to be visible, for example when talking in a private channel.", //
- "You can also run all of the ingame commands you have access to using this command, if you have your accounts connected." //
-})
-@RequiredArgsConstructor
-public class MCChatCommand extends ICommand2DC {
-
- private final MinecraftChatModule module;
-
- @Command2.Subcommand
- public boolean def(Command2DCSender sender) {
- if (!module.allowPrivateChat().get()) {
- sender.sendMessage("using the private chat is not allowed on this Minecraft server.");
- return true;
- }
- val message = sender.getMessage();
- val channel = message.getChannel().block();
- @SuppressWarnings("OptionalGetWithoutIsPresent") val author = message.getAuthor().get();
- if (!(channel instanceof PrivateChannel)) {
- DPUtils.reply(message, channel, "this command can only be issued in a direct message with the bot.").subscribe();
- return true;
- }
- try (final DiscordPlayer user = DiscordPlayer.getUser(author.getId().asString(), DiscordPlayer.class)) {
- boolean mcchat = !user.isMinecraftChatEnabled();
- MCChatPrivate.privateMCChat(channel, mcchat, author, user);
- DPUtils.reply(message, channel, "Minecraft chat " + (mcchat //
- ? "enabled. Use '" + DiscordPlugin.getPrefix() + "mcchat' again to turn it off." //
- : "disabled.")).subscribe();
- } catch (Exception e) {
- TBMCCoreAPI.SendException("Error while setting mcchat for user " + author.getUsername() + "#" + author.getDiscriminator(), e);
- }
- return true;
- } // TODO: Pin channel switching to indicate the current channel
-
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCustom.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCustom.java
deleted file mode 100644
index c9edaca..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatCustom.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.User;
-import discord4j.core.object.util.Snowflake;
-import lombok.NonNull;
-import lombok.val;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public class MCChatCustom {
- /**
- * Used for town or nation chats or anything else
- */
- static ArrayList lastmsgCustom = new ArrayList<>();
-
- public static void addCustomChat(MessageChannel channel, String groupid, Channel mcchannel, User user, DiscordConnectedPlayer dcp, int toggles, Set brtoggles) {
- if (mcchannel instanceof ChatRoom) {
- ((ChatRoom) mcchannel).joinRoom(dcp);
- if (groupid == null) groupid = mcchannel.getGroupID(dcp);
- }
- val lmd = new CustomLMD(channel, user, groupid, mcchannel, dcp, toggles, brtoggles);
- lastmsgCustom.add(lmd);
- }
-
- public static boolean hasCustomChat(Snowflake channel) {
- return lastmsgCustom.stream().anyMatch(lmd -> lmd.channel.getId().asLong() == channel.asLong());
- }
-
- @Nullable
- public static CustomLMD getCustomChat(Snowflake channel) {
- return lastmsgCustom.stream().filter(lmd -> lmd.channel.getId().asLong() == channel.asLong()).findAny().orElse(null);
- }
-
- public static boolean removeCustomChat(Snowflake channel) {
- MCChatUtils.lastmsgfromd.remove(channel.asLong());
- return lastmsgCustom.removeIf(lmd -> {
- if (lmd.channel.getId().asLong() != channel.asLong())
- return false;
- if (lmd.mcchannel instanceof ChatRoom)
- ((ChatRoom) lmd.mcchannel).leaveRoom(lmd.dcp);
- return true;
- });
- }
-
- public static List getCustomChats() {
- return Collections.unmodifiableList(lastmsgCustom);
- }
-
- public static class CustomLMD extends MCChatUtils.LastMsgData {
- public final String groupID;
- public final Channel mcchannel;
- public final DiscordConnectedPlayer dcp;
- public int toggles;
- public Set brtoggles;
-
- private CustomLMD(@NonNull MessageChannel channel, @NonNull User user,
- @NonNull String groupid, @NonNull Channel mcchannel, @NonNull DiscordConnectedPlayer dcp, int toggles, Set brtoggles) {
- super(channel, user);
- groupID = groupid;
- this.mcchannel = mcchannel;
- this.dcp = dcp;
- this.toggles = toggles;
- this.brtoggles = brtoggles;
- }
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
deleted file mode 100755
index 202fd93..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java
+++ /dev/null
@@ -1,432 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatRoom;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.DiscordSender;
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.listeners.CommandListener;
-import buttondevteam.discordplugin.listeners.CommonListeners;
-import buttondevteam.discordplugin.playerfaker.VanillaCommandListener;
-import buttondevteam.discordplugin.playerfaker.VanillaCommandListener14;
-import buttondevteam.discordplugin.util.Timings;
-import buttondevteam.lib.*;
-import buttondevteam.lib.chat.ChatMessage;
-import buttondevteam.lib.chat.TBMCChatAPI;
-import buttondevteam.lib.player.TBMCPlayer;
-import com.vdurmont.emoji.EmojiParser;
-import discord4j.core.event.domain.message.MessageCreateEvent;
-import discord4j.core.object.Embed;
-import discord4j.core.object.entity.*;
-import discord4j.core.object.util.Snowflake;
-import discord4j.core.spec.EmbedCreateSpec;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.scheduler.BukkitTask;
-import reactor.core.publisher.Mono;
-
-import java.awt.*;
-import java.time.Instant;
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class MCChatListener implements Listener {
- private BukkitTask sendtask;
- private LinkedBlockingQueue> sendevents = new LinkedBlockingQueue<>();
- private Runnable sendrunnable;
- private static Thread sendthread;
- private final MinecraftChatModule module;
-
- public MCChatListener(MinecraftChatModule minecraftChatModule) {
- module = minecraftChatModule;
- }
-
- @EventHandler // Minecraft
- public void onMCChat(TBMCChatEvent ev) {
- if (!ComponentManager.isEnabled(MinecraftChatModule.class) || ev.isCancelled()) //SafeMode: Needed so it doesn't restart after server shutdown
- return;
- sendevents.add(new AbstractMap.SimpleEntry<>(ev, Instant.now()));
- if (sendtask != null)
- return;
- sendrunnable = () -> {
- sendthread = Thread.currentThread();
- processMCToDiscord();
- if (DiscordPlugin.plugin.isEnabled()) //Don't run again if shutting down
- sendtask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, sendrunnable);
- };
- sendtask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, sendrunnable);
- }
-
- private void processMCToDiscord() {
- try {
- TBMCChatEvent e;
- Instant time;
- val se = sendevents.take(); // Wait until an element is available
- e = se.getKey();
- time = se.getValue();
-
- final String authorPlayer = "[" + DPUtils.sanitizeStringNoEscape(e.getChannel().DisplayName().get()) + "] " //
- + ("Minecraft".equals(e.getOrigin()) ? "" : "[" + e.getOrigin().substring(0, 1) + "]") //
- + (DPUtils.sanitizeStringNoEscape(ChromaUtils.getDisplayName(e.getSender())));
- val color = e.getChannel().Color().get();
- final Consumer embed = ecs -> {
- ecs.setDescription(e.getMessage()).setColor(new Color(color.getRed(),
- color.getGreen(), color.getBlue()));
- String url = module.profileURL().get();
- if (e.getSender() instanceof Player)
- DPUtils.embedWithHead(ecs, authorPlayer, e.getSender().getName(),
- url.length() > 0 ? url + "?type=minecraft&id="
- + ((Player) e.getSender()).getUniqueId() : null);
- else if (e.getSender() instanceof DiscordSenderBase)
- ecs.setAuthor(authorPlayer, url.length() > 0 ? url + "?type=discord&id="
- + ((DiscordSenderBase) e.getSender()).getUser().getId().asString() : null,
- ((DiscordSenderBase) e.getSender()).getUser().getAvatarUrl());
- else
- DPUtils.embedWithHead(ecs, authorPlayer, e.getSender().getName(), null);
- ecs.setTimestamp(time);
- };
- final long nanoTime = System.nanoTime();
- InterruptibleConsumer doit = lastmsgdata -> {
- if (lastmsgdata.message == null
- || !authorPlayer.equals(lastmsgdata.message.getEmbeds().get(0).getAuthor().map(Embed.Author::getName).orElse(null))
- || lastmsgdata.time / 1000000000f < nanoTime / 1000000000f - 120
- || !lastmsgdata.mcchannel.ID.equals(e.getChannel().ID)
- || lastmsgdata.content.length() + e.getMessage().length() + 1 > 2048) {
- lastmsgdata.message = lastmsgdata.channel.createEmbed(embed).block();
- lastmsgdata.time = nanoTime;
- lastmsgdata.mcchannel = e.getChannel();
- lastmsgdata.content = e.getMessage();
- } else {
- lastmsgdata.content = lastmsgdata.content + "\n"
- + e.getMessage(); // The message object doesn't get updated
- lastmsgdata.message.edit(mes -> mes.setEmbed(embed.andThen(ecs ->
- ecs.setDescription(lastmsgdata.content)))).block();
- }
- };
- // Checks if the given channel is different than where the message was sent from
- // Or if it was from MC
- Predicate isdifferentchannel = id -> !(e.getSender() instanceof DiscordSenderBase)
- || ((DiscordSenderBase) e.getSender()).getChannel().getId().asLong() != id.asLong();
-
- if (e.getChannel().isGlobal()
- && (e.isFromCommand() || isdifferentchannel.test(module.chatChannel().get())))
- doit.accept(MCChatUtils.lastmsgdata == null
- ? MCChatUtils.lastmsgdata = new MCChatUtils.LastMsgData(module.chatChannelMono().block(), null)
- : MCChatUtils.lastmsgdata);
-
- for (MCChatUtils.LastMsgData data : MCChatPrivate.lastmsgPerUser) {
- if ((e.isFromCommand() || isdifferentchannel.test(data.channel.getId()))
- && e.shouldSendTo(MCChatUtils.getSender(data.channel.getId(), data.user)))
- doit.accept(data);
- }
-
- val iterator = MCChatCustom.lastmsgCustom.iterator();
- while (iterator.hasNext()) {
- val lmd = iterator.next();
- if ((e.isFromCommand() || isdifferentchannel.test(lmd.channel.getId())) //Test if msg is from Discord
- && e.getChannel().ID.equals(lmd.mcchannel.ID) //If it's from a command, the command msg has been deleted, so we need to send it
- && e.getGroupID().equals(lmd.groupID)) { //Check if this is the group we want to test - #58
- if (e.shouldSendTo(lmd.dcp)) //Check original user's permissions
- doit.accept(lmd);
- else {
- iterator.remove(); //If the user no longer has permission, remove the connection
- lmd.channel.createMessage("The user no longer has permission to view the channel, connection removed.").subscribe();
- }
- }
- }
- } catch (InterruptedException ex) { //Stop if interrupted anywhere
- sendtask.cancel();
- sendtask = null;
- } catch (Exception ex) {
- TBMCCoreAPI.SendException("Error while sending message to Discord!", ex);
- }
- }
-
- @EventHandler
- public void onChatPreprocess(TBMCChatPreprocessEvent event) {
- int start = -1;
- while ((start = event.getMessage().indexOf('@', start + 1)) != -1) {
- int mid = event.getMessage().indexOf('#', start + 1);
- if (mid == -1)
- return;
- int end_ = event.getMessage().indexOf(' ', mid + 1);
- if (end_ == -1)
- end_ = event.getMessage().length();
- final int end = end_;
- final int startF = start;
- val user = DiscordPlugin.dc.getUsers().filter(u -> u.getUsername().equals(event.getMessage().substring(startF + 1, mid)))
- .filter(u -> u.getDiscriminator().equals(event.getMessage().substring(mid + 1, end))).blockFirst();
- if (user != null) //TODO: Nicknames
- event.setMessage(event.getMessage().substring(0, startF) + "@" + user.getUsername()
- + (event.getMessage().length() > end ? event.getMessage().substring(end) : "")); // TODO: Add formatting
- start = end; // Skip any @s inside the mention
- }
- }
-
- // ......................DiscordSender....DiscordConnectedPlayer.DiscordPlayerSender
- // Offline public chat......x............................................
- // Online public chat.......x...........................................x
- // Offline private chat.....x.......................x....................
- // Online private chat......x.......................x...................x
- // If online and enabling private chat, don't login
- // If leaving the server and private chat is enabled (has ConnectedPlayer), call login in a task on lowest priority
- // If private chat is enabled and joining the server, logout the fake player on highest priority
- // If online and disabling private chat, don't logout
- // The maps may not contain the senders for UnconnectedSenders
-
- /**
- * Stop the listener. Any calls to onMCChat will restart it as long as we're not in safe mode.
- *
- * @param wait Wait 5 seconds for the threads to stop
- */
- public static void stop(boolean wait) {
- if (sendthread != null) sendthread.interrupt();
- if (recthread != null) recthread.interrupt();
- try {
- if (sendthread != null) {
- sendthread.interrupt();
- if (wait)
- sendthread.join(5000);
- }
- if (recthread != null) {
- recthread.interrupt();
- if (wait)
- recthread.join(5000);
- }
- MCChatUtils.lastmsgdata = null;
- MCChatPrivate.lastmsgPerUser.clear();
- MCChatCustom.lastmsgCustom.clear();
- MCChatUtils.lastmsgfromd.clear();
- MCChatUtils.ConnectedSenders.clear();
- MCChatUtils.UnconnectedSenders.clear();
- recthread = sendthread = null;
- } catch (InterruptedException e) {
- e.printStackTrace(); //This thread shouldn't be interrupted
- }
- }
-
- private BukkitTask rectask;
- private LinkedBlockingQueue recevents = new LinkedBlockingQueue<>();
- private Runnable recrun;
- private static Thread recthread;
-
- // Discord
- public Mono handleDiscord(MessageCreateEvent ev) {
- val ret = Mono.just(true);
- if (!ComponentManager.isEnabled(MinecraftChatModule.class))
- return ret;
- Timings timings = CommonListeners.timings;
- timings.printElapsed("Chat event");
- val author = ev.getMessage().getAuthor();
- final boolean hasCustomChat = MCChatCustom.hasCustomChat(ev.getMessage().getChannelId());
- return ev.getMessage().getChannel().filter(channel -> {
- timings.printElapsed("Filter 1");
- return !(ev.getMessage().getChannelId().asLong() != module.chatChannel().get().asLong()
- && !(channel instanceof PrivateChannel
- && author.map(u -> MCChatPrivate.isMinecraftChatEnabled(u.getId().asString())).orElse(false))
- && !hasCustomChat); //Chat isn't enabled on this channel
- }).filter(channel -> {
- timings.printElapsed("Filter 2");
- return !(channel instanceof PrivateChannel //Only in private chat
- && ev.getMessage().getContent().isPresent()
- && ev.getMessage().getContent().get().length() < "/mcchat<>".length()
- && ev.getMessage().getContent().get().replace("/", "")
- .equalsIgnoreCase("mcchat")); //Either mcchat or /mcchat
- //Allow disabling the chat if needed
- }).filterWhen(channel -> CommandListener.runCommand(ev.getMessage(), channel, true))
- //Allow running commands in chat channels
- .filter(channel -> {
- MCChatUtils.resetLastMessage(channel);
- recevents.add(ev);
- timings.printElapsed("Message event added");
- if (rectask != null)
- return true;
- recrun = () -> { //Don't return in a while loop next time
- recthread = Thread.currentThread();
- processDiscordToMC();
- if (DiscordPlugin.plugin.isEnabled()) //Don't run again if shutting down
- rectask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, recrun); //Continue message processing
- };
- rectask = Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, recrun); //Start message processing
- return true;
- }).map(b -> false).defaultIfEmpty(true);
- }
-
- private void processDiscordToMC() {
- MessageCreateEvent event;
- try {
- event = recevents.take();
- } catch (InterruptedException e1) {
- rectask.cancel();
- return;
- }
- val sender = event.getMessage().getAuthor().orElse(null);
- String dmessage = event.getMessage().getContent().orElse("");
- try {
- final DiscordSenderBase dsender = MCChatUtils.getSender(event.getMessage().getChannelId(), sender);
- val user = dsender.getChromaUser();
-
- for (User u : event.getMessage().getUserMentions().toIterable()) { //TODO: Role mentions
- dmessage = dmessage.replace(u.getMention(), "@" + u.getUsername()); // TODO: IG Formatting
- val m = u.asMember(DiscordPlugin.mainServer.getId()).onErrorResume(t -> Mono.empty()).blockOptional();
- if (m.isPresent()) {
- val mm = m.get();
- final String nick = mm.getDisplayName();
- dmessage = dmessage.replace(mm.getNicknameMention(), "@" + nick);
- }
- }
- for (GuildChannel ch : event.getGuild().flux().flatMap(Guild::getChannels).toIterable()) {
- dmessage = dmessage.replace(ch.getMention(), "#" + ch.getName()); // TODO: IG Formatting
- }
-
- dmessage = EmojiParser.parseToAliases(dmessage, EmojiParser.FitzpatrickAction.PARSE); //Converts emoji to text- TODO: Add option to disable (resource pack?)
- dmessage = dmessage.replaceAll(":(\\S+)\\|type_(?:(\\d)|(1)_2):", ":$1::skin-tone-$2:"); //Convert to Discord's format so it still shows up
-
- dmessage = dmessage.replaceAll("", ":$1:"); //We don't need info about the custom emojis, just display their text
-
- Function getChatMessage = msg -> //
- msg + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage()
- .getAttachments().stream().map(Attachment::getUrl).collect(Collectors.joining("\n"))
- : "");
-
- MCChatCustom.CustomLMD clmd = MCChatCustom.getCustomChat(event.getMessage().getChannelId());
-
- boolean react = false;
-
- val sendChannel = event.getMessage().getChannel().block();
- boolean isPrivate = sendChannel instanceof PrivateChannel;
- if (dmessage.startsWith("/")) { // Ingame command
- if (!isPrivate)
- event.getMessage().delete().subscribe();
- final String cmd = dmessage.substring(1);
- final String cmdlowercased = cmd.toLowerCase();
- if (dsender instanceof DiscordSender && module.whitelistedCommands().get().stream()
- .noneMatch(s -> cmdlowercased.equals(s) || cmdlowercased.startsWith(s + " "))) {
- // Command not whitelisted
- dsender.sendMessage("Sorry, you can only access these commands:\n"
- + module.whitelistedCommands().get().stream().map(uc -> "/" + uc)
- .collect(Collectors.joining(", "))
- + (user.getConnectedID(TBMCPlayer.class) == null
- ? "\nTo access your commands, first please connect your accounts, using /connect in "
- + DPUtils.botmention()
- + "\nThen y"
- : "\nY")
- + "ou can access all of your regular commands (even offline) in private chat: DM me `mcchat`!");
- return;
- }
- val ev = new TBMCCommandPreprocessEvent(dsender, dmessage);
- Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () ->
- Bukkit.getPluginManager().callEvent(ev));
- if (ev.isCancelled())
- return;
- int spi = cmdlowercased.indexOf(' ');
- final String topcmd = spi == -1 ? cmdlowercased : cmdlowercased.substring(0, spi);
- Optional ch = Channel.getChannels()
- .filter(c -> c.ID.equalsIgnoreCase(topcmd)
- || (c.IDs().get().length > 0
- && Arrays.stream(c.IDs().get()).anyMatch(id -> id.equalsIgnoreCase(topcmd)))).findAny();
- if (!ch.isPresent()) //TODO: What if talking in the public chat while we have it on a different one
- Bukkit.getScheduler().runTask(DiscordPlugin.plugin, //Commands need to be run sync
- () -> { //TODO: Better handling...
- val channel = user.channel();
- val chtmp = channel.get();
- if (clmd != null) {
- channel.set(clmd.mcchannel); //Hack to send command in the channel
- } //TODO: Permcheck isn't implemented for commands
- try {
- String mcpackage = Bukkit.getServer().getClass().getPackage().getName();
- if (mcpackage.contains("1_12"))
- VanillaCommandListener.runBukkitOrVanillaCommand(dsender, cmd);
- else if (mcpackage.contains("1_14"))
- VanillaCommandListener14.runBukkitOrVanillaCommand(dsender, cmd);
- else
- Bukkit.dispatchCommand(dsender, cmd);
- } catch (NoClassDefFoundError e) {
- TBMCCoreAPI.SendException("A class is not found when trying to run command " + cmd + "!", e);
- }
- Bukkit.getLogger().info(dsender.getName() + " issued command from Discord: /" + cmd);
- if (clmd != null)
- channel.set(chtmp);
- });
- else {
- Channel chc = ch.get();
- if (!chc.isGlobal() && !isPrivate)
- dsender.sendMessage(
- "You can only talk in a public chat here. DM `mcchat` to enable private chat to talk in the other channels.");
- else {
- if (spi == -1) // Switch channels
- {
- val channel = dsender.getChromaUser().channel();
- val oldch = channel.get();
- if (oldch instanceof ChatRoom)
- ((ChatRoom) oldch).leaveRoom(dsender);
- if (!oldch.ID.equals(chc.ID)) {
- channel.set(chc);
- if (chc instanceof ChatRoom)
- ((ChatRoom) chc).joinRoom(dsender);
- } else
- channel.set(Channel.GlobalChat);
- dsender.sendMessage("You're now talking in: "
- + DPUtils.sanitizeString(channel.get().DisplayName().get()));
- } else { // Send single message
- final String msg = cmd.substring(spi + 1);
- val cmb = ChatMessage.builder(dsender, user, getChatMessage.apply(msg)).fromCommand(true);
- if (clmd == null)
- TBMCChatAPI.SendChatMessage(cmb.build(), chc);
- else
- TBMCChatAPI.SendChatMessage(cmb.permCheck(clmd.dcp).build(), chc);
- react = true;
- }
- }
- }
- } else {// Not a command
- if (dmessage.length() == 0 && event.getMessage().getAttachments().size() == 0
- && !isPrivate && event.getMessage().getType() == Message.Type.CHANNEL_PINNED_MESSAGE) {
- val rtr = clmd != null ? clmd.mcchannel.getRTR(clmd.dcp)
- : dsender.getChromaUser().channel().get().getRTR(dsender);
- TBMCChatAPI.SendSystemMessage(clmd != null ? clmd.mcchannel : dsender.getChromaUser().channel().get(), rtr,
- (dsender instanceof Player ? ((Player) dsender).getDisplayName()
- : dsender.getName()) + " pinned a message on Discord.", TBMCSystemChatEvent.BroadcastTarget.ALL);
- } else {
- val cmb = ChatMessage.builder(dsender, user, getChatMessage.apply(dmessage)).fromCommand(false);
- if (clmd != null)
- TBMCChatAPI.SendChatMessage(cmb.permCheck(clmd.dcp).build(), clmd.mcchannel);
- else
- TBMCChatAPI.SendChatMessage(cmb.build());
- react = true;
- }
- }
- if (react) {
- try {
- val lmfd = MCChatUtils.lastmsgfromd.get(event.getMessage().getChannelId().asLong());
- if (lmfd != null) {
- lmfd.removeSelfReaction(DiscordPlugin.DELIVERED_REACTION).subscribe(); // Remove it no matter what, we know it's there 99.99% of the time
- }
- } catch (Exception e) {
- TBMCCoreAPI.SendException("An error occured while removing reactions from chat!", e);
- }
- MCChatUtils.lastmsgfromd.put(event.getMessage().getChannelId().asLong(), event.getMessage());
- event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION).subscribe();
- }
- } catch (Exception e) {
- TBMCCoreAPI.SendException("An error occured while handling message \"" + dmessage + "\"!", e);
- }
- }
-
- @FunctionalInterface
- private interface InterruptibleConsumer {
- void accept(T value) throws TimeoutException, InterruptedException;
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java
deleted file mode 100644
index 06c3ce1..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatPrivate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.lib.player.TBMCPlayer;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.PrivateChannel;
-import discord4j.core.object.entity.User;
-import lombok.val;
-import org.bukkit.Bukkit;
-
-import java.util.ArrayList;
-
-public class MCChatPrivate {
-
- /**
- * Used for messages in PMs (mcchat).
- */
- static ArrayList lastmsgPerUser = new ArrayList<>();
-
- public static boolean privateMCChat(MessageChannel channel, boolean start, User user, DiscordPlayer dp) {
- TBMCPlayer mcp = dp.getAs(TBMCPlayer.class);
- if (mcp != null) { // If the accounts aren't connected, can't make a connected sender
- val p = Bukkit.getPlayer(mcp.getUUID());
- val op = Bukkit.getOfflinePlayer(mcp.getUUID());
- val mcm = ComponentManager.getIfEnabled(MinecraftChatModule.class);
- if (start) {
- val sender = DiscordConnectedPlayer.create(user, channel, mcp.getUUID(), op.getName(), mcm);
- MCChatUtils.addSender(MCChatUtils.ConnectedSenders, user, sender);
- if (p == null)// Player is offline - If the player is online, that takes precedence
- MCChatUtils.callLoginEvents(sender);
- } else {
- val sender = MCChatUtils.removeSender(MCChatUtils.ConnectedSenders, channel.getId(), user);
- assert sender != null;
- if (p == null // Player is offline - If the player is online, that takes precedence
- && sender.isLoggedIn()) //Don't call the quit event if login failed
- MCChatUtils.callLogoutEvent(sender, true);
- sender.setLoggedIn(false);
- }
- } // ---- PermissionsEx warning is normal on logout ----
- if (!start)
- MCChatUtils.lastmsgfromd.remove(channel.getId().asLong());
- return start //
- ? lastmsgPerUser.add(new MCChatUtils.LastMsgData(channel, user)) // Doesn't support group DMs
- : lastmsgPerUser.removeIf(lmd -> lmd.channel.getId().asLong() == channel.getId().asLong());
- }
-
- public static boolean isMinecraftChatEnabled(DiscordPlayer dp) {
- return isMinecraftChatEnabled(dp.getDiscordID());
- }
-
- public static boolean isMinecraftChatEnabled(String did) { // Don't load the player data just for this
- return lastmsgPerUser.stream()
- .anyMatch(lmd -> ((PrivateChannel) lmd.channel)
- .getRecipientIds().stream().anyMatch(u -> u.asString().equals(did)));
- }
-
- public static void logoutAll() {
- for (val entry : MCChatUtils.ConnectedSenders.entrySet())
- for (val valueEntry : entry.getValue().entrySet())
- if (MCChatUtils.getSender(MCChatUtils.OnlineSenders, valueEntry.getKey(), valueEntry.getValue().getUser()) == null) //If the player is online then the fake player was already logged out
- MCChatUtils.callLogoutEvent(valueEntry.getValue(), false); //This is sync
- MCChatUtils.ConnectedSenders.clear();
- }
-
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java
deleted file mode 100644
index 6b1c61d..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java
+++ /dev/null
@@ -1,387 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.core.MainPlugin;
-import buttondevteam.discordplugin.*;
-import buttondevteam.discordplugin.broadcaster.GeneralEventBroadcasterModule;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import com.google.common.collect.Sets;
-import discord4j.core.object.entity.*;
-import discord4j.core.object.util.Snowflake;
-import io.netty.util.collection.LongObjectHashMap;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.AuthorNagException;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredListener;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nullable;
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class MCChatUtils {
- /**
- * May contain P<DiscordID> as key for public chat
- */
- public static final HashMap> UnconnectedSenders = new HashMap<>();
- public static final HashMap> ConnectedSenders = new HashMap<>();
- /**
- * May contain P<DiscordID> as key for public chat
- */
- public static final HashMap> OnlineSenders = new HashMap<>();
- static @Nullable LastMsgData lastmsgdata;
- static LongObjectHashMap lastmsgfromd = new LongObjectHashMap<>(); // Last message sent by a Discord user, used for clearing checkmarks
- private static MinecraftChatModule module;
- private static HashMap, HashSet> staticExcludedPlugins = new HashMap<>();
-
- public static void updatePlayerList() {
- val mod = getModule();
- if (mod == null || !mod.showPlayerListOnDC().get()) return;
- if (lastmsgdata != null)
- updatePL(lastmsgdata);
- MCChatCustom.lastmsgCustom.forEach(MCChatUtils::updatePL);
- }
-
- private static boolean notEnabled() {
- return getModule() == null;
- }
-
- private static MinecraftChatModule getModule() {
- if (module == null) module = ComponentManager.getIfEnabled(MinecraftChatModule.class);
- else if (!module.isEnabled()) module = null; //Reset if disabled
- return module;
- }
-
- private static void updatePL(LastMsgData lmd) {
- if (!(lmd.channel instanceof TextChannel)) {
- TBMCCoreAPI.SendException("Failed to update player list for channel " + lmd.channel.getId(),
- new Exception("The channel isn't a (guild) text channel."));
- return;
- }
- String topic = ((TextChannel) lmd.channel).getTopic().orElse("");
- if (topic.length() == 0)
- topic = ".\n----\nMinecraft chat\n----\n.";
- String[] s = topic.split("\\n----\\n");
- if (s.length < 3)
- return;
- String gid;
- if (lmd instanceof MCChatCustom.CustomLMD)
- gid = ((MCChatCustom.CustomLMD) lmd).groupID;
- else //If we're not using a custom chat then it's either can ("everyone") or can't (null) see at most
- gid = buttondevteam.core.component.channel.Channel.GROUP_EVERYONE; // (Though it's a public chat then rn)
- AtomicInteger C = new AtomicInteger();
- s[s.length - 1] = "Players: " + Bukkit.getOnlinePlayers().stream()
- .filter(p -> gid.equals(lmd.mcchannel.getGroupID(p))) //If they can see it
- .filter(MCChatUtils::checkEssentials)
- .filter(p -> C.incrementAndGet() > 0) //Always true
- .map(p -> DPUtils.sanitizeString(p.getDisplayName())).collect(Collectors.joining(", "));
- s[0] = C + " player" + (C.get() != 1 ? "s" : "") + " online";
- ((TextChannel) lmd.channel).edit(tce -> tce.setTopic(String.join("\n----\n", s)).setReason("Player list update")).subscribe(); //Don't wait
- }
-
- private static boolean checkEssentials(Player p) {
- var ess = MainPlugin.ess;
- if (ess == null) return true;
- return !ess.getUser(p).isHidden();
- }
-
- public static T addSender(HashMap> senders,
- User user, T sender) {
- return addSender(senders, user.getId().asString(), sender);
- }
-
- public static T addSender(HashMap> senders,
- String did, T sender) {
- var map = senders.get(did);
- if (map == null)
- map = new HashMap<>();
- map.put(sender.getChannel().getId(), sender);
- senders.put(did, map);
- return sender;
- }
-
- public static T getSender(HashMap> senders,
- Snowflake channel, User user) {
- var map = senders.get(user.getId().asString());
- if (map != null)
- return map.get(channel);
- return null;
- }
-
- public static T removeSender(HashMap> senders,
- Snowflake channel, User user) {
- var map = senders.get(user.getId().asString());
- if (map != null)
- return map.remove(channel);
- return null;
- }
-
- public static void forAllMCChat(Consumer> action) {
- if (notEnabled()) return;
- action.accept(module.chatChannelMono());
- for (LastMsgData data : MCChatPrivate.lastmsgPerUser)
- action.accept(Mono.just(data.channel));
- // lastmsgCustom.forEach(cc -> action.accept(cc.channel)); - Only send relevant messages to custom chat
- }
-
- /**
- * For custom and all MC chat
- *
- * @param action The action to act
- * @param toggle The toggle to check
- * @param hookmsg Whether the message is also sent from the hook
- */
- public static void forCustomAndAllMCChat(Consumer> action, @Nullable ChannelconBroadcast toggle, boolean hookmsg) {
- if (notEnabled()) return;
- if (!GeneralEventBroadcasterModule.isHooked() || !hookmsg)
- forAllMCChat(action);
- final Consumer customLMDConsumer = cc -> action.accept(Mono.just(cc.channel));
- if (toggle == null)
- MCChatCustom.lastmsgCustom.forEach(customLMDConsumer);
- else
- MCChatCustom.lastmsgCustom.stream().filter(cc -> (cc.toggles & toggle.flag) != 0).forEach(customLMDConsumer);
- }
-
- /**
- * Do the {@code action} for each custom chat the {@code sender} have access to and has that broadcast type enabled.
- *
- * @param action The action to do
- * @param sender The sender to check perms of or null to send to all that has it toggled
- * @param toggle The toggle to check or null to send to all allowed
- */
- public static void forAllowedCustomMCChat(Consumer> action, @Nullable CommandSender sender, @Nullable ChannelconBroadcast toggle) {
- if (notEnabled()) return;
- MCChatCustom.lastmsgCustom.stream().filter(clmd -> {
- //new TBMCChannelConnectFakeEvent(sender, clmd.mcchannel).shouldSendTo(clmd.dcp) - Thought it was this simple hehe - Wait, it *should* be this simple
- if (toggle != null && (clmd.toggles & toggle.flag) == 0)
- return false; //If null then allow
- if (sender == null)
- return true;
- return clmd.groupID.equals(clmd.mcchannel.getGroupID(sender));
- }).forEach(cc -> action.accept(Mono.just(cc.channel))); //TODO: Send error messages on channel connect
- }
-
- /**
- * Do the {@code action} for each custom chat the {@code sender} have access to and has that broadcast type enabled.
- *
- * @param action The action to do
- * @param sender The sender to check perms of or null to send to all that has it toggled
- * @param toggle The toggle to check or null to send to all allowed
- * @param hookmsg Whether the message is also sent from the hook
- */
- public static void forAllowedCustomAndAllMCChat(Consumer> action, @Nullable CommandSender sender, @Nullable ChannelconBroadcast toggle, boolean hookmsg) {
- if (notEnabled()) return;
- if (!GeneralEventBroadcasterModule.isHooked() || !hookmsg)
- forAllMCChat(action);
- forAllowedCustomMCChat(action, sender, toggle);
- }
-
- public static Consumer> send(String message) {
- return ch -> ch.flatMap(mc -> {
- resetLastMessage(mc);
- return mc.createMessage(DPUtils.sanitizeString(message));
- }).subscribe();
- }
-
- public static void forAllowedMCChat(Consumer> action, TBMCSystemChatEvent event) {
- if (notEnabled()) return;
- if (event.getChannel().isGlobal())
- action.accept(module.chatChannelMono());
- for (LastMsgData data : MCChatPrivate.lastmsgPerUser)
- if (event.shouldSendTo(getSender(data.channel.getId(), data.user)))
- action.accept(Mono.just(data.channel)); //TODO: Only store ID?
- MCChatCustom.lastmsgCustom.stream().filter(clmd -> {
- if (!clmd.brtoggles.contains(event.getTarget()))
- return false;
- return event.shouldSendTo(clmd.dcp);
- }).map(clmd -> Mono.just(clmd.channel)).forEach(action);
- }
-
- /**
- * This method will find the best sender to use: if the player is online, use that, if not but connected then use that etc.
- */
- static DiscordSenderBase getSender(Snowflake channel, final User author) {
- //noinspection OptionalGetWithoutIsPresent
- return Stream.>>of( // https://stackoverflow.com/a/28833677/2703239
- () -> Optional.ofNullable(getSender(OnlineSenders, channel, author)), // Find first non-null
- () -> Optional.ofNullable(getSender(ConnectedSenders, channel, author)), // This doesn't support the public chat, but it'll always return null for it
- () -> Optional.ofNullable(getSender(UnconnectedSenders, channel, author)), //
- () -> Optional.of(addSender(UnconnectedSenders, author,
- new DiscordSender(author, (MessageChannel) DiscordPlugin.dc.getChannelById(channel).block())))).map(Supplier::get).filter(Optional::isPresent).map(Optional::get).findFirst().get();
- }
-
- /**
- * Resets the last message, so it will start a new one instead of appending to it.
- * This is used when someone (even the bot) sends a message to the channel.
- *
- * @param channel The channel to reset in - the process is slightly different for the public, private and custom chats
- */
- public static void resetLastMessage(Channel channel) {
- if (notEnabled()) return;
- if (channel.getId().asLong() == module.chatChannel().get().asLong()) {
- (lastmsgdata == null ? lastmsgdata = new LastMsgData(module.chatChannelMono().block(), null)
- : lastmsgdata).message = null;
- return;
- } // Don't set the whole object to null, the player and channel information should be preserved
- for (LastMsgData data : channel instanceof PrivateChannel ? MCChatPrivate.lastmsgPerUser : MCChatCustom.lastmsgCustom) {
- if (data.channel.getId().asLong() == channel.getId().asLong()) {
- data.message = null;
- return;
- }
- }
- //If it gets here, it's sending a message to a non-chat channel
- }
-
- public static void addStaticExcludedPlugin(Class event, String plugin) {
- staticExcludedPlugins.compute(event, (e, hs) -> hs == null
- ? Sets.newHashSet(plugin)
- : (hs.add(plugin) ? hs : hs));
- }
-
- public static void callEventExcludingSome(Event event) {
- if (notEnabled()) return;
- val second = staticExcludedPlugins.get(event.getClass());
- String[] first = module.excludedPlugins().get();
- String[] both = second == null ? first
- : Arrays.copyOf(first, first.length + second.size());
- int i = first.length;
- if (second != null)
- for (String plugin : second)
- both[i++] = plugin;
- callEventExcluding(event, false, both);
- }
-
- /**
- * Calls an event with the given details.
- *
- * This method only synchronizes when the event is not asynchronous.
- *
- * @param event Event details
- * @param only Flips the operation and includes the listed plugins
- * @param plugins The plugins to exclude. Not case sensitive.
- */
- @SuppressWarnings("WeakerAccess")
- public static void callEventExcluding(Event event, boolean only, String... plugins) { // Copied from Spigot-API and modified a bit
- if (event.isAsynchronous()) {
- if (Thread.holdsLock(Bukkit.getPluginManager())) {
- throw new IllegalStateException(
- event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
- }
- if (Bukkit.getServer().isPrimaryThread()) {
- throw new IllegalStateException(
- event.getEventName() + " cannot be triggered asynchronously from primary server thread.");
- }
- fireEventExcluding(event, only, plugins);
- } else {
- synchronized (Bukkit.getPluginManager()) {
- fireEventExcluding(event, only, plugins);
- }
- }
- }
-
- private static void fireEventExcluding(Event event, boolean only, String... plugins) {
- HandlerList handlers = event.getHandlers(); // Code taken from SimplePluginManager in Spigot-API
- RegisteredListener[] listeners = handlers.getRegisteredListeners();
- val server = Bukkit.getServer();
-
- for (RegisteredListener registration : listeners) {
- if (!registration.getPlugin().isEnabled()
- || Arrays.stream(plugins).anyMatch(p -> only ^ p.equalsIgnoreCase(registration.getPlugin().getName())))
- continue; // Modified to exclude plugins
-
- try {
- registration.callEvent(event);
- } catch (AuthorNagException ex) {
- Plugin plugin = registration.getPlugin();
-
- if (plugin.isNaggable()) {
- plugin.setNaggable(false);
-
- server.getLogger().log(Level.SEVERE,
- String.format("Nag author(s): '%s' of '%s' about the following: %s",
- plugin.getDescription().getAuthors(), plugin.getDescription().getFullName(),
- ex.getMessage()));
- }
- } catch (Throwable ex) {
- server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to "
- + registration.getPlugin().getDescription().getFullName(), ex);
- }
- }
- }
-
- /**
- * Call it from an async thread.
- */
- public static void callLoginEvents(DiscordConnectedPlayer dcp) {
- Consumer> loginFail = kickMsg -> {
- dcp.sendMessage("Minecraft chat disabled, as the login failed: " + kickMsg.get());
- MCChatPrivate.privateMCChat(dcp.getChannel(), false, dcp.getUser(), dcp.getChromaUser());
- }; //Probably also happens if the user is banned or so
- val event = new AsyncPlayerPreLoginEvent(dcp.getName(), InetAddress.getLoopbackAddress(), dcp.getUniqueId());
- callEventExcludingSome(event);
- if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
- loginFail.accept(event::getKickMessage);
- return;
- }
- Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () -> {
- val ev = new PlayerLoginEvent(dcp, "localhost", InetAddress.getLoopbackAddress());
- callEventExcludingSome(ev);
- if (ev.getResult() != PlayerLoginEvent.Result.ALLOWED) {
- loginFail.accept(ev::getKickMessage);
- return;
- }
- callEventExcludingSome(new PlayerJoinEvent(dcp, ""));
- dcp.setLoggedIn(true);
- DPUtils.getLogger().info(dcp.getName() + " (" + dcp.getUniqueId() + ") logged in from Discord");
- });
- }
-
- /**
- * Only calls the events if the player is actually logged in
- *
- * @param dcp The player
- * @param needsSync Whether we're in an async thread
- */
- public static void callLogoutEvent(DiscordConnectedPlayer dcp, boolean needsSync) {
- if (!dcp.isLoggedIn()) return;
- val event = new PlayerQuitEvent(dcp, "");
- if (needsSync) callEventSync(event);
- else callEventExcludingSome(event);
- dcp.setLoggedIn(false);
- DPUtils.getLogger().info(dcp.getName() + " (" + dcp.getUniqueId() + ") logged out from Discord");
- }
-
- static void callEventSync(Event event) {
- Bukkit.getScheduler().runTask(DiscordPlugin.plugin, () -> callEventExcludingSome(event));
- }
-
- @RequiredArgsConstructor
- public static class LastMsgData {
- public Message message;
- public long time;
- public String content;
- public final MessageChannel channel;
- public buttondevteam.core.component.channel.Channel mcchannel;
- public final User user;
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCListener.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCListener.java
deleted file mode 100644
index 50843e6..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MCListener.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.discordplugin.*;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.player.TBMCPlayer;
-import buttondevteam.lib.player.TBMCPlayerBase;
-import buttondevteam.lib.player.TBMCYEEHAWEvent;
-import com.earth2me.essentials.CommandSource;
-import discord4j.core.object.entity.Role;
-import discord4j.core.object.util.Snowflake;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-import net.ess3.api.events.AfkStatusChangeEvent;
-import net.ess3.api.events.MuteStatusChangeEvent;
-import net.ess3.api.events.NickChangeEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.server.BroadcastMessageEvent;
-import org.bukkit.event.server.TabCompleteEvent;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Optional;
-
-@RequiredArgsConstructor
-class MCListener implements Listener {
- private final MinecraftChatModule module;
-
- @EventHandler(priority = EventPriority.HIGHEST)
- public void onPlayerLogin(PlayerLoginEvent e) {
- if (e.getResult() != Result.ALLOWED)
- return;
- if (e.getPlayer() instanceof DiscordConnectedPlayer)
- return;
- MCChatUtils.ConnectedSenders.values().stream().flatMap(v -> v.values().stream()) //Only private mcchat should be in ConnectedSenders
- .filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
- .ifPresent(dcp -> MCChatUtils.callLogoutEvent(dcp, false));
- }
-
- @EventHandler(priority = EventPriority.MONITOR)
- public void onPlayerJoin(PlayerJoinEvent e) {
- if (e.getPlayer() instanceof DiscordConnectedPlayer)
- return; // Don't show the joined message for the fake player
- Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
- final Player p = e.getPlayer();
- DiscordPlayer dp = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class).getAs(DiscordPlayer.class);
- if (dp != null) {
- DiscordPlugin.dc.getUserById(Snowflake.of(dp.getDiscordID())).flatMap(user -> user.getPrivateChannel().flatMap(chan -> module.chatChannelMono().flatMap(cc -> {
- MCChatUtils.addSender(MCChatUtils.OnlineSenders, dp.getDiscordID(),
- new DiscordPlayerSender(user, chan, p));
- MCChatUtils.addSender(MCChatUtils.OnlineSenders, dp.getDiscordID(),
- new DiscordPlayerSender(user, cc, p)); //Stored per-channel
- return Mono.empty();
- }))).subscribe();
- }
- final String message = e.getJoinMessage();
- if (message != null && message.trim().length() > 0)
- MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(message), e.getPlayer(), ChannelconBroadcast.JOINLEAVE, true);
- ChromaBot.getInstance().updatePlayerList();
- });
- }
-
- @EventHandler(priority = EventPriority.MONITOR)
- public void onPlayerLeave(PlayerQuitEvent e) {
- if (e.getPlayer() instanceof DiscordConnectedPlayer)
- return; // Only care about real users
- MCChatUtils.OnlineSenders.entrySet()
- .removeIf(entry -> entry.getValue().entrySet().stream().anyMatch(p -> p.getValue().getUniqueId().equals(e.getPlayer().getUniqueId())));
- Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin,
- () -> MCChatUtils.ConnectedSenders.values().stream().flatMap(v -> v.values().stream())
- .filter(s -> s.getUniqueId().equals(e.getPlayer().getUniqueId())).findAny()
- .ifPresent(MCChatUtils::callLoginEvents));
- Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin,
- ChromaBot.getInstance()::updatePlayerList, 5);
- final String message = e.getQuitMessage();
- if (message != null && message.trim().length() > 0)
- MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(message), e.getPlayer(), ChannelconBroadcast.JOINLEAVE, true);
- }
-
- @EventHandler(priority = EventPriority.HIGHEST)
- public void onPlayerKick(PlayerKickEvent e) {
- /*if (!DiscordPlugin.hooked && !e.getReason().equals("The server is restarting")
- && !e.getReason().equals("Server closed")) // The leave messages errored with the previous setup, I could make it wait since I moved it here, but instead I have a special
- MCChatListener.forAllowedCustomAndAllMCChat(e.getPlayer().getName() + " left the game"); // message for this - Oh wait this doesn't even send normally because of the hook*/
- }
-
- @EventHandler(priority = EventPriority.LOW)
- public void onPlayerDeath(PlayerDeathEvent e) {
- MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(e.getDeathMessage()), e.getEntity(), ChannelconBroadcast.DEATH, true);
- }
-
- @EventHandler
- public void onPlayerAFK(AfkStatusChangeEvent e) {
- final Player base = e.getAffected().getBase();
- if (e.isCancelled() || !base.isOnline())
- return;
- final String msg = base.getDisplayName()
- + " is " + (e.getValue() ? "now" : "no longer") + " AFK.";
- MCChatUtils.forAllowedCustomAndAllMCChat(MCChatUtils.send(msg), base, ChannelconBroadcast.AFK, false);
- }
-
- private ConfigData> muteRole() {
- return DPUtils.roleData(module.getConfig(), "muteRole", "Muted");
- }
-
- @EventHandler
- public void onPlayerMute(MuteStatusChangeEvent e) {
- final Mono role = muteRole().get();
- if (role == null) return;
- final CommandSource source = e.getAffected().getSource();
- if (!source.isPlayer())
- return;
- final DiscordPlayer p = TBMCPlayerBase.getPlayer(source.getPlayer().getUniqueId(), TBMCPlayer.class)
- .getAs(DiscordPlayer.class);
- if (p == null) return;
- DPUtils.ignoreError(DiscordPlugin.dc.getUserById(Snowflake.of(p.getDiscordID()))
- .flatMap(user -> user.asMember(DiscordPlugin.mainServer.getId()))
- .flatMap(user -> role.flatMap(r -> {
- if (e.getValue())
- user.addRole(r.getId());
- else
- user.removeRole(r.getId());
- val modlog = module.modlogChannel().get();
- String msg = (e.getValue() ? "M" : "Unm") + "uted user: " + user.getUsername() + "#" + user.getDiscriminator();
- DPUtils.getLogger().info(msg);
- if (modlog != null)
- return modlog.flatMap(ch -> ch.createMessage(msg));
- return Mono.empty();
- }))).subscribe();
- }
-
- @EventHandler
- public void onChatSystemMessage(TBMCSystemChatEvent event) {
- MCChatUtils.forAllowedMCChat(MCChatUtils.send(event.getMessage()), event);
- }
-
- @EventHandler
- public void onBroadcastMessage(BroadcastMessageEvent event) {
- MCChatUtils.forCustomAndAllMCChat(MCChatUtils.send(event.getMessage()), ChannelconBroadcast.BROADCAST, false);
- }
-
- @EventHandler
- public void onYEEHAW(TBMCYEEHAWEvent event) { //TODO: Inherit from the chat event base to have channel support
- String name = event.getSender() instanceof Player ? ((Player) event.getSender()).getDisplayName()
- : event.getSender().getName();
- //Channel channel = ChromaGamerBase.getFromSender(event.getSender()).channel().get(); - TODO
- DiscordPlugin.mainServer.getEmojis().filter(e -> "YEEHAW".equals(e.getName()))
- .take(1).singleOrEmpty().map(Optional::of).defaultIfEmpty(Optional.empty()).subscribe(yeehaw ->
- MCChatUtils.forAllMCChat(MCChatUtils.send(name + (yeehaw.map(guildEmoji -> " <:YEEHAW:" + guildEmoji.getId().asString() + ">s").orElse(" YEEHAWs")))));
- }
-
- @EventHandler
- public void onNickChange(NickChangeEvent event) {
- MCChatUtils.updatePlayerList();
- }
-
- @EventHandler
- public void onTabComplete(TabCompleteEvent event) {
- int i = event.getBuffer().lastIndexOf(' ');
- String t = event.getBuffer().substring(i + 1); //0 if not found
- //System.out.println("Last token: " + t);
- if (!t.startsWith("@"))
- return;
- String token = t.substring(1);
- //System.out.println("Token: " + token);
- val x = DiscordPlugin.mainServer.getMembers()
- .flatMap(m -> Flux.just(m.getUsername(), m.getNickname().orElse("")))
- .filter(s -> s.startsWith(token))
- .map(s -> "@" + s)
- .doOnNext(event.getCompletions()::add).blockLast();
- //System.out.println("Finished - last: " + x);
- }
-
- @EventHandler
- public void onCommandSend(PlayerCommandSendEvent event) {
- event.getCommands().add("g");
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java b/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java
deleted file mode 100644
index 1018ba8..0000000
--- a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package buttondevteam.discordplugin.mcchat;
-
-import buttondevteam.core.MainPlugin;
-import buttondevteam.core.component.channel.Channel;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.playerfaker.perm.LPInjector;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.TBMCSystemChatEvent;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ConfigData;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import com.google.common.collect.Lists;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.util.Snowflake;
-import lombok.Getter;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-/**
- * Provides Minecraft chat connection to Discord. Commands may be used either in a public chat (limited) or in a DM.
- */
-public class MinecraftChatModule extends Component {
- private @Getter MCChatListener listener;
-
- /**
- * A list of commands that can be used in public chats - Warning: Some plugins will treat players as OPs, always test before allowing a command!
- */
- public ConfigData> whitelistedCommands() {
- return getConfig().getData("whitelistedCommands", () -> Lists.newArrayList("list", "u", "shrug", "tableflip", "unflip", "mwiki",
- "yeehaw", "lenny", "rp", "plugins"));
- }
-
- /**
- * The channel to use as the public Minecraft chat - everything public gets broadcasted here
- */
- public ReadOnlyConfigData chatChannel() {
- return DPUtils.snowflakeData(getConfig(), "chatChannel", 0L);
- }
-
- public Mono chatChannelMono() {
- return DPUtils.getMessageChannel(chatChannel().getPath(), chatChannel().get());
- }
-
- /**
- * The channel where the plugin can log when it mutes a player on Discord because of a Minecraft mute
- */
- public ReadOnlyConfigData> modlogChannel() {
- return DPUtils.channelData(getConfig(), "modlogChannel");
- }
-
- /**
- * The plugins to exclude from fake player events used for the 'mcchat' command - some plugins may crash, add them here
- */
- public ConfigData excludedPlugins() {
- return getConfig().getData("excludedPlugins", new String[]{"ProtocolLib", "LibsDisguises", "JourneyMapServer"});
- }
-
- /**
- * If this setting is on then players logged in through the 'mcchat' command will be able to teleport using plugin commands.
- * They can then use commands like /tpahere to teleport others to that place.
- * If this is off, then teleporting will have no effect.
- */
- public ConfigData allowFakePlayerTeleports() {
- return getConfig().getData("allowFakePlayerTeleports", false);
- }
-
- /**
- * If this is on, each chat channel will have a player list in their description.
- * It only gets added if there's no description yet or there are (at least) two lines of "----" following each other.
- * Note that it will replace everything between the first and last "----" but it will only detect exactly four dashes.
- * So if you want to use dashes for something else in the description, make sure it's either less or more dashes in one line.
- */
- public ConfigData showPlayerListOnDC() {
- return getConfig().getData("showPlayerListOnDC", true);
- }
-
- /**
- * This setting controls whether custom chat connections can be created (existing connections will always work).
- * Custom chat connections can be created using the channelcon command and they allow players to display town chat in a Discord channel for example.
- * See the channelcon command for more details.
- */
- public ConfigData allowCustomChat() {
- return getConfig().getData("allowCustomChat", true);
- }
-
- /**
- * This setting allows you to control if players can DM the bot to log on the server from Discord.
- * This allows them to both chat and perform any command they can in-game.
- */
- public ConfigData allowPrivateChat() {
- return getConfig().getData("allowPrivateChat", true);
- }
-
- /**
- * If set, message authors appearing on Discord will link to this URL. A 'type' and 'id' parameter will be added with the user's platform (Discord, Minecraft, ...) and ID.
- */
- public ConfigData profileURL() {
- return getConfig().getData("profileURL", "");
- }
-
- @Override
- protected void enable() {
- if (DPUtils.disableIfConfigErrorRes(this, chatChannel(), chatChannelMono()))
- return;
- /*clientID = DiscordPlugin.dc.getApplicationInfo().blockOptional().map(info->info.getId().asString())
- .orElse("Unknown"); //Need to block because otherwise it may not be set in time*/
- listener = new MCChatListener(this);
- TBMCCoreAPI.RegisterEventsForExceptions(listener, getPlugin());
- TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(this), getPlugin());//These get undone if restarting/resetting - it will ignore events if disabled
- getPlugin().getManager().registerCommand(new MCChatCommand(this));
- getPlugin().getManager().registerCommand(new ChannelconCommand(this));
-
- val chcons = getConfig().getConfig().getConfigurationSection("chcons");
- if (chcons == null) //Fallback to old place
- getConfig().getConfig().getRoot().getConfigurationSection("chcons");
- if (chcons != null) {
- val chconkeys = chcons.getKeys(false);
- for (val chconkey : chconkeys) {
- val chcon = chcons.getConfigurationSection(chconkey);
- val mcch = Channel.getChannels().filter(ch -> ch.ID.equals(chcon.getString("mcchid"))).findAny();
- val ch = DiscordPlugin.dc.getChannelById(Snowflake.of(chcon.getLong("chid"))).block();
- val did = chcon.getLong("did");
- val user = DiscordPlugin.dc.getUserById(Snowflake.of(did)).block();
- val groupid = chcon.getString("groupid");
- val toggles = chcon.getInt("toggles");
- val brtoggles = chcon.getStringList("brtoggles");
- if (!mcch.isPresent() || ch == null || user == null || groupid == null)
- continue;
- Bukkit.getScheduler().runTask(getPlugin(), () -> { //<-- Needed because of occasional ConcurrentModificationExceptions when creating the player (PermissibleBase)
- val dcp = DiscordConnectedPlayer.create(user, (MessageChannel) ch, UUID.fromString(chcon.getString("mcuid")), chcon.getString("mcname"), this);
- MCChatCustom.addCustomChat((MessageChannel) ch, groupid, mcch.get(), user, dcp, toggles, brtoggles.stream().map(TBMCSystemChatEvent.BroadcastTarget::get).filter(Objects::nonNull).collect(Collectors.toSet()));
- });
- }
- }
-
- try {
- new LPInjector(MainPlugin.Instance);
- } catch (Exception e) {
- TBMCCoreAPI.SendException("Failed to init LuckPerms injector", e);
- } catch (NoClassDefFoundError e) {
- getPlugin().getLogger().info("No LuckPerms, not injecting");
- }
- }
-
- @Override
- protected void disable() {
- val chcons = MCChatCustom.getCustomChats();
- val chconsc = getConfig().getConfig().createSection("chcons");
- for (val chcon : chcons) {
- val chconc = chconsc.createSection(chcon.channel.getId().asString());
- chconc.set("mcchid", chcon.mcchannel.ID);
- chconc.set("chid", chcon.channel.getId().asLong());
- chconc.set("did", chcon.user.getId().asLong());
- chconc.set("mcuid", chcon.dcp.getUniqueId().toString());
- chconc.set("mcname", chcon.dcp.getName());
- chconc.set("groupid", chcon.groupID);
- chconc.set("toggles", chcon.toggles);
- chconc.set("brtoggles", chcon.brtoggles.stream().map(TBMCSystemChatEvent.BroadcastTarget::getName).collect(Collectors.toList()));
- }
- MCChatListener.stop(true);
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
new file mode 100755
index 0000000..13b3095
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
@@ -0,0 +1,43 @@
+package buttondevteam.discordplugin.mccommands;
+
+import buttondevteam.discordplugin.DiscordPlayer;
+import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.discordplugin.listeners.MCChatListener;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.player.ChromaGamerBase;
+import buttondevteam.lib.player.TBMCPlayer;
+import buttondevteam.lib.player.TBMCPlayerBase;
+import org.bukkit.entity.Player;
+
+@CommandClass(modOnly = false, path = "accept")
+public class AcceptMCCommand extends DiscordMCCommandBase {
+
+ @Override
+ public String[] GetHelpText(String alias) {
+ return new String[] { //
+ "§6---- Accept Discord connection ----", //
+ "Accept a pending connection between your Discord and Minecraft account.", //
+ "To start the connection process, do §b/connect §r in the #bot channel on Discord", //
+ "Usage: /" + alias + " accept" //
+ };
+ }
+
+ @Override
+ public boolean OnCommand(Player player, String alias, String[] args) {
+ String did = ConnectCommand.WaitingToConnect.get(player.getName());
+ if (did == null) {
+ player.sendMessage("§cYou don't have a pending connection to Discord.");
+ return true;
+ }
+ DiscordPlayer dp = ChromaGamerBase.getUser(did, DiscordPlayer.class);
+ TBMCPlayer mcp = TBMCPlayerBase.getPlayer(player.getUniqueId(), TBMCPlayer.class);
+ dp.connectWith(mcp);
+ dp.save();
+ mcp.save();
+ ConnectCommand.WaitingToConnect.remove(player.getName());
+ MCChatListener.UnconnectedSenders.remove(did);
+ player.sendMessage("§bAccounts connected.");
+ return true;
+ }
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java
new file mode 100755
index 0000000..831ad89
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/DeclineMCCommand.java
@@ -0,0 +1,31 @@
+package buttondevteam.discordplugin.mccommands;
+
+import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.chat.CommandClass;
+import org.bukkit.entity.Player;
+
+@CommandClass(modOnly = false, path = "decline")
+public class DeclineMCCommand extends DiscordMCCommandBase {
+
+ @Override
+ public String[] GetHelpText(String alias) {
+ return new String[] { //
+ "§6---- Decline Discord connection ----", //
+ "Decline a pending connection between your Discord and Minecraft account.", //
+ "To start the connection process, do §b/connect §r in the #bot channel on Discord", //
+ "Usage: /" + alias + " decline" //
+ };
+ }
+
+ @Override
+ public boolean OnCommand(Player player, String alias, String[] args) {
+ String did = ConnectCommand.WaitingToConnect.remove(player.getName());
+ if (did == null) {
+ player.sendMessage("§cYou don't have a pending connection to Discord.");
+ return true;
+ }
+ player.sendMessage("§bPending connection declined.");
+ return true;
+ }
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java
deleted file mode 100644
index 61d9d6b..0000000
--- a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package buttondevteam.discordplugin.mccommands;
-
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlayer;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.commands.ConnectCommand;
-import buttondevteam.discordplugin.commands.VersionCommand;
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.chat.ICommand2MC;
-import buttondevteam.lib.player.ChromaGamerBase;
-import buttondevteam.lib.player.TBMCPlayer;
-import buttondevteam.lib.player.TBMCPlayerBase;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import reactor.core.publisher.Mono;
-
-import java.lang.reflect.Method;
-
-@CommandClass(path = "discord", helpText = {
- "Discord",
- "This command allows performing Discord-related actions."
-})
-public class DiscordMCCommand extends ICommand2MC {
- @Command2.Subcommand
- public boolean accept(Player player) {
- if (checkSafeMode(player)) return true;
- String did = ConnectCommand.WaitingToConnect.get(player.getName());
- if (did == null) {
- player.sendMessage("§cYou don't have a pending connection to Discord.");
- return true;
- }
- DiscordPlayer dp = ChromaGamerBase.getUser(did, DiscordPlayer.class);
- TBMCPlayer mcp = TBMCPlayerBase.getPlayer(player.getUniqueId(), TBMCPlayer.class);
- dp.connectWith(mcp);
- dp.save();
- mcp.save();
- ConnectCommand.WaitingToConnect.remove(player.getName());
- MCChatUtils.UnconnectedSenders.remove(did); //Remove all unconnected, will be recreated where needed
- player.sendMessage("§bAccounts connected.");
- return true;
- }
-
- @Command2.Subcommand
- public boolean decline(Player player) {
- if (checkSafeMode(player)) return true;
- String did = ConnectCommand.WaitingToConnect.remove(player.getName());
- if (did == null) {
- player.sendMessage("§cYou don't have a pending connection to Discord.");
- return true;
- }
- player.sendMessage("§bPending connection declined.");
- return true;
- }
-
- @Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP, helpText = {
- "Reload Discord plugin",
- "Reloads the config. To apply some changes, you may need to also run /discord reset."
- })
- public void reload(CommandSender sender) {
- if (DiscordPlugin.plugin.tryReloadConfig())
- sender.sendMessage("§bConfig reloaded.");
- else
- sender.sendMessage("§cFailed to reload config.");
- }
-
- public static boolean resetting = false;
-
- @Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP, helpText = {
- "Reset ChromaBot", //
- "This command disables and then enables the plugin." //
- })
- public void reset(CommandSender sender) {
- Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> {
- if (!DiscordPlugin.plugin.tryReloadConfig()) {
- sender.sendMessage("§cFailed to reload config so not resetting. Check the console.");
- return;
- }
- resetting = true; //Turned off after sending enable message (ReadyEvent)
- sender.sendMessage("§bDisabling DiscordPlugin...");
- Bukkit.getPluginManager().disablePlugin(DiscordPlugin.plugin);
- if (!(sender instanceof DiscordSenderBase)) //Sending to Discord errors
- sender.sendMessage("§bEnabling DiscordPlugin...");
- Bukkit.getPluginManager().enablePlugin(DiscordPlugin.plugin);
- if (!(sender instanceof DiscordSenderBase)) //Sending to Discord errors
- sender.sendMessage("§bReset finished!");
- });
- }
-
- @Command2.Subcommand(helpText = {
- "Version command",
- "Prints the plugin version"
- })
- public void version(CommandSender sender) {
- sender.sendMessage(VersionCommand.getVersion());
- }
-
- @Command2.Subcommand(helpText = {
- "Invite",
- "Shows an invite link to the server"
- })
- public void invite(CommandSender sender) {
- if (checkSafeMode(sender)) return;
- String invi = DiscordPlugin.plugin.inviteLink().get();
- if (invi.length() > 0) {
- sender.sendMessage("§bInvite link: " + invi);
- return;
- }
- DiscordPlugin.mainServer.getInvites().limitRequest(1)
- .switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("§cNo invites found for the server.")))
- .subscribe(inv -> {
- sender.sendMessage("§bInvite link: https://discord.gg/" + inv.getCode());
- }, e -> sender.sendMessage("§cThe invite link is not set and the bot has no permission to get it."));
- }
-
- @Override
- public String[] getHelpText(Method method, Command2.Subcommand ann) {
- switch (method.getName()) {
- case "accept":
- return new String[]{ //
- "Accept Discord connection", //
- "Accept a pending connection between your Discord and Minecraft account.", //
- "To start the connection process, do §b/connect §r in the " + DPUtils.botmention() + " channel on Discord", //
- };
- case "decline":
- return new String[]{ //
- "Decline Discord connection", //
- "Decline a pending connection between your Discord and Minecraft account.", //
- "To start the connection process, do §b/connect §r in the " + DPUtils.botmention() + " channel on Discord", //
- };
- default:
- return super.getHelpText(method, ann);
- }
- }
-
- private boolean checkSafeMode(CommandSender sender) {
- if (DiscordPlugin.SafeMode) {
- sender.sendMessage("§cThe plugin isn't initialized. Check console for details.");
- return true;
- }
- return false;
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommandBase.java b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommandBase.java
new file mode 100755
index 0000000..5edbafe
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommandBase.java
@@ -0,0 +1,9 @@
+package buttondevteam.discordplugin.mccommands;
+
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.PlayerCommandBase;
+
+@CommandClass(modOnly = false, path = "discord")
+public abstract class DiscordMCCommandBase extends PlayerCommandBase {
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordEntity.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordEntity.java
new file mode 100755
index 0000000..6ce85f8
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordEntity.java
@@ -0,0 +1,300 @@
+package buttondevteam.discordplugin.playerfaker;
+
+import buttondevteam.discordplugin.DiscordSenderBase;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.*;
+import org.bukkit.block.PistonMoveReaction;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.util.*;
+
+@Getter
+@Setter
+@SuppressWarnings("deprecated")
+public abstract class DiscordEntity extends DiscordSenderBase implements Entity {
+ protected DiscordEntity(IUser user, IChannel channel, int entityId, UUID uuid) {
+ super(user, channel);
+ this.entityId = entityId;
+ uniqueId = uuid;
+ }
+
+ private HashMap metadata = new HashMap();
+
+ private Location location = new Location(Bukkit.getWorlds().get(0), 0, 0, 0);
+ private Vector velocity;
+ private final int entityId;
+ private EntityDamageEvent lastDamageCause;
+ private final Set scoreboardTags = new HashSet();
+ private final UUID uniqueId;
+
+ @Override
+ public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
+ metadata.put(metadataKey, newMetadataValue);
+ }
+
+ @Override
+ public List getMetadata(String metadataKey) {
+ return Arrays.asList(metadata.get(metadataKey)); // Who needs multiple data anyways
+ }
+
+ @Override
+ public boolean hasMetadata(String metadataKey) {
+ return metadata.containsKey(metadataKey);
+ }
+
+ @Override
+ public void removeMetadata(String metadataKey, Plugin owningPlugin) {
+ metadata.remove(metadataKey);
+ }
+
+ @Override
+ public Location getLocation(Location loc) {
+ if (loc != null) {
+ loc.setWorld(getWorld());
+ loc.setX(location.getX());
+ loc.setY(location.getY());
+ loc.setZ(location.getZ());
+ loc.setYaw(location.getYaw());
+ loc.setPitch(location.getPitch());
+ }
+
+ return loc;
+ }
+
+ @Override
+ public double getHeight() {
+ return 0;
+ }
+
+ @Override
+ public double getWidth() {
+ return 0;
+ }
+
+ @Override
+ public boolean isOnGround() {
+ return false;
+ }
+
+ @Override
+ public World getWorld() {
+ return location.getWorld();
+ }
+
+ @Override
+ public boolean teleport(Location location) {
+ this.location = location;
+ return true;
+ }
+
+ @Override
+ public boolean teleport(Location location, TeleportCause cause) {
+ this.location = location;
+ return true;
+ }
+
+ @Override
+ public boolean teleport(Entity destination) {
+ this.location = destination.getLocation();
+ return true;
+ }
+
+ @Override
+ public boolean teleport(Entity destination, TeleportCause cause) {
+ this.location = destination.getLocation();
+ return true;
+ }
+
+ @Override
+ public List getNearbyEntities(double x, double y, double z) {
+ return Arrays.asList();
+ }
+
+ @Override
+ public int getFireTicks() {
+ return 0;
+ }
+
+ @Override
+ public int getMaxFireTicks() {
+ return 0;
+ }
+
+ @Override
+ public void setFireTicks(int ticks) {
+ }
+
+ @Override
+ public void remove() {
+ }
+
+ @Override
+ public boolean isDead() { // Impossible to kill
+ return false;
+ }
+
+ @Override
+ public boolean isValid() {
+ return true;
+ }
+
+ @Override
+ public Server getServer() {
+ return Bukkit.getServer();
+ }
+
+ @Override
+ public Entity getPassenger() {
+ return null;
+ }
+
+ @Override
+ public boolean setPassenger(Entity passenger) {
+ return false;
+ }
+
+ @Override
+ public List getPassengers() {
+ return Arrays.asList();
+ }
+
+ @Override
+ public boolean addPassenger(Entity passenger) {
+ return false;
+ }
+
+ @Override
+ public boolean removePassenger(Entity passenger) { // Don't support passengers
+ return false;
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return true;
+ }
+
+ @Override
+ public boolean eject() {
+ return false;
+ }
+
+ @Override
+ public float getFallDistance() {
+ return 0;
+ }
+
+ @Override
+ public void setFallDistance(float distance) {
+ }
+
+ @Override
+ public int getTicksLived() {
+ return 1;
+ }
+
+ @Override
+ public void setTicksLived(int value) {
+ }
+
+ @Override
+ public void playEffect(EntityEffect type) {
+ }
+
+ @Override
+ public boolean isInsideVehicle() {
+ return false;
+ }
+
+ @Override
+ public boolean leaveVehicle() {
+ return false;
+ }
+
+ @Override
+ public Entity getVehicle() { // Don't support vehicles
+ return null;
+ }
+
+ @Override
+ public void setCustomNameVisible(boolean flag) {
+ }
+
+ @Override
+ public boolean isCustomNameVisible() {
+ return true;
+ }
+
+ @Override
+ public void setGlowing(boolean flag) {
+ }
+
+ @Override
+ public boolean isGlowing() {
+ return false;
+ }
+
+ @Override
+ public void setInvulnerable(boolean flag) {
+ }
+
+ @Override
+ public boolean isInvulnerable() {
+ return true;
+ }
+
+ @Override
+ public boolean isSilent() {
+ return true;
+ }
+
+ @Override
+ public void setSilent(boolean flag) {
+ }
+
+ @Override
+ public boolean hasGravity() {
+ return false;
+ }
+
+ @Override
+ public void setGravity(boolean gravity) {
+ }
+
+ @Override
+ public int getPortalCooldown() {
+ return 0;
+ }
+
+ @Override
+ public void setPortalCooldown(int cooldown) {
+ }
+
+ @Override
+ public boolean addScoreboardTag(String tag) {
+ return scoreboardTags.add(tag);
+ }
+
+ @Override
+ public boolean removeScoreboardTag(String tag) {
+ return scoreboardTags.remove(tag);
+ }
+
+ @Override
+ public PistonMoveReaction getPistonMoveReaction() {
+ return PistonMoveReaction.IGNORE;
+ }
+
+ @Override
+ public Entity.Spigot spigot() {
+ return new Entity.Spigot();
+ }
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordFakePlayer.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordFakePlayer.java
new file mode 100755
index 0000000..c5b2c5c
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordFakePlayer.java
@@ -0,0 +1,716 @@
+package buttondevteam.discordplugin.playerfaker;
+
+import buttondevteam.discordplugin.DiscordPlugin;
+import lombok.Getter;
+import lombok.experimental.Delegate;
+import org.bukkit.*;
+import org.bukkit.advancement.Advancement;
+import org.bukkit.advancement.AdvancementProgress;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.map.MapView;
+import org.bukkit.permissions.PermissibleBase;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scoreboard.Scoreboard;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.net.InetSocketAddress;
+import java.util.*;
+
+public class DiscordFakePlayer extends DiscordHumanEntity implements Player {
+ protected DiscordFakePlayer(IUser user, IChannel channel, int entityId, UUID uuid, String mcname) {
+ super(user, channel, entityId, uuid);
+ perm = new PermissibleBase(Bukkit.getOfflinePlayer(uuid));
+ name = mcname;
+ }
+
+ @Delegate
+ private PermissibleBase perm;
+
+ private @Getter String name;
+
+ @Override
+ public EntityType getType() {
+ return EntityType.PLAYER;
+ }
+
+ @Override
+ public String getCustomName() {
+ return user.getName();
+ }
+
+ @Override
+ public void setCustomName(String name) {
+ }
+
+ @Override
+ public boolean isConversing() {
+
+ return false;
+ }
+
+ @Override
+ public void acceptConversationInput(String input) {
+ }
+
+ @Override
+ public boolean beginConversation(Conversation conversation) {
+ return false;
+ }
+
+ @Override
+ public void abandonConversation(Conversation conversation) {
+ }
+
+ @Override
+ public void abandonConversation(Conversation conversation, ConversationAbandonedEvent details) {
+ }
+
+ @Override
+ public boolean isOnline() {
+ return true;// Let's pretend
+ }
+
+ @Override
+ public boolean isBanned() {
+ return false;
+ }
+
+ @Override
+ public boolean isWhitelisted() {
+ return true;
+ }
+
+ @Override
+ public void setWhitelisted(boolean value) {
+ }
+
+ @Override
+ public Player getPlayer() {
+ return this;
+ }
+
+ @Override
+ public long getFirstPlayed() {
+ return 0;
+ }
+
+ @Override
+ public long getLastPlayed() {
+ return 0;
+ }
+
+ @Override
+ public boolean hasPlayedBefore() {
+ return false;
+ }
+
+ @Override
+ public Map serialize() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public void sendPluginMessage(Plugin source, String channel, byte[] message) {
+ }
+
+ @Override
+ public Set getListeningPluginChannels() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public String getDisplayName() {
+ return user.getDisplayName(DiscordPlugin.mainServer);
+ }
+
+ @Override
+ public void setDisplayName(String name) {
+ }
+
+ @Override
+ public String getPlayerListName() {
+ return getName();
+ }
+
+ @Override
+ public void setPlayerListName(String name) {
+ }
+
+ @Override
+ public void setCompassTarget(Location loc) {
+ }
+
+ @Override
+ public Location getCompassTarget() {
+ return new Location(Bukkit.getWorlds().get(0), 0, 0, 0);
+ }
+
+ @Override
+ public InetSocketAddress getAddress() {
+ return null;
+ }
+
+ @Override
+ public void sendRawMessage(String message) {
+ sendMessage(message);
+ }
+
+ @Override
+ public void kickPlayer(String message) {
+ }
+
+ @Override
+ public void chat(String msg) {
+ Bukkit.getPluginManager()
+ .callEvent(new AsyncPlayerChatEvent(true, this, msg, new HashSet<>(Bukkit.getOnlinePlayers())));
+ }
+
+ @Override
+ public boolean performCommand(String command) {
+ return Bukkit.getServer().dispatchCommand(this, command);
+ }
+
+ @Override
+ public boolean isSneaking() {
+ return false;
+ }
+
+ @Override
+ public void setSneaking(boolean sneak) {
+ }
+
+ @Override
+ public boolean isSprinting() {
+ return false;
+ }
+
+ @Override
+ public void setSprinting(boolean sprinting) {
+ }
+
+ @Override
+ public void saveData() {
+ }
+
+ @Override
+ public void loadData() {
+ }
+
+ @Override
+ public void setSleepingIgnored(boolean isSleeping) {
+ }
+
+ @Override
+ public boolean isSleepingIgnored() {
+ return false;
+ }
+
+ @Override
+ public void playNote(Location loc, byte instrument, byte note) {
+ }
+
+ @Override
+ public void playNote(Location loc, Instrument instrument, Note note) {
+ }
+
+ @Override
+ public void playSound(Location location, Sound sound, float volume, float pitch) {
+ }
+
+ @Override
+ public void playSound(Location location, String sound, float volume, float pitch) {
+ }
+
+ @Override
+ public void playSound(Location location, Sound sound, SoundCategory category, float volume, float pitch) {
+ }
+
+ @Override
+ public void playSound(Location location, String sound, SoundCategory category, float volume, float pitch) {
+ }
+
+ @Override
+ public void stopSound(Sound sound) {
+ }
+
+ @Override
+ public void stopSound(String sound) {
+ }
+
+ @Override
+ public void stopSound(Sound sound, SoundCategory category) {
+ }
+
+ @Override
+ public void stopSound(String sound, SoundCategory category) {
+ }
+
+ @Override
+ public void playEffect(Location loc, Effect effect, int data) {
+ }
+
+ @Override
+ public void playEffect(Location loc, Effect effect, T data) {
+ }
+
+ @Override
+ public void sendBlockChange(Location loc, Material material, byte data) {
+ }
+
+ @Override
+ public boolean sendChunkChange(Location loc, int sx, int sy, int sz, byte[] data) {
+ return false;
+ }
+
+ @Override
+ public void sendBlockChange(Location loc, int material, byte data) {
+ }
+
+ @Override
+ public void sendSignChange(Location loc, String[] lines) throws IllegalArgumentException {
+ }
+
+ @Override
+ public void sendMap(MapView map) {
+ }
+
+ @Override
+ public void updateInventory() {
+ }
+
+ @Override
+ public void awardAchievement(@SuppressWarnings("deprecation") Achievement achievement) {
+ }
+
+ @Override
+ public void removeAchievement(@SuppressWarnings("deprecation") Achievement achievement) {
+ }
+
+ @Override
+ public boolean hasAchievement(@SuppressWarnings("deprecation") Achievement achievement) {
+ return false;
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic) throws IllegalArgumentException {
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic) throws IllegalArgumentException {
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void setStatistic(Statistic statistic, int newValue) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public int getStatistic(Statistic statistic) throws IllegalArgumentException {
+
+ return 0;
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
+
+ return 0;
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void setStatistic(Statistic statistic, Material material, int newValue) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
+
+ return 0;
+ }
+
+ @Override
+ public void incrementStatistic(Statistic statistic, EntityType entityType, int amount)
+ throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void decrementStatistic(Statistic statistic, EntityType entityType, int amount) {
+
+ }
+
+ @Override
+ public void setStatistic(Statistic statistic, EntityType entityType, int newValue) {
+
+ }
+
+ @Override
+ public void setPlayerTime(long time, boolean relative) {
+
+ }
+
+ @Override
+ public long getPlayerTime() {
+
+ return 0;
+ }
+
+ @Override
+ public long getPlayerTimeOffset() {
+
+ return 0;
+ }
+
+ @Override
+ public boolean isPlayerTimeRelative() {
+
+ return false;
+ }
+
+ @Override
+ public void resetPlayerTime() {
+
+ }
+
+ @Override
+ public void setPlayerWeather(WeatherType type) {
+
+ }
+
+ @Override
+ public WeatherType getPlayerWeather() {
+
+ return null;
+ }
+
+ @Override
+ public void resetPlayerWeather() {
+
+ }
+
+ @Override
+ public void giveExp(int amount) {
+
+ }
+
+ @Override
+ public void giveExpLevels(int amount) {
+
+ }
+
+ @Override
+ public float getExp() {
+
+ return 0;
+ }
+
+ @Override
+ public void setExp(float exp) {
+
+ }
+
+ @Override
+ public int getLevel() {
+
+ return 0;
+ }
+
+ @Override
+ public void setLevel(int level) {
+
+ }
+
+ @Override
+ public int getTotalExperience() {
+
+ return 0;
+ }
+
+ @Override
+ public void setTotalExperience(int exp) {
+
+ }
+
+ @Override
+ public float getExhaustion() {
+
+ return 0;
+ }
+
+ @Override
+ public void setExhaustion(float value) {
+
+ }
+
+ @Override
+ public float getSaturation() {
+
+ return 0;
+ }
+
+ @Override
+ public void setSaturation(float value) {
+
+ }
+
+ @Override
+ public int getFoodLevel() {
+
+ return 0;
+ }
+
+ @Override
+ public void setFoodLevel(int value) {
+
+ }
+
+ @Override
+ public Location getBedSpawnLocation() {
+ return null;
+ }
+
+ @Override
+ public void setBedSpawnLocation(Location location) {
+ }
+
+ @Override
+ public void setBedSpawnLocation(Location location, boolean force) {
+ }
+
+ @Override
+ public boolean getAllowFlight() {
+ return false;
+ }
+
+ @Override
+ public void setAllowFlight(boolean flight) {
+ }
+
+ @Override
+ public void hidePlayer(Player player) {
+ }
+
+ @Override
+ public void showPlayer(Player player) {
+ }
+
+ @Override
+ public boolean canSee(Player player) { // Nobody can see them
+ return false;
+ }
+
+ @Override
+ public boolean isFlying() {
+ return false;
+ }
+
+ @Override
+ public void setFlying(boolean value) {
+ }
+
+ @Override
+ public void setFlySpeed(float value) throws IllegalArgumentException {
+ }
+
+ @Override
+ public void setWalkSpeed(float value) throws IllegalArgumentException {
+ }
+
+ @Override
+ public float getFlySpeed() {
+ return 0;
+ }
+
+ @Override
+ public float getWalkSpeed() {
+ return 0;
+ }
+
+ @Override
+ public void setTexturePack(String url) {
+ }
+
+ @Override
+ public void setResourcePack(String url) {
+ }
+
+ @Override
+ public void setResourcePack(String url, byte[] hash) {
+ }
+
+ @Override
+ public Scoreboard getScoreboard() {
+ return null;
+ }
+
+ @Override
+ public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException {
+ }
+
+ @Override
+ public boolean isHealthScaled() {
+ return false;
+ }
+
+ @Override
+ public void setHealthScaled(boolean scale) {
+ }
+
+ @Override
+ public void setHealthScale(double scale) throws IllegalArgumentException {
+ }
+
+ @Override
+ public double getHealthScale() {
+ return 1;
+ }
+
+ @Override
+ public Entity getSpectatorTarget() {
+ return null;
+ }
+
+ @Override
+ public void setSpectatorTarget(Entity entity) {
+ }
+
+ @Override
+ public void sendTitle(String title, String subtitle) {
+ }
+
+ @Override
+ public void sendTitle(String title, String subtitle, int fadeIn, int stay, int fadeOut) {
+ }
+
+ @Override
+ public void resetTitle() {
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count) {
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count, T data) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count, T data) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY,
+ double offsetZ) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX,
+ double offsetY, double offsetZ) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY,
+ double offsetZ, T data) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX,
+ double offsetY, double offsetZ, T data) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY,
+ double offsetZ, double extra) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX,
+ double offsetY, double offsetZ, double extra) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY,
+ double offsetZ, double extra, T data) {
+
+ }
+
+ @Override
+ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX,
+ double offsetY, double offsetZ, double extra, T data) {
+
+ }
+
+ @Override
+ public AdvancementProgress getAdvancementProgress(Advancement advancement) { // TODO: Test
+ return null;
+ }
+
+ @Override
+ public String getLocale() {
+
+ return null;
+ }
+
+ @Override
+ public Player.Spigot spigot() {
+ return new Player.Spigot();
+ }
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordHumanEntity.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordHumanEntity.java
new file mode 100755
index 0000000..c1522f1
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordHumanEntity.java
@@ -0,0 +1,167 @@
+package buttondevteam.discordplugin.playerfaker;
+
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Villager;
+import org.bukkit.inventory.*;
+import org.bukkit.inventory.InventoryView.Property;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.util.UUID;
+
+public abstract class DiscordHumanEntity extends DiscordLivingEntity implements HumanEntity {
+ protected DiscordHumanEntity(IUser user, IChannel channel, int entityId, UUID uuid) {
+ super(user, channel, entityId, uuid);
+ }
+
+ private PlayerInventory inv = new DiscordPlayerInventory(this);
+
+ @Override
+ public PlayerInventory getInventory() {
+ return inv;
+ }
+
+ private Inventory enderchest = new DiscordInventory(this);
+
+ @Override
+ public Inventory getEnderChest() {
+ return enderchest;
+ }
+
+ @Override
+ public MainHand getMainHand() {
+ return MainHand.RIGHT;
+ }
+
+ @Override
+ public boolean setWindowProperty(Property prop, int value) {
+ return false;
+ }
+
+ @Override
+ public InventoryView getOpenInventory() { // TODO: Test
+ return null;
+ }
+
+ @Override
+ public InventoryView openInventory(Inventory inventory) {
+ return null;
+ }
+
+ @Override
+ public InventoryView openWorkbench(Location location, boolean force) {
+ return null;
+ }
+
+ @Override
+ public InventoryView openEnchanting(Location location, boolean force) {
+ return null;
+ }
+
+ @Override
+ public void openInventory(InventoryView inventory) {
+ }
+
+ @Override
+ public InventoryView openMerchant(Villager trader, boolean force) {
+ return null;
+ }
+
+ @Override
+ public InventoryView openMerchant(Merchant merchant, boolean force) {
+ return null;
+ }
+
+ @Override
+ public void closeInventory() {
+ }
+
+ @Override
+ public ItemStack getItemInHand() { // TODO: Test all ItemStack methods
+ return null;
+ }
+
+ @Override
+ public void setItemInHand(ItemStack item) {
+ }
+
+ @Override
+ public ItemStack getItemOnCursor() {
+ return null;
+ }
+
+ @Override
+ public void setItemOnCursor(ItemStack item) {
+ }
+
+ @Override
+ public boolean hasCooldown(Material material) {
+ return false;
+ }
+
+ @Override
+ public int getCooldown(Material material) {
+ return 0;
+ }
+
+ @Override
+ public void setCooldown(Material material, int ticks) {
+ }
+
+ @Override
+ public boolean isSleeping() {
+ return false;
+ }
+
+ @Override
+ public int getSleepTicks() {
+ return 0;
+ }
+
+ @Override
+ public GameMode getGameMode() {
+ return GameMode.SPECTATOR;
+ }
+
+ @Override
+ public void setGameMode(GameMode mode) {
+ }
+
+ @Override
+ public boolean isBlocking() {
+ return false;
+ }
+
+ @Override
+ public boolean isHandRaised() {
+ return false;
+ }
+
+ @Override
+ public int getExpToLevel() {
+ return 0;
+ }
+
+ @Override
+ public Entity getShoulderEntityLeft() {
+ return null;
+ }
+
+ @Override
+ public void setShoulderEntityLeft(Entity entity) {
+ }
+
+ @Override
+ public Entity getShoulderEntityRight() {
+ return null;
+ }
+
+ @Override
+ public void setShoulderEntityRight(Entity entity) {
+ }
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java
old mode 100644
new mode 100755
index ab22f52..a97f715
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordInventory.java
@@ -1,110 +1,110 @@
package buttondevteam.discordplugin.playerfaker;
-import lombok.Getter;
-import lombok.Setter;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.stream.Collectors;
import java.util.stream.IntStream;
public class DiscordInventory implements Inventory {
- private ItemStack[] items = new ItemStack[27];
- private List itemStacks = Arrays.asList(items);
- @Getter
- @Setter
- public int maxStackSize;
- private static ItemStack emptyStack = new ItemStack(Material.AIR, 0);
+ public DiscordInventory(DiscordHumanEntity holder) {
+ this.holder = holder;
+ }
@Override
public int getSize() {
- return items.length;
+ return 0;
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return 0;
+ }
+
+ @Override
+ public void setMaxStackSize(int size) {
}
@Override
public String getName() {
- return "Discord inventory";
+ return "Player inventory";
}
@Override
public ItemStack getItem(int index) {
- if (index >= items.length)
- return emptyStack;
- else
- return items[index];
+ return null;
}
@Override
- public void setItem(int index, ItemStack item) {
- if (index < items.length)
- items[index] = item;
- }
-
- @Override
- public HashMap addItem(ItemStack... items) throws IllegalArgumentException {
- return IntStream.range(0, items.length).collect(HashMap::new, (map, i) -> map.put(i, items[i]), HashMap::putAll); //Pretend that we can't add anything
+ public HashMap addItem(ItemStack... items) throws IllegalArgumentException { // Can't add anything
+ return new HashMap<>(
+ IntStream.range(0, items.length).mapToObj(i -> i).collect(Collectors.toMap(i -> i, i -> items[i])));
}
@Override
public HashMap removeItem(ItemStack... items) throws IllegalArgumentException {
- return IntStream.range(0, items.length).collect(HashMap::new, (map, i) -> map.put(i, items[i]), HashMap::putAll); //Pretend that we can't add anything
+ return new HashMap<>(
+ IntStream.range(0, items.length).mapToObj(i -> i).collect(Collectors.toMap(i -> i, i -> items[i])));
}
@Override
public ItemStack[] getContents() {
- return items;
+ return new ItemStack[0];
}
@Override
public void setContents(ItemStack[] items) throws IllegalArgumentException {
- this.items = items;
+ if (items.length > 0)
+ throw new IllegalArgumentException("This inventory does not support items");
}
@Override
public ItemStack[] getStorageContents() {
- return items;
+ return new ItemStack[0];
}
@Override
public void setStorageContents(ItemStack[] items) throws IllegalArgumentException {
- this.items = items;
+ if (items.length > 0)
+ throw new IllegalArgumentException("This inventory does not support items");
}
- @SuppressWarnings("deprecation")
@Override
public boolean contains(int materialId) {
- return itemStacks.stream().anyMatch(is -> is.getType().getId() == materialId);
+ return false;
}
@Override
public boolean contains(Material material) throws IllegalArgumentException {
- return itemStacks.stream().anyMatch(is -> is.getType() == material);
+ return false;
}
@Override
public boolean contains(ItemStack item) {
- return itemStacks.stream().anyMatch(is -> is.getType() == item.getType() && is.getAmount() == item.getAmount());
+ return false;
}
- @SuppressWarnings("deprecation")
@Override
public boolean contains(int materialId, int amount) {
- return itemStacks.stream().anyMatch(is -> is.getType().getId() == materialId && is.getAmount() == amount);
+ return false;
}
@Override
public boolean contains(Material material, int amount) throws IllegalArgumentException {
- return itemStacks.stream().anyMatch(is -> is.getType() == material && is.getAmount() == amount);
+ return false;
}
@Override
- public boolean contains(ItemStack item, int amount) { //Not correct implementation but whatever
- return itemStacks.stream().anyMatch(is -> is.getType() == item.getType() && is.getAmount() == amount);
+ public boolean contains(ItemStack item, int amount) {
+ return false;
}
@Override
@@ -161,48 +161,52 @@ public class DiscordInventory implements Inventory {
@Override
public void clear(int index) {
- if (index < items.length)
- items[index] = null;
}
@Override
public void clear() {
- Arrays.fill(items, null);
}
@Override
public List getViewers() {
- return Collections.emptyList();
+ return new ArrayList<>(0);
}
@Override
public String getTitle() {
- return "Discord inventory";
+ return "Player inventory";
}
@Override
public InventoryType getType() {
- return InventoryType.CHEST;
+ return InventoryType.PLAYER;
}
- @Override
- public InventoryHolder getHolder() {
- return null;
- }
+ private ListIterator iterator = new ArrayList(0).listIterator();
- @SuppressWarnings("NullableProblems")
@Override
public ListIterator iterator() {
- return itemStacks.listIterator();
+ return iterator;
}
@Override
public ListIterator iterator(int index) {
- return itemStacks.listIterator(index);
+ return iterator;
}
@Override
public Location getLocation() {
- return null;
+ return holder.getLocation();
+ }
+
+ @Override
+ public void setItem(int index, ItemStack item) {
+ }
+
+ private HumanEntity holder;
+
+ @Override
+ public HumanEntity getHolder() {
+ return holder;
}
}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordLivingEntity.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordLivingEntity.java
new file mode 100755
index 0000000..f261de4
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordLivingEntity.java
@@ -0,0 +1,297 @@
+package buttondevteam.discordplugin.playerfaker;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+import sx.blah.discord.handle.obj.IChannel;
+import sx.blah.discord.handle.obj.IUser;
+
+import java.util.*;
+
+public abstract class DiscordLivingEntity extends DiscordEntity implements LivingEntity {
+
+ protected DiscordLivingEntity(IUser user, IChannel channel, int entityId, UUID uuid) {
+ super(user, channel, entityId, uuid);
+ }
+
+ private @Getter EntityEquipment equipment = new DiscordEntityEquipment(this);
+
+ @Getter
+ @Setter
+ private static class DiscordEntityEquipment implements EntityEquipment {
+
+ private float leggingsDropChance;
+ private ItemStack leggings;
+ private float itemInOffHandDropChance;
+ private ItemStack itemInOffHand;
+ private float itemInMainHandDropChance;
+ private ItemStack itemInMainHand;
+ private float itemInHandDropChance;
+ private ItemStack itemInHand;
+ private float helmetDropChance;
+ private ItemStack helmet;
+ private float chestplateDropChance;
+ private ItemStack chestplate;
+ private float bootsDropChance;
+ private ItemStack boots;
+ private ItemStack[] armorContents = new ItemStack[0]; // TODO
+ private final Entity holder;
+
+ public DiscordEntityEquipment(Entity holder) {
+ this.holder = holder;
+ }
+
+ @Override
+ public void clear() {
+ armorContents = new ItemStack[0];
+ }
+ }
+
+ @Override
+ public AttributeInstance getAttribute(Attribute attribute) { // We don't support any attributes
+ return null;
+ }
+
+ @Override
+ public void damage(double amount) {
+ }
+
+ @Override
+ public void damage(double amount, Entity source) {
+ }
+
+ @Override
+ public double getHealth() {
+ return getMaxHealth();
+ }
+
+ @Override
+ public void setHealth(double health) {
+ }
+
+ @Override
+ public double getMaxHealth() {
+ return 100;
+ }
+
+ @Override
+ public void setMaxHealth(double health) {
+ }
+
+ @Override
+ public void resetMaxHealth() {
+ }
+
+ @Override
+ public T launchProjectile(Class projectile) {
+ return null;
+ }
+
+ @Override
+ public T launchProjectile(Class projectile, Vector velocity) {
+ return null;
+ }
+
+ @Override
+ public double getEyeHeight() {
+ return 0;
+ }
+
+ @Override
+ public double getEyeHeight(boolean ignoreSneaking) {
+ return 0;
+ }
+
+ @Override
+ public Location getEyeLocation() {
+ return getLocation();
+ }
+
+ @Override
+ public List getLineOfSight(Set transparent, int maxDistance) {
+ return Arrays.asList();
+ }
+
+ @Override
+ public Block getTargetBlock(HashSet transparent, int maxDistance) {
+ return null;
+ }
+
+ @Override
+ public Block getTargetBlock(Set transparent, int maxDistance) {
+ return null;
+ }
+
+ @Override
+ public List getLastTwoTargetBlocks(HashSet transparent, int maxDistance) {
+ return Arrays.asList();
+ }
+
+ @Override
+ public List getLastTwoTargetBlocks(Set transparent, int maxDistance) {
+ return Arrays.asList();
+ }
+
+ @Override
+ public int getRemainingAir() {
+ return 100;
+ }
+
+ @Override
+ public void setRemainingAir(int ticks) {
+ }
+
+ @Override
+ public int getMaximumAir() {
+ return 100;
+ }
+
+ @Override
+ public void setMaximumAir(int ticks) {
+ }
+
+ @Override
+ public int getMaximumNoDamageTicks() {
+ return 100;
+ }
+
+ @Override
+ public void setMaximumNoDamageTicks(int ticks) {
+ }
+
+ @Override
+ public double getLastDamage() {
+ return 0;
+ }
+
+ @Override
+ public void setLastDamage(double damage) {
+ }
+
+ @Override
+ public int getNoDamageTicks() {
+ return 100;
+ }
+
+ @Override
+ public void setNoDamageTicks(int ticks) {
+ }
+
+ @Override
+ public Player getKiller() {
+ return null;
+ }
+
+ @Override
+ public boolean addPotionEffect(PotionEffect effect) {
+ return false;
+ }
+
+ @Override
+ public boolean addPotionEffect(PotionEffect effect, boolean force) {
+ return false;
+ }
+
+ @Override
+ public boolean addPotionEffects(Collection effects) {
+ return false;
+ }
+
+ @Override
+ public boolean hasPotionEffect(PotionEffectType type) {
+ return false;
+ }
+
+ @Override
+ public PotionEffect getPotionEffect(PotionEffectType type) {
+ return null;
+ }
+
+ @Override
+ public void removePotionEffect(PotionEffectType type) {
+ }
+
+ @Override
+ public Collection getActivePotionEffects() {
+ return Arrays.asList();
+ }
+
+ @Override
+ public boolean hasLineOfSight(Entity other) {
+ return false;
+ }
+
+ @Override
+ public boolean getRemoveWhenFarAway() {
+ return false;
+ }
+
+ @Override
+ public void setRemoveWhenFarAway(boolean remove) {
+ }
+
+ @Override
+ public void setCanPickupItems(boolean pickup) {
+ }
+
+ @Override
+ public boolean getCanPickupItems() {
+ return false;
+ }
+
+ @Override
+ public boolean isLeashed() {
+ return false;
+ }
+
+ @Override
+ public Entity getLeashHolder() throws IllegalStateException {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean setLeashHolder(Entity holder) {
+ return false;
+ }
+
+ @Override
+ public boolean isGliding() {
+ return false;
+ }
+
+ @Override
+ public void setGliding(boolean gliding) {
+ }
+
+ @Override
+ public void setAI(boolean ai) {
+ }
+
+ @Override
+ public boolean hasAI() {
+ return false;
+ }
+
+ @Override
+ public void setCollidable(boolean collidable) {
+ }
+
+ @Override
+ public boolean isCollidable() {
+ return false;
+ }
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordPlayerInventory.java b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordPlayerInventory.java
new file mode 100755
index 0000000..447cbcd
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/DiscordPlayerInventory.java
@@ -0,0 +1,105 @@
+package buttondevteam.discordplugin.playerfaker;
+
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+public class DiscordPlayerInventory extends DiscordInventory implements PlayerInventory {
+ public DiscordPlayerInventory(DiscordHumanEntity holder) {
+ super(holder);
+ }
+
+ @Override
+ public ItemStack[] getArmorContents() {
+ return new ItemStack[0];
+ }
+
+ @Override
+ public ItemStack[] getExtraContents() {
+ return new ItemStack[0];
+ }
+
+ @Override
+ public ItemStack getHelmet() {
+ return null;
+ }
+
+ @Override
+ public ItemStack getChestplate() {
+ return null;
+ }
+
+ @Override
+ public ItemStack getLeggings() {
+ return null;
+ }
+
+ @Override
+ public ItemStack getBoots() {
+ return null;
+ }
+
+ @Override
+ public void setArmorContents(ItemStack[] items) {
+ }
+
+ @Override
+ public void setExtraContents(ItemStack[] items) {
+ }
+
+ @Override
+ public void setHelmet(ItemStack helmet) {
+ }
+
+ @Override
+ public void setChestplate(ItemStack chestplate) {
+ }
+
+ @Override
+ public void setLeggings(ItemStack leggings) {
+ }
+
+ @Override
+ public void setBoots(ItemStack boots) {
+ }
+
+ @Override
+ public ItemStack getItemInMainHand() {
+ return null;
+ }
+
+ @Override
+ public void setItemInMainHand(ItemStack item) {
+ }
+
+ @Override
+ public ItemStack getItemInOffHand() {
+ return null;
+ }
+
+ @Override
+ public void setItemInOffHand(ItemStack item) {
+ }
+
+ @Override
+ public ItemStack getItemInHand() {
+ return null;
+ }
+
+ @Override
+ public void setItemInHand(ItemStack stack) {
+ }
+
+ @Override
+ public int getHeldItemSlot() {
+ return 0;
+ }
+
+ @Override
+ public void setHeldItemSlot(int slot) {
+ }
+
+ @Override
+ public int clear(int id, int data) {
+ return 0;
+ }
+}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/VCMDWrapper.java b/src/main/java/buttondevteam/discordplugin/playerfaker/VCMDWrapper.java
deleted file mode 100644
index 4bcf5eb..0000000
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/VCMDWrapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-@RequiredArgsConstructor
-public class VCMDWrapper {
- @Getter //Needed to mock the player
- private final Object listener;
-
- /**
- * This constructor will only send raw vanilla messages to the sender in plain text.
- *
- * @param player The Discord sender player (the wrapper)
- */
- public static > Object createListener(T player) {
- return createListener(player, null);
- }
-
- /**
- * This constructor will send both raw vanilla messages to the sender in plain text and forward the raw message to the provided player.
- *
- * @param player The Discord sender player (the wrapper)
- * @param bukkitplayer The Bukkit player to send the raw message to
- */
- public static > Object createListener(T player, Player bukkitplayer) {
- String mcpackage = Bukkit.getServer().getClass().getPackage().getName();
- if (mcpackage.contains("1_12"))
- return bukkitplayer == null ? new VanillaCommandListener<>(player) : new VanillaCommandListener<>(player, bukkitplayer);
- else if (mcpackage.contains("1_14"))
- return bukkitplayer == null ? new VanillaCommandListener14<>(player) : new VanillaCommandListener14<>(player, bukkitplayer);
- else
- return null;
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
index c12a308..29f3a13 100755
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
@@ -87,7 +87,7 @@ public class VanillaCommandListener>
if (!vcmd.testPermission(sender))
return true;
- ICommandListener icommandlistener = (ICommandListener) sender.getVanillaCmdListener().getListener();
+ ICommandListener icommandlistener = sender.getVanillaCmdListener();
String[] args = cmdstr.split(" ");
args = Arrays.copyOfRange(args, 1, args.length);
try {
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java
deleted file mode 100644
index fbaf958..0000000
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package buttondevteam.discordplugin.playerfaker;
-
-import buttondevteam.discordplugin.DiscordSenderBase;
-import buttondevteam.discordplugin.IMCPlayer;
-import lombok.Getter;
-import lombok.val;
-import net.minecraft.server.v1_14_R1.*;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_14_R1.command.ProxiedNativeCommandSender;
-import org.bukkit.craftbukkit.v1_14_R1.command.VanillaCommandWrapper;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
-
-public class VanillaCommandListener14> implements ICommandListener {
- private @Getter T player;
- private Player bukkitplayer;
-
- /**
- * This constructor will only send raw vanilla messages to the sender in plain text.
- *
- * @param player The Discord sender player (the wrapper)
- */
- public VanillaCommandListener14(T player) {
- this.player = player;
- this.bukkitplayer = null;
- }
-
- /**
- * This constructor will send both raw vanilla messages to the sender in plain text and forward the raw message to the provided player.
- *
- * @param player The Discord sender player (the wrapper)
- * @param bukkitplayer The Bukkit player to send the raw message to
- */
- public VanillaCommandListener14(T player, Player bukkitplayer) {
- this.player = player;
- this.bukkitplayer = bukkitplayer;
- if (!(bukkitplayer instanceof CraftPlayer))
- throw new ClassCastException("bukkitplayer must be a Bukkit player!");
- }
-
- @Override
- public void sendMessage(IChatBaseComponent arg0) {
- player.sendMessage(arg0.getString());
- if (bukkitplayer != null)
- ((CraftPlayer) bukkitplayer).getHandle().sendMessage(arg0);
- }
-
- @Override
- public boolean shouldSendSuccess() {
- return true;
- }
-
- @Override
- public boolean shouldSendFailure() {
- return true;
- }
-
- @Override
- public boolean shouldBroadcastCommands() {
- return true; //Broadcast to in-game admins
- }
-
- @Override
- public CommandSender getBukkitSender(CommandListenerWrapper commandListenerWrapper) {
- return player;
- }
-
- public static boolean runBukkitOrVanillaCommand(DiscordSenderBase dsender, String cmdstr) {
- val cmd = ((CraftServer) Bukkit.getServer()).getCommandMap().getCommand(cmdstr.split(" ")[0].toLowerCase());
- if (!(dsender instanceof Player) || !(cmd instanceof VanillaCommandWrapper))
- return Bukkit.dispatchCommand(dsender, cmdstr); // Unconnected users are treated well in vanilla cmds
-
- if (!(dsender instanceof IMCPlayer))
- throw new ClassCastException(
- "dsender needs to implement IMCPlayer to use vanilla commands as it implements Player.");
-
- IMCPlayer sender = (IMCPlayer) dsender; // Don't use val on recursive interfaces :P
-
- val vcmd = (VanillaCommandWrapper) cmd;
- if (!vcmd.testPermission(sender))
- return true;
-
- val world = ((CraftWorld) Bukkit.getWorlds().get(0)).getHandle();
- ICommandListener icommandlistener = (ICommandListener) sender.getVanillaCmdListener().getListener();
- val wrapper = new CommandListenerWrapper(icommandlistener, new Vec3D(0, 0, 0),
- new Vec2F(0, 0), world, 0, sender.getName(),
- new ChatComponentText(sender.getName()), world.getMinecraftServer(), null);
- val pncs = new ProxiedNativeCommandSender(wrapper, sender, sender);
- String[] args = cmdstr.split(" ");
- args = Arrays.copyOfRange(args, 1, args.length);
- try {
- return vcmd.execute(pncs, cmd.getLabel(), args);
- } catch (CommandException commandexception) {
- // Taken from CommandHandler
- ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.a());
- chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
- icommandlistener.sendMessage(chatmessage);
- }
- return true;
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/perm/LPInjector.java b/src/main/java/buttondevteam/discordplugin/playerfaker/perm/LPInjector.java
deleted file mode 100644
index 802accf..0000000
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/perm/LPInjector.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package buttondevteam.discordplugin.playerfaker.perm;
-
-import buttondevteam.core.MainPlugin;
-import buttondevteam.discordplugin.DiscordConnectedPlayer;
-import buttondevteam.discordplugin.mcchat.MCChatUtils;
-import buttondevteam.lib.TBMCCoreAPI;
-import me.lucko.luckperms.bukkit.LPBukkitBootstrap;
-import me.lucko.luckperms.bukkit.LPBukkitPlugin;
-import me.lucko.luckperms.bukkit.inject.dummy.DummyPermissibleBase;
-import me.lucko.luckperms.bukkit.inject.permissible.LPPermissible;
-import me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener;
-import me.lucko.luckperms.common.config.ConfigKeys;
-import me.lucko.luckperms.common.locale.message.Message;
-import me.lucko.luckperms.common.model.User;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.permissions.PermissibleBase;
-import org.bukkit.permissions.PermissionAttachment;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public final class LPInjector implements Listener { //Disable login event for LuckPerms
- private LPBukkitPlugin plugin;
- private BukkitConnectionListener connectionListener;
- private Set deniedLogin;
- private Field detectedCraftBukkitOfflineMode;
- private Method printCraftBukkitOfflineModeError;
- private Field PERMISSIBLE_BASE_ATTACHMENTS_FIELD;
- private Method convertAndAddAttachments;
- private Method getActive;
- private Method setOldPermissible;
- private Method getOldPermissible;
-
- public LPInjector(MainPlugin mp) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException {
- LPBukkitBootstrap bs = (LPBukkitBootstrap) Bukkit.getPluginManager().getPlugin("LuckPerms");
- Field field = LPBukkitBootstrap.class.getDeclaredField("plugin");
- field.setAccessible(true);
- plugin = (LPBukkitPlugin) field.get(bs);
- MCChatUtils.addStaticExcludedPlugin(PlayerLoginEvent.class, "LuckPerms");
- MCChatUtils.addStaticExcludedPlugin(PlayerQuitEvent.class, "LuckPerms");
-
- field = LPBukkitPlugin.class.getDeclaredField("connectionListener");
- field.setAccessible(true);
- connectionListener = (BukkitConnectionListener) field.get(plugin);
- field = connectionListener.getClass().getDeclaredField("deniedLogin");
- field.setAccessible(true);
- //noinspection unchecked
- deniedLogin = (Set) field.get(connectionListener);
- field = connectionListener.getClass().getDeclaredField("detectedCraftBukkitOfflineMode");
- field.setAccessible(true);
- detectedCraftBukkitOfflineMode = field;
- printCraftBukkitOfflineModeError = connectionListener.getClass().getDeclaredMethod("printCraftBukkitOfflineModeError");
- printCraftBukkitOfflineModeError.setAccessible(true);
-
- //PERMISSIBLE_FIELD = DiscordFakePlayer.class.getDeclaredField("perm");
- //PERMISSIBLE_FIELD.setAccessible(true); //Hacking my own plugin, while we're at it
- PERMISSIBLE_BASE_ATTACHMENTS_FIELD = PermissibleBase.class.getDeclaredField("attachments");
- PERMISSIBLE_BASE_ATTACHMENTS_FIELD.setAccessible(true);
-
- convertAndAddAttachments = LPPermissible.class.getDeclaredMethod("convertAndAddAttachments", Collection.class);
- convertAndAddAttachments.setAccessible(true);
- getActive = LPPermissible.class.getDeclaredMethod("getActive");
- getActive.setAccessible(true);
- setOldPermissible = LPPermissible.class.getDeclaredMethod("setOldPermissible", PermissibleBase.class);
- setOldPermissible.setAccessible(true);
- getOldPermissible = LPPermissible.class.getDeclaredMethod("getOldPermissible");
- getOldPermissible.setAccessible(true);
-
- TBMCCoreAPI.RegisterEventsForExceptions(this, mp);
- }
-
-
- //Code copied from LuckPerms - me.lucko.luckperms.bukkit.listeners.BukkitConnectionListener
- @EventHandler(priority = EventPriority.LOWEST)
- public void onPlayerLogin(PlayerLoginEvent e) {
- /* Called when the player starts logging into the server.
- At this point, the users data should be present and loaded. */
-
- if (!(e.getPlayer() instanceof DiscordConnectedPlayer))
- return; //Normal players must be handled by the plugin
-
- final DiscordConnectedPlayer player = (DiscordConnectedPlayer) e.getPlayer();
-
- if (plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
- plugin.getLogger().info("Processing login for " + player.getUniqueId() + " - " + player.getName());
- }
-
- final User user = plugin.getUserManager().getIfLoaded(player.getUniqueId());
-
- /* User instance is null for whatever reason. Could be that it was unloaded between asyncpre and now. */
- if (user == null) {
- deniedLogin.add(player.getUniqueId());
-
- if (!connectionListener.getUniqueConnections().contains(player.getUniqueId())) {
-
- plugin.getLogger().warn("User " + player.getUniqueId() + " - " + player.getName() +
- " doesn't have data pre-loaded, they have never been processed during pre-login in this session." +
- " - denying login.");
-
- try {
- if ((Boolean) detectedCraftBukkitOfflineMode.get(connectionListener)) {
- printCraftBukkitOfflineModeError.invoke(connectionListener);
- e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_STATE_ERROR_CB_OFFLINE_MODE.asString(plugin.getLocaleManager()));
- return;
- }
- } catch (IllegalAccessException | InvocationTargetException ex) {
- ex.printStackTrace();
- }
-
- } else {
- plugin.getLogger().warn("User " + player.getUniqueId() + " - " + player.getName() +
- " doesn't currently have data pre-loaded, but they have been processed before in this session." +
- " - denying login.");
- }
-
- e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_STATE_ERROR.asString(plugin.getLocaleManager()));
- return;
- }
-
- // User instance is there, now we can inject our custom Permissible into the player.
- // Care should be taken at this stage to ensure that async tasks which manipulate bukkit data check that the player is still online.
- try {
- // get the existing PermissibleBase held by the player
- PermissibleBase oldPermissible = player.getPerm();
-
- // Make a new permissible for the user
- LPPermissible lpPermissible = new LPPermissible(player, user, plugin);
-
- // Inject into the player
- inject(player, lpPermissible, oldPermissible);
-
- } catch (Throwable t) {
- plugin.getLogger().warn("Exception thrown when setting up permissions for " +
- player.getUniqueId() + " - " + player.getName() + " - denying login.");
- t.printStackTrace();
-
- e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_SETUP_ERROR.asString(plugin.getLocaleManager()));
- return;
- }
-
- plugin.refreshAutoOp(player, true);
- }
-
- // Wait until the last priority to unload, so plugins can still perform permission checks on this event
- @EventHandler(priority = EventPriority.MONITOR)
- public void onPlayerQuit(PlayerQuitEvent e) {
- if (!(e.getPlayer() instanceof DiscordConnectedPlayer))
- return;
-
- final DiscordConnectedPlayer player = (DiscordConnectedPlayer) e.getPlayer();
-
- connectionListener.handleDisconnect(player.getUniqueId());
-
- // perform unhooking from bukkit objects 1 tick later.
- // this allows plugins listening after us on MONITOR to still have intact permissions data
- this.plugin.getBootstrap().getServer().getScheduler().runTaskLaterAsynchronously(this.plugin.getBootstrap(), () -> {
- // Remove the custom permissible
- try {
- uninject(player, true);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- // Handle auto op
- if (this.plugin.getConfiguration().get(ConfigKeys.AUTO_OP)) {
- player.setOp(false);
- }
-
- // remove their contexts cache
- this.plugin.getContextManager().onPlayerQuit(player);
- }, 1L);
- }
-
- //me.lucko.luckperms.bukkit.inject.permissible.PermissibleInjector
- private void inject(DiscordConnectedPlayer player, LPPermissible newPermissible, PermissibleBase oldPermissible) throws IllegalAccessException, InvocationTargetException {
-
- // seems we have already injected into this player.
- if (oldPermissible instanceof LPPermissible) {
- throw new IllegalStateException("LPPermissible already injected into player " + player.toString());
- }
-
- // Move attachments over from the old permissible
-
- //noinspection unchecked
- List attachments = (List) PERMISSIBLE_BASE_ATTACHMENTS_FIELD.get(oldPermissible);
-
- convertAndAddAttachments.invoke(newPermissible, attachments);
- attachments.clear();
- oldPermissible.clearPermissions();
-
- // Setup the new permissible
- ((AtomicBoolean) getActive.invoke(newPermissible)).set(true);
- setOldPermissible.invoke(newPermissible, oldPermissible);
-
- // inject the new instance
- player.setPerm(newPermissible);
- }
-
- private void uninject(DiscordConnectedPlayer player, boolean dummy) throws Exception {
-
- // gets the players current permissible.
- PermissibleBase permissible = player.getPerm();
-
- // only uninject if the permissible was a luckperms one.
- if (permissible instanceof LPPermissible) {
- LPPermissible lpPermissible = ((LPPermissible) permissible);
-
- // clear all permissions
- lpPermissible.clearPermissions();
-
- // set to inactive
- ((AtomicBoolean) getActive.invoke(lpPermissible)).set(false);
-
- // handle the replacement permissible.
- if (dummy) {
- // just inject a dummy class. this is used when we know the player is about to quit the server.
- player.setPerm(DummyPermissibleBase.INSTANCE);
-
- } else {
- PermissibleBase newPb = (PermissibleBase) getOldPermissible.invoke(lpPermissible);
- if (newPb == null) {
- newPb = new PermissibleBase(player);
- }
-
- player.setPerm(newPb);
- }
- }
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java b/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
deleted file mode 100644
index d666a13..0000000
--- a/src/main/java/buttondevteam/discordplugin/role/GameRoleModule.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package buttondevteam.discordplugin.role;
-
-import buttondevteam.core.ComponentManager;
-import buttondevteam.discordplugin.DPUtils;
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ReadOnlyConfigData;
-import discord4j.core.event.domain.role.RoleCreateEvent;
-import discord4j.core.event.domain.role.RoleDeleteEvent;
-import discord4j.core.event.domain.role.RoleEvent;
-import discord4j.core.event.domain.role.RoleUpdateEvent;
-import discord4j.core.object.entity.MessageChannel;
-import discord4j.core.object.entity.Role;
-import lombok.val;
-import org.bukkit.Bukkit;
-import reactor.core.publisher.Mono;
-
-import java.awt.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Automatically collects roles with a certain color (the second to last in the upper row - #95a5a6).
- * Users can add these roles to themselves using the /role Discord command.
- */
-public class GameRoleModule extends Component {
- public List GameRoles;
-
- @Override
- protected void enable() {
- getPlugin().getManager().registerCommand(new RoleCommand(this));
- GameRoles = DiscordPlugin.mainServer.getRoles().filterWhen(r -> isGameRole(r, false)).map(Role::getName).collect(Collectors.toList()).block();
- }
-
- @Override
- protected void disable() {
-
- }
-
- /**
- * The channel where the bot logs when it detects a role change that results in a new game role or one being removed.
- */
- private ReadOnlyConfigData> logChannel() {
- return DPUtils.channelData(getConfig(), "logChannel");
- }
-
- public static void handleRoleEvent(RoleEvent roleEvent) {
- val grm = ComponentManager.getIfEnabled(GameRoleModule.class);
- if (grm == null) return;
- val GameRoles = grm.GameRoles;
- val logChannel = grm.logChannel().get();
- if (roleEvent instanceof RoleCreateEvent) {
- Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> {
- Role role=((RoleCreateEvent) roleEvent).getRole();
- grm.isGameRole(role, false).flatMap(b -> {
- if (!b)
- return Mono.empty(); //Deleted or not a game role
- GameRoles.add(role.getName());
- if (logChannel != null)
- return logChannel.flatMap(ch -> ch.createMessage("Added " + role.getName() + " as game role. If you don't want this, change the role's color from the game role color."));
- return Mono.empty();
- }).subscribe();
- }, 100);
- } else if (roleEvent instanceof RoleDeleteEvent) {
- Role role=((RoleDeleteEvent) roleEvent).getRole().orElse(null);
- if(role==null) return;
- if (GameRoles.remove(role.getName()) && logChannel != null)
- logChannel.flatMap(ch -> ch.createMessage("Removed " + role.getName() + " as a game role.")).subscribe();
- } else if (roleEvent instanceof RoleUpdateEvent) {
- val event = (RoleUpdateEvent) roleEvent;
- if(!event.getOld().isPresent()) {
- DPUtils.getLogger().warning("Old role not stored, cannot update game role!");
- return;
- }
- Role or=event.getOld().get();
- grm.isGameRole(event.getCurrent(), true).flatMap(b -> {
- if (!b) {
- if (GameRoles.remove(or.getName()) && logChannel != null)
- return logChannel.flatMap(ch -> ch.createMessage("Removed " + or.getName() + " as a game role because it's color changed."));
- } else {
- if (GameRoles.contains(or.getName()) && or.getName().equals(event.getCurrent().getName()))
- return Mono.empty();
- boolean removed = GameRoles.remove(or.getName()); //Regardless of whether it was a game role
- GameRoles.add(event.getCurrent().getName()); //Add it because it has no color
- if (logChannel != null) {
- if (removed)
- return logChannel.flatMap(ch -> ch.createMessage("Changed game role from " + or.getName() + " to " + event.getCurrent().getName() + "."));
- else
- return logChannel.flatMap(ch -> ch.createMessage("Added " + event.getCurrent().getName() + " as game role because it has the color of one."));
- }
- }
- return Mono.empty();
- }).subscribe();
- }
- }
-
- private Mono isGameRole(Role r, boolean debugMC) {
- boolean debug = debugMC && r.getName().equalsIgnoreCase("Minecraft");
- if (debug) TBMCCoreAPI.sendDebugMessage("Checking if Minecraft is a game role...");
- if (r.getGuildId().asLong() != DiscordPlugin.mainServer.getId().asLong()) {
- if (debug) TBMCCoreAPI.sendDebugMessage("Not in the main server: " + r.getGuildId().asString());
- return Mono.just(false); //Only allow on the main server
- }
- val rc = new Color(149, 165, 166, 0);
- if (debug) TBMCCoreAPI.sendDebugMessage("Game role color: " + rc + " - MC color: " + r.getColor());
- return Mono.just(r.getColor().equals(rc))
- .doAfterSuccessOrError((b, e) -> {
- if (debug) TBMCCoreAPI.sendDebugMessage("1. b: " + b + " - e: " + e);
- }).filter(b -> b).flatMap(b ->
- DiscordPlugin.dc.getSelf().flatMap(u -> u.asMember(DiscordPlugin.mainServer.getId()))
- .doAfterSuccessOrError((m, e) -> {
- if (debug) TBMCCoreAPI.sendDebugMessage("2. m: " + m.getDisplayName() + " e: " + e);
- }).flatMap(m -> m.hasHigherRoles(Collections.singleton(r)))) //Below one of our roles
- .doAfterSuccessOrError((b, e) -> {
- if (debug) TBMCCoreAPI.sendDebugMessage("3. b: " + b + " - e: " + e);
- }).defaultIfEmpty(false);
- }
-}
diff --git a/src/main/java/buttondevteam/discordplugin/role/RoleCommand.java b/src/main/java/buttondevteam/discordplugin/role/RoleCommand.java
deleted file mode 100755
index d484ef2..0000000
--- a/src/main/java/buttondevteam/discordplugin/role/RoleCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package buttondevteam.discordplugin.role;
-
-import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.commands.Command2DCSender;
-import buttondevteam.discordplugin.commands.ICommand2DC;
-import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.Command2;
-import buttondevteam.lib.chat.CommandClass;
-import discord4j.core.object.entity.Role;
-import lombok.val;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-
-@CommandClass
-public class RoleCommand extends ICommand2DC {
-
- private GameRoleModule grm;
-
- RoleCommand(GameRoleModule grm) {
- this.grm = grm;
- }
-
- @Command2.Subcommand(helpText = {
- "Add role",
- "This command adds a role to your account."
- })
- public boolean add(Command2DCSender sender, @Command2.TextArg String rolename) {
- final Role role = checkAndGetRole(sender, rolename);
- if (role == null)
- return true;
- try {
- sender.getMessage().getAuthorAsMember()
- .flatMap(m -> m.addRole(role.getId()).switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("added role."))))
- .subscribe();
- } catch (Exception e) {
- TBMCCoreAPI.SendException("Error while adding role!", e);
- sender.sendMessage("an error occured while adding the role.");
- }
- return true;
- }
-
- @Command2.Subcommand(helpText = {
- "Remove role",
- "This command removes a role from your account."
- })
- public boolean remove(Command2DCSender sender, @Command2.TextArg String rolename) {
- final Role role = checkAndGetRole(sender, rolename);
- if (role == null)
- return true;
- try {
- sender.getMessage().getAuthorAsMember()
- .flatMap(m -> m.removeRole(role.getId()).switchIfEmpty(Mono.fromRunnable(() -> sender.sendMessage("removed role."))))
- .subscribe();
- } catch (Exception e) {
- TBMCCoreAPI.SendException("Error while removing role!", e);
- sender.sendMessage("an error occured while removing the role.");
- }
- return true;
- }
-
- @Command2.Subcommand
- public void list(Command2DCSender sender) {
- var sb = new StringBuilder();
- boolean b = false;
- for (String role : (Iterable) grm.GameRoles.stream().sorted()::iterator) {
- sb.append(role);
- if (!b)
- for (int j = 0; j < Math.max(1, 20 - role.length()); j++)
- sb.append(" ");
- else
- sb.append("\n");
- b = !b;
- }
- if (sb.charAt(sb.length() - 1) != '\n')
- sb.append('\n');
- sender.sendMessage("list of roles:\n```\n" + sb + "```");
- }
-
- private Role checkAndGetRole(Command2DCSender sender, String rolename) {
- String rname = rolename;
- if (!grm.GameRoles.contains(rolename)) { //If not found as-is, correct case
- val orn = grm.GameRoles.stream().filter(r -> r.equalsIgnoreCase(rolename)).findAny();
- if (!orn.isPresent()) {
- sender.sendMessage("that role cannot be found.");
- list(sender);
- return null;
- }
- rname = orn.get();
- }
- val frname = rname;
- final List