From 50f7eb31bba9b884826889086b8c849e28facb6f Mon Sep 17 00:00:00 2001 From: carm Date: Sat, 29 Mar 2025 03:09:36 +0800 Subject: [PATCH] chore: Remove "resourcesPath" by default. --- .../bukkit/MineConfiguration.java | 14 +++++++++++--- .../bungee/MineConfiguration.java | 4 ++-- .../velocity/MineConfiguration.java | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java index c4d0ec3..92a2a8f 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java @@ -8,17 +8,25 @@ import cc.carm.lib.mineconfiguration.common.AbstractConfiguration; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.File; public class MineConfiguration extends AbstractConfiguration> { - public static ConfigurationHolder from(File file, String source) { + public static ConfigurationHolder from(@NotNull File file, + @Nullable String source) { return BukkitConfigFactory.from(file).resourcePath(source).build(); } - public static ConfigurationHolder from(Plugin plugin, String fileName) { - return from(new File(plugin.getDataFolder(), fileName), fileName); + public static ConfigurationHolder from(@NotNull Plugin plugin, + @NotNull String fileName) { + return from(plugin, fileName, null); + } + + public static ConfigurationHolder from(@NotNull Plugin plugin, + @NotNull String fileName, @Nullable String resource) { + return from(new File(plugin.getDataFolder(), fileName), resource); } public MineConfiguration(@NotNull JavaPlugin plugin) { diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/MineConfiguration.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/MineConfiguration.java index 74fafe0..8438481 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/MineConfiguration.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/MineConfiguration.java @@ -30,8 +30,8 @@ public class MineConfiguration extends AbstractConfiguration