mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5b6165c4 Add spawnreason for building copper golems (#13112) PaperMC/Paper@6950f05d Update to 1.21.9 PaperMC/Paper@dad730f2 [ci/skip] Update README PaperMC/Paper@27f926e7 Expose Copper Golem weathering state to API (#13089)
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
## Purpur
|
## Purpur
|
||||||
|
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://purpurmc.org/downloads/)
|
[](https://purpurmc.org/downloads/)
|
||||||
[](https://www.codefactor.io/repository/github/PurpurMC/Purpur)
|
[](https://www.codefactor.io/repository/github/PurpurMC/Purpur)
|
||||||
[](https://purpurmc.org/discord)
|
[](https://purpurmc.org/discord)
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ Join us on Discord:
|
|||||||
## Downloads
|
## Downloads
|
||||||
Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
|
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:
|
Downloads API endpoints:
|
||||||
* List versions of Minecraft with builds available:
|
* List versions of Minecraft with builds available:
|
||||||
@@ -67,7 +67,7 @@ Maven
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.purpurmc.purpur</groupId>
|
<groupId>org.purpurmc.purpur</groupId>
|
||||||
<artifactId>purpur-api</artifactId>
|
<artifactId>purpur-api</artifactId>
|
||||||
<version>1.21.8-R0.1-SNAPSHOT</version>
|
<version>1.21.9-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
```
|
```
|
||||||
@@ -80,7 +80,7 @@ repositories {
|
|||||||
```
|
```
|
||||||
```kotlin
|
```kotlin
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("org.purpurmc.purpur:purpur-api:1.21.8-R0.1-SNAPSHOT")
|
compileOnly("org.purpurmc.purpur:purpur-api:1.21.9-R0.1-SNAPSHOT")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
group = org.purpurmc.purpur
|
group = org.purpurmc.purpur
|
||||||
version = 1.21.9-rc1-R0.1-SNAPSHOT
|
version = 1.21.9-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.9-rc1
|
mcVersion = 1.21.9
|
||||||
paperCommit = b61b3c9dd2f6c99b187f6702ea3b2baa0ab5ce35
|
paperCommit = 27f926e7ecbcfd9c3fe24d53c79a59a141974824
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
--- a/src/main/java/org/bukkit/entity/CopperGolem.java
|
--- a/src/main/java/org/bukkit/entity/CopperGolem.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/CopperGolem.java
|
+++ b/src/main/java/org/bukkit/entity/CopperGolem.java
|
||||||
@@ -3,4 +_,19 @@
|
@@ -39,6 +_,22 @@
|
||||||
import io.papermc.paper.entity.Shearable;
|
*/
|
||||||
|
void setOxidizing(Oxidizing oxidizing);
|
||||||
|
|
||||||
public interface CopperGolem extends Golem, Shearable {
|
|
||||||
+ // Purpur start
|
+ // Purpur start
|
||||||
+ /**
|
+ /**
|
||||||
+ * Get the player that summoned this iron golem
|
+ * Get the player that summoned this iron golem
|
||||||
@@ -19,4 +19,7 @@
|
|||||||
+ */
|
+ */
|
||||||
+ void setSummoner(@org.jetbrains.annotations.Nullable java.util.UUID summoner);
|
+ void setSummoner(@org.jetbrains.annotations.Nullable java.util.UUID summoner);
|
||||||
+ // Purpur end
|
+ // Purpur end
|
||||||
}
|
+
|
||||||
|
/**
|
||||||
|
* Represents the oxidizing state of a copper golem.
|
||||||
|
*
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
||||||
@@ -13,4 +_,17 @@
|
@@ -55,4 +_,17 @@
|
||||||
public net.minecraft.world.entity.animal.coppergolem.CopperGolem getHandle() {
|
default -> throw new IllegalStateException("Unexpected value: " + oxidizing);
|
||||||
return (net.minecraft.world.entity.animal.coppergolem.CopperGolem) this.entity;
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ // Purpur start - Summoner API
|
+ // Purpur start - Summoner API
|
||||||
|
|||||||
Reference in New Issue
Block a user