diff --git a/build.gradle.kts b/build.gradle.kts index dec698f7..20a8c0d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ allprojects { apply(plugin = "java") group = "com.leonardobishop" - version = "3.15.2" + version = "3.16" java { toolchain { @@ -161,5 +161,5 @@ publishing { fun findPropertyString(propertyName: String): String? { val propertyValue = project.findProperty(propertyName) - return if (propertyValue is String) propertyValue else null + return propertyValue as? String } diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 140c4f5b..79e22687 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.github.goooler.shadow") + id("com.gradleup.shadow") } tasks.build { @@ -69,7 +69,7 @@ dependencies { compileOnlyProject(":common") // Paper - compileOnlyServer("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT") + compileOnlyServer("io.papermc.paper:paper-api:1.21.11-pre3-R0.1-SNAPSHOT") // ASkyBlock compileOnlyPlugin("com.wasteofplastic:askyblock:3.0.9.4") @@ -146,15 +146,15 @@ dependencies { // bStats implementation("org.bstats:bstats-bukkit-lite:1.8") // gson // TODO implement custom metrics without gson - implementation("com.google.code.gson:gson:2.13.1") + implementation("com.google.code.gson:gson:2.13.2") // HikariCP - implementation("com.zaxxer:HikariCP:6.3.0") + implementation("com.zaxxer:HikariCP:7.0.2") // slf4j implementation("org.slf4j:slf4j-nop:1.7.36") // hppc implementation("com.carrotsearch:hppc:0.10.0") // bungeecord-chat - implementation("net.md-5:bungeecord-chat:1.21-R0.3") { isTransitive = false } + implementation("net.md-5:bungeecord-chat:1.21-R0.4") { isTransitive = false } } tasks.shadowJar { diff --git a/docs/download.md b/docs/download.md index 223e4447..ff41f2b7 100644 --- a/docs/download.md +++ b/docs/download.md @@ -11,7 +11,7 @@ outdated versions. ## Release builds - [SpigotMC - (preferred)](https://www.spigotmc.org/resources/quests-1-8-1-19-set-up-goals-for-players.23696/) + (preferred)](https://www.spigotmc.org/resources/quests-1-8-1-21-set-up-goals-for-players.23696/) - [Hangar](https://hangar.papermc.io/LMBishop/Quests) - [Modrinth](https://modrinth.com/mod/quests) - [GitHub](https://github.com/LMBishop/Quests/releases) diff --git a/docs/task-types/bartering-(task-type).md b/docs/task-types/bartering-(task-type).md index 9ab42240..59ed24d6 100644 --- a/docs/task-types/bartering-(task-type).md +++ b/docs/task-types/bartering-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # bartering (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Minecraft 1.16.5+ required diff --git a/docs/task-types/bedwars1058_bedbreak-(task-type).md b/docs/task-types/bedwars1058_bedbreak-(task-type).md index 91fae4b6..f938bada 100644 --- a/docs/task-types/bedwars1058_bedbreak-(task-type).md +++ b/docs/task-types/bedwars1058_bedbreak-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # bedwars1058_bedbreak (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'BedWars1058' required diff --git a/docs/task-types/bedwars1058_finalkill-(task-type).md b/docs/task-types/bedwars1058_finalkill-(task-type).md index 19accfa5..402040c5 100644 --- a/docs/task-types/bedwars1058_finalkill-(task-type).md +++ b/docs/task-types/bedwars1058_finalkill-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # bedwars1058_finalkill (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'BedWars1058' required diff --git a/docs/task-types/bedwars1058_lose-(task-type).md b/docs/task-types/bedwars1058_lose-(task-type).md index 87c36b66..a6b20897 100644 --- a/docs/task-types/bedwars1058_lose-(task-type).md +++ b/docs/task-types/bedwars1058_lose-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # bedwars1058_lose (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'BedWars1058' required diff --git a/docs/task-types/bedwars1058_win-(task-type).md b/docs/task-types/bedwars1058_win-(task-type).md index 06dc4164..15d699ed 100644 --- a/docs/task-types/bedwars1058_win-(task-type).md +++ b/docs/task-types/bedwars1058_win-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # bedwars1058_win (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'BedWars1058' required diff --git a/docs/task-types/blockfertilizing-(task-type).md b/docs/task-types/blockfertilizing-(task-type).md index 7b5833f6..435f3395 100644 --- a/docs/task-types/blockfertilizing-(task-type).md +++ b/docs/task-types/blockfertilizing-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # blockfertilizing (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Minecraft 1.13+ required diff --git a/docs/task-types/evenmorefish_fishing-(task-type).md b/docs/task-types/evenmorefish_fishing-(task-type).md index ffeeceef..b397e16a 100644 --- a/docs/task-types/evenmorefish_fishing-(task-type).md +++ b/docs/task-types/evenmorefish_fishing-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # evenmorefish_fishing (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'EvenMoreFish' required diff --git a/docs/task-types/evenmorefish_hunting-(task-type).md b/docs/task-types/evenmorefish_hunting-(task-type).md index ba46480d..0e8ab590 100644 --- a/docs/task-types/evenmorefish_hunting-(task-type).md +++ b/docs/task-types/evenmorefish_hunting-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # evenmorefish_hunting (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'EvenMoreFish' required diff --git a/docs/task-types/fancynpcs_deliver-(task-type).md b/docs/task-types/fancynpcs_deliver-(task-type).md index 7b391c08..8dd2ff21 100644 --- a/docs/task-types/fancynpcs_deliver-(task-type).md +++ b/docs/task-types/fancynpcs_deliver-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # fancynpcs_deliver (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'FancyNpcs' required diff --git a/docs/task-types/fancynpcs_interact-(task-type).md b/docs/task-types/fancynpcs_interact-(task-type).md index f0abcde7..768ec6d3 100644 --- a/docs/task-types/fancynpcs_interact-(task-type).md +++ b/docs/task-types/fancynpcs_interact-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # fancynpcs_interact (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'FancyNpcs' required diff --git a/docs/task-types/mythicmobs_dealdamage-(task-type).md b/docs/task-types/mythicmobs_dealdamage-(task-type).md index d2594308..6e17c5b4 100644 --- a/docs/task-types/mythicmobs_dealdamage-(task-type).md +++ b/docs/task-types/mythicmobs_dealdamage-(task-type).md @@ -6,7 +6,7 @@ grand_parent: Task types # mythicmobs_dealdamage (task type) -Not released yet (dev builds) +Since v3.16 {: .label .label-green } Plugin 'MythicMobs' required diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da4..4eac4a84 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 0367eb25..0ee8bf3b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,8 +8,8 @@ pluginManagement { plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" - id("io.github.goooler.shadow") version "8.1.8" - id("xyz.wagyourtail.jvmdowngrader") version "1.3.3" + id("com.gradleup.shadow") version "9.2.2" + id("xyz.wagyourtail.jvmdowngrader") version "1.3.4" } }