Commit graph

2060 commits

Author SHA1 Message Date
Telesphoreo
7d71fc0a29 Pterodactyl integration is broken again 2022-01-16 17:48:23 -06:00
Telesphoreo
a33fd0d978 deadass just guessed the letters 2022-01-16 17:24:17 -06:00
Telesphoreo
a395197305 Actually generate a pom.xml for Maven publication 2021-10-17 14:51:05 -05:00
Telesphoreo
b5b71f8bb2 Update workflow 2021-10-17 14:19:33 -05:00
Telesphoreo
c592b1f141 Don't even know why these are here 2021-10-09 21:34:16 -05:00
Telesphoreo
f0ba148b81 Fix not being able to sync the project despite being able to build it 2021-10-09 21:16:20 -05:00
Telesphoreo
a8826c22cc Not sure we need these repos anymore 2021-10-09 19:55:15 -05:00
Telesphoreo
17629f9366 Oop 2021-10-09 19:46:27 -05:00
Telesphoreo
725375a597 Merge branch 'development' of https://github.com/TotalFreedomMC/TotalFreedomMod into development 2021-10-09 19:42:13 -05:00
Telesphoreo
30fb1ebbd5 Fix Gradle build so you don't have to have Git 2021-10-09 19:42:11 -05:00
Telesphoreo
78e85787e6
Delete SECURITY.md 2021-10-09 19:21:51 -05:00
Telesphoreo
2636f2c768
Update README.md 2021-10-09 19:21:22 -05:00
Telesphoreo
22278822fe Update this 2021-10-08 18:02:39 -05:00
Telesphoreo
12cf195e55 TotalFreedomMod 7.0.0 2021-10-08 17:54:21 -05:00
Telesphoreo
1906933ec8 Fix a few checkstyle warnings 2021-10-01 03:26:50 -05:00
Telesphoreo
d94011ce38 Styling changes for checkstyle 2021-10-01 03:06:26 -05:00
Telesphoreo
fe9ade1217 look at the top of his head oh no no no no 2021-10-01 02:19:27 -05:00
Telesphoreo
6e3dd60b99 Java 17 🎉 2021-10-01 02:14:23 -05:00
Telesphoreo
5a3f0a4de1 Update CoreProtect 2021-10-01 01:46:58 -05:00
Telesphoreo
b376a8c8e7 Fix shading of bStats 2021-10-01 01:29:07 -05:00
Telesphoreo
761d07b869 Reimplement checkstyle and formatting 2021-10-01 01:03:36 -05:00
Telesphoreo
2e6b990e33 Add codestyle and fix formatting 2021-10-01 00:21:50 -05:00
Telesphoreo
a1f1e4ccc0 In sync with AMG 2021-10-01 00:17:08 -05:00
Telesphoreo
e9839b714f This should not have been removed 2021-09-30 23:51:07 -05:00
Telesphoreo
13480eeb63 e 2021-09-30 22:16:34 -05:00
Telesphoreo
f294eaf10a a 2021-09-30 22:12:03 -05:00
Telesphoreo
8efe844640 Update to use Nexus 2021-09-30 22:08:26 -05:00
Telesphoreo
0df93530f1
Update build.gradle 2021-09-30 14:36:32 -05:00
Telesphoreo
f9dfce8368
Update some dependencies 2021-09-30 14:32:18 -05:00
Telesphoreo
e336df27c6
Delete pom.xml 2021-09-29 19:09:12 -05:00
Telesphoreo
88bdeeaf9f
Delete dependabot.yml 2021-09-29 19:08:25 -05:00
Telesphoreo
b61693b2ab
Merge pull request #312 from TotalFreedomMC/dependabot/maven/development/com.sk89q.worldguard-worldguard-bukkit-7.0.6
Bump worldguard-bukkit from 7.0.4 to 7.0.6
2021-09-29 19:07:54 -05:00
Telesphoreo
afef76efd7
Merge pull request #314 from TotalFreedomMC/dependabot/maven/development/org.spigotmc-spigot-1.17.1-R0.1-SNAPSHOT
Bump spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT
2021-09-29 19:07:34 -05:00
Telesphoreo
9fe3227f1a
Merge pull request #313 from TotalFreedomMC/dependabot/maven/development/net.dv8tion-JDA-4.3.0_331
Bump JDA from 4.2.1_255 to 4.3.0_331
2021-09-29 19:07:13 -05:00
Telesphoreo
512130ec52
Merge pull request #315 from TotalFreedomMC/dependabot/maven/development/commons-io-commons-io-2.11.0
Bump commons-io from 2.8.0 to 2.11.0
2021-09-29 19:07:01 -05:00
dependabot[bot]
5bd7d6fdb4
Bump JDA from 4.2.1_255 to 4.3.0_331
Bumps JDA from 4.2.1_255 to 4.3.0_331.

