SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade paperweight with bundler jar updates

Browse Source 
This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).
This commit is contained in:
Kyle Wood
2021-11-26 00:08:46 -06:00
parent 65c02a066c
commit 9809c9e47b
11 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/server/Build-system-changes.patch
View File

@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/build.gradle.kts
@@ -0,0 +0,0 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
implementation("jline:jline:2.12.1")
- implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
- exclude(group = "org.apache.logging.log4j", module = "log4j-api")

2
patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View File

@@ -13,9 +13,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import io.papermc.paperweight.tasks.BaseTask
import io.papermc.paperweight.util.*
+import java.nio.file.Files
import java.util.Locale
plugins {
java
@@ -0,0 +0,0 @@ plugins {
repositories {

4
patches/server/Implement-Brigadier-Mojang-API.patch
View File

@@ -16,8 +16,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
+ implementation(project(":Paper-MojangAPI"))
implementation(project(":paper-api"))
+ implementation(project(":paper-mojangapi"))
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")

0
patches/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-distance-maps.patch → patches/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
View File

4
patches/server/Setup-Gradle-project.patch
View File

@@ -33,7 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/build.gradle.kts
@@ -0,0 +0,0 @@
+import io.papermc.paperweight.util.*
+import java.util.Locale
+
+plugins {
+ java
@@ -46,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+}
+
+dependencies {
+ implementation(project(":Paper-API"))
+ implementation(project(":paper-api"))
+ implementation("jline:jline:2.12.1")
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
@@ -92,7 +91,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+publishing {
+ publications.create<MavenPublication>("maven") {
+ artifactId = rootProject.name.toLowerCase(Locale.ENGLISH)
+ artifact(tasks.reobfJar) {
+ classifier = null
+ }

2
patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
- implementation("jline:jline:2.12.1")
+ // Paper start
+ implementation("org.jline:jline-terminal-jansi:3.21.0")

6
patches/server/Use-Velocity-compression-and-cipher-natives.patch
View File

@@ -12,7 +12,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
+ implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
+ // Paper start - Use Velocity cipher
+ implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") {
+ isTransitive = false
+ }
+ // Paper end
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("junit:junit:4.13.1")