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

Start working on 1.19.4

Browse source
This commit is contained in:
Nassim Jahnke 2023-03-14 18:11:24 +01:00
parent 155aa36d89
commit 2ed604cf72
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
1390 changed files with 238 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d240e37d64d
index 0000000000000000000000000000000000000000..6aed6ea708639e43aea6ed467792a55b747fdad7
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,137 @@
@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24
+ implementation("org.ow2.asm:asm:9.4")
+ implementation("commons-lang:commons-lang:2.6")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
+ runtimeOnly("mysql:mysql-connector-java:8.0.29")
+ runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
+
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24
+ testImplementation("org.hamcrest:hamcrest-library:1.3")
+}
+
+val craftbukkitPackageVersion = "1_19_R2" // Paper
+val craftbukkitPackageVersion = "1_19_R3" // Paper
+tasks.jar {
+ archiveClassifier.set("dev")
+
@ -171,17 +171,17 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..0000000000000000000000000000000000000000
index 9c1719f6931450637a93f64fd2b43b2cd00929a0..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,617 +0,0 @@
@@ -1,585 +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.19.3-R0.1-SNAPSHOT</version>
- <version>1.19.4-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-
@ -197,7 +197,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.version>unknown</api.version>
- <bt.name>git</bt.name>
- <minecraft_version>1_19_R2</minecraft_version>
- <minecraft_version>1_19_R3</minecraft_version>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
- </properties>
@ -251,7 +251,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>authlib</artifactId>
- <version>3.16.29</version>
- <version>3.17.30</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -263,13 +263,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>datafixerupper</artifactId>
- <version>5.0.28</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>javabridge</artifactId>
- <version>2.0.25</version>
- <version>6.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -389,12 +383,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.joml</groupId>
- <artifactId>joml</artifactId>
- <version>1.10.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>2.0.1</version>
@ -417,13 +405,13 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.36.0.3</version>
- <version>3.41.0.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.29</version>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>8.0.32</version>
- <scope>runtime</scope>
- </dependency>
- <!-- add these back in as they are not exposed by the API -->
@ -728,26 +716,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.21</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <!--<goal>check</goal>-->
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>