From ebb706f5d988639e25d9b05feda28ab2893d92d9 Mon Sep 17 00:00:00 2001 From: yusshu Date: Thu, 21 Sep 2023 22:20:25 -0500 Subject: [PATCH] fix(common): actually set the public-url-format setting --- .../creative/central/server/CentralResourcePackServer.java | 2 +- .../creative/central/bukkit/CreativeCentralPlugin.java | 3 ++- .../central/common/server/CommonResourcePackServer.java | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/team/unnamed/creative/central/server/CentralResourcePackServer.java b/api/src/main/java/team/unnamed/creative/central/server/CentralResourcePackServer.java index f1e790b..e6b66ea 100644 --- a/api/src/main/java/team/unnamed/creative/central/server/CentralResourcePackServer.java +++ b/api/src/main/java/team/unnamed/creative/central/server/CentralResourcePackServer.java @@ -37,7 +37,7 @@ public interface CentralResourcePackServer extends Closeable { boolean isOpen(); - void open(String address, int port) throws IOException; + void open(String address, String publicUrlFormat, int port) throws IOException; String publicUrlFormat(); diff --git a/bukkit/src/main/java/team/unnamed/creative/central/bukkit/CreativeCentralPlugin.java b/bukkit/src/main/java/team/unnamed/creative/central/bukkit/CreativeCentralPlugin.java index a611b84..4447092 100644 --- a/bukkit/src/main/java/team/unnamed/creative/central/bukkit/CreativeCentralPlugin.java +++ b/bukkit/src/main/java/team/unnamed/creative/central/bukkit/CreativeCentralPlugin.java @@ -151,6 +151,7 @@ private void loadResourcePackServer() { getLogger().info("Resource-pack server enabled, starting..."); String address = config.address(); + String publicUrlFormat = config.publicUrlFormat(); int port = config.port(); // if address is empty, automatically detect the server's address @@ -168,7 +169,7 @@ private void loadResourcePackServer() { if (address != null) { try { - resourcePackServer.open(address, port); + resourcePackServer.open(address, publicUrlFormat, port); getLogger().info("Successfully started the resource-pack server, listening on port " + port); } catch (IOException e) { getLogger().log(Level.SEVERE, "Failed to open the resource pack server", e); diff --git a/common/src/main/java/team/unnamed/creative/central/common/server/CommonResourcePackServer.java b/common/src/main/java/team/unnamed/creative/central/common/server/CommonResourcePackServer.java index cc24024..8435ed9 100644 --- a/common/src/main/java/team/unnamed/creative/central/common/server/CommonResourcePackServer.java +++ b/common/src/main/java/team/unnamed/creative/central/common/server/CommonResourcePackServer.java @@ -34,8 +34,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import static java.util.Objects.requireNonNull; - public final class CommonResourcePackServer implements CentralResourcePackServer, ResourcePackRequestHandler { private @Nullable ResourcePackServer server; @@ -61,12 +59,13 @@ public boolean isOpen() { } @Override - public void open(String address, int port) throws IOException { + public void open(String address, String publicUrlFormat, int port) throws IOException { if (open) { throw new IllegalStateException("The resource pack server is already open!"); } this.address = address; + this.publicUrlFormat = publicUrlFormat; this.port = port; this.open = true;