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

we compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 13:45:48 -04:00
parent 856416cca4
commit 6268dc4452
10 changed files with 39 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
patches/server/0004-Component-related-conveniences.patch
View File

@@ -36,65 +36,23 @@ index 062a06dbff672235acc87624f1b7c28f04ffce32..54999c41a39e8c5baed67e01be3d2838
public void displayClientMessage(Component message, boolean actionBar) {
this.sendSystemMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.SYSTEM);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5134af3c96b8df8534db543971c1d574eec31f55..65a7113aec71db08d642946278472f58b6da7bd9 100644
index 5134af3c96b8df8534db543971c1d574eec31f55..46a8b5c7a1ac2031110f7386a900ade43925e4a5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1064,6 +1064,62 @@ public abstract class PlayerList {
@@ -1064,6 +1064,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
+ // Purpur start
+ public void broadcast(@Nullable String message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable String message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable String message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable String message, ChatType type, UUID sender) {
+ // Purpur Start
+ public void broadcastMiniMessage(@Nullable String message, ResourceKey<ChatType> type) {
+ if (message != null) {
+ broadcast(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type, sender);
+ this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type);
+ }
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) {
+ public void broadcastMessage(@Nullable net.kyori.adventure.text.Component message, ResourceKey<ChatType> type) {
+ if (message != null) {
+ broadcast(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender);
+ }
+ }
+
+ public void broadcast(@Nullable Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable Component message, ChatType type, UUID sender) {
+ if (message != null) {
+ broadcastMessage(message, type, sender);
+ this.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type);
+ }
+ }
+ // Purpur end
@@ -123,37 +81,23 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0473a4d80f58538ea3cabcd38684339b27c1d29c..4ac33be263c3380a1ccc01affe3e20d46badd46e 100644
index 0473a4d80f58538ea3cabcd38684339b27c1d29c..2c42e2c39a13372833a4ba9a027e0315b150ab6c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3732,6 +3732,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3732,6 +3732,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}
+ // Purpur Start
+ public void sendMessage(@Nullable String message) {
+ sendMessage(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable String message, UUID sender) {
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(message)) {
+ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), sender);
+ public void sendMiniMessage(@Nullable String message) {
+ if (message != null) {
+ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
+ }
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
+ sendMessage(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ if (message != null) {
+ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender);
+ }
+ }
+
+ public void sendMessage(@Nullable Component message) {
+ if (message != null) {
+ sendMessage(message, Util.NIL_UUID);
+ this.sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
+ }
+ }
+ // Purpur end