diff --git a/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineResourcePacksEvent.java b/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineResourcePacksEvent.java index ba71985fd..62f02e8d2 100644 --- a/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineResourcePacksEvent.java +++ b/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineResourcePacksEvent.java @@ -35,7 +35,6 @@ import java.util.UUID; /** * Called when {@link ResourcePack}'s and {@link ResourcePackCDNEntry}'s are loaded within Geyser. - * */ public abstract class GeyserDefineResourcePacksEvent implements Event { diff --git a/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java b/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java index 52dcda461..98b34126e 100644 --- a/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java +++ b/api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java @@ -39,5 +39,5 @@ import java.util.List; */ @Deprecated -public record GeyserLoadResourcePacksEvent(@Deprecated @NonNull List resourcePacks) implements Event { +public record GeyserLoadResourcePacksEvent(@NonNull List resourcePacks) implements Event { } diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java index c16cc494c..dae94cd29 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java @@ -96,7 +96,7 @@ public interface GeyserConfiguration { boolean isForceResourcePacks(); - List getCdnResourcePacks(); + List getResourcePackUrls(); boolean isXboxAchievementsEnabled(); diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java index 8211645ef..7a99d4368 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java @@ -137,8 +137,8 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration @JsonProperty("force-resource-packs") private boolean forceResourcePacks = true; - @JsonProperty("cdn-resource-packs") - private List cdnResourcePacks = new ArrayList<>(); + @JsonProperty("resource-pack-urls") + private List resourcePackUrls = new ArrayList<>(); @JsonProperty("xbox-achievements-enabled") private boolean xboxAchievementsEnabled = false; diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java index f9b962a64..1de225d3a 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java +++ b/core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java @@ -62,8 +62,6 @@ public class ResourcePackLoader implements RegistryLoader RESOURCE_PACK_CDN_ENTRY_LIST = new ArrayList<>(); @@ -102,19 +100,21 @@ public class ResourcePackLoader implements RegistryLoader cdnPacks = GeyserImpl.getInstance().getConfig().getCdnResourcePacks(); + List cdnPacks = GeyserImpl.getInstance().getConfig().getResourcePackUrls(); for (String url: cdnPacks) { int packHash = url.hashCode(); - Path cachedPath = CACHED_CDN_PACKS_DIRECTORY.resolve(packHash + ".zip"); + Path cachedPath = cachedCdnPacksDirectory.resolve(packHash + ".zip"); WebUtils.downloadFile(url, cachedPath.toString()); ResourcePack cdnpack = readPack(cachedPath); diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml index 575fed0df..07f9d4960 100644 --- a/core/src/main/resources/config.yml +++ b/core/src/main/resources/config.yml @@ -177,7 +177,7 @@ force-resource-packs: true # A list of links to send to the client to download resource packs from. # These must be direct links to the resource pack, not a link to a page containing the resource pack. -cdn-resource-packs: +resource-pack-urls: # Example: GeyserOptionalPack - "https://ci.opencollab.dev/job/GeyserMC/job/GeyserOptionalPack/job/master/lastSuccessfulBuild/artifact/GeyserOptionalPack.mcpack"