Commit Graph

2421 Commits

Author SHA1 Message Date
Paul Reilly
8b48408870 Merge branch 'RELEASE-2023.03' into proper-resultset-retrieval 2023-03-31 21:35:30 -05:00
Paul Reilly
dbb289db66 Squashed commit of the following:
commit cc48f93556
Merge: 71127c31 dd373fc9
Author: Paul Reilly <pawereus@gmail.com>
Date:   Fri Mar 31 21:15:34 2023 -0500

    Merge branch 'main' into development

commit dd373fc9aa
Merge: edb3dbfd 41331e71
Author: Paldiu <pawereus@gmail.com>
Date:   Fri Mar 31 18:25:42 2023 -0500

    Merge pull request #307 from AtlasMediaGroup/RELEASE-2022.06.1

    Release 2022.06.1

commit 41331e719d
Author: Video <videogamesm12@gmail.com>
Date:   Wed Mar 8 19:58:14 2023 -0700

    Updates version to 2022.06.1

commit 72c83ba84a
Merge: edb3dbfd 3deaaafb
Author: Video <videogamesm12@gmail.com>
Date:   Wed Mar 8 19:53:51 2023 -0700

    Merge pull request #306 from AtlasMediaGroup/critical-exploit-fix

    Patches critical exploit in the command blocker

commit 3deaaafb88
Author: Video <videogamesm12@gmail.com>
Date:   Wed Mar 8 19:52:30 2023 -0700

    Patches critical exploit
