mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-20 02:08:15 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ce56a02f Update Vanilla base to 26.1.2 PaperMC/Paper@67a54b31 Add EntityLungeEvent (#13637) PaperMC/Paper@1241f406 [ci/skip] Update Player#performCommand javadoc and signature (#13698) PaperMC/Paper@73aded43 Fix spigot config silentCommandBlocks filtering player commands (#13649) PaperMC/Paper@d61d8df4 Cleanup crafter slot diff (#13662) PaperMC/Paper@8987f91c [ci/skip] chore(jd): ChunkGenerator improvements (#13655)
This commit is contained in:
granny
@@ -1,11 +1,11 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
|
||||
<option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-26.1-R0.1-SNAPSHOT.jar" />
|
||||
<option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-26.1.2.local-SNAPSHOT.jar" />
|
||||
<option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" />
|
||||
<method v="2">
|
||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
|
||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
@@ -7,7 +7,7 @@
|
||||
## Purpur
|
||||
|
||||
[](LICENSE)
|
||||
[](https://purpurmc.org/downloads/)
|
||||
[](https://purpurmc.org/downloads/)
|
||||
[](https://www.codefactor.io/repository/github/PurpurMC/Purpur)
|
||||
[](https://purpurmc.org/discord)
|
||||
|
||||
@@ -27,7 +27,7 @@ Join us on Discord:
|
||||
## Downloads
|
||||
Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
|
||||
|
||||
[](https://purpurmc.org/downloads/)
|
||||
[](https://purpurmc.org/downloads/)
|
||||
|
||||
Downloads API endpoints:
|
||||
* List versions of Minecraft with builds available:
|
||||
@@ -67,7 +67,7 @@ Maven
|
||||
<dependency>
|
||||
<groupId>org.purpurmc.purpur</groupId>
|
||||
<artifactId>purpur-api</artifactId>
|
||||
<version>1.21.11-R0.1-SNAPSHOT</version>
|
||||
<version>[26.1.2.build,)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
```
|
||||
@@ -80,7 +80,7 @@ repositories {
|
||||
```
|
||||
```kotlin
|
||||
dependencies {
|
||||
compileOnly("org.purpurmc.purpur:purpur-api:1.21.11-R0.1-SNAPSHOT")
|
||||
compileOnly("org.purpurmc.purpur:purpur-api:26.1.2.build.+")
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
group = org.purpurmc.purpur
|
||||
|
||||
mcVersion = 26.1.1
|
||||
apiVersion = 26.1.1
|
||||
mcVersion = 26.1.2
|
||||
apiVersion = 26.1.2
|
||||
channel=EXPERIMENTAL
|
||||
paperCommit = 7773669d2ba9554e817b12c546ec58aa876d3bb4
|
||||
paperCommit = 8987f91c92631c1512cfafddf4eb2d3730ebf1af
|
||||
|
||||
org.gradle.configuration-cache = true
|
||||
org.gradle.caching = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -4012,4 +_,123 @@
|
||||
@@ -4015,4 +_,123 @@
|
||||
*/
|
||||
@ApiStatus.Experimental
|
||||
PlayerGameConnection getConnection();
|
||||
|
||||
@@ -58,12 +58,12 @@ fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {
|
||||
|
||||
gradle.lifecycle.beforeProject {
|
||||
val mcVersion = providers.gradleProperty("mcVersion").get().trim()
|
||||
val paperVersionChannel = providers.gradleProperty("channel").get().trim()
|
||||
val paperBuildNumber = providers.environmentVariable("BUILD_NUMBER").orNull?.trim()?.toInt()
|
||||
val versionString = if (paperBuildNumber == null) {
|
||||
val purpurChannel = providers.gradleProperty("channel").get().trim()
|
||||
val purpurBuildNumber = providers.environmentVariable("BUILD_NUMBER").orNull?.trim()?.toInt()
|
||||
val versionString = if (purpurBuildNumber == null) {
|
||||
"$mcVersion.local-SNAPSHOT"
|
||||
} else {
|
||||
"$mcVersion.build.$paperBuildNumber-${paperVersionChannel.lowercase()}"
|
||||
"$mcVersion.build.$purpurBuildNumber-${purpurChannel.lowercase()}"
|
||||
}
|
||||
version = versionString
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user