Skip to content

Commit

Permalink
Use paperweight
Browse files Browse the repository at this point in the history
  • Loading branch information
ryderbelserion committed Mar 31, 2023
1 parent a5b6543 commit 18393f9
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 41 deletions.
8 changes: 3 additions & 5 deletions .gitignore
Expand Up @@ -8,9 +8,7 @@ platforms/paper/build
platforms/paper/run/*

!platforms/paper/run/eula.txt
!platforms/paper/run/bukkit.yml
!platforms/paper/run/spigot.yml
!platforms/paper/run/server.properties
!platforms/paper/run/config

build
build

jars
20 changes: 9 additions & 11 deletions buildSrc/build.gradle.kts
Expand Up @@ -7,19 +7,17 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
implementation("com.github.johnrengelman:shadow:8.1.0")
implementation(libs.kotlin)
implementation(libs.shadow)

// For the webhook tasks, this applies to the buildSrc only
val ktor = "2.2.4"
implementation(libs.paperweight)

implementation("io.ktor:ktor-client-core-jvm:$ktor")
implementation("io.ktor:ktor-client-cio-jvm:$ktor")
implementation("io.ktor:ktor-client-content-negotiation:$ktor")
implementation("io.ktor:ktor-serialization-gson:$ktor")
implementation(libs.ktor.core)
implementation(libs.ktor.cio)
implementation(libs.ktor.content)
implementation(libs.ktor.gson)

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation(libs.kotlin.coroutines)

implementation("com.lordcodes.turtle:turtle:0.8.0")
implementation(libs.turtle)
}
6 changes: 6 additions & 0 deletions buildSrc/settings.gradle.kts
@@ -1,3 +1,9 @@
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
from(files("../gradle/libs.versions.toml"))
}
}

repositories.gradlePluginPortal()
}
20 changes: 20 additions & 0 deletions buildSrc/src/main/kotlin/crazyvouchers.paper-plugin.gradle.kts
@@ -1,5 +1,7 @@
plugins {
id("crazyvouchers.root-plugin")

id("io.papermc.paperweight.userdev")
}

repositories {
Expand All @@ -12,4 +14,22 @@ repositories {
* NBT API
*/
maven("https://repo.codemc.io/repository/maven-public/")
}

dependencies {
paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT")
}

tasks {
assemble {
dependsOn(reobfJar)
}

reobfJar {
val file = File("$rootDir/jars")

if (!file.exists()) file.mkdirs()

outputJar.set(layout.buildDirectory.file("$file/${rootProject.name}-Paper-${rootProject.version}.jar"))
}
}
20 changes: 7 additions & 13 deletions buildSrc/src/main/kotlin/crazyvouchers.root-plugin.gradle.kts
Expand Up @@ -3,25 +3,19 @@ import task.WebhookExtension

plugins {
`java-library`

`maven-publish`

id("com.github.hierynomus.license")

id("com.github.johnrengelman.shadow")
}

repositories {
maven("https://repo.triumphteam.dev/snapshots/")

maven("https://libraries.minecraft.net/")

maven("https://repo.crazycrew.us/api/")

maven("https://jitpack.io/")

mavenCentral()
mavenLocal()
}

java {
Expand All @@ -38,15 +32,15 @@ tasks {
}

compileJava {
options.encoding = Charsets.UTF_8.name()
options.release.set(17)
}
}

license {
header = rootProject.file("LICENSE")
encoding = "UTF-8"

mapping("java", "JAVADOC_STYLE")
javadoc {
options.encoding = Charsets.UTF_8.name()
}

include("**/*.java")
processResources {
filteringCharset = Charsets.UTF_8.name()
}
}
20 changes: 19 additions & 1 deletion gradle/libs.versions.toml
Expand Up @@ -6,11 +6,15 @@ paper = "1.19.4-R0.1-SNAPSHOT"
# Adventure
kyori = "4.13.0"

ktor = "2.2.4"
kotlin = "1.8.20-RC"

[libraries]

# Minecraft
papermc = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
paperlib = { module = "io.papermc:paperlib", version = "1.0.8-SNAPSHOT" }
paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version = "1.5.3" }

# Adventure
kyori = { module = "net.kyori:adventure-api", version.ref = "kyori" }
Expand All @@ -28,4 +32,18 @@ cmi_api = { module = "com.Zrips.CMI:CMI-API", version = "9.3.1.5" }
cmi_lib = { module = "net.zrips.CMILib:cmi-lib-api", version = "1.2.5.3" }

# Placeholders
placeholder_api = { module = "me.clip:placeholderapi", version = "2.11.3" }
placeholder_api = { module = "me.clip:placeholderapi", version = "2.11.3" }

# Kotlin
ktor-core = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" }
ktor-cio = { module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor" }
ktor-content = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
ktor-gson = { module = "io.ktor:ktor-serialization-gson", version.ref = "ktor" }

kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin"}
kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }

shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.0" }

turtle = { module = "com.lordcodes.turtle:turtle", version = "0.8.0" }
10 changes: 1 addition & 9 deletions platforms/paper/build.gradle.kts
Expand Up @@ -32,12 +32,10 @@ val type = if (beta) "beta" else "release"

tasks {
shadowJar {
archiveFileName.set("${rootProject.name}+Paper+${rootProject.version}.jar")

listOf(
"de.tr7zw.changeme.nbtapi",
"org.bstats"
).forEach { relocate(it, "${rootProject.group}.library.$it") }
).forEach { pack -> relocate(pack, "${rootProject.group}.$pack") }
}

runServer {
Expand Down Expand Up @@ -101,13 +99,7 @@ publishing {
val repo = if (beta) "beta" else "releases"
maven("https://repo.crazycrew.us/$repo") {
name = "crazycrew"

credentials(PasswordCredentials::class)

credentials {
username = System.getenv("REPOSITORY_USERNAME")
password = System.getenv("REPOSITORY_PASSWORD")
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions settings.gradle.kts
@@ -1,5 +1,3 @@
@file:Suppress("UnstableApiUsage")

dependencyResolutionManagement {
versionCatalogs {
create("settings") {
Expand Down

0 comments on commit 18393f9

Please sign in to comment.