2015-11-18 20:41:51 +00:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
2018-08-01 05:58:38 +00:00
|
|
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
2018-07-25 00:06:58 +00:00
|
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
2015-11-18 20:41:51 +00:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
|
|
|
<groupId>me.totalfreedom</groupId>
|
2019-11-28 09:28:48 +00:00
|
|
|
<artifactId>TotalFreedomMod</artifactId>
|
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 00:06:21 +00:00
|
|
|
<version>2021.06</version>
|
2015-11-18 20:41:51 +00:00
|
|
|
<packaging>jar</packaging>
|
|
|
|
|
|
|
|
<properties>
|
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
2021-02-26 16:53:00 +00:00
|
|
|
<tfm.build.codename>Phoenix</tfm.build.codename>
|
2015-11-22 18:26:47 +00:00
|
|
|
<jar.finalName>${project.name}</jar.finalName>
|
2018-07-25 00:06:58 +00:00
|
|
|
<timestamp>${maven.build.timestamp}</timestamp>
|
|
|
|
<maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
|
2015-11-18 20:41:51 +00:00
|
|
|
</properties>
|
|
|
|
|
|
|
|
<name>TotalFreedomMod</name>
|
|
|
|
<description>Server modification for the TotalFreedom server</description>
|
2020-12-24 18:09:42 +00:00
|
|
|
<url>https://github.com/AtlasMediaGroup/TotalFreedomMod</url>
|
2015-11-18 20:41:51 +00:00
|
|
|
|
|
|
|
<licenses>
|
|
|
|
<license>
|
|
|
|
<name>TotalFreedom General License</name>
|
|
|
|
<url>https://github.com/TotalFreedom/License/blob/master/LICENSE.md</url>
|
|
|
|
</license>
|
|
|
|
</licenses>
|
|
|
|
|
|
|
|
<organization>
|
2020-01-12 02:59:12 +00:00
|
|
|
<name>TotalFreedom</name>
|
2015-11-18 20:41:51 +00:00
|
|
|
<url>https://totalfreedom.me</url>
|
|
|
|
</organization>
|
|
|
|
|
|
|
|
<scm>
|
2018-07-25 00:06:58 +00:00
|
|
|
<connection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</connection>
|
|
|
|
<developerConnection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</developerConnection>
|
2018-07-25 02:44:00 +00:00
|
|
|
<url>git@github.com:TFPatches/TotalFreedomMod.git</url>
|
2015-11-18 20:41:51 +00:00
|
|
|
</scm>
|
|
|
|
|
|
|
|
<repositories>
|
2017-01-07 23:37:25 +00:00
|
|
|
<repository>
|
|
|
|
<id>jitpack.io</id>
|
|
|
|
<url>https://jitpack.io</url>
|
|
|
|
</repository>
|
2018-07-25 00:06:58 +00:00
|
|
|
|
2020-08-02 20:26:21 +00:00
|
|
|
<repository>
|
|
|
|
<id>CodeMC</id>
|
2020-08-31 00:13:46 +00:00
|
|
|
<url>https://repo.codemc.org/repository/maven-public/</url>
|
|
|
|
</repository>
|
|
|
|
|
|
|
|
<repository>
|
|
|
|
<id>nms-repo</id>
|
|
|
|
<url>https://repo.codemc.org/repository/nms/</url>
|
2020-08-02 20:26:21 +00:00
|
|
|
</repository>
|
|
|
|
|
2017-01-07 23:37:25 +00:00
|
|
|
<repository>
|
|
|
|
<id>spigot-repo</id>
|
|
|
|
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
|
|
|
</repository>
|
2018-07-25 00:06:58 +00:00
|
|
|
|
2020-04-14 06:40:22 +00:00
|
|
|
<repository>
|
|
|
|
<id>enginehub</id>
|
|
|
|
<url>https://maven.enginehub.org/repo/</url>
|
|
|
|
</repository>
|
|
|
|
|
2017-10-14 13:33:53 +00:00
|
|
|
<repository>
|
2018-07-25 00:06:58 +00:00
|
|
|
<id>elmakers-repo</id>
|
2020-12-24 22:52:35 +00:00
|
|
|
<url>https://maven.elmakers.com/repository/</url>
|
2017-10-14 13:33:53 +00:00
|
|
|
</repository>
|
2018-07-25 00:06:58 +00:00
|
|
|
|
2017-01-08 12:42:49 +00:00
|
|
|
<repository>
|
|
|
|
<id>sk89q-snapshots</id>
|
2020-12-24 22:52:35 +00:00
|
|
|
<url>https://maven.sk89q.com/artifactory/repo</url>
|
2018-07-25 00:06:58 +00:00
|
|
|
</repository>
|
|
|
|
|
|
|
|
<repository>
|
2021-04-09 11:20:33 +00:00
|
|
|
<id>dv8tion</id>
|
|
|
|
<name>m2-dv8tion</name>
|
|
|
|
<url>https://m2.dv8tion.net/releases/</url>
|
2018-07-25 00:06:58 +00:00
|
|
|
</repository>
|
|
|
|
|
2018-07-26 07:35:31 +00:00
|
|
|
<repository>
|
2018-07-26 21:08:48 +00:00
|
|
|
<id>playpro</id>
|
|
|
|
<url>https://maven.playpro.com/</url>
|
2018-07-26 07:35:31 +00:00
|
|
|
</repository>
|
|
|
|
|
2018-07-25 00:06:58 +00:00
|
|
|
<repository>
|
|
|
|
<id>md_5-public</id>
|
2020-12-24 22:52:35 +00:00
|
|
|
<url>https://repo.md-5.net/content/groups/public/</url>
|
2018-07-25 00:06:58 +00:00
|
|
|
</repository>
|
|
|
|
|
|
|
|
<repository>
|
|
|
|
<id>dmulloy2-repo</id>
|
2020-12-24 22:52:35 +00:00
|
|
|
<url>https://repo.dmulloy2.net/nexus/repository/public/</url>
|
2018-07-25 00:06:58 +00:00
|
|
|
</repository>
|
|
|
|
|
|
|
|
<repository>
|
|
|
|
<id>sk89q-repo</id>
|
2020-12-24 22:52:35 +00:00
|
|
|
<url>https://maven.sk89q.com/repo/</url>
|
2017-01-08 12:42:49 +00:00
|
|
|
</repository>
|
2019-11-13 02:50:53 +00:00
|
|
|
|
2020-01-15 23:10:00 +00:00
|
|
|
<repository>
|
|
|
|
<id>papermc</id>
|
|
|
|
<url>https://papermc.io/repo/repository/maven-public/</url>
|
|
|
|
</repository>
|
2020-01-25 06:27:16 +00:00
|
|
|
|
2020-08-13 03:07:15 +00:00
|
|
|
<repository>
|
|
|
|
<id>ess-repo</id>
|
|
|
|
<url>https://ci.ender.zone/plugin/repository/everything/</url>
|
|
|
|
</repository>
|
2015-11-18 20:41:51 +00:00
|
|
|
</repositories>
|
|
|
|
|
|
|
|
<dependencies>
|
|
|
|
|
2019-07-17 19:35:36 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>commons-io</groupId>
|
|
|
|
<artifactId>commons-io</artifactId>
|
2020-10-29 23:47:53 +00:00
|
|
|
<version>2.8.0</version>
|
2019-07-17 19:35:36 +00:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2019-07-31 04:35:41 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-lang3</artifactId>
|
2020-08-04 06:31:26 +00:00
|
|
|
<version>3.11</version>
|
2019-07-31 04:35:41 +00:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2020-01-25 06:27:16 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>commons-codec</groupId>
|
|
|
|
<artifactId>commons-codec</artifactId>
|
2020-10-29 23:47:53 +00:00
|
|
|
<version>1.15</version>
|
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
<dependency>
|
2020-12-28 22:04:14 +00:00
|
|
|
<groupId>com.github.speedxx</groupId>
|
|
|
|
<artifactId>Mojangson</artifactId>
|
|
|
|
<version>1957eef8d6</version>
|
2020-10-29 23:47:53 +00:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.bstats</groupId>
|
|
|
|
<artifactId>bstats-bukkit</artifactId>
|
2020-12-28 22:04:14 +00:00
|
|
|
<version>1.8</version>
|
2020-01-25 06:27:16 +00:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2015-11-18 20:41:51 +00:00
|
|
|
<dependency>
|
2018-07-25 00:06:58 +00:00
|
|
|
<groupId>org.spigotmc</groupId>
|
2020-08-31 00:13:46 +00:00
|
|
|
<artifactId>spigot</artifactId>
|
2021-02-25 21:42:30 +00:00
|
|
|
<version>1.16.5-R0.1-SNAPSHOT</version>
|
2017-12-29 18:12:47 +00:00
|
|
|
<scope>provided</scope>
|
2015-11-18 20:41:51 +00:00
|
|
|
</dependency>
|
|
|
|
|
2017-01-07 23:37:25 +00:00
|
|
|
<dependency>
|
2020-10-29 23:47:53 +00:00
|
|
|
<groupId>com.github.TotalFreedomMC</groupId>
|
2017-01-07 23:37:25 +00:00
|
|
|
<artifactId>BukkitTelnet</artifactId>
|
2020-10-29 23:47:53 +00:00
|
|
|
<version>541e9fdb84</version>
|
2017-12-29 18:12:47 +00:00
|
|
|
<scope>provided</scope>
|
2016-03-02 19:28:01 +00:00
|
|
|
</dependency>
|
|
|
|
|
2018-07-25 00:06:58 +00:00
|
|
|
<dependency>
|
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 00:06:21 +00:00
|
|
|
<groupId>com.github.AtlasMediaGroup</groupId>
|
2020-07-07 08:36:29 +00:00
|
|
|
<artifactId>TF-LibsDisguises</artifactId>
|
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 00:06:21 +00:00
|
|
|
<version>5a340341b0</version>
|
2020-08-18 04:53:21 +00:00
|
|
|
<scope>provided</scope>
|
2019-07-17 19:35:36 +00:00
|
|
|
</dependency>
|
|
|
|
|
2018-07-25 00:06:58 +00:00
|
|
|
<dependency>
|
2020-04-14 06:40:22 +00:00
|
|
|
<groupId>com.sk89q.worldedit</groupId>
|
|
|
|
<artifactId>worldedit-bukkit</artifactId>
|
2020-11-03 05:33:04 +00:00
|
|
|
<version>7.3.0-SNAPSHOT</version>
|
2018-08-08 21:37:48 +00:00
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2017-07-26 01:07:22 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>net.ess3</groupId>
|
2019-11-03 22:00:58 +00:00
|
|
|
<artifactId>EssentialsX</artifactId>
|
2020-12-04 00:28:53 +00:00
|
|
|
<version>2.18.2</version>
|
2017-12-29 18:12:47 +00:00
|
|
|
<scope>provided</scope>
|
2017-07-26 01:07:22 +00:00
|
|
|
</dependency>
|
2018-01-14 21:53:05 +00:00
|
|
|
|
2015-11-18 20:41:51 +00:00
|
|
|
<dependency>
|
2018-07-25 00:06:58 +00:00
|
|
|
<groupId>net.dv8tion</groupId>
|
|
|
|
<artifactId>JDA</artifactId>
|
2021-04-09 11:20:33 +00:00
|
|
|
<version>4.2.1_255</version>
|
2018-07-25 02:44:00 +00:00
|
|
|
<scope>provided</scope>
|
2015-11-18 20:41:51 +00:00
|
|
|
</dependency>
|
|
|
|
|
2017-10-14 13:33:53 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>net.coreprotect</groupId>
|
2018-07-26 21:08:48 +00:00
|
|
|
<artifactId>coreprotect</artifactId>
|
2020-12-04 00:28:53 +00:00
|
|
|
<version>19.3</version>
|
2019-04-23 07:36:51 +00:00
|
|
|
<scope>provided</scope>
|
2017-10-14 13:33:53 +00:00
|
|
|
</dependency>
|
2018-01-14 21:53:05 +00:00
|
|
|
|
2017-10-14 13:33:53 +00:00
|
|
|
<dependency>
|
2020-04-14 06:40:22 +00:00
|
|
|
<groupId>com.sk89q.worldguard</groupId>
|
|
|
|
<artifactId>worldguard-bukkit</artifactId>
|
2020-10-20 00:07:44 +00:00
|
|
|
<version>7.0.4</version>
|
2018-07-25 00:06:58 +00:00
|
|
|
<scope>provided</scope>
|
2017-10-14 13:33:53 +00:00
|
|
|
</dependency>
|
2020-01-15 23:10:00 +00:00
|
|
|
|
|
|
|
<dependency>
|
2020-08-31 00:13:46 +00:00
|
|
|
<groupId>io.papermc</groupId>
|
|
|
|
<artifactId>paperlib</artifactId>
|
2020-12-24 18:09:42 +00:00
|
|
|
<version>1.0.6</version>
|
2020-08-31 00:13:46 +00:00
|
|
|
<scope>compile</scope>
|
2020-01-15 23:10:00 +00:00
|
|
|
</dependency>
|
2020-01-25 06:27:16 +00:00
|
|
|
|
2020-04-08 02:20:01 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.github.vexsoftware</groupId>
|
|
|
|
<artifactId>votifier</artifactId>
|
|
|
|
<version>v1.9</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2020-04-29 23:29:43 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>net.goldtreeservers</groupId>
|
|
|
|
<artifactId>worldguardextraflags</artifactId>
|
|
|
|
<version>4.0.0</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2020-07-01 01:51:06 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.reflections</groupId>
|
|
|
|
<artifactId>reflections</artifactId>
|
2020-10-29 23:47:53 +00:00
|
|
|
<version>0.9.12</version>
|
|
|
|
<scope>compile</scope>
|
2020-07-01 01:51:06 +00:00
|
|
|
</dependency>
|
|
|
|
|
|
|
|
<dependency>
|
2020-10-29 23:47:53 +00:00
|
|
|
<groupId>org.javassist</groupId>
|
2020-07-01 01:51:06 +00:00
|
|
|
<artifactId>javassist</artifactId>
|
2020-10-29 23:47:53 +00:00
|
|
|
<version>3.27.0-GA</version>
|
|
|
|
<scope>compile</scope>
|
2020-07-01 01:51:06 +00:00
|
|
|
</dependency>
|
|
|
|
|
2020-07-21 19:21:51 +00:00
|
|
|
<dependency>
|
2021-05-22 14:06:34 +00:00
|
|
|
<groupId>com.github.AtlasMediaGroup</groupId>
|
2020-07-21 19:21:51 +00:00
|
|
|
<artifactId>TFGuilds</artifactId>
|
2021-05-22 14:06:34 +00:00
|
|
|
<version>master-SNAPSHOT</version>
|
2020-08-13 03:07:15 +00:00
|
|
|
<scope>provided</scope>
|
2020-07-21 19:21:51 +00:00
|
|
|
</dependency>
|
|
|
|
|
2021-03-02 05:03:49 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.jetbrains</groupId>
|
|
|
|
<artifactId>annotations</artifactId>
|
|
|
|
<version>20.1.0</version>
|
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2020-08-01 04:10:44 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
|
|
<version>3.1.1</version>
|
2020-10-29 23:47:53 +00:00
|
|
|
<scope>compile</scope>
|
2020-08-01 04:10:44 +00:00
|
|
|
</dependency>
|
2021-03-02 05:03:49 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.junit.jupiter</groupId>
|
|
|
|
<artifactId>junit-jupiter</artifactId>
|
|
|
|
<version>5.4.2</version>
|
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
2021-05-17 05:50:09 +00:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.sisu</groupId>
|
|
|
|
<artifactId>org.eclipse.sisu.inject</artifactId>
|
|
|
|
<version>0.3.4</version>
|
|
|
|
</dependency>
|
2015-11-18 20:41:51 +00:00
|
|
|
</dependencies>
|
|
|
|
|
|
|
|
<build>
|
|
|
|
<!-- Filter resources for build.properties -->
|
|
|
|
<resources>
|
|
|
|
<resource>
|
|
|
|
<directory>src/main/resources</directory>
|
|
|
|
<filtering>true</filtering>
|
|
|
|
</resource>
|
|
|
|
</resources>
|
|
|
|
|
|
|
|
<plugins>
|
2016-03-06 15:56:15 +00:00
|
|
|
<!-- Compiler -->
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
2020-08-03 01:59:47 +00:00
|
|
|
<version>3.8.1</version>
|
2016-03-06 15:56:15 +00:00
|
|
|
<configuration>
|
|
|
|
<outputFileName>TotalFreedomMod.jar</outputFileName>
|
2021-03-05 21:44:38 +00:00
|
|
|
<compilerVersion>11</compilerVersion>
|
|
|
|
<source>11</source>
|
|
|
|
<target>11</target>
|
2016-03-06 15:56:15 +00:00
|
|
|
</configuration>
|
|
|
|
</plugin>
|
2018-01-14 21:53:05 +00:00
|
|
|
|
2018-08-08 20:05:57 +00:00
|
|
|
<!-- Git describe -->
|
|
|
|
<plugin>
|
|
|
|
<groupId>pl.project13.maven</groupId>
|
|
|
|
<artifactId>git-commit-id-plugin</artifactId>
|
2020-08-30 19:39:07 +00:00
|
|
|
<version>4.0.2</version>
|
2018-08-08 20:05:57 +00:00
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>get-the-git-infos</id>
|
|
|
|
<goals>
|
|
|
|
<goal>revision</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
<execution>
|
|
|
|
<id>validate-the-git-infos</id>
|
|
|
|
<goals>
|
|
|
|
<goal>validateRevision</goal>
|
|
|
|
</goals>
|
|
|
|
<phase>package</phase>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
<configuration>
|
|
|
|
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
|
|
|
|
<prefix>git</prefix>
|
|
|
|
<dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
|
|
|
|
<verbose>false</verbose>
|
|
|
|
<format>properties</format>
|
|
|
|
<failOnNoGitDirectory>false</failOnNoGitDirectory>
|
|
|
|
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
|
|
|
|
<includeOnlyProperties>
|
|
|
|
<includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
|
|
|
|
</includeOnlyProperties>
|
|
|
|
<gitDescribe>
|
|
|
|
<skip>false</skip>
|
|
|
|
<always>false</always>
|
|
|
|
<abbrev>7</abbrev>
|
|
|
|
<dirty>-dirty</dirty>
|
|
|
|
<match>*</match>
|
|
|
|
</gitDescribe>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
|
2015-11-18 20:41:51 +00:00
|
|
|
<!-- Antrun -->
|
|
|
|
<plugin>
|
2018-06-02 08:18:28 +00:00
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
2015-11-18 20:41:51 +00:00
|
|
|
<artifactId>maven-antrun-plugin</artifactId>
|
|
|
|
<version>1.8</version>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
2018-08-08 20:05:57 +00:00
|
|
|
<id>default-cli</id>
|
2015-11-18 20:41:51 +00:00
|
|
|
<phase>initialize</phase>
|
|
|
|
<configuration>
|
2016-03-06 15:56:15 +00:00
|
|
|
<target>
|
2018-08-08 20:05:57 +00:00
|
|
|
<propertyfile file="${project.basedir}/src/main/resources/build.properties"
|
2018-07-25 00:06:58 +00:00
|
|
|
comment="Build information. Edit this to your liking.">
|
|
|
|
<entry key="buildAuthor" default="unknown"/>
|
|
|
|
<entry key="buildNumber" default="0"/>
|
2018-08-08 21:51:40 +00:00
|
|
|
<entry key="buildCodeName" value="${tfm.build.codename}"/>
|
|
|
|
<entry key="buildVersion" value="${project.version}"/>
|
|
|
|
<entry key="buildDate" value="${timestamp}"/>
|
2020-08-13 03:07:15 +00:00
|
|
|
<!--suppress UnresolvedMavenProperty -->
|
|
|
|
<entry key="buildHead" value="${git.commit.id.abbrev}"/>
|
2015-11-18 20:41:51 +00:00
|
|
|
</propertyfile>
|
2016-03-06 15:56:15 +00:00
|
|
|
</target>
|
2015-11-18 20:41:51 +00:00
|
|
|
</configuration>
|
|
|
|
<goals>
|
|
|
|
<goal>run</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
|
|
|
|
<!-- Properties -->
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>properties-maven-plugin</artifactId>
|
|
|
|
<version>1.0.0</version>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<phase>initialize</phase>
|
|
|
|
<goals>
|
|
|
|
<goal>read-project-properties</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<files>
|
2018-08-08 20:05:57 +00:00
|
|
|
<file>${project.basedir}/src/main/resources/build.properties</file>
|
2015-11-18 20:41:51 +00:00
|
|
|
</files>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
|
|
|
|
<!-- Buildnumber -->
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>buildnumber-maven-plugin</artifactId>
|
|
|
|
<version>1.4</version>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<phase>generate-resources</phase>
|
|
|
|
<goals>
|
|
|
|
<goal>create</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
|
|
|
|
<configuration>
|
|
|
|
<buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
|
2018-08-08 20:05:57 +00:00
|
|
|
<buildNumberPropertiesFileLocation>${project.basedir}/src/main/resources/build.properties
|
2018-07-25 00:06:58 +00:00
|
|
|
</buildNumberPropertiesFileLocation>
|
2016-05-12 19:40:39 +00:00
|
|
|
<format>{0,number,#}</format>
|
2015-11-18 20:41:51 +00:00
|
|
|
<items>
|
|
|
|
<item>buildNumber</item>
|
|
|
|
</items>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
2019-07-17 19:35:36 +00:00
|
|
|
|
|
|
|
<!-- Shade -->
|
|
|
|
<plugin>
|
2020-08-03 01:59:47 +00:00
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
|
|
<version>3.2.4</version>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<phase>package</phase>
|
|
|
|
<goals>
|
|
|
|
<goal>shade</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<minimizeJar>true</minimizeJar>
|
2020-09-12 03:27:26 +00:00
|
|
|
<relocations>
|
|
|
|
<relocation>
|
|
|
|
<pattern>io.papermc.lib</pattern>
|
2021-05-17 05:50:09 +00:00
|
|
|
<shadedPattern>me.totalfreedom.totalfreedommod.paperlib
|
|
|
|
</shadedPattern> <!-- Replace this -->
|
2020-09-12 03:27:26 +00:00
|
|
|
</relocation>
|
2020-10-29 23:47:53 +00:00
|
|
|
<relocation>
|
|
|
|
<pattern>org.bstats</pattern>
|
|
|
|
<shadedPattern>me.totalfreedom.totalfreedommod</shadedPattern>
|
|
|
|
</relocation>
|
2020-09-12 03:27:26 +00:00
|
|
|
</relocations>
|
2020-08-03 01:59:47 +00:00
|
|
|
<artifactSet>
|
|
|
|
<includes>
|
|
|
|
<include>commons-io:commons-io</include>
|
|
|
|
<include>org.apache.commons:commons-lang3</include>
|
|
|
|
<include>commons-codec:commons-codec</include>
|
|
|
|
<include>org.reflections:reflections</include>
|
2020-10-29 23:47:53 +00:00
|
|
|
<include>org.javassist:javassist</include>
|
2020-09-12 03:27:26 +00:00
|
|
|
<include>io.papermc:paperlib</include>
|
2020-12-28 22:04:14 +00:00
|
|
|
<include>com.github.speedxx:Mojangson</include>
|
2020-10-29 23:47:53 +00:00
|
|
|
<include>org.bstats:bstats-bukkit</include>
|
2021-03-02 05:03:49 +00:00
|
|
|
<include>org.jetbrains:annotations</include>
|
2020-08-03 01:59:47 +00:00
|
|
|
</includes>
|
|
|
|
</artifactSet>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
2015-11-18 20:41:51 +00:00
|
|
|
</plugins>
|
|
|
|
</build>
|
|
|
|
|
2015-11-22 18:26:47 +00:00
|
|
|
|
|
|
|
<reporting>
|
|
|
|
<!-- Checkstyle -->
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
2020-08-30 19:39:07 +00:00
|
|
|
<version>3.1.1</version>
|
2015-11-22 18:26:47 +00:00
|
|
|
<configuration>
|
|
|
|
<configLocation>checkstyle.xml</configLocation>
|
|
|
|
<failOnViolation>true</failOnViolation>
|
|
|
|
<failsOnError>true</failsOnError>
|
|
|
|
<consoleOutput>true</consoleOutput>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</reporting>
|
2020-12-24 22:52:35 +00:00
|
|
|
</project>
|