SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-7530, #1314: Improve Resource Pack API with new 1.20.3 functionality

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-01-31 22:02:45 +11:00
parent 4a1ae2fa02
commit 4fde00f8dc
3 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -1734,15 +1734,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(UUID id, String url, byte[] hash, String prompt, boolean force) {
Preconditions.checkArgument(id != null, "Resource pack ID cannot be null");
Preconditions.checkArgument(url != null, "Resource pack URL cannot be null");
String hashStr = "";
if (hash != null) {
Preconditions.checkArgument(hash.length == 20, "Resource pack hash should be 20 bytes long but was %s", hash.length);
getHandle().connection.send(new ClientboundResourcePackPushPacket(id, url, BaseEncoding.base16().lowerCase().encode(hash), force, CraftChatMessage.fromStringOrNull(prompt, true)));
} else {
getHandle().connection.send(new ClientboundResourcePackPushPacket(id, url, "", force, CraftChatMessage.fromStringOrNull(prompt, true)));
hashStr = BaseEncoding.base16().lowerCase().encode(hash);
}
this.handlePushResourcePack(new ClientboundResourcePackPushPacket(id, url, hashStr, force, CraftChatMessage.fromStringOrNull(prompt, true)), true);
}
@Override
public void addResourcePack(UUID id, String url, byte[] hash, String prompt, boolean force) {
Preconditions.checkArgument(url != null, "Resource pack URL cannot be null");
String hashStr = "";
if (hash != null) {
Preconditions.checkArgument(hash.length == 20, "Resource pack hash should be 20 bytes long but was %s", hash.length);
hashStr = BaseEncoding.base16().lowerCase().encode(hash);
}
this.handlePushResourcePack(new ClientboundResourcePackPushPacket(id, url, hashStr, force, CraftChatMessage.fromStringOrNull(prompt, true)), false);
}
@Override
@@ -1758,6 +1772,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
}
private void handlePushResourcePack(ClientboundResourcePackPushPacket resourcePackPushPacket, boolean resetBeforePush) {
if (getHandle().connection == null) return;
if (resetBeforePush) {
this.removeResourcePacks();
}
getHandle().connection.send(resourcePackPushPacket);
}
public void addChannel(String channel) {
Preconditions.checkState(channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
channel = StandardMessenger.validateAndCorrectChannel(channel);