mirror of
https://github.com/Suiranoil/SkinRestorer.git
synced 2026-01-16 04:42:12 +00:00
fix old skin directory migration not working
This commit is contained in:
@@ -65,7 +65,7 @@ public final class SkinRestorer {
|
||||
|
||||
public static void onServerStarted(MinecraftServer server) {
|
||||
Path worldSkinDirectory = server.getWorldPath(LevelResource.ROOT).resolve(SkinRestorer.MOD_ID);
|
||||
FileUtils.tryMigrateOldSkinDirectory(worldSkinDirectory);
|
||||
FileUtils.tryMigrateOldSkinDirectory(SkinRestorer.getConfigDir(), worldSkinDirectory);
|
||||
|
||||
SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
|
||||
}
|
||||
|
||||
@@ -17,12 +17,11 @@ public final class FileUtils {
|
||||
|
||||
private FileUtils() {}
|
||||
|
||||
public static void tryMigrateOldSkinDirectory(Path newDirectory) {
|
||||
public static void tryMigrateOldSkinDirectory(Path oldDirectory, Path newDirectory) {
|
||||
try {
|
||||
var configDirectory = SkinRestorer.getConfigDir();
|
||||
try (var stream = Files.list(configDirectory)) {
|
||||
try (var stream = Files.list(oldDirectory)) {
|
||||
var files = stream.filter(file -> {
|
||||
var name = file.getFileName();
|
||||
var name = file.getFileName().toString();
|
||||
return Files.isRegularFile(file)
|
||||
&& !name.startsWith(Translation.LEGACY_TRANSLATION_FILENAME)
|
||||
&& !name.startsWith(Config.CONFIG_FILENAME)
|
||||
@@ -32,7 +31,6 @@ public final class FileUtils {
|
||||
if (!files.isEmpty() && !Files.exists(newDirectory))
|
||||
Files.createDirectories(newDirectory);
|
||||
|
||||
|
||||
for (var file : files)
|
||||
Files.move(file, newDirectory.resolve(file.getFileName()), StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user