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

fix built jar

Browse Source
This commit is contained in:
Ben Kerllenevich
2023-06-09 10:21:34 -04:00
parent 71c445017d
commit 2a4fceaf99
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0001-Rebrand.patch
View File

@@ -5,21 +5,25 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fd553723ff88e8074a9ab391b63b64fb5f83050d 100644 index e7a03ea1dab56e7725f718da0b44c736018ac995..59b94c7a3ca821c90adea832f97ece8a32f65034 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -7,8 +7,8 @@ plugins { @@ -7,8 +7,12 @@ plugins {
} }
dependencies { dependencies {
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi")) - implementation(project(":paper-mojangapi"))
+ implementation(project(":purpur-api")) // Pufferfish // Purpur + // Purpur start
+ implementation("io.papermc.paper:paper-mojangapi:${project.version}") // Purpur + implementation(project(":purpur-api")) // Pufferfish
+ implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
+ exclude("io.papermc.paper", "paper-api")
+ }
+ // Purpur end
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -38,6 +38,10 @@ dependencies { @@ -38,6 +42,10 @@ dependencies {
} }
// Paper end // Paper end
@@ -30,7 +34,7 @@ index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fd553723ff88e8074a9ab391b63b64fb
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
@@ -62,7 +66,7 @@ tasks.jar { @@ -62,7 +70,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@@ -39,7 +43,7 @@ index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fd553723ff88e8074a9ab391b63b64fb
"Implementation-Vendor" to date, // Paper "Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask( @@ -134,7 +142,7 @@ fun TaskContainer.registerRunTask(
name: String, name: String,
block: JavaExec.() -> Unit block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -193,7 +197,7 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..7fe5d22b4c9eac832646780d4b5326ed
public SystemReport fillSystemReport(SystemReport details) { public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f87433133fa6a68dac33895f91770f453e0678d2..977ca71853dee58deed9e025942e7c6e103a40d2 100644 index ffa27c9c02dc4d12411fc089de3af8e8e12ba06e..7923d98fa98894986a600b8f81eeeb1b25a69c9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper @@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper