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

So it begins...

Browse source
This commit is contained in:
Noah van der Aa 2023-09-21 19:18:04 +02:00
parent 773dd72446
commit 6267e26420
No known key found for this signature in database
GPG key ID: 547D90BC6FF753CF
1050 changed files with 84 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

54
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..3ec94658ddd0c2f7b3716742c247656d9c7c8866
index 0000000000000000000000000000000000000000..91a5d6e9775010336da28ed6e2f6654b0f7248f6
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,138 @@
@ -48,8 +48,8 @@ index 0000000000000000000000000000000000000000..3ec94658ddd0c2f7b3716742c247656d
+ }
+ implementation("org.ow2.asm:asm:9.5")
+ implementation("commons-lang:commons-lang:2.6")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
+ runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0")
+ runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+
+ 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..3ec94658ddd0c2f7b3716742c247656d
+ testImplementation("org.hamcrest:hamcrest-library:1.3")
+}
+
+val craftbukkitPackageVersion = "1_20_R1" // Paper
+val craftbukkitPackageVersion = "1_20_R2" // Paper
+tasks.jar {
+ archiveClassifier.set("dev")
+
@ -172,7 +172,7 @@ index 0000000000000000000000000000000000000000..3ec94658ddd0c2f7b3716742c247656d
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index d3780030286a6d53f026e99ee7626a40e02eff8d..0000000000000000000000000000000000000000
index 5e98dccdfb48d7af87180ad0c652c9f2d711af7f..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,587 +0,0 @@
@ -182,7 +182,7 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot</artifactId>
- <packaging>jar</packaging>
- <version>1.20.1-R0.1-SNAPSHOT</version>
- <version>1.20.2-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
-
@ -198,7 +198,7 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.version>unknown</api.version>
- <bt.name>git</bt.name>
- <minecraft_version>1_20_R1</minecraft_version>
- <minecraft_version>1_20_R2</minecraft_version>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
- </properties>
@ -246,13 +246,13 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>6.2.2</version>
- <version>6.4.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>authlib</artifactId>
- <version>4.0.43</version>
- <version>5.0.47</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -276,87 +276,87 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- <version>2.13.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <classifier>linux-x86_64</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <classifier>linux-aarch_64</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.82.Final</version>
- <version>4.1.97.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil</artifactId>
- <version>8.5.9</version>
- <version>8.5.12</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>5.12.1</version>
- <version>5.13.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>5.12.1</version>
- <version>5.13.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -368,7 +368,7 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- <version>3.13.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
@ -386,7 +386,7 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>2.0.1</version>
- <version>2.0.7</version>
- <scope>compile</scope>
- </dependency>
- <!-- deprecated API depend -->
@ -406,13 +406,13 @@ index d3780030286a6d53f026e99ee7626a40e02eff8d..00000000000000000000000000000000
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.42.0.0</version>
- <version>3.43.0.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>8.0.33</version>
- <version>8.1.0</version>
- <scope>runtime</scope>
- </dependency>
- <!-- add these back in as they are not exposed by the API -->