From 2d305cb0f08563d915b626db39fb93ce3f2ff140 Mon Sep 17 00:00:00 2001
From: Andre Roldan <45738853+yusshu@users.noreply.github.com>
Date: Mon, 24 Jan 2022 19:42:32 -0500
Subject: [PATCH] Add ResourcePack#optional overload to specify prompt (#600)

---
 .../server/play/ResourcePackSendPacket.java   |  8 ++++----
 .../server/resourcepack/ResourcePack.java     | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java
index c948adc18..ff591e411 100644
--- a/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java
+++ b/src/main/java/net/minestom/server/network/packet/server/play/ResourcePackSendPacket.java
@@ -9,7 +9,7 @@ import net.minestom.server.utils.binary.BinaryWriter;
 import org.jetbrains.annotations.NotNull;
 
 public record ResourcePackSendPacket(String url, String hash, boolean forced,
-                                     Component forcedMessage) implements ServerPacket {
+                                     Component prompt) implements ServerPacket {
     public ResourcePackSendPacket(BinaryReader reader) {
         this(reader.readSizedString(), reader.readSizedString(), reader.readBoolean(),
                 reader.readBoolean() ? reader.readComponent() : null);
@@ -17,7 +17,7 @@ public record ResourcePackSendPacket(String url, String hash, boolean forced,
 
     public ResourcePackSendPacket(@NotNull ResourcePack resourcePack) {
         this(resourcePack.getUrl(), resourcePack.getHash(), resourcePack.isForced(),
-                resourcePack.getForcedMessage());
+                resourcePack.getPrompt());
     }
 
     @Override
@@ -25,9 +25,9 @@ public record ResourcePackSendPacket(String url, String hash, boolean forced,
         writer.writeSizedString(url);
         writer.writeSizedString(hash);
         writer.writeBoolean(forced);
-        if (forcedMessage != null) {
+        if (prompt != null) {
             writer.writeBoolean(true);
-            writer.writeComponent(forcedMessage);
+            writer.writeComponent(prompt);
         } else {
             writer.writeBoolean(false);
         }
diff --git a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
index 5e8f78742..041fd40f2 100644
--- a/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
+++ b/src/main/java/net/minestom/server/resourcepack/ResourcePack.java
@@ -13,22 +13,26 @@ public class ResourcePack {
     private final String url;
     private final String hash;
     private final boolean forced;
-    private final Component forcedMessage;
+    private final Component prompt;
 
-    private ResourcePack(@NotNull String url, @Nullable String hash, boolean forced, @Nullable Component forcedMessage) {
+    private ResourcePack(@NotNull String url, @Nullable String hash, boolean forced, @Nullable Component prompt) {
         this.url = url;
         // Optional, set to empty if null
         this.hash = hash == null ? "" : hash;
         this.forced = forced;
-        this.forcedMessage = forcedMessage;
+        this.prompt = prompt;
+    }
+
+    public static ResourcePack optional(@NotNull String url, @Nullable String hash, @Nullable Component prompt) {
+        return new ResourcePack(url, hash, false, prompt);
     }
 
     public static ResourcePack optional(@NotNull String url, @Nullable String hash) {
-        return new ResourcePack(url, hash, false, null);
+        return optional(url, hash, null);
     }
 
-    public static ResourcePack forced(@NotNull String url, @Nullable String hash, @Nullable Component forcedMessage) {
-        return new ResourcePack(url, hash, true, forcedMessage);
+    public static ResourcePack forced(@NotNull String url, @Nullable String hash, @Nullable Component prompt) {
+        return new ResourcePack(url, hash, true, prompt);
     }
 
     public static ResourcePack forced(@NotNull String url, @Nullable String hash) {
@@ -60,7 +64,7 @@ public class ResourcePack {
         return forced;
     }
 
-    public @Nullable Component getForcedMessage() {
-        return forcedMessage;
+    public @Nullable Component getPrompt() {
+        return prompt;
     }
 }