Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
7371a57
Update Javadoc documentation
Andre601 Aug 18, 2020
ab96120
More comments... a lot more!
Andre601 Aug 18, 2020
5bca9dc
Remove Gson
Andre601 Sep 24, 2020
c649461
Implemented working version for 1.8.8 - 1.16.3
darbyjack Sep 26, 2020
a3b2777
Merge branch 'master' into feature/update-documentation
Andre601 Dec 26, 2020
9b2ea05
Improve ExpansionsLoadedEvent's docs
Andre601 Dec 29, 2020
a7247ac
2021 🥳
ElijahRus250 Jan 20, 2021
ff60343
Add contributing and expansion section
Andre601 Jan 24, 2021
dd2981b
Merge pull request #443 from PlaceholderAPI/feature/update-documentation
PiggyPiglet Jan 29, 2021
892f072
Fix invalid link tag
Andre601 Jan 29, 2021
0c13004
Start using new Issue template system
Andre601 Feb 28, 2021
a8bcf0e
Create bug_report.yml
Andre601 Feb 28, 2021
b5c70de
Rename feature_request.md to feature_request_old.md
Andre601 Feb 28, 2021
d640d80
Create feature_request.yml
Andre601 Feb 28, 2021
0e56ea9
should it use setBracketPlaceholders??
HSGamer Mar 6, 2021
43a5db7
fix unique name
Andre601 Mar 8, 2021
1d7bf23
Update feature_request_old.md
Andre601 Mar 8, 2021
66a7a6d
Add Checkboxes
Andre601 Mar 8, 2021
c607338
Add checkboxes
Andre601 Mar 8, 2021
48f7ffe
disable default issue body
Andre601 Mar 8, 2021
a15c6b4
Delete bug_report_old.md
Andre601 Mar 8, 2021
73f5573
Delete feature_request_old.md
Andre601 Mar 8, 2021
a7d92f5
Rename bug_report_new.yml to bug_report.yml
Andre601 Mar 8, 2021
a45f420
Check if deleting this fixed the PR...
Andre601 Mar 8, 2021
b9b7104
Merge pull request #580 from PlaceholderAPI/feature/use-new-issue-system
Andre601 Mar 8, 2021
33e4743
Use description in favour of about
Andre601 Mar 8, 2021
78f76c8
improve feature_request.md
Andre601 Mar 8, 2021
375e743
Update bug_report.yml
Andre601 Mar 8, 2021
2c92598
Merge pull request #584 from PlaceholderAPI/fix/issue-form-about-depr…
Andre601 Mar 8, 2021
c2ab9f5
Assign "Type: Issue (Unconfirmed)" label
Andre601 Mar 8, 2021
f629806
Use lists and not comma-separated string
Andre601 Mar 11, 2021
d221a3f
Update feature_request.yml
Andre601 Mar 11, 2021
87ea46a
Merge pull request #585 from PlaceholderAPI/fix/change-to-stringlist
Andre601 Mar 11, 2021
ec127db
Merge pull request #595 from PlaceholderAPI/docs/wiki
Andre601 Mar 24, 2021
bf1527a
Use id option for error and dump fields
Andre601 Mar 26, 2021
8f796e3
Add field for logs
Andre601 Mar 26, 2021
7b7bfb7
Merge pull request #543 from ElijahRus250/master
PiggyPiglet Apr 12, 2021
6827176
Merge pull request #546 from PlaceholderAPI/feature/add-sections
PiggyPiglet Apr 12, 2021
20b2a69
Merge pull request #558 from PlaceholderAPI/development
PiggyPiglet Apr 12, 2021
3a31c5c
Merge pull request #485 from PlaceholderAPI/fix/477-remove-gson
PiggyPiglet Apr 12, 2021
2086fcb
Merge pull request #583 from HSGamer/patch-1
Andre601 Apr 13, 2021
d0e62e6
Update Copyright
Andre601 Apr 13, 2021
4e8b1b4
Re-add removed code
Andre601 Apr 13, 2021
4127550
Undo renaming of boolean
Andre601 Apr 13, 2021
0c6dd54
Merge pull request #610 from PlaceholderAPI/fix/update-missing-copyright
Andre601 Apr 13, 2021
5dbbe01
Remove deprecated issue_body type
Andre601 Apr 21, 2021
91af12f
Update feature_request.yml
Andre601 Apr 21, 2021
0927760
Merge pull request #619 from PlaceholderAPI/feature/remove-issue-body…
Andre601 Apr 21, 2021
d14f319
Improve description of bug_report.yml
Andre601 Apr 21, 2021
748b9f3
Build jars on PR (Compile and build validation)
Andre601 Apr 26, 2021
71b5433
Initial 1.17 Changes
darbyjack Jun 11, 2021
09e68e7
Extracted URLClassLoader out of try-with-resources block
Vshnv Jun 24, 2021
df8583d
Close URLClassLoader if Expansion class was not found
Vshnv Jun 24, 2021
8c69a16
Merge pull request #649 from Vshnv/patch/expansion-classloader
PiggyPiglet Jun 25, 2021
4c4b160
Build against Java 8, 11 and 16
Andre601 Jun 25, 2021
af268c4
adoPt
Andre601 Jun 25, 2021
247a5cd
Merge pull request #623 from PlaceholderAPI/feature/621-build-jars-on-pr
PiggyPiglet Jun 26, 2021
438a665
add render
Andre601 Jun 27, 2021
4c968f0
Cleanup build.gradle
Starmism Jun 30, 2021
0c102a1
Remove the @NotNull's because they are overridden by expansion devs a…
Starmism Jun 30, 2021
14d8853
Fix version checker to compare the individual semver numbers instead …
Starmism Jun 30, 2021
ac9b0c4
Update src/main/java/me/clip/placeholderapi/updatechecker/UpdateCheck…
Starmism Jun 30, 2021
679ef90
Re-add NotNull's
Starmism Jun 30, 2021
8932a92
Merge pull request #658 from PlaceholderAPI/1.17
PiggyPiglet Jun 30, 2021
252802d
Removed nullcheck from hashcode, and moved it up the chain.
Starmism Jun 30, 2021
94bf5fe
POJO to help with checking that expansions have all required methods …
Starmism Jun 30, 2021
9b6b558
Add method implementation checking and nullchecking for fields.
Starmism Jun 30, 2021
c4a2256
Appease the Pigman
Starmism Jul 1, 2021
7df3a5c
Merge pull request #657 from Starmism/development
PiggyPiglet Jul 1, 2021
0fa5923
Merge branch 'development' into master
Andre601 Jul 1, 2021
ead63ca
Revert build.gradle dependencies change
Andre601 Jul 1, 2021
8905335
Fixed duplicate files
darbyjack Jul 1, 2021
fa7c30d
Sync Dev with master (#659)
Andre601 Jul 1, 2021
dd77513
Initial test on adventure
darbyjack Jul 6, 2021
d7a4acc
started moving to pure adventure
PiggyPiglet Jul 7, 2021
c4789b7
finished kyori impl
PiggyPiglet Jul 9, 2021
3abc78f
Merge pull request #660 from PlaceholderAPI/development
PiggyPiglet Jul 9, 2021
9a7790c
Merge pull request #661 from PlaceholderAPI/adventure
PiggyPiglet Jul 9, 2021
6395551
added 1.17 to nmsversion (what does this even do)
PiggyPiglet Jul 10, 2021
5710972
Merge remote-tracking branch 'origin/master'
PiggyPiglet Jul 10, 2021
5fb45d1
removed dev for release
PiggyPiglet Jul 10, 2021
6348c88
added dev back
PiggyPiglet Jul 10, 2021
b4f6831
Update development from master (#662)
Andre601 Jul 10, 2021
d79f972
Add logging options to PlaceholderExpansion
Andre601 Jul 22, 2021
7219043
Add overload for Throwable
Andre601 Jul 22, 2021
fe0bb12
Add missing [<expansion>] prefix
Andre601 Jul 30, 2021
08c43d2
Add Java Version to /papi dump command
darbyjack Aug 4, 2021
1dd3e1f
Switch to differen wiki action
Andre601 Aug 26, 2021
7e28dc0
Merge pull request #698 from PlaceholderAPI/feature/change-wiki-action
Andre601 Sep 1, 2021
3809919
Include version in registration message
Andre601 Sep 20, 2021
d9da5a7
Update README.md
Andre601 Oct 1, 2021
aa13ddf
Add files via upload
Andre601 Oct 1, 2021
407714c
Rename logo.png to wiki-logo.png
Andre601 Oct 1, 2021
416fbc0
Merge branch 'docs/wiki' into master
Andre601 Oct 1, 2021
6f58537
fix wiki action... again
Andre601 Oct 1, 2021
aa68a48
Update flex
Funny-cube Oct 1, 2021
0798d94
Update this flex too funnycube :)
Andre601 Oct 1, 2021
6e1eb88
Add release.yml for automatic release drafts
Andre601 Oct 9, 2021
d68af58
Make name of job only show java version
Andre601 Nov 11, 2021
6f87955
feat: nullable annotation placeholderhook
itIsMaku Nov 17, 2021
b9a5f44
Merge pull request #731 from PlaceholderAPI/feature/automatic-release…
Andre601 Nov 29, 2021
e969f37
Improve StringBuilder and also fix possible NPE
Andre601 Dec 1, 2021
3ba29f1
Fix possible NPE for findExpansionsOnDisk
Andre601 Dec 1, 2021
31deef2
Use completedFuture instead
Andre601 Dec 1, 2021
41c9231
Merge pull request #749 from itIsMaku/master
PiggyPiglet Dec 3, 2021
894dcd0
Merge pull request #687 from PlaceholderAPI/java-version-dump
PiggyPiglet Dec 3, 2021
cc235cf
Merge Development into master (#758)
Andre601 Dec 3, 2021
acb5728
1.18 + Gradle Updates
darbyjack Nov 27, 2021
020f14d
Merge branch 'master' into feature/log-expansio-version
PiggyPiglet Dec 3, 2021
e11d551
Merge pull request #717 from PlaceholderAPI/feature/log-expansio-version
PiggyPiglet Dec 3, 2021
18fb194
Merge pull request #677 from PlaceholderAPI/feature/add-logging-options
PiggyPiglet Dec 3, 2021
511717a
Merge branch 'master' into 1.18
PiggyPiglet Dec 3, 2021
d168be9
Merge pull request #752 from PlaceholderAPI/1.18
PiggyPiglet Dec 3, 2021
3540645
Add PowerBoard
Xitee1 Dec 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# This file is used to automatically draft new release changelogs in GitHub.
# Read more: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
#
changelog:
exclude:
labels:
- 'Action: No Changelog'
categories:
- title: 'Breaking Changes'
labels:
- 'Type: Breaking'
- title: 'Additions'
labels:
- 'Type: New Feature'
- title: 'Changes'
labels:
- 'Type: Enhancement'
- title: 'Fixes'
labels:
- 'Type: Bugfix'
- title: 'Other changes'
labels:
- '*' # Catch every other PR not labeled with an "exclude" label.
4 changes: 2 additions & 2 deletions .github/workflows/pr_build_jars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:

jobs:
testBuilds:
name: "Test-compile against Java 8, 11 and 16"
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 4
matrix:
java-version: [8, 11, 16]
name: "Compile jar against ${{ matrix.java-version }}"
runs-on: ubuntu-latest
steps:
- name: "Checkout Code"
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI

[APIversionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
[logo]: https://i.imgur.com/Ea4PURv.png
[logo]: https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/master/wiki/img/papi-logo.png

[contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
[placeholderexpansion]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/PlaceholderExpansion
Expand All @@ -30,7 +30,7 @@

Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 150+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault.

PlaceholderAPI has been downloaded over 500,000 times and has been used concurrently on over 20,000 servers, which makes it a must-have for a server of any type or scale.
PlaceholderAPI has been downloaded over 750,000 times and has been used concurrently on over 35,000 servers, which makes it a must-have for a server of any type or scale.

## Contribute
If you would like to contribute towards PlaceholderAPI should you take a look at our [Contributing file][contributing] for the ins and outs on how you can do that and what you need to keep in mind.
Expand Down
21 changes: 10 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import org.apache.tools.ant.filters.ReplaceTokens
plugins {
id "java"
id "maven-publish"
id "org.cadixdev.licenser" version "0.6.0"
id "com.github.johnrengelman.shadow" version "7.0.0"
id "org.cadixdev.licenser" version "0.6.1"
id "com.github.johnrengelman.shadow" version "7.1.0"
}

group "me.clip"
Expand All @@ -18,23 +18,22 @@ repositories {
mavenCentral()
mavenLocal()

maven({ url = "https://repo.codemc.org/repository/maven-public" })
maven({ url = "https://repo.codemc.org/repository/maven-public/" })
maven({ url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" })
}

dependencies {
implementation "org.bstats:bstats-bukkit:2.2.1"
implementation "net.kyori:adventure-platform-bukkit:4.0.1"

implementation "net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT"
compileOnly "org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT"
compileOnly "org.jetbrains:annotations:22.0.0"

compileOnly "org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT"
compileOnly "org.jetbrains:annotations:19.0.0"
testImplementation "org.openjdk.jmh:jmh-core:1.32"
testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.32"

testImplementation "org.openjdk.jmh:jmh-core:1.23"
testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.23"

testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.2"
testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
}

processResources {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading