AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-15 18:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,451 Commits 38 Branches 58 Tags
proper-resultset-retrieval
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Reilly 1f9a36cbfb Merge branch 'RELEASE-2023.03-LUCKPERMS' into proper-resultset-retrieval 2023-04-10 21:36:50 -05:00
Paul Reilly f4f60a7993 Fix some minor issues 2023-04-10 20:02:42 -05:00
Paul Reilly 6c0856d647 Attempt to intercept native commands 2023-04-10 01:27:30 -05:00
Paul Reilly 33ac3a36ca Command fixing 2023-04-10 01:18:06 -05:00
Paul Reilly 42482ef8e7 Deferred command loading 
Moved command loading into a runnable that will execute on the first server tick. This way, we can ensure that all the plugins are loaded before we load our commands, so TFD4J and Shop can both have their respective commands loaded in.
 2023-04-09 23:17:31 -05:00
Paul Reilly 11f9313653 This should work properly! 2023-04-09 23:05:57 -05:00
Paul Reilly 2a3a48f2ae Fixing errors 2023-04-07 17:59:23 -05:00
Paul Reilly 3dde5ef578 More fixes 2023-04-07 17:37:56 -05:00
Paul Reilly 198f1d3acf Another stupid fix. 2023-04-07 16:35:12 -05:00
Paul Reilly 7967bfc9f8 Dumb thing 1 2023-04-07 16:28:13 -05:00
Paul Reilly 6566c7f305 Fixed some dumb shit 2023-04-07 16:22:43 -05:00
Paul Reilly 71fe940049 Oops 2023-04-07 16:09:23 -05:00
Paul Reilly e2d7f6ebcb Adjusting some stuff :) 2023-04-07 16:06:11 -05:00
Paul Reilly 8262e81e69 Fixes part 1 
There's definitely more to do here, I am dead inside
 2023-04-05 20:46:24 -05:00
Paul Reilly 55f8c29036 Merge branch 'RELEASE-2023.03' into proper-resultset-retrieval 2023-04-05 16:39:50 -05:00
Paul Reilly b29a176fa9 minor fixing 2023-04-05 16:38:31 -05:00
Paul Reilly d1569cb3c0 Luck Perms is actually based but also not based 2023-04-05 15:59:20 -05:00
Paul Reilly d6c68adb41 Merge branch 'RELEASE-2023.03' into proper-resultset-retrieval 2023-04-05 14:05:52 -05:00
Paul Reilly f474ce99fd Added inheritance to the groups when created by TFM. 2023-04-04 17:42:05 -05:00
PaldiuandGitHub a3530ad143 Fixed a code discrepancy. 2023-03-31 21:41:28 -05:00
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 <[email protected]>
Date:   Fri Mar 31 21:15:34 2023 -0500

    Merge branch 'main' into development

commit dd373fc9aa
Merge: edb3dbfd 41331e71
Author: Paldiu <[email protected]>
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 <[email protected]>
Date:   Wed Mar 8 19:58:14 2023 -0700

    Updates version to 2022.06.1

commit 72c83ba84a
Merge: edb3dbfd 3deaaafb
Author: Video <[email protected]>
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 <[email protected]>
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
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
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
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
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
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
PaldiuandGitHub 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
PaldiuandGitHub fa85b8e160 Merge pull request #284 from AtlasMediaGroup/FS-454 
FS-454 - Add expiry to indefinite bans
 2022-11-14 17:12:17 -06:00
PaldiuandGitHub a332ecfbea Merge pull request #272 from AtlasMediaGroup/fix-interact-blocking 
Remove guard clause causing unintended side effects in interact blocker
 2022-10-12 11:29:00 -05:00
PaldiuandGitHub 7f78549f9d Merge branch 'development' into fix-interact-blocking 2022-10-09 15:15:57 -05:00
PaldiuandGitHub c472c5d5ce Merge pull request #243 from AtlasMediaGroup/beds 
Fix beds exploding in the Nether & End dimensions with explosions off
 2022-06-20 07:25:27 -05:00
