Prepare for 1.19 dev

This commit is contained in:
Nassim Jahnke 2022-06-07 18:52:56 +02:00
parent f34f678b20
commit 1148687a8d
1302 changed files with 120 additions and 61 deletions

View File

@ -38,7 +38,7 @@ How To (Plugin Developers)
<dependency> <dependency>
<groupId>io.papermc.paper</groupId> <groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId> <artifactId>paper-api</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version> <version>1.19-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
``` ```

View File

@ -61,10 +61,10 @@ repositories {
} }
dependencies { dependencies {
paramMappings("net.fabricmc:yarn:1.18.2+build.2:mergedv2") paramMappings("net.fabricmc:yarn:1.19+build.1:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.8.2:fat") remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
decompiler("net.minecraftforge:forgeflower:1.5.605.7") decompiler("net.minecraftforge:forgeflower:1.5.605.7")
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.4") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
paperclip("io.papermc:paperclip:3.0.2") paperclip("io.papermc:paperclip:3.0.2")
} }

View File

@ -1,7 +1,7 @@
group=io.papermc.paper group=io.papermc.paper
version=1.18.2-R0.1-SNAPSHOT version=1.19-R0.1-SNAPSHOT
mcVersion=1.18.2 mcVersion=1.19
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

View File

@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:9.2") testImplementation("org.ow2.asm:asm-tree:9.3")
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> { @@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
options.links( options.links(
"https://guava.dev/releases/31.0.1-jre/api/docs/", "https://guava.dev/releases/31.0.1-jre/api/docs/",

View File

@ -43,7 +43,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+dependencies { +dependencies {
+ // api dependencies are listed transitively to API consumers + // api dependencies are listed transitively to API consumers
+ api("commons-lang:commons-lang:2.6")
+ api("com.google.guava:guava:31.0.1-jre") + api("com.google.guava:guava:31.0.1-jre")
+ api("com.google.code.gson:gson:2.8.9") + api("com.google.code.gson:gson:2.8.9")
+ api("net.md-5:bungeecord-chat:1.16-R0.4") + api("net.md-5:bungeecord-chat:1.16-R0.4")
@ -59,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ testImplementation("junit:junit:4.13.2") + testImplementation("junit:junit:4.13.2")
+ testImplementation("org.hamcrest:hamcrest-library:1.3") + testImplementation("org.hamcrest:hamcrest-library:1.3")
+ testImplementation("org.ow2.asm:asm-tree:9.2") + testImplementation("org.ow2.asm:asm-tree:9.3")
+} +}
+ +
+configure<PublishingExtension> { +configure<PublishingExtension> {
@ -124,7 +123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- -
- <groupId>org.spigotmc</groupId> - <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
- <version>1.18.2-R0.1-SNAPSHOT</version> - <version>1.19-R0.1-SNAPSHOT</version>
- <packaging>jar</packaging> - <packaging>jar</packaging>
- -
- <name>Spigot-API</name> - <name>Spigot-API</name>
@ -150,12 +149,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- </distributionManagement> - </distributionManagement>
- -
- <dependencies> - <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>compile</scope>
- </dependency>
- <!-- bundled with Minecraft, should be kept in sync --> - <!-- bundled with Minecraft, should be kept in sync -->
- <dependency> - <dependency>
- <groupId>com.google.guava</groupId> - <groupId>com.google.guava</groupId>
@ -187,19 +180,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.apache.maven</groupId> - <groupId>org.apache.maven</groupId>
- <artifactId>maven-resolver-provider</artifactId> - <artifactId>maven-resolver-provider</artifactId>
- <version>3.8.4</version> - <version>3.8.5</version>
- <scope>provided</scope> - <scope>provided</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.apache.maven.resolver</groupId> - <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId> - <artifactId>maven-resolver-connector-basic</artifactId>
- <version>1.7.2</version> - <version>1.8.0</version>
- <scope>provided</scope> - <scope>provided</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.apache.maven.resolver</groupId> - <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-http</artifactId> - <artifactId>maven-resolver-transport-http</artifactId>
- <version>1.7.2</version> - <version>1.8.0</version>
- <scope>provided</scope> - <scope>provided</scope>
- </dependency> - </dependency>
- <!-- annotations --> - <!-- annotations -->
@ -225,7 +218,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.ow2.asm</groupId> - <groupId>org.ow2.asm</groupId>
- <artifactId>asm-tree</artifactId> - <artifactId>asm-tree</artifactId>
- <version>9.2</version> - <version>9.3</version>
- <scope>test</scope> - <scope>test</scope>
- </dependency> - </dependency>
- </dependencies> - </dependencies>
@ -248,7 +241,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId> - <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version> - <version>3.10.1</version>
- <configuration> - <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK --> - <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId> - <compilerId>eclipse</compilerId>
@ -257,19 +250,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.codehaus.plexus</groupId> - <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId> - <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.8.8</version> - <version>2.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ecj</artifactId>
- <version>3.28.0</version>
- </dependency> - </dependency>
- </dependencies> - </dependencies>
- </plugin> - </plugin>
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId> - <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version> - <version>3.2.2</version>
- <configuration> - <configuration>
- <archive> - <archive>
- <manifest> - <manifest>
@ -309,7 +297,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId> - <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.1</version> - <version>3.4.0</version>
- <configuration> - <configuration>
- <links> - <links>
- <link>https://guava.dev/releases/31.0.1-jre/api/docs/</link> - <link>https://guava.dev/releases/31.0.1-jre/api/docs/</link>
@ -358,7 +346,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.codehaus.mojo</groupId> - <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId> - <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version> - <version>1.21</version>
- <executions> - <executions>
- <execution> - <execution>
- <phase>process-classes</phase> - <phase>process-classes</phase>

View File

@ -46,9 +46,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") { + implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api") + exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+ } + }
+ implementation("org.ow2.asm:asm:9.2") + implementation("org.ow2.asm:asm:9.3")
+ implementation("commons-lang:commons-lang:2.6")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") + runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
+ runtimeOnly("mysql:mysql-connector-java:8.0.27") + runtimeOnly("mysql:mysql-connector-java:8.0.29")
+ +
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4") + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
@ -181,7 +182,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <groupId>org.spigotmc</groupId> - <groupId>org.spigotmc</groupId>
- <artifactId>spigot</artifactId> - <artifactId>spigot</artifactId>
- <packaging>jar</packaging> - <packaging>jar</packaging>
- <version>1.18.2-R0.1-SNAPSHOT</version> - <version>1.19-R0.1-SNAPSHOT</version>
- <name>Spigot</name> - <name>Spigot</name>
- <url>https://www.spigotmc.org/</url> - <url>https://www.spigotmc.org/</url>
- -
@ -197,9 +198,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.version>unknown</api.version> - <api.version>unknown</api.version>
- <bt.name>git</bt.name> - <bt.name>git</bt.name>
- <minecraft_version>1_18_R2</minecraft_version> - <minecraft_version>1_19_R1</minecraft_version>
- <maven.compiler.source>16</maven.compiler.source> - <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>16</maven.compiler.target> - <maven.compiler.target>17</maven.compiler.target>
- </properties> - </properties>
- -
- <repositories> - <repositories>
@ -238,7 +239,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.ow2.asm</groupId> - <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId> - <artifactId>asm</artifactId>
- <version>9.2</version> - <version>9.3</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <!-- Mojang depends --> - <!-- Mojang depends -->
@ -251,7 +252,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>com.mojang</groupId> - <groupId>com.mojang</groupId>
- <artifactId>authlib</artifactId> - <artifactId>authlib</artifactId>
- <version>3.3.39</version> - <version>3.5.41</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
@ -263,7 +264,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>com.mojang</groupId> - <groupId>com.mojang</groupId>
- <artifactId>datafixerupper</artifactId> - <artifactId>datafixerupper</artifactId>
- <version>4.1.27</version> - <version>5.0.28</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
@ -286,8 +287,64 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>io.netty</groupId> - <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId> - <artifactId>netty-buffer</artifactId>
- <version>4.1.68.Final</version> - <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.76.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.76.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.76.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.76.Final</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
@ -297,6 +354,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>5.10.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>5.10.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId> - <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId> - <artifactId>jopt-simple</artifactId>
- <version>5.0.4</version> - <version>5.0.4</version>
@ -328,6 +397,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- </dependency> - </dependency>
- <!-- deprecated API depend --> - <!-- deprecated API depend -->
- <dependency> - <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>compile</scope>
- </dependency>
- <!-- deprecated API depend -->
- <dependency>
- <groupId>com.googlecode.json-simple</groupId> - <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId> - <artifactId>json-simple</artifactId>
- <version>1.1.1</version> - <version>1.1.1</version>
@ -342,26 +418,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>mysql</groupId> - <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId> - <artifactId>mysql-connector-java</artifactId>
- <version>8.0.27</version> - <version>8.0.29</version>
- <scope>runtime</scope> - <scope>runtime</scope>
- </dependency> - </dependency>
- <!-- add these back in as they are not exposed by the API --> - <!-- add these back in as they are not exposed by the API -->
- <dependency> - <dependency>
- <groupId>org.apache.maven</groupId> - <groupId>org.apache.maven</groupId>
- <artifactId>maven-resolver-provider</artifactId> - <artifactId>maven-resolver-provider</artifactId>
- <version>3.8.4</version> - <version>3.8.5</version>
- <scope>runtime</scope> - <scope>runtime</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.apache.maven.resolver</groupId> - <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId> - <artifactId>maven-resolver-connector-basic</artifactId>
- <version>1.7.2</version> - <version>1.8.0</version>
- <scope>runtime</scope> - <scope>runtime</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.apache.maven.resolver</groupId> - <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-http</artifactId> - <artifactId>maven-resolver-transport-http</artifactId>
- <version>1.7.2</version> - <version>1.8.0</version>
- <scope>runtime</scope> - <scope>runtime</scope>
- </dependency> - </dependency>
- <!-- testing --> - <!-- testing -->
@ -416,7 +492,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId> - <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version> - <version>3.2.0</version>
- <executions> - <executions>
- <execution> - <execution>
- <phase>initialize</phase> - <phase>initialize</phase>
@ -429,7 +505,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId> - <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version> - <version>3.2.2</version>
- <configuration> - <configuration>
- <archive> - <archive>
- <manifest> - <manifest>
@ -476,12 +552,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.ow2.asm</groupId> - <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId> - <artifactId>asm</artifactId>
- <version>9.2</version> - <version>9.3</version>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.ow2.asm</groupId> - <groupId>org.ow2.asm</groupId>
- <artifactId>asm-commons</artifactId> - <artifactId>asm-commons</artifactId>
- <version>9.2</version> - <version>9.3</version>
- </dependency> - </dependency>
- </dependencies> - </dependencies>
- <executions> - <executions>
@ -514,7 +590,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>net.md-5</groupId> - <groupId>net.md-5</groupId>
- <artifactId>specialsource-maven-plugin</artifactId> - <artifactId>specialsource-maven-plugin</artifactId>
- <version>1.2.3</version> - <version>1.2.4</version>
- <executions> - <executions>
- <execution> - <execution>
- <phase>package</phase> - <phase>package</phase>
@ -586,7 +662,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.apache.maven.plugins</groupId> - <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId> - <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version> - <version>3.10.1</version>
- <configuration> - <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK --> - <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId> - <compilerId>eclipse</compilerId>
@ -595,12 +671,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.codehaus.plexus</groupId> - <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId> - <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.8.8</version> - <version>2.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ecj</artifactId>
- <version>3.28.0</version>
- </dependency> - </dependency>
- </dependencies> - </dependencies>
- </plugin> - </plugin>
@ -660,7 +731,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <plugin> - <plugin>
- <groupId>org.codehaus.mojo</groupId> - <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId> - <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version> - <version>1.21</version>
- <executions> - <executions>
- <execution> - <execution>
- <phase>process-classes</phase> - <phase>process-classes</phase>

Some files were not shown because too many files have changed in this diff Show More