Added MCUtils#getDataFolder

xDec0de · Oct 30, 2024 · 0d1eb98 · 0d1eb98
1 parent 0699041
commit 0d1eb98
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/platforms/spigot/src/main/java/net/codersky/mcutils/spigot/SpigotUtils.java b/platforms/spigot/src/main/java/net/codersky/mcutils/spigot/SpigotUtils.java
@@ -27,6 +27,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -44,6 +45,12 @@ public SpigotUtils(@NotNull P plugin) {
 		this.console = new SpigotConsole(Bukkit.getConsoleSender());
 	}
 
+	@NotNull
+	@Override
+	public File getDataFolder() {
+		return getPlugin().getDataFolder();
+	}
+
 	@NotNull
 	public SpigotUtils<P> setPlayerProvider(@NotNull PlayerProvider<Player> playerProvider) {
 		this.playerProvider = Objects.requireNonNull(playerProvider, "Player provider cannot be null");

diff --git a/platforms/velocity/src/main/java/net/codersky/mcutils/velocity/VelocityUtils.java b/platforms/velocity/src/main/java/net/codersky/mcutils/velocity/VelocityUtils.java
@@ -15,6 +15,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+import java.nio.file.Path;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -23,11 +25,13 @@ public class VelocityUtils<P> extends ProxyUtils<P> {
 	private final ProxyServer proxy;
 	private final VelocityConsole console;
 	private PlayerProvider<Player> playerProvider;
+	private final Path dataDirectory;
 
-	public VelocityUtils(@NotNull P plugin, @NotNull ProxyServer proxy) {
+	public VelocityUtils(@NotNull P plugin, @NotNull ProxyServer proxy, @NotNull Path dataDirectory) {
 		super(plugin);
 		this.proxy = Objects.requireNonNull(proxy);
 		this.console = new VelocityConsole(proxy.getConsoleCommandSource());
+		this.dataDirectory = dataDirectory;
 	}
 
 	@NotNull
@@ -46,6 +50,12 @@ public PlayerProvider<Player> getPlayerProvider() {
 		return playerProvider;
 	}
 
+	@NotNull
+	@Override
+	public File getDataFolder() {
+		return this.dataDirectory.toFile();
+	}
+
 	@Nullable
 	public MCPlayer getPlayer(@NotNull UUID uuid) {
 		return playerProvider.getPlayer(uuid);

diff --git a/shared/src/main/java/net/codersky/mcutils/MCUtils.java b/shared/src/main/java/net/codersky/mcutils/MCUtils.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -43,6 +44,9 @@ public final P getPlugin() {
 		return plugin;
 	}
 
+	@NotNull
+	public abstract File getDataFolder();
+
 	@Nullable
 	public abstract MCPlayer getPlayer(@NotNull UUID uuid);