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,438 Commits 38 Branches 58 Tags
1364b551d8f7cf9266fc5cd435347bd776e01518
Commit Graph
73 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PaldiuandGitHub 1364b551d8 Merge pull request #340 from AtlasMediaGroup/merge/main/development 
Main -> Development Pro Max
 2023-07-25 14:29:10 -05:00
PaldiuandGitHub 8fee6c7f14 Merge pull request #339 from AtlasMediaGroup/merge/development/main 
Merge development into main
 2023-07-25 13:38:29 -05:00
PaldiuandGitHub d471490a94 Merge pull request #338 from AtlasMediaGroup/merge/main/development 
Main -> Development
 2023-07-24 17:56:29 -05:00
PaldiuandGitHub b5178e6761 Merge pull request #336 from AtlasMediaGroup/feat/configurable-item-drops 
Add configuration value for player item drops (main)
 2023-07-24 17:35:30 -05:00
PaldiuandGitHub 41cf62c8c0 Merge pull request #333 from AtlasMediaGroup/Paldiu-patch-1 
Update plugin.yml
 2023-07-11 11:49:44 -05:00
PaldiuandGitHub 268b71f8a3 Update plugin.yml 2023-07-11 11:38:45 -05:00
PaldiuandGitHub a84a47980a Merge pull request #331 from AtlasMediaGroup/manual-patch-conflict-1 
Update pom.xml
 2023-07-11 11:33:47 -05:00
PaldiuandGitHub 3a502713ea Merge branch 'main' into manual-patch-conflict-1 2023-07-11 09:18:06 -05:00
PaldiuandGitHub 5dc5e5dcc5 Merge pull request #332 from AtlasMediaGroup/manual-patch-conflict-2 
Update plugin.yml
 2023-07-11 09:17:54 -05:00
PaldiuandGitHub 171daf25a4 Update plugin.yml 2023-07-11 09:06:11 -05:00
PaldiuandGitHub 2fa7b6855b Update pom.xml 2023-07-11 09:05:04 -05:00
PaldiuandGitHub 3bcf0f5082 Merge pull request #325 from AtlasMediaGroup/dependabot/maven/development/com.sk89q.worldedit-worldedit-bukkit-7.2.15 
Bump worldedit-bukkit from 7.2.12 to 7.2.15
 2023-07-04 18:49:01 -05:00
PaldiuandGitHub c5f24b46d5 Merge pull request #327 from AtlasMediaGroup/ver/1.19.3-main 
Update to 1.19.4
 2023-07-04 17:37:37 -05:00
PaldiuandGitHub 3016c57e3e Merge branch 'main' into ver/1.19.3-main 2023-07-04 17:25:10 -05:00
PaldiuandGitHub 00351f1163 Merge pull request #326 from AtlasMediaGroup/fix/movement-validator 
Miscellaneous improvements to the movement validator
 2023-07-04 17:24:55 -05:00
PaldiuandGitHub 1c096b97e3 Merge pull request #314 from AtlasMediaGroup/merge-main-to-dev 
Merge main to dev
 2023-03-31 21:29:35 -05:00
Paul Reilly cc48f93556 Merge branch 'main' into development 2023-03-31 21:15:34 -05:00
PaldiuandGitHub dd373fc9aa Merge pull request #307 from AtlasMediaGroup/RELEASE-2022.06.1 
Release 2022.06.1
 2023-03-31 18:25:42 -05: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
Paldiu 5c0f77c7c5 Removal of Lombok 
Lombok implementation removal.

I have also gone through and replaced things with inline methods and variables, lambdas, and simplified loops down, removed unnecessary guard clauses, and overall cleaned up every single class. This took a long time, please do remember to follow proper naming conventions, don't include unnecessary guard clauses, follow exception rules and comment rules, and please PLEASE remember to use the DIAMOND OPERATOR rather than just inferring RAW TYPES!!!

Thank you!!
 2020-12-25 14:46:43 -05:00