ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases 8 Packages Wiki Activity

Made the chat also support players

Browse source
This commit is contained in:
Norbi Peti 2016-12-04 21:41:17 +01:00
parent c336de27ea
commit faf3b8857f
1 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
View file

@ -47,50 +47,44 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID()) if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID())
/* && !(event.getMessage().getChannel().isPrivate() && privatechat) */) /* && !(event.getMessage().getChannel().isPrivate() && privatechat) */)
return; return;
if (event.getMessage().getContent().startsWith("/")) { try {
final String cmd = event.getMessage().getContent().substring(1);
Optional<? extends Player> player = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players Optional<? extends Player> player = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players
DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class); // Online player, already loaded DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class); // Online player, already loaded
return author.getID().equals(dp.getDiscordID()); return author.getID().equals(dp.getDiscordID());
}).findAny(); }).findAny();
try { final CommandSender dsender;
if (player.isPresent()) // Connected? if (player.isPresent()) // Connected?
{ { // Execute as ingame player
if (!ConnectedSenders.containsKey(author.getID())) if (!ConnectedSenders.containsKey(author.getID()))
ConnectedSenders.put(author.getID(), new DiscordPlayerSender(author, player.get())); ConnectedSenders.put(author.getID(), new DiscordPlayerSender(author, player.get()));
final DiscordPlayerSender dsender = ConnectedSenders.get(author.getID());
dsender.setChannel(event.getMessage().getChannel());
// Execute as ingame player
Bukkit.dispatchCommand(dsender, cmd);
} else {
if (!UnconnectedSenders.containsKey(author.getID()))
UnconnectedSenders.put(author.getID(), new DiscordSender(author));
final DiscordSender dsender = UnconnectedSenders.get(author.getID());
dsender.setChannel(event.getMessage().getChannel());
if (!Arrays.stream(UnconnectedCmds).anyMatch(s -> cmd.startsWith(s))) {
// Command not whitelisted
DiscordPlugin.sendMessageToChannel(event.getMessage().getChannel(), // TODO
"Sorry, you need to be online on the server and have your accounts connected, you can only access these commands:\n"
+ Arrays.toString(UnconnectedCmds));
} else
Bukkit.dispatchCommand(dsender, cmd);
}
} catch (Exception e) {
TBMCCoreAPI.SendException("An error occured while executing command " + cmd + "!", e);
return;
}
} else {
CommandSender dsender = UnconnectedSenders.get(author.getID());
if (dsender == null)
dsender = ConnectedSenders.get(author.getID()); dsender = ConnectedSenders.get(author.getID());
if (dsender == null) { ((DiscordPlayerSender) dsender).setChannel(event.getMessage().getChannel());
UnconnectedSenders.put(author.getID(), new DiscordSender(author)); } else {
if (!UnconnectedSenders.containsKey(author.getID()))
UnconnectedSenders.put(author.getID(), new DiscordSender(author));
dsender = UnconnectedSenders.get(author.getID()); dsender = UnconnectedSenders.get(author.getID());
((DiscordSender) dsender).setChannel(event.getMessage().getChannel());
} }
TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender, if (event.getMessage().getContent().startsWith("/")) {
event.getMessage().getContent() final String cmd = event.getMessage().getContent().substring(1);
+ (event.getMessage().getAttachments().size() > 0 ? event.getMessage().getAttachments() if (!player.isPresent()) {
.stream().map(a -> a.getUrl()).collect(Collectors.joining("\n")) : "")); // Command not whitelisted
DiscordPlugin.sendMessageToChannel(event.getMessage().getChannel(), // TODO
"Sorry, you need to be online on the server and have your accounts connected, you can only access these commands:\n"
+ Arrays.toString(UnconnectedCmds));
return;
}
Bukkit.dispatchCommand(dsender, cmd);
} else
TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender,
event.getMessage().getContent()
+ (event.getMessage().getAttachments().size() > 0 ? event.getMessage().getAttachments()
.stream().map(a -> a.getUrl()).collect(Collectors.joining("\n")) : ""));
} catch (
Exception e) {
TBMCCoreAPI.SendException("An error occured while handling " + event.getMessage().getContent() + "!", e);
return;
} }
} }
} }