Commit graph

482 commits

Author SHA1 Message Date
Norbi Peti 6183c034c6
Merge branch 'scala'
# Conflicts:
#	pom.xml
#	src/main/java/buttondevteam/discordplugin/mcchat/MCListener.java
#	src/main/scala/buttondevteam/discordplugin/ChromaBot.java
#	src/main/scala/buttondevteam/discordplugin/ChromaBot.scala
#	src/main/scala/buttondevteam/discordplugin/DiscordPlugin.java
#	src/main/scala/buttondevteam/discordplugin/DiscordPlugin.scala
#	src/main/scala/buttondevteam/discordplugin/listeners/CommandListener.java
2022-01-05 01:35:34 +01:00
Norbi Peti 2a985509fb
Remove custom command handling and start slash commands
They don't work yet, but show up on Discord so that's something
2022-01-05 01:31:24 +01:00
Norbi Peti cafd8096fa
Fix even more returns and Discord->MC chat 2021-12-31 00:38:28 +01:00
Norbi Peti 9f3ca37929
Fix compilation issues and startup exceptions
- Removed test class because it errors, and I don't know how to fix it
- Updated dependencies
- Fixed SMono.whenDelayError() causing a crash on Scala 3.0.0
- Fixed subscribe method calls being ambiguous
- Fixed returns returning the wrong things
- Converted onGetInfo() to use no returns
2021-12-30 21:25:50 +01:00
Norbi Peti 263c652d68
Fix subcommand detection, fix returns 2021-08-26 02:03:06 +02:00
Norbi Peti 7b27ec0ea3
Update to Scala 3.0.0 and update dependencies 2021-07-08 23:04:17 +02:00
Norbi Peti c49fac5ce5
Fix command parameter name saving and other things 2021-04-06 23:17:31 +02:00
Norbi Peti fd63e995ff
Add command parameter name saving 2021-04-06 22:32:12 +02:00
Norbi Peti ad3bd451ba
Save all of the config comments and include in JAR 2021-04-06 02:25:23 +02:00
Norbi Peti 74bce1ecf9
Save config comments (not all of them apparently) 2021-04-06 01:05:58 +02:00
Norbi Peti d80703ac68
Obtain config comments from sources 2021-04-06 00:35:59 +02:00
Norbi Peti 470212411d
Successfully made an unnecessary subproject work 2021-04-05 18:57:40 +02:00
Norbi Peti 5146fdf368
Add Reflections 2021-04-05 03:47:56 +02:00
Norbi Peti 860dd66431
Add task to read source files 2021-04-05 02:45:28 +02:00
Norbi Peti efa1dcfc8f
Convert to SBT project (manually), including shading 2021-04-04 00:32:27 +02:00
Norbi Peti 3f6135f427
Revert "Convert some classes to Scala"
This reverts commit 261725dc0f.
2021-03-20 14:35:15 +01:00
Norbi Peti 1b1a592a1e
It compiles! Remove LPInjector for now
The IDE and the Scala compiler don't agree on what is or isn't needed
2021-03-09 23:55:02 +01:00
Norbi Peti a84cd4e8e3
Fix all Scala errors! 2021-03-09 03:41:04 +01:00
Norbi Peti a0a7f756c4
Implicit classes for conversion, more fixing
Added 'extension methods' to convert to Scala-friendly formats easily
2021-03-09 02:47:11 +01:00
Norbi Peti 7296ebd2f8
Tailrec announcer method, fix some compile issues 2021-03-06 01:27:21 +01:00
Norbi Peti d416eef144
Make some small functions 2021-03-02 01:40:58 +01:00
Norbi Peti fce6b91b97
Use Scala version of Reactor & data types 2021-03-02 01:18:20 +01:00
Norbi Peti c57ac26b2d
All classes converted that I wanted 2021-03-01 02:07:40 +01:00
Norbi Peti 9f47509dcb
Converted mcchat classes to Scala 2021-02-26 02:27:59 +01:00
Norbi Peti 428361c46c
Convert some more classes to Scala
Actually, a lot of them
2021-02-25 01:44:43 +01:00
Norbi Peti 261725dc0f
Convert some classes to Scala
Because why not
Except... It doesn't work. Yet.
2021-02-15 22:24:14 +01:00
Norbi Peti b18f6beba9
Add more relocations to fix compatibility issues 2021-02-09 23:00:40 +01:00
Norbi Peti cbc9728c02
Try using a different path for the script 2020-11-01 19:14:47 +01:00
Norbi Peti 9576c0ba1d
Use install-jdk.sh for Java 8 as well 2020-11-01 18:57:25 +01:00
Norbi Peti 1fe367a96c
Use Java 8 for Spigot, Java 11 for others (CI) 2020-11-01 18:42:04 +01:00
Norbi Peti 28cff3ed43
Fix mcchat crash on config issue 2020-11-01 13:54:07 +01:00
Norbi Peti 491b5e4ee9
Fix commands not working in some cases
#98
Also unregistering DC commands
Also removed the command string from the unknown command message
2020-10-30 23:50:08 +01:00
Norbi Peti 64994ee44e
Fix some things, disable some modules by default 2020-10-30 00:56:08 +01:00
Norbi Peti e57974ebcd
Remove debug msg and set version 2020-10-28 00:32:59 +01:00
Norbi Peti 324f5e756c
Detect restarts by reading *everything* logged
The server uses sout to print the message we're interested in...
Hopefully a check like this won't put any significant load on the server
2020-10-27 15:02:42 +01:00
Norbi Peti 2b549227a6
Aw man 2020-10-26 23:05:03 +01:00
Norbi Peti 61986c9b51
Fix server start message not being displayed 2020-10-26 22:56:13 +01:00
Norbi Peti 4d234cf832
Fix vanish player count and no crash on fast disable
#130
2020-10-26 21:16:08 +01:00
Norbi Peti 7866ddbe06
Config conversion 2020-10-26 20:01:00 +01:00
Norbi Peti fdcab1acb2
Fix LPInjector and player data stuff 2020-10-25 21:49:09 +01:00
Norbi Peti 40fe1093e0
Player data things, LPInjector update start 2020-10-25 01:59:10 +02:00
Norbi Peti d3ae53cd46
Merge pull request #131 from TBMCPlugins/dependabot/maven/junit-junit-4.13.1
Bump junit from 3.8.1 to 4.13.1
2020-10-14 19:48:25 +02:00
dependabot[bot] 67a66c0c44
Bump junit from 3.8.1 to 4.13.1
Bumps [junit](https://github.com/junit-team/junit4) from 3.8.1 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/commits/r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-13 06:37:54 +00:00
Norbi Peti a27a262858
LPInjector and mcchat fixes
Fixed LPInjector registering to the Core
Stop MCChatListener from having multiple active instances
MinecraftChatModule.state instead of all the flags
Showing MinecraftChatModule enable/disable on Discord
/discord reset --> restart
Wait for each shutdown message to send on shutdown (although it hasn't really been an issue so far)
This means using Mono<?> in a lot of places
Also added a contract (IntelliJ) to warn if not subscribed
Faking getOnlinePlayers() is unnecessary and causes too much trouble
Today's work
2020-10-10 00:29:21 +02:00
Norbi Peti ccc15aa048
Log exceptions using the plugin/component logger
And fix LPInjector loading multiple times / once
2020-10-09 00:10:36 +02:00
Norbi Peti 891be91d69
Fix some mcchat and a reset issue
Using ConcurrentHashMaps (#62)
Add custom /list to hide vanished players (#120)
Fixed /discord reset for non-Paper servers (#103)
2020-10-08 00:02:49 +02:00
Norbi Peti 56d13ebf9f
Update to Discord4J v3.1.1
It wasn't as complicated as I expected
2020-10-07 22:27:20 +02:00
Norbi Peti 7cebb74835
Switch back to mocking
The ByteBuddy solution complains about adding/removing fields
But making a delegating mock maker is easy enough
2020-10-07 20:09:35 +02:00
Norbi Peti 3f2fa286fb
Attempt to use ByteBuddy directly for ServerWatcher 2020-10-07 00:52:59 +02:00
Norbi Peti beae6e6ce0
Config and such 2020-09-12 01:54:45 +02:00