Commit graph

81 commits

Author SHA1 Message Date
Video bf2323bed2 Squashed commit of the following:
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 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 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 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 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 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 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 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 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 02:44:23 -07:00
Video 871acc2eeb Actually, let's make it possible to disable it if needed 2021-08-10 04:13:23 -06:00
Video a9c9979b1c FS-218 2021-08-10 04:06:41 -06:00
Video 9dd0298f56
Bug fixes, improvements, and removals (FS-192) (#46)
* Three fixes

* Fixes /tempban throwing a NullPointerException when trying to get a player who isn't on the server but was in the past
* Fixes /tempban banning players for 24 hours regardless of the duration defined
* Fixes /list -t throwing a NullPointerException when performed from a non-player source (such as Telnet)

* Removes hubworld entriely

* Configurable blacklists for tag, muted commands, and wildcard

Changes:
* Moves globally blocked commands to the `global` subsection of the original `blocked_commands` section. You *will* need to update your configurations
* /wildcard's command blacklist is now configurable under the `wildcard` section in `blocked_commands`.
* The commands muted players can't use are now configurable under the `muted` section in `blocked_commands`.
* Removes some commented-out globally blocked command entries.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-05-09 16:42:31 +01:00
Video 407b63e48b Fixes FS-137 2021-04-26 01:23:24 -06:00
Nathan Curran b9f7ab3ec3
Change punishment from kicking to muting on spam (FS-97) (#45) 2021-04-22 21:54:29 +10:00
Video 2cdf1e66a6
Disables block gravity and makes it togglable (FS-89) (#50)
* Disables block gravity by default (FS-89)

* Combine these checks as Codacy ever so kindly suggested
2021-04-19 17:34:36 +10:00
Elmon11 dca5e30291
Actually display assistant exec in game (#37)
* Actually display assistant exec in game

* Update RankManager.java

* Update ConfigEntry.java

* Update FUtil.java

Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-04-04 22:24:06 +10: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 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
speed b9606fa0e3 admin chat discord formatting (FS-59) 2020-12-26 18:54:15 -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 de496970d9 remove reddit system
jraw free 🦀🦀🦀
2020-12-24 13:09:42 -05:00
SupItsDillon 7a11c9062d
Update ConfigEntry.java
config option for verification
2020-12-08 16:09:26 +00: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
Telesphoreo a537183545 Add adminchat channel 2020-11-14 20:13:59 -06:00
Seth 533e4fe369
Login messages for players. Still need to come up with login messaghes 2020-10-02 02:27:06 -07:00
Telesphoreo 54e6e2f9b1 relying on someone else to look this over to see if i missed anything 2020-09-27 21:51:15 -05:00
Telesphoreo eb6514332e fix the config issues 2020-09-14 21:58:46 -05:00
Seth 81eb333b6a
Pterodactyl 2020-09-14 02:36:25 -07:00
speedxx 24575aba88 index httpd module 2020-08-17 18:17:45 -04:00
Telesphoreo 090c445aa9 seth kelly 2020-08-16 22:33:35 -05:00
Telesphoreo 53038ca3b2 fuck intellij 2020-08-15 17:42:46 -05:00
Telesphoreo da80f1b69e Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development"
This reverts commit 4407e9e6ec, reversing
changes made to e4c9ea656e.
2020-08-15 17:41:23 -05:00
Seth f5b5fcd5ef
Admins are now known as staff
To other developers: If you find places where staff are refered to as only admins pls fix it for me.
2020-08-14 23:44:57 -07:00
Seth 00f94e47f1
github is a love hate relationship 2020-08-09 17:49:52 -07:00
Seth 2ecde80b5f
AMP automation 2020-08-07 22:51:09 -07: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
Seth 76bb2d08ac
Split gcmd sub cmds out n other stuff 2020-07-31 21:10:44 -07:00
speedxx 6f2d5aa08d add magical saddle to shop 2020-07-25 22:59:37 -04:00
Seth d12a121300
useless 2020-07-09 15:29:00 -07: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
Super_ 8a60ae2235 respawn anchor place prevention 2020-07-02 08:13:20 -04:00
Seth 19ed60d407
Bossbar reactions and stacking potato 2020-07-02 01:42:27 -07:00
Seth eb58419a3a
1.16, overhaul of player data 2020-06-30 00:25:38 -07:00
ZeroEpoch1969 4ddcc3b8d7
SQL DB is a WIP 2020-05-29 03:14:21 -07:00
ZeroEpoch1969 c49abd1f4a
got bored 2020-04-23 04:18:03 -07:00
ZeroEpoch1969 cbc1d997ec
chat reactions 2020-04-08 01:34:08 -07:00
ZeroEpoch1969 af935cb824
shops stuffs 2020-04-07 19:20:01 -07:00
ZeroEpoch1969 c94ce6b276
things 2020-03-09 18:58:45 -07:00
ZeroEpoch1969 2d7353c076
block beehives 2020-02-08 21:52:43 -07:00
Super_ 89b91598fb why dont i ever commit 2020-01-11 17:44:13 -05:00
Super_ 1181de8ed4 i hate video ass smash 2020-01-04 18:35:41 -05:00
Super_ 73a799d709 customizable login title 2019-12-24 20:05:36 -05:00
Super_ 5206ab5b27 ride for ops, 4chan, and more toggles 2019-12-09 19:59:17 -05:00
ZeroEpoch1969 4ca89c6bf2
probably broke something 2019-11-28 02:08:36 -07:00
ZeroEpoch1969 e0bbbbdda8
assistant executive title now exists 2019-11-24 11:56:32 -07:00
Super_ 337a612437 tpr on join (#153) 2019-11-18 16:45:18 -05:00