2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
|
|
Date: Sat, 4 Apr 2015 23:17:52 -0400
|
|
|
|
Subject: [PATCH] Complete resource pack API
|
|
|
|
|
|
|
|
|
2023-09-21 22:14:58 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
|
2023-12-05 20:54:55 +01:00
|
|
|
index 0a6feccc657e62d7bad5e1461d5538a4c3a16b76..53833e155cf0d2328f2c2b36702970925045be3d 100644
|
2023-09-21 22:14:58 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
|
|
|
|
@@ -156,7 +156,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
|
2023-12-05 20:54:55 +01:00
|
|
|
ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack {} rejection", this.playerProfile().getName(), packet.id());
|
2022-06-07 21:55:39 +02:00
|
|
|
this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
|
2021-06-12 02:57:04 +02:00
|
|
|
}
|
2023-12-05 20:54:55 +01:00
|
|
|
- this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()])); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
2023-12-05 20:54:55 +01:00
|
|
|
+ PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()];
|
2021-06-11 14:02:28 +02:00
|
|
|
+ player.getBukkitEntity().setResourcePackStatus(packStatus);
|
2021-06-12 02:57:04 +02:00
|
|
|
+ this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
2023-09-21 22:14:58 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-12-05 20:54:55 +01:00
|
|
|
index a58b0d10d73310587a05e40e072029ee258063e1..06c0f72a83de5866f4c734c0809d60446a736af6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2023-12-05 20:54:55 +01:00
|
|
|
@@ -192,6 +192,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 14:02:28 +02:00
|
|
|
private double healthScale = 20;
|
2022-04-16 10:29:50 +02:00
|
|
|
private CraftWorldBorder clientWorldBorder = null;
|
|
|
|
private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
|
|
|
|
+ private String resourcePackHash;
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
public CraftPlayer(CraftServer server, ServerPlayer entity) {
|
|
|
|
super(server, entity);
|
2023-12-05 20:54:55 +01:00
|
|
|
@@ -2387,6 +2391,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 14:02:28 +02:00
|
|
|
public boolean getAffectsSpawning() {
|
|
|
|
return this.getHandle().affectsSpawning;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-07-12 21:42:17 +02:00
|
|
|
+ public void setResourcePack(@NotNull String url, @NotNull String hash) {
|
|
|
|
+ this.setResourcePack(url, hash, false, null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setResourcePack(@NotNull String url, @NotNull String hash, boolean required) {
|
|
|
|
+ this.setResourcePack(url, hash, required, null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setResourcePack(@NotNull String url, @NotNull String hash, boolean required, net.kyori.adventure.text.Component resourcePackPrompt) {
|
2023-06-13 01:51:45 +02:00
|
|
|
+ Preconditions.checkArgument(url != null, "Resource pack URL cannot be null");
|
|
|
|
+ Preconditions.checkArgument(hash != null, "Hash cannot be null");
|
2021-07-12 21:42:17 +02:00
|
|
|
+ net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
|
|
|
|
+ io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
|
2021-10-01 02:56:22 +02:00
|
|
|
+ null;
|
2023-09-22 04:31:59 +02:00
|
|
|
+ this.getHandle().connection.send(new ClientboundResourcePackPacket(url, hash, required, promptComponent));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {
|
|
|
|
+ return this.resourcePackStatus;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getResourcePackHash() {
|
|
|
|
+ return this.resourcePackHash;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean hasResourcePack() {
|
|
|
|
+ return this.resourcePackStatus == org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setResourcePackStatus(org.bukkit.event.player.PlayerResourcePackStatusEvent.Status status) {
|
|
|
|
+ this.resourcePackStatus = status;
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
@Override
|