13
0
geforkt von Mirrors/Paper

Start working on 1.19.4

Dieser Commit ist enthalten in:
Nassim Jahnke 2023-03-14 18:11:24 +01:00
Ursprung 627c3d4475
Commit 08ab8edb76
1390 geänderte Dateien mit 29 neuen und 53 gelöschten Zeilen

Datei anzeigen

@ -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.19.3-R0.1-SNAPSHOT</version> <version>1.19.4-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
``` ```
@ -54,7 +54,7 @@ repositories {
} }
dependencies { dependencies {
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
} }
java { java {

Datei anzeigen

@ -61,7 +61,7 @@ repositories {
} }
dependencies { dependencies {
paramMappings("net.fabricmc:yarn:1.19.3+build.1:mergedv2") paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.8.6:fat") remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
decompiler("net.minecraftforge:forgeflower:2.0.627.2") decompiler("net.minecraftforge:forgeflower:2.0.627.2")
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
@ -133,7 +133,7 @@ allprojects {
tasks.collectAtsFromPatches { tasks.collectAtsFromPatches {
// Uncomment while updating for a new Minecraft version // Uncomment while updating for a new Minecraft version
//extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
} }
tasks.register("printMinecraftVersion") { tasks.register("printMinecraftVersion") {

Datei anzeigen

@ -1,6 +1,6 @@
group=io.papermc.paper group=io.papermc.paper
version=1.19.3-R0.1-SNAPSHOT version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.3 mcVersion=1.19.4
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

Datei anzeigen

@ -47,6 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ api("com.google.code.gson:gson:2.10") + api("com.google.code.gson:gson:2.10")
+ api("net.md-5:bungeecord-chat:1.16-R0.4") + api("net.md-5:bungeecord-chat:1.16-R0.4")
+ api("org.yaml:snakeyaml:1.33") + api("org.yaml:snakeyaml:1.33")
+ api("org.joml:joml:1.10.5")
+ +
+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@ -125,7 +126,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- -
- <groupId>org.spigotmc</groupId> - <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
- <version>1.19.3-R0.1-SNAPSHOT</version> - <version>1.19.4-R0.1-SNAPSHOT</version>
- <packaging>jar</packaging> - <packaging>jar</packaging>
- -
- <name>Spigot-API</name> - <name>Spigot-API</name>
@ -165,6 +166,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <version>2.10</version> - <version>2.10</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <!-- bundled with Minecraft, should be kept in sync -->
- <dependency>
- <groupId>org.joml</groupId>
- <artifactId>joml</artifactId>
- <version>1.10.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency> - <dependency>
- <groupId>net.md-5</groupId> - <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId> - <artifactId>bungeecord-chat</artifactId>

Datei anzeigen

@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ implementation("org.ow2.asm:asm:9.4") + implementation("org.ow2.asm:asm:9.4")
+ implementation("commons-lang:commons-lang:2.6") + 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.29") + runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
+ +
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ testImplementation("org.hamcrest:hamcrest-library:1.3") + testImplementation("org.hamcrest:hamcrest-library:1.3")
+} +}
+ +
+val craftbukkitPackageVersion = "1_19_R2" // Paper +val craftbukkitPackageVersion = "1_19_R3" // Paper
+tasks.jar { +tasks.jar {
+ archiveClassifier.set("dev") + archiveClassifier.set("dev")
+ +
@ -181,7 +181,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.19.3-R0.1-SNAPSHOT</version> - <version>1.19.4-R0.1-SNAPSHOT</version>
- <name>Spigot</name> - <name>Spigot</name>
- <url>https://www.spigotmc.org/</url> - <url>https://www.spigotmc.org/</url>
- -
@ -197,7 +197,7 @@ 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_19_R2</minecraft_version> - <minecraft_version>1_19_R3</minecraft_version>
- <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target> - <maven.compiler.target>17</maven.compiler.target>
- </properties> - </properties>
@ -251,7 +251,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>com.mojang</groupId> - <groupId>com.mojang</groupId>
- <artifactId>authlib</artifactId> - <artifactId>authlib</artifactId>
- <version>3.16.29</version> - <version>3.17.30</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
@ -263,13 +263,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>com.mojang</groupId> - <groupId>com.mojang</groupId>
- <artifactId>datafixerupper</artifactId> - <artifactId>datafixerupper</artifactId>
- <version>5.0.28</version> - <version>6.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.mojang</groupId>
- <artifactId>javabridge</artifactId>
- <version>2.0.25</version>
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
@ -389,12 +383,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <scope>compile</scope> - <scope>compile</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>org.joml</groupId>
- <artifactId>joml</artifactId>
- <version>1.10.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId> - <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId> - <artifactId>slf4j-api</artifactId>
- <version>2.0.1</version> - <version>2.0.1</version>
@ -417,13 +405,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <dependency> - <dependency>
- <groupId>org.xerial</groupId> - <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId> - <artifactId>sqlite-jdbc</artifactId>
- <version>3.36.0.3</version> - <version>3.41.0.0</version>
- <scope>runtime</scope> - <scope>runtime</scope>
- </dependency> - </dependency>
- <dependency> - <dependency>
- <groupId>mysql</groupId> - <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-java</artifactId> - <artifactId>mysql-connector-j</artifactId>
- <version>8.0.29</version> - <version>8.0.32</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 -->
@ -728,26 +716,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- </dependency> - </dependency>
- </dependencies> - </dependencies>
- </plugin> - </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> - </plugins>
- </build> - </build>
- </profile> - </profile>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen