Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@afe633d convert API/server tests to mockito (#8848)
PaperMC/Paper@03a4e7a Updated Upstream (Bukkit/CraftBukkit) (#8832)
PaperMC/Paper@5c87711 Make sure Registry is loaded after Bukkit.setServer() (#8853)
This commit is contained in:
granny
2023-02-15 18:34:28 -08:00
parent 08aa4dccaa
commit c795c61137
14 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 3c4dd6ebc2289c44c2f5723e7920aadffdc51884..a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa 100644
index c16ebc233bce9fd2020d3dde6253c3b90000c0f3..4e78a535b528a87ad0ec9c361541c79854929c6e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
@@ -31,7 +31,7 @@ index 3c4dd6ebc2289c44c2f5723e7920aadffdc51884..a995ecc3b1d6181c58d5b4a0a6a89317
implementation("org.ow2.asm:asm:9.2")
implementation("org.ow2.asm:asm-commons:9.2")
@@ -83,6 +84,13 @@ val generateApiVersioningFile by tasks.registering {
@@ -84,6 +85,13 @@ val generateApiVersioningFile by tasks.registering {
}
}

4
patches/api/0003-Build-System-Changes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
diff --git a/build.gradle.kts b/build.gradle.kts
index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..5c8dd4d3313a791d1fee00ec5d4bc595b76b7d6d 100644
index 4e78a535b528a87ad0ec9c361541c79854929c6e..0d27a44ad43dce122e207aa7d0c83db594bb16a4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -103,6 +103,8 @@ tasks.jar {
@@ -104,6 +104,8 @@ tasks.jar {
}
tasks.withType<Javadoc> {

15
patches/api/0019-ItemStack-convenience-methods.patch
View File

@@ -5,13 +5,14 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index ee471fbd7c2138cd330b2c64da4e77b3414ec913..4df3de56641b0ce028f25ee8d3ed496c707302a7 100644
index 6bbb47d1f9d8d45326232024e82a0ebaf764fae7..2a22d0639d63a3db4e7bded2d4e91b09bb93a95e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -10714,4 +10714,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getCreativeCategory(this);
@@ -10753,4 +10753,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public String getItemTranslationKey() {
return Bukkit.getUnsafe().getItemTranslationKey(this);
}
+
+ // Purpur start
+ public boolean isArmor() {
+ switch (this) {
@@ -49,10 +50,10 @@ index ee471fbd7c2138cd330b2c64da4e77b3414ec913..4df3de56641b0ce028f25ee8d3ed496c
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 870c0ddd101094a3bce1ebf5ec4d42c51053db84..2cd247a315586b35b73e4396d850ca1d347eea92 100644
index 449d6e1995eedbfaeffdc5d1f1c2295378006aa8..11261c659e3a378f468f4a19e2c24c1bb1f95a2b 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -16,6 +16,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -71,7 +72,7 @@ index 870c0ddd101094a3bce1ebf5ec4d42c51053db84..2cd247a315586b35b73e4396d850ca1d
/**
* Represents a stack of items.
@@ -992,4 +1004,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
@@ -986,4 +998,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
return livingEntity.damageItemStack(this, amount);
}
// Paper end