Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Final 1.20.4 Update (#97)

Browse Source
This commit is contained in:
Alpha
2024-04-29 15:43:49 +09:00
committed by GitHub
parent a479b3e02f
commit 39728823f0
58 changed files with 3710 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/server/0003-Use-Gradle-Version-Catalogs.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Use Gradle Version Catalogs
diff --git a/build.gradle.kts b/build.gradle.kts
index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9ff41d19a 100644
index 1cad0728d..b97182b80 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,21 +19,37 @@ dependencies {
@@ -19,21 +19,38 @@ dependencies {
exclude("io.papermc.paper", "paper-api")
}
// Purpur end
@@ -48,11 +48,12 @@ index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9
+
+ testImplementation(common.bundles.test)
+ testImplementation(server.bundles.test)
+
+ /*
implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
// Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
@@ -46,10 +62,13 @@ dependencies {
@@ -46,8 +63,11 @@ dependencies {
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
// Paper start - Use Velocity cipher
implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
@@ -60,13 +61,11 @@ index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9
+ implementation(server.velocity) {
isTransitive = false
}
+ /*
// Paper end - Use Velocity cipher
+ /*
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
@@ -57,20 +76,25 @@ dependencies {
@@ -57,8 +77,11 @@ dependencies {
// Pufferfish start
implementation("org.yaml:snakeyaml:1.32")
implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
@@ -74,23 +73,15 @@ index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9
+ implementation(server.simpleyaml) {
exclude(group="org.yaml", module="snakeyaml")
}
+ /*
// Pufferfish end
- implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
- implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
+ //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
+ //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
implementation("dev.omega24:upnp4j:1.0") // Purpur
+ /*
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
testImplementation("org.hamcrest:hamcrest:2.2")
testImplementation("org.mockito:mockito-core:5.5.0")
testImplementation("org.ow2.asm:asm-tree:9.5")
implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
@@ -71,6 +94,7 @@ dependencies {
testImplementation("org.mockito:mockito-core:5.11.0")
testImplementation("org.ow2.asm:asm-tree:9.7")
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
+ */
+ // Plazma end - Use Gradle Version Catalogs
+ */
}
val craftbukkitPackageVersion = "1_20_R3" // Paper