PaldiuandGitHub 0fc20b6c56 Merge branch 'development' into FS-222 2022-05-26 10:11:01 -05:00
PaldiuandGitHub dfd90af017 Merge pull request #224 from AtlasMediaGroup/dependabot/maven/development/org.apache.maven.plugins-maven-antrun-plugin-3.1.0 
Bump maven-antrun-plugin from 3.0.0 to 3.1.0
 2022-05-24 20:47:32 -05:00
Paldiu d13ecea947 Merge branch 'RELEASE-2022.02' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2022.02 2022-05-01 09:55:58 -05:00
Paldiu 7ec053c867 Adjusted version 
Removed "-RELEASE"
 2022-05-01 09:55:47 -05:00
Paldiu c913b7ae74 Set Maven Shade version to 3.3.0 2022-05-01 09:41:53 -05:00
Paldiu 951f3c91d9 2022.02-RELEASE Versioning 
- Changed the version to 2022.02-RELEASE
- Changed the API version to 1.17
 2022-05-01 09:31:20 -05:00
PaldiuandGitHub 2551d184ca Merge pull request #211 from AtlasMediaGroup/RELEASE-2022.02 
Release 2022.02
 2022-03-11 18:09:21 -06:00
PaldiuandGitHub 2c22c6c52d Merge pull request #194 from AtlasMediaGroup/Wild1145-patch-1 
Update various dependencies based on Freedom-01 State
 2022-02-23 17:10:09 -06:00
PaldiuandGitHub f457c4cde2 Merge branch 'development' into FS-292 2022-02-21 18:08:29 -06:00
PaldiuandGitHub 850f12103c Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 
Correct CoreProtect Version
 2022-01-17 11:35:09 -06:00
PaldiuandGitHub 9155ac90b5 Official Release 2021-11-22 12:29:54 -06:00
PaldiuandGitHub a728ec24d4 Merge pull request #156 from AtlasMediaGroup/critical-inspect-bugfix 
Critical Bugfix
 2021-10-04 17:59:10 -05:00
PaldiuandGitHub 0caf972248 Merge pull request #90 from AtlasMediaGroup/FS-309 
2 bugfixes, one command (FS-309)
 2021-07-16 09:05:57 -05:00
PaldiuandGitHub 64a4e70c41 Merge pull request #48 from AtlasMediaGroup/abhi-fix 
Strip role/user mentions (FS-191)
 2021-04-12 16:45:13 -05:00
Paldiu 97672c2fff Update DiscordToAdminChatListener.java 
This is the only way we can load media after [Discord] and [Formatting] without rewriting the method
 2021-03-22 09:57:09 -05:00
Paldiu 5837b05a35 Merge branch 'tfm-bugfix-001' of https://github.com/AtlasMediaGroup/TotalFreedomMod into tfm-bugfix-001 2021-03-21 14:02:51 -05:00
Paldiu b3b68ebd13 Switch to Allman Formatting 2021-03-21 14:02:43 -05:00
PaldiuandGitHub 2725857364 Merge pull request #38 from AtlasMediaGroup/FS-147 
Fix ban expiration (FS-147)
 2021-03-20 22:14:10 -05:00
Paldiu b03870c0aa SQL Fixes 
:)
 2021-03-19 10:39:58 -05:00
Paldiu 2a87271642 Should fix FS-143 2021-03-19 08:58:29 -05:00
PaldiuandGitHub 216234ea01 Merge pull request #32 from AtlasMediaGroup/FS-33 
Properly fix FS-33
 2021-03-18 16:20:06 -05:00
PaldiuandGitHub d0a195647c Merge pull request #33 from AtlasMediaGroup/FS-93 
Fixed permission not setting for new players (FS-93)
 2021-03-17 09:06:45 -05:00
Paldiu 0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only 2021-03-06 12:12:59 -06:00
Paldiu 5c097c83cb Here's to hoping this fixes that stupid ban crap. 2021-03-06 12:00:32 -06:00
PaldiuandGitHub 9161016f73 Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-03 11:52:37 -06:00
PaldiuandGitHub bdd22f8d75 Update month to be 30 days instead of 4 weeks 2021-03-03 12:50:45 -05:00
PaldiuandGitHub ce103ffd50 Merge pull request #28 from AtlasMediaGroup/abhi-test 
fixes of JIRA issues.
 2021-03-02 20:45:18 -06:00
Paldiu a4ead85701 add annotations dependency 2021-03-01 23:03:49 -06:00
Paldiu 46273b3301 Revert "SQL PreparedStatement Fixes" 
This reverts commit 17347c23a5.
 2021-03-01 23:03:13 -06:00
Paldiu 17347c23a5 SQL PreparedStatement Fixes 2021-02-26 15:29:02 -06:00
Paldiu 718748f1a2 Commit Ultimate 
ultimate super mega mode power upgrade
 2021-02-26 15:26:13 -06:00
Paldiu 830daab8f4 Fix Daemon Error 
Reflection issue when initializing the daemon; trying to call a constructor with one argument using two arguments.

Removed an unused constructor.
 2021-01-08 17:32:54 -06:00
Paldiu 3464a33678 NPE on Thread.join() possible fix 
This bug is hard to decipher mainly due to the thread being terminated somewhere before the thread.join is called. this may be due to the safeClose method defined with serverSocket, but again, I'm not too sure what's up here. This may also be because something failed to execute in one of the try catch statements, causing the thread to never be initialized in the first place.
 2021-01-08 00:25:46 -06:00
PaldiuandGitHub 5754d70d05 Merge branch 'development' into sql-fix 2021-01-07 14:46:13 -05:00
Paldiu fbf2972006 Merge branch 'sql-fix' into paldiu-local 2021-01-07 13:40:59 -06:00
Paldiu aa2836b29a Merge branch 'mbw-fix' into paldiu-local 2021-01-07 13:39:51 -06:00
Paldiu 260368585e reformat 2021-01-07 13:29:47 -06:00
Paldiu 323fd1a031 Should be fine now 2021-01-04 18:27:57 -06:00
Paldiu c7b0f77910 Merge branch 'development' into paldiu-local 2021-01-04 13:14:53 -06:00
Paldiu a4e23dc03f Codacy Complacency Part 2 2020-12-29 22:14:57 -06:00
Paldiu 7a394e52e4 Codacy complacency 2020-12-29 22:06:12 -06:00
Paldiu 9352a48650 Finalized lombok removal 
Finally removed all lomboks, also reduced npath complexity for FreedomCommand.FCommand#execute and removed empty constructor from Discord
 2020-12-29 21:37:50 -06:00
PaldiuandGitHub a849e01ce5 Merge pull request #12 from AtlasMediaGroup/FS-59 
admin chat discord formatting (FS-59)
 2020-12-29 15:34:48 -05:00
PaldiuandGitHub c0ac0365eb Merge pull request #13 from AtlasMediaGroup/Elmon11-patch-1 
Make gcmd not work on admins

//MERGE COMMIT:
At least one build check passed, the failing check is irrelevant.
 2020-12-28 07:41:58 -05:00
Paldiu d71f5452ad Changed instance of SplittableRandom back to Random 
Overridable methods required Random instead of SplittableRandom and caused a build failure in the previous commit. This should fix the build failure.
 2020-12-26 10:30:30 -05:00
Paldiu eb9759f2d8 Replaced All Instances of Random With SplittableRandom 
SplittableRandom is faster (negligable) than Random and is also able to recursively return new instances of itself for an even more complex pseudo random generator compared to the default Random supplied by Java.
 2020-12-25 15:57:10 -05:00
Paldiu dec35f76e4 Minor fix 
Switched from a lengthy if else to a ternary.
 2020-12-25 15:51:17 -05:00
Paldiu 97edce0a67 Fixes for Codacy; 
These fixes are designed to satisfy codacy.

However, codacy reports a NPath Complexity of 649, whereas the current, recommended, and standardized threshold is 200.

This is caused by FreedomCommand#execute(CommandSender, String, String[]);
 2020-12-25 15:35:33 -05:00
Paldiu 361aa4ee04 Bugfix on Commit #5c0f77c 
A mismatched argument count during constructor initialization in Module_logs.class was fixed in this patch.
 2020-12-25 15:20:34 -05:00