From b521fe4a1fc4348f8de0116ca985fc3c911d29d6 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:24:07 +0200 Subject: [PATCH 01/39] Update Contributing file --- .github/CONTRIBUTING.md | 60 ++++++++--------------------------------- 1 file changed, 11 insertions(+), 49 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 968f6ca..32c08a3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,7 +1,5 @@ [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_placeholderapi.md [Discord]: https://helpch.at/discord -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ # Contributing @@ -11,54 +9,18 @@ Please note we have a code of conduct, please follow it in all your interactions ## Pull Request Process -1. Update the README.md with details of changes if it is affected by those changes. -2. Try to prevent any breaking changes affecting the end-user (Developers using the API). -Mention any breaking changes that could affect the end-user. -3. Document any public methods that the end-user might use. +When creating a Pull request should you follow the below rules: -## Code of Conduct +- When pushing towards the code of PlaceholderAPI make the Pull request target the `develop` branch of this repository. +- When pushing towards the wiki (Towards the dedicated Wiki folder) make the Pull request target the `docs/wiki` branch of this repository. +- Any Pull requests targeting the `master` branch for above reasons will be denied and closed. -### Our Pledge +### Code structure +When changing the code of PlaceholderAPI should you follow these basic guidelines for how to do stuff. -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. +#### Codestyle +We follow the Google Codestyle for the project. Please make sure that you follow it when contributing code to this project. -### Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -### Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -### Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -### Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at our [Discord]. All -complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -### Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] +#### Documentation +When you implement/change methods that are supposed to be usable by the end-user (developer) is it required to also add or update the corresponding Javadocs of the methods. +Deprecating a method requires you to add a `@deprecated` tag to the comments and mention the next version this may get removed. From fbdd789dbe0e023bea67580ddf0e7025e3b8017a Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:26:33 +0200 Subject: [PATCH 02/39] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..622ab8f --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,49 @@ +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at our [Discord]. All +complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] From d12c746630f5b244435442c9c735ea00b4577955 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:00:35 +0200 Subject: [PATCH 03/39] Improve content --- .github/CONTRIBUTING.md | 64 ++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 32c08a3..93960b5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,26 +1,58 @@ -[issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_placeholderapi.md +[issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new [Discord]: https://helpch.at/discord +[Code of Conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md -# Contributing +# Contributing Guidelines +We welcome everyone to contribute towards the PlaceholderAPI Project, but doing so will require you to follow specific rules to keep a consistent and welcoming way of contributing. -When contributing to this repository, please first discuss the change you wish to make via [issue] or through [Discord] with the owners of this repository before making a change. +## Issues +Like any other Project can you encounter bugs or a feature is missing for you in the plugin. +For that can you open an [issue] to report a bug or suggest a new feature to be added. -Please note we have a code of conduct, please follow it in all your interactions with the project. +When doing so, make sure you follow the below rules. -## Pull Request Process +### Follow the Template +We have Issue templates to help us get the required information more easly. Please follow the provided template when either filing a bug report or feature request. +We reserve the right to close your issue without warning for not following the templates. -When creating a Pull request should you follow the below rules: +### Using Latest Version +When it comes to bug reports should you always check first, if you're using the latest release of PlaceholderAPI. +Often is a bug you encounter fixed in a newer release. -- When pushing towards the code of PlaceholderAPI make the Pull request target the `develop` branch of this repository. -- When pushing towards the wiki (Towards the dedicated Wiki folder) make the Pull request target the `docs/wiki` branch of this repository. -- Any Pull requests targeting the `master` branch for above reasons will be denied and closed. +You can optionally also try out development builds to see, if your bug is fixed in those. -### Code structure -When changing the code of PlaceholderAPI should you follow these basic guidelines for how to do stuff. +The same rules apply for when making a feature request. -#### Codestyle -We follow the Google Codestyle for the project. Please make sure that you follow it when contributing code to this project. +### No duplicate issue +Make sure that there isn't any existing issue, which is still open, or is closed with a solution/explanation. +Opening a separate issue for a bug report or feature request, that already exists on the issue tracker only slows down the process of fixing the bug or implementing the feature. -#### Documentation -When you implement/change methods that are supposed to be usable by the end-user (developer) is it required to also add or update the corresponding Javadocs of the methods. -Deprecating a method requires you to add a `@deprecated` tag to the comments and mention the next version this may get removed. +If an issue with the bug or feature you want to report/suggest exists, comment on it with your info (bug reports) or give it a :thumbsup: (Feature Request) to show that this is important for you. + +### Issue isn't caused by external sourced +PlaceholderAPI provides a feature to have extensions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said extensions or a separate plugin that uses this extension. +In those cases should you report the issue to the issue tracker of the extension or plugin. + +## Pull requests +As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code like bug fixes or new features, or contributions to its documentation such as the Wiki or the Javadoc. + +### Code contributions +Any contributions to PlaceholderAPI's code should be done towards the `develop` branch. Targeting the `master` branch in your Pull request may get it closed without warning. +Additionally should you follow the `Google Codestyle` when changing the code and Javadoc. + +Some noteworthy points about Javadoc: + +- `@param` tags are in a single line and any additional param tag after one don't have an empty line in between. +Example: +```java +/** + * @param param1 description + * @param param2 description + */ +``` +- Tags follow the order `@param`, `@return`, `@since` and `@deprecated` +- The `@deprecated` tag should mention the version of when the annotated object will be removed. This usually the next minor version. + +## Code of Conduct +We have a [Code of Conduct] to maintain a welcoming atmosphere in this project. +If your contributions go against the above linked Code of Conduct will we reserve the right t deny or revert your contributions and to permanently remove your access from this project. From c76baeae1c01b806a6bd37afed9a699d219b46b7 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:02:20 +0200 Subject: [PATCH 04/39] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 93960b5..13d5289 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,10 +1,12 @@ [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new -[Discord]: https://helpch.at/discord +[discord]: https://helpch.at/discord [Code of Conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md # Contributing Guidelines We welcome everyone to contribute towards the PlaceholderAPI Project, but doing so will require you to follow specific rules to keep a consistent and welcoming way of contributing. +If you have any questions about this contributing file, feel free to contact us on our [Discord Server][discord]. + ## Issues Like any other Project can you encounter bugs or a feature is missing for you in the plugin. For that can you open an [issue] to report a bug or suggest a new feature to be added. From e3d71843ac94321a46b2f97934f870ac82f07294 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:41:35 +0200 Subject: [PATCH 05/39] Fix typos and more info --- .github/CONTRIBUTING.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 13d5289..b63cb85 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,7 @@ [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new [discord]: https://helpch.at/discord [Code of Conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md +[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki # Contributing Guidelines We welcome everyone to contribute towards the PlaceholderAPI Project, but doing so will require you to follow specific rules to keep a consistent and welcoming way of contributing. @@ -31,8 +32,8 @@ Opening a separate issue for a bug report or feature request, that already exist If an issue with the bug or feature you want to report/suggest exists, comment on it with your info (bug reports) or give it a :thumbsup: (Feature Request) to show that this is important for you. -### Issue isn't caused by external sourced -PlaceholderAPI provides a feature to have extensions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said extensions or a separate plugin that uses this extension. +### Issue isn't caused by external source +PlaceholderAPI provides a feature to have extensions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said extensions or a separate plugin that uses those extensions. In those cases should you report the issue to the issue tracker of the extension or plugin. ## Pull requests @@ -53,7 +54,11 @@ Example: */ ``` - Tags follow the order `@param`, `@return`, `@since` and `@deprecated` -- The `@deprecated` tag should mention the version of when the annotated object will be removed. This usually the next minor version. +- The `@deprecated` tag should mention the version of when the annotated object will be removed. This usually would be the next minor version. + +### Wiki/Javadoc contributions +If your Pull request only targets the [wiki] or only changes the Javadoc of PlaceholderAPI (And not its actual code) should Pull requests target the `docs` branch. +The develop branch should only be targeted when you also change some of PlaceholderAPI's code. ## Code of Conduct We have a [Code of Conduct] to maintain a welcoming atmosphere in this project. From 19a80c2d269cb574c3799e031cb09f83e734df86 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 3 Aug 2020 16:51:46 +0200 Subject: [PATCH 06/39] Do some changes --- .github/CONTRIBUTING.md | 50 +++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b63cb85..a13af7e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,65 +1,51 @@ [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new [discord]: https://helpch.at/discord -[Code of Conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md +[code of conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md [wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki +[style]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/config/style # Contributing Guidelines We welcome everyone to contribute towards the PlaceholderAPI Project, but doing so will require you to follow specific rules to keep a consistent and welcoming way of contributing. -If you have any questions about this contributing file, feel free to contact us on our [Discord Server][discord]. +If you have any questions about contributions towards the project, feel free to contact us on our [Discord Server][discord]. ## Issues -Like any other Project can you encounter bugs or a feature is missing for you in the plugin. +Like any other project can you encounter bugs or a feature is missing for you in the plugin. For that can you open an [issue] to report a bug or suggest a new feature to be added. When doing so, make sure you follow the below rules. -### Follow the Template -We have Issue templates to help us get the required information more easly. Please follow the provided template when either filing a bug report or feature request. -We reserve the right to close your issue without warning for not following the templates. +### Follow the template +We have issue templates to help us get the required information more easily. Please follow the provided template when either filing a bug report or feature request. +Your issue may be closed without warning for not following the template. -### Using Latest Version -When it comes to bug reports should you always check first, if you're using the latest release of PlaceholderAPI. -Often is a bug you encounter fixed in a newer release. +### Use the latest version +When it comes to bug reports should you always check first, that you're using the latest release of PlaceholderAPI. +Often the bug you've encountered, is fixed in a newer version. -You can optionally also try out development builds to see, if your bug is fixed in those. - -The same rules apply for when making a feature request. +The same rules apply when making a feature request. ### No duplicate issue -Make sure that there isn't any existing issue, which is still open, or is closed with a solution/explanation. +Make sure that there aren't any existing issues relating to the problem, which are still open, or are closed with a solution/explanation. Opening a separate issue for a bug report or feature request, that already exists on the issue tracker only slows down the process of fixing the bug or implementing the feature. If an issue with the bug or feature you want to report/suggest exists, comment on it with your info (bug reports) or give it a :thumbsup: (Feature Request) to show that this is important for you. ### Issue isn't caused by external source -PlaceholderAPI provides a feature to have extensions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said extensions or a separate plugin that uses those extensions. -In those cases should you report the issue to the issue tracker of the extension or plugin. +PlaceholderAPI provides a feature to have expansions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said expansions or a separate plugin that uses those expansions. +In those cases should you report the issue to the issue tracker of the expansion or plugin. ## Pull requests -As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code like bug fixes or new features, or contributions to its documentation such as the Wiki or the Javadoc. +As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code like bug fixes or new features, or contributions to its documentation such as the [Wiki] or the Javadoc. ### Code contributions Any contributions to PlaceholderAPI's code should be done towards the `develop` branch. Targeting the `master` branch in your Pull request may get it closed without warning. -Additionally should you follow the `Google Codestyle` when changing the code and Javadoc. - -Some noteworthy points about Javadoc: - -- `@param` tags are in a single line and any additional param tag after one don't have an empty line in between. -Example: -```java -/** - * @param param1 description - * @param param2 description - */ -``` -- Tags follow the order `@param`, `@return`, `@since` and `@deprecated` -- The `@deprecated` tag should mention the version of when the annotated object will be removed. This usually would be the next minor version. +Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory. ### Wiki/Javadoc contributions -If your Pull request only targets the [wiki] or only changes the Javadoc of PlaceholderAPI (And not its actual code) should Pull requests target the `docs` branch. +If your pull request only targets the [wiki] or only changes the javadoc comments of PlaceholderAPI (And not its actual code), it should be to `docs` branch. The develop branch should only be targeted when you also change some of PlaceholderAPI's code. ## Code of Conduct We have a [Code of Conduct] to maintain a welcoming atmosphere in this project. -If your contributions go against the above linked Code of Conduct will we reserve the right t deny or revert your contributions and to permanently remove your access from this project. +If your contributions go against the Code of Conduct, linked above, we reserve the right to deny or revert your contributions. From ec9d6295fb4afdf0a2423aa04a9e74aff6722640 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 3 Aug 2020 16:56:58 +0200 Subject: [PATCH 07/39] on their? Sounds better imo --- CODE_OF_CONDUCT.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 622ab8f..1a57eb6 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,6 +1,8 @@ [homepage]: http://contributor-covenant.org [version]: http://contributor-covenant.org/version/1/4/ +[discord]: https://helpch.at/discord + ## Code of Conduct ### Our Pledge @@ -38,7 +40,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ### Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at our [Discord]. All +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team on their [discord server][discord]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. From eb5a93dce2f963ee8db8a25a4fe1174c29f32f62 Mon Sep 17 00:00:00 2001 From: MrIvanPlays Date: Sun, 9 Aug 2020 10:22:21 +0300 Subject: [PATCH 08/39] Attach sources and javadoc jar when deploying --- build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bda91d8..73f669f 100644 --- a/build.gradle +++ b/build.gradle @@ -37,11 +37,16 @@ processResources { } } -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - +java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + + withJavadocJar() + withSourcesJar() +} + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" } shadowJar { From d1e30474455216c79d4334590a4a7cacd7dac837 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 10 Aug 2020 21:29:42 +0200 Subject: [PATCH 09/39] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a13af7e..153c278 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,7 +43,7 @@ Any contributions to PlaceholderAPI's code should be done towards the `develop` Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory. ### Wiki/Javadoc contributions -If your pull request only targets the [wiki] or only changes the javadoc comments of PlaceholderAPI (And not its actual code), it should be to `docs` branch. +If your pull request only targets the [wiki] or only changes the javadoc comments of PlaceholderAPI (And not its actual code), it should be to `docs/wiki` branch. The develop branch should only be targeted when you also change some of PlaceholderAPI's code. ## Code of Conduct From 7555bb0f97a268311a854e8ab8e83f9eb1b1fe5c Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 19 Aug 2020 16:27:48 +0200 Subject: [PATCH 10/39] Update .github/CONTRIBUTING.md Co-authored-by: PiggyPiglet --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 153c278..429786d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,7 +13,7 @@ If you have any questions about contributions towards the project, feel free to Like any other project can you encounter bugs or a feature is missing for you in the plugin. For that can you open an [issue] to report a bug or suggest a new feature to be added. -When doing so, make sure you follow the below rules. +When doing so, make sure you follow rules below: ### Follow the template We have issue templates to help us get the required information more easily. Please follow the provided template when either filing a bug report or feature request. From fe02939466c2a9d71ff61ef45715dfb7036e0603 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:16:03 +0200 Subject: [PATCH 11/39] Add missing getBoolean method --- .../clip/placeholderapi/expansion/PlaceholderExpansion.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java index 385ce4a..2021cc2 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java @@ -199,6 +199,12 @@ public abstract class PlaceholderExpansion extends PlaceholderHook { final ConfigurationSection section = getConfigSection(); return section == null ? Collections.emptyList() : section.getStringList(path); } + + @NotNull + public final boolean getBoolean(@NotNull final String path, final boolean def) { + final ConfigurationSection section = getConfigSection(); + return section == null ? def : section.getBoolean(path, def); + } public final boolean configurationContains(@NotNull final String path) { final ConfigurationSection section = getConfigSection(); From 61a71b9e7329db0a842ec46d6ae420d8cb28683e Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 31 Aug 2020 02:50:08 +0200 Subject: [PATCH 12/39] Add info about target branch. --- wiki/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wiki/README.md b/wiki/README.md index fa4af2a..6f2e77f 100644 --- a/wiki/README.md +++ b/wiki/README.md @@ -8,6 +8,10 @@ It allows you to suggest changes through Pull request while keeping a simple way If you want to contribute towards the wiki would we highly recommend to follow the below contributing Guidelines, to keep the overal style of the wiki intact. +## Target branch +The wiki is handled on a separate branch called `docs/wiki`. +When making a Pull request, make sure to target this specific branch. Any PR not targeting this branch may either be closed or the target changed. + ## Adding your resource(s) If you have one or multiple resources that support PlaceholderAPI (being it by just supporting placeholders from other plugins, or providing your own) can you add them to the wiki in the following ways. From 3fe0f0143cb632bc6304303e7f25318648da2eb9 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 31 Aug 2020 02:50:30 +0200 Subject: [PATCH 13/39] Add note about wiki PRs --- .github/label-commenter-config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index ea41209..32fc0ef 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -55,6 +55,9 @@ labels: - [Bug Report](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=bug_report.md) - [Feature Request](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=feature_request.md) + If you want changes to be made towards the Wiki, would we encourage you to [Make a Pull request](https://github.com/PlaceholderAPI/PlaceholderAPI/pulls). + You can find more information about this process on the [Wiki's Readme](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki/README.md). + > *This is an automated response.* action: close - name: 'Target: Wiki' From d5e27252cf9b7116f830a359b461b098f3aa3729 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 31 Aug 2020 02:52:16 +0200 Subject: [PATCH 14/39] Fix wrong link --- wiki/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/README.md b/wiki/README.md index 6f2e77f..6d67df5 100644 --- a/wiki/README.md +++ b/wiki/README.md @@ -1,6 +1,6 @@ [Wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki [Placeholders]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders -[Plugins using PlaceholderAPI]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders +[Plugins using PlaceholderAPI]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Plugins-using-PlaceholderAPI # Wiki This is the wiki folder. It contains all pages that you can find in our [Wiki]. From 18cfd438b84343422ee20210ad7ba420912697a3 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 31 Aug 2020 03:00:24 +0200 Subject: [PATCH 15/39] Update .github/CONTRIBUTING.md Co-authored-by: PiggyPiglet --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 429786d..b230db7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -11,7 +11,7 @@ If you have any questions about contributions towards the project, feel free to ## Issues Like any other project can you encounter bugs or a feature is missing for you in the plugin. -For that can you open an [issue] to report a bug or suggest a new feature to be added. +For that, you can open an [issue] to report a bug, or suggest a new feature to be added. When doing so, make sure you follow rules below: From 7c404db56b76e933d5e9a66ad510541ebe68c1f5 Mon Sep 17 00:00:00 2001 From: Jacob Bordas Date: Mon, 31 Aug 2020 13:32:11 +0200 Subject: [PATCH 16/39] Added event when all expansions are loaded for developers. --- .../events/ExpansionsLoadedEvent.java | 28 +++++++++++++++++++ .../manager/LocalExpansionManager.java | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java diff --git a/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java new file mode 100644 index 0000000..8a97567 --- /dev/null +++ b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java @@ -0,0 +1,28 @@ +package me.clip.placeholderapi.events; + + +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.NotNull; + +/** + * This event is ran when all expansions are loaded. + * This is done when reloading config, on plugin start and on server load. + * @author jacobbordas (@ignissak) + */ +public class ExpansionsLoadedEvent extends Event { + + @NotNull + private static final HandlerList HANDLERS = new HandlerList(); + + @NotNull + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + @NotNull + public static HandlerList getHandlerList() { + return HANDLERS; + } +} diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index 79f3509..ac3527f 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -36,6 +36,7 @@ import java.util.logging.Level; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.events.ExpansionRegisterEvent; import me.clip.placeholderapi.events.ExpansionUnregisterEvent; +import me.clip.placeholderapi.events.ExpansionsLoadedEvent; import me.clip.placeholderapi.expansion.Cacheable; import me.clip.placeholderapi.expansion.Cleanable; import me.clip.placeholderapi.expansion.Configurable; @@ -320,6 +321,9 @@ public final class LocalExpansionManager implements Listener { Msg.msg(sender, registered == 0 ? "&6No expansions were registered!" : registered + "&a placeholder hooks successfully registered!"); + + final ExpansionsLoadedEvent event = new ExpansionsLoadedEvent(); + Bukkit.getPluginManager().callEvent(event); }); } From 2c13acfd307bd1b86e59e987ee5ace89d510a18e Mon Sep 17 00:00:00 2001 From: Jacob Bordas Date: Tue, 1 Sep 2020 01:31:52 +0200 Subject: [PATCH 17/39] Changes regarding review by Andre Signed-off-by: Jacob Bordas --- .../me/clip/placeholderapi/events/ExpansionsLoadedEvent.java | 4 +--- .../expansion/manager/LocalExpansionManager.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java index 8a97567..d949b8a 100644 --- a/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java +++ b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java @@ -6,9 +6,7 @@ import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; /** - * This event is ran when all expansions are loaded. - * This is done when reloading config, on plugin start and on server load. - * @author jacobbordas (@ignissak) + * This event is called when all expansions are loaded (when reloading config, on plugin start and on server load). */ public class ExpansionsLoadedEvent extends Event { diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index ac3527f..f0add00 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -322,8 +322,7 @@ public final class LocalExpansionManager implements Listener { registered == 0 ? "&6No expansions were registered!" : registered + "&a placeholder hooks successfully registered!"); - final ExpansionsLoadedEvent event = new ExpansionsLoadedEvent(); - Bukkit.getPluginManager().callEvent(event); + Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent()); }); } From 7691dd93adca680bf56a49b5ecdd609737da9715 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:08:50 +0200 Subject: [PATCH 18/39] Add and improve responses --- .github/label-commenter-config.yml | 31 +++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 32fc0ef..c6e85af 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -10,7 +10,7 @@ labels: Please report this issue to the Expansion's main issue-tracker. - > *This is an automated response.* + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* - name: 'Type: Duplicate' labeled: issue: @@ -19,7 +19,7 @@ labels: Please comment on the already existing issue with your information instead of opening your own. - > *This is an automated response.* + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* action: close - name: 'Problem: More info required' labeled: @@ -36,12 +36,14 @@ labels: The easiest way to provide those information is through the `/papi dumb` command which posts the required information and gives a URL to share. - > *This is an automated response.* + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* unlabeled: issue: body: |- Thank you for providing additional information. We will take a look at the issue you encounter and come back to you with a possible solution. + + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* - name: 'Type: Invalid' labeled: issue: @@ -58,7 +60,7 @@ labels: If you want changes to be made towards the Wiki, would we encourage you to [Make a Pull request](https://github.com/PlaceholderAPI/PlaceholderAPI/pulls). You can find more information about this process on the [Wiki's Readme](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki/README.md). - > *This is an automated response.* + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* action: close - name: 'Target: Wiki' labeled: @@ -76,4 +78,23 @@ labels: If you have any questions about submitting a PR for the wiki or have any other questions don't hesitate to ask us about it. - > *This is an automated response.* + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + - name: 'Type: Not a bug' + labeled: + issue: + body: |- + The issue you encounter is not considered a bug and rather an intentional behaviour of PlaceholderAPI and/or one of its expansions. + If you still believe that it is a bug, provide more information and a maintainer of this repository may look at it more closely. + + Before providing more info, always make sure to use the latest version of PlaceholderAPI, as the issue you encounter might already be fixed in a newer version. + Optionally can you also try out [development builds](https://ci.extendedclip.com/job/PlaceholderAPI/) and see if the issue was fixed there. + + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + action: close + unlabeled: + issue: + body: |- + After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible. + + > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + action: open From 325cd2d2844fe78e369aa2253e97a9ce5372caee Mon Sep 17 00:00:00 2001 From: darbyjack Date: Sun, 6 Sep 2020 16:39:15 -0500 Subject: [PATCH 19/39] Added support for 1.16.2 NMS changes --- build.gradle | 2 +- src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bda91d8..bc86bfc 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation "com.google.code.gson:gson:2.8.6" implementation "org.bstats:bstats-bukkit:1.5" - compileOnly "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" + compileOnly "org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" compileOnly "org.jetbrains:annotations:19.0.0" testImplementation "org.openjdk.jmh:jmh-core:1.23" diff --git a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java index ac9a4af..cf2511c 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java @@ -39,7 +39,8 @@ public enum NMSVersion { SPIGOT_1_13_R2("v1_13_R2"), SPIGOT_1_14_R1("v1_14_R1"), SPIGOT_1_15_R1("v1_15_R1"), - SPIGOT_1_16_R1("v1_16_R1"); + SPIGOT_1_16_R1("v1_16_R1"), + SPIGOT_1_16_R2("v1_16_R2"); private final String version; From 9d35f4c3e626d462a6a342e189b655b380e33381 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sat, 12 Sep 2020 22:02:25 +0200 Subject: [PATCH 20/39] Fix issue commenter --- .github/workflows/label_comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label_comment.yml b/.github/workflows/label_comment.yml index 306dec2..796ccca 100644 --- a/.github/workflows/label_comment.yml +++ b/.github/workflows/label_comment.yml @@ -19,6 +19,6 @@ jobs: with: ref: master - name: Send Issue/Pull request comment - uses: peaceiris/actions-label-commenter@v1.5.0 + uses: peaceiris/actions-label-commenter@v1.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} From a74f78bd732c0094152be92f265f822efd77edd7 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sat, 12 Sep 2020 22:05:06 +0200 Subject: [PATCH 21/39] Update placeholders --- .github/label-commenter-config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index c6e85af..07986dc 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -3,7 +3,7 @@ labels: labeled: issue: body: |- - Hello @{{ sender.login }}, + Hello @{{ issue.user.login }}, The issue you encountered is caused by an Expansion and not PlaceholderAPI itself. This issue-tracker is reserved for Bug reports and feature requests towards PlaceholderAPI. @@ -25,7 +25,7 @@ labels: labeled: issue: body: |- - Hello @{{ sender.login }}, + Hello @{{ issue.user.login }}, Your issue unfortunately lacks certain information that we require in order to help you with your issue. Please make sure you provide the following information: @@ -66,7 +66,7 @@ labels: labeled: issue: body: |- - Hello @{{ sender.login }}, + Hello @{{ issue.user.login }}, Thank you for reaching out to us about the wiki. We would like to inform you, that you are now able to directly commit your changes to the wiki through a Pull request. From 35838aa229b479903889697313e2d46d1046abba Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 13 Sep 2020 00:30:27 +0200 Subject: [PATCH 22/39] Fix wrong expansion get in /papi info --- .../me/clip/placeholderapi/commands/impl/local/CommandInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java index 11ec7bd..ca0903a 100644 --- a/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java +++ b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java @@ -47,7 +47,7 @@ public final class CommandInfo extends PlaceholderCommand { } final PlaceholderExpansion expansion = plugin.getLocalExpansionManager() - .findExpansionByName(params.get(0)).orElse(null); + .findExpansionByIdentifier(params.get(0)).orElse(null); if (expansion == null) { Msg.msg(sender, "&cThere is no expansion loaded with the identifier: &f" + params.get(0)); From 549a30b5023ff7a91bc6d977b1ec93ad6e3698d0 Mon Sep 17 00:00:00 2001 From: thienbao860 <35884937+thienbao860@users.noreply.github.com> Date: Sun, 27 Sep 2020 20:05:55 +0700 Subject: [PATCH 23/39] Update Placeholders.md --- wiki/Placeholders.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/Placeholders.md b/wiki/Placeholders.md index 4dd197c..4c2f9bf 100644 --- a/wiki/Placeholders.md +++ b/wiki/Placeholders.md @@ -863,7 +863,7 @@ This placeholder is for all players on the server. ---- - ### **SpeedPerSec** -> /papi ecloud download SpeedPerSecond +> /papi ecloud download SpeedPerSec ``` %speedpersec_blockBreak% From ae06fcd8078951d80acd758d952ec4bf1c060cd1 Mon Sep 17 00:00:00 2001 From: Gianluca Falcomer Date: Mon, 28 Sep 2020 17:23:25 +0200 Subject: [PATCH 24/39] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7711ae7..56f2631 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ PlaceholderAPI has been downloaded over 400,000 times and has been used concurre ## Quick Links - [CI Server][ci] -- [Expansions cloud] +- [Expansions Cloud] - [Placeholder List] - [Spigot Page][spigot] - [Plugin Statistics][statistics] From 1e6fb502a6b73d9a22ce58bffaee094bc2d75ae6 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Thu, 22 Oct 2020 00:54:43 +0200 Subject: [PATCH 25/39] Improve some text --- .github/label-commenter-config.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 07986dc..cda61b9 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -10,7 +10,8 @@ labels: Please report this issue to the Expansion's main issue-tracker. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* - name: 'Type: Duplicate' labeled: issue: @@ -19,7 +20,8 @@ labels: Please comment on the already existing issue with your information instead of opening your own. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* action: close - name: 'Problem: More info required' labeled: @@ -36,7 +38,8 @@ labels: The easiest way to provide those information is through the `/papi dumb` command which posts the required information and gives a URL to share. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* unlabeled: issue: body: |- @@ -60,7 +63,10 @@ labels: If you want changes to be made towards the Wiki, would we encourage you to [Make a Pull request](https://github.com/PlaceholderAPI/PlaceholderAPI/pulls). You can find more information about this process on the [Wiki's Readme](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki/README.md). - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + It is recommended to [join our Discord Server](https://helpch.at/discord) as you often receive faster response compared to the issue tracker here. + + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* action: close - name: 'Target: Wiki' labeled: @@ -78,7 +84,8 @@ labels: If you have any questions about submitting a PR for the wiki or have any other questions don't hesitate to ask us about it. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* - name: 'Type: Not a bug' labeled: issue: @@ -89,12 +96,14 @@ labels: Before providing more info, always make sure to use the latest version of PlaceholderAPI, as the issue you encounter might already be fixed in a newer version. Optionally can you also try out [development builds](https://ci.extendedclip.com/job/PlaceholderAPI/) and see if the issue was fixed there. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* action: close unlabeled: issue: body: |- After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible. - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* action: open From f52bdbc458f75b091679d131c6e9da5ef9214891 Mon Sep 17 00:00:00 2001 From: darbyjack Date: Mon, 2 Nov 2020 14:35:55 -0600 Subject: [PATCH 26/39] Compile under 1.16.4 + add new NMS support --- build.gradle | 2 +- src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bc86bfc..a3491a6 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation "com.google.code.gson:gson:2.8.6" implementation "org.bstats:bstats-bukkit:1.5" - compileOnly "org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" + compileOnly "org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT" compileOnly "org.jetbrains:annotations:19.0.0" testImplementation "org.openjdk.jmh:jmh-core:1.23" diff --git a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java index cf2511c..acd7e0d 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java @@ -40,7 +40,8 @@ public enum NMSVersion { SPIGOT_1_14_R1("v1_14_R1"), SPIGOT_1_15_R1("v1_15_R1"), SPIGOT_1_16_R1("v1_16_R1"), - SPIGOT_1_16_R2("v1_16_R2"); + SPIGOT_1_16_R2("v1_16_R2"), + SPIGOT_1_16_R3("v1_16_R3"); private final String version; From 0d9485ddeccdda792e1663badc2f614d34ed2113 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 15 Nov 2020 15:45:49 +0100 Subject: [PATCH 27/39] Add action for inactive issues. --- .github/label-commenter-config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index cda61b9..6129ee0 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -104,6 +104,26 @@ labels: body: |- After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible. + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* + action: open + - name: 'Type: Inactive' + labeled: + issue: + body: |- + The issue was marked as "inactive" which means it didn't recieve any responses from the Author for a long period of time. + To keep the issue-tracker clean and up to date are we closing issues, that didn't receive any responses for a long time. + + If you're the Author and this issue is still present, make sure to respond to this issue with extra info and **do not create a new issue for the same problem!** + + > *This is an automated response created by a GitHub-Action.* + > *Responding to the bot or mentioning it won't have any effect!* + action: close + unlabeled: + issue: + body: |- + The issue received a response from the Author who confirms this to still be prominent and has therefore been reopened. + > *This is an automated response created by a GitHub-Action.* > *Responding to the bot or mentioning it won't have any effect!* action: open From 93e83efb574b111abf9608c4b502cf7103fda28c Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 15 Nov 2020 15:47:37 +0100 Subject: [PATCH 28/39] Rename label --- .github/label-commenter-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 6129ee0..fda2741 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -107,7 +107,7 @@ labels: > *This is an automated response created by a GitHub-Action.* > *Responding to the bot or mentioning it won't have any effect!* action: open - - name: 'Type: Inactive' + - name: 'Status: Inactive' labeled: issue: body: |- From dcca454bad144d6113c69feff69132de5166a527 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 9 Dec 2020 13:10:11 +0100 Subject: [PATCH 29/39] Mention GitHub Discussions in Template chooser Adds a link to the new [GitHub Discussions page](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions) of this Repository. --- .github/ISSUE_TEMPLATE/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 7553dc0..9192137 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -12,3 +12,6 @@ contact_links: - name: Update Wiki url: https://github.com/PlaceholderAPI/PlaceholderAPI/pulls about: Please make a Pull request towards the "wiki" folder to update the wiki. + - name: Questions + url: https://github.com/PlaceholderAPI/PlaceholderAPI/discussions + about: If you have any questions, ask them in our Discussions Page. From 9c750f50a202ff0918288328aaa07918920c4686 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 9 Dec 2020 18:10:19 +0100 Subject: [PATCH 30/39] Add Type:Question label --- .github/label-commenter-config.yml | 56 ++++++++++++------------------ 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index fda2741..9e68665 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -1,17 +1,20 @@ +comment: + footer: |- + > *This is an automated response created by a **GitHub Action*** + > *Mentioning the bot won't have any effect!* + labels: - name: 'Type: Issue (Expansion)' labeled: issue: body: |- + Hello @{{ issue.user.login }}, The issue you encountered is caused by an Expansion and not PlaceholderAPI itself. This issue-tracker is reserved for Bug reports and feature requests towards PlaceholderAPI. Please report this issue to the Expansion's main issue-tracker. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* - name: 'Type: Duplicate' labeled: issue: @@ -19,9 +22,6 @@ labels: Your issue is already known and a separate issue with the exact same report/feature request already exist. Please comment on the already existing issue with your information instead of opening your own. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* action: close - name: 'Problem: More info required' labeled: @@ -37,16 +37,11 @@ labels: - Currently installed Plugins The easiest way to provide those information is through the `/papi dumb` command which posts the required information and gives a URL to share. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* unlabeled: issue: body: |- Thank you for providing additional information. We will take a look at the issue you encounter and come back to you with a possible solution. - - > *This is an automated response created by a GitHub-Action. Responding to or mentioning this bot has no effect!* - name: 'Type: Invalid' labeled: issue: @@ -64,9 +59,7 @@ labels: You can find more information about this process on the [Wiki's Readme](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/wiki/README.md). It is recommended to [join our Discord Server](https://helpch.at/discord) as you often receive faster response compared to the issue tracker here. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* + Questions about PlaceholderAPI should be asked in our [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions). action: close - name: 'Target: Wiki' labeled: @@ -83,9 +76,6 @@ labels: - You followed the general Styling Guidelines mentioned in the wiki's [README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki/README.md) file. If you have any questions about submitting a PR for the wiki or have any other questions don't hesitate to ask us about it. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* - name: 'Type: Not a bug' labeled: issue: @@ -95,17 +85,10 @@ labels: Before providing more info, always make sure to use the latest version of PlaceholderAPI, as the issue you encounter might already be fixed in a newer version. Optionally can you also try out [development builds](https://ci.extendedclip.com/job/PlaceholderAPI/) and see if the issue was fixed there. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* action: close unlabeled: issue: - body: |- - After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* + body: After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible. action: open - name: 'Status: Inactive' labeled: @@ -115,15 +98,22 @@ labels: To keep the issue-tracker clean and up to date are we closing issues, that didn't receive any responses for a long time. If you're the Author and this issue is still present, make sure to respond to this issue with extra info and **do not create a new issue for the same problem!** - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* action: close unlabeled: issue: - body: |- - The issue received a response from the Author who confirms this to still be prominent and has therefore been reopened. - - > *This is an automated response created by a GitHub-Action.* - > *Responding to the bot or mentioning it won't have any effect!* + body: The issue received a response from the Author who confirms this to still be prominent and has therefore been reopened. action: open + - name: 'Type: Question' + labeled: + issue: + body: |- + Hello @{{ issue.user.login }}, + + Thank you for reaching out to us for getting Support with PlaceholderAPI. + We would like to inform you, that we now have [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions) that you can use for asking questions. + Just head over there and click the "New discussion" button to create a new post. + + Remember to first read the [READ ME](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions/507) post to not face any issues. + + For questions do we recommend to use the [Q&A Category](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions?discussions_q=category%3AQ%26A). + You can also use the Discussion to submit Feature requests (Feature requests through issues are still accepted tho). From f756fbb43b33f992b096712ef72987b17b7cfeb0 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 13 Dec 2020 17:21:18 +0100 Subject: [PATCH 31/39] Update label-commenter-config.yml --- .github/label-commenter-config.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/label-commenter-config.yml b/.github/label-commenter-config.yml index 9e68665..3da689a 100644 --- a/.github/label-commenter-config.yml +++ b/.github/label-commenter-config.yml @@ -1,20 +1,22 @@ comment: - footer: |- - > *This is an automated response created by a **GitHub Action*** + footer: "\ + ----\n\n + > *This is an automated response created by a **GitHub Action*** \ > *Mentioning the bot won't have any effect!* + " labels: - name: 'Type: Issue (Expansion)' labeled: issue: body: |- - Hello @{{ issue.user.login }}, The issue you encountered is caused by an Expansion and not PlaceholderAPI itself. This issue-tracker is reserved for Bug reports and feature requests towards PlaceholderAPI. Please report this issue to the Expansion's main issue-tracker. + action: close - name: 'Type: Duplicate' labeled: issue: @@ -94,10 +96,10 @@ labels: labeled: issue: body: |- - The issue was marked as "inactive" which means it didn't recieve any responses from the Author for a long period of time. + The issue was marked as "inactive" which means it didn't recieve any responses from the Author ({{ issue.user.login }}) for a long period of time. To keep the issue-tracker clean and up to date are we closing issues, that didn't receive any responses for a long time. - If you're the Author and this issue is still present, make sure to respond to this issue with extra info and **do not create a new issue for the same problem!** + If you're the Author and this issue is still present, make sure to respond with extra info and **do not create a new issue for the same problem!** action: close unlabeled: issue: From 6b03c38e4035e00390b412540b6c68303547e077 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Sun, 13 Dec 2020 17:21:52 +0100 Subject: [PATCH 32/39] Update label commenter action --- .github/workflows/label_comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label_comment.yml b/.github/workflows/label_comment.yml index 796ccca..dae6036 100644 --- a/.github/workflows/label_comment.yml +++ b/.github/workflows/label_comment.yml @@ -19,6 +19,6 @@ jobs: with: ref: master - name: Send Issue/Pull request comment - uses: peaceiris/actions-label-commenter@v1.6.0 + uses: peaceiris/actions-label-commenter@v1.8.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} From ba22201311e7b9ba04c819a314ba452b43f25c94 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 14 Dec 2020 01:02:01 +0100 Subject: [PATCH 33/39] Fix Javadoc build errors --- .../clip/placeholderapi/expansion/PlaceholderExpansion.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java index 385ce4a..fb3d24a 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java +++ b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java @@ -231,6 +231,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook { /** * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()} + * + * @return The plugin name. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -240,6 +242,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook { /** * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description + * + * @return The description of the expansion. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -249,6 +253,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook { /** * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link + * + * @return The link for the expansion. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") From e7e9e81e854a80cc7babd14561935a336c067561 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 14 Dec 2020 01:04:07 +0100 Subject: [PATCH 34/39] Update VersionSpecific.java --- .../java/me/clip/placeholderapi/expansion/VersionSpecific.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java b/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java index b539532..84d28ba 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java +++ b/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java @@ -34,6 +34,8 @@ public interface VersionSpecific { * This method is called before the expansion is attempted to be registered The server version * will be passed to this method so you know what version the server is currently running. * + * @param v The {@link Version} to check against + * * @return true if your expansion is compatible with the version the server is running. */ boolean isCompatibleWith(Version v); From 30a194c75d848fe22364e723250688ad9fd987fd Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 14 Dec 2020 01:08:40 +0100 Subject: [PATCH 35/39] Update PlaceholderAPI.java --- .../java/me/clip/placeholderapi/PlaceholderAPI.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java index ea29cfe..f9901b6 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java @@ -150,7 +150,7 @@ public final class PlaceholderAPI { /** * set relational placeholders in the text specified placeholders are matched with the pattern - * %% when set with this method + * {@literal %%} when set with this method * * @param one First player to compare * @param two Second player to compare @@ -225,6 +225,8 @@ public final class PlaceholderAPI { /** * Get the normal placeholder pattern. + * + * @return The default Placeholder Pattern */ public static Pattern getPlaceholderPattern() { return PLACEHOLDER_PATTERN; @@ -232,6 +234,8 @@ public final class PlaceholderAPI { /** * Get the bracket placeholder pattern. + * + * @return the Bracket Placeholder Pattern */ public static Pattern getBracketPlaceholderPattern() { return BRACKET_PLACEHOLDER_PATTERN; @@ -239,6 +243,8 @@ public final class PlaceholderAPI { /** * Get the relational placeholder pattern. + * + * @return The Relational Placeholder Pattern */ public static Pattern getRelationalPlaceholderPattern() { return RELATIONAL_PLACEHOLDER_PATTERN; @@ -286,8 +292,7 @@ public final class PlaceholderAPI { * Get map of registered placeholders * * @return Map of registered placeholders - * @deprecated Use {@link me.clip.placeholderapi.PlaceholderAPIPlugin().getLocalExpansionManager() - * .getExpansions()} instead. + * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") From b3893c38db8773935675858a99e234c59fd8db8d Mon Sep 17 00:00:00 2001 From: Andre601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 14 Dec 2020 01:31:40 +0100 Subject: [PATCH 36/39] Hopefully fixing all the JD issues --- .../clip/placeholderapi/PlaceholderAPI.java | 100 ++++++++++++++++-- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java index f9901b6..e162d09 100644 --- a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java +++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.Relational; +import me.clip.placeholderapi.expansion.manager.LocalExpansionManager; import me.clip.placeholderapi.replacer.CharsReplacer; import me.clip.placeholderapi.replacer.Replacer; import me.clip.placeholderapi.replacer.Replacer.Closure; @@ -290,9 +291,10 @@ public final class PlaceholderAPI { /** * Get map of registered placeholders + * + * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead. * * @return Map of registered placeholders - * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -303,8 +305,12 @@ public final class PlaceholderAPI { } /** - * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to + * @deprecated Please use {@link PlaceholderExpansion} to * register placeholders instead + * + * @param plugin The Plugin to register with this {@link PlaceholderHook} + * @param placeholderHook The {@link PlaceholderHook} to register + * @return always false */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -317,8 +323,12 @@ public final class PlaceholderAPI { } /** - * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to + * @deprecated Please use {@link PlaceholderExpansion} to * register placeholders instead + * + * @param identifier The identifier to use for the {@link PlaceholderHook} + * @param placeholderHook The {@link PlaceholderHook} to register + * @return always false */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -330,8 +340,11 @@ public final class PlaceholderAPI { } /** - * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to + * @deprecated Please use {@link PlaceholderExpansion} to * unregister placeholders instead + * + * @param plugin The plugin to unregister + * @return always false */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -344,8 +357,11 @@ public final class PlaceholderAPI { } /** - * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to + * @deprecated Please use {@link PlaceholderExpansion} to * unregister placeholders instead + * + * @param identifier The identifier to unregister + * @return always false */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -357,6 +373,8 @@ public final class PlaceholderAPI { /** * @deprecated Will be removed in a future release. + * + * @return Set of registered identifiers */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -366,6 +384,8 @@ public final class PlaceholderAPI { /** * @deprecated Will be removed in a future release. + * + * @return always null */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -375,6 +395,12 @@ public final class PlaceholderAPI { /** * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, String)} instead + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param pattern The Pattern to use + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -385,6 +411,12 @@ public final class PlaceholderAPI { /** * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, List)} instead + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param pattern The Pattern to use + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -395,6 +427,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -405,6 +442,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param pattern The Pattern to use + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -414,6 +456,11 @@ public final class PlaceholderAPI { } /** * @deprecated Will be removed in a future release. + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -423,6 +470,11 @@ public final class PlaceholderAPI { /** * @deprecated Will be removed in a future release. + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -432,6 +484,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -441,6 +498,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param pattern The Pattern to use + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -450,6 +512,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -460,6 +527,11 @@ public final class PlaceholderAPI { /** * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead. + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -469,6 +541,11 @@ public final class PlaceholderAPI { /** * @deprecated Will be removed in a future release. + * + * @param player The offline player to parse the placeholders against + * @param text The text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -478,6 +555,11 @@ public final class PlaceholderAPI { /** * @deprecated Will be removed in a future release. + * + * @param player The offline player to parse the placeholders against + * @param text The List of text to parse + * @param colorize If PlaceholderAPI should also parse color codes + * @return String with the parsed placeholders */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") @@ -488,12 +570,12 @@ public final class PlaceholderAPI { /** * set relational placeholders in the text specified placeholders are matched with the pattern - * %% when set with this method + * {@literal %%} when set with this method * * @param one Player to compare * @param two Player to compare * @param text Text to parse the placeholders in - * @param colorize If color codes (&[0-1a-fk-o]) should be translated + * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated * @return The text containing the parsed relational placeholders * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead. */ @@ -511,9 +593,9 @@ public final class PlaceholderAPI { * @param one First player to compare * @param two Second player to compare * @param text Text to parse the placeholders in - * @param colorize If color codes (&[0-1a-fk-o]) should be translated + * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated * @return The text containing the parsed relational placeholders - * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead. + * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead. */ @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0") From 59cd5982ad7f97e5bf1dabb625561b4ccb5e6dd7 Mon Sep 17 00:00:00 2001 From: Andre601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 14 Dec 2020 01:52:46 +0100 Subject: [PATCH 37/39] Complete fix --- build.gradle | 4 ++++ .../expansion/manager/LocalExpansionManager.java | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 34b0a3c..36523ca 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,10 @@ tasks.withType(JavaCompile) { options.encoding = "UTF-8" } +javadoc { + options.encoding = "UTF-8" +} + shadowJar { archiveClassifier.set("") diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index 79f3509..034b651 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -173,10 +173,7 @@ public final class LocalExpansionManager implements Listener { return Optional.empty(); } - - /** - * Do not call this method yourself, use {@link PlaceholderExpansion#register()} - */ + @ApiStatus.Internal public boolean register(@NotNull final PlaceholderExpansion expansion) { final String identifier = expansion.getIdentifier().toLowerCase(); @@ -270,9 +267,6 @@ public final class LocalExpansionManager implements Listener { return true; } - /** - * Do not call this method yourself, use {@link PlaceholderExpansion#unregister()} - */ @ApiStatus.Internal public boolean unregister(@NotNull final PlaceholderExpansion expansion) { if (expansions.remove(expansion.getIdentifier()) == null) { From 3cd665a1595813117b23cb9f6786489ecff57d24 Mon Sep 17 00:00:00 2001 From: darbyjack Date: Sun, 13 Dec 2020 18:58:55 -0600 Subject: [PATCH 38/39] Javadoc Changes - Don't fail on error - Add license to new files that were merged --- build.gradle | 7 +++++-- .../events/ExpansionsLoadedEvent.java | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 36523ca..fcd2d75 100644 --- a/build.gradle +++ b/build.gradle @@ -49,8 +49,11 @@ tasks.withType(JavaCompile) { options.encoding = "UTF-8" } -javadoc { - options.encoding = "UTF-8" +tasks.withType(Javadoc) { + failOnError false + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') + options.addStringOption('charSet', 'UTF-8') } shadowJar { diff --git a/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java index d949b8a..157b0a0 100644 --- a/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java +++ b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java @@ -1,3 +1,23 @@ +/* + * This file is part of PlaceholderAPI + * + * PlaceholderAPI + * Copyright (c) 2015 - 2020 PlaceholderAPI Team + * + * PlaceholderAPI free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlaceholderAPI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package me.clip.placeholderapi.events; From 3c9f6ea5200f2d1012a5b52a4745a95ae31c5f2e Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 25 Dec 2020 15:09:25 +0100 Subject: [PATCH 39/39] Only work on non-closed issues --- .github/workflows/label_comment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label_comment.yml b/.github/workflows/label_comment.yml index dae6036..5ed7eb3 100644 --- a/.github/workflows/label_comment.yml +++ b/.github/workflows/label_comment.yml @@ -12,6 +12,7 @@ on: jobs: give_comment: + if: github.event.state == 'open' runs-on: ubuntu-latest steps: - name: Checkout Code