TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-28 08:50:35 +00:00
Code Issues Projects Releases Wiki Activity
2125 commits 7 branches 35 tags 8.2 MiB
Commit graph

62 commits

Author SHA1 Message Date
Video a29392cab2 Squashed commit of the following: 
commit 706229004c
Merge: a42cb6af a4adfa9b
Author: Video <videogamesm12@gmail.com>
Date:   Mon Nov 29 03:00:15 2021 -0700

    Merge pull request #131 from AtlasMediaGroup/FS-273

    Moves /rainbowtrail to the shop (FS-273)

commit a4adfa9bee
Merge: 1b5bbd1c a42cb6af
Author: Video <videogamesm12@gmail.com>
Date:   Mon Nov 29 02:46:41 2021 -0700

    Merge branch 'development' into FS-273

commit a42cb6aff9
Merge: 2ecfb886 01fdf766
Author: Video <videogamesm12@gmail.com>
Date:   Mon Nov 29 02:41:34 2021 -0700

    Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags

    Shitcans SavedFlags

commit 01fdf766ee
Merge: 58c21bb1 2ecfb886
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 09:28:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit 1b5bbd1c05
Merge: 8356e831 2ecfb886
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 09:16:21 2021 -0700

    Merge branch 'development' into FS-273

commit 2ecfb88604
Merge: 42143c11 bb2ddf11
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 09:15:16 2021 -0700

    Merge pull request #130 from AtlasMediaGroup/FS-215

    Makes [Discord] a hyperlink (FS-215)

commit 8356e831a5
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 09:11:16 2021 -0700

    Redundancy fix and better protection system

commit ab00cb840f
Merge: ecce62f6 42143c11
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 03:31:45 2021 -0700

    Merge branch 'development' into FS-273

commit bb2ddf1129
Merge: cf9fdc6f 42143c11
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 03:31:19 2021 -0700

    Merge branch 'development' into FS-215

commit 58c21bb1aa
Merge: fdba119d 42143c11
Author: Video <videogamesm12@gmail.com>
Date:   Tue Nov 23 03:30:48 2021 -0700

    Merge branch 'development' into shitcan-savedflags

commit ecce62f6b4
Merge: d8148530 a598c933
Author: Video <videogamesm12@gmail.com>
Date:   Sat Oct 9 00:01:22 2021 -0600

    Merge branch 'development' into FS-273

commit cf9fdc6fe4
Merge: 387ea6f7 a598c933
Author: Video <videogamesm12@gmail.com>
Date:   Fri Oct 8 01:43:33 2021 -0600

    Merge branch 'development' into FS-215

commit 387ea6f71e
Merge: a1ecf881 180cd811
Author: Video <videogamesm12@gmail.com>
Date:   Fri Oct 1 00:35:12 2021 -0600

    Merge branch 'development' into FS-215

commit d814853036
Merge: 47e63869 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sun Sep 12 13:49:05 2021 +0100

    Merge branch 'development' into FS-273

commit a1ecf88109
Merge: bd647afe 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sun Sep 12 13:48:59 2021 +0100

    Merge branch 'development' into FS-215

commit fdba119d5d
Merge: 61857dd0 213a4338
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sun Sep 12 13:48:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 61857dd06f
Merge: 2d18d461 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date:   Sun Sep 12 03:01:37 2021 -0600

    Merge branch 'development' into shitcan-savedflags

commit bd647afe92
Merge: 69f17ef2 0e12f5e7
Author: Video <videogamesm12@gmail.com>
Date:   Sun Sep 12 02:50:39 2021 -0600

    Merge branch 'development' into FS-215

commit 69f17ef2d7
Merge: ee1b27fa aebe1ace
Author: Video <videogamesm12@gmail.com>
Date:   Sun Sep 12 02:01:56 2021 -0600

    Merge branch 'development' into FS-215

commit ee1b27fa0d
Merge: 2bdf14f3 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 11 01:24:00 2021 +0100

    Merge branch 'development' into FS-215

commit 2d18d461fe
Merge: a4c81f20 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 11 01:23:44 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit 47e6386907
Merge: b1062fbb 0a9b95bf
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 11 01:23:13 2021 +0100

    Merge branch 'development' into FS-273

commit 2bdf14f38c
Merge: f6d46b61 44ff621d
Author: Video <videogamesm12@gmail.com>
Date:   Mon Sep 6 15:26:13 2021 -0600

    Merge branch 'development' into FS-215

commit b1062fbb6c
Merge: f69feed4 44ff621d
Author: Video <videogamesm12@gmail.com>
Date:   Mon Sep 6 14:39:32 2021 -0600

    Merge branch 'development' into FS-273

commit f69feed469
Author: Video <videogamesm12@gmail.com>
Date:   Mon Sep 6 01:14:21 2021 -0600

    fixed

commit 8253f94ac4
Merge: daf0126f 54cb0cfa
Author: Video <videogamesm12@gmail.com>
Date:   Mon Sep 6 01:12:00 2021 -0600

    Merge branch 'development' into FS-273

commit a4c81f202c
Merge: 0d09c3a5 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 4 01:23:06 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit daf0126f45
Merge: a51f5c9b 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 4 01:07:39 2021 +0100

    Merge branch 'development' into FS-273

commit f6d46b6178
Merge: ee804d52 23caa4e8
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sat Sep 4 01:07:33 2021 +0100

    Merge branch 'development' into FS-215

commit a51f5c9bbf
Author: Video <videogamesm12@gmail.com>
Date:   Fri Sep 3 13:53:33 2021 -0600

    FS-273

commit ee804d52ff
Author: Video <videogamesm12@gmail.com>
Date:   Fri Sep 3 12:52:15 2021 -0600

    Makes [Discord] a hyperlink (FS-215)

    I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily.

commit 0d09c3a550
Merge: e2ccd14e 4c3f188b
Author: Ryan <Wild1145@users.noreply.github.com>
Date:   Sun Aug 29 20:09:03 2021 +0100

    Merge branch 'development' into shitcan-savedflags

commit e2ccd14eb3
Author: Video <videogamesm12@gmail.com>
Date:   Fri Aug 27 16:54:55 2021 -0600

    Unsaves SavedFlags
 2021-11-29 03:03:00 -07:00
Video 62fe72d99b Code quality and consistency improvements 
Here's all the changes I've made in this commit:
- Resolves FS-44 (AutoEject.java)
- Resolves FS-45 (BlockBlocker.java)
- Resolves FS-47 and FS-48 (InteractBlocker.java)
- Resolves FS-49 (Command_cage.java)
- Resolves FS-50 (Command_manageshop.java)
- Resolves FS-51 (Command_notes.java)
- Resolves FS-52 (Command_potion.java)
- Resolves FS-53 (Command_tag.java)
- Resolves FS-55 (ItemFun.java)
- Resolves FS-56 (Module_list.java)
- Resolves FS-57 (Module_players.java)
- Removes redundant code from InteractBlocker.java
- Misc. code consistency corrections (global)
 2021-06-16 21:10:08 -06:00