2023-03-31 21:33:08 -05:00
Paul Reilly
0d0fbf2c04 Implement sql properly 2023-03-31 17:21:19 -05:00
Paul Reilly
997210a16f Retrieving ResultSets correctly 2023-03-31 00:52:53 -05:00
Video
f53ba1bd76 Lots of fixes and cool shit
- Fixes bug that caused login messages to not show properly
- Fixes bug that caused names to now show properly in tab
- Adds the ability for commands to be ignored if plugins that they require aren't present
- Fixes bug that caused the admin list to fail to load properly
- Fixes bug that caused tags to not show properly
- Login messages now use MiniMessage
2023-03-30 23:14:57 -06:00
Paul Reilly
74408b85bf Fix autoclosing on resultsets 2023-03-30 22:46:45 -05:00
Paul Reilly
c26e05c392 Fix discrepancies. 2023-03-30 21:21:50 -05:00
Paul Reilly
ee39e6f534 Now buildable. 2023-03-30 20:36:00 -05:00
Paul Reilly
8a58782d99 LuckPerms Integration (2/2) 2023-03-30 15:26:35 -05:00
Paul Reilly
cc244fc4f7 LuckPerms Integration (1.5/2) 2023-03-29 22:00:35 -05:00
Paul Reilly
65540b7f3a LuckPerms Integration (1/2)
This is part 1 of 2 of the luckperms integration for our switch to permissions.
2023-03-29 00:46:32 -05:00
Video
f91c21cc81 Merge branch 'RELEASE-2023.03' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2023.03 2023-03-27 23:27:22 -06:00
Video
6c983f6b97 I was on a development roll and now I need to sleep
- Removes commands /aec, /attributelist, /reactionbar, /playtime, /settotalvotes, /status
- Removes unused activity log functionality
- Migrates many more commands to use MiniMessage
- Merges /disguisetoggle with /toggle
- Reimplements explosive arrows in a much better way
2023-03-27 23:23:34 -06:00
Paul Reilly
1e97273e01 Fixed commas breaking notes. 2023-03-27 21:02:30 -05:00
Paul Reilly
922a2bcc76 Change trailer from blocks to particles. 2023-03-27 20:35:16 -05:00
Video
34269bde09 Please read the commit description for a full changelog
- Reimplements the clownfish toggle in a much better way
- Completely rewrites the plugin's chat formatting system
- Tags now use MiniMessage instead of color codes. New tags are automatically converted.
- /adminchat now uses MiniMessage for its messages
- /autoclear and /autotp now use MiniMessage for their messages
- /banip now uses MiniMessage for its messages
- /bird now uses MiniMessage for its messages (and also now shows a rainbow message)
- /blockcmd now uses MiniMessage for its messages
- /clownfish now uses MiniMessage for its messages
- /notes now uses MiniMessage for its messages
- /op now uses MiniMessage for its messages
- /plc now uses MiniMessage for its messages
- Fixes bug in /stop where the stop message was not showing properly
- Condenses /tagrainbow into /tag and integrates /tag gradient into /tag set using MiniMessage
- /toggle now uses MiniMessage for its messages
- /tossmob now uses MiniMessage for its messages
- /unban, /unbanip, and /unbanname now use MiniMessage for its messages
- /unblockcmd now uses MiniMessage for its messages
- /uncage now uses MiniMessage for its messages
- /undisguiseall now uses MiniMessage for its messages
- /unlinkdiscord now uses MiniMessage for its messages
- /unmute now uses MiniMessage for its messages
- /vanish now uses MiniMessage for its messages
- /vote now partially uses MiniMessage for its messages
- /warn now uses MiniMessage for its messages
- Deprecates FreedomCommand.msg(String) for now
2023-03-27 18:42:43 -06:00
Video
922fa4a34f Whoops lol 2023-03-26 21:59:17 -06:00
Video
ccf572315f Read the commit description
- Admin chat formats now use MiniMessage
- Tab header and footers now use MiniMessage
- Certain titles from the plugin now use MiniMessage
- More commands now use MiniMessage
2023-03-26 21:56:38 -06:00
Video
733f668145 Read the commit details for more information
- Removes several old unused commands
- Begins implementing MiniMessage into several commands
2023-03-26 19:49:31 -06:00
Video
2cd107c317 Even more commands use Adventure now. Includes a bugfix for /creative. 2023-03-26 17:13:05 -06:00
Video
e4782a3542 Changes several commands to use Adventure 2023-03-26 16:28:12 -06:00
Video
77d65e80f8 Removes useless fucking command 2023-03-26 15:28:22 -06:00
Video
3644ba33a5 This is interferring with testing and is pointless 2023-03-26 12:32:28 -06:00
Paul Reilly
f25d69c5fa Fixer upper 2023-03-17 22:10:32 -05:00
Paul Reilly
9dbe30aaa7 i can't think but this may be right 2023-03-16 13:19:37 -05:00
Paul Reilly
1a28facc56 Made some adjustments; still more to do. 2023-03-11 18:36:15 -06:00
Video
e82a90c0dc [SHOP] Reverts previous bugfix. There's clearly something else going on that I didn't pick up on 2023-03-11 02:58:23 -07:00
Video
f8e09665f5 [SHOP] Fixes bug where not having the Shop enabled would cause an error to be thrown then the server is shutting down 2023-03-11 02:55:51 -07:00
Video
a5135ef641 [DISCORD] Lots and lots of bugfixes
- Fixes bug where sending any messages through Discord would result in errors about roles
- Fixes bug where attempting to send any messages to Discord just didn't work
- Discord integration now shows main chat messages in color
2023-03-11 02:38:33 -07:00
Video
071d19c5e0 [COMMONS] Fixes minor bug that caused /tpr to teleport you partially into the ground
Alco wouldn't stop annoying me about this.
2023-03-11 01:08:27 -07:00
Video
2e7756ed0f [COMMONS] Bugfixes, cleanup, and a much-needed clownfish tweak
- Fixes bug that caused non-shop items (like the mob tosser) to not work if the Shop plugin is not already installed
- Finally makes the fucking clownfish something that can be turned down in the sound settings by having it play the sound at the Player sound category
2023-03-11 00:55:02 -07:00
Video
5332dc88cd My life sucks
- Fixes mistake that caused the shop plugin to not enable properly
- Fixes issue that caused the Discord integration to block the main thread when it shouldn't
- Removes old legacy code that still relied on JDA
- Fixes issue that caused slash commands to fail to register properly
2023-03-11 00:27:43 -07:00
Video
631b691518 General corrections
- Removes JDA as a dependency as we do not use that shit
- Fixes fuck-up on my end where I didn't think Paul used the libraries part of spigot.yml but he actually did
2023-03-10 23:52:24 -07:00
Video
982a991fb0 Video man enters the scene
- Fixes multiple issues that were preventing the project from building
- Fixes an issue that was causing project build class files to be included in git commits
2023-03-10 23:41:06 -07:00
Paul Reilly
adbad1ad9b Update TFD4J.java
Forgot to init the bot LMFAO!!! RETARD.
2023-03-10 20:17:38 -06:00
Paul Reilly
cbd3caaab3 Another fix 2023-03-10 19:27:20 -06:00
Paul Reilly
49696f0c30 Minor fix 2023-03-10 19:25:18 -06:00
Paul Reilly
3a96c853d2 Cyclic Dependency Patch
- Fixed cyclic dependencies
- Added a TFShoppe class for effective plugin initialization
- Registered discord commands, did not before
- Added SLF4J loggers for module logging.
2023-03-10 19:21:03 -06:00
Paul Reilly
b5804c7eb1 Attempt to fix maven compiler issues 2023-03-09 09:41:13 -06:00
Paul Reilly
f9ecebd5c9 Fix Minor Discrepancy 2023-03-09 09:36:59 -06:00
Paul Reilly
3a6e7921cc Merge branch 'development' into RELEASE-2023.03 2023-03-09 09:13:44 -06:00
Paul Reilly
b7ea1b8b3e 2023.03 update 2 / 2
I think we're done!!!
2023-03-09 03:50:47 -06:00
Paul Reilly
2265783afb Part 1 / 2
Only thing left is to fix all the code issues from moving out the discord and shop implementations.
2023-03-09 01:42:18 -06:00
Allink
71127c3152
Add configuration option for disabling books (#275)
FS-458

Co-authored-by: Video <videogamesm12@gmail.com>
Co-authored-by: Paldiu <pawereus@gmail.com>
2023-02-20 23:39:40 +00:00
Paul Reilly
f53696aa9e dissc 2023-02-16 20:28:38 -06:00
Matt Masters
ea60be4c48 Implemenn
ababa stuff
2023-02-16 18:33:25 -06:00
dependabot[bot]
3bd177ea6f
Bump actions/setup-java from 3.6.0 to 3.9.0 (#291)
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.9.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.9.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2023-01-07 20:21:19 +00:00
Nathan Curran
1c0b768e4f
Add logging to ro command - FS-233 (#282)
* Add logging to ro command - FS-233

* Create a variable for API instead of calling method every time

Co-authored-by: Paldiu <pawereus@gmail.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2023-01-07 18:31:11 +00:00
Paldiu
67b0656e61
Merge pull request #285 from AtlasMediaGroup/fs24
Resolves many issues in FS-24 and cleans up code
2023-01-06 20:37:26 -06:00
Video
b3e1a8b528 Aggressive debloat
- Removes unused Logviewer functionality
- Removes several unused bits of code from FPlayer
- Changes the build configuration to not shade in org.apache.commons:commons-lang3, commons-io.commons-io,
  jetbrains.annotation, and org.javassist:javassist, opting instead to load them in on runtime using a
  little-known Spigot trick
2022-11-21 07:09:59 -07:00