Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix relocations

Browse Source
This commit is contained in:
jmp
2020-12-18 16:18:49 -08:00
parent 7e331c24ed
commit c4531702cb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@@ -11,6 +11,7 @@ toothpick {
forkVersion = "git-$forkName-$versionTag" forkVersion = "git-$forkName-$versionTag"
minecraftVersion = "1.16.4" minecraftVersion = "1.16.4"
nmsPackage = "1_16_R3"
nmsRevision = "R0.1-SNAPSHOT" nmsRevision = "R0.1-SNAPSHOT"
upstream = "Paper" upstream = "Paper"

5
buildSrc/src/main/kotlin/ConfigureSubprojects.kt
View File

@@ -77,11 +77,10 @@ private fun Project.configureServerProject() {
} }
// Don't like to do this but sadly have to do this for compatibility reasons // Don't like to do this but sadly have to do this for compatibility reasons
val relocVersion = toothpick.minecraftVersion.replace(".", "_") relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v${toothpick.nmsPackage}") {
relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$relocVersion") {
exclude("org.bukkit.craftbukkit.Main*") exclude("org.bukkit.craftbukkit.Main*")
} }
relocate("net.minecraft.server", "net.minecraft.server.v$relocVersion") relocate("net.minecraft.server", "net.minecraft.server.v${toothpick.nmsPackage}")
} }
tasks.getByName("build") { tasks.getByName("build") {
dependsOn(shadowJar) dependsOn(shadowJar)

1
buildSrc/src/main/kotlin/ToothpickExtension.kt
View File

@@ -13,6 +13,7 @@ open class ToothpickExtension(objects: ObjectFactory) {
lateinit var groupId: String lateinit var groupId: String
lateinit var minecraftVersion: String lateinit var minecraftVersion: String
lateinit var nmsRevision: String lateinit var nmsRevision: String
lateinit var nmsPackage: String
lateinit var upstream: String lateinit var upstream: String
val upstreamLowercase val upstreamLowercase