Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
c40e04e9e7 Remove wrong update call in distance map add method
58c41d0f60 [ci skip] Update log4j-api in Paper-API to 2.17.1 (#7227)
fa438331e0 [ci skip] Update shadow and remove semicolons from kotlin code
8b1734123e Fix vanilla LocalMobCapCalculator being used when per-player mob spawning is enabled (#7230)
3a43821c38 Updated Upstream (Bukkit/CraftBukkit/Spigot)
4bf2aef745 Validate usernames
3c5284dae9 Allow . in usernames
This commit is contained in:
BillyGalbreath
2022-01-01 16:01:07 -06:00
parent 5593d17308
commit 12e0430097
26 changed files with 107 additions and 104 deletions

View File

@@ -6,12 +6,12 @@ Subject: [PATCH] Build System Changes
todo: merge with rebrand patch
diff --git a/build.gradle.kts b/build.gradle.kts
index a23b2bd8e1ca1ff8d0ad5ed5d5e41c89e4795090..46877e24c8e676fcc229090b96738ea79dceeaa1 100644
index 001c2b963205012f340db0d539e4033c748124ce..1ab728d05891b3a17094a4a61b5af4ad6de5e074 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-plain")
api("org.apache.logging.log4j:log4j-api:2.17.0")
api("org.apache.logging.log4j:log4j-api:2.17.1")
api("org.slf4j:slf4j-api:1.8.0-beta4")
+ api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur

View File

@@ -5,12 +5,12 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index f24820f14d689d49dfea25605199d5299ec28e7c..4e4fcce337047da575a9318c7094614d5270040e 100644
index 56e5ab93096801277ec5162981ddf5275d2c7669..bfcd5b17898ae97340d813bb46506234bc03e229 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -9832,4 +9832,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
// </editor-fold>
}
@@ -9857,4 +9857,40 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getDefaultAttributeModifiers(this, slot);
}
+
+ // Purpur start

View File

@@ -503,10 +503,10 @@ index fa2a5c8ed947cd2beed01df82fcc5e450e3e5782..d5e7538f7c7f288e1710fb383b57683f
@NotNull
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 81e17ebb54f8b5c085842f223081f3d6d33a317d..9b17e6920dc3612e1787be1b74988a24bb6ad5a7 100644
index f59030893eba2bf653207b040a5f54fdf7b7b50f..430525a74bd727c6c831aaa86784430bf7b221a8 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -88,6 +88,8 @@ public interface UnsafeValues {
@@ -94,6 +94,8 @@ public interface UnsafeValues {
/**
* Called once by the version command on first use, then cached.
@@ -515,7 +515,7 @@ index 81e17ebb54f8b5c085842f223081f3d6d33a317d..9b17e6920dc3612e1787be1b74988a24
*/
default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
@@ -114,6 +116,8 @@ public interface UnsafeValues {
@@ -120,6 +122,8 @@ public interface UnsafeValues {
/**
* Return the translation key for the Material, so the client can translate it into the active
* locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.
@@ -524,7 +524,7 @@ index 81e17ebb54f8b5c085842f223081f3d6d33a317d..9b17e6920dc3612e1787be1b74988a24
* @return the translation key
*/
String getTranslationKey(Material mat);
@@ -121,6 +125,8 @@ public interface UnsafeValues {
@@ -127,6 +131,8 @@ public interface UnsafeValues {
/**
* Return the translation key for the Block, so the client can translate it into the active
* locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.
@@ -533,7 +533,7 @@ index 81e17ebb54f8b5c085842f223081f3d6d33a317d..9b17e6920dc3612e1787be1b74988a24
* @return the translation key
*/
String getTranslationKey(org.bukkit.block.Block block);
@@ -129,6 +135,8 @@ public interface UnsafeValues {
@@ -135,6 +141,8 @@ public interface UnsafeValues {
* Return the translation key for the EntityType, so the client can translate it into the active
* locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.<br>
* This is <code>null</code>, when the EntityType isn't known to NMS (custom entities)
@@ -542,7 +542,7 @@ index 81e17ebb54f8b5c085842f223081f3d6d33a317d..9b17e6920dc3612e1787be1b74988a24
* @return the translation key
*/
String getTranslationKey(org.bukkit.entity.EntityType type);
@@ -144,6 +152,8 @@ public interface UnsafeValues {
@@ -150,6 +158,8 @@ public interface UnsafeValues {
* Creates and returns the next EntityId available.
* <p>
* Use this when sending custom packets, so that there are no collisions on the client or server.