Commit graph

440 commits

Author SHA1 Message Date
b95b9092f5 Merge branch 'master' into dev
Conflicts:
	src/main/java/buttondevteam/discordplugin/DiscordPlayer.java
	src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
	src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
	src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
	src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
	src/main/java/buttondevteam/discordplugin/listeners/MCListener.java
	src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
2017-04-02 02:06:00 +02:00
ffbb9a0a91 Fixed and updated plugin to the new things 2017-04-02 01:32:37 +02:00
b21a6b2f5f Moved update progress msgs to bot room 2017-02-04 21:06:39 +01:00
6ce730016d Implemented new player data thingy 2017-01-29 01:49:25 +01:00
dfeae5de9e Added removing cmds from chat and perform method
The perform method handles safe mode and ratelimiting.
2017-01-15 21:19:44 +01:00
2b9164ebc6 Fixes and probably added add cmd 2017-01-14 13:32:33 +01:00
519e0f468e Started game role commands 2017-01-14 01:33:44 +01:00
d50e9a23ce Fixed start message not showing 2017-01-04 20:56:00 +01:00
b7ef8f4048 Applied changes 2017-01-02 01:20:02 +01:00
6c654c28dd Added safe mode 2016-12-31 19:43:35 +01:00
85d26d7b9f Merge pull request #24 from TBMCPlugins/dev
Added removing obfuscated chars from names, delivered reactions are more reliable, added linking to the PR on plugin autoupdate, a fix
2016-12-31 18:51:53 +01:00
c5edce848f Fixed update details msg 2016-12-31 18:39:54 +01:00
f97d7e7a05 Fixed office channel test location
Also testing it with this commit
2016-12-31 18:35:54 +01:00
7d813e8d59 Testing autoupdate improvements 2016-12-31 18:30:39 +01:00
7aeff53967 Added PR linking - in the condition 2016-12-31 03:08:20 +01:00
6cdac8696d Made delivered reactions more reliable 2016-12-31 00:41:37 +01:00
7e5ab8cbbd Removing obfuscated chars from names 2016-12-27 21:28:22 +01:00
0ba39e3e30 Giving the fix for everyone!
I was tired...
2016-12-27 16:29:38 +01:00
237559d663 Made last chat msg reset on sendMessage 2016-12-26 22:33:38 +01:00
9269e0fb19 Added extra parenthesis 2016-12-25 01:03:05 +01:00
bf33c55205 Merge pull request #23 from TBMCPlugins/dev
Started using embeds for a nicer chat
2016-12-25 00:56:31 +01:00
6c1b2e39c4 IT WORKS! (See commit body)
- Added message grouping
- Moved listener and other registrations to the Discord ready event, so
people can't do things before they should
- Spent lot of time on message grouping
2016-12-25 00:48:56 +01:00
2f76583a87 Using embeds for chat and separated restart and stop messages 2016-12-24 16:50:14 +01:00
9383f5ea0c Moved update msgs to <#219530035365675010>
#coffee-table
2016-12-23 23:06:23 +01:00
e8d4f03992 Added embeds to sendMessageToChannel 2016-12-23 22:53:36 +01:00
972ea865e0 Only reacting if prod. or not master
So it won't put a checkmark on master commits if updated on a test
server
2016-12-22 23:46:04 +01:00
46182fc4ec Merge pull request #21 from TBMCPlugins/dev
Added automatic plugin updater and a few smaller changes
2016-12-22 23:37:25 +01:00
4ecbb15bd2 Added reaction after plugin update 2016-12-22 23:20:27 +01:00
6151fa0de9 Made the updater use the chat channel
And fixed branch...
2016-12-22 22:41:38 +01:00
ab90f935fa Testing autoupdate with this commit
- Finished autoupdate
- Made DiscordSender work with no Discord user
- Made the DiscordPlayerSender return the player's name on getName()
2016-12-22 21:56:26 +01:00
c3cc559b61 Added some debug code, testing them now 2016-12-22 21:40:09 +01:00
74fe66ec7d I'm only committing to test it btw 2016-12-22 21:29:55 +01:00
e51c2fe32f Comparing IDs
Now I'm finally only committing after my server is up
2016-12-22 21:22:55 +01:00
599f853f19 Made it use the core's test detection 2016-12-22 21:17:24 +01:00
8f92c8eb9b Why do I keep forgetting registering 2016-12-22 20:59:15 +01:00
3c16795964 Fixed timeout delay after ratelimit 2016-12-22 20:57:13 +01:00
aeee423c5a Added auto-updater listener 2016-12-22 20:52:14 +01:00
03540b430c Made the test notification not show in chat 2016-12-22 20:29:08 +01:00
2053b7f508 Added ratelimit handling for reaction remove 2016-12-21 22:58:23 +01:00
51e96b982a Discord4J's branch got merged 17h ago 2016-12-21 22:42:54 +01:00
2bcb47b7b5 Some additions and fixes...
- Made the bot only react when msg starts with the ping unless we're in
PM
- Now removing color codes from AFK messages
- Removed /t as an unconnnected cmd as it doesn't work properly
- Added /yeehaw to the unconnected cmds
- Allowing bot commands in mc chat
2016-12-21 22:37:01 +01:00
4570b964b3 Added removing reactions from chat 2016-12-21 20:54:48 +01:00
cd3cc633fb Ok, nooow it should work 2016-12-20 23:07:58 +01:00
2cbfdff383 Copied reaction code from Discord itself 2016-12-20 23:02:20 +01:00
05ab8fa970 Trying 2016-12-20 22:57:42 +01:00
a53c5103f4 Fixed reaction NPE... 2016-12-20 22:47:35 +01:00
e4a4408cbc Removed YEEHAW event handler 2016-12-20 22:32:56 +01:00
ede11fa512 Added the annotation for AFK event... 2016-12-20 22:30:00 +01:00
a05115293d Added checkmark if mcchat send succeeds
Also updated Discord4J to a dev version and other stuff
2016-12-20 21:08:34 +01:00
b28e7fd67f Added line breaks... 2016-12-18 18:43:00 +01:00