mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Begin update to 1.20.5

Browse source
This commit is contained in:
Jake Potrebic 2024-04-23 10:02:08 -07:00
parent f4c7d373e4
commit abc49bf069
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
1409 changed files with 1134 additions and 1281 deletions
Download patch file Download diff file Expand all files Collapse all files

59
patches/server/0001-Setup-Gradle-project.patch
View file

@ -28,7 +28,7 @@ index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa
index 0000000000000000000000000000000000000000..8116ef8a1d098f0fe4fab661f913132ce3ec4ae9
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,141 @@
@ -43,13 +43,13 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+dependencies {
+ implementation(project(":paper-api"))
+ implementation("jline:jline:2.12.1")
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+ }
+ implementation("org.ow2.asm:asm-commons:9.7")
+ implementation("commons-lang:commons-lang:2.6")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
+ runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
+ runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
+
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+ testImplementation("org.ow2.asm:asm-tree:9.7")
+}
+
+val craftbukkitPackageVersion = "1_20_R3" // Paper
+val craftbukkitPackageVersion = "1_20_R4" // Paper
+tasks.jar {
+ archiveClassifier.set("dev")
+
@ -175,17 +175,17 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 226b56846562846d1b89c54b67b4ccc235eaf3e9..0000000000000000000000000000000000000000
index ca5ed64db9554831442170c57e288941454dcbca..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,608 +0,0 @@
@@ -1,613 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot</artifactId>
- <packaging>jar</packaging>
- <version>1.20.4-R0.1-SNAPSHOT</version>
- <version>1.20.5-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-
@ -201,9 +201,8 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.version>unknown</api.version>
- <bt.name>git</bt.name>
- <minecraft_version>1_20_R3</minecraft_version>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
- <minecraft_version>1_20_R4</minecraft_version>
- <maven.compiler.release>21</maven.compiler.release>
- </properties>
-
- <repositories>
@ -236,7 +235,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-iostreams</artifactId>
- <version>2.19.0</version>
- <version>2.22.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -249,13 +248,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>6.4.5</version>
- <version>6.4.10</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>authlib</artifactId>
- <version>5.0.51</version>
- <version>6.0.54</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -267,19 +266,19 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>datafixerupper</artifactId>
- <version>6.0.8</version>
- <version>7.0.14</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>logging</artifactId>
- <version>1.1.1</version>
- <version>1.2.7</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.13.0</version>
- <version>2.15.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -353,13 +352,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>5.13.0</version>
- <version>5.14.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>5.13.0</version>
- <version>5.14.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -371,25 +370,31 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.13.0</version>
- <version>3.14.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.19.0</version>
- <version>2.22.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <version>2.19.0</version>
- <version>2.22.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>2.0.7</version>
- <version>2.0.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.lz4</groupId>
- <artifactId>lz4-java</artifactId>
- <version>1.8.0</version>
- <scope>compile</scope>
- </dependency>
- <!-- deprecated API depend -->
@ -415,13 +420,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.42.0.1</version>
- <version>3.45.3.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>8.2.0</version>
- <version>8.3.0</version>
- <scope>runtime</scope>
- </dependency>
- <!-- add these back in as they are not exposed by the API -->
@ -673,7 +678,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
- <version>3.13.0</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
@ -684,7 +689,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.13.0</version>
- <version>2.15.0</version>
- </dependency>
- </dependencies>
- </plugin>