---
updated-dependencies:
- dependency-name: net.dv8tion:JDA
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:21:08 +00:00
Telesphoreo
f4fe50fca0 Fix compile issues 2021-09-29 18:20:58 -05:00
dependabot[bot]
f37dce7da6
Bump worldguard-bukkit from 7.0.4 to 7.0.6
Bumps worldguard-bukkit from 7.0.4 to 7.0.6.

---
updated-dependencies:
- dependency-name: com.sk89q.worldguard:worldguard-bukkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:20:55 +00:00
dependabot[bot]
8c914ce3d1
Bump spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT
Bumps spigot from 1.16.5-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT.

---
updated-dependencies:
- dependency-name: org.spigotmc:spigot
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 23:16:03 +00:00
Telesphoreo
cfd197b14d Update to 1.17
As a consequence, TFM is now behind AMG
2021-09-29 18:11:22 -05:00
dependabot[bot]
8486fa331d
Bump commons-io from 2.8.0 to 2.11.0
Bumps commons-io from 2.8.0 to 2.11.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 19:53:47 +00:00
Telesphoreo
eaa26f9832 Merge from upstream 2021-09-29 14:50:04 -05:00
Ryan
5322d8ab64
Fixing Github Actions (#107)
Hopefully this should now let us automatically down-sync from Main to Development
2021-08-18 23:45:34 +01:00
Ryan
7657ae1928
Fix Dependabot to target the right branch and open all PR (#106) 2021-08-17 19:28:14 +01:00
Ryan
dcaf1ec11a
Release 2021.06 (#97)
* Update Command_ride.java

* ok, done (FS-156)

* Fixes FS-137

* grammar fix

* Remove a number of wipe commands we don't want anyway

We shouldn't be wiping any of this data within the server now anyway so let's not tempt fate again.

* Why overcomplicating things is a horrifically bad idea (#55)

The longer I look into this plugin's code, the angrier I will become.

This fixes 2 bugs in the /potion command:
- Fixes non-admins being able to clear other players
- Fixes NPE caused when trying to add potion effects to players who are not on the server as a non-admin.

Both of these issues are caused by overcomplicating seemingly simple solutions, hence the name of this commit.

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>

* 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>

* Switched from -c to -ci (#63)

Resolves FS-219

* Added new dependency to allow TFM to compile (#65)

* Name change for Fleek (#64)

* Add //g to blocked commands (#62)

Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>

* Small modification to new TFGuilds (FS-255) (#67)

* Calculate the player count without offline players (FS-247) (#68)

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>

* 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

* Addresses FS-224 (#70)

* 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.

* 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.

* 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.

* Update EntityWiper.java

* FS-27

* FS-26

* FS-25

* 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)

* FS-54

* Shut up Codacy

* FS-201

* Simple fix

* 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

* Order of operations fix

* ez (#77)

* 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

* 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>

* Use 'getPlayer()' to prevent NPE (FS-159) (#87)

Co-authored-by: Ryan <Wild1145@users.noreply.github.com>

* 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`.

* 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

* Let's actually do dependency uplifts (#89)

* Bump release to 2021.06-RC01

* Bump to release version

We're good to go!

Co-authored-by: Video <videogamesm12@gmail.com>
Co-authored-by: Elmon11 <elmon11bussiness@gmail.com>
Co-authored-by: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
Co-authored-by: Paldiu <pawereus@gmail.com>
2021-08-15 01:06:21 +01:00
Ryan
a37364d07e
Correct JDK Version in README (#92)
It's currently wrong so needed updating.
2021-07-16 11:43:46 +01:00
Ryan
939e98b759
Update badges (#88)
Remove TravisCI
Add Github Maven Build Action 
Add CodeQL Badge
2021-07-08 20:48:41 +01:00
Telesphoreo
fc37633dfd this'll have to do 2021-06-30 22:01:11 -05:00
Telesphoreo
32ade2dece this took all day and the build number still doesnt work 2021-06-30 21:48:57 -05:00
Telesphoreo
92394a5b30 Fix all build warnings 2021-06-30 19:38:20 -05:00