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 e4e82165f..6b609cb1a 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java @@ -136,8 +136,8 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration @JsonProperty("force-resource-packs") private boolean forceResourcePacks = true; - @JsonProperty("resource-pack-urls") - private List resourcePackUrls = 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/event/type/GeyserDefineResourcePacksEventImpl.java b/core/src/main/java/org/geysermc/geyser/event/type/GeyserDefineResourcePacksEventImpl.java index ea4623d92..adec6e0d5 100644 --- a/core/src/main/java/org/geysermc/geyser/event/type/GeyserDefineResourcePacksEventImpl.java +++ b/core/src/main/java/org/geysermc/geyser/event/type/GeyserDefineResourcePacksEventImpl.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.UUID; +import java.util.stream.Collectors; @Getter public class GeyserDefineResourcePacksEventImpl extends GeyserDefineResourcePacksEvent { @@ -50,7 +51,7 @@ public class GeyserDefineResourcePacksEventImpl extends GeyserDefineResourcePack @Override public @NonNull List resourcePacks() { - return List.copyOf(packs.values().stream().map(ResourcePackHolder::pack).toList()); + return packs.values().stream().map(ResourcePackHolder::pack).collect(Collectors.toUnmodifiableList()); } @Override diff --git a/core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java b/core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java index e06e02e70..fdeb22542 100644 --- a/core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java +++ b/core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java @@ -140,7 +140,7 @@ public class SessionLoadResourcePacksEventImpl extends SessionLoadResourcePacksE public List orderedPacks() { TreeSet> sortedPacks = packs.values().stream() // Map each ResourcePack to a pair of (GeyserResourcePack, Priority) - .map(holder -> new AbstractMap.SimpleEntry<>(holder.pack(), getPriority(holder.pack()))) + .map(holder -> new AbstractMap.SimpleEntry<>(holder.pack(), priority(holder.pack()))) // Sort by priority in ascending order .collect(Collectors.toCollection(() -> new TreeSet<>(Map.Entry.comparingByValue(Comparator.naturalOrder())))); @@ -188,7 +188,7 @@ public class SessionLoadResourcePacksEventImpl extends SessionLoadResourcePacksE // Helper methods to get the options for a ResourcePack - private double getPriority(GeyserResourcePack pack) { + private double priority(GeyserResourcePack pack) { OptionHolder holder = options.get(pack.uuid()); OptionHolder defaultHolder = packs.get(pack.uuid()).optionHolder(); Objects.requireNonNull(defaultHolder); // should never be null