Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TSJ and TSV parsing #1962

Merged
merged 14 commits into from
Nov 23, 2022
Merged

TSJ and TSV parsing #1962

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
aeff8c7
Deserialization support for tsv files
Birdulon Oct 28, 2022
d2516bf
Benchmarking
Birdulon Oct 28, 2022
b9ad9f3
Apparently moving the setter out of the lambda fixed the setAccessibl…
Birdulon Oct 28, 2022
30c8e14
Thread it
Birdulon Oct 28, 2022
b4a0c3f
Use AllArgsConstructor instead of field reflection
Birdulon Nov 7, 2022
72f9c0d
Clean up AllArgsConstructor TSV deserialization
Birdulon Nov 16, 2022
7d38918
Refactor TsvUtils
Birdulon Nov 16, 2022
0429fb5
Remove AllArgsConstructors from Excels
Birdulon Nov 16, 2022
753c2e7
Set field accessible
Birdulon Nov 16, 2022
fae6bbf
[WIP] TSJ improvements
Birdulon Nov 18, 2022
9e1a6a5
[WIP] More TSV stuff
Birdulon Nov 18, 2022
8ada2ed
[WIP] More TSV stuff
Birdulon Nov 21, 2022
95ea57f
Working TSV parser (slow)
Birdulon Nov 23, 2022
c68b616
Load Excels in TSJ > JSON > TSV priority
Birdulon Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[WIP] More TSV stuff
  • Loading branch information
@Birdulon
Birdulon committed Nov 21, 2022
commit 8ada2ed8ac4723624fed1470ecafa2fa4f4c43cb
4 changes: 2 additions & 2 deletions src/main/java/emu/grasscutter/data/ResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void loadResources(boolean doReload) {
getResourceDefClassesPrioritySets().forEach(classes -> {
// Grasscutter.getLogger().error("Loading resources: " + classes);
classes.stream()
.parallel().unordered()
// .parallel().unordered()
.forEach(c -> {
val type = c.getAnnotation(ResourceType.class);
if (type == null) return;
Expand Down Expand Up @@ -165,7 +165,7 @@ protected static void loadFromResourceTsv(Class<?> c, ResourceType type, Int2Obj
Stream.of(type.name())
.map(FileUtils::getExcelPath)
.forEach(path ->
TsvUtils.loadTsjToListSetField(c, path).forEach(o -> {
TsvUtils.loadTsvToListSetField(c, path).forEach(o -> {
GameResource res = (GameResource) o;
res.onLoad();
map.put(res.getId(), res);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static Path getResourcePath(String path) {
}

public static Path getExcelPath(String fileName) {
return RESOURCES_PATH.resolve("ExcelBinOutput/" + fileName.replace(".json", ".tsj"));
return RESOURCES_PATH.resolve("ExcelBinOutput/" + fileName.replace(".json", ".tsv"));
}

public static Path getScriptPath(String path) {
Expand Down
Loading