Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-09-27 14:52:57 +02:00
Code Issues Projects Releases Wiki Activity

Rename AddonManager to Addons

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2024-05-27 23:46:32 +02:00
parent 51185f5884
commit 52d1e59108
No known key found for this signature in database
GPG Key ID: AA33883B1BBA03E6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/addons/AddonManager.java → BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/addons/Addons.java
View File

@ -45,12 +45,12 @@
import static de.bluecolored.bluemap.common.addons.AddonInfo.ADDON_INFO_FILE;
public final class AddonManager {
public final class Addons {
private static final Gson GSON = new GsonBuilder().create();
private static final Map<String, LoadedAddon> LOADED_ADDONS = new ConcurrentHashMap<>();
private AddonManager() {
private Addons() {
throw new UnsupportedOperationException("Utility class");
}
@ -63,7 +63,7 @@ public static void tryLoadAddons(Path root, boolean expectOnlyAddons) {
files
.filter(Files::isRegularFile)
.filter(f -> f.getFileName().toString().endsWith(".jar"))
.forEach(expectOnlyAddons ? AddonManager::tryLoadAddon : AddonManager::tryLoadJar);
.forEach(expectOnlyAddons ? Addons::tryLoadAddon : Addons::tryLoadJar);
} catch (IOException e) {
Logger.global.logError("Failed to load addons from '%s'".formatted(root), e);
}

6
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java
View File

@ -28,7 +28,7 @@
import de.bluecolored.bluemap.common.BlueMapService;
import de.bluecolored.bluemap.common.InterruptableReentrantLock;
import de.bluecolored.bluemap.common.MissingResourcesException;
import de.bluecolored.bluemap.common.addons.AddonManager;
import de.bluecolored.bluemap.common.addons.Addons;
import de.bluecolored.bluemap.common.api.BlueMapAPIImpl;
import de.bluecolored.bluemap.common.config.*;
import de.bluecolored.bluemap.common.live.LivePlayersDataSupplier;
@ -125,8 +125,8 @@ private void load(@Nullable ResourcePack preloadedResourcePack) throws IOExcepti
//load addons
Path addonsFolder = serverInterface.getConfigFolder().resolve("addons");
Files.createDirectories(addonsFolder);
AddonManager.tryLoadAddons(addonsFolder, true);
serverInterface.getModsFolder().ifPresent(AddonManager::tryLoadAddons);
Addons.tryLoadAddons(addonsFolder, true);
serverInterface.getModsFolder().ifPresent(Addons::tryLoadAddons);
//load configs
BlueMapConfigManager configManager = BlueMapConfigManager.builder()

4
implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -27,7 +27,7 @@
import de.bluecolored.bluemap.common.BlueMapConfiguration;
import de.bluecolored.bluemap.common.BlueMapService;
import de.bluecolored.bluemap.common.MissingResourcesException;
import de.bluecolored.bluemap.common.addons.AddonManager;
import de.bluecolored.bluemap.common.addons.Addons;
import de.bluecolored.bluemap.common.api.BlueMapAPIImpl;
import de.bluecolored.bluemap.common.config.BlueMapConfigManager;
import de.bluecolored.bluemap.common.config.ConfigurationException;
@ -312,7 +312,7 @@ public static void main(String[] args) {
// load addons
Path addonsFolder = cli.configFolder.resolve("addons");
Files.createDirectories(addonsFolder);
AddonManager.tryLoadAddons(cli.configFolder.resolve("addons"), true);
Addons.tryLoadAddons(cli.configFolder.resolve("addons"), true);
// load configs
BlueMapConfigManager configs = BlueMapConfigManager.builder()