Skip to content

Commit 348ce6a

Browse files
committed
feat: update version to 1.1.7 and add LuckPerms dependency
1 parent f2803e2 commit 348ce6a

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ packetevents = "2.7.0"
1313
# Command API
1414
commandapi = "10.0.0"
1515

16+
# LuckPerms
17+
luckperms = "v5.5.0-bukkit"
18+
1619
# Scoreboard Library
1720
scoreboard-library = "2.3.0"
1821
scoreboard-library-implementation = "2.3.0"

surf-api-gradle-plugin/build.gradle.kts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
}
1919

2020
group = groupId
21-
version = "$mcVersion-1.1.6"
21+
version = "$mcVersion-1.1.7"
2222

2323
repositories {
2424
mavenCentral()
@@ -54,21 +54,25 @@ gradlePlugin {
5454

5555
create("paper-plugin") {
5656
id = "dev.slne.surf.surfapi.gradle.paper-plugin"
57-
implementationClass = "dev.slne.surf.surfapi.gradle.platform.paper.plugin.PaperPluginSurfPlugin"
57+
implementationClass =
58+
"dev.slne.surf.surfapi.gradle.platform.paper.plugin.PaperPluginSurfPlugin"
5859
}
5960
create("paper-raw") {
6061
id = "dev.slne.surf.surfapi.gradle.paper-raw"
61-
implementationClass = "dev.slne.surf.surfapi.gradle.platform.paper.raw.RawPaperSurfPlugin"
62+
implementationClass =
63+
"dev.slne.surf.surfapi.gradle.platform.paper.raw.RawPaperSurfPlugin"
6264
}
6365

6466
create("standalone") {
6567
id = "dev.slne.surf.surfapi.gradle.standalone"
66-
implementationClass = "dev.slne.surf.surfapi.gradle.platform.standalone.StandaloneSurfPlugin"
68+
implementationClass =
69+
"dev.slne.surf.surfapi.gradle.platform.standalone.StandaloneSurfPlugin"
6770
}
6871

6972
create("velocity") {
7073
id = "dev.slne.surf.surfapi.gradle.velocity"
71-
implementationClass = "dev.slne.surf.surfapi.gradle.platform.velocity.VelocitySurfPlugin"
74+
implementationClass =
75+
"dev.slne.surf.surfapi.gradle.platform.velocity.VelocitySurfPlugin"
7276
}
7377
}
7478

@@ -89,7 +93,8 @@ gradlePlugin {
8993
}
9094
}
9195

92-
val constantsOutputDir = layout.buildDirectory.dir("generated/dev/slne/surf/surfapi/gradle/generated")
96+
val constantsOutputDir =
97+
layout.buildDirectory.dir("generated/dev/slne/surf/surfapi/gradle/generated")
9398
val generateConstants by tasks.registering {
9499
val outputFile = constantsOutputDir.map { it.file("Constants.kt") }
95100

@@ -102,6 +107,7 @@ val generateConstants by tasks.registering {
102107
inputs.property("libs.auto.service", libs.auto.service.asProvider().get().toString())
103108
inputs.property("libs.versions.commandapi", libs.versions.commandapi.get().toString())
104109
inputs.property("libs.versions.placeholder.api", libs.versions.placeholder.api.get().toString())
110+
inputs.property("libs.versions.luckperms", libs.versions.luckperms.get().toString())
105111
inputs.property("version", rootProject.findProperty("version") as String)
106112
outputs.dir(constantsOutputDir)
107113

@@ -124,6 +130,7 @@ val generateConstants by tasks.registering {
124130
|
125131
| const val COMMAND_API_VERSION = "${libs.versions.commandapi.get()}"
126132
| const val PLACEHOLDER_API_VERSION = "${libs.versions.placeholder.api.get()}"
133+
| const val LUCKPERMS_VERSION = "${libs.versions.luckperms.get()}"
127134
|
128135
| const val SURF_API_FULL_VERSION = "${rootProject.findProperty("version") as String}"
129136
|}

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/paper/plugin/PaperPluginSurfPlugin.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ import xyz.jpenilla.runpaper.task.RunServer
1919
internal class PaperPluginSurfPlugin :
2020
AbstractPaperSurfPlugin<PaperPluginSurfExtension>("paperPlugin") {
2121

22-
init {
23-
addRelocationsForDependency("surf-data-api", "com.fasterxml.jackson" to "dev.slne.data.libs.jackson")
24-
}
22+
init {
23+
addRelocationsForDependency(
24+
"surf-data-api",
25+
"com.fasterxml.jackson" to "dev.slne.data.libs.jackson"
26+
)
27+
}
2528

2629
private val paperPlugins = listOf(
2730
"xyz.jpenilla.run-paper",
@@ -69,17 +72,13 @@ internal class PaperPluginSurfPlugin :
6972
withType<RunServer> {
7073
minecraftVersion(Constants.MINECRAFT_VERSION)
7174

72-
downloadPlugins {
73-
hangar("CommandAPI", "9.7.0")
74-
modrinth("luckperms", "v5.4.145-bukkit")
75-
}
76-
7775
extension.runServer.orNull?.execute(this)
7876
}
7977
}
8078
}
8179

82-
override fun createExtension(objects: ObjectFactory, project: Project) = PaperPluginSurfExtension(objects)
80+
override fun createExtension(objects: ObjectFactory, project: Project) =
81+
PaperPluginSurfExtension(objects)
8382

8483
override fun Project.applyPlugins0() {
8584
paperPlugins.forEach { plugin ->

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/util/run-server-extensions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ fun RunServer.withSurfApiBukkit() {
1212
minecraftVersion(Constants.MINECRAFT_VERSION)
1313
downloadPlugins {
1414
modrinth("commandapi", Constants.COMMAND_API_VERSION)
15+
modrinth("luckperms", Constants.LUCKPERMS_VERSION)
1516
hangar("PlaceholderAPI", Constants.PLACEHOLDER_API_VERSION)
1617
github(
1718
"SLNE-Development",

0 commit comments

Comments
 (0)