Video ed815794ed FS-26 2021-06-16 21:10:08 -06:00
Video 0c12a19d1d FS-27 2021-06-16 21:10:08 -06:00
Video d5238150d0
Curse be gone (#47) 
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
 2021-04-13 14:13:47 +10:00
Ivan 96424694ee fix codacy errors 2021-02-25 17:03:31 -05:00
Ivan 0367d9fd3a my end of the bargain 2021-02-25 16:42:30 -05:00
Paldiu 260368585e reformat 2021-01-07 13:29:47 -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
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 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 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
speed 293ea04c56 staff -> admins 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
 2020-12-03 19:28:53 -05:00
Seth 82d92565e7
lol 2020-10-13 13:37:11 -07:00
speedxx 642725252b fix tossmob not working, toggle stuff 
- fix tossmob not working, sorta revamp it (#259)
- make tossmob and a few other config things toggleable with /toggle (note mp44 and landmines still don't work, i'll probably try and fix those too)
- replace if else statements with switch and catch (yandere dev code type beat)
 2020-08-06 16:05:17 -04:00
Telesphoreo 880b78e528 master 2020-08-05 02:01:21 -05:00
Seth 81df3103b6
Some updates 
- Added Reddit flair sync
- Removed magical saddle because the stacking potato does the same thing
- Some internal improvements
- Fixed bug where if a service throws an error while starting or stopping it breaks the entire plugin
 2020-08-04 15:16:11 -07:00
speedxx 6f2d5aa08d add magical saddle to shop 2020-07-25 22:59:37 -04:00
Seth c87e1b3d64
Read description lol 
- Re-added premium
- Made the clown fish a shop item
- Thank fuck I caught this DB bug with setting null values
 2020-07-09 15:18:29 -07:00
Seth 19ed60d407
Bossbar reactions and stacking potato 2020-07-02 01:42:27 -07:00
Super_ 3eec04ec1c quality control 2020-06-30 23:38:29 -04:00
Super_ 9d71a7f4ae removal of aero 2020-06-30 21:51:06 -04:00
Seth eb58419a3a
1.16, overhaul of player data 2020-06-30 00:25:38 -07:00
ZeroEpoch1969 abbadb55ee
revert shop to names, next up mysql 2020-04-29 16:29:43 -07:00
ZeroEpoch1969 af935cb824
shops stuffs 2020-04-07 19:20:01 -07:00
Super_ 046bebe54c shop updates 2020-02-05 17:07:16 -05:00
Super_ 7940313dd1 ivan u never commit 2020-01-12 20:56:31 -05:00
Super_ 1ee1cbca2b fixed cooldowns and shortened them 2020-01-12 11:18:41 -05:00
Super_ 939e0730fd realtime and the superior sword 2020-01-12 09:51:29 -05:00
Super_ 81621d260d grammatical genius 2020-01-09 06:43:11 -05:00
Super_ 5bb489e8ba new item 2020-01-08 18:00:15 -05:00
Super_ fbcb6da30d shop and grappling hook 2020-01-07 15:13:59 -05:00
Robinson Gallego 233632eaf1 this is what happens when you force push 2019-11-03 17:40:58 -05:00
ZeroEpoch1969 1d932e2c7b
oop 2019-11-03 14:43:29 -07:00
ZeroEpoch1969 b525e53348
cubev3.com 2019-11-03 14:40:05 -07:00
Ivan aad33958f0 hubworld is no longer necessary 2019-11-01 21:35:13 -04:00
Ivan 7d0ea0837e Fixes, added /hub, removed CONSOLE restrictions on some commands 2019-08-18 21:06:47 -04:00
Robinson Gallego 521825024e omg maga tease 
Signed-off-by: Robinson Gallego <robinson.leal7@gmail.com>
 2019-07-28 02:04:16 -04:00
ZeroEpoch1969 591b8644cb
fuck you super there is development 2019-07-10 19:13:57 -07:00
Lemon a77e53932b Merge remote-tracking branch 'origin/TFM-1.13' into TFM-1.13 2019-02-09 14:45:56 +05:00
Lemon b4bb2cf4d8 //UNTESTED: add personal jumppads 2019-02-09 14:45:37 +05:00
ZeroEpoch1969 3d7d363e30
yay more things 2019-01-27 18:49:07 -07:00
ZeroEpoch1969 2716e2500b
Forgot class paths, remove things lombok covers, and optimize imports 2018-07-31 00:01:29 -07:00
Telesphoreo 9c2f181ab9 sIgNifICanT buG FixEs (#105) 
- Ignore totalfreedom.iml (people who clone from Git get this instead of TotalFreedomMod)
- Essentials check before running /denick
- Revise grammar in /invis
- WorldEdit check for /setl (since W/E is no longer a required dependency)
- WorldEdit check for /gtfo
- WorldEdit check for /unban
- Refactor -> LibsDisguiseBridge: isPluginEnabled -> isEnabled
- Remove unneccesary ChatColor in /wiperegions
- Use BlockData in Trailer
- Revise /wiewarps grammar
 2018-07-28 00:11:48 -07:00
Telesphoreo 519b456807 Update CoreProtect and masterbuilder restrictions (#100) 
* Update CoreProtect and masterbuilder restrictions

* intellij is gay shit
 2018-07-27 02:08:48 +05:00
ZeroEpoch1969 d2d93ec76a
Permission adjustments and this triggered my OCD 2018-07-26 00:40:28 -07:00
Telesphoreo 25aa28194b Even more bug fixes (#94) 
- Clean up /commandlist
- /ov now displays proper unknown command message
- /toggle doesnt check for case
- Trailer will now check if CoreProtect is enabled before trying to log
- Temporarily disable master builder world restrictions, causing spam in console everytime a command is one
 2018-07-25 15:09:35 -07:00
ZeroEpoch1969 f671f3c3fa
this was my fault for messing up the pr attempting to resolve the conflicts, im so stupid smh 2018-07-24 19:47:04 -07:00
Telesphoreo 7278176143 asdf (#91) 2018-07-24 19:44:00 -07:00
ZeroEpoch1969 7170b1c999
More progress towards 1.13 2018-07-24 19:08:29 -07:00