Upstream/ChestCommands
1
0
Fork 0
mirror of https://github.com/filoghost/ChestCommands.git synced 2025-02-20 21:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Use common formatPath method

Browse Source
This commit is contained in:
filoghost 2020-08-14 18:39:04 +02:00
parent de5dd3b3ef
commit 94ab7624f7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commons/src/main/java/me/filoghost/commons/config/ConfigErrors.java
View File

@ -49,7 +49,7 @@ public class ConfigErrors {
return "value of type \"" + value.getClass() + "\" couldn't be converted by \"" + converter.getClass() + "\""; return "value of type \"" + value.getClass() + "\" couldn't be converted by \"" + converter.getClass() + "\"";
} }
private static String formatPath(Path rootDataFolder, Path path) { public static String formatPath(Path rootDataFolder, Path path) {
if (path.startsWith(rootDataFolder)) { if (path.startsWith(rootDataFolder)) {
// Remove root data folder prefix // Remove root data folder prefix
return path.subpath(rootDataFolder.getNameCount(), path.getNameCount()).toString(); return path.subpath(rootDataFolder.getNameCount(), path.getNameCount()).toString();

8
plugin/src/main/java/me/filoghost/chestcommands/logging/Errors.java
View File

@ -8,6 +8,7 @@ package me.filoghost.chestcommands.logging;
import me.filoghost.chestcommands.ChestCommands; import me.filoghost.chestcommands.ChestCommands;
import me.filoghost.chestcommands.parsing.icon.AttributeType; import me.filoghost.chestcommands.parsing.icon.AttributeType;
import me.filoghost.chestcommands.parsing.icon.IconSettings; import me.filoghost.chestcommands.parsing.icon.IconSettings;
import me.filoghost.commons.config.ConfigErrors;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.nio.file.Path; import java.nio.file.Path;
@ -213,12 +214,7 @@ public class Errors {
} }
private static String formatPath(Path path) { private static String formatPath(Path path) {
if (path.startsWith(ChestCommands.getDataFolderPath())) { return ConfigErrors.formatPath(ChestCommands.getDataFolderPath(), path);
// Remove "/plugins/ChestCommands" prefix
return path.subpath(ChestCommands.getDataFolderPath().getNameCount(), path.getNameCount()).toString();
} else {
return path.toString();
}
} }
} }