diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/PackCacheData.java b/core/src/main/java/net/momirealms/craftengine/core/pack/PackCacheData.java index 424eccc32..702bf2163 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/PackCacheData.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/PackCacheData.java @@ -1,41 +1,29 @@ package net.momirealms.craftengine.core.pack; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import net.momirealms.craftengine.core.plugin.CraftEngine; import net.momirealms.craftengine.core.plugin.config.Config; -import net.momirealms.craftengine.core.plugin.logger.Debugger; -import net.momirealms.craftengine.core.util.SetMonitor; import org.jetbrains.annotations.NotNull; import java.nio.file.Files; import java.nio.file.Path; import java.util.Set; -import java.util.stream.Collectors; public class PackCacheData { private final Set externalZips; private final Set externalFolders; PackCacheData(@NotNull CraftEngine plugin) { - this.externalFolders = new SetMonitor<>( - Config.foldersToMerge().stream() - .map(it -> plugin.dataFolderPath().getParent().resolve(it)) - .filter(Files::exists) - .collect(Collectors.toSet()), - add -> plugin.logger().info("Adding external folder: " + add), - remove -> plugin.logger().info("Removing external folder: " + remove), - true - ); - this.externalZips = new SetMonitor<>( - Config.zipsToMerge().stream() - .map(it -> plugin.dataFolderPath().getParent().resolve(it)) - .filter(Files::exists) - .filter(Files::isRegularFile) - .filter(file -> file.getFileName().toString().endsWith(".zip")) - .collect(Collectors.toSet()), - add -> plugin.logger().info("Adding external zip: " + add), - remove -> plugin.logger().info("Removing external zip: " + remove), - true - ); + this.externalFolders = Config.foldersToMerge().stream() + .map(it -> plugin.dataFolderPath().getParent().resolve(it)) + .filter(Files::exists) + .collect(ObjectOpenHashSet.toSet()); + this.externalZips = Config.zipsToMerge().stream() + .map(it -> plugin.dataFolderPath().getParent().resolve(it)) + .filter(Files::exists) + .filter(Files::isRegularFile) + .filter(file -> file.getFileName().toString().endsWith(".zip")) + .collect(ObjectOpenHashSet.toSet()); } @NotNull diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/ListMonitor.java b/core/src/main/java/net/momirealms/craftengine/core/util/ListMonitor.java index aeb2c9350..3e37d53b5 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/ListMonitor.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/ListMonitor.java @@ -13,16 +13,10 @@ public class ListMonitor implements List { private final List list; private final Consumer addConsumer; private final Consumer removeConsumer; - public ListMonitor(List list, Consumer addConsumer, Consumer removeConsumer) { - this(list, addConsumer, removeConsumer, false); - } - - public ListMonitor(List list, Consumer addConsumer, Consumer removeConsumer, boolean skipInitialNotification) { this.list = list; this.addConsumer = addConsumer; this.removeConsumer = removeConsumer; - if (skipInitialNotification) return; for (T key : list) { this.addConsumer.accept(key); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/SetMonitor.java b/core/src/main/java/net/momirealms/craftengine/core/util/SetMonitor.java index 97b5640b2..39a3fa4ac 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/SetMonitor.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/SetMonitor.java @@ -13,14 +13,9 @@ public class SetMonitor implements Set { private final Consumer removeConsumer; public SetMonitor(Set set, Consumer addConsumer, Consumer removeConsumer) { - this(set, addConsumer, removeConsumer, false); - } - - public SetMonitor(Set set, Consumer addConsumer, Consumer removeConsumer, boolean skipInitialNotification) { this.set = set; this.addConsumer = addConsumer; this.removeConsumer = removeConsumer; - if (skipInitialNotification) return; for (E element : set) { this.addConsumer.accept(element); }