Skip to content

Commit 397349e

Browse files
kezzjpenilla
kezz
and
jpenilla
authored
Adventure 4.9.1 (#6634)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
1 parent 1707c10 commit 397349e

File tree

53 files changed

+343
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+343
-158
lines changed

‎patches/api/0002-Build-system-changes.patch

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 6e64a444fb20aabaabfb15a30d645702c11c2da8..db6a7b2e60da0d96ef96545a781f1e056482d6ff 100644
8+
index fd30d2e6d3716777be7bc2f28267ab5b03131342..8cabc75b2272dbb448c1f04a0ef6b0339d9f6b17 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
11-
@@ -17,12 +17,14 @@ dependencies {
11+
@@ -17,15 +17,23 @@ dependencies {
1212
api("com.google.code.gson:gson:2.8.0")
1313
api("net.md-5:bungeecord-chat:1.16-R0.4")
1414
api("org.yaml:snakeyaml:1.28")
@@ -24,7 +24,16 @@ index 6e64a444fb20aabaabfb15a30d645702c11c2da8..db6a7b2e60da0d96ef96545a781f1e05
2424
compileOnly(annotations)
2525
testCompileOnly(annotations)
2626

27-
@@ -61,7 +63,7 @@ tasks.withType<Javadoc>().configureEach {
27+
+ // Paper start - add checker
28+
+ val checkerAnnotations = "org.checkerframework:checker-qual:3.18.0"
29+
+ compileOnlyApi(checkerAnnotations)
30+
+ testCompileOnly(checkerAnnotations)
31+
+ // Paper end
32+
+
33+
testImplementation("junit:junit:4.13.1")
34+
testImplementation("org.hamcrest:hamcrest-library:1.3")
35+
testImplementation("org.ow2.asm:asm-tree:9.2")
36+
@@ -61,7 +69,7 @@ tasks.withType<Javadoc>().configureEach {
2837
(options as StandardJavadocDocletOptions).links(
2938
"https://guava.dev/releases/21.0/api/docs/",
3039
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",

‎patches/api/0007-Adventure.patch

Lines changed: 70 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Co-authored-by: zml <zml@stellardrift.ca>
77
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
88

99
diff --git a/build.gradle.kts b/build.gradle.kts
10-
index ccf5b30fa48e641fc8d04f185f9ffca55d4e2154..0ed6d9e6619db7559dc5b65a8da6e54e6e15d31c 100644
10+
index 3a395a44ff50a77895341bbbfb8c81deede41b8b..6ebea1d9fafb08ede7e37dfe1b145a676c7aaaf9 100644
1111
--- a/build.gradle.kts
1212
+++ b/build.gradle.kts
1313
@@ -10,6 +10,19 @@ java {
1414
withJavadocJar()
1515
}
1616

17-
+val adventureVersion = "4.8.1"
17+
+val adventureVersion = "4.9.1"
1818
+val apiAndDocs by configurations.creating {
1919
+ attributes {
2020
+ attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -42,7 +42,7 @@ index ccf5b30fa48e641fc8d04f185f9ffca55d4e2154..0ed6d9e6619db7559dc5b65a8da6e54e
4242

4343
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
4444
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
45-
@@ -61,10 +79,17 @@ tasks.jar {
45+
@@ -67,10 +85,17 @@ tasks.jar {
4646
}
4747

4848
tasks.withType<Javadoc>().configureEach {
@@ -1401,7 +1401,7 @@ index 25a6f9313a1953def7470e411b53016f2ca14bef..03d8ac1b41659540d7eb3d7e218cdfaa
14011401
+ // Paper end
14021402
}
14031403
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
1404-
index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955dfa653edb3 100644
1404+
index 6c910e09eda6f4f08226ccc75189171015a72b85..696bf438012fd93f38495024ca49999cec151168 100644
14051405
--- a/src/main/java/org/bukkit/entity/Player.java
14061406
+++ b/src/main/java/org/bukkit/entity/Player.java
14071407
@@ -33,7 +33,28 @@ import org.jetbrains.annotations.Nullable;
@@ -1697,7 +1697,26 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
16971697
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
16981698

16991699
/**
1700-
@@ -1266,6 +1437,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1700+
@@ -1020,7 +1191,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1701+
*
1702+
* @param title Title text
1703+
* @param subtitle Subtitle text
1704+
- * @deprecated API behavior subject to change
1705+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
1706+
*/
1707+
@Deprecated
1708+
public void sendTitle(@Nullable String title, @Nullable String subtitle);
1709+
@@ -1039,7 +1210,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1710+
* @param fadeIn time in ticks for titles to fade in. Defaults to 10.
1711+
* @param stay time in ticks for titles to stay. Defaults to 70.
1712+
* @param fadeOut time in ticks for titles to fade out. Defaults to 20.
1713+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
1714+
*/
1715+
+ @Deprecated // Paper - Adventure
1716+
public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
1717+
1718+
/**
1719+
@@ -1266,6 +1439,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17011720
*/
17021721
public int getClientViewDistance();
17031722

@@ -1712,7 +1731,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17121731
/**
17131732
* Gets the player's estimated ping in milliseconds.
17141733
*
1715-
@@ -1291,8 +1470,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1734+
@@ -1291,8 +1472,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17161735
* they wish.
17171736
*
17181737
* @return the player's locale
@@ -1723,7 +1742,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17231742
public String getLocale();
17241743

17251744
/**
1726-
@@ -1310,6 +1491,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1745+
@@ -1310,6 +1493,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17271746
*/
17281747
public void openBook(@NotNull ItemStack book);
17291748

@@ -1738,7 +1757,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17381757
// Spigot start
17391758
public class Spigot extends Entity.Spigot {
17401759

1741-
@@ -1364,11 +1553,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1760+
@@ -1364,11 +1555,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17421761
throw new UnsupportedOperationException("Not supported yet.");
17431762
}
17441763

@@ -1752,7 +1771,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17521771
@Override
17531772
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
17541773
throw new UnsupportedOperationException("Not supported yet.");
1755-
@@ -1379,7 +1570,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1774+
@@ -1379,7 +1572,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17561775
*
17571776
* @param position the screen position
17581777
* @param component the components to send
@@ -1762,7 +1781,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17621781
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
17631782
throw new UnsupportedOperationException("Not supported yet.");
17641783
}
1765-
@@ -1389,7 +1582,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1784+
@@ -1389,7 +1584,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17661785
*
17671786
* @param position the screen position
17681787
* @param components the components to send
@@ -1772,7 +1791,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17721791
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
17731792
throw new UnsupportedOperationException("Not supported yet.");
17741793
}
1775-
@@ -1400,7 +1595,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1794+
@@ -1400,7 +1597,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17761795
* @param position the screen position
17771796
* @param sender the sender of the message
17781797
* @param component the components to send
@@ -1782,7 +1801,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955df
17821801
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
17831802
throw new UnsupportedOperationException("Not supported yet.");
17841803
}
1785-
@@ -1411,7 +1608,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1804+
@@ -1411,7 +1610,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
17861805
* @param position the screen position
17871806
* @param sender the sender of the message
17881807
* @param components the components to send
@@ -3571,6 +3590,45 @@ index 4dba721aefe4fc6699b3b4bfa7ecb0b19c2a2a1a..01dec2c877df58c9dc22445e8b1f9ce2
35713590
+ public @NotNull MapCursor addCursor(int x, int y, byte direction, byte type, boolean visible, @Nullable net.kyori.adventure.text.Component caption) {
35723591
+ return addCursor(new MapCursor((byte) x, (byte) y, direction, type, visible, caption));
35733592
+ }
3593+
+ // Paper end
3594+
}
3595+
diff --git a/src/main/java/org/bukkit/permissions/Permissible.java b/src/main/java/org/bukkit/permissions/Permissible.java
3596+
index 228421154913116069c20323afb519bdde2134df..26791db3c267670d5782f1d2b67ff7d5b55b9dac 100644
3597+
--- a/src/main/java/org/bukkit/permissions/Permissible.java
3598+
+++ b/src/main/java/org/bukkit/permissions/Permissible.java
3599+
@@ -126,4 +126,34 @@ public interface Permissible extends ServerOperator {
3600+
*/
3601+
@NotNull
3602+
public Set<PermissionAttachmentInfo> getEffectivePermissions();
3603+
+
3604+
+ // Paper start - add TriState permission checks
3605+
+ /**
3606+
+ * Checks if this object has a permission set and, if it is set, the value of the permission.
3607+
+ *
3608+
+ * @param permission the permission to check
3609+
+ * @return a tri-state of if the permission is set and, if it is set, it's value
3610+
+ */
3611+
+ default net.kyori.adventure.util.@NotNull TriState permissionValue(final @NotNull Permission permission) {
3612+
+ if (this.isPermissionSet(permission)) {
3613+
+ return net.kyori.adventure.util.TriState.byBoolean(this.hasPermission(permission));
3614+
+ } else {
3615+
+ return net.kyori.adventure.util.TriState.NOT_SET;
3616+
+ }
3617+
+ }
3618+
+
3619+
+ /**
3620+
+ * Checks if this object has a permission set and, if it is set, the value of the permission.
3621+
+ *
3622+
+ * @param permission the permission to check
3623+
+ * @return a tri-state of if the permission is set and, if it is set, it's value
3624+
+ */
3625+
+ default net.kyori.adventure.util.@NotNull TriState permissionValue(final @NotNull String permission) {
3626+
+ if (this.isPermissionSet(permission)) {
3627+
+ return net.kyori.adventure.util.TriState.byBoolean(this.hasPermission(permission));
3628+
+ } else {
3629+
+ return net.kyori.adventure.util.TriState.NOT_SET;
3630+
+ }
3631+
+ }
35743632
+ // Paper end
35753633
}
35763634
diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java

‎patches/api/0008-Player-affects-spawning-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index d68b2c6044db7740ef4d737e1b2955dfa653edb3..1786b6c230cabaf962b27f9d95c49b42e2b5cc67 100644
8+
index 696bf438012fd93f38495024ca49999cec151168..210b3440518cbddd6c27a7b301b280d814404a2a 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -1476,6 +1476,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -1478,6 +1478,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
@Deprecated // Paper
1313
public String getLocale();
1414

‎patches/api/0013-Add-view-distance-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ index 92e8b0b1ccebdc2646337114793ea9f3e7759d25..5d01ba43ead1c5d257e38645380359c8
6464
public class Spigot {
6565

6666
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
67-
index 1786b6c230cabaf962b27f9d95c49b42e2b5cc67..d65f35573700078a90283c37d698778a751e44a2 100644
67+
index 210b3440518cbddd6c27a7b301b280d814404a2a..14f35121aaeb641ac90bcadc906816f225e165ac 100644
6868
--- a/src/main/java/org/bukkit/entity/Player.java
6969
+++ b/src/main/java/org/bukkit/entity/Player.java
70-
@@ -1490,6 +1490,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
70+
@@ -1492,6 +1492,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
7171
* @param affects Whether the player can affect mob spawning
7272
*/
7373
public void setAffectsSpawning(boolean affects);

‎patches/api/0020-Player-Tab-List-and-Title-APIs.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
432432
+ }
433433
+}
434434
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
435-
index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd822a01ca3c 100644
435+
index a989f63b6862123dc2b1293b9fd901bd093c84d0..adf57da082ef37c369ed327804148ff992841055 100644
436436
--- a/src/main/java/org/bukkit/entity/Player.java
437437
+++ b/src/main/java/org/bukkit/entity/Player.java
438438
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -474,7 +474,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
474474
+ * @param fadeInTicks ticks to fade-in
475475
+ * @param stayTicks ticks to stay visible
476476
+ * @param fadeOutTicks ticks to fade-out
477-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
477+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
478478
+ */
479479
+ @Deprecated
480480
+ public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks);
@@ -483,7 +483,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
483483
+ * Update the subtitle of titles displayed to the player
484484
+ *
485485
+ * @param subtitle Subtitle to set
486-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
486+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
487487
+ */
488488
+ @Deprecated
489489
+ public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent[] subtitle);
@@ -492,7 +492,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
492492
+ * Update the subtitle of titles displayed to the player
493493
+ *
494494
+ * @param subtitle Subtitle to set
495-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
495+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
496496
+ */
497497
+ @Deprecated
498498
+ public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent subtitle);
@@ -501,7 +501,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
501501
+ * Show the given title to the player, along with the last subtitle set, using the last set times
502502
+ *
503503
+ * @param title Title to set
504-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
504+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
505505
+ */
506506
+ @Deprecated
507507
+ public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title);
@@ -510,7 +510,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
510510
+ * Show the given title to the player, along with the last subtitle set, using the last set times
511511
+ *
512512
+ * @param title Title to set
513-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
513+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
514514
+ */
515515
+ @Deprecated
516516
+ public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title);
@@ -523,7 +523,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
523523
+ * @param fadeInTicks ticks to fade-in
524524
+ * @param stayTicks ticks to stay visible
525525
+ * @param fadeOutTicks ticks to fade-out
526-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
526+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
527527
+ */
528528
+ @Deprecated
529529
+ public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title, @Nullable net.md_5.bungee.api.chat.BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
@@ -536,7 +536,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
536536
+ * @param fadeInTicks ticks to fade-in
537537
+ * @param stayTicks ticks to stay visible
538538
+ * @param fadeOutTicks ticks to fade-out
539-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
539+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
540540
+ */
541541
+ @Deprecated
542542
+ public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title, @Nullable net.md_5.bungee.api.chat.BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
@@ -548,7 +548,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
548548
+ *
549549
+ * @param title the title to send
550550
+ * @throws NullPointerException if the title is null
551-
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)}
551+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
552552
+ */
553553
+ @Deprecated
554554
+ void sendTitle(@NotNull Title title);
@@ -560,7 +560,7 @@ index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd82
560560
+ *
561561
+ * @param title the title to send
562562
+ * @throws NullPointerException if title is null
563-
+ * @deprecated use {@link #showTitle(net.kyori.adventure.title.Title)}
563+
+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
564564
+ */
565565
+ @Deprecated
566566
+ void updateTitle(@NotNull Title title);

‎patches/api/0024-Complete-resource-pack-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 9d56c51b64dfd70dbc83b32729c38615141930d5..bbdcb00642d6d91787f0c4184434de15b0e31646 100644
8+
index adf57da082ef37c369ed327804148ff992841055..2c3e43ccf862c9de27811de0a49a2dee85e5d459 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
1111
@@ -1220,7 +1220,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -18,7 +18,7 @@ index 9d56c51b64dfd70dbc83b32729c38615141930d5..bbdcb00642d6d91787f0c4184434de15
1818
public void setResourcePack(@NotNull String url);
1919

2020
/**
21-
@@ -1731,6 +1733,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
21+
@@ -1733,6 +1735,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2222
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
2323
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
2424
}

0 commit comments

Comments
 (0)