Commit Graph

2214 Commits

Author SHA1 Message Date
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
fc3fe871b3 FS-381 2021-08-05 00:43:01 -06:00
Video
e99aaa2eb4 Fixes FS-37
Fixes an oversight introduced in 76bb2d08ac in which the configuration is loaded twice.
2021-08-05 00:32:23 -06:00
Ryan Wild
62529a6171
Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development 2021-07-17 13:18:18 +01:00
Paldiu
0caf972248
Merge pull request #90 from AtlasMediaGroup/FS-309
2 bugfixes, one command (FS-309)
2021-07-16 09:05:57 -05:00
Ryan
a37364d07e
Correct JDK Version in README (#92)
It's currently wrong so needed updating.
2021-07-16 11:43:46 +01:00
Video
4ac9844534
Merge branch 'development' into FS-309 2021-07-12 22:53:44 -06:00
Ryan
939e98b759
Update badges (#88)
Remove TravisCI
Add Github Maven Build Action 
Add CodeQL Badge
2021-07-08 20:48:41 +01:00
Ryan
d99f3e657b
Let's actually do dependency uplifts (#89) 2021-07-08 20:48:27 +01:00
Ryan
92bbb62379
Temporarily re-naming /clearchat to /cleanchat (#91)
* Temporarily re-naming /clearchat to /cleanchat

Due to another plugin which currently doesn't quite have all the permissions working, this command is not currently able to be executed as it stands.

* Shhh I know I'm an idiot
2021-07-05 23:29:22 +01:00
Video
e4a0943af2
Merge branch 'development' into FS-309 2021-06-29 22:00:13 -06:00
Video
36bd8c0fad 2 bugfixes
- Fixes FS-309 by checking if a material provided is actually a block before caging someone.
- Fixes a bug that causes the command to throw an ArrayOutOfBoundsException if one were to use a command like `/cage player1 block`.
2021-06-29 21:52:46 -06:00
Nathan Curran
d77f59435b
Use 'getPlayer()' to prevent NPE (FS-159) (#87)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 15:06:15 +01:00
Video
a08fd2afb6
Adds /seed command (FS-225) (#85)
* Create Command_seed.java

* Addresses requested changes

* My IDE decided to try to "fix" things with *s in imports

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-26 14:25:08 +01:00
Ryan
6fd075fe96
Start building Java 16 (#84)
* Start building Java 16

* Re-apply Fleek's change

* Removed the shitty Github auto formatted white space.

* Update to the maven build in Github workflows

Given TravisCI has started to charge, I guess this might be what we move back to using as our main way to verify if something can actually build.

* Update maven.yml

* Delete .travis.yml
2021-06-24 21:21:39 +01:00
Video
f57fc56f4a
Merge pull request #83 from AtlasMediaGroup/FS-239-to-FS-242
Logs even more punishment types (FS-239, FS-240, FS-241, FS-242)
2021-06-19 03:20:47 -06:00
Ryan
a6ca6b122c
Merge branch 'development' into FS-239-to-FS-242 2021-06-18 13:24:15 +01:00
Video
064e73f58b
ez (#77) 2021-06-18 13:16:52 +01:00
Video
32138b2e59 Order of operations fix 2021-06-17 13:41:25 -06:00
Video
e1c3bad4d0 Even more punishment log types
Here's what I've changed in this commit:
- Adds /blockcmd to the punishment log (FS-239)
- Adds /blockedit and /blockpvp to the punishment log (FS-240)
- Adds /cage to the punishment log (FS-241)
- Adds /orbit to the punishment log (FS-242)
- Changes the order of operations in some commands to be a bit more consistent
2021-06-17 06:56:52 -06:00
Video
4e78027f0c
Merge pull request #79 from AtlasMediaGroup/FS-307
Fixes the EntityWiper not toggling properly (FS-307)
2021-06-17 06:12:26 -06:00
Video
721f4f9fc3
Merge branch 'development' into FS-307 2021-06-17 05:56:56 -06:00
Video
24ad2611a9
Merge pull request #81 from AtlasMediaGroup/FS-201
Admins can now see commands of everyone, regardless of rank (FS-201)
2021-06-17 05:54:10 -06:00
Video
c238f251f2
Merge branch 'development' into FS-201 2021-06-17 05:46:40 -06:00
Video
02848e3439
Merge pull request #82 from AtlasMediaGroup/FS-199
Prevents entities of type PLAYER from being purged in /entitywipe (FS-199)
2021-06-17 05:46:28 -06:00
Video
9550f54e2b
Merge branch 'development' into FS-199 2021-06-17 05:37:30 -06:00
Video
39dade78e3
Merge pull request #80 from AtlasMediaGroup/FS-24-Round-2
Code quality improvements (FS-24)
2021-06-17 05:35:55 -06:00
Video
5b6d8b01a4
Merge branch 'development' into FS-24-Round-2 2021-06-17 05:25:42 -06:00
Video
96bc83cead
Merge pull request #78 from AtlasMediaGroup/FS-207
Two fixes, one commit (FS-207)
2021-06-17 04:58:26 -06:00
Video
be700a90ce Simple fix 2021-06-16 22:42:45 -06:00
Video
6d1fce1716 FS-201 2021-06-16 22:06:12 -06:00
Video
d3665f31fe Shut up Codacy 2021-06-16 21:56:25 -06:00
Video
4188cb80fa FS-54 2021-06-16 21:10:08 -06: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
f4749559d2 FS-25 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
96d47e8e0c Update EntityWiper.java 2021-06-16 17:47:09 -06:00
Video
3027e2a18c Two fixes, one commit
To kill two birds with one stone, I've done two fixes in this commit.
- Fixes issue that caused quiet warns to behave improperly (e.g. the warnings wouldn't increment if quiet)
- Added WARN to the PunishmentType list.
2021-06-16 17:29:57 -06:00
Ryan
06025b2e69
Updated permissions to re-baseline with the dev server (#75)
Updating this to be based off of the dev server as it seems this has not been updated in some time. Primary purpose is to add the crackshot bypass removal for everyone (Though allow admins to bypass) and to add a start of network manager perms in the hopes it makes it more usable going forward.
2021-06-13 19:51:27 +01:00
Video
da7e8f64aa
Continuation on that notes thing (#74)
I forgot to remove the dependency after I removed the code that used JSONMessage. This fixes that by removing both the repository and the dependency from the pom file.
2021-06-12 11:26:40 +01:00
Ryan
17b051e2a7 Retired support for 2021.02 fully. (#72) 2021-06-07 16:26:15 +01:00
Nathan Curran
77a05f22a8 TotalFreedomMod May Update 2021-06-07 16:26:15 +01:00
Nathan Curran
5c3ef1f107 Bump version 2021-06-07 16:26:15 +01:00
Video
53c5991971 Addresses FS-224 (#70) 2021-06-07 16:26:15 +01:00
Nathan Curran
ff760a6c11 Use long instead of int and use offset to check time (FS-181) (#69)
* Use long instead of int and use offset to check time (FS-181)

* Remove star import
2021-06-07 16:26:15 +01:00
Nathan Curran
63069ff9ec Calculate the player count without offline players (FS-247) (#68)
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
2021-06-07 16:26:15 +01:00
Nathan Curran
5e63b71861 Small modification to new TFGuilds (FS-255) (#67) 2021-06-07 16:26:15 +01:00
Ryan
b72782de4f Add //g to blocked commands (#62)
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
2021-06-07 16:26:15 +01:00