Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 22:03:03 +08:00
Code Issues Projects Releases Wiki Activity

Fix dataloader with eclipse

Browse Source
This commit is contained in:
Melledy 2022-05-19 00:10:02 -07:00
parent bad853573c
commit 512021b234
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/data/DataLoader.java
View File

@ -7,8 +7,10 @@ import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
import java.io.*; import java.io.*;
import java.nio.file.FileSystems;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
import static emu.grasscutter.Configuration.DATA; import static emu.grasscutter.Configuration.DATA;
@ -46,17 +48,18 @@ public class DataLoader {
} }
public static void CheckAllFiles() { public static void CheckAllFiles() {
String pathSplitter = "defaults" + Pattern.quote(FileSystems.getDefault().getSeparator()) + "data" + Pattern.quote(FileSystems.getDefault().getSeparator());
try { try {
List<Path> filenames = FileUtils.getPathsFromResource("/defaults/data/"); List<Path> filenames = FileUtils.getPathsFromResource("/defaults/data/");
for (Path file : filenames) { for (Path file : filenames) {
String relativePath = String.valueOf(file).split("/defaults/data/")[1]; String relativePath = String.valueOf(file).split(pathSplitter)[1];
CheckAndCopyData(relativePath); CheckAndCopyData(relativePath);
} }
} catch (Exception e) { } catch (Exception e) {
Grasscutter.getLogger().error("An error occurred while trying to check the data folder. \n" + e); Grasscutter.getLogger().error("An error occurred while trying to check the data folder. \n", e);
} }
GenerateGachaMappings(); GenerateGachaMappings();

11
src/main/java/emu/grasscutter/utils/FileUtils.java
View File

@ -9,6 +9,7 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.*; import java.nio.file.*;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -76,15 +77,16 @@ public final class FileUtils {
// From https://mkyong.com/java/java-read-a-file-from-resources-folder/ // From https://mkyong.com/java/java-read-a-file-from-resources-folder/
public static List<Path> getPathsFromResource(String folder) throws URISyntaxException, IOException { public static List<Path> getPathsFromResource(String folder) throws URISyntaxException, IOException {
List<Path> result; List<Path> result = null;
// get path of the current running JAR // Get path of the current running JAR
String jarPath = Grasscutter.class.getProtectionDomain() String jarPath = Grasscutter.class.getProtectionDomain()
.getCodeSource() .getCodeSource()
.getLocation() .getLocation()
.toURI() .toURI()
.getPath(); .getPath();
try {
// file walks JAR // file walks JAR
URI uri = URI.create("jar:file:" + jarPath); URI uri = URI.create("jar:file:" + jarPath);
try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) { try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
@ -92,6 +94,11 @@ public final class FileUtils {
.filter(Files::isRegularFile) .filter(Files::isRegularFile)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} catch (Exception e) {
// Eclipse puts resources in its bin folder
File f = new File(jarPath + "defaults/data/");
result = Arrays.stream(f.listFiles()).map(File::toPath).toList();
}
return result; return result;
} }